Andrew Poelstra
b733f588d8
Merge cb21d864c5 into merged_master (Bitcoin PR #19401 )
2020-12-01 05:14:13 +00:00
Andrew Poelstra
205b628304
Merge 2947ae6f85 into merged_master (Bitcoin PR #20035 )
2020-12-01 04:33:11 +00:00
Andrew Poelstra
85663c72a3
Merge 82d3596dfe into merged_master (Bitcoin PR #20161 )
2020-12-01 04:25:27 +00:00
Andrew Poelstra
e483648523
Merge cbb5f3a2d5 into merged_master (Bitcoin PR #19836 )
2020-12-01 04:16:10 +00:00
Andrew Poelstra
7578d2068f
Merge 9ad7cd2887 into merged_master (Bitcoin PR #20090 )
2020-12-01 04:04:03 +00:00
Andrew Poelstra
943ae42b1a
Merge 9855422e65 into merged_master (Bitcoin PR #17428 )
2020-12-01 03:53:08 +00:00
Andrew Poelstra
2a2f3e49ea
Merge 0d22482353 into merged_master (Bitcoin PR #20002 )
2020-12-01 03:42:49 +00:00
Andrew Poelstra
0ef34670a2
Merge 711ddce943 into merged_master (Bitcoin PR #20131 )
2020-12-01 03:36:05 +00:00
Andrew Poelstra
653fe79fe8
Merge 560dea9b26 into merged_master (Bitcoin PR #19770 )
2020-12-01 03:29:12 +00:00
Andrew Poelstra
ff121d071d
Merge e3b474c548 into merged_master (Bitcoin PR #20140 )
2020-12-01 03:09:48 +00:00
Andrew Poelstra
595bf707be
Merge 3956165903 into merged_master (Bitcoin PR #17775 )
2020-12-01 03:02:17 +00:00
Andrew Poelstra
e765fc93ea
Merge 3caee16946 into merged_master (Bitcoin PR #19953 )
...
Taproot :D
2020-12-01 02:54:57 +00:00
Andrew Poelstra
4eeadb7fde
Merge 8ed37f6c84 into merged_master (Bitcoin PR #19077 )
2020-11-30 20:20:56 +00:00
Andrew Poelstra
da0f4ad1de
Merge f2e6d14430 into merged_master (Bitcoin PR #20147 )
...
Update secp256k1-zkp to ff4714e6417c56f7235b287d4a9e555df10e09af latest master,
which is up to date with upstream libsecp 9e5939d2848df5508e3a6eb038273b28d255248c
(pull request #835 Nov 4 2020)
2020-11-30 19:33:11 +00:00
Andrew Poelstra
de9f3068a8
Merge 661fe5d65c into merged_master (Bitcoin PR #20146 )
2020-11-30 19:25:46 +00:00
Andrew Poelstra
f327fa97f2
Merge c2c4dbaebd into merged_master (Bitcoin PR #19988 )
2020-11-30 19:05:03 +00:00
Andrew Poelstra
a8f78d1aef
Merge 99a1d572ea into merged_master (Bitcoin PR #18750 )
2020-11-30 18:59:04 +00:00
Andrew Poelstra
6a979f902a
Merge 9efa55c715 into merged_master (Bitcoin PR #20130 )
2020-11-30 18:50:04 +00:00
Andrew Poelstra
5ac09f4543
Merge 3750f664b3 into merged_master (Bitcoin PR #20129 )
2020-11-30 18:44:05 +00:00
Andrew Poelstra
ed77072953
Merge e21b824386 into merged_master (Bitcoin PR #20109 )
2020-11-30 18:38:05 +00:00
Andrew Poelstra
e40c69583b
Merge ec0453cd57 into merged_master (Bitcoin PR bitcoin-core/gui#102 )
2020-11-30 18:32:13 +00:00
Andrew Poelstra
c33f69966f
Merge cd6e193d4c into merged_master (Bitcoin PR #20126 )
2020-11-30 18:26:10 +00:00
Andrew Poelstra
1c396306e3
Merge ad90dd9f31 into merged_master (Bitcoin PR #20141 )
2020-11-30 18:14:23 +00:00
Andrew Poelstra
a21f702161
Merge f79a4a8952 into merged_master (Bitcoin PR #19998 )
2020-11-30 17:55:22 +00:00
Andrew Poelstra
c9621a0d4a
Merge af22322dab into merged_master (Bitcoin PR #20119 )
2020-11-30 17:36:05 +00:00
Andrew Poelstra
4cb66aae97
Merge 0b2abaa666 into merged_master (Bitcoin PR #19954 )
2020-11-30 17:12:23 +00:00
Andrew Poelstra
d504893530
Merge 12a1c3ad1a into merged_master (Bitcoin PR #20107 )
2020-11-30 17:06:15 +00:00
Andrew Poelstra
d3cbe231b7
Merge 6854dbdc88 into merged_master (Bitcoin PR #20076 )
2020-11-30 17:00:03 +00:00
Andrew Poelstra
6ded9c5799
Merge 380705ef4f into merged_master (Bitcoin PR #20106 )
2020-11-30 16:53:46 +00:00
Andrew Poelstra
1961e9c99c
Merge d9de00b3e0 into merged_master (Bitcoin PR #20105 )
2020-11-30 16:42:53 +00:00
Andrew Poelstra
111d9d89b2
Merge 392c6f4fb2 into merged_master (Bitcoin PR #20101 )
2020-11-30 16:29:27 +00:00
Andrew Poelstra
45f9d081a2
Merge b337bd7bc0 into merged_master (Bitcoin PR #20065 )
2020-11-30 16:22:16 +00:00
Andrew Poelstra
613f65d853
Merge 9dd4de2832 into merged_master (Bitcoin PR #20027 )
2020-11-30 16:15:12 +00:00
Andrew Poelstra
43ebfe681c
Merge 283a73d7ea into merged_master (Bitcoin PR #20092 )
2020-11-30 16:07:45 +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
5275df6f80
Merge d8cd7b137f into merged_master (Bitcoin PR #20095 )
2020-11-30 15:25:32 +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
0bc6dbbce1
Merge e6207229b8 into merged_master (Elements PR #911 )
...
Spent a while figuring out where this new function should live now that
the PSBT stuff has been pulled into src/psbt.cpp and the wallet, and isn't
mixed up with the RPC logic.
In the end I modified the the function to return a normal error rather
than throwing an RPC exception and put it in src/psbt.cpp with the other
functions that behave this way.
2020-11-30 14:31:38 +00:00
Andrew Poelstra
a9a69ea6fa
Merge 875e1ccc9f into merged_master (Bitcoin PR #19947 )
2020-11-30 13:51:18 +00:00
Andrew Poelstra
40ea75c22b
Merge dde104963b into merged_master (Bitcoin PR #20064 )
2020-11-30 06:33:14 +00:00
Andrew Poelstra
f1975b49cf
Merge cce1513179 into merged_master (Bitcoin PR #19723 )
2020-11-30 06:25:50 +00:00
Andrew Poelstra
05d14ead56
Merge f0fd132226 into merged_master (Bitcoin PR #20072 )
2020-11-30 06:06:53 +00:00
Andrew Poelstra
4285f7d6f0
Merge 2f7a53cc9d into merged_master (Bitcoin PR #20069 )
2020-11-30 06:00:06 +00:00
Andrew Poelstra
0fd697aa7b
Merge 06314fbb55 into merged_master (Bitcoin PR #20071 )
2020-11-30 05:53:34 +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
8ef11db1b0
Merge d9935222d5 into merged_master (Bitcoin PR #19951 )
2020-11-30 05:14:15 +00:00
Andrew Poelstra
dc097c6d9c
Merge 597488d37c into merged_master (Bitcoin PR #19871 )
2020-11-30 05:07:07 +00:00
Andrew Poelstra
77c3300ae3
Merge df2129a234 into merged_master (Bitcoin PR #19991 )
...
I had to make up an onion service target port for Liquid and for our custom
params, so I chose 37041 and 37040 to roughly match how signet just adds
30000 to its normal port.
2020-11-30 04:44:21 +00:00
Andrew Poelstra
f2177876bd
Merge 60ec57b3d7 into merged_master (Bitcoin PR #20055 )
2020-11-30 04:25:38 +00:00
