Commit graph

33 commits

Author SHA1 Message Date
Byron Hambly
0b1508bf01
ci: fix lint issues 2025-04-17 11:06:32 +02:00
Byron Hambly
80b3fcae86 Merge 80fc1af096 into merged_master (Bitcoin PR bitcoin/bitcoin#26289) 2025-04-01 09:10:14 +02:00
Byron Hambly
0b0d5d214e Merge 8597260872 into merged_master (Bitcoin PR bitcoin/bitcoin#26480) 2025-03-04 10:42:21 +02:00
Byron Hambly
d3148d2497 Merge a1e04e1079 into merged_master (Bitcoin PR bitcoin/bitcoin#23926) 2023-06-14 16:12:54 +00:00
Byron Hambly
af3fe60b69 Merge 94db963de5 into merged_master (Bitcoin PR bitcoin/bitcoin#23300) 2023-05-17 13:44:36 +00:00
Byron Hambly
f80332fee5 Merge 2e82af46e2 into merged_master (Bitcoin PR bitcoin/bitcoin#23207) 2023-05-12 09:55:10 +00:00
Glenn Willen
f035196ceb Merge 586e5c7dd7 into merged_master (Elements PR ElementsProject/elements#1062) 2022-04-20 21:51:53 -07:00
Pablo Greco
85c3c2b819 Deprecate con_dyna_deploy_start in favor of evbparams 2021-11-23 14:36:03 +00:00
Andrew Poelstra
d39d57c704 Merge 1c7be9ab90 into merged_master (Bitcoin PR #20286)
I hate this PR.
2021-06-28 21:30:17 +00:00
Andrew Poelstra
6f267e338a Merge 47fc883106 into merged_master (Bitcoin PR #19967) 2020-12-01 14:36:58 +00:00
Andrew Poelstra
1b85209c18 Merge 1769828684 into merged_master (Bitcoin PR #19501)
Adds "verbose" flag to a bunch of RPC that pass through to SendMoney. I also
added it to sendtomainchain and destroyamount.
2020-11-30 02:17:54 +00:00
Andrew Poelstra
714f585800 Merge 4b5c9191e3 into merged_master (Bitcoin PR #19208) 2020-11-26 01:09:11 +00:00
Andrew Poelstra
b8a1b9df4d Merge ed03bfc899 into merged_master (Elements PR #726) 2020-11-09 21:20:31 +00:00
Andrew Poelstra
b24be4b1a7 Merge 59c138d2f1 into merged_master (Bitcoin PR #16898) 2020-11-09 21:20:27 +00:00
Andrew Poelstra
87438de6c3 Merge 51c4ebbe81 into merged_master (Elements PR #706) 2020-11-09 21:20:23 +00:00
Andrew Poelstra
9cc26a716a Merge 5b2fe5563b into merged_master (Elements PR #642)
FIXME: we disable standardness checks for the non-PAK node in the PAK tests.
This is because of a bug in Elements which causes non-PAK nodes to reject
pegouts for standardness reasons. Need to fix it after the rebase.
2020-11-09 21:20:21 +00:00
Andrew Poelstra
adceec0ffe Merge a6878b8080 into merged_master (Elements PR #696) 2020-11-09 21:20:20 +00:00
Andrew Poelstra
1b2ba86a9e Merge e8a6d52724 into merged_master (Bitcoin PR #16542) 2020-11-09 21:20:15 +00:00
Andrew Poelstra
67d718b048 Merge a74d588f21 into merged_master (Bitcoin PR #14954) 2020-10-27 22:32:24 +00:00
Steven Roose
55c4c6cd20
Fix other bug in initpegoutwallet descriptor parsing 2019-09-30 17:40:33 +02:00
Steven Roose
fdba8c45f9
Support descriptors with checksums in initpegoutwallet 2019-09-30 15:50:27 +02:00
Gregory Sanders
606f5665a9 Fix feature_pak.py in light of #706 2019-09-12 10:35:45 -04:00
Gregory Sanders
47db75e39f Dynafed RPC support, tests, and deployment for custom chains 2019-09-05 10:51:09 -04:00
Gregory Sanders
d35bf08210 Fix sendtomainchain with pak when subtracting fee from output 2019-08-30 11:35:43 -04:00
Steven Roose
4ed0bb36b4
Fix dead-code linter issues 2019-05-14 20:59:06 +01:00
Steven Roose
5492cefcc6
MERGE-FIX: Fix fedpeg and pak tests for 0.18.0 2019-05-14 15:09:20 +01:00
Gregory Sanders
30eb323e9b ensure pak wallet is returning right kind of addresses 2019-04-04 11:48:48 -04:00
Gregory Sanders
adcc2d2ada Re-enable no wallet functional tests 2019-03-26 11:48:16 -04:00
Gregory Sanders
0148024dd8 Functional test linting 2019-03-20 11:00:50 -04:00
Steven Roose
b48aea8284
[BROKEN] Account for assets in all balance inspection in tests 2019-03-20 12:06:01 +00:00
Gregory Sanders
4202671221 MERGE FIX: spelling linter fixes 2019-01-31 10:55:03 +00:00
Gregory Sanders
1cb252e01d Descriptor support in PAK infrastructure and tests 2019-01-24 11:07:17 -05:00
Gregory Sanders
bcd8db972f functional test for pak feature 2019-01-24 11:07:11 -05:00