DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

guard cryptoconditions

Browse Source
This commit is contained in:
Scott Sadler
2018-02-18 20:38:29 -03:00
parent 28b946127b
commit 6263d40239
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/script/interpreter.cpp
View File

@@ -940,7 +940,9 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, un
case OP_CHECKCRYPTOCONDITION: case OP_CHECKCRYPTOCONDITION:
case OP_CHECKCRYPTOCONDITIONVERIFY: case OP_CHECKCRYPTOCONDITIONVERIFY:
{ {
// (fulfillment condition -- bool) if (!IsCryptoConditionsEnabled()) {
goto INTERPRETER_DEFAULT;
}
if (stack.size() < 2) if (stack.size() < 2)
return set_error(serror, SCRIPT_ERR_INVALID_STACK_OPERATION); return set_error(serror, SCRIPT_ERR_INVALID_STACK_OPERATION);
@@ -982,6 +984,7 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, un
} }
break; break;
INTERPRETER_DEFAULT:
default: default:
return set_error(serror, SCRIPT_ERR_BAD_OPCODE); return set_error(serror, SCRIPT_ERR_BAD_OPCODE);
} }

13
src/script/standard.cpp
View File

@@ -9,6 +9,7 @@
#include "script/script.h" #include "script/script.h"
#include "util.h" #include "util.h"
#include "utilstrencodings.h" #include "utilstrencodings.h"
#include "komodo_cryptoconditions.h"
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
@@ -68,11 +69,13 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, vector<vector<unsi
return true; return true;
} }
// Shortcut for pay-to-crypto-condition if (IsCryptoConditionsEnabled() {
if (scriptPubKey.IsPayToCryptoCondition()) { // Shortcut for pay-to-crypto-condition
typeRet = TX_CRYPTOCONDITION; if (scriptPubKey.IsPayToCryptoCondition()) {
// TODO: Extract solutions typeRet = TX_CRYPTOCONDITION;
return true; // TODO: Extract solutions
return true;
}
} }
// Scan templates // Scan templates