Skip to content

feat: use @shapeshiftoss/bitcoinjs-lib instead of @bitgo/utxo-lib for Ledger Zcash PSBTs #11374

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 19 commits into from
Dec 28, 2025
Merged

feat: use @shapeshiftoss/bitcoinjs-lib instead of @bitgo/utxo-lib for Ledger Zcash PSBTs #11374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
0d16c0c
fix: svg imports MIME type error
gomesalexandre Dec 11, 2025
f57ca79
feat: use @shapeshiftoss/bitcoinjs-lib for Ledger Zcash
gomesalexandre Dec 11, 2025
beda98d
fix: update hdwallet to 1.62.29-bitgo-removal.1
gomesalexandre Dec 11, 2025
622772a
fix: update hdwallet to 1.62.29-bitgo-removal.2
gomesalexandre Dec 11, 2025
30dfee6
fix: update hdwallet to 1.62.29-bitgo-removal.3
gomesalexandre Dec 11, 2025
8feeb8e
chore: bump hdwallet packages to 1.62.29
gomesalexandre Dec 11, 2025
14e7e06
[skip ci] placeholder commit for draft PR
gomesalexandre Dec 11, 2025
ba42643
Merge remote-tracking branch 'origin/develop' into feat_bitgo_bitcoin…
gomesalexandre Dec 16, 2025
602628b
chore: update hdwallet packages to 1.62.31-bitgo-bitcoinjs-lib.0
gomesalexandre Dec 16, 2025
5537477
chore: merge develop into feat_bitgo_bitcoinjs_lib
gomesalexandre Dec 16, 2025
e71d175
fix: extract blockHeight from Blockchair for Zcash Ledger consensus b…
gomesalexandre Dec 17, 2025
d5bfc50
fix(chain-adapters): pass blockHeight to Ledger only when positive
gomesalexandre Dec 28, 2025
cb73f34
docs(skill): add isAssetSupportedByWallet step to chain integration
gomesalexandre Dec 28, 2025
04c7acc
chore: merge origin/develop and bump hdwallet to 1.62.33 [skip ci]
gomesalexandre Dec 28, 2025
6a48ca3
chore: revert .yarnrc.yml to npmjs registry [skip ci]
gomesalexandre Dec 28, 2025
ca307a0
chore: bump hdwallet to 1.62.35 [skip ci]
gomesalexandre Dec 28, 2025
8a63776
feat: bump
gomesalexandre Dec 28, 2025
02c6801
Merge remote-tracking branch 'origin/develop' into feat_bitgo_bitcoin…
gomesalexandre Dec 28, 2025
2f90a27
Merge branch 'develop' into feat_bitgo_bitcoinjs_lib
gomesalexandre Dec 28, 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
36 changes: 18 additions & 18 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,24 +100,24 @@
"@shapeshiftoss/chain-adapters": "workspace:^",
"@shapeshiftoss/contracts": "workspace:^",
"@shapeshiftoss/errors": "workspace:^",
"@shapeshiftoss/hdwallet-coinbase": "1.62.32",
"@shapeshiftoss/hdwallet-core": "1.62.32",
"@shapeshiftoss/hdwallet-gridplus": "1.62.32",
"@shapeshiftoss/hdwallet-keepkey": "1.62.32",
"@shapeshiftoss/hdwallet-keepkey-webusb": "1.62.32",
"@shapeshiftoss/hdwallet-keplr": "1.62.32",
"@shapeshiftoss/hdwallet-ledger": "1.62.32",
"@shapeshiftoss/hdwallet-ledger-webhid": "1.62.32",
"@shapeshiftoss/hdwallet-ledger-webusb": "1.62.32",
"@shapeshiftoss/hdwallet-metamask-multichain": "1.62.32",
"@shapeshiftoss/hdwallet-native": "1.62.32",
"@shapeshiftoss/hdwallet-native-vault": "1.62.32",
"@shapeshiftoss/hdwallet-phantom": "1.62.32",
"@shapeshiftoss/hdwallet-trezor": "1.62.32",
"@shapeshiftoss/hdwallet-trezor-connect": "1.62.32",
"@shapeshiftoss/hdwallet-vultisig": "1.62.32",
"@shapeshiftoss/hdwallet-walletconnect": "1.62.32",
"@shapeshiftoss/hdwallet-walletconnectv2": "1.62.32",
"@shapeshiftoss/hdwallet-coinbase": "1.62.35",
"@shapeshiftoss/hdwallet-core": "1.62.35",
"@shapeshiftoss/hdwallet-gridplus": "1.62.35",
"@shapeshiftoss/hdwallet-keepkey": "1.62.35",
"@shapeshiftoss/hdwallet-keepkey-webusb": "1.62.35",
"@shapeshiftoss/hdwallet-keplr": "1.62.35",
"@shapeshiftoss/hdwallet-ledger": "1.62.35",
"@shapeshiftoss/hdwallet-ledger-webhid": "1.62.35",
"@shapeshiftoss/hdwallet-ledger-webusb": "1.62.35",
"@shapeshiftoss/hdwallet-metamask-multichain": "1.62.35",
"@shapeshiftoss/hdwallet-native": "1.62.35",
"@shapeshiftoss/hdwallet-native-vault": "1.62.35",
"@shapeshiftoss/hdwallet-phantom": "1.62.35",
"@shapeshiftoss/hdwallet-trezor": "1.62.35",
"@shapeshiftoss/hdwallet-trezor-connect": "1.62.35",
"@shapeshiftoss/hdwallet-vultisig": "1.62.35",
"@shapeshiftoss/hdwallet-walletconnect": "1.62.35",
"@shapeshiftoss/hdwallet-walletconnectv2": "1.62.35",
"@shapeshiftoss/swapper": "workspace:^",
"@shapeshiftoss/types": "workspace:^",
"@shapeshiftoss/unchained-client": "workspace:^",
Expand Down
4 changes: 2 additions & 2 deletions packages/chain-adapters/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
"dependencies": {
"@mysten/sui": "1.45.0",
"@shapeshiftoss/caip": "workspace:^",
"@shapeshiftoss/hdwallet-core": "1.62.32",
"@shapeshiftoss/hdwallet-ledger": "1.62.32",
"@shapeshiftoss/hdwallet-core": "1.62.35",
"@shapeshiftoss/hdwallet-ledger": "1.62.35",
"@shapeshiftoss/types": "workspace:^",
"@shapeshiftoss/unchained-client": "workspace:^",
"@shapeshiftoss/utils": "workspace:^",
Expand Down
11 changes: 8 additions & 3 deletions packages/chain-adapters/src/utxo/UtxoBaseAdapter.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,9 @@ export abstract class UtxoBaseAdapter<T extends UtxoChainId> implements IChainAd
if (!response.ok || data.error) {
throw new Error(`Blockchair API error: ${data.error || response.statusText}`)
}
return { hex: data.data[input.txid].raw_transaction }
return {
hex: data.data[input.txid].raw_transaction,
}
}
throw error
}
Expand All @@ -372,9 +374,12 @@ export abstract class UtxoBaseAdapter<T extends UtxoChainId> implements IChainAd
txid: input.txid,
hex: data.hex,
// For Zcash, we need to pass the blockHeight and txid of each input transaction
// so Ledger can add them to the PSBT and determine the correct consensus branch ID
// so Ledger can add them to the PSBT and determine the correct consensus branch ID.
// Only pass blockHeight if it's a valid positive number (mempool txs have blockHeight: -1)
...(this.coinName === 'Zcash' &&
'blockHeight' in data && { blockHeight: data.blockHeight }),
'blockHeight' in data &&
typeof data.blockHeight === 'number' &&
data.blockHeight > 0 && { blockHeight: data.blockHeight }),
})
}

Expand Down
2 changes: 1 addition & 1 deletion packages/swapper/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"@shapeshiftoss/caip": "workspace:^",
"@shapeshiftoss/chain-adapters": "workspace:^",
"@shapeshiftoss/contracts": "workspace:^",
"@shapeshiftoss/hdwallet-core": "1.62.32",
"@shapeshiftoss/hdwallet-core": "1.62.35",
"@shapeshiftoss/types": "workspace:^",
"@shapeshiftoss/unchained-client": "workspace:^",
"@shapeshiftoss/utils": "workspace:^",
Expand Down
Loading