Andrew Poelstra
3c9222f410
Merge 59869704c0 into merged_master (Bitcoin PR bitcoin/bitcoin#21818 )
2021-07-05 01:03:56 +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
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
4485d3c785
Merge 40310f5e8c into merged_master (Bitcoin PR bitcoin/bitcoin#21792 )
2021-07-03 22:18:16 +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
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
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
e8fbb8c8bd
Merge 683dda2a70 into merged_master (Bitcoin PR bitcoin/bitcoin#21777 )
2021-07-01 03:35:37 +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
827081b134
Merge 4b5659c6b1 into merged_master (Bitcoin PR bitcoin/bitcoin#19801 )
2021-07-01 01:35:09 +00:00
Andrew Poelstra
b791c544d7
Merge 83c715415a into merged_master (Bitcoin PR #20857 )
2021-06-30 21:04:37 +00:00
Andrew Poelstra
2905d3d747
Merge a47ae618a0 into merged_master (Bitcoin PR #21718 )
2021-06-30 19:33:08 +00:00
Andrew Poelstra
990e799b8f
Merge 8e69370b15 into merged_master (Bitcoin PR #21712 )
2021-06-30 18:15:06 +00:00
Andrew Poelstra
6d4961766a
Merge 2cd834e6c0 into merged_master (Bitcoin PR #21377 )
2021-06-30 16:24:18 +00:00
Andrew Poelstra
b51a61f5cc
Merge 773f8c1a7d into merged_master (Bitcoin PR #21678 )
2021-06-30 13:56:28 +00:00
Andrew Poelstra
7d5bc3ab04
Merge b8e5bbdf93 into merged_master (Bitcoin PR #21669 )
2021-06-30 13:06:15 +00:00
Andrew Poelstra
b945a1dacf
Merge a1f0b8b62e into merged_master (Bitcoin PR #21634 )
2021-06-30 12:41:09 +00:00
Andrew Poelstra
a9ef79acbc
Merge 1f14130cb0 into merged_master (Bitcoin PR #21575 )
2021-06-30 03:43:01 +00:00
Andrew Poelstra
f2bd5dd18b
Merge f0b457212f into merged_master (Bitcoin PR #21467 )
2021-07-27 01:26:50 +00:00
Andrew Poelstra
83785ab18c
Merge cb79cabdd9 into merged_master (Bitcoin PR #21594 )
2021-06-29 21:29:09 +00:00
Andrew Poelstra
39c9dbe3c6
Merge 245a5cd560 into merged_master (Bitcoin PR #21166 )
2021-06-29 20:13:10 +00:00
Andrew Poelstra
d889478cd5
Merge 328aaac80d into merged_master (Bitcoin PR #21597 )
2021-06-29 17:09:23 +00:00
Andrew Poelstra
e5dc4dd1d6
Merge 1ea5c7ec78 into merged_master (Bitcoin PR #21604 )
2021-06-29 15:59:54 +00:00
Andrew Poelstra
638473471d
Merge 824eea5643 into merged_master (Bitcoin PR #21599 )
2021-06-29 15:34:39 +00:00
Andrew Poelstra
1ec76a8dfe
Merge 590e49ccf2 into merged_master (Bitcoin PR #21586 )
2021-06-29 14:49:49 +00:00
Andrew Poelstra
4b7d6fdcaa
Merge 7aa0d8adf8 into merged_master (Bitcoin PR #21063 )
2021-06-29 03:15:39 +00:00
Andrew Poelstra
54d3d598e1
Merge 6e22b522f9 into merged_master (Bitcoin PR #21373 )
2021-06-29 02:06:38 +00:00
Andrew Poelstra
d20af8f9ea
Merge 602b038d43 into merged_master (Bitcoin PR #21366 )
2021-06-29 00:32:18 +00:00
Andrew Poelstra
d39d57c704
Merge 1c7be9ab90 into merged_master (Bitcoin PR #20286 )
...
I hate this PR.
2021-06-28 21:30:17 +00:00
Andrew Poelstra
6af6d1bc4e
Merge 4399dc8142 into merged_master (Bitcoin PR #21509 )
2021-06-28 18:36:41 +00:00
Andrew Poelstra
d976552b1c
Merge 9b48b3ac42 into merged_master (Bitcoin PR #21390 )
...
Diff reduction :) again just had to replace some fixed hashes
2021-06-28 15:54:24 +00:00
Andrew Poelstra
c1cf0e6fa4
Merge ed49203daa into merged_master (Bitcoin PR #21357 )
2021-06-28 13:58:19 +00:00
Andrew Poelstra
8fea4687f4
Merge 7ce7ce5716 into merged_master (Bitcoin PR #21338 )
2021-06-28 13:00:43 +00:00
Andrew Poelstra
1c58e32ee6
Merge 4132193617 into merged_master (Bitcoin PR #21040 )
2021-06-27 21:04:51 +00:00
Andrew Poelstra
a4e0826481
Merge 3530d5d2d8 into merged_master (Bitcoin PR #18335 )
2021-06-27 20:40:06 +00:00
Andrew Poelstra
d44ce3a73f
Merge 8ec881d3b6 into merged_master (Bitcoin PR #20861 )
2021-06-27 19:12:42 +00:00
Andrew Poelstra
ac1581a22d
Merge 5ef16038a1 into merged_master (Bitcoin PR #21410 )
2021-06-27 03:49:38 +00:00
Andrew Poelstra
d16103e6c4
Merge b650c9140e into merged_master (Bitcoin PR #21141 )
2021-06-27 01:12:01 +00:00
Andrew Poelstra
43d7756b36
Merge e9b6400a1e into merged_master (Bitcoin PR #21411 )
2021-06-26 21:31:48 +00:00
Andrew Poelstra
6ab18fa738
Merge 3172615d2c into merged_master (Elements PR ElementsProject/elements#986 )
...
Note: up to this point I still had the old "sort by UNIX timestamp"
behavior on, which may have meant that some PRs were merged out of
order (i.e. multiple merged at once, followed by no-op merges). I
turned this off, and now just use git's default topo-sort (and manually
switch between Elements merges and Bitcoin merges).
2021-06-26 20:57:54 +00:00
Andrew Poelstra
23a49336e0
Merge ceb6df391f into merged_master (Bitcoin PR #21388 )
2021-06-26 17:14:29 +00:00
Andrew Poelstra
24a86af27b
Merge a8b0892b74 into merged_master (Bitcoin PR #20536 )
...
This PR adds a new functional test which unfortunately we need to disable
because it triggers an unrelated Elements bug (assertation failure when
attempting a large fundrawtransaction).
See https://github.com/ElementsProject/elements/issues/880
2021-06-26 14:25:24 +00:00
Andrew Poelstra
f651c29f92
Merge f7653eb5ae into merged_master (Bitcoin PR #21345 )
2021-06-26 02:23:36 +00:00
Andrew Poelstra
90f1f6650b
Merge fbf5d16238 into merged_master (Bitcoin PR #21246 )
2021-06-26 01:58:32 +00:00
Andrew Poelstra
9a55d65515
Merge 92b7efcf54 into merged_master (Bitcoin PR #21148 )
2021-06-25 23:51:25 +00:00
Andrew Poelstra
367a454b34
Merge d099894ec1 into merged_master (Bitcoin PR #20969 )
2021-06-25 23:39:05 +00:00
