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
Andrew Poelstra
7895eae09d
Merge 5c4911e7e7 into merged_master (Bitcoin PR #20568 )
2021-06-11 17:20:15 +00:00
Andrew Poelstra
7a7791e879
Merge 03b1db6114 into merged_master (Bitcoin PR #18766 )
2021-06-11 16:59:19 +00:00
Andrew Poelstra
ec8dc88631
Merge eab63b971d into merged_master (Bitcoin PR #19847 )
2021-06-11 15:26:10 +00:00
Andrew Poelstra
07a34b32ae
Merge 64156ad4d1 into merged_master (Bitcoin PR #19893 )
2021-06-11 14:03:49 +00:00
Andrew Poelstra
f9255e62d7
Merge 751ffaabad into merged_master (Bitcoin PR #20562 )
2021-06-11 03:56:06 +00:00
Andrew Poelstra
137e74a3dc
Merge 681ce59d0e into merged_master (Bitcoin PR #20466 )
2021-06-11 00:13:51 +00:00
Andrew Poelstra
0533e80b8c
Merge 283f22cabb into merged_master (Bitcoin PR #20461 )
2021-06-10 22:04:42 +00:00
Andrew Poelstra
eb8384648f
Merge 607c844f37 into merged_master (Bitcoin PR #20540 )
2021-06-10 21:43:43 +00:00
Andrew Poelstra
2d31b7300e
Merge f17e8ba3a1 into merged_master (Bitcoin PR #20207 )
2021-06-10 20:35:12 +00:00
Andrew Poelstra
4240c083aa
Merge 7ae86b3c68 into merged_master (Bitcoin PR #20522 )
2021-05-08 00:06:07 +00:00
Andrew Poelstra
2522ba9f6d
Merge 1ae5758981 into merged_master (Bitcoin PR #20448 )
2021-05-07 23:27:40 +00:00
Andrew Poelstra
8d52d54329
Merge afdfd3c8c1 into merged_master (Bitcoin PR #20403 )
2021-05-07 21:52:40 +00:00
Andrew Poelstra
3fff08ad6a
Merge efd4cdb81f into merged_master (Bitcoin PR #20456 )
2021-05-07 21:14:51 +00:00
Andrew Poelstra
d3321390c2
Merge ca4a784942 into merged_master (Bitcoin PR #20410 )
2021-05-07 20:56:02 +00:00
Andrew Poelstra
c9266f6d1c
Merge 3a32b62fa7 into merged_master (Bitcoin PR #20462 )
2021-05-07 19:41:18 +00:00
Andrew Poelstra
a9e2850a58
Merge 2ee954daae into merged_master (Bitcoin PR #20458 )
2021-05-07 18:18:43 +00:00
Andrew Poelstra
d16f8ae480
Merge 816132e6eb into merged_master (Bitcoin PR #20426 )
...
Needed to restore an #include in wallet/rpcwallet.cpp for several
functions (ChainActive, IsDynaFedActive, GetFeeMap and others)
2021-05-07 16:18:13 +00:00
Andrew Poelstra
1357911374
Merge 3d632c3f49 into merged_master (Bitcoin PR #20428 )
2021-05-06 22:59:14 +00:00
Andrew Poelstra
00e18636bf
Merge 04670ef81e into merged_master (Bitcoin PR #20385 )
2021-05-06 21:53:52 +00:00
Andrew Poelstra
82faa689f1
Merge c4d1e24f54 into merged_master (Bitcoin PR #20047 )
2021-05-06 21:24:00 +00:00
Andrew Poelstra
b8d53f04fb
Merge 4b24c3962f into merged_master (Bitcoin PR #19504 )
2021-05-06 16:02:38 +00:00
Andrew Poelstra
2573747447
fix test code duplication from 3a0de44d90
2021-04-15 17:06:37 +00:00
Andrew Poelstra
24ca09cb84
test: add missing sync_blocks to dynafed test; disable timing out travis test
2021-04-01 20:59:38 +00:00
Andrew Poelstra
f76fe5e469
ci: fix some test timeouts
2021-03-31 23:01:22 +00:00
Andrew Poelstra
7575e050bb
remove some unused imports from new sighash_rangeproof test
2021-03-26 23:24:08 +00:00
Andrew Poelstra
e801e951df
ci: whitelist some RPCs on the functional test coverage check
2021-03-26 17:33:05 +00:00
Andrew Poelstra
98d0ff7035
tests: actually fix intermittent failure in feature_assetsdir.py
2021-03-26 17:33:05 +00:00
Andrew Poelstra
f1092db80e
disable previous-release compatibility test and walletupgrade test
...
Should revisit; I am not sure whether we have a long-term stable
URL for prebuilt past Elements releases, but we should be able
to just point test/get-previous-releases.py at that, and change
the set of versions (since we do not have 0.15, 0.19, etc), and
we're good to go.
2021-03-26 17:33:05 +00:00
Andrew Poelstra
55be2930fb
test: disable "is everyone connected" check in sync_all in blocksigner test
...
Everyone is _not_ connected in this test, so on slow machines
where this check triggers (e.g. the CI boxes) the test incorrectly
fails. This was also a source of (very infrequent) spurious failures
during the rebase.
2021-03-26 17:33:05 +00:00
Andrew Poelstra
697cd77985
ci: disable broken feature_pruning test
...
It may be that we just need to recompute some numbers because our
block limits are different. But this test takes 20 minutes to
fail and it would take some time to understand what the expected
behavior is.
2021-03-26 17:33:05 +00:00
