Andrew Poelstra
9ea813efb8
Merge 4a26705761 into merged_master (Bitcoin PR bitcoin/bitcoin#21902 )
2021-07-09 00:08:06 +00:00
Andrew Poelstra
8d570c2dcb
Merge 4bc3b16349 into merged_master (Bitcoin PR bitcoin-core/gui#293 )
2021-07-08 23:02:50 +00:00
Andrew Poelstra
77bd932406
Merge b49fe0a75a into merged_master (Bitcoin PR bitcoin-core/gui#280 )
2021-07-08 21:57:18 +00:00
Andrew Poelstra
b3ee198bfb
Merge a2bdbdb358 into merged_master (Bitcoin PR bitcoin-core/gui#194 )
2021-07-08 20:52:32 +00:00
Andrew Poelstra
e8208438a1
Merge 8d7125f80e into merged_master (Bitcoin PR bitcoin-core/gui#257 )
2021-07-08 19:44:35 +00:00
Andrew Poelstra
d56bdbd28f
Merge 32692d2681 into merged_master (Bitcoin PR bitcoin/bitcoin#21359 )
...
I hacked up rpc_fundrawtransaction.py a little bit because our `get_address`
method here depends on nobody having called `createwallet` on a particular
node ... the "correct" fix for this would be to redo the Elements changes
to this functional test for the 0.20+ createwallet changes, but because
there will be big future changes to this test (in Elements #900 (PSET))
I did the quick/hacky thing, and will defer cleanups to a separate
post-rebase PR.
2021-07-08 16:08:49 +00:00
Andrew Poelstra
655a4393b2
Merge 8bed1706ea into merged_master (Bitcoin PR bitcoin-core/gui#296 )
2021-07-08 14:02:15 +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
16944dd222
Merge c49d246647 into merged_master (Bitcoin PR bitcoin/bitcoin#21745 )
2021-07-08 09:39:26 +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
c9aa9a8d18
Merge 1591e35049 into merged_master (Bitcoin PR bitcoin/bitcoin#21708 )
2021-07-08 04:02:44 +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
c40a9ecf0f
Merge 2a22d903f3 into merged_master (Bitcoin PR bitcoin/bitcoin#21897 )
2021-07-08 00:27:49 +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
b7ec414b10
Merge 5925f1e652 into merged_master (Bitcoin PR bitcoin/bitcoin#21872 )
2021-07-07 21:11:33 +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
086262250a
Merge a0d1d487e9 into merged_master (Bitcoin PR bitcoin/bitcoin#21845 )
2021-07-07 14:05:11 +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
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
9e86b11c75
Merge 75b3a32f03 into merged_master (Bitcoin PR bitcoin/bitcoin#21821 )
2021-07-06 18:56:18 +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
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
0642c8aeab
Merge ea71726a54 into merged_master (Bitcoin PR bitcoin/bitcoin#21810 )
2021-07-05 06:53:37 +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
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
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
Andrew Poelstra
222850a864
Merge 480bf01c29 into merged_master (Bitcoin PR bitcoin-core/gui#300 )
2021-07-04 01:54:07 +00:00
Andrew Poelstra
1e75f936fb
Merge e1e1e708fa into merged_master (Bitcoin PR bitcoin-core/gui#125 )
2021-07-04 00:43:33 +00:00
Andrew Poelstra
a8362769f4
Merge d9ae6ec892 into merged_master (Bitcoin PR bitcoin/bitcoin#21759 )
2021-07-03 20:38:21 +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
4b9e6df7a5
Merge 328da33557 into merged_master (Bitcoin PR bitcoin-core/gui#18 )
2021-07-02 20:34:29 +00:00
Andrew Poelstra
ae471dc6a5
Merge 549d20a31b into merged_master (Bitcoin PR bitcoin/bitcoin#20772 )
2021-07-02 14:19:51 +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
d51f42534f
Merge e45863166f into merged_master (Bitcoin PR bitcoin/bitcoin#21169 )
...
Adds fuzztests for RPC. FIXME there is a crash; I just disabled the
test for now and we can revisit in a future PR.
2021-07-01 17:04:41 +00:00
Andrew Poelstra
02a627ac8d
Merge edf679503c into merged_master (Bitcoin PR bitcoin/bitcoin#21783 )
2021-07-01 14:17:54 +00:00
Andrew Poelstra
d9730235a4
Merge bce09da122 into merged_master (Bitcoin PR bitcoin/bitcoin#21773 )
2021-07-01 14:05:24 +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
5f0c45b568
Merge ac219dcbcc into merged_master (Bitcoin PR bitcoin/bitcoin#19160 )
2021-07-01 13:29:36 +00:00
