@swapkit/wallet-keystore 1.0.0-rc.2 → 1.0.0-rc.21

package/package.json

@@ -1,12 +1,14 @@
 {
   "author": "swapkit-oss-team",
   "dependencies": {
+    "crypto-js": "4.2.0",
     "blakejs": "1.2.1",
     "uuid": "9.0.0",
-    "@swapkit/types": "1.0.0-rc.0"
+    "@swapkit/types": "1.0.0-rc.6"
   },
   "description": "SwapKit Lib keystore",
   "devDependencies": {
+    "@rollup/plugin-node-resolve": "15.2.3",
     "@scure/bip39": "1.2.1",
     "@types/long": "4.0.2",
     "@types/uniqid": "5.3.2",
@@ -17,10 +19,10 @@
     "vite": "4.4.9",
     "vitest": "0.34.4",
     "@internal/config": "0.0.0-internal.0",
-    "@swapkit/helpers": "1.0.0-rc.0",
-    "@swapkit/toolbox-cosmos": "1.0.0-rc.1",
-    "@swapkit/toolbox-evm": "1.0.0-rc.1",
-    "@swapkit/toolbox-utxo": "1.0.0-rc.0"
+    "@swapkit/helpers": "1.0.0-rc.15",
+    "@swapkit/toolbox-cosmos": "1.0.0-rc.17",
+    "@swapkit/toolbox-evm": "1.0.0-rc.16",
+    "@swapkit/toolbox-utxo": "1.0.0-rc.16"
   },
   "eslintConfig": {
     "extends": "../../../internal/eslint-config"
@@ -45,10 +47,10 @@
     "@scure/bip39": "1.2.1",
     "ethers": "^6.7.1",
     "bitcoinjs-lib": "^5.2.0",
-    "@swapkit/helpers": "1.0.0-rc.0",
-    "@swapkit/toolbox-cosmos": "1.0.0-rc.1",
-    "@swapkit/toolbox-evm": "1.0.0-rc.1",
-    "@swapkit/toolbox-utxo": "1.0.0-rc.0"
+    "@swapkit/helpers": "1.0.0-rc.15",
+    "@swapkit/toolbox-cosmos": "1.0.0-rc.17",
+    "@swapkit/toolbox-evm": "1.0.0-rc.16",
+    "@swapkit/toolbox-utxo": "1.0.0-rc.16"
   },
   "publishConfig": {
     "access": "public"
@@ -57,7 +59,7 @@
   "repository": "https://github.com/thorswap/SwapKit.git",
   "type": "module",
   "types": "./dist/index.d.ts",
-  "version": "1.0.0-rc.2",
+  "version": "1.0.0-rc.21",
   "scripts": {
     "build": "vite build",
     "clean": "rm -rf dist vite.config.ts.* .turbo node_modules",

package/src/helpers.ts

@@ -1,4 +1,4 @@
-import { entropyToMnemonic, generateMnemonic } from '@scure/bip39';
+import { generateMnemonic } from '@scure/bip39';
 import { wordlist } from '@scure/bip39/wordlists/english';
 import { blake2bFinal, blake2bInit, blake2bUpdate } from 'blakejs';
 import crypto from 'crypto';
@@ -38,6 +38,7 @@ export type Keystore = {
  */
 const toHexByte = (byte: number) => (byte < 0x10 ? `0${byte.toString(16)}` : byte.toString(16));
 const toHex = (buffer: Buffer | Uint8Array) => Array.from(buffer).map(toHexByte).join('');
+const _isNode = () => typeof window === 'undefined';
 
 /**
  * Gets data's 256 bit blake hash.
@@ -61,7 +62,7 @@ const pbkdf2Async = async (
   digest: string,
 ) => {
   return new Promise<Buffer>((resolve, reject) => {
-    crypto.pbkdf2(passphrase, salt, iterations, keylen, digest, (err, drived) => {
+    crypto.pbkdf2(passphrase, salt, iterations, keylen, digest, (err: any, drived: any) => {
       if (err) {
         reject(err);
       } else {
@@ -71,10 +72,6 @@ const pbkdf2Async = async (
   });
 };
 
-const _isNode = () => {
-  return typeof window === 'undefined';
-};
-
 export const encryptToKeyStore = async (phrase: string, password: string) => {
   const ID = _isNode() ? require('uuid').v4() : uuidv4();
   const salt = crypto.randomBytes(32);
@@ -124,11 +121,7 @@ export const encryptToKeyStore = async (phrase: string, password: string) => {
 
 export const generatePhrase = (size = 12) => {
   const entropy = size === 12 ? 128 : 256;
-  if (_isNode()) {
-    return entropyToMnemonic(crypto.randomBytes(entropy / 8), wordlist);
-  } else {
-    return generateMnemonic(wordlist, entropy);
-  }
+  return generateMnemonic(wordlist, entropy);
 };
 
 export const decryptFromKeystore = async (keystore: Keystore, password: string) => {

package/src/keystore.ts

@@ -10,7 +10,7 @@ import type { Psbt } from 'bitcoinjs-lib';
 
 type KeystoreOptions = {
   ethplorerApiKey?: string;
-  utxoApiKey?: string;
+  blockchairApiKey?: string;
   covalentApiKey?: string;
   stagenet?: boolean;
 };
@@ -30,7 +30,7 @@ const getWalletMethodsForChain = async ({
   phrase,
   ethplorerApiKey,
   covalentApiKey,
-  utxoApiKey,
+  blockchairApiKey,
   index,
   stagenet,
 }: Params) => {
@@ -72,9 +72,8 @@ const getWalletMethodsForChain = async ({
     }
 
     case Chain.BitcoinCash: {
-      if (!utxoApiKey) throw new Error('UTXO API key not found');
       const { BCHToolbox } = await import('@swapkit/toolbox-utxo');
-      const toolbox = BCHToolbox({ rpcUrl, apiKey: utxoApiKey, apiClient: api });
+      const toolbox = BCHToolbox({ rpcUrl, apiKey: blockchairApiKey, apiClient: api });
       const keys = await toolbox.createKeysForPath({ phrase, derivationPath });
       const address = toolbox.getAddressFromKeys(keys);
 
@@ -106,7 +105,7 @@ const getWalletMethodsForChain = async ({
     case Chain.Bitcoin:
     case Chain.Dogecoin:
     case Chain.Litecoin: {
-      const params = { rpcUrl, apiKey: utxoApiKey, apiClient: api };
+      const params = { rpcUrl, apiKey: blockchairApiKey, apiClient: api };
 
       const { BTCToolbox, LTCToolbox, DOGEToolbox } = await import('@swapkit/toolbox-utxo');
 
@@ -179,6 +178,27 @@ const getWalletMethodsForChain = async ({
       };
     }
 
+    case Chain.Kujira: {
+      const { KujiraToolbox } = await import('@swapkit/toolbox-cosmos');
+      const toolbox = KujiraToolbox({ server: api });
+      const signer = await toolbox.getSigner(phrase);
+      const address = await toolbox.getAddressFromMnemonic(phrase);
+
+      const transfer = ({ assetValue, recipient, memo }: TransferParams) =>
+        toolbox.transfer({
+          from: address,
+          recipient,
+          signer,
+          assetValue,
+          memo,
+        });
+
+      return {
+        address,
+        walletMethods: { ...toolbox, transfer, getAddress: () => address },
+      };
+    }
+
     case Chain.Maya:
     case Chain.THORChain: {
       const { MayaToolbox, ThorchainToolbox } = await import('@swapkit/toolbox-cosmos');
@@ -215,7 +235,7 @@ const connectKeystore =
     addChain,
     apis,
     rpcUrls,
-    config: { covalentApiKey, ethplorerApiKey, utxoApiKey, stagenet },
+    config: { covalentApiKey, ethplorerApiKey, blockchairApiKey, utxoApiKey, stagenet },
   }: ConnectWalletParams) =>
   async (chains: Chain[], phrase: string, index: number = 0) => {
     const promises = chains.map(async (chain) => {
@@ -227,7 +247,7 @@ const connectKeystore =
         covalentApiKey,
         ethplorerApiKey,
         phrase,
-        utxoApiKey,
+        blockchairApiKey: blockchairApiKey || utxoApiKey,
         stagenet,
       });