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
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
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
Andrew Poelstra
29c7f63764
Merge c48e788246 into merged_master (Bitcoin PR #18836 )
2020-12-02 15:51:02 +00:00
Andrew Poelstra
51e3b537f6
Merge 4fd37d0a10 into merged_master (Bitcoin PR #20292 )
2020-12-02 06:39:49 +00:00
Andrew Poelstra
23f0a2294b
Merge c51c2753a4 into merged_master (Bitcoin PR #20326 )
2020-12-02 05:21:55 +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
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
6f267e338a
Merge 47fc883106 into merged_master (Bitcoin PR #19967 )
2020-12-01 14:36:58 +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
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
4cb66aae97
Merge 0b2abaa666 into merged_master (Bitcoin PR #19954 )
2020-11-30 17:12:23 +00:00
Andrew Poelstra
62faba7499
Merge 171cd05ae3 into merged_master (Bitcoin PR #20034 )
2020-11-30 05:33:57 +00:00
Andrew Poelstra
638acbcdd0
Merge 40aab35e98 into merged_master (Bitcoin PR #19253 )
2020-11-30 03:40:21 +00:00
Andrew Poelstra
52c2d8e525
Merge 78f912c901 into merged_master (Bitcoin PR #19804 )
2020-11-29 21:58:22 +00:00
Andrew Poelstra
455f61c0db
Merge 8c5f68118c into merged_master (Bitcoin PR #18267 )
...
This commit adds signet support, which is a little bit silly/redundant for us :)
Was a surprisingly easy merge to handle, and hopefully in future Core is more
mindful of signed blocks when they are changing code architecture.
I had to change a couple lines of src/signet.cpp to add blank assets to the
CTxOuts and to find transaction input scriptWitnesses. No need to add any
other tx witness data (and the CAsset()s that I did add to make things compile
won't be used..) because signet will always have g_con_elementsmode off.
2020-11-29 16:57:55 +00:00
Andrew Poelstra
ca42c615f0
Merge b99a1633b2 into merged_master (Bitcoin PR #19781 )
2020-11-29 14:25:26 +00:00
Andrew Poelstra
81a3dda09b
Merge c30f79d418 into merged_master (Bitcoin PR #19940 )
2020-11-29 14:00:02 +00:00
Andrew Poelstra
af5429c8ac
Merge f2d9934381 into merged_master (Bitcoin PR #19922 )
2020-11-29 03:11:53 +00:00
Andrew Poelstra
3f50e404e0
Merge 564e1ab0f3 into merged_master (Bitcoin PR #19800 )
2020-11-29 02:37:47 +00:00
Andrew Poelstra
897f8be4ef
Merge bd60a9a8ed into merged_master (Bitcoin PR #19818 )
2020-11-28 22:14:15 +00:00
Andrew Poelstra
f5f5be3203
Merge 136fe4c5e9 into merged_master (Bitcoin PR #19816 )
2020-11-28 21:25:31 +00:00
Andrew Poelstra
9a200a587e
Merge 505b39e72b into merged_master (Bitcoin PR #19610 )
2020-11-28 20:35:13 +00:00
Andrew Poelstra
ef13698934
Merge 48c1083632 into merged_master (Bitcoin PR #19105 )
2020-11-28 20:18:13 +00:00
Andrew Poelstra
f4b291f821
Merge 28f4e53e16 into merged_master (Bitcoin PR #19752 )
2020-11-28 14:17:23 +00:00
Andrew Poelstra
66ad009d69
Merge e80e5b3e4f into merged_master (Bitcoin PR #19760 )
2020-11-28 13:25:26 +00:00
Andrew Poelstra
e10dd69c55
Merge a0e75bd31d into merged_master (Bitcoin PR #15937 )
2020-11-27 20:39:27 +00:00
Andrew Poelstra
1aea27d291
Merge b4d0366b47 into merged_master (Bitcoin PR #19070 )
2020-11-27 17:48:36 +00:00
Andrew Poelstra
c98788b086
Merge cb1ee1551c into merged_master (Bitcoin PR #19674 )
2020-11-27 14:17:51 +00:00
Andrew Poelstra
b309341ae8
Merge 5e4fed9e58 into merged_master (Bitcoin PR #19657 )
2020-11-27 04:21:24 +00:00
Andrew Poelstra
d9d1b5285b
Merge 4644b13b44 into merged_master (Bitcoin PR #19632 )
2020-11-27 02:13:28 +00:00
Andrew Poelstra
33545124d8
Merge 3c93623be2 into merged_master (Bitcoin PR #19489 )
2020-11-27 00:53:07 +00:00
Andrew Poelstra
0c61562058
Merge 149eca433d into merged_master (Bitcoin PR #19599 )
2020-11-26 21:15:20 +00:00
Andrew Poelstra
e547a98b54
Merge ccef10261e into merged_master (Bitcoin PR #18044 )
2020-11-26 17:01:52 +00:00
Andrew Poelstra
f1d46ae49d
Merge edfeaf6836 into merged_master (Bitcoin PR #19552 )
2020-11-26 14:53:46 +00:00
Andrew Poelstra
efaef30fdb
Merge 631284f09a into merged_master (Bitcoin PR #19486 )
2020-11-26 01:51:47 +00:00
Andrew Poelstra
e96a115bab
Merge f6072e601a into merged_master (Bitcoin PR #19368 )
2020-11-26 01:09:16 +00:00
Andrew Poelstra
5402e2ba19
Merge 67881de0e3 into merged_master (Bitcoin PR #19272 )
2020-11-26 01:09:12 +00:00
Andrew Poelstra
7f0653ba54
Merge 8ef15e8a86 into merged_master (Bitcoin PR #19198 )
2020-11-26 01:09:11 +00:00
Andrew Poelstra
714f585800
Merge 4b5c9191e3 into merged_master (Bitcoin PR #19208 )
2020-11-26 01:09:11 +00:00
Andrew Poelstra
38b86cf63f
Merge 38389dd3a0 into merged_master (Bitcoin PR #19252 )
2020-11-26 01:09:07 +00:00
Andrew Poelstra
9fdbb98aff
Merge 5cafb46fef into merged_master (Bitcoin PR #19294 )
2020-11-26 01:09:06 +00:00
Andrew Poelstra
607a572223
Merge 46bdd4b537 into merged_master (Bitcoin PR #19178 )
2020-11-26 01:09:05 +00:00
Andrew Poelstra
dd4616946d
Merge 85f7db2284 into merged_master (Bitcoin PR #19239 )
2020-11-26 01:09:03 +00:00
Andrew Poelstra
9e70adf13e
Merge 6762a627ec into merged_master (Bitcoin PR #19230 )
2020-11-26 01:09:02 +00:00
