Copilot siwe

apps/copilot-api/config/publicClient.ts

@@ -0,0 +1,7 @@
+import { createPublicClient, http } from 'viem'
+import { mainnet } from 'viem/chains'
+
+export const publicClient = createPublicClient({
+  chain: mainnet,
+  transport: http('https://rpc.payload.de')
+})

apps/copilot-api/routes/auth.ts

@@ -1,13 +1,14 @@
 import express from 'express';
-import type {Request, Response} from 'express';
+import type { Request, Response } from 'express';
 import dotenv from 'dotenv';
 import jwt from 'jsonwebtoken';
-import {throwInternalError} from '../middleware/error.middleware';
-import {isAddress, verifyMessage} from 'viem';
-import {dataSource} from '../db';
-import {AddressesEntity} from '../entities/addreesses.entity';
-import {UsersEntity} from '../entities/users.entity';
-import {v4 as uuidv4} from 'uuid';
+import { throwInternalError } from '../middleware/error.middleware';
+import { isAddress } from 'viem';
+import { dataSource } from '../db';
+import { AddressesEntity } from '../entities/addreesses.entity';
+import { UsersEntity } from '../entities/users.entity';
+import { createSiweMessage, generateSiweNonce } from 'viem/siwe';
+import { publicClient } from '../config/publicClient';
 
 dotenv.config();
 
@@ -17,31 +18,31 @@ const addressesRepo = dataSource.getRepository(AddressesEntity);
 const usersRepo = dataSource.getRepository(UsersEntity);
 
 router.post('/login', async (req: Request, res: Response) => {
-  const {signature, walletAddress, challengeMessage} = req.body;
+  const { signature, walletAddress, message } = req.body;
 
   if (!isAddress(walletAddress)) {
-    res.status(403).json({error: 'Invalid wallet address'});
+    res.status(403).json({ error: 'Invalid wallet address' });
     return;
   }
 
   try {
-    const valid_address = await verifyMessage({
-      signature,
+    const valid = await publicClient.verifySiweMessage({
       address: walletAddress,
-      message: challengeMessage
+      message,
+      signature,
     });
 
-    if (!valid_address) {
-      res.status(403).json({error: 'Invalid signature'});
+    if (!valid) {
+      res.status(403).json({ error: 'Invalid signature' });
       return;
     }
 
     const existingAddress = await addressesRepo.findOne({
-      where: {address: walletAddress},
+      where: { address: walletAddress },
     });
 
     const user = await usersRepo.findOne({
-      where: {uuid: existingAddress?.userId},
+      where: { uuid: existingAddress?.userId },
     });
 
     if (!user) {
@@ -56,7 +57,7 @@ router.post('/login', async (req: Request, res: Response) => {
         expiresIn: '7d',
       });
 
-      res.status(200).send({token});
+      res.status(200).send({ token });
       return;
     }
 
@@ -70,42 +71,44 @@ router.post('/login', async (req: Request, res: Response) => {
       expiresIn: '7d',
     });
 
-    res.status(200).send({token});
-  } catch (err) {
-  }
+    res.status(200).send({ token });
+  } catch (err) {}
 });
 
 router.post('/wallet-address', async (req, res) => {
   try {
-    const {walletAddress} = req.body;
-    const nonce = uuidv4();
-    const timestamp = new Date().toISOString();
-    const challengeMessage = `
-            Challenge: ${process.env.CHALLENGE_SECRET},
-            Wallet Address: ${walletAddress},
-            Nonce: ${nonce},
-            Timestamp: ${timestamp}
-        `
-      .replace(/\\s+/g, ' ')
-      .trim();
-    res.status(200).json({nonce, challengeMessage});
+    const { walletAddress, chainId, domain } = req.body;
+    const nonce = generateSiweNonce();
+    const timestamp = new Date();
+
+    const message = createSiweMessage({
+      address: walletAddress,
+      chainId,
+      domain,
+      nonce,
+      uri: `https://${domain}`, // TODO: Change for production
+      version: '1',
+      issuedAt: timestamp,
+    });
+
+    res.status(200).json({ nonce, message });
   } catch (err) {
-    throwInternalError(res, 'Error generating challenge message: ', err);
+    throwInternalError(res, 'Error generating login message: ', err);
   }
 });
 
 router.post('/verify-token', async (req, res) => {
-  const {token} = req.body;
+  const { token } = req.body;
 
   try {
     const decoded = jwt.verify(token, process.env.JWT_SECRET!);
 
     const id: number = (decoded as Request)['user'].id;
 
-    const user = await usersRepo.findOne({where: {uuid: id}});
+    const user = await usersRepo.findOne({ where: { uuid: id } });
 
     if (!user) {
-      res.status(401).json({error: 'Invalid token'});
+      res.status(401).json({ error: 'Invalid token' });
       return;
     }
 

apps/extension/package.json

@@ -22,10 +22,11 @@
     "@amplitude/analytics-browser": "2.9.2",
     "@ebay/nice-modal-react": "^1.2.13",
     "@hookform/resolvers": "^3.9.0",
-    "@noble/hashes": "^1.5.0",
-    "@idriss-xyz/ui": "workspace:*",
     "@idriss-xyz/constants": "workspace:*",
+    "@idriss-xyz/ui": "workspace:*",
     "@idriss-xyz/wallet-connect": "workspace:*",
+    "@lifi/sdk": "^3.4.2",
+    "@noble/hashes": "^1.5.0",
     "@radix-ui/react-checkbox": "^1.1.2",
     "@radix-ui/react-dialog": "^1.1.2",
     "@radix-ui/react-dropdown-menu": "^2.1.2",
@@ -50,6 +51,7 @@
     "react-number-format": "^5.4.2",
     "react-router": "^6.27.0",
     "react-use": "^17.5.1",
+    "socket.io-client": "^4.8.1",
     "tailwind-merge": "^2.5.4",
     "ts-custom-error": "^3.3.1",
     "ts-pattern": "^5.5.0",

apps/extension/src/application/look-up-wallet-address/components/address-list.tsx

@@ -1,6 +1,7 @@
 import { useCallback, useEffect, useState } from 'react';
+import { ScrollArea } from '@idriss-xyz/ui/scroll-area';
 
-import { classes, ScrollArea } from 'shared/ui';
+import { classes } from 'shared/ui';
 
 import { SearchResult } from '../types';
 

apps/extension/src/application/trading-copilot/commands/add-trading-copilot-subscription.ts

@@ -2,15 +2,13 @@ import {
   Command,
   FailureResult,
   HandlerError,
+  HandlerResponseError,
   OkResult,
 } from 'shared/messaging';
 
-import { Subscription } from '../types';
-import { TradingCopilotSettingsManager } from '../subscriptions-manager';
+import { SubscriptionRequest as Payload } from '../types';
 
-interface Payload {
-  subscription: Subscription;
-}
+import { COPILOT_API_URL } from './constants';
 
 type Response = boolean;
 
@@ -26,9 +24,26 @@ export class AddTradingCopilotSubscriptionCommand extends Command<
 
   async handle() {
     try {
-      await TradingCopilotSettingsManager.subscribe(this.payload.subscription);
+      const response = await fetch(`${COPILOT_API_URL}/subscribe`, {
+        method: 'POST',
+        body: JSON.stringify(this.payload),
+        headers: {
+          'Content-Type': 'application/json',
+        },
+      });
+
+      if (!response.ok) {
+        const responseText = await response.text();
+        throw new HandlerResponseError(
+          this.name,
+          responseText,
+          response.status,
+        );
+      }
+
+      const json = (await response.json()) as Response;
 
-      return new OkResult(true);
+      return new OkResult(json);
     } catch (error) {
       this.captureException(error);
       if (error instanceof HandlerError) {

apps/extension/src/application/trading-copilot/commands/constants.ts

@@ -0,0 +1,3 @@
+export const COPILOT_API_URL = 'https://copilot-production-e887.up.railway.app';
+export const QUOTE_API_URL = 'https://idriss-lifi.vercel.app/api/get-quote';
+export const AUTH_API_URL = 'http://localhost:8080/auth';

apps/extension/src/application/trading-copilot/commands/get-ens-address.ts

@@ -25,7 +25,7 @@ export class GetEnsAddressCommand extends Command<Payload, Hex | null> {
     try {
       const client = createPublicClient({
         chain: { ...mainnet },
-        transport: http(),
+        transport: http('https://eth.llamarpc.com'),
       });
       const response = await client.getEnsAddress({
         name: normalize(this.payload.ensName),

apps/extension/src/application/trading-copilot/commands/get-ens-balance.ts

@@ -0,0 +1,44 @@
+import { createPublicClient, formatEther, http } from 'viem';
+import { mainnet } from 'viem/chains';
+
+import { Hex } from 'shared/web3';
+import {
+  Command,
+  FailureResult,
+  HandlerError,
+  OkResult,
+} from 'shared/messaging';
+
+type Payload = {
+  address: Hex;
+  blockTag: 'latest' | 'earliest' | 'pending' | 'safe' | 'finalized';
+};
+
+export class GetEnsBalanceCommand extends Command<Payload, string | null> {
+  public readonly name = 'GetEnsBalanceCommand' as const;
+
+  constructor(public payload: Payload) {
+    super();
+  }
+
+  async handle() {
+    try {
+      const client = createPublicClient({
+        chain: { ...mainnet },
+        transport: http('https://eth.llamarpc.com'),
+      });
+
+      const result = await client.getBalance(this.payload);
+      const balanceAsEth = formatEther(result);
+
+      return new OkResult(balanceAsEth);
+    } catch (error) {
+      this.captureException(error);
+      if (error instanceof HandlerError) {
+        return new FailureResult(error.message);
+      }
+
+      return new FailureResult();
+    }
+  }
+}

apps/extension/src/application/trading-copilot/commands/get-ens-info.ts

@@ -25,7 +25,7 @@ export class GetEnsInfoCommand extends Command<Payload, string | null> {
     try {
       const client = createPublicClient({
         chain: { ...mainnet },
-        transport: http(),
+        transport: http('https://eth.llamarpc.com'),
       });
 
       const result = await client.getEnsText({

apps/extension/src/application/trading-copilot/commands/get-ens-name.ts

@@ -0,0 +1,41 @@
+import { createPublicClient, http } from 'viem';
+import { mainnet } from 'viem/chains';
+
+import { Hex } from 'shared/web3';
+import {
+  Command,
+  FailureResult,
+  HandlerError,
+  OkResult,
+} from 'shared/messaging';
+
+type Payload = {
+  address: Hex;
+};
+
+export class GetEnsNameCommand extends Command<Payload, string | null> {
+  public readonly name = 'GetEnsNameCommand' as const;
+
+  constructor(public payload: Payload) {
+    super();
+  }
+
+  async handle() {
+    try {
+      const client = createPublicClient({
+        chain: { ...mainnet },
+        transport: http('https://eth.llamarpc.com'),
+      });
+      const result = await client.getEnsName(this.payload);
+
+      return new OkResult(result);
+    } catch (error) {
+      this.captureException(error);
+      if (error instanceof HandlerError) {
+        return new FailureResult(error.message);
+      }
+
+      return new FailureResult();
+    }
+  }
+}