Andrew Poelstra
68bfd70b43
ci: various linter / CI compiler error fixes
...
Includes changing TRUE to OP_TRUE for anyone-can-spend output name,
to avoid symbol conflict on win64 builds, which is really obnoxious.
2021-03-26 17:33:04 +00:00
Andrew Poelstra
0699c4d5aa
Merge 277cbb2dc8 into merged_master (Elements PR #969 )
2021-03-26 01:26:01 +00:00
Andrew Poelstra
d89112072c
Merge 3b8e4070c8 into merged_master (Elements PR #958 )
...
Conflicts due to change of error state formatting upstream.
2021-03-26 00:21:11 +00:00
Andrew Poelstra
22cf380984
Merge a993a7c675 into merged_master (Elements PR #960 )
...
Several conflicts in the C++ code related to the new `flags` parameter
to `CheckSignature` and the corresponding function being renamed upstream
to `CheckSignatureECDSA`.
Several conflicts in the test harness as Steven sorta pulled the new
upstream ECKey module into the Python code, and the actual upstream
code was slightly different. Also needed to update the feature_taproot
code to always use the non-RANGEPROOF sighash since dynafed is not
enabled in the Taproot test.
Also had to pull the `set_wif` method out of `ECKey` and inline it because
otherwise it triggers a "circular inclusion" error between script.py (which
would pull in `base58_to_bytes` from address.py) and address.py (which now
pulls in some taproot EC related stuff from script.py).
Noticed that #960 does not test the "sighash rangeproof flag set but no
witnesses" case.
2021-03-25 23:46:21 +00:00
Steven Roose
7aaf01e02f
Test duration of fedpeg validity in dynafed test
2021-03-10 17:00:33 +00:00
Steven Roose
3b8e4070c8
Merge #958 : Some minor dynafed improvements
...
14a42a018fe0372933ce7a93d93
2021-03-02 16:25:46 +00:00
Steven Roose
b888f42270
tests: Add test feature_sighash_rangeproof.py
2021-02-22 15:19:10 +00:00
Steven Roose
236f0b1762
tests: Replace CECKey with new ECKey impl from Bitcoin master
...
Somehow the CECKey impl is really broken if you want to set
a raw private key. Core master already has a new impl so I just
took that one and replaces the usages. This will probably be equivalent
with what would be rebased in at a later stage.
2021-02-22 13:45:37 +00:00
Steven Roose
fe03729338
dynafed: Support changing mainnet dynafed activation
...
This should obviously only be done by blocksigners. The flag used is not
documented.
2021-02-10 14:07:06 +01:00
Andrew Poelstra
5b89a9fc92
Merge 80e32e120e into merged_master (Bitcoin PR #20305 )
2020-12-02 17:53:59 +00:00
Andrew Poelstra
29c7f63764
Merge c48e788246 into merged_master (Bitcoin PR #18836 )
2020-12-02 15:51:02 +00:00
Andrew Poelstra
45668b8508
Merge c2d8ba6265 into merged_master (Bitcoin PR #19502 )
2020-12-02 12:53:09 +00:00
Andrew Poelstra
3f6fdc2838
Merge 42f950cb27 into merged_master (Bitcoin PR #20322 )
2020-12-02 07:07:00 +00:00
Andrew Poelstra
7ec1f12f7c
Merge 1dfe19e284 into merged_master (Bitcoin PR #20153 )
2020-12-02 06:52:54 +00:00
Andrew Poelstra
3e4941552f
Merge 79a3b59cc7 into merged_master (Bitcoin PR #20120 )
2020-12-02 06:46:10 +00:00
Andrew Poelstra
51e3b537f6
Merge 4fd37d0a10 into merged_master (Bitcoin PR #20292 )
2020-12-02 06:39:49 +00:00
Andrew Poelstra
2d1adacaf2
Merge 663fd92b28 into merged_master (Bitcoin PR #20266 )
2020-12-02 06:16:37 +00:00
Andrew Poelstra
23f0a2294b
Merge c51c2753a4 into merged_master (Bitcoin PR #20326 )
2020-12-02 05:21:55 +00:00
Andrew Poelstra
31caf66124
Merge f5cdc290d5 into merged_master (Bitcoin PR #20316 )
2020-12-02 05:06:51 +00:00
Andrew Poelstra
699e2f45db
Merge 6954e4d16c into merged_master (Bitcoin PR #20283 )
2020-12-02 04:15:43 +00:00
Andrew Poelstra
0b598c17b3
Merge 83650e4df5 into merged_master (Bitcoin PR #20199 )
2020-12-02 04:08:17 +00:00
Andrew Poelstra
105b7f1159
Merge ed9f547750 into merged_master (Bitcoin PR #20299 )
2020-12-02 03:28:18 +00:00
Andrew Poelstra
2577c79f78
Merge 5d32009f1a into merged_master (Bitcoin PR #20220 )
2020-12-02 03:05:14 +00:00
Andrew Poelstra
3f275df2be
Merge 17c6fb176a into merged_master (Bitcoin PR #20282 )
2020-12-02 02:10:14 +00:00
Andrew Poelstra
0a4ca5becf
Merge ca18860563 into merged_master (Bitcoin PR #20263 )
2020-12-02 01:27:52 +00:00
Andrew Poelstra
d009849f95
Merge ef4c7c4e0b into merged_master (Bitcoin PR #18788 )
...
This one was pretty brutal, but ultimately nothing too surprising.
Just had to keep track of which wallets owned which blinding keys,
and in wallet_importprunedfunds.py I had to manually create a
Liquid address.
2020-12-02 01:21:09 +00:00
Andrew Poelstra
aff3d057d5
Merge c5ec0367d7 into merged_master (Bitcoin PR #20165 )
2020-12-01 21:54:11 +00:00
Andrew Poelstra
a01ffb9d0c
Merge 0c2eb7f8de into merged_master (Bitcoin PR #20262 )
2020-12-01 21:09:44 +00:00
Andrew Poelstra
9ce2c21435
Merge 42b66a6b81 into merged_master (Bitcoin PR #20186 )
2020-12-01 20:37:50 +00:00
Andrew Poelstra
3fde0f012f
Merge 6196cf77e5 into merged_master (Bitcoin PR #19753 )
2020-12-01 18:26:43 +00:00
Andrew Poelstra
11d75a53ed
Merge 3f512f3d56 into merged_master (Bitcoin PR #20258 )
2020-12-01 18:07:02 +00:00
Andrew Poelstra
ec01e32371
Merge db26eeba71 into merged_master (Bitcoin PR #19877 )
2020-12-01 17:59:59 +00:00
Andrew Poelstra
10ea7f1e54
Merge 83363f7b62 into merged_master (Bitcoin PR #20167 )
2020-12-01 17:32:41 +00:00
Andrew Poelstra
1254d1081d
Merge 88271184e8 into merged_master (Bitcoin PR #20112 )
2020-12-01 16:10:09 +00:00
Andrew Poelstra
797a5bf283
Merge 7012db2a6b into merged_master (Bitcoin PR #20176 )
2020-12-01 16:03:26 +00:00
Andrew Poelstra
f1188d79e4
Merge 1cb4e339f9 into merged_master (Bitcoin PR #20039 )
2020-12-01 15:56:21 +00:00
Andrew Poelstra
5a0577ecb6
Merge dda18e7310 into merged_master (Bitcoin PR #20214 )
2020-12-01 15:16:21 +00:00
Andrew Poelstra
bd9d811281
Merge b46f37ba5e into merged_master (Bitcoin PR #20198 )
2020-12-01 14:56:40 +00:00
Andrew Poelstra
6f267e338a
Merge 47fc883106 into merged_master (Bitcoin PR #19967 )
2020-12-01 14:36:58 +00:00
Andrew Poelstra
9eb2afd7ff
Merge f5bd46a4cc into merged_master (Bitcoin PR #20125 )
2020-12-01 14:13:32 +00:00
Andrew Poelstra
dad417577a
Merge 4769942d90 into merged_master (Bitcoin PR #19624 )
2020-12-01 06:42:52 +00:00
Andrew Poelstra
86062499f5
Merge d9d9a29352 into merged_master (Bitcoin PR #20179 )
2020-12-01 06:36:26 +00:00
Andrew Poelstra
251361078d
Merge 80c8a02f1b into merged_master (Bitcoin PR #20159 )
2020-12-01 05:47:16 +00:00
Andrew Poelstra
b733f588d8
Merge cb21d864c5 into merged_master (Bitcoin PR #19401 )
2020-12-01 05:14:13 +00:00
Andrew Poelstra
85663c72a3
Merge 82d3596dfe into merged_master (Bitcoin PR #20161 )
2020-12-01 04:25:27 +00:00
Andrew Poelstra
2a2f3e49ea
Merge 0d22482353 into merged_master (Bitcoin PR #20002 )
2020-12-01 03:42:49 +00:00
Andrew Poelstra
653fe79fe8
Merge 560dea9b26 into merged_master (Bitcoin PR #19770 )
2020-12-01 03:29:12 +00:00
Andrew Poelstra
e765fc93ea
Merge 3caee16946 into merged_master (Bitcoin PR #19953 )
...
Taproot :D
2020-12-01 02:54:57 +00:00
Andrew Poelstra
4eeadb7fde
Merge 8ed37f6c84 into merged_master (Bitcoin PR #19077 )
2020-11-30 20:20:56 +00:00
Andrew Poelstra
f327fa97f2
Merge c2c4dbaebd into merged_master (Bitcoin PR #19988 )
2020-11-30 19:05:03 +00:00
