diff options
| author | Peter Todd <pete@petertodd.org> | 2014-09-28 21:17:36 -0400 |
|---|---|---|
| committer | Peter Todd <pete@petertodd.org> | 2014-11-17 22:22:33 -0500 |
| commit | 03914234b3c9c35d66b51d580fe727a0707394ca (patch) | |
| tree | 7b8bb1ddba7c75adefa5241bc97d3b5f0a5d2608 /src/test/data/script_valid.json | |
| parent | 8adf457047677df1d58da070bae5629526bb5b74 (diff) | |
| download | bitcoin-03914234b3c9c35d66b51d580fe727a0707394ca.tar.xz | |
Discourage NOPs reserved for soft-fork upgrades
NOP1 to NOP10 are reserved for future soft-fork upgrades. In the event
of an upgrade such NOPs have *VERIFY behavior, meaning that if their
arguments are not correct the script fails. Discouraging these NOPs by
rejecting transactions containing them from the mempool ensures that
we'll never accept transactions, nor mine blocks, with scripts that are
now invalid according to the majority of hashing power even if we're not
yet upgraded. Previously this wasn't an issue as the IsStandard() rules
didn't allow upgradable NOPs anyway, but 7f3b4e95 relaxed the
IsStandard() rules for P2SH redemptions allowing any redeemScript to be
spent.
We *do* allow upgradable NOPs in scripts so long as they are not
executed. This is harmless as there is no opportunity for the script to
be invalid post-upgrade.
Diffstat (limited to 'src/test/data/script_valid.json')
| -rw-r--r-- | src/test/data/script_valid.json | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/test/data/script_valid.json b/src/test/data/script_valid.json index 439c82ef32..0cf1563163 100644 --- a/src/test/data/script_valid.json +++ b/src/test/data/script_valid.json @@ -235,6 +235,11 @@ nSequences are max. ["1","NOP1 NOP2 NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10 1 EQUAL", "P2SH,STRICTENC"], ["'NOP_1_to_10' NOP1 NOP2 NOP3 NOP4 NOP5 NOP6 NOP7 NOP8 NOP9 NOP10","'NOP_1_to_10' EQUAL", "P2SH,STRICTENC"], +["1", "NOP", "P2SH,STRICTENC,DISCOURAGE_UPGRADABLE_NOPS", "Discourage NOPx flag allows OP_NOP"], + +["0", "IF NOP10 ENDIF 1", "P2SH,STRICTENC,DISCOURAGE_UPGRADABLE_NOPS", + "Discouraged NOPs are allowed if not executed"], + ["0", "IF 0xba ELSE 1 ENDIF", "P2SH,STRICTENC", "opcodes above NOP10 invalid if executed"], ["0", "IF 0xbb ELSE 1 ENDIF", "P2SH,STRICTENC"], ["0", "IF 0xbc ELSE 1 ENDIF", "P2SH,STRICTENC"], |