Commit graph

884 commits

Author SHA1 Message Date
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
3b8e4070c8
Merge #958: Some minor dynafed improvements
14a42a018 Add two missing dynafed fields to getblockchaininfo (Steven Roose)
fe0372933 dynafed: Support changing mainnet dynafed activation (Steven Roose)
ce7a93d93 dynafed: Only verify proposed parameters if they differ from current (Steven Roose)

Pull request description:

  - support blocksigners specifying their own activation to make coordination a bit more flexible
  - don't force fedpeg script to change in order to change the block signing script

Tree-SHA512: 8dd66440261f910b083f7ed461e1930c9380350e3648f6aca44726c39dcca3bb7e62c36d36ae56c2717827fbaee2b9046c6ce0b05441c1d8d1b54f3c284bc4d7
2021-03-02 16:25:46 +00:00
Steven Roose
691040a63d
Add SIGHASH_RANGEPROOF support 2021-02-22 15:19:09 +00:00
Steven Roose
ce7a93d933
dynafed: Only verify proposed parameters if they differ from current
This allows the initial relaxed restriction on non-segwit fedpeg
programs to be extended as long as the fedpeg program is not changed
while the block signing parameters can be changed.
2021-02-10 14:07:05 +01:00
Andrew Poelstra
5928cc6aa1 Merge 027e51f715 into merged_master (Bitcoin PR #20372) 2020-12-02 13:18:59 +00:00
Andrew Poelstra
aff3d057d5 Merge c5ec0367d7 into merged_master (Bitcoin PR #20165) 2020-12-01 21:54:11 +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
ab283556b0 Merge db88db4727 into merged_master (Bitcoin PR #19339)
Changes API for AcceptToMemoryPool to no longer check maximum fee; we remove
this check from interfaces::CChain::testPeginClaimAcceptance. This is fine,
the check never should have been there (this method's job is to notice double
claim attempts and provide a more helpful message to the user; other mempool
failures should be caught later in the `claimrawpegin` logic when we call
`pwallet->commitTransaction` which actually subits to the mempool). It was
only checking fees because the API made it easier to do so than to not.
2020-11-30 15:50:18 +00:00
Andrew Poelstra
5a731b1c03 Merge d82b2c6e65 into merged_master (Bitcoin PR #19898) 2020-11-30 00:17:21 +00:00
Andrew Poelstra
d105732185 Merge ec9b28e089 into merged_master (Elements PR #910) 2020-11-29 22:55:33 +00:00
Andrew Poelstra
5f5f4279ed Merge 1b313cacc9 into merged_master (Bitcoin PR #19927) 2020-11-29 21:07:46 +00:00
Andrew Poelstra
7a8f77d7ad Merge 9e217f5a6f into merged_master (Bitcoin PR #19572) 2020-11-29 19:44:31 +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
81a3dda09b Merge c30f79d418 into merged_master (Bitcoin PR #19940) 2020-11-29 14:00:02 +00:00
Andrew Poelstra
28f22e39af Merge 1c4f59728c into merged_master (Bitcoin PR #19879) 2020-11-29 05:32:13 +00:00
Andrew Poelstra
2a0cf12ecc Merge 07087051af into merged_master (Bitcoin PR #19556)
Added a method testPeginClaimAcceptance to interfaces::CChain. It is not clear
to me that this is meaningfully different from the existing method broadcastTransaction
(with the `relay` flag set to false so it doesn't actually broadcast), except
that this method returns the TxValidationState, which we display to the user
in the RPC error. Worth revisiting this.

Another nonobvious change was replacing a block of mempool-searching logic
in wallet/rpcwallet.cpp with the single line `pwallet->chain().findCoins(coins)`.
This I stole from the current state of upstream #17211, our favorite in-progress
PR from which the original logic came.
2020-11-29 01:43:20 +00:00
Andrew Poelstra
a0c37112ef Merge 5c910a6b7a into merged_master (Bitcoin PR #19826) 2020-11-28 17:34:40 +00:00
Andrew Poelstra
419fd4f90d Merge b75f2ad72d into merged_master (Bitcoin PR #19660) 2020-11-27 04:05:36 +00:00
Andrew Poelstra
5f3c60ff97 Merge 6d8543504d into merged_master (Bitcoin PR #19620) 2020-11-27 02:47:54 +00:00
Andrew Poelstra
54f2d85914 Merge 34eb236258 into merged_master (Bitcoin PR #19326) 2020-11-27 00:39:12 +00:00
Andrew Poelstra
59aa4e1fba Merge ad2952d17a into merged_master (Bitcoin PR #19604) 2020-11-26 22:45:20 +00:00
Andrew Poelstra
12f11f8f70 Merge 2f71a1ea35 into merged_master (Bitcoin PR #18637) 2020-11-26 20:30:20 +00:00
Andrew Poelstra
21f9f41bf4 Merge a1da180b1b into merged_master (Bitcoin PR #19589) 2020-11-26 19:33:53 +00:00
Andrew Poelstra
e547a98b54 Merge ccef10261e into merged_master (Bitcoin PR #18044) 2020-11-26 17:01:52 +00:00
Andrew Poelstra
f0f5ff0efe Merge 1397afc5ec into merged_master (Bitcoin PR #19526) 2020-11-26 15:55:30 +00:00
Andrew Poelstra
16a46e7c34 Merge 65a54d684f into merged_master (Bitcoin PR #18984) 2020-11-26 14:41:58 +00:00
Andrew Poelstra
2efdcca333 Merge b26d62c49a into merged_master (Bitcoin PR #18990) 2020-11-26 03:22:29 +00:00
Andrew Poelstra
7fabb1de9a Merge 5ec19df687 into merged_master (Bitcoin PR #19277) 2020-11-26 01:09:19 +00:00
Andrew Poelstra
8e770d3f21 Merge 915ac8a861 into merged_master (Bitcoin PR #19413) 2020-11-26 01:09:19 +00:00
Andrew Poelstra
c473bf0bce Merge bb588669f9 into merged_master (Bitcoin PR #19331) 2020-11-26 01:09:16 +00:00
Andrew Poelstra
a4f01a718d Merge 8edfc1715a into merged_master (Bitcoin PR #19204) 2020-11-26 01:09:15 +00:00
Andrew Poelstra
99d485db22 Merge 39bd9ddb87 into merged_master (Bitcoin PR #19295) 2020-11-26 01:09:07 +00:00
Andrew Poelstra
082754d60d Merge 4b30c41b4e into merged_master (Bitcoin PR #18927) 2020-11-26 01:09:05 +00:00
Andrew Poelstra
440e85cbdb Merge 371a73e940 into merged_master (Bitcoin PR #19233) 2020-11-26 01:09:02 +00:00
Andrew Poelstra
e92d54175b Merge a79bca2f1f into merged_master (Bitcoin PR #19069) 2020-11-26 01:09:01 +00:00
Andrew Poelstra
0a5760376f Merge 1b90a7b61a into merged_master (Bitcoin PR #19005) 2020-11-26 01:09:00 +00:00
Andrew Poelstra
f1891dd855 Merge 011fe009f9 into merged_master (Bitcoin PR #17994) 2020-11-26 01:08:58 +00:00
Andrew Poelstra
ff4bfc81c9 Merge 584170a388 into merged_master (Bitcoin PR #19142) 2020-11-26 01:08:58 +00:00
Andrew Poelstra
7ffe113cd9 Merge a1c0e5fce1 into merged_master (Bitcoin PR #19088) 2020-11-26 01:08:57 +00:00
Andrew Poelstra
4d1d393cd6 Merge 9e8bd217cd into merged_master (Bitcoin PR #13204) 2020-11-26 01:08:56 +00:00
Andrew Poelstra
531cdf3ca5 Merge 826fe9c667 into merged_master (Bitcoin PR #18807) 2020-11-26 01:08:54 +00:00
Andrew Poelstra
29b17c1221 Merge 793e0ff22c into merged_master (Bitcoin PR #18698) 2020-11-26 01:08:49 +00:00
Andrew Poelstra
0903cd4bc7 Merge d44dd51322 into merged_master (Bitcoin PR #18152) 2020-11-26 01:08:46 +00:00
Andrew Poelstra
1d1a32e637 Merge 5b24f6084e into merged_master (Bitcoin PR #16224) 2020-11-26 01:08:40 +00:00
Andrew Poelstra
028afdac4a Merge e727c2bdca into merged_master (Bitcoin PR #18088) 2020-11-26 01:08:37 +00:00
Andrew Poelstra
8c572c898e Merge 42fd503819 into merged_master (Bitcoin PR #18786) 2020-11-26 01:08:37 +00:00
Andrew Poelstra
0a22e1a6e6 Merge 64673b1037 into merged_master (Bitcoin PR #18780) 2020-11-26 01:08:34 +00:00
Andrew Poelstra
e5f1b2cdaa Merge 0ef0d33f75 into merged_master (Bitcoin PR #18038) 2020-11-26 01:08:33 +00:00
Andrew Poelstra
22cee70001 Merge 9fac600aba into merged_master (Bitcoin PR #17383) 2020-11-26 01:08:30 +00:00