Merge pull request #5 from h0tw4t3r/fix/compare-traders-address-to-auth-response

fix: compare auth response with trader instance address

Author: nickadamson

src/entities/cli-trader/base-trader.ts

@@ -17,7 +17,7 @@ import {
 } from 'viem';
 import type { ERC20Contract } from '../contracts/erc20';
 import type { SimulatedTxRequest } from '../../types';
-import { handleGRPCRequest, authClient, createSIWEMessage } from '../../utils';
+import { handleGRPCRequest, authClient, createSIWEMessage, fromH160ToAddress } from '../../utils';
 import type { CLEAR_ADDRESS, SEAPORT_ADDRESS } from '../../constants';
 import type { ClearinghouseContract } from '../contracts/clearinghouse';
 
@@ -31,12 +31,10 @@ export class Trader {
   public chain: Chain;
   public authenticated = false;
   public publicClient: PublicClient<Transport, Chain>;
-  public walletClient: WalletClient; //<Transport, Chain, PrivateKeyAccount>;
+  public walletClient: WalletClient;
 
   /** cached results */
-  // { [ERC20_ADDRESS]: BALANCE}
   private erc20Balances = new Map<Address, bigint>();
-  // { [ERC20_ADDRESS]: { [CLEAR_ADDRESS]: APPROVED_AMOUNT, [SEAPORT_ADDRESS]: APPROVED_AMOUNT } }
   private erc20Allowances = new Map<
     Address,
     {
@@ -96,7 +94,8 @@ export class Trader {
     const res = await handleGRPCRequest(async () =>
       authClient.authenticate({}),
     );
-    this.authenticated = res !== null;
+    if (res) this.authenticated = fromH160ToAddress(res).toLowerCase() === this.account.address.toLowerCase()
+    return this.authenticated;
   }
 
   public async verifyWithSIWE(message: string, signature: `0x${string}`) {
@@ -108,7 +107,8 @@ export class Trader {
         }),
       }),
     );
-    return { verified: res !== null };
+    if (res) return {verified: fromH160ToAddress(res).toLowerCase() === this.account.address.toLowerCase()}
+    return { verified: null };
   }
 
   public async createAndSignMessage(nonce: string) {