diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-12-19 09:46:08 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-12-19 09:55:11 +0100 |
| commit | fee0370fd6e53234d230799bbbbe45eda5dcf630 (patch) | |
| tree | f4274d8776d0e082adaf4d6afdc299ab9b2c4068 /src/core_io.h | |
| parent | 483bb67253620014c7c6ec0f9197f1fd66badae3 (diff) | |
| parent | 6f39ac04375a5f6ef803da59ba0b606123d63142 (diff) | |
| download | bitcoin-fee0370fd6e53234d230799bbbbe45eda5dcf630.tar.xz | |
Merge #11178: Add iswitness parameter to decode- and fundrawtransaction RPCs
6f39ac0 Add test for decoderawtransaction bool (MeshCollider)
bbdbe80 Add iswitness parameter to decode- and fundrawtransaction RPCs (MeshCollider)
Pull request description:
Suggested in https://github.com/bitcoin/bitcoin/pull/10481#issuecomment-325244946, this adds the option to explicitly choose whether a serialized transaction should be decoded as a witness or non-witness transaction rather than relying on the heuristic checks in #10481. The parameter defaults to relying on #10481 if not included, but it overrides that if included.
Tree-SHA512: d4846a5bb7d64dc19c516445488b00af329fc1f4181d9dfdf9f2382a086568edc98250a4ac7594e24a1bc231dfdee53c699b12c8380c355b920a67cc6770b7a9
Diffstat (limited to 'src/core_io.h')
| -rw-r--r-- | src/core_io.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core_io.h b/src/core_io.h index 7ed84d6665..3cdae06dfb 100644 --- a/src/core_io.h +++ b/src/core_io.h @@ -20,7 +20,7 @@ class UniValue; // core_read.cpp CScript ParseScript(const std::string& s); std::string ScriptToAsmStr(const CScript& script, const bool fAttemptSighashDecode = false); -bool DecodeHexTx(CMutableTransaction& tx, const std::string& strHexTx, bool fTryNoWitness = false); +bool DecodeHexTx(CMutableTransaction& tx, const std::string& hex_tx, bool try_no_witness = false, bool try_witness = true); bool DecodeHexBlk(CBlock&, const std::string& strHexBlk); uint256 ParseHashUV(const UniValue& v, const std::string& strName); uint256 ParseHashStr(const std::string&, const std::string& strName); |