@swapkit/wallet-keystore 1.4.5 → 1.5.0

package/package.json

@@ -1,13 +1,13 @@
 {
   "dependencies": {
     "@scure/bip39": "1.3.0",
-    "@swapkit/helpers": "2.2.0",
-    "@swapkit/toolbox-cosmos": "1.7.2",
-    "@swapkit/toolbox-evm": "1.7.10",
-    "@swapkit/toolbox-radix": "1.2.26",
-    "@swapkit/toolbox-solana": "1.3.11",
-    "@swapkit/toolbox-substrate": "1.3.10",
-    "@swapkit/toolbox-utxo": "1.2.10",
+    "@swapkit/helpers": "2.3.0",
+    "@swapkit/toolbox-cosmos": "1.8.0",
+    "@swapkit/toolbox-evm": "1.8.0",
+    "@swapkit/toolbox-radix": "1.2.28",
+    "@swapkit/toolbox-solana": "1.4.0",
+    "@swapkit/toolbox-substrate": "1.3.12",
+    "@swapkit/toolbox-utxo": "1.2.12",
     "blakejs": "1.2.1",
     "micro-key-producer": "0.7.1"
   },
@@ -34,5 +34,5 @@
   },
   "type": "module",
   "types": "./src/index.ts",
-  "version": "1.4.5"
+  "version": "1.5.0"
 }

package/src/helpers.ts

@@ -30,6 +30,7 @@ const blake256 = (initData: Buffer | string): string => {
   let data = initData;
 
   if (!(data instanceof Buffer)) {
+    // @ts-ignore
     data = Buffer.from(data, "hex");
   }
 

package/src/keystore.ts

@@ -2,13 +2,17 @@ import {
   type AssetValue,
   Chain,
   type ConnectWalletParams,
+  CosmosChains,
   type DerivationPathArray,
+  EVMChains,
   NetworkDerivationPath,
+  UTXOChains,
   WalletOption,
   type WalletTxParams,
   type Witness,
   derivationPathToString,
   ensureEVMApiKeys,
+  filterSupportedChains,
   getRPCUrl,
   setRequestClientConfig,
   updatedLastIndex,
@@ -21,7 +25,14 @@ import type {
   UTXOWalletTransferParams,
 } from "@swapkit/toolbox-utxo";
 
-type KeystoreSupportedChain = Exclude<Chain, Chain.Fiat | Chain.Radix>;
+const KEYSTORE_SUPPORTED_CHAINS = [
+  ...EVMChains,
+  ...UTXOChains,
+  ...CosmosChains,
+  Chain.Polkadot,
+  Chain.Chainflip,
+  Chain.Solana,
+] as const;
 
 type KeystoreOptions = {
   ethplorerApiKey?: string;
@@ -57,7 +68,8 @@ const getWalletMethodsForChain = async ({
     case Chain.Ethereum:
     case Chain.Optimism:
     case Chain.Polygon: {
-      const { HDNodeWallet, getProvider, getToolboxByChain } = await import("@swapkit/toolbox-evm");
+      const { getProvider, getToolboxByChain } = await import("@swapkit/toolbox-evm");
+      const { HDNodeWallet } = await import("ethers");
 
       const keys = ensureEVMApiKeys({ chain, covalentApiKey, ethplorerApiKey });
       const provider = getProvider(chain, rpcUrl);
@@ -202,13 +214,19 @@ function connectKeystore({
   config: { thorswapApiKey, covalentApiKey, ethplorerApiKey, blockchairApiKey, stagenet },
 }: ConnectWalletParams) {
   return async function connectKeystore(
-    chains: KeystoreSupportedChain[],
+    chains: Chain[],
     phrase: string,
     derivationPathMapOrIndex?: { [chain in Chain]?: DerivationPathArray } | number,
   ) {
     setRequestClientConfig({ apiKey: thorswapApiKey });
 
-    const promises = chains.map(async (chain) => {
+    const supportedChains = filterSupportedChains(
+      chains,
+      KEYSTORE_SUPPORTED_CHAINS,
+      WalletOption.KEYSTORE,
+    );
+
+    const promises = supportedChains.map(async (chain) => {
       const derivationPathIndex =
         typeof derivationPathMapOrIndex === "number" ? derivationPathMapOrIndex : 0;