diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-06-28 15:06:04 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-06-28 15:06:18 +0200 |
commit | 9125ef942174254d4afdf96c3eda1da12dff01e0 (patch) | |
tree | b9302084bb363a0e68bdab96bf2aff4a1fac4bb8 /src/script.cpp | |
parent | 5bc77b2bb23509bfc8bc54e95c52be55ac3085c0 (diff) | |
parent | 86fe1b864b109869659f140af07047163637a673 (diff) |
Merge pull request #4398
86fe1b8 update coding.md to reflect changes by pull (Philip Kaufmann)
e10dcf2 ensure clean and consistent "namespace" usage (Philip Kaufmann)
Diffstat (limited to 'src/script.cpp')
-rw-r--r-- | src/script.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/script.cpp b/src/script.cpp index bc4705abe7..e1b6985408 100644 --- a/src/script.cpp +++ b/src/script.cpp @@ -974,6 +974,7 @@ bool EvalScript(vector<vector<unsigned char> >& stack, const CScript& script, co namespace { + /** Wrapper that serializes like CTransaction, but with the modifications * required for the signature hash done in-place */ @@ -1066,7 +1067,8 @@ public: ::Serialize(s, txTo.nLockTime, nType, nVersion); } }; -} + +} // anon namespace uint256 SignatureHash(const CScript &scriptCode, const CTransaction& txTo, unsigned int nIn, int nHashType) { @@ -1092,7 +1094,6 @@ uint256 SignatureHash(const CScript &scriptCode, const CTransaction& txTo, unsig return ss.GetHash(); } - // Valid signature cache, to avoid doing expensive ECDSA signature checking // twice for every transaction (once when accepted into memory pool, and // again when accepted into the block chain) |