Andrew Poelstra 240f03f586 Merge cef87f7a48 into merged_master (Bitcoin PR #17290) ... This one took a little bit of work. Basically everywhere that Andy's new code didn't compile, I looked for a similarly shaped line in the pre-PR diff between Bitcoin and Elements and adjusted it in the same way. Was pretty typical; all CAmounts become CAmountMaps, etc. I then spent about 7 hours chasing down a coin selection failure in the blocksign functional tests, which ultimately turned out to be a Core issue. I added a stopgap fix (commented, search for "stopgap" in wallet.cpp), and opened the issue https://github.com/bitcoin/bitcoin/issues/20347 There was also a bug where we were not estimating change output sizes correctly in case we had massive blinded outputs, which I had to fix to get the functional tests to pass.		2020-11-10 21:59:56 +00:00
..
test	Merge cef87f7a48 into merged_master (Bitcoin PR #17290)	2020-11-10 21:59:56 +00:00
coincontrol.cpp	Merge 00922b8720 into merged_master (Bitcoin PR #15906)	2020-11-09 21:20:10 +00:00
coincontrol.h	Merge 08e2947312 into merged_master (Bitcoin PR #17316)	2020-11-09 21:20:48 +00:00
coinselection.cpp	Merge 08e2947312 into merged_master (Bitcoin PR #17316)	2020-11-09 21:20:48 +00:00
coinselection.h	UPSTREAM MERGE BROKEN: Merge commit 'f617e05c38' into master	2019-05-01 19:18:18 +01:00
crypter.cpp	Fix occurences of c_str() used with size() to data()	2019-10-28 13:41:45 +01:00
crypter.h	Remove unused includes	2019-10-15 22:56:43 +00:00
db.cpp	scripted-diff: Change BCLog::DB to BCLog::WALLETDB	2019-11-08 18:45:38 +01:00
db.h	Merge #17070: wallet: Avoid showing GUI popups on RPC errors	2019-10-21 13:48:27 +02:00
feebumper.cpp	Merge 99ab3a72c5 into merged_master (Bitcoin PR #15931)	2020-11-09 23:10:09 +00:00
feebumper.h	change wallet pointers to references in feebumper	2019-10-10 17:46:59 -04:00
fees.cpp	Remove unused includes	2019-10-15 22:56:43 +00:00
fees.h	Remove uses of fee globals in wallet code	2019-02-22 15:43:02 -04:00
init.cpp	Pass NodeContext, ConnMan, BanMan references more places	2019-10-28 10:30:51 -04:00
ismine.h	Merge 6a97e8a060 into merged_master (Bitcoin PR #17260) (multiple commits)	2020-11-09 21:20:47 +00:00
load.cpp	wallet: Avoid showing GUI popups on RPC errors	2019-10-08 13:02:14 -04:00
load.h	wallet: Fix documentation around WalletParameterInteraction	2019-09-03 14:10:25 -04:00
psbtwallet.cpp	Merge 6a97e8a060 into merged_master (Bitcoin PR #17260) (multiple commits)	2020-11-09 21:20:47 +00:00
psbtwallet.h	Merge 46d6930f8c into merged_master (Bitcoin PR #16659)	2020-11-09 21:20:41 +00:00
rpcdump.cpp	Merge 99ab3a72c5 into merged_master (Bitcoin PR #15931)	2020-11-09 23:10:09 +00:00
rpcwallet.cpp	Merge 1028882eea into merged_master (Bitcoin PR #17437)	2020-11-09 23:10:10 +00:00
rpcwallet.h	Merge 976cc766c4 into merged_master (Bitcoin PR #17381)	2020-11-09 23:10:08 +00:00
scriptpubkeyman.cpp	Merge 976cc766c4 into merged_master (Bitcoin PR #17381)	2020-11-09 23:10:08 +00:00
scriptpubkeyman.h	Merge 976cc766c4 into merged_master (Bitcoin PR #17381)	2020-11-09 23:10:08 +00:00
wallet.cpp	Merge cef87f7a48 into merged_master (Bitcoin PR #17290)	2020-11-10 21:59:56 +00:00
wallet.h	Merge cef87f7a48 into merged_master (Bitcoin PR #17290)	2020-11-10 21:59:56 +00:00
walletdb.cpp	Merge cef7df37ce into merged_master (Bitcoin PR #17410)	2020-11-09 23:10:09 +00:00
walletdb.h	Merge a22b62481a into merged_master (Bitcoin PR #17070)	2020-11-09 21:20:43 +00:00
wallettool.cpp	Merge #17260: Split some CWallet functions into new LegacyScriptPubKeyMan	2019-10-29 08:19:23 -04:00
wallettool.h	Remove unused includes	2019-10-15 22:56:43 +00:00
walletutil.cpp	Merge d5931f3676 into merged_master (Bitcoin PR #15870)	2020-10-29 18:02:26 +00:00
walletutil.h	Move wallet enums to walletutil.h	2019-10-25 19:20:24 -04:00