Andrew Poelstra
42ec9ecdbe
Merge be3af4f310 into merged_master (Bitcoin PR #19934 )
2020-11-29 05:54:04 +00:00
Andrew Poelstra
28f22e39af
Merge 1c4f59728c into merged_master (Bitcoin PR #19879 )
2020-11-29 05:32:13 +00:00
Andrew Poelstra
3a620fbb0a
Merge 62e3eb9888 into merged_master (Bitcoin PR #19241 )
...
This caused a segfault because we have no checkpoints. Added a NULL check
which jnewbery suggested on the original PR, but for some reason didn't
get in.
2020-11-29 05:16:14 +00:00
Andrew Poelstra
510dbdf232
Merge 48a9968e50 into merged_master (Bitcoin PR #19558 )
2020-11-29 04:52:57 +00:00
Andrew Poelstra
e62380314d
Merge a33651866c into merged_master (Bitcoin PR #19643 )
2020-11-29 04:45:04 +00:00
Andrew Poelstra
5e62edcf8e
Merge ffaac6e614 into merged_master (Bitcoin PR #16378 )
...
Adds a new "send" RPC which I didn't really look at too closely to match
our other RPC modifications. In particular our backport of #17211 adds a
"solving_data" field to other transaction-creation RPCs, but not this
one. (But I checked the current status of #17211 and Andy hasn't updated
upstream either, just passes NullUniValue to FundTransaction from `send`.
So that's what I did here.)
2020-11-29 04:33:22 +00:00
Andrew Poelstra
1a00b8af1a
Merge 06dbbe76dd into merged_master (Bitcoin PR #19931 )
2020-11-29 03:35:35 +00:00
Andrew Poelstra
9c308f094f
Merge be375b2206 into merged_master (Bitcoin PR #19919 )
2020-11-29 03:17:26 +00:00
Andrew Poelstra
f14158137a
Merge a47e596486 into merged_master (Bitcoin PR #19841 )
2020-11-29 02:43:18 +00:00
Andrew Poelstra
bc5e94af85
Merge 4f229d8904 into merged_master (Bitcoin PR #19914 )
2020-11-29 02:21:13 +00:00
Andrew Poelstra
b657dd4a3a
Merge 147d50d63e into merged_master (Bitcoin PR #19791 )
2020-11-29 02:07:46 +00:00
Andrew Poelstra
d8ce9195a1
Merge 2583966130 into merged_master (Bitcoin PR #19478 )
2020-11-29 01:52:23 +00:00
Andrew Poelstra
2a0cf12ecc
Merge 07087051af into merged_master (Bitcoin PR #19556 )
...
Added a method testPeginClaimAcceptance to interfaces::CChain. It is not clear
to me that this is meaningfully different from the existing method broadcastTransaction
(with the `relay` flag set to false so it doesn't actually broadcast), except
that this method returns the TxValidationState, which we display to the user
in the RPC error. Worth revisiting this.
Another nonobvious change was replacing a block of mempool-searching logic
in wallet/rpcwallet.cpp with the single line `pwallet->chain().findCoins(coins)`.
This I stole from the current state of upstream #17211 , our favorite in-progress
PR from which the original logic came.
2020-11-29 01:43:20 +00:00
Andrew Poelstra
239cea1d22
Merge 78cb45d722 into merged_master (Bitcoin PR #19738 )
2020-11-29 00:26:50 +00:00
Andrew Poelstra
d4e8eb56b0
Merge 56d47e19ed into merged_master (Bitcoin PR #19619 )
2020-11-29 00:21:17 +00:00
Andrew Poelstra
eec76f80cc
Merge 68d1f1698f into merged_master (Bitcoin PR #19890 )
2020-11-28 23:47:58 +00:00
Andrew Poelstra
81a7362f37
Merge 3ba25e3bdd into merged_master (Bitcoin PR #19848 )
2020-11-28 23:28:08 +00:00
Andrew Poelstra
83b1fbe585
Merge 416efcb7ab into merged_master (Bitcoin PR #19728 )
2020-11-28 23:22:15 +00:00
Andrew Poelstra
ecf4d0de5c
Merge 81a19e7253 into merged_master (Bitcoin PR #19852 )
2020-11-28 23:16:39 +00:00
Andrew Poelstra
4393de33e3
Merge df75e9f3ee into merged_master (Bitcoin PR #19878 )
2020-11-28 23:10:31 +00:00
Andrew Poelstra
0744ff1754
Merge 58bf5653ed into merged_master (Elements PR #904 )
...
Manually applied this one from the original diff.
2020-11-28 23:04:05 +00:00
Andrew Poelstra
532e650b1d
Merge 23d3ae7acc into merged_master (Bitcoin PR #19405 )
2020-11-28 22:56:34 +00:00
Andrew Poelstra
08ceba023e
Merge 99a8eb6051 into merged_master (Bitcoin PR #19854 )
2020-11-28 22:40:46 +00:00
Andrew Poelstra
646aa14168
Merge a0a422c34c into merged_master (Bitcoin PR #19754 )
2020-11-28 22:31:57 +00:00
Andrew Poelstra
897f8be4ef
Merge bd60a9a8ed into merged_master (Bitcoin PR #19818 )
2020-11-28 22:14:15 +00:00
Andrew Poelstra
dfd4a46a05
Merge 69a13eb246 into merged_master (Bitcoin PR #19670 )
2020-11-28 22:08:22 +00:00
Andrew Poelstra
96feda8b8a
Merge 620ac8c475 into merged_master (Bitcoin PR #19724 )
2020-11-28 21:46:23 +00:00
Andrew Poelstra
e7d708436f
Merge 68f0ab26bc into merged_master (Bitcoin PR #19805 )
2020-11-28 21:36:21 +00:00
Andrew Poelstra
ac33feb400
Merge 9876ab8c74 into merged_master (Bitcoin PR #19844 )
2020-11-28 21:19:29 +00:00
Andrew Poelstra
30b510767b
Merge c157a50694 into merged_master (Bitcoin PR #19840 )
2020-11-28 21:07:08 +00:00
Andrew Poelstra
b91bc85ff4
Merge c17a003758 into merged_master (Bitcoin PR #19857 )
2020-11-28 20:51:38 +00:00
Andrew Poelstra
9a200a587e
Merge 505b39e72b into merged_master (Bitcoin PR #19610 )
2020-11-28 20:35:13 +00:00
Andrew Poelstra
b28ab82f99
Merge 3a3e21dafb into merged_master (Bitcoin PR #14687 )
2020-11-28 20:23:56 +00:00
Andrew Poelstra
b306593374
Merge bab4cce1b0 into merged_master (Bitcoin PR #19668 )
2020-11-28 19:57:58 +00:00
Andrew Poelstra
afe472121a
Merge a1d14f522c into merged_master (Bitcoin PR #19671 )
2020-11-28 19:48:53 +00:00
Andrew Poelstra
ad7f014d11
Merge 89a8299a14 into merged_master (Bitcoin PR #19717 )
2020-11-28 19:34:51 +00:00
Andrew Poelstra
5f6eb8ee3f
Merge f98872f127 into merged_master (Bitcoin PR #18244 )
2020-11-28 18:55:44 +00:00
Andrew Poelstra
a6e69db203
Merge 7721b31809 into merged_master (Bitcoin PR #19773 )
2020-11-28 18:22:47 +00:00
Andrew Poelstra
1aced337f5
Merge 61b8c04d78 into merged_master (Bitcoin PR #19379 )
2020-11-28 18:11:17 +00:00
Andrew Poelstra
4087c88a7e
Merge 269a7ccb27 into merged_master (Bitcoin PR #19099 )
2020-11-28 17:53:38 +00:00
Andrew Poelstra
e9902f4810
Merge afffbb1bc6 into merged_master (Bitcoin PR #19710 )
2020-11-28 17:46:45 +00:00
Andrew Poelstra
a0c37112ef
Merge 5c910a6b7a into merged_master (Bitcoin PR #19826 )
2020-11-28 17:34:40 +00:00
Andrew Poelstra
a3ff560ad9
Merge 0adb80fe63 into merged_master (Bitcoin PR #19803 )
2020-11-28 17:09:11 +00:00
Andrew Poelstra
2217632a3e
Merge 21eda43cde into merged_master (Bitcoin PR #19828 )
2020-11-28 17:02:25 +00:00
Andrew Poelstra
477ecda390
Merge baf9cedee8 into merged_master (Bitcoin PR #18817 )
2020-11-28 16:35:47 +00:00
Andrew Poelstra
03089f17d8
Merge 1cf73fb8eb into merged_master (Bitcoin PR #19607 )
2020-11-28 16:27:43 +00:00
Andrew Poelstra
2bb42412e2
Merge ca30d34cf9 into merged_master (Bitcoin PR bitcoin-core/gui#39 )
2020-11-28 16:21:22 +00:00
Andrew Poelstra
deddadb1aa
Merge 5edef20a65 into merged_master (Bitcoin PR #19797 )
2020-11-28 16:15:24 +00:00
Andrew Poelstra
ad13ce952c
Merge 9632b7edc7 into merged_master (Bitcoin PR #19739 )
2020-11-28 16:03:38 +00:00
Andrew Poelstra
2e593978da
Merge 22acd36d53 into merged_master (Bitcoin PR #19646 )
2020-11-28 15:51:43 +00:00
