Commit graph

3669 commits

Author SHA1 Message Date
Andrew Poelstra
50a0a6246b Merge d48f9e8ebb into merged_master (Bitcoin PR #21124) 2021-06-21 14:32:43 +00:00
Andrew Poelstra
e71719db1a Merge c4214d0e0d into merged_master (Bitcoin PR #21117) 2021-06-21 13:28:28 +00:00
Andrew Poelstra
77f846938e Merge b09ad737ee into merged_master (Bitcoin PR #20944) 2021-06-21 12:51:08 +00:00
Andrew Poelstra
323f9bf6cd Merge b401b09355 into merged_master (Bitcoin PR #21107) 2021-06-21 08:23:27 +00:00
Andrew Poelstra
bbfd887a43 Merge c969ab43c3 into merged_master (Bitcoin PR #21084) 2021-06-21 07:59:08 +00:00
Andrew Poelstra
0f6fcf55f7 Merge cf26ca3911 into merged_master (Bitcoin PR #21081) 2021-06-21 03:52:27 +00:00
Andrew Poelstra
bcd5f2207c Merge a6b1bf6439 into merged_master (Bitcoin PR #20267) 2021-06-21 02:52:43 +00:00
Andrew Poelstra
b8d3a6ea22 Merge ea5a50f92a into merged_master (Bitcoin PR #21042) 2021-06-21 01:40:03 +00:00
Andrew Poelstra
5313c74e69 Merge 4e946ebcf1 into merged_master (Bitcoin PR #20715) 2021-06-20 23:51:29 +00:00
Andrew Poelstra
81622629c1 Merge 384e090f93 into merged_master (Bitcoin PR #19509) 2021-06-20 20:00:04 +00:00
Andrew Poelstra
4fc9d12dc4 Merge 4c55f92c76 into merged_master (Bitcoin PR #20954) 2021-06-20 02:12:30 +00:00
Andrew Poelstra
7d94f4b120 Merge c8b83510f4 into merged_master (Bitcoin PR #20724) 2021-06-20 01:14:29 +00:00
Andrew Poelstra
561bf64d1b Merge 80e16cadd5 into merged_master (Bitcoin PR #20012)
Made some edits to rpc/client.cpp on the advice of test/functional/rpc_help.py
to make the "RPC conversion tables" consistent, but I have no idea what these
tables are or what they're for. I assume, given that nobody has noticed these
inconsistencies ever, that they're fine.
2021-06-19 16:30:37 +00:00
Andrew Poelstra
402bba0e4f Merge 9deba2de76 into merged_master (Bitcoin PR #20226)
Had to change a test vector to match our test framework's different deterministic
keys (when I produced these during the 0.21 rebase I made new random keys rather
than converting the existing ones, it appears).
2021-06-19 02:35:13 +00:00
Andrew Poelstra
6a7359d623 Merge 15a9df0706 into merged_master (Bitcoin PR #20964) 2021-06-19 01:19:46 +00:00
Andrew Poelstra
d6c85c5620 Merge 4b15ffe991 into merged_master (Bitcoin PR #20832) 2021-06-18 20:35:42 +00:00
Andrew Poelstra
a9ab76769e Merge 11cbd4bb54 into merged_master (Bitcoin PR #17556)
This PR eliminates "strange regtest=0 behavior" in a test which had forced
us to disable the test for Elements. Can re-enable now :)

I also removed the `chain_in_args` parameter to `TestNode`, which Steven added
in https://github.com/ElementsProject/elements/pull/533 (which itself replaces
unconditionally adding chain={} on the command-line, which was added in #458).
These were added in the 0.17 rebase to deal with the job of starting bitcoind,
which then did not support the `chain=` command-line arg as well as elementsd,
which back then required this command-line arg.

This was causing some issues with the "check -acceptnonstdtxn doesn't work on
mainnet" test because it would add -chain=elementsregtest to the command-line
of a daemon that was supposed to be connecting to mainnet/liquidv1. It is
possible to override this behavior, but since 0.20+ versions of elementsd and
bitcoind have essentially the same support for chain= options, it seemed
cleaner to just eliminate the diff.
2021-06-18 14:40:09 +00:00
Andrew Poelstra
6f0f1d4268 Merge 3734adba39 into merged_master (Bitcoin PR #20953) 2021-06-18 03:37:39 +00:00
Andrew Poelstra
9e4190cd76 Merge bc51b99bd5 into merged_master (Bitcoin PR #20891) 2021-06-18 02:53:26 +00:00
Andrew Poelstra
6e0871df92 Merge 32e59fc371 into merged_master (Bitcoin PR #20916) 2021-06-17 23:00:15 +00:00
Andrew Poelstra
89f673c0bd Merge 6af013792f into merged_master (Bitcoin PR #19315)
This uses a regtest-only RPC which checks that the chain is literally
"regtest". Since regtest is disabled in Elements (we use elementsregtest)
I weakened the check for this to just check that the chain name has
"regtest" somewhere in it. Hopefully this isn't too magical.
2021-06-17 17:31:47 +00:00
Andrew Poelstra
4b15a86287 Merge 675af2a515 into merged_master (Bitcoin PR #20852) 2021-06-17 16:16:41 +00:00
Andrew Poelstra
c3a8653b11 Merge 9c0b76c709 into merged_master (Bitcoin PR #20876) 2021-06-17 15:30:21 +00:00
Andrew Poelstra
8f25ea200d Merge 5082324225 into merged_master (Bitcoin PR #20688) 2021-06-17 02:46:51 +00:00
Andrew Poelstra
c5a022192f Merge d7e2401c62 into merged_master (Bitcoin PR #18077) 2021-06-17 01:59:15 +00:00
Andrew Poelstra
6afa119596 Merge b6a71b80d2 into merged_master (Bitcoin PR #19055) 2021-06-16 22:36:48 +00:00
Andrew Poelstra
617905a928 Merge 34322b7f5c into merged_master (Bitcoin PR #20842) 2021-06-16 18:28:04 +00:00
Andrew Poelstra
27930edc9c Merge 4a540683ec into merged_master (Bitcoin PR #20813) 2021-06-16 14:11:07 +00:00
Andrew Poelstra
08851f5ebb Merge e3dd0a56cf into merged_master (Bitcoin PR #20755) 2021-06-16 04:46:16 +00:00
Andrew Poelstra
691fc96215 Merge 0e1b57b4bb into merged_master (Bitcoin PR #20763) 2021-06-16 03:40:29 +00:00
Andrew Poelstra
658b2312da Merge f656165e9c into merged_master (Bitcoin PR #18772)
I'm gonna be honest, I largely just rewrote this one. It adds a "fee" field
to the RPC transaction output, which I replaced with a feemap which is
directly extracted from the transaction rather than computed implicitly
from inputs - outputs.

Removed a functional test that fee computations become impossible without
chain data, since in Elements there is no chain data lookup involved.
2021-06-16 01:07:10 +00:00
Andrew Poelstra
9a27a41c59 Merge cc592a85ea into merged_master (Bitcoin PR #20189) 2021-06-15 23:48:08 +00:00
Andrew Poelstra
df6ba0e0c8 Merge cc2a5ef9b2 into merged_master (Bitcoin PR #20683) 2021-06-15 20:51:02 +00:00
Andrew Poelstra
11ff9d19cb Merge 1d7243d307 into merged_master (Bitcoin PR #20737) 2021-06-15 20:11:35 +00:00
Andrew Poelstra
2520d6fe0d Merge 1077c93a34 into merged_master (Bitcoin PR #20692) 2021-06-15 17:06:07 +00:00
Andrew Poelstra
f1767b4fe3 Merge b27104dc52 into merged_master (Bitcoin PR #20687) 2021-06-15 13:27:44 +00:00
Andrew Poelstra
994de82dac Merge 9b28bd73a3 into merged_master (Bitcoin PR #20691) 2021-06-15 13:07:58 +00:00
Andrew Poelstra
e5d61f39b4 Merge 143bd108ed into merged_master (Bitcoin PR #19137) 2021-06-15 02:39:30 +00:00
Andrew Poelstra
26d6840001 Merge 5b6f970e3f into merged_master (Bitcoin PR #20171) 2021-06-14 19:26:23 +00:00
Andrew Poelstra
d52727714b Merge 69f1ee1922 into merged_master (Bitcoin PR #20365) 2021-06-14 18:47:18 +00:00
Andrew Poelstra
7744178267 Merge 9dbcd37105 into merged_master (Bitcoin PR #20569) 2021-06-14 18:06:07 +00:00
Andrew Poelstra
ea8dc50986 Merge a023094fc4 into merged_master (Bitcoin PR #20276) 2021-06-14 16:13:26 +00:00
Andrew Poelstra
e511e8717f Merge b103fdcb3b into merged_master (Bitcoin PR #19763) 2021-06-14 03:43:09 +00:00
Andrew Poelstra
5ecb0f619f Merge b18978066d into merged_master (Bitcoin PR #20079) 2021-06-14 01:43:09 +00:00
Andrew Poelstra
1e30b57d06 Merge da957cd62e into merged_master (Bitcoin PR #20613) 2021-06-14 00:07:04 +00:00
Andrew Poelstra
c8d2647081 Merge 38176dc665 into merged_master (Bitcoin PR #20573) 2021-06-13 21:04:50 +00:00
Andrew Poelstra
1d72c6dee8 Merge 22f13c1e08 into merged_master (Bitcoin PR #19776) 2021-06-13 19:18:27 +00:00
Andrew Poelstra
a9503e8d53 Merge 42ed7f51fa into merged_master (Bitcoin PR #20606) 2021-06-13 17:11:52 +00:00
Andrew Poelstra
49c7d30f1d Merge 90ef622ab5 into merged_master (Bitcoin PR #20564) 2021-06-11 19:27:33 +00:00
Andrew Poelstra
5eb8983d1d Merge d38feb6134 into merged_master (Bitcoin PR #20535) 2021-06-11 17:41:12 +00:00