GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-15 12:51:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add OP_CHECKSIGFROMSTACK[VERIFY]

Browse source
This commit is contained in:
Steven Roose 2019-01-08 14:29:14 +00:00
parent 8c20371f72
commit c27ea98605
5 changed files with 44 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

36
src/script/interpreter.cpp
View file

@ -1126,6 +1126,42 @@ bool EvalScript(std::vector<std::vector<unsigned char> >& stack, const CScript&
} }
break; break;
case OP_CHECKSIGFROMSTACK:
case OP_CHECKSIGFROMSTACKVERIFY:
{
// (sig data pubkey -- bool)
if (stack.size() < 3)
return set_error(serror, SCRIPT_ERR_INVALID_STACK_OPERATION);
valtype& vchSig = stacktop(-3);
valtype& vchData = stacktop(-2);
valtype& vchPubKey = stacktop(-1);
// Sigs from stack have no hash byte ever
if (!CheckSignatureEncoding(vchSig, (flags | SCRIPT_NO_SIGHASH_BYTE), serror) || !CheckPubKeyEncoding(vchPubKey, flags, sigversion, serror)) {
//serror is set
return false;
}
valtype vchHash(32);
CSHA256().Write(vchData.data(), vchData.size()).Finalize(vchHash.data());
uint256 hash(vchHash);
CPubKey pubkey(vchPubKey);
bool fSuccess = pubkey.Verify(hash, vchSig);
popstack(stack);
popstack(stack);
popstack(stack);
stack.push_back(fSuccess ? vchTrue : vchFalse);
if (opcode == OP_CHECKSIGFROMSTACKVERIFY)
popstack(stack);
if (!fSuccess)
return set_error(serror, SCRIPT_ERR_CHECKSIGVERIFY);
}
break;
default: default:
return set_error(serror, SCRIPT_ERR_BAD_OPCODE); return set_error(serror, SCRIPT_ERR_BAD_OPCODE);
} }

5
src/script/script.cpp
View file

@ -127,6 +127,8 @@ const char* GetOpName(opcodetype opcode)
case OP_CHECKMULTISIG : return "OP_CHECKMULTISIG"; case OP_CHECKMULTISIG : return "OP_CHECKMULTISIG";
case OP_CHECKMULTISIGVERIFY : return "OP_CHECKMULTISIGVERIFY"; case OP_CHECKMULTISIGVERIFY : return "OP_CHECKMULTISIGVERIFY";
case OP_DETERMINISTICRANDOM : return "OP_DETERMINISTICRANDOM"; case OP_DETERMINISTICRANDOM : return "OP_DETERMINISTICRANDOM";
case OP_CHECKSIGFROMSTACK : return "OP_CHECKSIGFROMSTACK";
case OP_CHECKSIGFROMSTACKVERIFY: return "OP_CHECKSIGFROMSTACKVERIFY";
// expansion // expansion
case OP_NOP1 : return "OP_NOP1"; case OP_NOP1 : return "OP_NOP1";
@ -157,7 +159,8 @@ unsigned int CScript::GetSigOpCount(bool fAccurate) const
opcodetype opcode; opcodetype opcode;
if (!GetOp(pc, opcode)) if (!GetOp(pc, opcode))
break; break;
if (opcode == OP_CHECKSIG || opcode == OP_CHECKSIGVERIFY) if (opcode == OP_CHECKSIG || opcode == OP_CHECKSIGVERIFY ||
opcode == OP_CHECKSIGFROMSTACK || opcode == OP_CHECKSIGFROMSTACKVERIFY)
n++; n++;
else if (opcode == OP_CHECKMULTISIG || opcode == OP_CHECKMULTISIGVERIFY) else if (opcode == OP_CHECKMULTISIG || opcode == OP_CHECKMULTISIGVERIFY)
{ {

4
src/script/script.h
View file

@ -174,6 +174,8 @@ enum opcodetype
OP_CHECKMULTISIG = 0xae, OP_CHECKMULTISIG = 0xae,
OP_CHECKMULTISIGVERIFY = 0xaf, OP_CHECKMULTISIGVERIFY = 0xaf,
OP_DETERMINISTICRANDOM = 0xc0, OP_DETERMINISTICRANDOM = 0xc0,
OP_CHECKSIGFROMSTACK = 0xc1,
OP_CHECKSIGFROMSTACKVERIFY = 0xc2,
// expansion // expansion
OP_NOP1 = 0xb0, OP_NOP1 = 0xb0,
@ -193,7 +195,7 @@ enum opcodetype
}; };
// Maximum value that an opcode can be // Maximum value that an opcode can be
static const unsigned int MAX_OPCODE = OP_DETERMINISTICRANDOM; static const unsigned int MAX_OPCODE = OP_CHECKSIGFROMSTACKVERIFY;
const char* GetOpName(opcodetype opcode); const char* GetOpName(opcodetype opcode);

4
src/test/data/script_tests.json
View file

@ -258,8 +258,6 @@
["0", "IF 0xbd ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"], ["0", "IF 0xbd ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
["0", "IF 0xbe ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"], ["0", "IF 0xbe ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
["0", "IF 0xbf ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"], ["0", "IF 0xbf ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
["0", "IF 0xc1 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
["0", "IF 0xc2 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
["0", "IF 0xc3 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"], ["0", "IF 0xc3 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
["0", "IF 0xc4 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"], ["0", "IF 0xc4 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
["0", "IF 0xc5 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"], ["0", "IF 0xc5 ELSE 1 ENDIF", "P2SH,STRICTENC", "OK"],
@ -893,8 +891,6 @@
["1", "IF 0xbd ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"], ["1", "IF 0xbd ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
["1", "IF 0xbe ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"], ["1", "IF 0xbe ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
["1", "IF 0xbf ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"], ["1", "IF 0xbf ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
["1", "IF 0xc1 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
["1", "IF 0xc2 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
["1", "IF 0xc3 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"], ["1", "IF 0xc3 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
["1", "IF 0xc4 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"], ["1", "IF 0xc4 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],
["1", "IF 0xc5 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"], ["1", "IF 0xc5 ELSE 1 ENDIF", "P2SH,STRICTENC", "BAD_OPCODE"],

2
src/test/script_tests.cpp
View file

@ -1474,7 +1474,7 @@ BOOST_AUTO_TEST_CASE(script_HasValidOps)
BOOST_CHECK(script.HasValidOps()); BOOST_CHECK(script.HasValidOps());
script = ScriptFromHex("ff88ac"); // Script with OP_INVALIDOPCODE explicit script = ScriptFromHex("ff88ac"); // Script with OP_INVALIDOPCODE explicit
BOOST_CHECK(!script.HasValidOps()); BOOST_CHECK(!script.HasValidOps());
script = ScriptFromHex("88acc1"); // Script with undefined opcode: one higher then MAX_OPCODE script = ScriptFromHex("88acc3"); // Script with undefined opcode: one higher then MAX_OPCODE
BOOST_CHECK(!script.HasValidOps()); BOOST_CHECK(!script.HasValidOps());
} }