Samuel Dobson a24806c25d Merge #19215: psbt: Include and allow both non_witness_utxo and witness_utxo for segwit inputs ...

84d295e513 tests: Check that segwit inputs in psbt have both UTXO types (Andrew Chow)
4600479058 psbt: always put a non_witness_utxo and don't remove it (Andrew Chow)
5279d8bc07 psbt: Allow both non_witness_utxo and witness_utxo (Andrew Chow)
72f6bec1da rpc: show both UTXOs in decodepsbt (Andrew Chow)

Pull request description:

  Due to recent changes to hardware wallets, the full previous transaction will need to be provided for segwit inputs. Since some software may be checking for the existence of a `witness_utxo` to determine whether to produce a segwit signature, we keep that field to ease the transition.

  Because all of the sanity checks implemented by the `IsSane` functions were related to having mixed segwit and non-segwit data in a PSBT, those functions are removed as those checks are no longer proper.

  Some tests are updated/removed to accommodate this and a simple test added to check that both UTXOs are being added to segwit inputs.

  As discussed in the wallet IRC meeting, our own signer will not require `non_witness_utxo` for segwit inputs.

ACKs for top commit:
  Sjors:
    utACK 84d295e513 (didn't retest compared to 836d6fc, but fortunately HWI's CI tracks our master branch, with a bunch of hardware wallet simulators)
  ryanofsky:
    Code review re-ACK 84d295e513. No changes since last review, but now I understand the context better. I think it would good to improve the comments as suggested https://github.com/bitcoin/bitcoin/pull/19215#discussion_r447889473 and maybe refer to
  meshcollider:
    utACK 84d295e513

Tree-SHA512: ccc1fd3c16ac3859f5aca4fa489bd40f68be0b81bbdc4dd51188bbf28827a8642dc8b605a37318e5f16cf40f1c4910052dace2f27eca21bb58435f02a443e940

2020-07-03 09:23:22 +12:00

..

addition_overflow.cpp

tests: Add fuzzing harness for AdditionOverflow(...)

2020-04-08 14:45:27 +00:00

addrdb.cpp

Switch from Optional<T> to std::optional<T> (C++17). Run clang-format.

2020-05-14 18:52:57 +00:00

asmap_direct.cpp

Switch from Optional<T> to std::optional<T> (C++17). Run clang-format.

2020-05-14 18:52:57 +00:00

asmap.cpp

Switch from Optional<T> to std::optional<T> (C++17). Run clang-format.

2020-05-14 18:52:57 +00:00

base_encode_decode.cpp

scripted-diff: Bump copyright headers

2020-04-16 13:33:09 -04:00

bech32.cpp

…

block_header.cpp

Switch from Optional<T> to std::optional<T> (C++17). Run clang-format.

2020-05-14 18:52:57 +00:00

block.cpp

tests: Fill fuzzing coverage gaps for functions in consensus/validation.h

2020-05-14 18:45:42 +00:00

blockfilter.cpp

Switch from Optional<T> to std::optional<T> (C++17). Run clang-format.

2020-05-14 18:52:57 +00:00

bloom_filter.cpp

Switch from Optional<T> to std::optional<T> (C++17). Run clang-format.

2020-05-14 18:52:57 +00:00

chain.cpp

Switch from Optional<T> to std::optional<T> (C++17). Run clang-format.

2020-05-14 18:52:57 +00:00

checkqueue.cpp

Switch from Optional<T> to std::optional<T> (C++17). Run clang-format.

2020-05-14 18:52:57 +00:00

coins_view.cpp

tests: Add fuzzing harness for CCoinsViewCache

2020-05-25 10:05:06 +00:00

crypto_common.cpp

tests: Add fuzzing harness for {Read,Write}{LE,BE}{16,32,64} (crypto/common.h)

2020-06-11 14:05:54 +00:00

crypto.cpp

tests: Add fuzzing harness for CHash{160,256}, C{HMAC_,}SHA{1,256,512}, CRIPEMD160, CSipHasher, etc.

2020-06-15 18:14:50 +00:00

cuckoocache.cpp

Switch from Optional<T> to std::optional<T> (C++17). Run clang-format.

2020-05-14 18:52:57 +00:00

decode_tx.cpp

refactor: Replace HexStr(o.begin(), o.end()) with HexStr(o)

2020-06-24 18:41:45 +02:00

descriptor_parse.cpp

scripted-diff: Bump copyright headers

2020-04-16 13:33:09 -04:00

deserialize.cpp

scripted-diff: Bump copyright headers

2020-04-16 13:33:09 -04:00

eval_script.cpp

scripted-diff: Bump copyright headers

2020-04-16 13:33:09 -04:00

fee_rate.cpp

…

fees.cpp

Switch from Optional<T> to std::optional<T> (C++17). Run clang-format.

2020-05-14 18:52:57 +00:00

flatfile.cpp

Switch from Optional<T> to std::optional<T> (C++17). Run clang-format.

2020-05-14 18:52:57 +00:00

float.cpp

…

fuzz.cpp

tests: Provide main(...) function in fuzzer

2020-06-25 21:03:27 +00:00

fuzz.h

…

FuzzedDataProvider.h

…

golomb_rice.cpp

Switch from Optional<T> to std::optional<T> (C++17). Run clang-format.

2020-05-14 18:52:57 +00:00

hex.cpp

Switch from Optional<T> to std::optional<T> (C++17). Run clang-format.

2020-05-14 18:52:57 +00:00

http_request.cpp

fuzz: http_request workaround for libevent < 2.1.1

2020-04-17 19:00:19 +02:00

integer.cpp

Merge #18413: script: prevent UB when computing abs value for num opcode serialize

2020-05-02 21:24:05 +08:00

key_io.cpp

…

key.cpp

Merge #19114: scripted-diff: TxoutType C++11 scoped enum class

2020-06-28 14:20:00 -04:00

kitchen_sink.cpp

refactor: Error message bilingual_str consistency

2020-06-09 15:39:44 +02:00

locale.cpp

fuzz: fix unused variable compiler warning

2020-04-17 13:45:43 +02:00

merkleblock.cpp

Switch from Optional<T> to std::optional<T> (C++17). Run clang-format.

2020-05-14 18:52:57 +00:00

message.cpp

Switch from Optional<T> to std::optional<T> (C++17). Run clang-format.

2020-05-14 18:52:57 +00:00

multiplication_overflow.cpp

…

net_permissions.cpp

refactor: Error message bilingual_str consistency

2020-06-09 15:39:44 +02:00

netaddress.cpp

…

p2p_transport_deserializer.cpp

…

parse_hd_keypath.cpp

tests: Add fuzzing coverage for FormatHDKeypath(...) and WriteHDKeypath(...)

2020-04-26 20:23:56 +00:00

parse_iso8601.cpp

…

parse_numbers.cpp

…

parse_script.cpp

…

parse_univalue.cpp

scripted-diff: Bump copyright headers

2020-04-16 13:33:09 -04:00

policy_estimator.cpp

Switch from Optional<T> to std::optional<T> (C++17). Run clang-format.

2020-05-14 18:52:57 +00:00

pow.cpp

Switch from Optional<T> to std::optional<T> (C++17). Run clang-format.

2020-05-14 18:52:57 +00:00

prevector.cpp

Switch from Optional<T> to std::optional<T> (C++17). Run clang-format.

2020-05-14 18:52:57 +00:00

primitives_transaction.cpp

Switch from Optional<T> to std::optional<T> (C++17). Run clang-format.

2020-05-14 18:52:57 +00:00

process_message.cpp

net: Remove dead logging code

2020-06-16 06:57:39 -04:00

process_messages.cpp

Merge #18937: refactor: s/command/msg_type/ in CNetMsgMaker and CSerializedNetMsg

2020-06-19 06:54:24 -04:00

protocol.cpp

Switch from Optional<T> to std::optional<T> (C++17). Run clang-format.

2020-05-14 18:52:57 +00:00

psbt.cpp

psbt: Allow both non_witness_utxo and witness_utxo

2020-06-24 16:31:42 -04:00

random.cpp

tests: Add fuzzing harness for functions/classes in random.h

2020-03-29 13:17:04 +00:00

rbf.cpp

Switch from Optional<T> to std::optional<T> (C++17). Run clang-format.

2020-05-14 18:52:57 +00:00

rolling_bloom_filter.cpp

Switch from Optional<T> to std::optional<T> (C++17). Run clang-format.

2020-05-14 18:52:57 +00:00

script_bitcoin_consensus.cpp

tests: Add fuzzing harness for functions in script/bitcoinconsensus.h

2020-05-30 10:37:01 +00:00

script_descriptor_cache.cpp

tests: Add fuzzing harness for functions in script/descriptor.h

2020-05-30 10:37:01 +00:00

script_flags.cpp

scripted-diff: Bump copyright headers

2020-04-16 13:33:09 -04:00

script_interpreter.cpp

tests: Add fuzzing harness for functions in script/interpreter.h

2020-05-30 10:37:01 +00:00

script_ops.cpp

script: Remove undocumented and unused operator+

2020-04-15 10:01:55 -04:00

script_sigcache.cpp

tests: Add fuzzing harness for functions in script/sigcache.h

2020-05-30 10:37:01 +00:00

script_sign.cpp

tests: Add fuzzing harness for functions in script/sign.h

2020-05-30 10:37:01 +00:00

script.cpp

scripted-diff: TxoutType C++11 scoped enum class

2020-06-21 06:41:55 -04:00

scriptnum_ops.cpp

script: prevent UB when computing abs value for num opcode serialize

2020-04-09 08:32:00 +09:00

signature_checker.cpp

scripted-diff: Bump copyright headers

2020-04-16 13:33:09 -04:00

span.cpp

Simplify usage of Span in several places

2020-05-12 14:19:40 -07:00

spanparsing.cpp

Simplify usage of Span in several places

2020-05-12 14:19:40 -07:00

string.cpp

tests: Fill fuzzing coverage gaps for functions in script/script.h, script/script_error.h and script/standard.h

2020-05-30 10:37:01 +00:00

strprintf.cpp

tests: Fill fuzzing coverage gaps for functions in util/translation.h

2020-05-14 18:52:57 +00:00

system.cpp

fuzz: fix vector size problem in system fuzzer

2020-05-08 20:21:48 +02:00

timedata.cpp

…

transaction.cpp

scripted-diff: Bump copyright headers

2020-04-16 13:33:09 -04:00

tx_in.cpp

…

tx_out.cpp

…

util.h

tests: Add std::vector<uint8_t> ConsumeFixedLengthByteVector(FuzzedDataProvider& fuzzed_data_provider, const size_t length)

2020-06-11 14:05:54 +00:00