Skip to content

fix: bs58check v4 compatibility for Tron and UTXO derivation #763

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
gomesalexandre merged 3 commits into from
Dec 9, 2025
Merged

fix: bs58check v4 compatibility for Tron and UTXO derivation #763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1c6c879
fix: bs58check v4 compatibility for Tron and UTXO derivation
gomesalexandre Dec 8, 2025
52898bc
feat: yarn.lock
gomesalexandre Dec 9, 2025
16a2ffc
chore(release): publish 1.62.24
gomesalexandre Dec 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions examples/sandbox/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-sandbox",
"version": "1.62.23",
"version": "1.62.24",
"license": "MIT",
"private": true,
"browserslist": "> 0.5%, last 2 versions, not dead",
Expand All @@ -12,24 +12,24 @@
"dependencies": {
"@esm2cjs/p-queue": "^7.3.0",
"@metamask/eth-sig-util": "^7.0.0",
"@shapeshiftoss/hdwallet-coinbase": "1.62.23",
"@shapeshiftoss/hdwallet-core": "1.62.23",
"@shapeshiftoss/hdwallet-keepkey": "1.62.23",
"@shapeshiftoss/hdwallet-keepkey-tcp": "1.62.23",
"@shapeshiftoss/hdwallet-keepkey-webusb": "1.62.23",
"@shapeshiftoss/hdwallet-keplr": "1.62.23",
"@shapeshiftoss/hdwallet-ledger": "1.62.23",
"@shapeshiftoss/hdwallet-ledger-webhid": "1.62.23",
"@shapeshiftoss/hdwallet-ledger-webusb": "1.62.23",
"@shapeshiftoss/hdwallet-metamask-multichain": "1.62.23",
"@shapeshiftoss/hdwallet-native": "1.62.23",
"@shapeshiftoss/hdwallet-phantom": "1.62.23",
"@shapeshiftoss/hdwallet-portis": "1.62.23",
"@shapeshiftoss/hdwallet-trezor": "1.62.23",
"@shapeshiftoss/hdwallet-trezor-connect": "1.62.23",
"@shapeshiftoss/hdwallet-vultisig": "1.62.23",
"@shapeshiftoss/hdwallet-walletconnect": "1.62.23",
"@shapeshiftoss/hdwallet-walletconnectv2": "1.62.23",
"@shapeshiftoss/hdwallet-coinbase": "1.62.24",
"@shapeshiftoss/hdwallet-core": "1.62.24",
"@shapeshiftoss/hdwallet-keepkey": "1.62.24",
"@shapeshiftoss/hdwallet-keepkey-tcp": "1.62.24",
"@shapeshiftoss/hdwallet-keepkey-webusb": "1.62.24",
"@shapeshiftoss/hdwallet-keplr": "1.62.24",
"@shapeshiftoss/hdwallet-ledger": "1.62.24",
"@shapeshiftoss/hdwallet-ledger-webhid": "1.62.24",
"@shapeshiftoss/hdwallet-ledger-webusb": "1.62.24",
"@shapeshiftoss/hdwallet-metamask-multichain": "1.62.24",
"@shapeshiftoss/hdwallet-native": "1.62.24",
"@shapeshiftoss/hdwallet-phantom": "1.62.24",
"@shapeshiftoss/hdwallet-portis": "1.62.24",
"@shapeshiftoss/hdwallet-trezor": "1.62.24",
"@shapeshiftoss/hdwallet-trezor-connect": "1.62.24",
"@shapeshiftoss/hdwallet-vultisig": "1.62.24",
"@shapeshiftoss/hdwallet-walletconnect": "1.62.24",
"@shapeshiftoss/hdwallet-walletconnectv2": "1.62.24",
"bip32": "^2.0.4",
"eip-712": "^1.0.0",
"jquery": "^3.7.1",
Expand Down
22 changes: 11 additions & 11 deletions integration/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/integration",
"version": "1.62.23",
"version": "1.62.24",
"main": "index.js",
"license": "MIT",
"private": true,
Expand All @@ -11,16 +11,16 @@
},
"dependencies": {
"@bitcoinerlab/secp256k1": "^1.1.1",
"@shapeshiftoss/hdwallet-core": "1.62.23",
"@shapeshiftoss/hdwallet-keepkey": "1.62.23",
"@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.62.23",
"@shapeshiftoss/hdwallet-keepkey-tcp": "1.62.23",
"@shapeshiftoss/hdwallet-ledger": "1.62.23",
"@shapeshiftoss/hdwallet-metamask-multichain": "1.62.23",
"@shapeshiftoss/hdwallet-native": "1.62.23",
"@shapeshiftoss/hdwallet-portis": "1.62.23",
"@shapeshiftoss/hdwallet-trezor": "1.62.23",
"@shapeshiftoss/hdwallet-vultisig": "1.62.23",
"@shapeshiftoss/hdwallet-core": "1.62.24",
"@shapeshiftoss/hdwallet-keepkey": "1.62.24",
"@shapeshiftoss/hdwallet-keepkey-nodewebusb": "1.62.24",
"@shapeshiftoss/hdwallet-keepkey-tcp": "1.62.24",
"@shapeshiftoss/hdwallet-ledger": "1.62.24",
"@shapeshiftoss/hdwallet-metamask-multichain": "1.62.24",
"@shapeshiftoss/hdwallet-native": "1.62.24",
"@shapeshiftoss/hdwallet-portis": "1.62.24",
"@shapeshiftoss/hdwallet-trezor": "1.62.24",
"@shapeshiftoss/hdwallet-vultisig": "1.62.24",
"fast-json-stable-stringify": "^2.1.0",
"msw": "^0.27.1",
"whatwg-fetch": "^3.6.2"
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"lerna": "5.2.0",
"version": "1.62.23",
"version": "1.62.24",
"npmClient": "yarn",
"useWorkspaces": true,
"command": {
Expand Down
4 changes: 2 additions & 2 deletions packages/hdwallet-coinbase/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-coinbase",
"version": "1.62.23",
"version": "1.62.24",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -15,7 +15,7 @@
},
"dependencies": {
"@coinbase/wallet-sdk": "^3.6.6",
"@shapeshiftoss/hdwallet-core": "1.62.23",
"@shapeshiftoss/hdwallet-core": "1.62.24",
"eth-rpc-errors": "^4.0.3",
"lodash": "^4.17.21"
},
Expand Down
3 changes: 2 additions & 1 deletion packages/hdwallet-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-core",
"version": "1.62.23",
"version": "1.62.24",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions packages/hdwallet-core/src/utxoUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { decode, encode } from "bs58check";
import bs58check from "bs58check";

import { BTCInputScriptType } from "./bitcoin";

Expand Down Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions packages/hdwallet-gridplus/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-gridplus",
"version": "1.62.23",
"version": "1.62.24",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -20,7 +20,7 @@
"@ethereumjs/rlp": "5.0.2",
"@ethereumjs/tx": "5.4.0",
"@metamask/eth-sig-util": "^7.0.0",
"@shapeshiftoss/hdwallet-core": "1.62.23",
"@shapeshiftoss/hdwallet-core": "1.62.24",
"bech32": "^1.1.4",
"bs58": "^5.0.0",
"crypto-js": "^4.2.0",
Expand Down
6 changes: 3 additions & 3 deletions packages/hdwallet-keepkey-chromeusb/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keepkey-chromeusb",
"version": "1.62.23",
"version": "1.62.24",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,7 +14,7 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-core": "1.62.23",
"@shapeshiftoss/hdwallet-keepkey": "1.62.23"
"@shapeshiftoss/hdwallet-core": "1.62.24",
"@shapeshiftoss/hdwallet-keepkey": "1.62.24"
}
}
4 changes: 2 additions & 2 deletions packages/hdwallet-keepkey-electron/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keepkey-electron",
"version": "1.62.23",
"version": "1.62.24",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,7 +14,7 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-keepkey": "1.62.23",
"@shapeshiftoss/hdwallet-keepkey": "1.62.24",
"uuid": "^8.3.2"
},
"peerDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions packages/hdwallet-keepkey-nodehid/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keepkey-nodehid",
"version": "1.62.23",
"version": "1.62.24",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,7 +14,7 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-keepkey": "1.62.23"
"@shapeshiftoss/hdwallet-keepkey": "1.62.24"
},
"peerDependencies": {
"node-hid": "^2.1.1"
Expand Down
6 changes: 3 additions & 3 deletions packages/hdwallet-keepkey-nodewebusb/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keepkey-nodewebusb",
"version": "1.62.23",
"version": "1.62.24",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,8 +14,8 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-core": "1.62.23",
"@shapeshiftoss/hdwallet-keepkey": "1.62.23"
"@shapeshiftoss/hdwallet-core": "1.62.24",
"@shapeshiftoss/hdwallet-keepkey": "1.62.24"
},
"peerDependencies": {
"usb": "^2.3.1"
Expand Down
6 changes: 3 additions & 3 deletions packages/hdwallet-keepkey-tcp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keepkey-tcp",
"version": "1.62.23",
"version": "1.62.24",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,8 +14,8 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-core": "1.62.23",
"@shapeshiftoss/hdwallet-keepkey": "1.62.23",
"@shapeshiftoss/hdwallet-core": "1.62.24",
"@shapeshiftoss/hdwallet-keepkey": "1.62.24",
"axios": "^0.21.1"
}
}
6 changes: 3 additions & 3 deletions packages/hdwallet-keepkey-webusb/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keepkey-webusb",
"version": "1.62.23",
"version": "1.62.24",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,8 +14,8 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-core": "1.62.23",
"@shapeshiftoss/hdwallet-keepkey": "1.62.23"
"@shapeshiftoss/hdwallet-core": "1.62.24",
"@shapeshiftoss/hdwallet-keepkey": "1.62.24"
},
"devDependencies": {
"@types/w3c-web-usb": "^1.0.4"
Expand Down
4 changes: 2 additions & 2 deletions packages/hdwallet-keepkey/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keepkey",
"version": "1.62.23",
"version": "1.62.24",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -21,7 +21,7 @@
"@keepkey/device-protocol": "7.13.4",
"@metamask/eth-sig-util": "^7.0.0",
"@shapeshiftoss/bitcoinjs-lib": "7.0.0-shapeshift.2",
"@shapeshiftoss/hdwallet-core": "1.62.23",
"@shapeshiftoss/hdwallet-core": "1.62.24",
"@shapeshiftoss/proto-tx-builder": "0.10.0",
"bignumber.js": "^9.0.1",
"bnb-javascript-sdk-nobroadcast": "2.16.15",
Expand Down
4 changes: 2 additions & 2 deletions packages/hdwallet-keplr/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-keplr",
"version": "1.62.23",
"version": "1.62.24",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -17,7 +17,7 @@
"@cosmjs/amino": "^0.28.13",
"@cosmjs/stargate": "^0.28.13",
"@shapeshiftoss/caip": "8.15.0",
"@shapeshiftoss/hdwallet-core": "1.62.23",
"@shapeshiftoss/hdwallet-core": "1.62.24",
"@shapeshiftoss/proto-tx-builder": "0.10.0",
"@shapeshiftoss/types": "3.1.3",
"base64-js": "^1.5.1",
Expand Down
6 changes: 3 additions & 3 deletions packages/hdwallet-ledger-webhid/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-ledger-webhid",
"version": "1.62.23",
"version": "1.62.24",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -18,8 +18,8 @@
"@ledgerhq/hw-app-eth": "^6.45.13",
"@ledgerhq/hw-transport": "6.31.8",
"@ledgerhq/hw-transport-webhid": "^6.30.4",
"@shapeshiftoss/hdwallet-core": "1.62.23",
"@shapeshiftoss/hdwallet-ledger": "1.62.23",
"@shapeshiftoss/hdwallet-core": "1.62.24",
"@shapeshiftoss/hdwallet-ledger": "1.62.24",
"@types/w3c-web-hid": "^1.0.2"
}
}
6 changes: 3 additions & 3 deletions packages/hdwallet-ledger-webusb/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-ledger-webusb",
"version": "1.62.23",
"version": "1.62.24",
Comment thread
gomesalexandre marked this conversation as resolved.
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -20,8 +20,8 @@
"@ledgerhq/hw-app-solana": "^7.5.1",
"@ledgerhq/hw-transport": "6.31.8",
"@ledgerhq/hw-transport-webusb": "6.29.8",
"@shapeshiftoss/hdwallet-core": "1.62.23",
"@shapeshiftoss/hdwallet-ledger": "1.62.23",
"@shapeshiftoss/hdwallet-core": "1.62.24",
"@shapeshiftoss/hdwallet-ledger": "1.62.24",
"@types/w3c-web-usb": "^1.0.4",
"p-queue": "^7.4.1"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/hdwallet-ledger/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-ledger",
"version": "1.62.23",
"version": "1.62.24",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -27,12 +27,12 @@
"@ledgerhq/logs": "6.13.0",
"@mysten/ledgerjs-hw-app-sui": "^0.7.0",
"@shapeshiftoss/bitcoinjs-lib": "7.0.0-shapeshift.2",
"@shapeshiftoss/hdwallet-core": "1.62.23",
"@shapeshiftoss/hdwallet-core": "1.62.24",
"@solana/web3.js": "1.95.8",
"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",
Expand Down
2 changes: 1 addition & 1 deletion packages/hdwallet-ledger/src/solana.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";
Expand Down
4 changes: 2 additions & 2 deletions packages/hdwallet-metamask-multichain/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@shapeshiftoss/hdwallet-metamask-multichain",
"version": "1.62.23",
"version": "1.62.24",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -17,7 +17,7 @@
"@metamask/detect-provider": "^1.2.0",
"@metamask/onboarding": "^1.0.1",
"@shapeshiftoss/common-api": "^9.3.0",
"@shapeshiftoss/hdwallet-core": "1.62.23",
"@shapeshiftoss/hdwallet-core": "1.62.24",
"@shapeshiftoss/metamask-snaps-adapter": "^1.0.12",
"@shapeshiftoss/metamask-snaps-types": "^1.0.12",
"eth-rpc-errors": "^4.0.3",
Expand Down
Loading