Skip to content

fix: gridplus derivation #764

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 10 commits into from
Dec 9, 2025
Merged

fix: gridplus derivation #764

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
1c6c879
fix: bs58check v4 compatibility for Tron and UTXO derivation
gomesalexandre Dec 8, 2025
6bc9161
chore: version packages to 1.62.24-alpha-ledger-tron.0
NeOMakinG Dec 9, 2025
929622f
chore: version packages to 1.62.24-alpha-ledger-tron.1
NeOMakinG Dec 9, 2025
8a8d724
fix: bs58check type issues in gridplus and keepkey osmosis
NeOMakinG Dec 9, 2025
7c226ff
Merge remote-tracking branch 'origin' into gridplus-derivation
NeOMakinG Dec 9, 2025
e9861d7
fix: conflicts
NeOMakinG Dec 9, 2025
d7ef4df
fix: conflicts
NeOMakinG Dec 9, 2025
f48e573
fix: conflicts
NeOMakinG Dec 9, 2025
9ad6c06
fix: bs58check v4 compatibility for Osmosis by using default import
gomesalexandre Dec 9, 2025
77211db
chore(release): publish 1.62.25
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-alpha-ledger-tron.1",
"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-alpha-ledger-tron.1",
"@shapeshiftoss/hdwallet-core": "^1.62.24-alpha-ledger-tron.1",
"@shapeshiftoss/hdwallet-keepkey": "^1.62.24-alpha-ledger-tron.1",
"@shapeshiftoss/hdwallet-keepkey-tcp": "^1.62.24-alpha-ledger-tron.1",
"@shapeshiftoss/hdwallet-keepkey-webusb": "^1.62.24-alpha-ledger-tron.1",
"@shapeshiftoss/hdwallet-keplr": "^1.62.24-alpha-ledger-tron.1",
"@shapeshiftoss/hdwallet-ledger": "^1.62.24-alpha-ledger-tron.1",
"@shapeshiftoss/hdwallet-ledger-webhid": "^1.62.24-alpha-ledger-tron.1",
"@shapeshiftoss/hdwallet-ledger-webusb": "^1.62.24-alpha-ledger-tron.1",
"@shapeshiftoss/hdwallet-metamask-multichain": "^1.62.24-alpha-ledger-tron.1",
"@shapeshiftoss/hdwallet-native": "^1.62.24-alpha-ledger-tron.1",
"@shapeshiftoss/hdwallet-phantom": "^1.62.24-alpha-ledger-tron.1",
"@shapeshiftoss/hdwallet-portis": "^1.62.24-alpha-ledger-tron.1",
"@shapeshiftoss/hdwallet-trezor": "^1.62.24-alpha-ledger-tron.1",
"@shapeshiftoss/hdwallet-trezor-connect": "^1.62.24-alpha-ledger-tron.1",
"@shapeshiftoss/hdwallet-vultisig": "^1.62.24-alpha-ledger-tron.1",
"@shapeshiftoss/hdwallet-walletconnect": "^1.62.24-alpha-ledger-tron.1",
"@shapeshiftoss/hdwallet-walletconnectv2": "^1.62.24-alpha-ledger-tron.1",
"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-alpha-ledger-tron.1",
"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-alpha-ledger-tron.1",
"@shapeshiftoss/hdwallet-keepkey": "^1.62.24-alpha-ledger-tron.1",
"@shapeshiftoss/hdwallet-keepkey-nodewebusb": "^1.62.24-alpha-ledger-tron.1",
"@shapeshiftoss/hdwallet-keepkey-tcp": "^1.62.24-alpha-ledger-tron.1",
"@shapeshiftoss/hdwallet-ledger": "^1.62.24-alpha-ledger-tron.1",
"@shapeshiftoss/hdwallet-metamask-multichain": "^1.62.24-alpha-ledger-tron.1",
"@shapeshiftoss/hdwallet-native": "^1.62.24-alpha-ledger-tron.1",
"@shapeshiftoss/hdwallet-portis": "^1.62.24-alpha-ledger-tron.1",
"@shapeshiftoss/hdwallet-trezor": "^1.62.24-alpha-ledger-tron.1",
"@shapeshiftoss/hdwallet-vultisig": "^1.62.24-alpha-ledger-tron.1",
"fast-json-stable-stringify": "^2.1.0",
"msw": "^0.27.1",
"whatwg-fetch": "^3.6.2"
Expand Down
9 changes: 7 additions & 2 deletions lerna.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
{
"lerna": "5.2.0",
"version": "1.62.23",
"version": "1.62.24-alpha-ledger-tron.1",
"npmClient": "yarn",
"useWorkspaces": true,
"command": {
"publish": {
"message": "chore(release): publish %v"
}
},
"ignoreChanges": ["**/__fixtures__/**", "**/__tests__/**", "**/*.md", "**/.env"]
"ignoreChanges": [
"**/__fixtures__/**",
"**/__tests__/**",
"**/*.md",
"**/.env"
]
}
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"author": "ShapeShift Open Source <oss@shapeshiftoss.io>",
"license": "MIT",
"engines": {
"node": "22.x"
"node": ">=22.x"
},
"workspaces": {
"packages": [
Expand Down
7 changes: 4 additions & 3 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-alpha-ledger-tron.1",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -15,11 +15,12 @@
},
"dependencies": {
"@coinbase/wallet-sdk": "^3.6.6",
"@shapeshiftoss/hdwallet-core": "1.62.23",
"@shapeshiftoss/hdwallet-core": "^1.62.24-alpha-ledger-tron.1",
"eth-rpc-errors": "^4.0.3",
"lodash": "^4.17.21"
},
"devDependencies": {
"@types/lodash": "^4.14.168"
}
},
"gitHead": "929622fc6fadb86c39290ba653291893ce3e7662"
}
6 changes: 4 additions & 2 deletions 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-alpha-ledger-tron.1",
"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 All @@ -27,5 +28,6 @@
"devDependencies": {
"@types/google-protobuf": "^3.15.1",
"@types/lodash": "^4.14.168"
}
},
"gitHead": "929622fc6fadb86c39290ba653291893ce3e7662"
}
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
8 changes: 5 additions & 3 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-alpha-ledger-tron.1",
Comment thread
gomesalexandre marked this conversation as resolved.
Outdated
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -20,9 +20,10 @@
"@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-alpha-ledger-tron.1",
"bech32": "^1.1.4",
"bs58": "^5.0.0",
"bs58check": "^4.0.0",
Comment thread
gomesalexandre marked this conversation as resolved.
"crypto-js": "^4.2.0",
"gridplus-sdk": "^3.2.0",
"lodash": "^4.17.21"
Expand All @@ -34,5 +35,6 @@
"nohoist": [
"@ethereumjs/common",
"@ethereumjs/tx"
]
],
"gitHead": "929622fc6fadb86c39290ba653291893ce3e7662"
}
4 changes: 2 additions & 2 deletions packages/hdwallet-gridplus/src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { pointCompress } from "@bitcoinerlab/secp256k1";
import * as bech32 from "bech32";
import * as bs58 from "bs58check";
import bs58check from "bs58check";
import CryptoJS from "crypto-js";

export const getCompressedPubkey = (pubkey: string | Buffer): Buffer => {
// Extended public key (xpub/ypub/zpub)
if (typeof pubkey === "string") return bs58.decode(pubkey).subarray(45, 78);
if (typeof pubkey === "string") return Buffer.from(bs58check.decode(pubkey).subarray(45, 78));

// Already compressed public key (33 bytes)
if (pubkey.length === 33) return pubkey;
Expand Down
9 changes: 5 additions & 4 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-alpha-ledger-tron.1",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,7 +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-alpha-ledger-tron.1",
"@shapeshiftoss/hdwallet-keepkey": "^1.62.24-alpha-ledger-tron.1"
},
"gitHead": "929622fc6fadb86c39290ba653291893ce3e7662"
}
7 changes: 4 additions & 3 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-alpha-ledger-tron.1",
"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-alpha-ledger-tron.1",
"uuid": "^8.3.2"
},
"peerDependencies": {
Expand All @@ -23,5 +23,6 @@
"devDependencies": {
"@types/uuid": "^8.3.0",
"electron": "^12.0.9"
}
},
"gitHead": "929622fc6fadb86c39290ba653291893ce3e7662"
}
7 changes: 4 additions & 3 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-alpha-ledger-tron.1",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,12 +14,13 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-keepkey": "1.62.23"
"@shapeshiftoss/hdwallet-keepkey": "^1.62.24-alpha-ledger-tron.1"
},
"peerDependencies": {
"node-hid": "^2.1.1"
},
"devDependencies": {
"@types/node-hid": "^1.3.1"
}
},
"gitHead": "929622fc6fadb86c39290ba653291893ce3e7662"
}
9 changes: 5 additions & 4 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-alpha-ledger-tron.1",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,13 +14,14 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-core": "1.62.23",
"@shapeshiftoss/hdwallet-keepkey": "1.62.23"
"@shapeshiftoss/hdwallet-core": "^1.62.24-alpha-ledger-tron.1",
"@shapeshiftoss/hdwallet-keepkey": "^1.62.24-alpha-ledger-tron.1"
},
"peerDependencies": {
"usb": "^2.3.1"
},
"devDependencies": {
"usb": "^2.3.1"
}
},
"gitHead": "929622fc6fadb86c39290ba653291893ce3e7662"
}
9 changes: 5 additions & 4 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-alpha-ledger-tron.1",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,8 +14,9 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-core": "1.62.23",
"@shapeshiftoss/hdwallet-keepkey": "1.62.23",
"@shapeshiftoss/hdwallet-core": "^1.62.24-alpha-ledger-tron.1",
"@shapeshiftoss/hdwallet-keepkey": "^1.62.24-alpha-ledger-tron.1",
"axios": "^0.21.1"
}
},
"gitHead": "929622fc6fadb86c39290ba653291893ce3e7662"
}
9 changes: 5 additions & 4 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-alpha-ledger-tron.1",
"license": "MIT",
"publishConfig": {
"access": "public"
Expand All @@ -14,10 +14,11 @@
"prepublishOnly": "yarn clean && yarn build"
},
"dependencies": {
"@shapeshiftoss/hdwallet-core": "1.62.23",
"@shapeshiftoss/hdwallet-keepkey": "1.62.23"
"@shapeshiftoss/hdwallet-core": "^1.62.24-alpha-ledger-tron.1",
"@shapeshiftoss/hdwallet-keepkey": "^1.62.24-alpha-ledger-tron.1"
},
"devDependencies": {
"@types/w3c-web-usb": "^1.0.4"
}
},
"gitHead": "929622fc6fadb86c39290ba653291893ce3e7662"
}
7 changes: 4 additions & 3 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-alpha-ledger-tron.1",
"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-alpha-ledger-tron.1",
"@shapeshiftoss/proto-tx-builder": "0.10.0",
"bignumber.js": "^9.0.1",
"bnb-javascript-sdk-nobroadcast": "2.16.15",
Expand All @@ -44,5 +44,6 @@
"@types/lodash": "^4.14.168",
"@types/semver": "^6.2.2",
"typedoc": "^0.20.36"
}
},
"gitHead": "929622fc6fadb86c39290ba653291893ce3e7662"
}
Loading