Andrew Poelstra
e56472be53
Merge d2ec37221a into merged_master (Bitcoin PR bitcoin/bitcoin#21796 )
2021-07-09 17:38:32 +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
3402d0aa23
Merge 94f83534e4 into merged_master (Bitcoin PR bitcoin/bitcoin#21752 )
2021-07-09 03:24:22 +00:00
Andrew Poelstra
400268064d
Merge f8176b768a into merged_master (Bitcoin PR bitcoin/bitcoin#21836 )
2021-07-08 08:34:10 +00:00
Andrew Poelstra
b20d4cbdb5
Merge b8b6801412 into merged_master (Bitcoin PR bitcoin/bitcoin#21710 )
2021-07-07 00:26:09 +00:00
Andrew Poelstra
87c10268ee
Merge 3275c6e578 into merged_master (Bitcoin PR bitcoin/bitcoin#21727 )
2021-07-06 21:07:44 +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
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
6f238f5ad9
Merge c6d6bc8abb into merged_master (Bitcoin PR bitcoin/bitcoin#21523 )
2021-07-01 13:43:23 +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
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
6995de8b1a
Merge a839303edc into merged_master (Bitcoin PR #21244 )
2021-06-30 21:56:22 +00:00
Andrew Poelstra
a9ef79acbc
Merge 1f14130cb0 into merged_master (Bitcoin PR #21575 )
2021-06-30 03:43:01 +00:00
Andrew Poelstra
770892540f
Merge 6664211be2 into merged_master (Bitcoin PR #21574 )
2021-06-29 22:00:51 +00:00
Andrew Poelstra
d20af8f9ea
Merge 602b038d43 into merged_master (Bitcoin PR #21366 )
2021-06-29 00:32:18 +00:00
Andrew Poelstra
f313d8edec
Merge 1999baac30 into merged_master (Bitcoin PR #20228 )
2021-06-28 22:56:51 +00:00
Andrew Poelstra
2fe92c0077
Merge b1281b5d8f into merged_master (Bitcoin PR #21516 )
2021-06-28 13:25:43 +00:00
Andrew Poelstra
07d04a45c3
Merge 01bb3afb51 into merged_master (Bitcoin PR #21447 )
2021-06-27 03:13:21 +00:00
Andrew Poelstra
3b7df88c5c
Merge af6ee17545 into merged_master (Bitcoin PR #21405 )
2021-06-27 02:24:17 +00:00
Andrew Poelstra
8c54b98b25
Merge e0bc27a14c into merged_master (Bitcoin PR #21404 )
2021-06-26 22:39:09 +00:00
Andrew Poelstra
7602228cf0
Merge 92cf3a22e3 into merged_master (Bitcoin PR #21007 )
2021-06-26 19:51:03 +00:00
Andrew Poelstra
1668dac3d6
Merge 702cfc8c53 into merged_master (Bitcoin PR #21055 )
2021-06-26 01:21:19 +00:00
Andrew Poelstra
9a55d65515
Merge 92b7efcf54 into merged_master (Bitcoin PR #21148 )
2021-06-25 23:51:25 +00:00
Andrew Poelstra
362765a450
Merge b9f41df1ea into merged_master (Bitcoin PR #20685 )
2021-06-25 19:49:38 +00:00
Andrew Poelstra
37c94c9100
Merge b805dbb0b9 into merged_master (Bitcoin PR #19809 )
2021-06-24 13:52:54 +00:00
Andrew Poelstra
5a654c9bab
Merge 9017d55e7c into merged_master (Bitcoin PR #15946 )
2021-06-24 02:56:40 +00:00
Andrew Poelstra
993a3aa40e
Merge 372dd8da24 into merged_master (Bitcoin PR #21110 )
2021-06-24 02:09:12 +00:00
Andrew Poelstra
5ac1d67769
Merge 489030f2a8 into merged_master (Bitcoin PR #20965 )
2021-06-23 14:18:22 +00:00
Andrew Poelstra
401d0bb381
Merge e9c037ba64 into merged_master (Bitcoin PR #19884 )
2021-06-23 03:43:29 +00:00
Andrew Poelstra
d9966231cf
Merge 53730a78bc into merged_master (Bitcoin PR #21077 )
2021-06-21 02:17:09 +00:00
Andrew Poelstra
84118435fe
Merge ea96e17e1f into merged_master (Bitcoin PR #21060 )
2021-06-20 20:12:17 +00:00
Andrew Poelstra
81622629c1
Merge 384e090f93 into merged_master (Bitcoin PR #19509 )
2021-06-20 20:00:04 +00:00
Andrew Poelstra
bc289db9e0
Merge d0d256536c into merged_master (Bitcoin PR #21016 )
...
Copied the node.scheduler syntax to node.reverification_scheduler
2021-06-20 15:17:57 +00:00
Andrew Poelstra
2885d86bf7
Merge 44f4bcd302 into merged_master (Bitcoin PR #20749 )
...
More-or-less mechanical fixes to conflicts (checking upstream diff and chasing
compiler errors).
2021-06-20 14:54:25 +00:00
Andrew Poelstra
78dca68c7e
Merge 11d3b58336 into merged_master (Bitcoin PR #20757 )
2021-06-19 00:52:39 +00:00
Andrew Poelstra
a7f2499713
Merge b386d37360 into merged_master (Bitcoin PR #18710 )
2021-06-18 19:12:18 +00:00
Andrew Poelstra
f9d79c1220
Merge 60427ee35f into merged_master (Bitcoin PR #20811 )
2021-06-17 20:33:57 +00:00
Andrew Poelstra
c5a022192f
Merge d7e2401c62 into merged_master (Bitcoin PR #18077 )
2021-06-17 01:59:15 +00:00
Andrew Poelstra
3fb1d0400a
Merge 6f97172b42 into merged_master (Bitcoin PR #20649 )
2021-06-16 14:59:59 +00:00
Andrew Poelstra
cf9987e280
Merge 1be6f2dba9 into merged_master (Bitcoin PR #20747 )
2021-06-15 23:25:42 +00:00
Andrew Poelstra
51f8ec379c
Merge cfbfd389f6 into merged_master (Bitcoin PR #20668 )
2021-06-14 23:39:00 +00:00
Andrew Poelstra
40b55f89b0
Merge 3f205808a5 into merged_master (Bitcoin PR #20605 )
2021-06-14 18:26:20 +00:00
Andrew Poelstra
f40eadb344
Merge f1f2418433 into merged_master (Bitcoin PR #20253 )
2021-06-14 05:07:49 +00:00
Andrew Poelstra
098565e3b7
Merge 6a48063671 into merged_master (Bitcoin PR #19858 )
2021-06-14 00:48:50 +00:00
Andrew Poelstra
df67e5b1dd
Merge f5b2ea3e59 into merged_master (Bitcoin PR #20217 )
2021-06-13 18:57:45 +00:00
Andrew Poelstra
7a7791e879
Merge 03b1db6114 into merged_master (Bitcoin PR #18766 )
2021-06-11 16:59:19 +00:00
Andrew Poelstra
34db56ae3a
Merge 9385549a31 into merged_master (Bitcoin PR #20581 )
2021-06-11 13:09:57 +00:00
Andrew Poelstra
f8af0d7192
Merge cd720337fe into merged_master (Bitcoin PR #20222 )
2021-06-10 18:30:29 +00:00
