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
bc4b09e348
Merge 68196a8910 into merged_master (Bitcoin PR #20860 )
2021-06-16 19:57:37 +00:00
Andrew Poelstra
064691408f
Merge e520e091db into merged_master (Bitcoin PR #20844 )
2021-06-16 19:41:11 +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
41d7fe8db8
Merge b40254b232 into merged_master (Bitcoin PR #20855 )
2021-06-16 17:55:17 +00:00
Andrew Poelstra
6182fe76de
Merge ff6adac5f4 into merged_master (Bitcoin PR #20847 )
2021-06-16 17:38:47 +00:00
Andrew Poelstra
54fd9e6a48
Merge 8d6715666d into merged_master (Bitcoin PR #20846 )
2021-06-16 17:22:23 +00:00
Andrew Poelstra
7f766514dc
Merge 8b6acaca2f into merged_master (Bitcoin PR #20848 )
2021-06-16 17:05:58 +00:00
Andrew Poelstra
ecb3b70ee6
Merge bc8ada1c15 into merged_master (Bitcoin PR #20736 )
2021-06-16 16:49:39 +00:00
Andrew Poelstra
f1c013c119
Merge f52f427b8e into merged_master (Bitcoin PR #20817 )
2021-06-16 16:33:15 +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
0f7f6bc225
Merge 6e70674cda into merged_master (Bitcoin PR #20781 )
2021-06-16 15:32:28 +00:00
Andrew Poelstra
a6733375bf
Merge 9c3765ad7c into merged_master (Bitcoin PR #20830 )
2021-06-16 15:16:21 +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
8a23f151ba
Merge e75f91eae3 into merged_master (Bitcoin PR #20805 )
2021-06-16 14:27:26 +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
00801e5a4b
Merge 7f9ae87011 into merged_master (Bitcoin PR #20451 )
2021-06-16 04:29:56 +00:00
Andrew Poelstra
fd06c98dce
Merge ddbf7a6f50 into merged_master (Bitcoin PR #20684 )
2021-06-16 04:13:35 +00:00
Andrew Poelstra
68f3d10407
Merge 4a8f4ac4fc into merged_master (Bitcoin PR #20771 )
2021-06-16 03:56:45 +00:00
Andrew Poelstra
691fc96215
Merge 0e1b57b4bb into merged_master (Bitcoin PR #20763 )
2021-06-16 03:40:29 +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
3c40a813e2
Merge 22435f0cf6 into merged_master (Bitcoin PR #20759 )
2021-06-16 02:05:47 +00:00
Andrew Poelstra
55b46ab9d1
Merge 443988d406 into merged_master (Bitcoin PR #20761 )
2021-06-16 01:46:04 +00:00
Andrew Poelstra
77ce6d06f0
Merge 1b31695c74 into merged_master (Bitcoin PR #20673 )
2021-06-16 01:26:32 +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
cf9987e280
Merge 1be6f2dba9 into merged_master (Bitcoin PR #20747 )
2021-06-15 23:25:42 +00:00
Andrew Poelstra
8db90a1098
Merge e669c3156f into merged_master (Bitcoin PR #20748 )
2021-06-15 23:04:29 +00:00
Andrew Poelstra
939e4d0543
Merge 98de9eb1aa into merged_master (Bitcoin PR #19983 )
2021-06-15 22:35:40 +00:00
Andrew Poelstra
c8f8f19631
Merge 9286b1cbce into merged_master (Bitcoin PR #20745 )
2021-06-15 22:09:08 +00:00
Andrew Poelstra
cbf37c688c
Merge df127ecede into merged_master (Bitcoin PR #19829 )
2021-06-15 21:49:44 +00:00
Andrew Poelstra
a1504ea490
Merge 209974d379 into merged_master (Bitcoin PR #20740 )
2021-06-15 21:30:12 +00:00
Andrew Poelstra
0e9be949cf
Merge f4ac48d30a into merged_master (Bitcoin PR #20735 )
2021-06-15 21:10:36 +00:00
Andrew Poelstra
df6ba0e0c8
Merge cc2a5ef9b2 into merged_master (Bitcoin PR #20683 )
2021-06-15 20:51:02 +00:00
Andrew Poelstra
c1419171a6
Merge 2556a973ed into merged_master (Bitcoin PR #20731 )
2021-06-15 20:31:23 +00:00
