diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2012-01-04 21:40:52 -0500 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2012-01-13 10:22:23 -0500 |
| commit | 922e8e2929a2e78270868385aa46f96002fbcff3 (patch) | |
| tree | d7c7d2b3fe89bc18b8d0f1137980b9db16db3ae8 /src/main.h | |
| parent | d11a58a2d39b90dfe27d3a696b3977b87d7c8113 (diff) | |
Replace OP_EVAL (BIP 12) with Pay-to-script-hash (BIP 16).
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/main.h b/src/main.h index 30f3cc3ed1..6f71fd2004 100644 --- a/src/main.h +++ b/src/main.h @@ -503,7 +503,9 @@ public: } bool IsStandard() const; - bool AreInputsStandard(std::map<uint256, std::pair<CTxIndex, CTransaction> > mapInputs) const; + bool AreInputsStandard(const std::map<uint256, std::pair<CTxIndex, CTransaction> >& mapInputs) const; + + int GetLegacySigOpCount() const; int64 GetValueOut() const { @@ -636,8 +638,8 @@ public: 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, - std::map<uint256, CTxIndex>& mapTestPool, CDiskTxPos posThisTx, - CBlockIndex* pindexBlock, int64& nFees, bool fBlock, bool fMiner, int& nSigOpsRet, int64 nMinFee=0); + std::map<uint256, CTxIndex>& mapTestPool, const CDiskTxPos& posThisTx, + const CBlockIndex* pindexBlock, int64& nFees, bool fBlock, bool fMiner, int& nSigOpsRet, int64 nMinFee=0); bool ClientConnectInputs(); bool CheckTransaction() const; bool AcceptToMemoryPool(CTxDB& txdb, bool fCheckInputs=true, bool* pfMissingInputs=NULL); |