-
Notifications
You must be signed in to change notification settings - Fork 300
WP-6380: resolve conflicts again #7266
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.
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
pengyuc-bitgo
merged 33 commits into
rel/latest
from
rel/latest-WP-6380-resolve-conflict-2
Oct 16, 2025
Merged
WP-6380: resolve conflicts again #7266
pengyuc-bitgo
merged 33 commits into
rel/latest
from
rel/latest-WP-6380-resolve-conflict-2
Oct 16, 2025
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- Add base TxIntentMismatchError class extending BitGoJsError - Add TxIntentMismatchRecipientError for recipient intent mismatches - Add TxIntentMismatchContractError for contract interaction intent mismatches - Add TxIntentMismatchApprovalError for token approval intent mismatches TICKET: WP-6187
This commit was generated by the vendor-github-repo script. Ticket: SC-3362
This commit removes unnecessary development and test files from the vendor directory. Ticket: SC-3362
Change class fields from private to protected to enable proper inheritance in BabylonBtcStakingManager. Issue: BTC-2143 Co-authored-by: llm-git <llm-git@ttll.de>
…thod to public Make the createBtcDelegationMsg method public to allow access from outside the BabylonBtcStakingManager class. Issue: BTC-2143 Co-authored-by: llm-git <llm-git@ttll.de>
… fork Update package name, version, and dependencies to support BitGo's fork of the babylonlabs BTC staking library. Simplified build configuration and updated Node.js version requirements. Issue: BTC-2143 Co-authored-by: llm-git <llm-git@ttll.de>
Add exports for babylon and staking utility functions needed by BitGo integration code. Issue: BTC-2143 Co-authored-by: llm-git <llm-git@ttll.de>
…ssage creation Add event channel parameter to the BabylonBtcStakingManager method that creates a protobuf message for BTC delegation. Issue: BTC-2143 Co-authored-by: llm-git <llm-git@ttll.de>
Issue: BTC-2143 Co-authored-by: llm-git <llm-git@ttll.de>
Issue: BTC-2143 Co-authored-by: llm-git <llm-git@ttll.de>
Remove deprecated methods `defaultSigHashType` and `verifySignature` in favor of using utxolib's functions directly. BREAKING CHANGE: Consumers must now use `utxolib.bitgo.getDefaultSigHash(network)` Issue: BTC-2676 Co-authored-by: llm-git <llm-git@ttll.de>
Import directly from bitgo module to prevent circular dependency error. Co-authored-by: llm-git <llm-git@ttll.de> Issue: BTC-2651
Issue: BTC-2651 Co-authored-by: llm-git <llm-git@ttll.de>
Add support for different file formats (.json, .hex, .txt) with proper type handling in fixture loading. Replace fs-extra with native fs.promises for better modularity. Issue: BTC-2651 Co-authored-by: llm-git <llm-git@ttll.de>
Add functionality to save PSBT fixtures in JSON format for testing. This helps to make the tests more robust and allows for easier debugging. Also rename `neutratedRootWalletKeys` to the more descriptive `rootWalletKeysXpubs` to better reflect its purpose. Issue: BTC-2651 Co-authored-by: llm-git <llm-git@ttll.de>
…ning-op feat(sdk-coin-opeth): support message signing for walletconnect
feat(sdk-coin-canton): added wallet initialize builder to the builder factory
…-api-v-2-coin-wallet-id-signtx-typed-routes test(express): added supertest for wallet signtx
feat(abstract-utxo): remove deprecated signature verification functions
Babylon cherry picks 2.5.7
feat(sdk-coin-ada) - remove fallback logic for token fee calculation
feat(utxo-lib): improve PSBT fixture handling and fix circular imports
feat(polyx): add rejectInstruction transaction
…st-for-api-v-1-wallet-id-fanoutunspents-typed-routes test(express): added supertest for fanoutUnspents
…tion-error-classes feat(sdk-core): add transaction intent mismatch errors
# Conflicts: # modules/utxo-staking/package.json
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Ticket: WP-6380