Andrew Poelstra
a34b91cda7
Merge 8235dca621 into merged_master (Bitcoin PR #19979 )
2020-11-29 19:50:32 +00:00
Andrew Poelstra
7a8f77d7ad
Merge 9e217f5a6f into merged_master (Bitcoin PR #19572 )
2020-11-29 19:44:31 +00:00
Andrew Poelstra
c1f937fe53
Merge 8219893825 into merged_master (Bitcoin PR #19993 )
2020-11-29 18:52:06 +00:00
Andrew Poelstra
7892a185b5
Merge b1291b2e8f into merged_master (Bitcoin PR #19963 )
2020-11-29 18:29:03 +00:00
Andrew Poelstra
b260d5c229
Merge c7eb85d005 into merged_master (Bitcoin PR #19959 )
2020-11-29 18:23:10 +00:00
Andrew Poelstra
f9355ded4a
Merge bca68fe713 into merged_master (Elements PR #906 )
2020-11-29 18:17:16 +00:00
Andrew Poelstra
5c1a330c57
Merge d692d192cd into merged_master (Bitcoin PR #19849 )
...
More RPC cleanups. This one discovered that the `createpsbt` and
`rawblindrawtransaction` RPCs had incorrect argument lists :)
2020-11-29 17:58:59 +00:00
Andrew Poelstra
1c0f4b7a7d
Merge 77376034d4 into merged_master (Bitcoin PR #17785 )
2020-11-29 17:04:21 +00:00
Andrew Poelstra
455f61c0db
Merge 8c5f68118c into merged_master (Bitcoin PR #18267 )
...
This commit adds signet support, which is a little bit silly/redundant for us :)
Was a surprisingly easy merge to handle, and hopefully in future Core is more
mindful of signed blocks when they are changing code architecture.
I had to change a couple lines of src/signet.cpp to add blank assets to the
CTxOuts and to find transaction input scriptWitnesses. No need to add any
other tx witness data (and the CAsset()s that I did add to make things compile
won't be used..) because signet will always have g_con_elementsmode off.
2020-11-29 16:57:55 +00:00
Andrew Poelstra
592ecdc084
Merge c0c409dcd3 into merged_master (Bitcoin PR #19697 )
2020-11-29 14:42:20 +00:00
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
