Andrew Poelstra
d4e09a0738
Merge 2448457cca into merged_master (Bitcoin PR #21830 )
2021-07-05 01:53:52 +00:00
Andrew Poelstra
3c9222f410
Merge 59869704c0 into merged_master (Bitcoin PR bitcoin/bitcoin#21818 )
2021-07-05 01:03:56 +00:00
Andrew Poelstra
ab260dd10b
Merge f2865b7394 into merged_master (Bitcoin PR bitcoin/bitcoin#21811 )
2021-07-05 00:13:57 +00:00
Andrew Poelstra
27eff4ad45
Merge d22e7ee933 into merged_master (Bitcoin PR bitcoin/bitcoin#21822 )
...
Adding an iteration cap to a fuzztest in this PR, not because it
has anything to do with this PR, but because this is where the
merge script happened to be when I was done investigating 100+
minute fuzzer runs.
Added a comment explaining the rationale for the iteration cap.
2021-07-04 23:52:11 +00:00
Andrew Poelstra
608e6123b8
Merge bb11a988fa into merged_master (Bitcoin PR bitcoin/bitcoin#21793 )
2021-07-04 22:12:43 +00:00
Andrew Poelstra
06f0492f4a
Merge 13f24d135b into merged_master (Bitcoin PR bitcoin-core/gui#298 )
2021-07-04 21:03:26 +00:00
Andrew Poelstra
c4182106af
Merge 2b45cf0bcd into merged_master (Bitcoin PR bitcoin/bitcoin#19521 )
...
This is part of the "UTXO Set Statistics" project in Core, which aims
to make things like "checking coin supply" faster. This stuff, and
related things in coinstats.cpp, have always been broken for Elements
in the sense that we consider only explicit outputs and we ignore
assets (so everything just gets added together to get a meaningless
total). It probably wouldn't be too hard to restrict this to only
consider policyAsset, but it's out of scope for a rebase IMO.
Also, I think this situation is fine .. I don't understand the motivation
for this or why Core is merging this when they refuse to merge an address
index .. but I guess we'll see if there are users who care about this data
and who care about it being meaningful on Elements.
Also, apologies for the big diff -- there were some mechanical changes
to deal with CT amounts, but most of the changes related to the difference
in how fees are accounted for. While I'm not thrilled with this PR, its
functional test is really good! So I think what I eventually came up with
is internally consistent.
2021-07-04 19:51:38 +00:00
Andrew Poelstra
222850a864
Merge 480bf01c29 into merged_master (Bitcoin PR bitcoin-core/gui#300 )
2021-07-04 01:54:07 +00:00
Andrew Poelstra
1e75f936fb
Merge e1e1e708fa into merged_master (Bitcoin PR bitcoin-core/gui#125 )
2021-07-04 00:43:33 +00:00
Andrew Poelstra
583e314e71
Merge 298fd02e4a into merged_master (Bitcoin PR bitcoin/bitcoin#21045 )
2021-07-03 23:33:29 +00:00
Andrew Poelstra
4485d3c785
Merge 40310f5e8c into merged_master (Bitcoin PR bitcoin/bitcoin#21792 )
2021-07-03 22:18:16 +00:00
Andrew Poelstra
a8362769f4
Merge d9ae6ec892 into merged_master (Bitcoin PR bitcoin/bitcoin#21759 )
2021-07-03 20:38:21 +00:00
Andrew Poelstra
6cb16b5c8e
Merge 16d0051c6a into merged_master (Bitcoin PR bitcoin/bitcoin#21688 )
2021-07-03 18:51:29 +00:00
Andrew Poelstra
16e3fcba46
Merge a7a193789e into merged_master (Bitcoin PR bitcoin/bitcoin#21804 )
2021-07-03 17:11:33 +00:00
Andrew Poelstra
e300bdf641
Merge 1daca9f9a9 into merged_master (Bitcoin PR bitcoin/bitcoin#21738 )
2021-07-03 15:30:12 +00:00
Andrew Poelstra
6b565b9878
Merge fb66dbe786 into merged_master (Bitcoin PR bitcoin/bitcoin#21762 )
2021-07-03 13:46:53 +00:00
Andrew Poelstra
a02abbc35a
Merge 7f37a1d560 into merged_master (Bitcoin PR bitcoin/bitcoin#21785 )
2021-07-03 08:56:11 +00:00
Andrew Poelstra
b58c89e582
Merge 2cbb4ab7a9 into merged_master (Bitcoin PR bitcoin/bitcoin#21658 )
2021-07-03 07:17:41 +00:00
Andrew Poelstra
10ee57280a
Merge 4cfe6c37d9 into merged_master (Bitcoin PR bitcoin/bitcoin#18847 )
2021-07-03 05:39:04 +00:00
Andrew Poelstra
4b9e6df7a5
Merge 328da33557 into merged_master (Bitcoin PR bitcoin-core/gui#18 )
2021-07-02 20:34:29 +00:00
Andrew Poelstra
ae471dc6a5
Merge 549d20a31b into merged_master (Bitcoin PR bitcoin/bitcoin#20772 )
2021-07-02 14:19:51 +00:00
Andrew Poelstra
ac9594fd74
Merge bd2e2d5c64 into merged_master (Elements PR ElementsProject/elements#1012 )
...
Took the non-backported version of base_encode_decode from https://github.com/bitcoin/bitcoin/pull/22279
2021-07-02 03:42:38 +00:00
Andrew Poelstra
d51f42534f
Merge e45863166f into merged_master (Bitcoin PR bitcoin/bitcoin#21169 )
...
Adds fuzztests for RPC. FIXME there is a crash; I just disabled the
test for now and we can revisit in a future PR.
2021-07-01 17:04:41 +00:00
Steven Roose
bd2e2d5c64
Merge ElementsProject/elements#1012 : fuzz: backport fixes to fuzzer errors
...
0896d0a2785f18d337d499b86594dfc98902bd1bhttps://github.com/bitcoin/bitcoin/pull/22279 and https://github.com/bitcoin/bitcoin/pull/22002 and https://github.com/bitcoin/bitcoin/pull/22137
ACKs for top commit:
jonasnick:
utACK 0896d0a278
2021-07-01 16:58:21 +01:00
Andrew Poelstra
02a627ac8d
Merge edf679503c into merged_master (Bitcoin PR bitcoin/bitcoin#21783 )
2021-07-01 14:17:54 +00:00
Andrew Poelstra
d9730235a4
Merge bce09da122 into merged_master (Bitcoin PR bitcoin/bitcoin#21773 )
2021-07-01 14:05:24 +00:00
Andrew Poelstra
6f238f5ad9
Merge c6d6bc8abb into merged_master (Bitcoin PR bitcoin/bitcoin#21523 )
2021-07-01 13:43:23 +00:00
Andrew Poelstra
5f0c45b568
Merge ac219dcbcc into merged_master (Bitcoin PR bitcoin/bitcoin#19160 )
2021-07-01 13:29:36 +00:00
Andrew Poelstra
95ab1aa7cb
Merge 19a56d1519 into merged_master (Bitcoin PR bitcoin/bitcoin#21009 )
2021-07-01 04:00:30 +00:00
Andrew Poelstra
33d8878160
Merge f8f55522c4 into merged_master (Bitcoin PR bitcoin/bitcoin#21746 )
2021-07-01 03:48:03 +00:00
Andrew Poelstra
e8fbb8c8bd
Merge 683dda2a70 into merged_master (Bitcoin PR bitcoin/bitcoin#21777 )
2021-07-01 03:35:37 +00:00
Andrew Poelstra
ff1af2ca5d
Merge 74a960a220 into merged_master (Bitcoin PR bitcoin/bitcoin#21714 )
2021-07-01 03:22:26 +00:00
Andrew Poelstra
11f8520ec2
Merge 0a0a95b9d6 into merged_master (Bitcoin PR bitcoin/bitcoin#21707 )
2021-07-01 02:52:46 +00:00
Andrew Poelstra
3479bcceec
Merge c4571a0c39 into merged_master (Bitcoin PR bitcoin-core/gui#284 )
2021-07-01 02:40:15 +00:00
Andrew Poelstra
931655f99d
Merge 8f80092d78 into merged_master (Bitcoin PR bitcoin/bitcoin#21563 )
2021-07-01 02:07:23 +00:00
Andrew Poelstra
0f00842a22
Merge 66fd3b28e8 into merged_master (Bitcoin PR bitcoin/bitcoin#21732 )
2021-07-01 01:54:34 +00:00
Andrew Poelstra
827081b134
Merge 4b5659c6b1 into merged_master (Bitcoin PR bitcoin/bitcoin#19801 )
2021-07-01 01:35:09 +00:00
Andrew Poelstra
ba678ce2f3
Merge aaf66413e1 into merged_master (Bitcoin PR bitcoin/bitcoin#21564 )
2021-07-01 01:12:06 +00:00
Andrew Poelstra
f1c8929947
Merge e7776e20ed into merged_master (Bitcoin PR bitcoin-core/gui#286 )
2021-07-01 00:59:40 +00:00
Andrew Poelstra
06129d0540
Merge e16f8720dc into merged_master (Bitcoin PR #21655 )
2021-07-01 00:46:45 +00:00
Andrew Poelstra
0e8bf9479e
Merge e507acb118 into merged_master (Bitcoin PR #20353 )
2021-07-01 00:33:27 +00:00
Andrew Poelstra
dd87547295
Merge 2bce9329e8 into merged_master (Bitcoin PR bitcoin/bitcoin#21719 )
2021-07-01 00:20:39 +00:00
Andrew Poelstra
7d4d030ccc
Merge f385ad7651 into merged_master (Bitcoin PR bitcoin-core/gui#263 )
2021-07-01 00:05:46 +00:00
Andrew Poelstra
a04f19cbf2
Merge bca00942ed into merged_master (Bitcoin PR bitcoin/bitcoin#21731 )
2021-06-30 23:48:23 +00:00
Andrew Poelstra
d58adf1d3b
Merge 90e0faaa44 into merged_master (Bitcoin PR #21694 )
2021-06-30 23:11:36 +00:00
Andrew Poelstra
a4e1fd2f33
Merge 0180453471 into merged_master (Bitcoin PR #21595 )
2021-06-30 22:59:13 +00:00
Andrew Poelstra
7a6382c3ac
Merge 30a86bb814 into merged_master (Bitcoin PR bitcoin/bitcoin#21733 )
2021-06-30 22:46:44 +00:00
Andrew Poelstra
d6417d70e8
Merge 572b36d4ff into merged_master (Bitcoin PR bitcoin/bitcoin#21736 )
2021-06-30 22:34:04 +00:00
Andrew Poelstra
579df93eb7
Merge 906ecb87c8 into merged_master (Bitcoin PR #21238 )
2021-06-30 22:21:20 +00:00
Andrew Poelstra
d273c001cc
Merge de77cbc9d8 into merged_master (Bitcoin PR bitcoin/bitcoin#21691 )
2021-06-30 22:08:56 +00:00
