diff options
| author | Pieter Wuille <pieter@wuille.net> | 2020-09-11 14:33:45 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter@wuille.net> | 2020-10-12 17:17:56 -0700 |
| commit | 8bbed4b7acf4c76eaea8c0e10f3cbf6ba4e53809 (patch) | |
| tree | 32afa457bf2ead02197781c43087b5f83f499d15 /src/script/script_error.cpp | |
| parent | 0664f5fe1f77f08d235aa3750b59428257b0b91d (diff) | |
| download | bitcoin-8bbed4b7acf4c76eaea8c0e10f3cbf6ba4e53809.tar.xz | |
Implement Taproot validation (BIP 341)
This includes key path spending and script path spending, but not the
Tapscript execution implementation (leaf 0xc0 remains unemcumbered in
this commit).
Includes constants for various aspects of the consensus rules suggested
by Jeremy Rubin.
Diffstat (limited to 'src/script/script_error.cpp')
| -rw-r--r-- | src/script/script_error.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/script/script_error.cpp b/src/script/script_error.cpp index 9c49ced3ed..77add5194c 100644 --- a/src/script/script_error.cpp +++ b/src/script/script_error.cpp @@ -73,6 +73,8 @@ std::string ScriptErrorString(const ScriptError serror) return "NOPx reserved for soft-fork upgrades"; case SCRIPT_ERR_DISCOURAGE_UPGRADABLE_WITNESS_PROGRAM: return "Witness version reserved for soft-fork upgrades"; + case SCRIPT_ERR_DISCOURAGE_UPGRADABLE_TAPROOT_VERSION: + return "Taproot version reserved for soft-fork upgrades"; case SCRIPT_ERR_PUBKEYTYPE: return "Public key is neither compressed or uncompressed"; case SCRIPT_ERR_CLEANSTACK: @@ -97,6 +99,8 @@ std::string ScriptErrorString(const ScriptError serror) return "Invalid Schnorr signature hash type"; case SCRIPT_ERR_SCHNORR_SIG: return "Invalid Schnorr signature"; + case SCRIPT_ERR_TAPROOT_WRONG_CONTROL_SIZE: + return "Invalid Taproot control block size"; case SCRIPT_ERR_OP_CODESEPARATOR: return "Using OP_CODESEPARATOR in non-witness script"; case SCRIPT_ERR_SIG_FINDANDDELETE: |