Andrew Poelstra
c33f69966f
Merge cd6e193d4c into merged_master (Bitcoin PR #20126 )
2020-11-30 18:26:10 +00:00
Andrew Poelstra
4cb66aae97
Merge 0b2abaa666 into merged_master (Bitcoin PR #19954 )
2020-11-30 17:12:23 +00:00
Andrew Poelstra
111d9d89b2
Merge 392c6f4fb2 into merged_master (Bitcoin PR #20101 )
2020-11-30 16:29:27 +00:00
Andrew Poelstra
613f65d853
Merge 9dd4de2832 into merged_master (Bitcoin PR #20027 )
2020-11-30 16:15:12 +00:00
Andrew Poelstra
ab283556b0
Merge db88db4727 into merged_master (Bitcoin PR #19339 )
...
Changes API for AcceptToMemoryPool to no longer check maximum fee; we remove
this check from interfaces::CChain::testPeginClaimAcceptance. This is fine,
the check never should have been there (this method's job is to notice double
claim attempts and provide a more helpful message to the user; other mempool
failures should be caught later in the `claimrawpegin` logic when we call
`pwallet->commitTransaction` which actually subits to the mempool). It was
only checking fees because the API made it easier to do so than to not.
2020-11-30 15:50:18 +00:00
Andrew Poelstra
3ce8ed9bb5
Merge 88067ddbe4 into merged_master (Elements PR #912 )
...
Also fixed an intermittent failure in feature_assetsdir.py that has
been bugging me for the entire rebase.
2020-11-30 15:19:14 +00:00
Andrew Poelstra
a9a69ea6fa
Merge 875e1ccc9f into merged_master (Bitcoin PR #19947 )
2020-11-30 13:51:18 +00:00
Andrew Poelstra
1108aae86c
Merge 54fc96ffa7 into merged_master (Bitcoin PR #19956 )
2020-11-30 05:40:00 +00:00
Andrew Poelstra
62faba7499
Merge 171cd05ae3 into merged_master (Bitcoin PR #20034 )
2020-11-30 05:33:57 +00:00
Andrew Poelstra
350d1098f1
Merge a0185d90a7 into merged_master (Bitcoin PR #18309 )
2020-11-30 03:53:02 +00:00
Andrew Poelstra
e5875a75bc
Merge 9fc2f011ba into merged_master (Bitcoin PR #20048 )
2020-11-30 03:46:23 +00:00
Andrew Poelstra
638acbcdd0
Merge 40aab35e98 into merged_master (Bitcoin PR #19253 )
2020-11-30 03:40:21 +00:00
Andrew Poelstra
33a0d5e270
Merge 301959fa74 into merged_master (Bitcoin PR #20043 )
2020-11-30 02:42:44 +00:00
Andrew Poelstra
1b85209c18
Merge 1769828684 into merged_master (Bitcoin PR #19501 )
...
Adds "verbose" flag to a bunch of RPC that pass through to SendMoney. I also
added it to sendtomainchain and destroyamount.
2020-11-30 02:17:54 +00:00
Andrew Poelstra
64bfdd9af8
Merge 8aa6178961 into merged_master (Bitcoin PR #20003 )
2020-11-30 00:24:10 +00:00
Andrew Poelstra
7c68cb4fb0
Merge 6af9b31bfc into merged_master (Bitcoin PR #19107 )
2020-11-29 23:52:21 +00:00
Andrew Poelstra
3a833cdb0e
Merge e36aa351a3 into merged_master (Bitcoin PR #19969 )
2020-11-29 23:45:31 +00:00
Andrew Poelstra
1da43aaaf0
Merge 7ea649946d into merged_master (Bitcoin PR #20028 )
2020-11-29 23:39:40 +00:00
Andrew Poelstra
62ec516ac7
Merge e7e6f0bf18 into merged_master (Bitcoin PR #20026 )
2020-11-29 22:25:26 +00:00
Andrew Poelstra
67531848a8
Merge 055abfbc5a into merged_master (Bitcoin PR #20023 )
2020-11-29 22:19:20 +00:00
Andrew Poelstra
65b01321e2
Merge 4f45ea1f73 into merged_master (Bitcoin PR #19725 )
2020-11-29 22:09:36 +00:00
Andrew Poelstra
614dbd26f4
Merge 8aa3a4a498 into merged_master (Bitcoin PR #20022 )
2020-11-29 22:04:07 +00:00
Andrew Poelstra
52c2d8e525
Merge 78f912c901 into merged_master (Bitcoin PR #19804 )
2020-11-29 21:58:22 +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
f9355ded4a
Merge bca68fe713 into merged_master (Elements PR #906 )
2020-11-29 18:17:16 +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
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
b2cc574f87
Merge a518b1c26b into merged_master (Bitcoin PR #19936 )
2020-11-29 05:48:24 +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
af5429c8ac
Merge f2d9934381 into merged_master (Bitcoin PR #19922 )
2020-11-29 03:11:53 +00:00
Andrew Poelstra
3f50e404e0
Merge 564e1ab0f3 into merged_master (Bitcoin PR #19800 )
2020-11-29 02:37:47 +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
15764533c6
Merge c91f955f44 into merged_master (Bitcoin PR #19887 )
2020-11-28 23:42:28 +00:00
Andrew Poelstra
532e650b1d
Merge 23d3ae7acc into merged_master (Bitcoin PR #19405 )
2020-11-28 22:56:34 +00:00
Andrew Poelstra
897f8be4ef
Merge bd60a9a8ed into merged_master (Bitcoin PR #19818 )
2020-11-28 22:14:15 +00:00
Andrew Poelstra
c67e668003
Merge 4053de04e2 into merged_master (Bitcoin PR #19859 )
2020-11-28 21:56:01 +00:00
Andrew Poelstra
f5f5be3203
Merge 136fe4c5e9 into merged_master (Bitcoin PR #19816 )
2020-11-28 21:25:31 +00:00
Andrew Poelstra
9a200a587e
Merge 505b39e72b into merged_master (Bitcoin PR #19610 )
2020-11-28 20:35:13 +00:00
Andrew Poelstra
ef13698934
Merge 48c1083632 into merged_master (Bitcoin PR #19105 )
2020-11-28 20:18:13 +00:00
Andrew Poelstra
afe472121a
Merge a1d14f522c into merged_master (Bitcoin PR #19671 )
2020-11-28 19:48:53 +00:00
Andrew Poelstra
aba7e8ce09
Merge e796fdd4cb into merged_master (Bitcoin PR #19507 )
2020-11-28 19:42:25 +00:00
Andrew Poelstra
ad7f014d11
Merge 89a8299a14 into merged_master (Bitcoin PR #19717 )
2020-11-28 19:34:51 +00:00
Andrew Poelstra
55ff198606
Merge c1e0c2ad3b into merged_master (Bitcoin PR #19813 )
2020-11-28 19:05:58 +00:00
