Andrew Poelstra
8add337795
Merge cb2c578451 into merged_master (Bitcoin PR bitcoin-core/gui#148 )
2021-06-17 21:22:54 +00:00
Andrew Poelstra
7edece4a69
Merge 22fa9673b0 into merged_master (Bitcoin PR #20917 )
2021-06-17 21:06:43 +00:00
Andrew Poelstra
50f29236f8
Merge e7eb37128c into merged_master (Bitcoin PR #20913 )
2021-06-17 20:51:51 +00:00
Andrew Poelstra
f9d79c1220
Merge 60427ee35f into merged_master (Bitcoin PR #20811 )
2021-06-17 20:33:57 +00:00
Andrew Poelstra
81f3883b46
Merge 8ffaf5c2f5 into merged_master (Bitcoin PR #19935 )
2021-06-17 20:19:16 +00:00
Andrew Poelstra
c60d414796
Merge 7b975639ef into merged_master (Bitcoin PR #19937 )
2021-06-17 18:27:22 +00:00
Andrew Poelstra
f2ca9433fd
Merge 7838db141b into merged_master (Bitcoin PR #20495 )
2021-06-17 17:47:48 +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
07f78541bc
Merge 6d81d7aa87 into merged_master (Bitcoin PR #20787 )
2021-06-17 16:46:13 +00:00
Andrew Poelstra
284da932bf
Merge 5cce607105 into merged_master (Bitcoin PR #20373 )
2021-06-17 16:31:30 +00:00
Andrew Poelstra
4b15a86287
Merge 675af2a515 into merged_master (Bitcoin PR #20852 )
2021-06-17 16:16:41 +00:00
Andrew Poelstra
85b597780d
Merge 616eace02a into merged_master (Bitcoin PR bitcoin-core/gui#161 )
2021-06-17 16:01:47 +00:00
Andrew Poelstra
acf709b3ab
Merge bd6af53e1f into merged_master (Bitcoin PR #20480 )
...
what a trainwreck of a programming language..
2021-06-17 15:15:29 +00:00
Andrew Poelstra
4daefd2f5c
Merge c4458cc3a1 into merged_master (Bitcoin PR #18819 )
2021-06-17 13:19:06 +00:00
Andrew Poelstra
e38d520c6c
Merge 0944024309 into merged_master (Bitcoin PR bitcoin-core/gui#163 )
2021-06-17 13:04:06 +00:00
Andrew Poelstra
279362dbd8
Merge 555fc0789d into merged_master (Bitcoin PR #20881 )
2021-06-17 04:05:09 +00:00
Andrew Poelstra
56178bb594
Merge 9158d6f341 into merged_master (Bitcoin PR #20786 )
2021-06-17 03:18:05 +00:00
Andrew Poelstra
80cd2ea2a3
Merge 1e078f17b5 into merged_master (Bitcoin PR #20882 )
2021-06-17 03:02:25 +00:00
Andrew Poelstra
13d5584e76
Merge 86a8b35f32 into merged_master (Bitcoin PR #14501 )
2021-06-17 02:15:46 +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
f92d11e329
Merge 3a6acd1772 into merged_master (Bitcoin PR #20789 )
2021-06-16 22:21:20 +00:00
Andrew Poelstra
7f613c9a12
Merge 4b8b71e630 into merged_master (Bitcoin PR bitcoin-core/gui#173 )
2021-06-16 22:04:54 +00:00
Andrew Poelstra
e71cc0e2ed
Merge 42675e7833 into merged_master (Bitcoin PR #20864 )
2021-06-16 21:48:16 +00:00
Andrew Poelstra
a425d345e2
Merge 8a720ced5f into merged_master (Bitcoin PR bitcoin-core/gui#165 )
2021-06-16 21:15:20 +00:00
Andrew Poelstra
e5cb4cb00e
Merge f13e03cda2 into merged_master (Bitcoin PR #20584 )
2021-06-16 20:58:56 +00:00
Andrew Poelstra
4796f602f0
Merge 3b6d1b61d3 into merged_master (Bitcoin PR #20829 )
2021-06-16 20:13:50 +00:00
Andrew Poelstra
ff56c107e7
Merge 4eada5d8b1 into merged_master (Bitcoin PR #20816 )
2021-06-16 19:24:51 +00:00
Andrew Poelstra
e3c86dccef
Merge 417f95fa45 into merged_master (Bitcoin PR #19915 )
2021-06-16 19:08:32 +00:00
Andrew Poelstra
216f7d7e67
Merge fafd725a7c into merged_master (Bitcoin PR #19846 )
2021-06-16 18:52:11 +00:00
Andrew Poelstra
617905a928
Merge 34322b7f5c into merged_master (Bitcoin PR #20842 )
2021-06-16 18:28:04 +00:00
Andrew Poelstra
549c9b182e
Merge c37600777e into merged_master (Bitcoin PR #20854 )
2021-06-16 18:11:34 +00:00
Andrew Poelstra
ecb3b70ee6
Merge bc8ada1c15 into merged_master (Bitcoin PR #20736 )
2021-06-16 16:49:39 +00:00
Andrew Poelstra
e511efad22
Merge 9a2400b575 into merged_master (Bitcoin PR #20760 )
2021-06-16 16:05:09 +00:00
Andrew Poelstra
da64813a8a
Merge 2dab2d239a into merged_master (Bitcoin PR #20765 )
2021-06-16 15:48:40 +00:00
Andrew Poelstra
3fb1d0400a
Merge 6f97172b42 into merged_master (Bitcoin PR #20649 )
2021-06-16 14:59:59 +00:00
Andrew Poelstra
f4a4b82ebb
Merge ae8f797135 into merged_master (Bitcoin PR #20210 )
2021-06-16 14:43:43 +00:00
Andrew Poelstra
27930edc9c
Merge 4a540683ec into merged_master (Bitcoin PR #20813 )
2021-06-16 14:11:07 +00:00
Andrew Poelstra
6d30b20e4c
Merge 409afd7153 into merged_master (Bitcoin PR #20812 )
2021-06-16 13:54:49 +00:00
Andrew Poelstra
dd2f9ba9fe
Merge f1f26b8d5b into merged_master (Bitcoin PR #20377 )
2021-06-16 13:38:28 +00:00
Andrew Poelstra
c40b1c8346
Merge 069f37c0fd into merged_master (Bitcoin PR #20791 )
2021-06-16 13:22:10 +00:00
Andrew Poelstra
f6208081ac
Merge d875bcc8f9 into merged_master (Bitcoin PR #162 )
2021-06-16 13:05:31 +00:00
Andrew Poelstra
08851f5ebb
Merge e3dd0a56cf into merged_master (Bitcoin PR #20755 )
2021-06-16 04:46:16 +00:00
Andrew Poelstra
68f3d10407
Merge 4a8f4ac4fc into merged_master (Bitcoin PR #20771 )
2021-06-16 03:56:45 +00:00
Andrew Poelstra
4d6f31ab76
Merge 31e511658a into merged_master (Bitcoin PR #20674 )
2021-06-16 03:24:16 +00:00
Andrew Poelstra
b3ed41acb1
Merge 02cf20b9f5 into merged_master (Bitcoin PR #20756 )
2021-06-16 03:04:51 +00:00
Andrew Poelstra
ca49452288
Merge 43fc7a569c into merged_master (Bitcoin PR #19972 )
2021-06-16 02:44:49 +00:00
Andrew Poelstra
121ca2549a
Merge 762cbd287f into merged_master (Bitcoin PR #15451 )
2021-06-16 02:25:23 +00:00
Andrew Poelstra
55b46ab9d1
Merge 443988d406 into merged_master (Bitcoin PR #20761 )
2021-06-16 01:46:04 +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
