Implement BIP 370 PSBTv2 #21283
Open
Implement BIP 370 PSBTv2 #21283
+1,031
−244
Conversation
This file contains 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
|
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers. Code CoverageFor detailed information about the code coverage, see the test coverage report. ReviewsSee the guideline for information on the review process.
If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update. ConflictsReviewers, this pull request conflicts with the following ones:
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first. |
This was referenced Feb 24, 2021
This was referenced Mar 4, 2021
adamjonas
reviewed
Mar 5, 2021
src/rpc/rawtransaction.cpp
Outdated
Comment on lines
1192
to
1193
| result.pushKV("input_count", psbtx.inputs.size()); | ||
| result.pushKV("output_count", psbtx.inputs.size()); |
There was a problem hiding this comment.
Getting a compile error consistent with the CI for these two lines:
rpc/rawtransaction.cpp:1192:16: error: call to member function 'pushKV' is ambiguous
result.pushKV("input_count", psbtx.inputs.size());
~~~~~~~^~~~~~
./univalue/include/univalue.h:127:10: note: candidate function
bool pushKV(const std::string& key, int64_t val_) {
^
./univalue/include/univalue.h:131:10: note: candidate function
bool pushKV(const std::string& key, uint64_t val_) {
^
./univalue/include/univalue.h:135:10: note: candidate function
bool pushKV(const std::string& key, bool val_) {
^
./univalue/include/univalue.h:139:10: note: candidate function
bool pushKV(const std::string& key, int val_) {
^
./univalue/include/univalue.h:143:10: note: candidate function
bool pushKV(const std::string& key, double val_) {
^
./univalue/include/univalue.h:118:10: note: candidate function
bool pushKV(const std::string& key, const UniValue& val);
^
./univalue/include/univalue.h:119:10: note: candidate function not viable: no known conversion from 'std::__1::vector<PSBTInput, std::__1::allocator<PSBTInput> >::size_type' (aka 'unsigned long') to 'const std::string' (aka 'const basic_string<char, char_traits<char>, allocator<char> >') for 2nd argument
bool pushKV(const std::string& key, const std::string& val_) {
^
./univalue/include/univalue.h:123:10: note: candidate function not viable: no known conversion from 'std::__1::vector<PSBTInput, std::__1::allocator<PSBTInput> >::size_type' (aka 'unsigned long') to 'const char *' for 2nd argument
bool pushKV(const std::string& key, const char *val_) {
^
rpc/rawtransaction.cpp:1193:16: error: call to member function 'pushKV' is ambiguous
result.pushKV("output_count", psbtx.inputs.size());
~~~~~~~^~~~~~
./univalue/include/univalue.h:127:10: note: candidate function
bool pushKV(const std::string& key, int64_t val_) {
^
./univalue/include/univalue.h:131:10: note: candidate function
bool pushKV(const std::string& key, uint64_t val_) {
^
./univalue/include/univalue.h:135:10: note: candidate function
bool pushKV(const std::string& key, bool val_) {
^
./univalue/include/univalue.h:139:10: note: candidate function
bool pushKV(const std::string& key, int val_) {
^
./univalue/include/univalue.h:143:10: note: candidate function
bool pushKV(const std::string& key, double val_) {
^
./univalue/include/univalue.h:118:10: note: candidate function
bool pushKV(const std::string& key, const UniValue& val);
^
./univalue/include/univalue.h:119:10: note: candidate function not viable: no known conversion from 'std::__1::vector<PSBTInput, std::__1::allocator<PSBTInput> >::size_type' (aka 'unsigned long') to 'const std::string' (aka 'const basic_string<char, char_traits<char>, allocator<char> >') for 2nd argument
bool pushKV(const std::string& key, const std::string& val_) {
^
./univalue/include/univalue.h:123:10: note: candidate function not viable: no known conversion from 'std::__1::vector<PSBTInput, std::__1::allocator<PSBTInput> >::size_type' (aka 'unsigned long') to 'const char *' for 2nd argument
bool pushKV(const std::string& key, const char *val_) {
^
2 errors generated.
There was a problem hiding this comment.
I can't replicate this error at all, but I think I have fixed it.
This was referenced Mar 6, 2021
achow101
force-pushed
the
psbt2
branch
2 times, most recently
from
21c991c
to
76ea5cc
Compare
achow101
force-pushed
the
psbt2
branch
6 times, most recently
from
c13bfdd
to
c50746a
Compare
Now that PSBTInput's track their own prevouts, there's no need for a PSBT global function to fetch input specific data.
Function to compute the lock time for the transaction
A helper function for getting the unsigned transaction regardless of psbt version.
The unique ID for PSBTv2 is different from v0. Use this function to get the ID without requiring the caller to know the version number.
Helper for getting the PSBTInput COutPoint
Use v2 for other RPCs. For some tests to work, PSBTv0 is set explicitly.
If we are asked to make a PSBTv0, we may not necessarily have made an unsigned transaction. So instead use GetUnsignedTx which will either fetch one that already exists, or construct a new one from the stored data. Internally we may be storing a PSBTv0 like a PSBTv2, but still want to serialize those as v0.
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.
BIP 370 PSBTv2 introduces several new fields and different invariants for PSBT. This PR implements those new fields and restructures the PSBT implementation to match PSBTv2 but still remain compatible with PSBTv0.