fix: bs58check v4 compatibility for Tron and UTXO derivation

packages/hdwallet-core/package.json

@@ -17,6 +17,7 @@
     "@shapeshiftoss/bitcoinjs-lib": "7.0.0-shapeshift.2",
     "@shapeshiftoss/proto-tx-builder": "0.10.0",
     "@solana/web3.js": "1.95.8",
+    "bs58check": "^4.0.0",
     "eip-712": "^1.0.0",
     "ethers": "5.7.2",
     "eventemitter2": "^5.0.1",

packages/hdwallet-core/src/utxoUtils.ts

@@ -1,4 +1,4 @@
-import { decode, encode } from "bs58check";
+import bs58check from "bs58check";
 
 import { BTCInputScriptType } from "./bitcoin";
 
@@ -70,15 +70,15 @@ export function convertXpubVersion(xpub: string, accountType: UtxoAccountType |
   if (!accountType) return xpub;
   if (!convertVersions.includes(xpub.substring(0, 4))) return xpub;
 
-  const payload = decode(xpub);
+  const payload = Buffer.from(bs58check.decode(xpub));
   const version = payload.subarray(0, 4);
   const desiredVersion = accountTypeToVersion(coin, accountType);
 
   if (version.compare(desiredVersion) !== 0) {
     // Get the key without the version code at the front
     const key = payload.subarray(4);
 
-    return encode(Buffer.concat([desiredVersion, key]));
+    return bs58check.encode(Buffer.concat([desiredVersion, key]));
   }
 
   return xpub;

packages/hdwallet-ledger/package.json

@@ -32,7 +32,7 @@
     "base64-js": "^1.5.1",
     "bchaddrjs": "^0.4.4",
     "bitcoinjs-message": "^2.0.0",
-    "bs58check": "2.1.2",
+    "bs58check": "^4.0.0",
     "ethereumjs-tx": "1.3.7",
     "ethereumjs-util": "^6.1.0",
     "ethers": "5.7.2",

packages/hdwallet-ledger/src/solana.ts

@@ -1,6 +1,6 @@
 import * as core from "@shapeshiftoss/hdwallet-core";
 import { PublicKey } from "@solana/web3.js";
-import * as bs58 from "bs58";
+import bs58 from "bs58";
 
 import { LedgerTransport } from "./transport";
 import { handleError } from "./utils";

packages/hdwallet-native/package.json

@@ -26,6 +26,7 @@
     "bip32": "^2.0.5",
     "bip39": "^3.0.2",
     "bnb-javascript-sdk-nobroadcast": "2.16.15",
+    "bs58check": "^4.0.0",
     "crypto-js": "^4.0.0",
     "ecpair": "^3.0.0-rc.0",
     "eip-712": "^1.0.0",

packages/hdwallet-native/src/crypto/isolation/adapters/tron.ts

@@ -1,6 +1,6 @@
 import { keccak256 } from "@ethersproject/keccak256";
 import * as core from "@shapeshiftoss/hdwallet-core";
-import * as bs58check from "bs58check";
+import bs58check from "bs58check";
 
 import { Isolation } from "../..";
 import { SecP256K1 } from "../core";

packages/hdwallet-native/src/crypto/isolation/engines/dummy/bip39.ts

@@ -1,5 +1,5 @@
 import { toArrayBuffer } from "@shapeshiftoss/hdwallet-core";
-import * as bs58check from "bs58check";
+import bs58check from "bs58check";
 
 import * as BIP32 from "../../core/bip32";
 import * as BIP39 from "../../core/bip39";