Andrew Poelstra
ca42c615f0
Merge b99a1633b2 into merged_master (Bitcoin PR #19781 )
2020-11-29 14:25:26 +00:00
Andrew Poelstra
a1b43a0ae5
Merge 38fd1bdcd4 into merged_master (Bitcoin PR #18949 )
2020-11-29 14:19:15 +00:00
Andrew Poelstra
0a093f742b
Merge 831b0ecea9 into merged_master (Bitcoin PR #13686 )
2020-11-29 14:12:27 +00:00
Andrew Poelstra
8804910783
Merge 83b23848f7 into merged_master (Bitcoin PR #18790 )
2020-11-29 14:06:06 +00:00
Andrew Poelstra
81a3dda09b
Merge c30f79d418 into merged_master (Bitcoin PR #19940 )
2020-11-29 14:00:02 +00:00
Andrew Poelstra
28c2a096e4
Merge 967be53aee into merged_master (Bitcoin PR #19971 )
2020-11-29 06:18:11 +00:00
Andrew Poelstra
a7602fb56d
Merge 652c45fdbb into merged_master (Bitcoin PR #15454 )
2020-11-29 06:12:28 +00:00
Andrew Poelstra
42ec9ecdbe
Merge be3af4f310 into merged_master (Bitcoin PR #19934 )
2020-11-29 05:54:04 +00:00
Andrew Poelstra
b2cc574f87
Merge a518b1c26b into merged_master (Bitcoin PR #19936 )
2020-11-29 05:48:24 +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
afd00d41af
Merge 5d5e335f96 into merged_master (Bitcoin PR #19903 )
2020-11-29 04:39:03 +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
a5b11981ec
Merge ba4b3fbcf2 into merged_master (Bitcoin PR #19944 )
...
Another libsecp upgrade (this one the Taproot one) that I was able to turn into a no-op
2020-11-29 03:28:57 +00:00
Andrew Poelstra
9c308f094f
Merge be375b2206 into merged_master (Bitcoin PR #19919 )
2020-11-29 03:17:26 +00:00
Andrew Poelstra
af5429c8ac
Merge f2d9934381 into merged_master (Bitcoin PR #19922 )
2020-11-29 03:11:53 +00:00
Andrew Poelstra
7e4e4b10fc
Merge 9366a73d69 into merged_master (Bitcoin PR #19916 )
2020-11-29 03:00:55 +00:00
Andrew Poelstra
246b11ff76
Merge dffefda21d into merged_master (Bitcoin PR #19870 )
2020-11-29 02:54:55 +00:00
Andrew Poelstra
f14158137a
Merge a47e596486 into merged_master (Bitcoin PR #19841 )
2020-11-29 02:43:18 +00:00
Andrew Poelstra
3f50e404e0
Merge 564e1ab0f3 into merged_master (Bitcoin PR #19800 )
2020-11-29 02:37:47 +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
735ead6bdd
Merge af8135e369 into merged_master (Bitcoin PR #19897 )
2020-11-28 23:53:49 +00:00
Andrew Poelstra
eec76f80cc
Merge 68d1f1698f into merged_master (Bitcoin PR #19890 )
2020-11-28 23:47:58 +00:00
Andrew Poelstra
15764533c6
Merge c91f955f44 into merged_master (Bitcoin PR #19887 )
2020-11-28 23:42:28 +00:00
Andrew Poelstra
10a4574d9d
Merge 0368931702 into merged_master (Bitcoin PR #19881 )
2020-11-28 23:35:22 +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
d9c937df31
Merge 32b624b0c9 into merged_master (Elements PR #905 )
2020-11-28 22:02:25 +00:00
Andrew Poelstra
c67e668003
Merge 4053de04e2 into merged_master (Bitcoin PR #19859 )
2020-11-28 21:56:01 +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
f5f5be3203
Merge 136fe4c5e9 into merged_master (Bitcoin PR #19816 )
2020-11-28 21:25:31 +00:00
Andrew Poelstra
ac33feb400
Merge 9876ab8c74 into merged_master (Bitcoin PR #19844 )
2020-11-28 21:19:29 +00:00
Andrew Poelstra
054312239f
Merge 2d4574aad8 into merged_master (Bitcoin PR #19861 )
2020-11-28 21:13:39 +00:00
