X-Git-Url: https://git.novaco.in/?a=blobdiff_plain;f=src%2Fscript.h;h=8dd7ce986d319608f85eb806700ddd797e4e605f;hb=HEAD;hp=7d4798916957dd279d3666fed66d86e361eafaf4;hpb=7e58f6d48d573135ef9f8b36a09603c414c50ba9;p=novacoin.git diff --git a/src/script.h b/src/script.h index 7d47989..0f7cdf2 100644 --- a/src/script.h +++ b/src/script.h @@ -5,21 +5,43 @@ #ifndef H_BITCOIN_SCRIPT #define H_BITCOIN_SCRIPT +#include "keystore.h" +#include "bignum.h" +#include "util.h" + #include #include -#include - -#include "keystore.h" -#include "bignum.h" 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,7 +52,7 @@ enum isminetype typedef uint8_t isminefilter; -/** Signature hash types/flags */ +// Signature hash types/flags enum { SIGHASH_ALL = 1, @@ -39,7 +61,7 @@ enum SIGHASH_ANYONECANPAY = 0x80 }; -/** Script verification flags */ +// Script verification flags enum { SCRIPT_VERIFY_NONE = 0, @@ -47,9 +69,9 @@ enum SCRIPT_VERIFY_STRICTENC = (1U << 1), // enforce strict conformance to DER and SEC2 for signatures and pubkeys 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_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: @@ -87,7 +109,7 @@ enum txnouttype const char* GetTxnOutputType(txnouttype t); -/** Script opcodes */ +// Script opcodes enum opcodetype { // push value @@ -128,6 +150,7 @@ enum opcodetype OP_VERIFY = 0x69, OP_RETURN = 0x6a, OP_CHECKLOCKTIMEVERIFY = 0xb1, + OP_CHECKSEQUENCEVERIFY = 0xb2, // stack ops OP_TOALTSTACK = 0x6b, @@ -213,7 +236,6 @@ enum opcodetype // expansion OP_NOP1 = 0xb0, - OP_NOP3 = 0xb2, OP_NOP4 = 0xb3, OP_NOP5 = 0xb4, OP_NOP6 = 0xb5, @@ -246,7 +268,7 @@ inline std::string ValueString(const std::vector& vch) inline std::string StackString(const std::vector >& vStack) { std::string str; - BOOST_FOREACH(const std::vector& vch, vStack) + for (const std::vector& vch : vStack) { if (!str.empty()) str += " "; @@ -255,7 +277,7 @@ inline std::string StackString(const std::vector >& v return str; } -/** Serialized script, used inside transaction inputs and outputs */ +// Serialized script, used inside transaction inputs and outputs class CScript : public std::vector { protected: @@ -295,6 +317,8 @@ public: CScript(const uint8_t* pbegin, const uint8_t* pend) : std::vector(pbegin, pend) { } #endif + CScript& operator=(const CScript&) = default; + CScript& operator+=(const CScript& b) { insert(end(), b.begin(), b.end()); @@ -357,7 +381,7 @@ public: CScript& operator<<(const CPubKey& key) { - std::vector vchKey = key.Raw(); + std::vector vchKey(key.begin(), key.end()); return (*this) << vchKey; } @@ -562,8 +586,8 @@ public: bool HasCanonicalPushes() const; void SetDestination(const CTxDestination& address); - void SetDestination(const CPubKey& R, CPubKey& pubKeyVariant); - void SetMultisig(int nRequired, const std::vector& keys); + void SetAddress(const CBitcoinAddress& dest); + void SetMultisig(int nRequired, const std::vector& keys); void PrintHex() const @@ -599,10 +623,7 @@ public: printf("%s\n", ToString().c_str()); } - CScriptID GetID() const - { - return CScriptID(Hash160(*this)); - } + CScriptID GetID() const; }; bool IsCanonicalPubKey(const std::vector &vchPubKey, unsigned int flags); @@ -614,9 +635,11 @@ bool Solver(const CScript& scriptPubKey, txnouttype& typeRet, 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);