Commit graph

33020 commits

Author SHA1 Message Date
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
b7ec414b10 Merge 5925f1e652 into merged_master (Bitcoin PR bitcoin/bitcoin#21872) 2021-07-07 21:11:33 +00:00
Andrew Poelstra
adc947f6ca Merge 8d5a0583c4 into merged_master (Bitcoin PR bitcoin/bitcoin#21869) 2021-07-07 20:02:50 +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
21558d641d Merge eb9a1fe037 into merged_master (Bitcoin PR bitcoin/bitcoin#21802) 2021-07-07 16:15:26 +00:00
Andrew Poelstra
45fdf8809b Merge a33f360fcd into merged_master (Bitcoin PR bitcoin/bitcoin#21873) 2021-07-07 15:10:12 +00:00
Andrew Poelstra
086262250a Merge a0d1d487e9 into merged_master (Bitcoin PR bitcoin/bitcoin#21845) 2021-07-07 14:05:11 +00:00
Andrew Poelstra
bf5cf2b070 Merge 06d573f053 into merged_master (Bitcoin PR bitcoin/bitcoin#21867) 2021-07-07 13:00:25 +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
fb81781ca1 Merge 9c05da4a5c into merged_master (Bitcoin PR bitcoin/bitcoin#21865) 2021-07-07 05:28:58 +00:00
Andrew Poelstra
086ab9fa9c Merge f8575bce31 into merged_master (Bitcoin PR bitcoin/bitcoin#21864) 2021-07-07 04:39:12 +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
6ce592d7cd Merge 1b9a5236e9 into merged_master (Bitcoin PR bitcoin/bitcoin#21740) 2021-07-07 01:15:58 +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
ad61a8e5bf Merge a0f46028fc into merged_master (Bitcoin PR bitcoin/bitcoin#21814) 2021-07-06 23:36:32 +00:00
Andrew Poelstra
50835e366e Merge 576300afb0 into merged_master (Bitcoin PR bitcoin/bitcoin#21856) 2021-07-06 22:46:46 +00:00
Andrew Poelstra
a5a02a17ab Merge 54617fad99 into merged_master (Bitcoin PR bitcoin/bitcoin#21709) 2021-07-06 21:57:10 +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
7cb5955c4e Merge 23109cc548 into merged_master (Bitcoin PR bitcoin/bitcoin#21753) 2021-07-06 19:46:06 +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
a61038a299 Merge fb43d7cb1e into merged_master (Bitcoin PR bitcoin/bitcoin#21787) 2021-07-06 18:06:39 +00:00
Andrew Poelstra
37ae37747f Merge df21e500d6 into merged_master (Bitcoin PR bitcoin/bitcoin#21427) 2021-07-06 17:16:56 +00:00
Andrew Poelstra
4c47eb18c3 Merge cdcf82622d into merged_master (Bitcoin PR bitcoin/bitcoin#21629) 2021-07-06 16:25:52 +00:00
Andrew Poelstra
cc047c66f0 Merge b7c2625703 into merged_master (Bitcoin PR bitcoin/bitcoin#21664) 2021-07-06 15:36:05 +00:00
Andrew Poelstra
2e922f24f4 Merge 00a9b0647e into merged_master (Bitcoin PR bitcoin/bitcoin#21799) 2021-07-06 14:46:04 +00:00
Andrew Poelstra
ab1e80eb09 Merge 779aaa7f03 into merged_master (Bitcoin PR bitcoin/bitcoin#21754)
What a pain in the ass. This changes the `feature_cltv` functional test
to use the `MiniWallet`, an internal Pythonic wallet that produces
"signatures" consisting of several OP_NOPs in a row, so that this test
can be used when the wallet is disabled.

This means that the functions in feature_cltv which add a CLTV check and
change the locktime/sequence number no longer need to re-sign when they
change the txid, so they don't...HOWEVER, our Elements-specific
`feature_block_v4` test calls these functions with a real transaction
and depended on the re-signing behavior.

After several attempts at min-effort min-diff fixes I landed on this,
which simply sets the locktime at transaction creation and avoids having
to re-sign at all.

Also, I had to change the number of NOPs in the fake wallet code to make
a vsize assertion pass, presumably because of differences in Bitcoin/Elements
transaction serialization.
2021-07-06 13:53:02 +00:00
Andrew Poelstra
44f58478b0 Merge dc8da2a685 into merged_master (Bitcoin PR bitcoin/bitcoin#21824) 2021-07-06 00:08:45 +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
566f94ccc5 Merge a1c6434e19 into merged_master (Bitcoin PR bitcoin/bitcoin#21852) 2021-07-05 22:27:26 +00:00
Andrew Poelstra
488cc1141f Merge 0ca8b7e7ec into merged_master (Bitcoin PR bitcoin/bitcoin#21812) 2021-07-05 21:35:49 +00:00
Andrew Poelstra
56e5c4c75e Merge ab9a566ab3 into merged_master (Bitcoin PR bitcoin/bitcoin#21825) 2021-07-05 13:26:39 +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
e64f03b7d4 Merge bf5e6a7771 into merged_master (Bitcoin PR bitcoin/bitcoin#21846) 2021-07-05 08:36:03 +00:00
Andrew Poelstra
42d564fdc8 Merge 8e1c06846e into merged_master (Bitcoin PR bitcoin/bitcoin#21662) 2021-07-05 07:44:52 +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
bfdf82b18f Merge 3692097d92 into merged_master (Bitcoin PR bitcoin/bitcoin#21823) 2021-07-05 06:03:49 +00:00
Andrew Poelstra
b67a98b030 Merge b8593616dc into merged_master (Bitcoin PR bitcoin/bitcoin#21775) 2021-07-05 05:13:53 +00:00
Andrew Poelstra
d95da2d3b1 Merge 320e518b90 into merged_master (Bitcoin PR bitcoin/bitcoin#21750) 2021-07-05 04:24:00 +00:00
Andrew Poelstra
bf708b833a Merge 77d569ccb5 into merged_master (Bitcoin PR bitcoin/bitcoin#19817) 2021-07-05 03:33:56 +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
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