Replace bitcoind with corepc_node#1041
Merged
arminsabouri merged 3 commits intopayjoin:masterfrom Sep 5, 2025
Merged
Conversation
spacebear21
force-pushed
the
replace-bitcoind
branch
3 times, most recently
from
dad6c92 to
6ae837a
Compare
Collaborator
Pull Request Test Coverage Report for Build 17503708210Details
💛 - Coveralls |
spacebear21
force-pushed
the
replace-bitcoind
branch
from
6ae837a to
c95fccc
Compare
bitcoind is no longer maintained and is incompatible with newer versions of Bitcoin Core. corepc-node is the "official" successor (see deprecation notice on https://docs.rs/bitcoind/latest/bitcoind/). However, the the latest tagged release for corepc_node as of writing (0.8.0) contains several bugs when deserializing the [testmempoolaccept](rust-bitcoin/corepc#327), [walletprocesspsbt](rust-bitcoin/corepc#340), and [finalizepsbt](rust-bitcoin/corepc#326) RPC responses. The linked PRs fixed those issues, but haven't been included in a release yet. For now we can point to a specific git rev from https://github.com/rust-bitcoin/corepc to make those fixes available.
spacebear21
force-pushed
the
replace-bitcoind
branch
from
c95fccc to
117732d
Compare
spacebear21
changed the title
spacebear21
force-pushed
the
replace-bitcoind
branch
from
6daf7af to
1e97522
Compare
spacebear21
force-pushed
the
replace-bitcoind
branch
from
1e97522 to
ddc5264
Compare
arminsabouri
approved these changes
Sep 5, 2025
Collaborator
arminsabouri
left a comment
arminsabouri
left a comment
There was a problem hiding this comment.
utACK ddc5264
My only suggestion would be to replace the hardcoded u64 expecteded fee components with weight consts. That can be a left as a follow up or done in this PR. Shouldn't be a blocker.
| payjoin = { path = "payjoin" } | ||
| payjoin-directory = { path = "payjoin-directory" } | ||
| payjoin-test-utils = { path = "payjoin-test-utils" } | ||
| # TODO: Remove these patches once a new version (>0.8.0) is released to crates.io |
Collaborator
There was a problem hiding this comment.
Just a reminder to self to create an issue for a follow up
payjoin/tests/integration.rs
Outdated
| do_v1_to_v1(sender, receiver, true) | ||
| // tx_header_vbytes + inputs_vb + outputs_vb - 1 vb saved from signature grinding, | ||
| // at 1 sat/vb | ||
| let expected_fee = Amount::from_sat(10 + (148 * 2) + (31 * 2) - 1); |
Collaborator
There was a problem hiding this comment.
These are a bit hard to read and understand. Would bitcoin::Weight consts help?
Psuedocode:
let weight = Weight::new(NON_SEGWIT_TX_HEADER + (LEGACY_INPUT_WEIGHT * 2) + (P2WPKH_OUTPUT_WEIGHT * 2) - SIG_GRIDING_WEIGHT_SAVINGS))
let expected_fee = Amount::from(to_vsize(weight) * FeeRate::from_sat_vb(1))
spacebear21
force-pushed
the
replace-bitcoind
branch
from
ddc5264 to
6486282
Compare
Collaborator
Author
|
I had considered the const approach and decided it would be a lot of boilerplate just for tests, but it's actually not that bad and I agree it's more readable this way. Also, using |
Instead of dynamically calculating expected fees with weight predictions, hardcode the expected values and assert that the resulting fees match.
Now that we support later versions of bitcoin core, we can enable the taproot test.
spacebear21
force-pushed
the
replace-bitcoind
branch
from
6486282 to
9675c55
Compare
arminsabouri
approved these changes
Sep 5, 2025
Collaborator
arminsabouri
left a comment
arminsabouri
left a comment
There was a problem hiding this comment.
re-ACK
Thanks for making those changes
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
The first commit addresses #369 so we can include taproot integration tests ahead of 1.0. The second commit simplifies the fee calculations in the integration tests to simply hardcode expected fees and match those against the actual PSBT fee. Finally, the third commit enables the taproot test with the proper expected fee.
I used Claude Code to troubleshoot some errors and ideate, but rawdogged the actual code changes.
Pull Request Checklist
Please confirm the following before requesting review:
AI
in the body of this PR.