diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2011-11-08 13:20:29 -0500 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2011-12-19 13:24:48 -0500 |
| commit | 2a45a494b0bec6a0f1fc6ab7f26c260b85e7ff3e (patch) | |
| tree | a6c8ad492ea81d6f1c2b8694351a7b7bfa785ae6 /src/main.h | |
| parent | a0871afb2b1d6d358c833fd08bca2f13c840fd4d (diff) | |
Use block times for 'hard' OP_EVAL switchover, and refactored EvalScript
so it takes a flag for how to interpret OP_EVAL.
Also increased IsStandard size of scriptSigs to 500 bytes, so
a 3-of-3 multisig transaction IsStandard.
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/main.h b/src/main.h index bf31234c29..26d14b0d3f 100644 --- a/src/main.h +++ b/src/main.h @@ -494,7 +494,7 @@ public: } bool IsStandard() const; - bool IsStandardInputs(std::map<uint256, std::pair<CTxIndex, CTransaction> > mapInputs) const; + bool AreInputsStandard(std::map<uint256, std::pair<CTxIndex, CTransaction> > mapInputs) const; int64 GetValueOut() const { @@ -622,6 +622,8 @@ public: bool ReadFromDisk(CTxDB& txdb, COutPoint prevout); bool ReadFromDisk(COutPoint prevout); bool DisconnectInputs(CTxDB& txdb); + + // Fetch from memory and/or disk. inputsRet keys are transaction hashes. bool FetchInputs(CTxDB& txdb, const std::map<uint256, CTxIndex>& mapTestPool, bool fBlock, bool fMiner, std::map<uint256, std::pair<CTxIndex, CTransaction> >& inputsRet); bool ConnectInputs(std::map<uint256, std::pair<CTxIndex, CTransaction> > inputs, |