Andrew Poelstra
e0b40dae0d
Merge a7d17daa5c into merged_master (Bitcoin PR bitcoin/bitcoin#22086 )
2021-07-20 20:29:41 +00:00
Andrew Poelstra
b654bb7f5e
Merge f63fc53c2a into merged_master (Bitcoin PR bitcoin/bitcoin#21767 )
2021-07-20 05:10:30 +00:00
Andrew Poelstra
fcdbd75e5b
Merge c91589dc2d into merged_master (Bitcoin PR bitcoin/bitcoin#22005 )
2021-07-20 03:41:04 +00:00
Andrew Poelstra
f39648bfe5
Merge 5cf92c32d1 into merged_master (Bitcoin PR bitcoin/bitcoin#21969 )
2021-07-20 02:11:14 +00:00
Andrew Poelstra
62962e335d
Merge 62d9ff9e6e into merged_master (Bitcoin PR bitcoin/bitcoin#22107 )
2021-07-19 23:51:25 +00:00
Andrew Poelstra
564e6fb94b
Merge 8c6df2b4ca into merged_master (Bitcoin PR bitcoin/bitcoin#22095 )
2021-07-19 14:35:04 +00:00
Andrew Poelstra
8a669eccfb
Merge 7257e50dba into merged_master (Bitcoin PR bitcoin/bitcoin#20833 )
2021-07-18 18:11:25 +00:00
Andrew Poelstra
92436f454e
Merge e20745c1bd into merged_master (Bitcoin PR bitcoin/bitcoin#22029 )
2021-07-18 14:08:58 +00:00
Andrew Poelstra
95ce7de90f
Merge 707ba8692b into merged_master (Bitcoin PR bitcoin/bitcoin#21966 )
2021-07-17 20:20:55 +00:00
Andrew Poelstra
84be3d46b1
Merge 48c86eca02 into merged_master (Bitcoin PR bitcoin/bitcoin#22069 )
2021-07-17 17:28:29 +00:00
Andrew Poelstra
092f386da0
Merge d3fa42c795 into merged_master (Bitcoin PR bitcoin/bitcoin#21186 )
2021-07-12 17:45:04 +00:00
Andrew Poelstra
d1bbcf2a0a
Merge ce4a852475 into merged_master (Bitcoin PR bitcoin/bitcoin#21848 )
2021-07-12 16:38:25 +00:00
Andrew Poelstra
29a8292858
Merge 599000903e into merged_master (Bitcoin PR bitcoin/bitcoin#21850 )
...
Copied GetMainchainAuthCookieFile logic from GetAuthCookieFile, since
the former no longer compiled.
2021-07-12 15:20:15 +00:00
Andrew Poelstra
2a2bbdaee3
Merge be4171679b into merged_master (Bitcoin PR bitcoin/bitcoin#21953 )
2021-07-12 03:35:40 +00:00
Andrew Poelstra
cfd16b90ca
Merge eb4df9a628 into merged_master (Bitcoin PR bitcoin/bitcoin#22004 )
2021-07-11 23:59:16 +00:00
Andrew Poelstra
d509636ace
Merge ac5f7f47c1 into merged_master (Bitcoin PR bitcoin/bitcoin#21936 )
2021-07-11 22:52:59 +00:00
Andrew Poelstra
b9027c994c
Merge 1cc38d3e01 into merged_master (Bitcoin PR bitcoin/bitcoin#22003 )
2021-07-11 21:46:30 +00:00
Andrew Poelstra
bae18ea9ed
Merge 37e9f07996 into merged_master (Bitcoin PR bitcoin/bitcoin#21843 )
2021-07-11 17:21:19 +00:00
Andrew Poelstra
ff432ef70e
Merge 7d19c85f4a into merged_master (Bitcoin PR bitcoin/bitcoin#21970 )
2021-07-11 15:08:31 +00:00
Andrew Poelstra
ba0573cbe6
Merge 39d597d362 into merged_master (Bitcoin PR bitcoin/bitcoin#21659 )
2021-07-11 06:31:37 +00:00
Andrew Poelstra
3074da475f
Merge 4da26fb85d into merged_master (Bitcoin PR bitcoin/bitcoin#21506 )
2021-07-11 04:19:15 +00:00
Andrew Poelstra
1cb298ae73
Merge 2fc111b6e3 into merged_master (Bitcoin PR bitcoin/bitcoin#21985 )
2021-07-11 02:06:30 +00:00
Andrew Poelstra
7d5047620a
Merge b82c3a0075 into merged_master (Bitcoin PR bitcoin/bitcoin#21929 )
2021-07-10 14:44:01 +00:00
Andrew Poelstra
1fd44e5dfc
Merge ee9befe8b4 into merged_master (Bitcoin PR bitcoin/bitcoin#21584 )
2021-07-09 21:14:15 +00:00
Andrew Poelstra
e56472be53
Merge d2ec37221a into merged_master (Bitcoin PR bitcoin/bitcoin#21796 )
2021-07-09 17:38:32 +00:00
Andrew Poelstra
d8f9c34946
Merge 91db985bc9 into merged_master (Bitcoin PR bitcoin/bitcoin#21927 )
2021-07-09 16:21:26 +00:00
Andrew Poelstra
99cc7a5245
Merge 2e30e328a7 into merged_master (Bitcoin PR bitcoin/bitcoin#19064 )
2021-07-09 13:03:17 +00:00
Andrew Poelstra
2d5af8c458
Merge 6754e1928b into merged_master (Bitcoin PR bitcoin/bitcoin#21922 )
2021-07-09 07:45:40 +00:00
Andrew Poelstra
37dd8140a6
Merge f0a76b3dbc into merged_master (Bitcoin PR bitcoin/bitcoin#21892 )
2021-07-09 06:40:31 +00:00
Andrew Poelstra
0c0d7cf29c
Merge 88dc09d759 into merged_master (Bitcoin PR bitcoin/bitcoin#21909 )
2021-07-09 05:35:04 +00:00
Andrew Poelstra
edd579466f
Merge e175a20769 into merged_master (Bitcoin PR bitcoin/bitcoin#21644 )
2021-07-09 04:29:45 +00:00
Andrew Poelstra
9ea813efb8
Merge 4a26705761 into merged_master (Bitcoin PR bitcoin/bitcoin#21902 )
2021-07-09 00:08:06 +00:00
Andrew Poelstra
31519bf533
Merge c9b051b58f into merged_master (Bitcoin PR bitcoin/bitcoin#21891 )
2021-07-08 10:44:48 +00:00
Andrew Poelstra
9c4837db05
Merge adf7843410 into merged_master (Bitcoin PR bitcoin/bitcoin#21786 )
2021-07-08 02:57:17 +00:00
Andrew Poelstra
b30d96864f
Merge 3028a1e384 into merged_master (Bitcoin PR bitcoin/bitcoin#21581 )
2021-07-07 23:22:36 +00:00
Andrew Poelstra
4ab5109c93
Merge 86e04741dd into merged_master (Bitcoin PR bitcoin/bitcoin#21890 )
2021-07-07 22:16:39 +00:00
Andrew Poelstra
1254ad9cdb
Merge 21d6fed815 into merged_master (Bitcoin PR bitcoin/bitcoin#21884 )
2021-07-07 18:54:37 +00:00
Andrew Poelstra
e873c758fa
Merge 9313c4e6aa into merged_master (Bitcoin PR bitcoin/bitcoin#21874 )
2021-07-07 17:46:26 +00:00
Andrew Poelstra
b2376cfef6
Merge 1fcf66af68 into merged_master (Bitcoin PR bitcoin/bitcoin#21798 )
2021-07-07 06:18:42 +00:00
Andrew Poelstra
7b25418b9c
Merge 128b98fce3 into merged_master (Bitcoin PR bitcoin/bitcoin#21681 )
2021-07-07 03:49:35 +00:00
Andrew Poelstra
3850e85010
Merge 32f1f021bf into merged_master (Bitcoin PR bitcoin/bitcoin#21817 )
2021-07-07 02:29:25 +00:00
Andrew Poelstra
9e86b11c75
Merge 75b3a32f03 into merged_master (Bitcoin PR bitcoin/bitcoin#21821 )
2021-07-06 18:56:18 +00:00
Andrew Poelstra
2306e2c134
Merge 3f8f238deb into merged_master (Bitcoin PR bitcoin/bitcoin#21849 )
2021-07-05 23:18:57 +00:00
Andrew Poelstra
5a7343536d
Merge e2d4e67a8f into merged_master (Bitcoin PR bitcoin/bitcoin#21840 )
2021-07-05 12:34:58 +00:00
Andrew Poelstra
0642c8aeab
Merge ea71726a54 into merged_master (Bitcoin PR bitcoin/bitcoin#21810 )
2021-07-05 06:53:37 +00:00
Andrew Poelstra
fb60da4597
Merge 60132382a7 into merged_master (Bitcoin PR bitcoin/bitcoin#20867 )
2021-07-29 13:40:05 +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
10ee57280a
Merge 4cfe6c37d9 into merged_master (Bitcoin PR bitcoin/bitcoin#18847 )
2021-07-03 05:39:04 +00:00
Andrew Poelstra
ae471dc6a5
Merge 549d20a31b into merged_master (Bitcoin PR bitcoin/bitcoin#20772 )
2021-07-02 14:19:51 +00:00
