Andrew Poelstra
4eeadb7fde
Merge 8ed37f6c84 into merged_master (Bitcoin PR #19077 )
2020-11-30 20:20:56 +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
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
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
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
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
1108aae86c
Merge 54fc96ffa7 into merged_master (Bitcoin PR #19956 )
2020-11-30 05:40:00 +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
Andrew Poelstra
979fc8ef9d
Merge a6a993a888 into merged_master (Bitcoin PR #20060 )
2020-11-30 04:19:03 +00:00
Andrew Poelstra
6eb01f892d
Merge 69a73803df into merged_master (Bitcoin PR #20058 )
2020-11-30 04:00:30 +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
86c430b852
Merge 3487e421a7 into merged_master (Bitcoin PR #20004 )
2020-11-30 03:25:50 +00:00
Andrew Poelstra
4b62325fc4
Merge 7b7cb70f4c into merged_master (Bitcoin PR #19498 )
2020-11-30 02:50:02 +00:00
Andrew Poelstra
33a0d5e270
Merge 301959fa74 into merged_master (Bitcoin PR #20043 )
2020-11-30 02:42:44 +00:00
Andrew Poelstra
369ebdda10
Merge 4f5ae52738 into merged_master (Bitcoin PR #20006 )
2020-11-30 02:35:18 +00:00
Andrew Poelstra
e3853b414c
Merge 5c435c78e3 into merged_master (Bitcoin PR #20036 )
2020-11-30 02:29:24 +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
b64dffc7ec
Merge c7ad94428a into merged_master (Bitcoin PR #19958 )
2020-11-30 00:42:46 +00:00
Andrew Poelstra
c364bcefad
Merge 9e6f56f6ea into merged_master (Bitcoin PR #19984 )
2020-11-30 00:30:38 +00:00
Andrew Poelstra
64bfdd9af8
Merge 8aa6178961 into merged_master (Bitcoin PR #20003 )
2020-11-30 00:24:10 +00:00
Andrew Poelstra
5a731b1c03
Merge d82b2c6e65 into merged_master (Bitcoin PR #19898 )
2020-11-30 00:17:21 +00:00
Andrew Poelstra
61e047512c
Merge ec9b4492eb into merged_master (Bitcoin PR #19630 )
2020-11-30 00:08:23 +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
1f47015ba6
Merge 5db44c740e into merged_master (Bitcoin PR #20014 )
2020-11-29 23:32:59 +00:00
Andrew Poelstra
850b0e367b
Merge 655937ebcb into merged_master (Bitcoin PR #19845 )
2020-11-29 23:08:29 +00:00
Andrew Poelstra
e20126cae4
Merge 2552702000 into merged_master (Bitcoin PR #15367 )
2020-11-29 23:02:09 +00:00
Andrew Poelstra
d105732185
Merge ec9b28e089 into merged_master (Elements PR #910 )
2020-11-29 22:55:33 +00:00
Andrew Poelstra
07d50b2951
Merge c95784e3d3 into merged_master (Bitcoin PR #20016 )
2020-11-29 22:31:43 +00:00
Andrew Poelstra
65b01321e2
Merge 4f45ea1f73 into merged_master (Bitcoin PR #19725 )
2020-11-29 22:09:36 +00:00
