Andrew Poelstra
aff3d057d5
Merge c5ec0367d7 into merged_master (Bitcoin PR #20165 )
2020-12-01 21:54:11 +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
86c430b852
Merge 3487e421a7 into merged_master (Bitcoin PR #20004 )
2020-11-30 03:25:50 +00:00
Andrew Poelstra
f14158137a
Merge a47e596486 into merged_master (Bitcoin PR #19841 )
2020-11-29 02:43:18 +00:00
Andrew Poelstra
d4e8eb56b0
Merge 56d47e19ed into merged_master (Bitcoin PR #19619 )
2020-11-29 00:21:17 +00:00
Andrew Poelstra
e9902f4810
Merge afffbb1bc6 into merged_master (Bitcoin PR #19710 )
2020-11-28 17:46:45 +00:00
Andrew Poelstra
38a158c0f5
Merge 44ddcd887d into merged_master (Bitcoin PR #19706 )
2020-11-28 01:15:15 +00:00
Andrew Poelstra
ab8a5542cf
Merge bd00d3b1f2 into merged_master (Bitcoin PR #19658 )
2020-11-27 16:30:30 +00:00
Andrew Poelstra
54f2d85914
Merge 34eb236258 into merged_master (Bitcoin PR #19326 )
2020-11-27 00:39:12 +00:00
Andrew Poelstra
0f9a38732c
Merge 4ebe2f6e75 into merged_master (Bitcoin PR #18011 )
2020-11-26 21:44:11 +00:00
Andrew Poelstra
bfcd064fa4
Merge 7ebc365047 into merged_master (Bitcoin PR #19214 )
2020-11-26 05:08:23 +00:00
Andrew Poelstra
b99679fa3c
Merge dbd7a91fdf into merged_master (Bitcoin PR #19310 )
2020-11-26 01:09:08 +00:00
Andrew Poelstra
4d1d393cd6
Merge 9e8bd217cd into merged_master (Bitcoin PR #13204 )
2020-11-26 01:08:56 +00:00
Andrew Poelstra
f89b990b78
Merge 448bdff263 into merged_master (Bitcoin PR #18317 )
2020-11-26 01:08:46 +00:00
Andrew Poelstra
335af1e4c4
Merge 74a1152f25 into merged_master (Bitcoin PR #18859 )
2020-11-26 01:08:36 +00:00
Andrew Poelstra
c6d6e49475
Merge af2ec6b037 into merged_master (Bitcoin PR #18759 )
2020-11-26 01:08:33 +00:00
Andrew Poelstra
8710909d88
Merge 6f51f6f357 into merged_master (Bitcoin PR #18754 )
2020-11-26 01:08:30 +00:00
Andrew Poelstra
4b1d94e736
Merge a7a6f1ff41 into merged_master (Bitcoin PR #18575 )
2020-11-26 01:08:28 +00:00
Andrew Poelstra
fd37b7c5d6
Merge 54f812d9d2 into merged_master (Bitcoin PR #18673 )
2020-11-26 01:08:23 +00:00
Andrew Poelstra
e6c67f94cc
Merge 969ee85494 into merged_master (Bitcoin PR #18662 )
2020-11-26 01:08:22 +00:00
Andrew Poelstra
2016bea80a
Merge 544709763e into merged_master (Bitcoin PR #18571 )
...
This resulted in double-initializing the asset directory (and from multiple
places), so I added a `ClearGlobalAssetDir` method and called it from the
qt test setup.
2020-11-26 01:08:20 +00:00
Andrew Poelstra
6fae461783
Merge 9a2b5f22c1 into merged_master (Bitcoin PR #18338 )
2020-11-26 01:08:06 +00:00
Andrew Poelstra
ed5795f10a
Merge 67dfd18f44 into merged_master (Bitcoin PR #16902 )
2020-11-26 01:07:55 +00:00
Andrew Poelstra
cc668250eb
Merge 97aadf98d0 into merged_master (Bitcoin PR #16117 )
2020-11-26 01:07:50 +00:00
Andrew Poelstra
584ee38590
Merge 7a266a679d into merged_master (Bitcoin PR #18173 )
2020-11-26 01:07:47 +00:00
Andrew Poelstra
91e195d7cd
Merge 2d6e76af24 into merged_master (Bitcoin PR #17261 )
...
Moved GetOnlinePakKey to the scriptpubkey manager; the other blinding
stuff remains in the CWallet. At some point after the rebase we should
consider whether there's a better separation to be had between the PAK
related stuff now that we have wallet boxes.
2020-11-14 17:16:10 +00:00
Andrew Poelstra
7d7080c04e
Merge fe48ac8580 into merged_master (Bitcoin PR #18013 )
2020-11-14 16:52:12 +00:00
Andrew Poelstra
7c53615bb6
Merge af05bd9e1e into merged_master (Bitcoin PR #17891 )
2020-11-14 16:52:07 +00:00
Andrew Poelstra
75726e3bc3
Merge 40a495a38a into merged_master (Bitcoin PR #16975 )
2020-11-14 16:52:05 +00:00
Andrew Poelstra
d9db3e9012
Merge 17e14ac92f into merged_master (Bitcoin PR #17781 )
2020-11-14 16:52:03 +00:00
Andrew Poelstra
009bc2fdfb
Merge 99813a9745 into merged_master (Bitcoin PR #17829 )
2020-11-14 16:52:02 +00:00
Andrew Poelstra
7d5d0e9d6a
Merge 94c6f2bba4 into merged_master (Bitcoin PR #17593 )
2020-11-14 16:52:00 +00:00
Andrew Poelstra
c1ac820649
Merge 3914e877c4 into merged_master (Bitcoin PR #17511 )
2020-11-14 16:51:57 +00:00
Andrew Poelstra
056b9bb06d
Merge 46fc4d1a24 into merged_master (Bitcoin PR #17384 )
2020-11-09 23:10:08 +00:00
Andrew Poelstra
a2a3f277d9
Merge fba574c908 into merged_master (Bitcoin PR #17349 )
2020-11-09 21:20:50 +00:00
Andrew Poelstra
3cb664e64e
Merge 5933c6d924 into merged_master (Bitcoin PR #17228 )
2020-11-09 21:20:50 +00:00
Andrew Poelstra
c89653aa74
Merge a5224be645 into merged_master (Bitcoin PR #17292 )
2020-11-09 21:20:50 +00:00
Andrew Poelstra
bde84fefc4
Merge 3c40bc6726 into merged_master (Bitcoin PR #15921 )
2020-11-09 21:20:48 +00:00
Andrew Poelstra
34af974d28
Merge 471e5f8829 into merged_master (Bitcoin PR #16839 )
2020-11-09 21:20:47 +00:00
Andrew Poelstra
fdb06a8ceb
Merge 4c1090c882 into merged_master (Bitcoin PR #17279 )
2020-11-09 21:20:46 +00:00
Andrew Poelstra
935460299b
Merge f8cc2b967b into merged_master (Bitcoin PR #17267 )
2020-11-09 21:20:46 +00:00
Andrew Poelstra
6490a104e1
Merge 8f14d2002b into merged_master (Bitcoin PR #17183 )
2020-11-09 21:20:43 +00:00
Andrew Poelstra
821f5256a5
Merge 46d6930f8c into merged_master (Bitcoin PR #16659 )
2020-11-09 21:20:41 +00:00
Andrew Poelstra
9c3480fea9
Merge 3a3d8b8357 into merged_master (Bitcoin PR #16097 )
2020-11-09 21:20:11 +00:00
Andrew Poelstra
a50b652932
Merge 735d6b57e7 into merged_master (Bitcoin PR #16227 )
2020-11-09 03:58:21 +00:00
Andrew Poelstra
18ed97642c
Merge 28d1353f48 into merged_master (Bitcoin PR #15649 )
2020-11-09 03:58:21 +00:00
Andrew Poelstra
80e17c78a6
Merge 0a6ee9797e into merged_master (Bitcoin PR #16267 )
2020-11-09 03:58:20 +00:00
Andrew Poelstra
f30bcf51c4
Merge 91c345eb92 into merged_master (Bitcoin PR #16299 )
...
Easiest way to build this without a clean build is to first run
rm src/bench/data/block413567.raw.h
--asp
2020-11-09 03:58:19 +00:00
Andrew Poelstra
e33ff205ee
Merge 1a274bce4b into merged_master (Bitcoin PR #16205 )
2020-11-06 15:20:15 +00:00
Andrew Poelstra
68d9951825
Merge d0f81a96d9 into merged_master (Bitcoin PR #16129 )
2020-11-06 15:20:13 +00:00
