Fix bug of Discord's wallet not being detected

Author: edisontim

packages/controller/src/wallets/bridge.ts

@@ -1,3 +1,4 @@
+import { getAddress } from "ethers";
 import { ArgentWallet } from "./argent";
 import { MetaMaskWallet } from "./metamask";
 import { PhantomWallet } from "./phantom";
@@ -134,11 +135,12 @@ export class WalletBridge {
     let wallet: WalletAdapter | undefined;
     if (typeof identifier === "string") {
       // this is an address
+      const checkSummedAddress = getAddress(identifier);
+
       wallet = this.walletAdapters.values().find((adapter) => {
-        const ident = identifier.toLowerCase();
         return (
-          adapter.getConnectedAccounts().includes(ident) ||
-          adapter.type === ident
+          adapter.getConnectedAccounts().includes(checkSummedAddress) ||
+          adapter.type === checkSummedAddress
         );
       });
     } else {
@@ -149,7 +151,7 @@ export class WalletBridge {
       wallet = this.walletAdapters
         .values()
         .find((adapter) =>
-          adapter.getConnectedAccounts().includes(identifier.toLowerCase()),
+          adapter.getConnectedAccounts().includes(getAddress(identifier)),
         );
     }
 

packages/controller/src/wallets/index.ts

@@ -3,6 +3,5 @@ export * from "./bridge";
 export * from "./metamask";
 export * from "./phantom";
 export * from "./rabby";
-export * from "./turnkey";
 export * from "./types";
 export * from "./wallet-connect";

packages/controller/src/wallets/metamask/index.ts

@@ -1,4 +1,5 @@
 import { MetaMaskSDK } from "@metamask/sdk";
+import { getAddress } from "ethers/address";
 import { createStore } from "mipd";
 import {
   ExternalPlatform,
@@ -31,14 +32,20 @@ export class MetaMaskWallet implements WalletAdapter {
           })
           .then((accounts: any) => {
             if (accounts && accounts.length > 0) {
-              this.account = accounts[0];
-              this.connectedAccounts = accounts;
+              this.account = getAddress(accounts[0]);
+              this.connectedAccounts = accounts.map((account: string) =>
+                getAddress(account),
+              );
             }
           });
         this.MMSDK.getProvider()?.on("accountsChanged", (accounts: any) => {
           if (Array.isArray(accounts)) {
-            this.account = accounts?.[0];
-            this.connectedAccounts = accounts;
+            if (accounts.length > 0) {
+              this.account = getAddress(accounts?.[0]);
+            }
+            this.connectedAccounts = accounts.map((account: string) =>
+              getAddress(account),
+            );
           }
         });
       });
@@ -69,8 +76,8 @@ export class MetaMaskWallet implements WalletAdapter {
   }
 
   async connect(address?: string): Promise<ExternalWalletResponse<any>> {
-    if (address && this.connectedAccounts.includes(address)) {
-      this.account = address;
+    if (address && this.connectedAccounts.includes(getAddress(address))) {
+      this.account = getAddress(address);
     }
 
     if (this.account) {
@@ -84,8 +91,10 @@ export class MetaMaskWallet implements WalletAdapter {
 
       const accounts = await this.MMSDK.connect();
       if (accounts && accounts.length > 0) {
-        this.account = accounts[0];
-        this.connectedAccounts = accounts;
+        this.account = getAddress(accounts[0]);
+        this.connectedAccounts = accounts.map((account: string) =>
+          getAddress(account),
+        );
         return { success: true, wallet: this.type, account: this.account };
       }
 
@@ -141,7 +150,7 @@ export class MetaMaskWallet implements WalletAdapter {
 
       const result = await this.MMSDK.getProvider()?.request({
         method: "personal_sign",
-        params: [this.account!, message],
+        params: [this.account, message],
       });
 
       return { success: true, wallet: this.type, result };

packages/controller/src/wallets/rabby/index.ts

@@ -1,3 +1,4 @@
+import { getAddress } from "ethers/address";
 import { createStore, EIP6963ProviderDetail } from "mipd";
 import {
   ExternalPlatform,
@@ -31,10 +32,8 @@ export class RabbyWallet implements WalletAdapter {
     this.provider?.provider?.on("accountsChanged", (accounts: string[]) => {
       if (accounts) {
         // rabby doesn't allow multiple accounts to be connected at the same time
-        this.connectedAccounts = accounts.map((account) =>
-          account.toLowerCase(),
-        );
-        this.account = accounts?.[0]?.toLowerCase();
+        this.connectedAccounts = accounts.map((account) => getAddress(account));
+        this.account = getAddress(accounts?.[0]);
       }
     });
   }
@@ -58,8 +57,8 @@ export class RabbyWallet implements WalletAdapter {
   }
 
   async connect(address?: string): Promise<ExternalWalletResponse<any>> {
-    if (address && this.connectedAccounts.includes(address.toLowerCase())) {
-      this.account = address.toLowerCase();
+    if (address && this.connectedAccounts.includes(getAddress(address))) {
+      this.account = getAddress(address);
     }
 
     if (this.account) {

packages/controller/src/wallets/turnkey/index.ts

@@ -1,4 +1,5 @@
 import Provider from "@walletconnect/ethereum-provider";
+import { getAddress } from "ethers/address";
 import {
   ExternalPlatform,
   ExternalWallet,
@@ -17,7 +18,7 @@ export class WalletConnectWallet implements WalletAdapter {
     private provider: Provider,
     address?: string,
   ) {
-    this.account = address?.toLowerCase();
+    this.account = address ? getAddress(address) : undefined;
   }
 
   getConnectedAccounts(): string[] {

packages/controller/src/wallets/wallet-connect/index.ts

@@ -22,6 +22,7 @@
   },
   "dependencies": {
     "@auth0/auth0-react": "^2.3.0",
+    "@auth0/auth0-spa-js": "^2.1.3",
     "@cartridge/controller-wasm": "catalog:",
     "@cartridge/controller": "workspace:*",
     "@cartridge/penpal": "catalog:",
@@ -32,7 +33,7 @@
     "@starknet-io/types-js": "catalog:",
     "@stripe/react-stripe-js": "^2.8.1",
     "@stripe/stripe-js": "^4.8.0",
-    "@turnkey/sdk-browser": "^4.0.0",
+    "@turnkey/sdk-browser": "^4.1.0",
     "@turnkey/sdk-react": "^4.2.1",
     "@walletconnect/ethereum-provider": "^2.20.0",
     "base64url": "catalog:",

packages/keychain/package.json

@@ -2,10 +2,9 @@ import { IdToken } from "@auth0/auth0-react";
 import { jwtDecode, JwtPayload } from "jwt-decode";
 
 export const getOidcToken = async (
-  getIdTokenClaims: () => Promise<IdToken | undefined>,
+  tokenClaims: IdToken | undefined,
   expectedNonce: string,
 ) => {
-  const tokenClaims = await getIdTokenClaims();
   if (!tokenClaims) {
     throw new Error("Not authenticated with Auth0 yet");
   }