diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-10-17 13:26:26 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2016-10-17 13:27:05 +0200 |
| commit | 53133c1c041d113c2a480a18e6ff38681d135dca (patch) | |
| tree | d272f24e8715993840724b3fa733c61d9b5dffcf /src/script/script_error.cpp | |
| parent | 0329511b9cd60146fcd27a75600e404122505593 (diff) | |
| parent | 67d6ee1e3679504f46473fe0818970565ff3b137 (diff) | |
Merge #8499: Add several policy limits and disable uncompressed keys for segwit scripts
67d6ee1 remove redundant tests in p2p-segwit.py (Johnson Lau)
9260085 test segwit uncompressed key fixes (Johnson Lau)
248f3a7 Fix ismine and addwitnessaddress: no uncompressed keys in segwit (Pieter Wuille)
b811124 [qa] Add tests for uncompressed pubkeys in segwit (Suhas Daftuar)
9f0397a Make test framework produce lowS signatures (Johnson Lau)
4c0c25a Require compressed keys in segwit as policy and disable signing with uncompressed keys for segwit scripts (Johnson Lau)
3ade2f6 Add standard limits for P2WSH with tests (Johnson Lau)
Diffstat (limited to 'src/script/script_error.cpp')
| -rw-r--r-- | src/script/script_error.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/script/script_error.cpp b/src/script/script_error.cpp index e27b715c2c..2c5359fe8a 100644 --- a/src/script/script_error.cpp +++ b/src/script/script_error.cpp @@ -85,6 +85,8 @@ const char* ScriptErrorString(const ScriptError serror) return "Witness requires only-redeemscript scriptSig"; case SCRIPT_ERR_WITNESS_UNEXPECTED: return "Witness provided for non-witness script"; + case SCRIPT_ERR_WITNESS_PUBKEYTYPE: + return "Using non-compressed keys in segwit"; case SCRIPT_ERR_UNKNOWN_ERROR: case SCRIPT_ERR_ERROR_COUNT: default: break; |