aboutsummaryrefslogtreecommitdiff
path: root/src/script.h
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2013-10-21 22:47:24 -0700
committerGavin Andresen <gavinandresen@gmail.com>2013-10-21 22:47:24 -0700
commitbe484db274e6de7e7b6880d04b2d84e20b719b9a (patch)
treecd0bef85a328ee5d111545f6862b9cbb42fd0aac /src/script.h
parent10dc3c74737eea1f2de694c6582caf3027926034 (diff)
parenta79342479f577013f2fd2573fb32585d6f4981b3 (diff)
Merge pull request #2738 from jgarzik/op_return
Relay OP_RETURN data TxOut as standard transaction type.
Diffstat (limited to 'src/script.h')
-rw-r--r--src/script.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/script.h b/src/script.h
index d339f7880e..931307007f 100644
--- a/src/script.h
+++ b/src/script.h
@@ -46,6 +46,7 @@ enum txnouttype
TX_PUBKEYHASH,
TX_SCRIPTHASH,
TX_MULTISIG,
+ TX_NULL_DATA,
};
class CNoDestination {
@@ -202,6 +203,7 @@ enum opcodetype
// template matching params
+ OP_SMALLDATA = 0xf9,
OP_SMALLINTEGER = 0xfa,
OP_PUBKEYS = 0xfb,
OP_PUBKEYHASH = 0xfd,
@@ -683,7 +685,7 @@ bool IsCanonicalSignature(const std::vector<unsigned char> &vchSig, unsigned int
bool EvalScript(std::vector<std::vector<unsigned char> >& stack, const CScript& script, const CTransaction& txTo, unsigned int nIn, unsigned int flags, int nHashType);
bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, std::vector<std::vector<unsigned char> >& vSolutionsRet);
int ScriptSigArgsExpected(txnouttype t, const std::vector<std::vector<unsigned char> >& vSolutions);
-bool IsStandard(const CScript& scriptPubKey);
+bool IsStandard(const CScript& scriptPubKey, txnouttype& whichType);
bool IsMine(const CKeyStore& keystore, const CScript& scriptPubKey);
bool IsMine(const CKeyStore& keystore, const CTxDestination &dest);
void ExtractAffectedKeys(const CKeyStore &keystore, const CScript& scriptPubKey, std::vector<CKeyID> &vKeys);