feat: add enable method for validation checks on strategies

InjectiveLabs · Nov 15, 2023 · a84d25b · a84d25b
1 parent 9fce77f
commit a84d25b
Show file tree

Hide file tree

Showing 18 changed files with 483 additions and 27 deletions.
diff --git a/packages/wallet-ts/package.json b/packages/wallet-ts/package.json
@@ -52,6 +52,7 @@
     "@solana/wallet-adapter-wallets": "^0.19.5",
     "@toruslabs/torus-embed": "^1.39.0",
     "@trezor/connect-web": "^9.0.6",
+    "@web3auth/torus-wallet-connector-plugin": "^7.1.1",
     "alchemy-sdk": "^2.6.3",
     "eip1193-provider": "^1.0.1",
     "eth-sig-util": "^3.0.1",

diff --git a/packages/wallet-ts/src/strategies/cosmos-wallet-strategy/CosmosWalletStrategy.ts b/packages/wallet-ts/src/strategies/cosmos-wallet-strategy/CosmosWalletStrategy.ts
@@ -91,6 +91,10 @@ export default class CosmosWalletStrategy {
     return this.getStrategy().getPubKey()
   }
 
+  public enable(): Promise<void> {
+    return this.getStrategy().enable()
+  }
+
   public getAddresses(): Promise<AccountAddress[]> {
     return this.getStrategy().getAddresses()
   }

diff --git a/packages/wallet-ts/src/strategies/cosmos-wallet-strategy/strategies/Cosmostation.ts b/packages/wallet-ts/src/strategies/cosmos-wallet-strategy/strategies/Cosmostation.ts
@@ -54,19 +54,15 @@ export default class Cosmostation implements ConcreteCosmosWalletStrategy {
     return Promise.resolve(WalletDeviceType.Browser)
   }
 
+  async enable() {
+    await new CosmostationWallet(this.chainId).checkChainIdSupport()
+  }
+
   async getAddresses(): Promise<string[]> {
     const { chainName } = this
     const cosmostationWallet = await this.getCosmostationWallet()
-    const cosmostationWalletUtil = new CosmostationWallet(this.chainId)
 
     try {
-      if (!(await cosmostationWalletUtil.checkChainIdSupport())) {
-        throw new CosmosWalletException(
-          new Error(`The ${this.chainId} is not supported on Cosmostation.`),
-          { type: ErrorType.WalletError },
-        )
-      }
-
       const accounts = await cosmostationWallet.requestAccount(chainName)
 
       return [accounts.address]
@@ -81,6 +77,10 @@ export default class Cosmostation implements ConcreteCosmosWalletStrategy {
         )
       }
 
+      if (e instanceof CosmosWalletException) {
+        throw e
+      }
+
       throw new CosmosWalletException(new Error((e as any).message), {
         code: UnspecifiedErrorCode,
         context: WalletAction.GetAccounts,

diff --git a/packages/wallet-ts/src/strategies/cosmos-wallet-strategy/strategies/Keplr.ts b/packages/wallet-ts/src/strategies/cosmos-wallet-strategy/strategies/Keplr.ts
@@ -38,6 +38,10 @@ export default class Keplr implements ConcreteCosmosWalletStrategy {
       : Promise.resolve(WalletDeviceType.Browser)
   }
 
+  async enable() {
+    await this.getKeplrWallet().checkChainIdSupport()
+  }
+
   async getAddresses(): Promise<string[]> {
     const keplrWallet = this.getKeplrWallet()
 
@@ -46,6 +50,10 @@ export default class Keplr implements ConcreteCosmosWalletStrategy {
 
       return accounts.map((account) => account.address)
     } catch (e: unknown) {
+      if (e instanceof CosmosWalletException) {
+        throw e
+      }
+
       throw new CosmosWalletException(new Error((e as any).message), {
         code: UnspecifiedErrorCode,
         context: WalletAction.GetAccounts,

diff --git a/packages/wallet-ts/src/strategies/cosmos-wallet-strategy/strategies/Leap.ts b/packages/wallet-ts/src/strategies/cosmos-wallet-strategy/strategies/Leap.ts
@@ -34,22 +34,22 @@ export default class Leap implements ConcreteCosmosWalletStrategy {
     return Promise.resolve(WalletDeviceType.Browser)
   }
 
+  async enable() {
+    await this.getLeapWallet().checkChainIdSupport()
+  }
+
   async getAddresses(): Promise<string[]> {
-    const { chainId } = this
     const leapWallet = this.getLeapWallet()
 
     try {
-      if (!(await leapWallet.checkChainIdSupport())) {
-        throw new CosmosWalletException(
-          new Error(`The ${chainId} is not supported on Leap.`),
-          { type: ErrorType.WalletError },
-        )
-      }
-
       const accounts = await leapWallet.getAccounts()
 
       return accounts.map((account) => account.address)
     } catch (e: unknown) {
+      if (e instanceof CosmosWalletException) {
+        throw e
+      }
+
       throw new CosmosWalletException(new Error((e as any).message), {
         code: UnspecifiedErrorCode,
         context: WalletAction.GetAccounts,

diff --git a/packages/wallet-ts/src/strategies/cosmos-wallet-strategy/strategies/Ninji.ts b/packages/wallet-ts/src/strategies/cosmos-wallet-strategy/strategies/Ninji.ts
@@ -34,22 +34,24 @@ export default class Ninji implements ConcreteCosmosWalletStrategy {
     return Promise.resolve(WalletDeviceType.Browser)
   }
 
+  async enable() {
+    await this.getNinjiWallet().checkChainIdSupport()
+  }
+
   async getAddresses(): Promise<string[]> {
-    const { chainId } = this
     const ninjiWallet = this.getNinjiWallet()
 
     try {
-      if (!(await ninjiWallet.checkChainIdSupport())) {
-        throw new CosmosWalletException(
-          new Error(`The ${chainId} is not supported on Ninji.`),
-          { type: ErrorType.WalletError },
-        )
-      }
+      await ninjiWallet.checkChainIdSupport()
 
       const accounts = await ninjiWallet.getAccounts()
 
       return accounts.map((account) => account.address)
     } catch (e: unknown) {
+      if (e instanceof CosmosWalletException) {
+        throw e
+      }
+
       throw new CosmosWalletException(new Error((e as any).message), {
         code: UnspecifiedErrorCode,
         context: WalletAction.GetAccounts,

diff --git a/packages/wallet-ts/src/strategies/types/strategy.ts b/packages/wallet-ts/src/strategies/types/strategy.ts
@@ -39,6 +39,12 @@ export interface ConcreteCosmosWalletStrategy {
    */
   getPubKey(): Promise<string>
 
+  /**
+   * Perform validations and checks
+   * for the wallet (if the chain is supported, etc)
+   */
+  enable(): Promise<void>
+
   /**
    * Sends Cosmos transaction. Returns a transaction hash
    * @param transaction should implement TransactionConfig

diff --git a/packages/wallet-ts/src/strategies/wallet-strategy/WalletStrategy.ts b/packages/wallet-ts/src/strategies/wallet-strategy/WalletStrategy.ts
@@ -156,6 +156,10 @@ export default class WalletStrategy {
     return this.getStrategy().getPubKey()
   }
 
+  public enable(): Promise<void> {
+    return this.getStrategy().enable()
+  }
+
   public getEthereumChainId(): Promise<string> {
     return this.getStrategy().getEthereumChainId()
   }

diff --git a/packages/wallet-ts/src/strategies/wallet-strategy/strategies/Cosmostation.ts b/packages/wallet-ts/src/strategies/wallet-strategy/strategies/Cosmostation.ts
@@ -43,6 +43,10 @@ export default class Cosmostation
     return Promise.resolve(WalletDeviceType.Browser)
   }
 
+  async enable(): Promise<void> {
+    //
+  }
+
   async getAddresses(): Promise<string[]> {
     const cosmostationWallet = await this.getCosmostationWallet()
 

diff --git a/packages/wallet-ts/src/strategies/wallet-strategy/strategies/Keplr.ts b/packages/wallet-ts/src/strategies/wallet-strategy/strategies/Keplr.ts
@@ -48,6 +48,10 @@ export default class Keplr
       : Promise.resolve(WalletDeviceType.Browser)
   }
 
+  async enable(): Promise<void> {
+    //
+  }
+
   async getAddresses(): Promise<string[]> {
     const keplrWallet = this.getKeplrWallet()
 

diff --git a/packages/wallet-ts/src/strategies/wallet-strategy/strategies/Leap.ts b/packages/wallet-ts/src/strategies/wallet-strategy/strategies/Leap.ts
@@ -43,6 +43,10 @@ export default class Leap
     return Promise.resolve(WalletDeviceType.Browser)
   }
 
+  async enable(): Promise<void> {
+    //
+  }
+
   async getAddresses(): Promise<string[]> {
     const { chainId } = this
     const leapWallet = this.getLeapWallet()

diff --git a/packages/wallet-ts/src/strategies/wallet-strategy/strategies/Ledger/Base.ts b/packages/wallet-ts/src/strategies/wallet-strategy/strategies/Ledger/Base.ts
@@ -79,6 +79,10 @@ export default class LedgerBase
     return Promise.resolve(WalletDeviceType.Hardware)
   }
 
+  async enable(): Promise<void> {
+    //
+  }
+
   public async getAddresses(): Promise<string[]> {
     const { baseDerivationPath, derivationPathType } = this
 

diff --git a/packages/wallet-ts/src/strategies/wallet-strategy/strategies/Metamask/index.ts b/packages/wallet-ts/src/strategies/wallet-strategy/strategies/Metamask/index.ts
@@ -35,6 +35,10 @@ export default class Metamask
     return Promise.resolve(WalletDeviceType.Browser)
   }
 
+  async enable(): Promise<void> {
+    //
+  }
+
   async getAddresses(): Promise<string[]> {
     const ethereum = await this.getEthereum()
 

diff --git a/packages/wallet-ts/src/strategies/wallet-strategy/strategies/Ninji.ts b/packages/wallet-ts/src/strategies/wallet-strategy/strategies/Ninji.ts
@@ -43,6 +43,10 @@ export default class Ninji
     return Promise.resolve(WalletDeviceType.Browser)
   }
 
+  async enable(): Promise<void> {
+    //
+  }
+
   async getAddresses(): Promise<string[]> {
     const { chainId } = this
     const ninjiWallet = this.getNinjiWallet()

diff --git a/packages/wallet-ts/src/strategies/wallet-strategy/strategies/Torus.ts b/packages/wallet-ts/src/strategies/wallet-strategy/strategies/Torus.ts
@@ -59,6 +59,10 @@ export default class Torus
     return Promise.resolve(WalletDeviceType.Browser)
   }
 
+  async enable(): Promise<void> {
+    //
+  }
+
   async connect(): Promise<void> {
     const { connected, torus, ethereumChainId } = this
 

diff --git a/packages/wallet-ts/src/strategies/wallet-strategy/strategies/Trezor/index.ts b/packages/wallet-ts/src/strategies/wallet-strategy/strategies/Trezor/index.ts
@@ -81,6 +81,10 @@ export default class Trezor
     return Promise.resolve(WalletDeviceType.Hardware)
   }
 
+  async enable(): Promise<void> {
+    //
+  }
+
   public async getAddresses(): Promise<string[]> {
     try {
       await this.trezor.connect()

diff --git a/packages/wallet-ts/src/strategies/wallet-strategy/strategies/TrustWallet/index.ts b/packages/wallet-ts/src/strategies/wallet-strategy/strategies/TrustWallet/index.ts
@@ -35,6 +35,10 @@ export default class TrustWallet
     return Promise.resolve(WalletDeviceType.Browser)
   }
 
+  async enable(): Promise<void> {
+    //
+  }
+
   async getAddresses(): Promise<string[]> {
     const ethereum = await this.getEthereum()