metamask: only detectEthereumProvider() once

shapeshift · Feb 11, 2022 · e615e8f · e615e8f
1 parent fc5e32f
commit e615e8f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/integration/src/wallets/metamask.ts b/integration/src/wallets/metamask.ts
@@ -10,8 +10,9 @@ export function createInfo(): core.HDWalletInfo {
 }
 
 export async function createWallet(): Promise<core.HDWallet> {
-  const wallet = new metamask.MetaMaskHDWallet();
-  await wallet.initialize();
+  const keyring = new core.Keyring();
+  const adapter = metamask.MetaMaskAdapter.useKeyring(keyring);
+  const wallet = await adapter.pairDevice()
   return wallet;
 }
 

diff --git a/packages/hdwallet-metamask/src/adapter.ts b/packages/hdwallet-metamask/src/adapter.ts
@@ -35,7 +35,7 @@ export class MetaMaskAdapter {
       throw error;
     }
     const wallet = new MetaMaskHDWallet();
-    await wallet.initialize();
+    await wallet.initialize(provider);
     const deviceID = await wallet.getDeviceID();
     this.keyring.add(wallet, deviceID);
     this.currentDeviceID = deviceID;

diff --git a/packages/hdwallet-metamask/src/metamask.ts b/packages/hdwallet-metamask/src/metamask.ts
@@ -77,14 +77,11 @@ export class MetaMaskHDWallet implements core.HDWallet, core.ETHWallet {
     return Promise.resolve("MetaMask");
   }
 
-  public async initialize(): Promise<any> {
-    try {
-      this.provider = await detectEthereumProvider({ mustBeMetaMask: true, silent: false, timeout: 3000 });
-    } catch (e) {
-      console.error(e);
-    }
-
-    return Promise.resolve();
+  public initialize(): never;
+  public initialize(provider: unknown): Promise<any>;
+  public async initialize(provider?: unknown): Promise<any> {
+    if (!provider) throw new Error("provider is required");
+    this.provider = provider;
   }
 
   public hasOnDevicePinEntry(): boolean {