Merge b1a672d158 into merged_master (Bitcoin PR bitcoin/bitcoin#22337)

This commit is contained in:
Byron Hambly 2023-04-07 11:14:41 +00:00
commit a20c67310c
17 changed files with 92 additions and 80 deletions

View file

@ -317,7 +317,7 @@ CMutableTransaction TestChain100Setup::CreateValidMempoolTransaction(CTransactio
input_coins.insert({outpoint_to_spend, utxo_to_spend});
// - Default signature hashing type
int nHashType = SIGHASH_ALL;
std::map<int, std::string> input_errors;
std::map<int, bilingual_str> input_errors;
assert(SignTransaction(mempool_txn, &keystore, input_coins, nHashType, Params().HashGenesisBlock(), input_errors));
// If submit=true, add transaction to the mempool.