Andrew Poelstra
850b0e367b
Merge 655937ebcb into merged_master (Bitcoin PR #19845 )
2020-11-29 23:08:29 +00:00
Andrew Poelstra
07d50b2951
Merge c95784e3d3 into merged_master (Bitcoin PR #20016 )
2020-11-29 22:31:43 +00:00
Andrew Poelstra
5f5f4279ed
Merge 1b313cacc9 into merged_master (Bitcoin PR #19927 )
2020-11-29 21:07:46 +00:00
Andrew Poelstra
c1f937fe53
Merge 8219893825 into merged_master (Bitcoin PR #19993 )
2020-11-29 18:52:06 +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
42ec9ecdbe
Merge be3af4f310 into merged_master (Bitcoin PR #19934 )
2020-11-29 05:54:04 +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
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
96feda8b8a
Merge 620ac8c475 into merged_master (Bitcoin PR #19724 )
2020-11-28 21:46:23 +00:00
Andrew Poelstra
1aced337f5
Merge 61b8c04d78 into merged_master (Bitcoin PR #19379 )
2020-11-28 18:11:17 +00:00
Andrew Poelstra
a0c37112ef
Merge 5c910a6b7a into merged_master (Bitcoin PR #19826 )
2020-11-28 17:34:40 +00:00
Andrew Poelstra
03089f17d8
Merge 1cf73fb8eb into merged_master (Bitcoin PR #19607 )
2020-11-28 16:27:43 +00:00
Andrew Poelstra
6183feb6ba
Merge 862fde88be into merged_master (Bitcoin PR #19067 )
2020-11-28 15:07:16 +00:00
Andrew Poelstra
ec3c13988a
Merge 6a2ba62685 into merged_master (Bitcoin PR #19779 )
2020-11-28 13:07:39 +00:00
Andrew Poelstra
5c26f38427
Merge 92735e45ba into merged_master (Bitcoin PR #19775 )
2020-11-28 12:48:08 +00:00
Andrew Poelstra
19dc3ee256
Merge 8d6224fefe into merged_master (Bitcoin PR #19628 )
2020-11-28 12:24:29 +00:00
Andrew Poelstra
5dd8b96340
Merge 4fefd80f08 into merged_master (Bitcoin PR #19704 )
2020-11-28 04:18:46 +00:00
Andrew Poelstra
c366a5890a
Merge e9b3012654 into merged_master (Bitcoin PR #19750 )
2020-11-28 01:21:34 +00:00
Andrew Poelstra
38a158c0f5
Merge 44ddcd887d into merged_master (Bitcoin PR #19706 )
2020-11-28 01:15:15 +00:00
Andrew Poelstra
3ca887d480
Merge d052f5e6b7 into merged_master (Bitcoin PR #16841 )
2020-11-27 21:29:55 +00:00
Andrew Poelstra
64b8eac774
Merge 1a43cd3f74 into merged_master (Bitcoin PR #19709 )
2020-11-27 20:00:03 +00:00
Andrew Poelstra
e8b23b0198
Merge 4d4bd5ed74 into merged_master (Bitcoin PR #17204 )
2020-11-27 19:53:57 +00:00
Andrew Poelstra
ab8a5542cf
Merge bd00d3b1f2 into merged_master (Bitcoin PR #19658 )
2020-11-27 16:30:30 +00:00
Andrew Poelstra
87a94621e7
Merge ce3bdd0ed1 into merged_master (Bitcoin PR #19316 )
2020-11-27 16:20:25 +00:00
Andrew Poelstra
419fd4f90d
Merge b75f2ad72d into merged_master (Bitcoin PR #19660 )
2020-11-27 04:05:36 +00:00
Andrew Poelstra
54668f0d50
Merge 4b705b1c98 into merged_master (Bitcoin PR #19098 )
2020-11-27 02:59:49 +00:00
Andrew Poelstra
519f434cd7
Merge e4df534c60 into merged_master (Bitcoin PR #15382 )
2020-11-27 01:48:55 +00:00
Andrew Poelstra
0d961c83a2
Merge 0f16212c59 into merged_master (Bitcoin PR #19340 )
2020-11-27 01:03:20 +00:00
Andrew Poelstra
54f2d85914
Merge 34eb236258 into merged_master (Bitcoin PR #19326 )
2020-11-27 00:39:12 +00:00
Andrew Poelstra
9cbfabd2d6
Merge 14ceddd290 into merged_master (Bitcoin PR #18991 )
2020-11-27 00:01:40 +00:00
Andrew Poelstra
59aa4e1fba
Merge ad2952d17a into merged_master (Bitcoin PR #19604 )
2020-11-26 22:45:20 +00:00
Andrew Poelstra
89581d6b4f
Merge a76ccb01b9 into merged_master (Bitcoin PR #19534 )
2020-11-26 20:35:25 +00:00
Andrew Poelstra
12f11f8f70
Merge 2f71a1ea35 into merged_master (Bitcoin PR #18637 )
2020-11-26 20:30:20 +00:00
Andrew Poelstra
64ebaceb2e
Merge b62fbf9e1c into merged_master (Bitcoin PR #19593 )
2020-11-26 18:58:42 +00:00
Andrew Poelstra
e377f4f773
Merge f4cfa6d019 into merged_master (Bitcoin PR #15935 )
2020-11-26 18:11:36 +00:00
Andrew Poelstra
461829d58e
Merge 2031aa92a3 into merged_master (Bitcoin PR #19562 )
2020-11-26 15:26:04 +00:00
Andrew Poelstra
9280ac9ba9
Merge 597d2f905e into merged_master (Bitcoin PR #19548 )
2020-11-26 15:20:28 +00:00
Andrew Poelstra
8eb2701f0b
Merge b763ae02a6 into merged_master (Bitcoin PR #16878 )
2020-11-26 14:30:39 +00:00
Andrew Poelstra
8a894fdcbb
Merge 476436b2de into merged_master (Bitcoin PR #19551 )
2020-11-26 13:58:21 +00:00
Andrew Poelstra
cd8a188ed8
Merge 090d877160 into merged_master (Bitcoin PR #19143 )
2020-11-26 13:52:27 +00:00
Andrew Poelstra
5c12ae9beb
Merge 0f6900e780 into merged_master (Bitcoin PR #19533 )
2020-11-26 12:02:44 +00:00
Andrew Poelstra
75408ab731
Merge affed844ba into merged_master (Bitcoin PR #19174 )
2020-11-26 06:06:02 +00:00
Andrew Poelstra
9139511690
Merge 31bdd86631 into merged_master (Bitcoin PR #19353 )
2020-11-26 05:37:52 +00:00
Andrew Poelstra
69313c4329
Merge 21209c9cce into merged_master (Bitcoin PR #19512 )
2020-11-26 05:14:51 +00:00
Andrew Poelstra
389b232e46
Merge 43125596ce into merged_master (Bitcoin PR #19296 )
2020-11-26 04:55:08 +00:00
Andrew Poelstra
3894f4419c
Merge 3d57015aa2 into merged_master (Bitcoin PR #19491 )
2020-11-26 04:25:00 +00:00
Andrew Poelstra
10eade5ba9
Merge b93c4244b9 into merged_master (Bitcoin PR #19464 )
2020-11-26 02:44:00 +00:00
