@xchainjs/xchain-thorchain 3.0.4 → 3.0.6

package/lib/index.esm.js

@@ -6,10 +6,10 @@ import { Client as Client$1, bech32ToBase64, MsgTypes, makeClientPath, base64ToB
 import { getSeed } from '@xchainjs/xchain-crypto';
 import { toWords, encode } from 'bech32';
 import { BigNumber } from 'bignumber.js';
-import { fromSeed } from 'bip32';
+import { HDKey } from '@scure/bip32';
 import { TxRaw } from 'cosmjs-types/cosmos/tx/v1beta1/tx';
 import { createHash } from 'crypto';
-import { publicKeyCreate } from 'secp256k1';
+import * as secp from '@bitcoin-js/tiny-secp256k1-asmjs';
 import { assetToString, isSynthAsset, isSecuredAsset, AssetType, assetToBase, assetAmount, eqAsset, assetFromString, assetFromStringEx } from '@xchainjs/xchain-util';
 import { Network } from '@xchainjs/xchain-client';
 import * as minimal from 'protobufjs/minimal';
@@ -3479,12 +3479,14 @@ class ClientKeystore extends Client {
      */
     getAddress(walletIndex) {
         const seed = getSeed(this.phrase);
-        const node = fromSeed(seed);
-        const child = node.derivePath(this.getFullDerivationPath(walletIndex || 0));
+        const node = HDKey.fromMasterSeed(seed);
+        const child = node.derive(this.getFullDerivationPath(walletIndex || 0));
         if (!child.privateKey)
             throw new Error('child does not have a privateKey');
         // TODO: Make this method async and use CosmosJS official address generation strategy
-        const pubKey = publicKeyCreate(child.privateKey);
+        const pubKey = secp.pointFromScalar(child.privateKey, true);
+        if (!pubKey)
+            throw new Error('pubKey is null');
         const rawAddress = this.hash160(Uint8Array.from(pubKey));
         const words = toWords(Buffer.from(rawAddress));
         const address = encode(this.prefix, words);

package/lib/index.js

@@ -8,10 +8,10 @@ var xchainCosmosSdk = require('@xchainjs/xchain-cosmos-sdk');
 var xchainCrypto = require('@xchainjs/xchain-crypto');
 var bech32 = require('bech32');
 var bignumber_js = require('bignumber.js');
-var bip32 = require('bip32');
+var bip32 = require('@scure/bip32');
 var tx = require('cosmjs-types/cosmos/tx/v1beta1/tx');
 var crypto = require('crypto');
-var secp256k1 = require('secp256k1');
+var secp = require('@bitcoin-js/tiny-secp256k1-asmjs');
 var xchainUtil = require('@xchainjs/xchain-util');
 var xchainClient = require('@xchainjs/xchain-client');
 var minimal = require('protobufjs/minimal');
@@ -40,6 +40,7 @@ function _interopNamespace(e) {
     return Object.freeze(n);
 }
 
+var secp__namespace = /*#__PURE__*/_interopNamespace(secp);
 var minimal__namespace = /*#__PURE__*/_interopNamespace(minimal);
 var axios__default = /*#__PURE__*/_interopDefault(axios);
 var THORChainApp__default = /*#__PURE__*/_interopDefault(THORChainApp);
@@ -3505,12 +3506,14 @@ class ClientKeystore extends Client {
      */
     getAddress(walletIndex) {
         const seed = xchainCrypto.getSeed(this.phrase);
-        const node = bip32.fromSeed(seed);
-        const child = node.derivePath(this.getFullDerivationPath(walletIndex || 0));
+        const node = bip32.HDKey.fromMasterSeed(seed);
+        const child = node.derive(this.getFullDerivationPath(walletIndex || 0));
         if (!child.privateKey)
             throw new Error('child does not have a privateKey');
         // TODO: Make this method async and use CosmosJS official address generation strategy
-        const pubKey = secp256k1.publicKeyCreate(child.privateKey);
+        const pubKey = secp__namespace.pointFromScalar(child.privateKey, true);
+        if (!pubKey)
+            throw new Error('pubKey is null');
         const rawAddress = this.hash160(Uint8Array.from(pubKey));
         const words = bech32.toWords(Buffer.from(rawAddress));
         const address = bech32.encode(this.prefix, words);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xchainjs/xchain-thorchain",
-  "version": "3.0.4",
+  "version": "3.0.6",
   "description": "Custom Thorchain client and utilities used by XChainJS clients",
   "keywords": [
     "THORChain",
@@ -34,25 +34,25 @@
     "generate:ThorchainMsgs": "./genMsgs.sh"
   },
   "dependencies": {
-    "@cosmjs/amino": "0.32.4",
-    "@cosmjs/crypto": "0.32.4",
-    "@cosmjs/encoding": "0.32.4",
-    "@cosmjs/math": "0.32.4",
-    "@cosmjs/proto-signing": "0.32.4",
-    "@cosmjs/stargate": "0.32.4",
-    "@ledgerhq/hw-transport": "6.30.6",
-    "@xchainjs/ledger-thorchain": "0.2.0",
-    "@xchainjs/xchain-client": "2.0.0",
-    "@xchainjs/xchain-cosmos-sdk": "2.0.0",
-    "@xchainjs/xchain-crypto": "1.0.0",
-    "@xchainjs/xchain-util": "2.0.0",
+    "@bitcoin-js/tiny-secp256k1-asmjs": "^2.2.3",
+    "@cosmjs/amino": "0.33.1",
+    "@cosmjs/crypto": "0.33.1",
+    "@cosmjs/encoding": "0.33.1",
+    "@cosmjs/math": "0.33.1",
+    "@cosmjs/proto-signing": "0.33.1",
+    "@cosmjs/stargate": "0.33.1",
+    "@ledgerhq/hw-transport": "^6.31.6",
+    "@scure/bip32": "^1.7.0",
+    "@xchainjs/ledger-thorchain": "0.3.0",
+    "@xchainjs/xchain-client": "2.0.2",
+    "@xchainjs/xchain-cosmos-sdk": "2.0.2",
+    "@xchainjs/xchain-crypto": "1.0.1",
+    "@xchainjs/xchain-util": "2.0.1",
     "axios": "1.8.4",
     "bech32": "^1.1.3",
-    "bignumber.js": "9.0.0",
-    "bip32": "^2.0.6",
+    "bignumber.js": "^9.0.0",
     "cosmjs-types": "0.9.0",
-    "protobufjs": "6.11.4",
-    "secp256k1": "5.0.1"
+    "protobufjs": "6.11.4"
   },
   "publishConfig": {
     "access": "public",