correctly creates metamask signer based on given web3 instance

Author: lukezhangstudio

src/dpos-user.ts

@@ -84,7 +84,7 @@ export class DPOSUser {
     loomAddress: string,
     version?: GatewayVersion
   ): Promise<DPOSUser> {
-    const wallet = getMetamaskSigner()
+    const wallet = getMetamaskSigner(web3.currentProvider)
     return DPOSUser.createUserAsync(
       wallet,
       dappchainEndpoint,
@@ -104,7 +104,7 @@ export class DPOSUser {
     gatewayAddress: string,
     loomAddress: string
   ): Promise<DPOSUser> {
-    const wallet = getMetamaskSigner()
+    const wallet = getMetamaskSigner(web3.currentProvider)
 
     const { client, address } = await createDefaultEthSignClientAsync(
       dappchainKey,

src/solidity-helpers.ts

@@ -18,11 +18,10 @@ export interface IEthereumSigner {
 /**
  * Returns the Metamask signer from web3 current provider
  */
-export function getMetamaskSigner(): ethers.Signer {
+export function getMetamaskSigner(provider: any): ethers.Signer {
   // HACK: force personal sign by pretending to be metamask no matter what the web3 provider is
-  ;(web3.currentProvider as any).isMetaMask = true
-  const provider = new ethers.providers.Web3Provider(web3.currentProvider)
-  return provider.getSigner()
+  provider.isMetaMask = true
+  return new ethers.providers.Web3Provider(provider).getSigner()
 }
 
 /**