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/db.cpp | |
| parent | a0871afb2b1d6d358c833fd08bca2f13c840fd4d (diff) | |
| download | bitcoin-2a45a494b0bec6a0f1fc6ab7f26c260b85e7ff3e.tar.xz | |
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/db.cpp')
| -rw-r--r-- | src/db.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/db.cpp b/src/db.cpp index 52ad695c71..f43b2a5656 100644 --- a/src/db.cpp +++ b/src/db.cpp @@ -938,7 +938,7 @@ int CWalletDB::LoadWallet(CWallet* pwallet) { uint160 hash; ssKey >> hash; - std::vector<unsigned char> script; + CScript script; ssValue >> script; if (!pwallet->LoadCScript(hash, script)) return DB_CORRUPT; |