X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=blobdiff_plain;f=src%2Fscript.h;h=8dd7ce986d319608f85eb806700ddd797e4e605f;hp=ec66e55e1e19f8c6ddb6eaeb70fa43320636fcb4;hb=9e58e0a8ca28b15a4bfa677f5b23891972db40fd;hpb=77a43545b4491b9703d803765da9059d2bdd5aaa diff --git a/src/script.h b/src/script.h index ec66e55..8dd7ce9 100644 --- a/src/script.h +++ b/src/script.h @@ -12,14 +12,37 @@ #include "keystore.h" #include "bignum.h" +#include "base58.h" -typedef std::vector valtype; +typedef std::vector valtype; class CTransaction; +class CBitcoinAddress; static const unsigned int MAX_SCRIPT_ELEMENT_SIZE = 520; // bytes -/** IsMine() return codes */ +// Setting nSequence to this value for every input in a transaction +// disables nLockTime. +static const uint32_t SEQUENCE_FINAL = 0xffffffff; + +// Threshold for inverted nSequence: below this value it is interpreted +// as a relative lock-time, otherwise ignored. +//static const uint32_t SEQUENCE_THRESHOLD = 0x80000000; + +// If this flag set, CTxIn::nSequence is NOT interpreted as a +// relative lock-time. +static const uint32_t SEQUENCE_LOCKTIME_DISABLE_FLAG = 0x80000000; + +// If CTxIn::nSequence encodes a relative lock-time and this flag +// is set, the relative lock-time has units of 512 seconds, +// otherwise it specifies blocks with a granularity of 1. +static const uint32_t SEQUENCE_LOCKTIME_TYPE_FLAG = 0x00400000; + +// If CTxIn::nSequence encodes a relative lock-time, this mask is +// applied to extract that lock-time from the sequence field. +static const uint32_t SEQUENCE_LOCKTIME_MASK = 0x0000ffff; + +// IsMine() return codes enum isminetype { MINE_NO = 0, @@ -30,16 +53,16 @@ enum isminetype typedef uint8_t isminefilter; -/** Signature hash types/flags */ +// Signature hash types/flags enum { SIGHASH_ALL = 1, SIGHASH_NONE = 2, SIGHASH_SINGLE = 3, - SIGHASH_ANYONECANPAY = 0x80, + SIGHASH_ANYONECANPAY = 0x80 }; -/** Script verification flags */ +// Script verification flags enum { SCRIPT_VERIFY_NONE = 0, @@ -48,6 +71,8 @@ enum SCRIPT_VERIFY_LOW_S = (1U << 2), // enforce low S values in signatures (depends on STRICTENC) SCRIPT_VERIFY_NOCACHE = (1U << 3), // do not store results in signature cache (but do query it) SCRIPT_VERIFY_NULLDUMMY = (1U << 4), // verify dummy stack item consumed by CHECKMULTISIG is of zero-length + SCRIPT_VERIFY_CHECKLOCKTIMEVERIFY = (1U << 9), + SCRIPT_VERIFY_CHECKSEQUENCEVERIFY = (1U << 10) }; // Strict verification: @@ -71,23 +96,21 @@ static const unsigned int MANDATORY_SCRIPT_VERIFY_FLAGS = SCRIPT_VERIFY_P2SH; // blocks and we must accept those blocks. static const unsigned int STRICT_FLAGS = MANDATORY_SCRIPT_VERIFY_FLAGS | STRICT_FORMAT_FLAGS; -// Soft verifications, no extended signature format checkings -static const unsigned int SOFT_FLAGS = STRICT_FLAGS & ~STRICT_FORMAT_FLAGS; - enum txnouttype { TX_NONSTANDARD, // 'standard' transaction types: TX_PUBKEY, + TX_PUBKEY_DROP, TX_PUBKEYHASH, TX_SCRIPTHASH, TX_MULTISIG, - TX_NULL_DATA, + TX_NULL_DATA }; const char* GetTxnOutputType(txnouttype t); -/** Script opcodes */ +// Script opcodes enum opcodetype { // push value @@ -127,6 +150,8 @@ enum opcodetype OP_ENDIF = 0x68, OP_VERIFY = 0x69, OP_RETURN = 0x6a, + OP_CHECKLOCKTIMEVERIFY = 0xb1, + OP_CHECKSEQUENCEVERIFY = 0xb2, // stack ops OP_TOALTSTACK = 0x6b, @@ -212,8 +237,6 @@ enum opcodetype // expansion OP_NOP1 = 0xb0, - OP_NOP2 = 0xb1, - OP_NOP3 = 0xb2, OP_NOP4 = 0xb3, OP_NOP5 = 0xb4, OP_NOP6 = 0xb5, @@ -222,26 +245,23 @@ enum opcodetype OP_NOP9 = 0xb8, OP_NOP10 = 0xb9, - - // template matching params OP_SMALLDATA = 0xf9, OP_SMALLINTEGER = 0xfa, OP_PUBKEYS = 0xfb, + OP_INTEGER = 0xfc, OP_PUBKEYHASH = 0xfd, OP_PUBKEY = 0xfe, - OP_INVALIDOPCODE = 0xff, + OP_INVALIDOPCODE = 0xff }; const char* GetOpName(opcodetype opcode); - - inline std::string ValueString(const std::vector& vch) { if (vch.size() <= 4) - return strprintf("%d", CBigNum(vch).getint()); + return strprintf("%d", CBigNum(vch).getint32()); else return HexStr(vch); } @@ -258,22 +278,15 @@ inline std::string StackString(const std::vector >& v return str; } - - - - - - - -/** Serialized script, used inside transaction inputs and outputs */ -class CScript : public std::vector +// Serialized script, used inside transaction inputs and outputs +class CScript : public std::vector { protected: CScript& push_int64(int64_t n) { if (n == -1 || (n >= 1 && n <= 16)) { - push_back(n + (OP_1 - 1)); + push_back((uint8_t)n + (OP_1 - 1)); } else { @@ -287,7 +300,7 @@ protected: { if (n >= 1 && n <= 16) { - push_back(n + (OP_1 - 1)); + push_back((uint8_t)n + (OP_1 - 1)); } else { @@ -299,10 +312,10 @@ protected: public: CScript() { } - CScript(const CScript& b) : std::vector(b.begin(), b.end()) { } - CScript(const_iterator pbegin, const_iterator pend) : std::vector(pbegin, pend) { } + CScript(const CScript& b) : std::vector(b.begin(), b.end()) { } + CScript(const_iterator pbegin, const_iterator pend) : std::vector(pbegin, pend) { } #ifndef _MSC_VER - CScript(const unsigned char* pbegin, const unsigned char* pend) : std::vector(pbegin, pend) { } + CScript(const uint8_t* pbegin, const uint8_t* pend) : std::vector(pbegin, pend) { } #endif CScript& operator+=(const CScript& b) @@ -318,58 +331,56 @@ public: return ret; } + explicit CScript(int8_t b) { operator<<(b); } + explicit CScript(int16_t b) { operator<<(b); } + explicit CScript(int32_t b) { operator<<(b); } + explicit CScript(int64_t b) { operator<<(b); } - //explicit CScript(char b) is not portable. Use 'signed char' or 'unsigned char'. - explicit CScript(signed char b) { operator<<(b); } - explicit CScript(short b) { operator<<(b); } - explicit CScript(int b) { operator<<(b); } - explicit CScript(long b) { operator<<(b); } - explicit CScript(unsigned char b) { operator<<(b); } - explicit CScript(unsigned int b) { operator<<(b); } - explicit CScript(unsigned short b) { operator<<(b); } - explicit CScript(unsigned long b) { operator<<(b); } + explicit CScript(uint8_t b) { operator<<(b); } + explicit CScript(uint16_t b) { operator<<(b); } + explicit CScript(uint32_t b) { operator<<(b); } + explicit CScript(uint64_t b) { operator<<(b); } explicit CScript(opcodetype b) { operator<<(b); } explicit CScript(const uint256& b) { operator<<(b); } explicit CScript(const CBigNum& b) { operator<<(b); } - explicit CScript(const std::vector& b) { operator<<(b); } + explicit CScript(const std::vector& b) { operator<<(b); } + CScript& operator<<(int8_t b) { return push_int64(b); } + CScript& operator<<(int16_t b) { return push_int64(b); } + CScript& operator<<(int32_t b) { return push_int64(b); } + CScript& operator<<(int64_t b) { return push_int64(b); } - //CScript& operator<<(char b) is not portable. Use 'signed char' or 'unsigned char'. - CScript& operator<<(signed char b) { return push_int64(b); } - CScript& operator<<(short b) { return push_int64(b); } - CScript& operator<<(int b) { return push_int64(b); } - CScript& operator<<(long b) { return push_int64(b); } - CScript& operator<<(unsigned char b) { return push_uint64(b); } - CScript& operator<<(unsigned int b) { return push_uint64(b); } - CScript& operator<<(unsigned short b) { return push_uint64(b); } - CScript& operator<<(unsigned long b) { return push_uint64(b); } + CScript& operator<<(uint8_t b) { return push_uint64(b); } + CScript& operator<<(uint16_t b) { return push_uint64(b); } + CScript& operator<<(uint32_t b) { return push_uint64(b); } + CScript& operator<<(uint64_t b) { return push_uint64(b); } CScript& operator<<(opcodetype opcode) { if (opcode < 0 || opcode > 0xff) throw std::runtime_error("CScript::operator<<() : invalid opcode"); - insert(end(), (unsigned char)opcode); + insert(end(), (uint8_t)opcode); return *this; } CScript& operator<<(const uint160& b) { insert(end(), sizeof(b)); - insert(end(), (unsigned char*)&b, (unsigned char*)&b + sizeof(b)); + insert(end(), (uint8_t*)&b, (uint8_t*)&b + sizeof(b)); return *this; } CScript& operator<<(const uint256& b) { insert(end(), sizeof(b)); - insert(end(), (unsigned char*)&b, (unsigned char*)&b + sizeof(b)); + insert(end(), (uint8_t*)&b, (uint8_t*)&b + sizeof(b)); return *this; } CScript& operator<<(const CPubKey& key) { - std::vector vchKey = key.Raw(); + std::vector vchKey(key.begin(), key.end()); return (*this) << vchKey; } @@ -379,28 +390,28 @@ public: return *this; } - CScript& operator<<(const std::vector& b) + CScript& operator<<(const std::vector& b) { if (b.size() < OP_PUSHDATA1) { - insert(end(), (unsigned char)b.size()); + insert(end(), (uint8_t)b.size()); } else if (b.size() <= 0xff) { insert(end(), OP_PUSHDATA1); - insert(end(), (unsigned char)b.size()); + insert(end(), (uint8_t)b.size()); } else if (b.size() <= 0xffff) { insert(end(), OP_PUSHDATA2); - unsigned short nSize = b.size(); - insert(end(), (unsigned char*)&nSize, (unsigned char*)&nSize + sizeof(nSize)); + uint16_t nSize = (uint16_t) b.size(); + insert(end(), (uint8_t*)&nSize, (uint8_t*)&nSize + sizeof(nSize)); } else { insert(end(), OP_PUSHDATA4); - unsigned int nSize = b.size(); - insert(end(), (unsigned char*)&nSize, (unsigned char*)&nSize + sizeof(nSize)); + uint32_t nSize = (uint32_t) b.size(); + insert(end(), (uint8_t*)&nSize, (uint8_t*)&nSize + sizeof(nSize)); } insert(end(), b.begin(), b.end()); return *this; @@ -415,7 +426,7 @@ public: } - bool GetOp(iterator& pc, opcodetype& opcodeRet, std::vector& vchRet) + bool GetOp(iterator& pc, opcodetype& opcodeRet, std::vector& vchRet) { // Wrapper so it can be called with either iterator or const_iterator const_iterator pc2 = pc; @@ -432,7 +443,7 @@ public: return fRet; } - bool GetOp(const_iterator& pc, opcodetype& opcodeRet, std::vector& vchRet) const + bool GetOp(const_iterator& pc, opcodetype& opcodeRet, std::vector& vchRet) const { return GetOp2(pc, opcodeRet, &vchRet); } @@ -442,7 +453,7 @@ public: return GetOp2(pc, opcodeRet, NULL); } - bool GetOp2(const_iterator& pc, opcodetype& opcodeRet, std::vector* pvchRet) const + bool GetOp2(const_iterator& pc, opcodetype& opcodeRet, std::vector* pvchRet) const { opcodeRet = OP_INVALIDOPCODE; if (pvchRet) @@ -453,12 +464,12 @@ public: // Read instruction if (end() - pc < 1) return false; - unsigned int opcode = *pc++; + uint32_t opcode = *pc++; // Immediate operand if (opcode <= OP_PUSHDATA4) { - unsigned int nSize; + uint32_t nSize = OP_0; if (opcode < OP_PUSHDATA1) { nSize = opcode; @@ -473,7 +484,6 @@ public: { if (end() - pc < 2) return false; - nSize = 0; memcpy(&nSize, &pc[0], 2); pc += 2; } @@ -484,7 +494,7 @@ public: memcpy(&nSize, &pc[0], 4); pc += 4; } - if (end() - pc < 0 || (unsigned int)(end() - pc) < nSize) + if (end() - pc < 0 || (uint32_t)(end() - pc) < nSize) return false; if (pvchRet) pvchRet->assign(pc, pc + nSize); @@ -501,7 +511,7 @@ public: if (opcode == OP_0) return 0; assert(opcode >= OP_1 && opcode <= OP_16); - return (int)opcode - (int)(OP_1 - 1); + return (opcode - (OP_1 - 1)); } static opcodetype EncodeOP_N(int n) { @@ -552,10 +562,8 @@ public: bool IsPayToScriptHash() const; - // Called by CTransaction::IsStandard and P2SH VerifyScript (which makes it consensus-critical). - bool IsPushOnly() const + bool IsPushOnly(const_iterator pc) const { - const_iterator pc = begin(); while (pc < end()) { opcodetype opcode; @@ -567,11 +575,18 @@ public: return true; } + // Called by CTransaction::IsStandard and P2SH VerifyScript (which makes it consensus-critical). + bool IsPushOnly() const + { + return this->IsPushOnly(begin()); + } + // Called by CTransaction::IsStandard. bool HasCanonicalPushes() const; void SetDestination(const CTxDestination& address); - void SetMultisig(int nRequired, const std::vector& keys); + void SetAddress(const CBitcoinAddress& dest); + void SetMultisig(int nRequired, const std::vector& keys); void PrintHex() const @@ -583,7 +598,7 @@ public: { std::string str; opcodetype opcode; - std::vector vch; + std::vector vch; const_iterator pc = begin(); while (pc < end()) { @@ -614,17 +629,19 @@ public: }; bool IsCanonicalPubKey(const std::vector &vchPubKey, unsigned int flags); +bool IsDERSignature(const valtype &vchSig, bool fWithHashType=false, bool fCheckLow=false); bool IsCanonicalSignature(const std::vector &vchSig, unsigned int flags); - bool EvalScript(std::vector >& stack, const CScript& script, const CTransaction& txTo, unsigned int nIn, unsigned int flags, int nHashType); bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, std::vector >& vSolutionsRet); int ScriptSigArgsExpected(txnouttype t, const std::vector >& vSolutions); bool IsStandard(const CScript& scriptPubKey, txnouttype& whichType); isminetype IsMine(const CKeyStore& keystore, const CScript& scriptPubKey); -isminetype IsMine(const CKeyStore& keystore, const CTxDestination& dest); +//isminetype IsMine(const CKeyStore& keystore, const CTxDestination& dest); +isminetype IsMine(const CKeyStore& keystore, const CBitcoinAddress& dest); void ExtractAffectedKeys(const CKeyStore &keystore, const CScript& scriptPubKey, std::vector &vKeys); bool ExtractDestination(const CScript& scriptPubKey, CTxDestination& addressRet); +bool ExtractAddress(const CKeyStore &keystore, const CScript& scriptPubKey, CBitcoinAddress& addressRet); bool ExtractDestinations(const CScript& scriptPubKey, txnouttype& typeRet, std::vector& addressRet, int& nRequiredRet); bool SignSignature(const CKeyStore& keystore, const CScript& fromPubKey, CTransaction& txTo, unsigned int nIn, int nHashType=SIGHASH_ALL); bool SignSignature(const CKeyStore& keystore, const CTransaction& txFrom, CTransaction& txTo, unsigned int nIn, int nHashType=SIGHASH_ALL); @@ -632,6 +649,6 @@ bool VerifyScript(const CScript& scriptSig, const CScript& scriptPubKey, const C // Given two sets of signatures for scriptPubKey, possibly with OP_0 placeholders, // combine them intelligently and return the result. -CScript CombineSignatures(CScript scriptPubKey, const CTransaction& txTo, unsigned int nIn, const CScript& scriptSig1, const CScript& scriptSig2); +CScript CombineSignatures(const CScript& scriptPubKey, const CTransaction& txTo, unsigned int nIn, const CScript& scriptSig1, const CScript& scriptSig2); #endif