Commit graph

4624 commits

Author SHA1 Message Date
Andrew Poelstra
b7ec414b10 Merge 5925f1e652 into merged_master (Bitcoin PR bitcoin/bitcoin#21872) 2021-07-07 21:11:33 +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
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
7b25418b9c Merge 128b98fce3 into merged_master (Bitcoin PR bitcoin/bitcoin#21681) 2021-07-07 03:49:35 +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
ad61a8e5bf Merge a0f46028fc into merged_master (Bitcoin PR bitcoin/bitcoin#21814) 2021-07-06 23:36:32 +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
a61038a299 Merge fb43d7cb1e into merged_master (Bitcoin PR bitcoin/bitcoin#21787) 2021-07-06 18:06:39 +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
e64f03b7d4 Merge bf5e6a7771 into merged_master (Bitcoin PR bitcoin/bitcoin#21846) 2021-07-05 08:36:03 +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
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