aboutsummaryrefslogtreecommitdiff
path: root/src/db.cpp
diff options
context:
space:
mode:
authorGavin Andresen <[email protected]>2011-12-20 14:43:31 -0500
committerGavin Andresen <[email protected]>2011-12-20 14:43:31 -0500
commit595925592d36fb5d5d34beea3c3e71fca2b6726e (patch)
treee28c34353aa08a6f3c0368a39982970c08245ea3 /src/db.cpp
parentMerge pull request #717 from TheBlueMatt/installerqtupgrade (diff)
parentinclude util.h to get SecureString definition. (diff)
downloaddiscoin-595925592d36fb5d5d34beea3c3e71fca2b6726e.tar.xz
discoin-595925592d36fb5d5d34beea3c3e71fca2b6726e.zip
Merge branch 'op_eval'
Diffstat (limited to 'src/db.cpp')
-rw-r--r--src/db.cpp9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/db.cpp b/src/db.cpp
index 7195e065e..f43b2a565 100644
--- a/src/db.cpp
+++ b/src/db.cpp
@@ -934,6 +934,15 @@ int CWalletDB::LoadWallet(CWallet* pwallet)
if (nMinVersion > CLIENT_VERSION)
return DB_TOO_NEW;
}
+ else if (strType == "cscript")
+ {
+ uint160 hash;
+ ssKey >> hash;
+ CScript script;
+ ssValue >> script;
+ if (!pwallet->LoadCScript(hash, script))
+ return DB_CORRUPT;
+ }
}
pcursor->close();
}