Batch writes for importmulti

achow101 · achow101 · commit ccb26cf347a6 · 2019-05-18T12:59:17.000-04:00
When writing all of the imported data to the wallet, use a common
WalletBatch object so that batch writes are done and the writes
finish more quickly.

AddKeypoolPubkey is no longer needed so it is also removed
diff --git a/src/wallet/rpcdump.cpp b/src/wallet/rpcdump.cpp
@@ -1261,8 +1261,9 @@ static UniValue ProcessImport(CWallet * const pwallet, const UniValue& data, con
 
         // All good, time to import
         pwallet->MarkDirty();
+        WalletBatch batch(pwallet->GetDBHandle());
         for (const auto& entry : import_data.import_scripts) {
-            if (!pwallet->HaveCScript(CScriptID(entry)) && !pwallet->AddCScript(entry)) {
+            if (!pwallet->HaveCScript(CScriptID(entry)) && !pwallet->AddCScriptWithDB(batch, entry)) {
                 throw JSONRPCError(RPC_WALLET_ERROR, "Error adding script to wallet");
              }
          }
@@ -1273,13 +1274,13 @@ static UniValue ProcessImport(CWallet * const pwallet, const UniValue& data, con
              assert(key.VerifyPubKey(pubkey));
              pwallet->mapKeyMetadata[id].nCreateTime = timestamp;
              // If the private key is not present in the wallet, insert it.
-             if (!pwallet->HaveKey(id) && !pwallet->AddKeyPubKey(key, pubkey)) {
+             if (!pwallet->HaveKey(id) && !pwallet->AddKeyPubKeyWithDB(batch, key, pubkey)) {
                  throw JSONRPCError(RPC_WALLET_ERROR, "Error adding key to wallet");
              }
              pwallet->UpdateTimeFirstKey(timestamp);
         }
         for (const auto& entry : import_data.key_origins) {
-            pwallet->AddKeyOrigin(entry.second.first, entry.second.second);
+            pwallet->AddKeyOriginWithDB(batch, entry.second.first, entry.second.second);
         }
         for (const CKeyID& id : ordered_pubkeys) {
             auto entry = pubkey_map.find(id);
@@ -1288,20 +1289,20 @@ static UniValue ProcessImport(CWallet * const pwallet, const UniValue& data, con
             }
              const CPubKey& pubkey = entry->second;
              CPubKey temp;
-             if (!pwallet->GetPubKey(id, temp) && !pwallet->AddWatchOnly(GetScriptForRawPubKey(pubkey), timestamp)) {
+             if (!pwallet->GetPubKey(id, temp) && !pwallet->AddWatchOnlyWithDB(batch, GetScriptForRawPubKey(pubkey), timestamp)) {
                 throw JSONRPCError(RPC_WALLET_ERROR, "Error adding address to wallet");
             }
             pwallet->mapKeyMetadata[id].nCreateTime = timestamp;
 
             // Add to keypool only works with pubkeys
             if (add_keypool) {
-                pwallet->AddKeypoolPubkey(pubkey, internal);
+                pwallet->AddKeypoolPubkeyWithDB(pubkey, internal, batch);
             }
         }
 
         for (const CScript& script : script_pub_keys) {
             if (!have_solving_data || !::IsMine(*pwallet, script)) { // Always call AddWatchOnly for non-solvable watch-only, so that watch timestamp gets updated
-                if (!pwallet->AddWatchOnly(script, timestamp)) {
+                if (!pwallet->AddWatchOnlyWithDB(batch, script, timestamp)) {
                     throw JSONRPCError(RPC_WALLET_ERROR, "Error adding address to wallet");
                 }
             }
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -3372,13 +3372,6 @@ bool CWallet::TopUpKeyPool(unsigned int kpSize)
     return true;
 }
 
-void CWallet::AddKeypoolPubkey(const CPubKey& pubkey, const bool internal)
-{
-    WalletBatch batch(*database);
-    AddKeypoolPubkeyWithDB(pubkey, internal, batch);
-    NotifyCanGetAddressesChanged();
-}
-
 void CWallet::AddKeypoolPubkeyWithDB(const CPubKey& pubkey, const bool internal, WalletBatch& batch)
 {
     LOCK(cs_wallet);
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -994,7 +994,6 @@ class CWallet final : public CCryptoKeyStore, private interfaces::Chain::Notific
     bool NewKeyPool();
     size_t KeypoolCountExternalKeys() EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
     bool TopUpKeyPool(unsigned int kpSize = 0);
-    void AddKeypoolPubkey(const CPubKey& pubkey, const bool internal);
     void AddKeypoolPubkeyWithDB(const CPubKey& pubkey, const bool internal, WalletBatch& batch);
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -1261,8 +1261,9 @@ static UniValue ProcessImport(CWallet * const pwallet, const UniValue& data, con`
`1261`	`1261`
`1262`	`1262`	`// All good, time to import`
`1263`	`1263`	`pwallet->MarkDirty();`
	`1264`	`+ WalletBatch batch(pwallet->GetDBHandle());`
`1264`	`1265`	`for (const auto& entry : import_data.import_scripts) {`
`1265`		`- if (!pwallet->HaveCScript(CScriptID(entry)) && !pwallet->AddCScript(entry)) {`
	`1266`	`+ if (!pwallet->HaveCScript(CScriptID(entry)) && !pwallet->AddCScriptWithDB(batch, entry)) {`
`1266`	`1267`	`throw JSONRPCError(RPC_WALLET_ERROR, "Error adding script to wallet");`
`1267`	`1268`	`}`
`1268`	`1269`	`}`
`@@ -1273,13 +1274,13 @@ static UniValue ProcessImport(CWallet * const pwallet, const UniValue& data, con`
`1273`	`1274`	`assert(key.VerifyPubKey(pubkey));`
`1274`	`1275`	`pwallet->mapKeyMetadata[id].nCreateTime = timestamp;`
`1275`	`1276`	`// If the private key is not present in the wallet, insert it.`
`1276`		`- if (!pwallet->HaveKey(id) && !pwallet->AddKeyPubKey(key, pubkey)) {`
	`1277`	`+ if (!pwallet->HaveKey(id) && !pwallet->AddKeyPubKeyWithDB(batch, key, pubkey)) {`
`1277`	`1278`	`throw JSONRPCError(RPC_WALLET_ERROR, "Error adding key to wallet");`
`1278`	`1279`	`}`
`1279`	`1280`	`pwallet->UpdateTimeFirstKey(timestamp);`
`1280`	`1281`	`}`
`1281`	`1282`	`for (const auto& entry : import_data.key_origins) {`
`1282`		`- pwallet->AddKeyOrigin(entry.second.first, entry.second.second);`
	`1283`	`+ pwallet->AddKeyOriginWithDB(batch, entry.second.first, entry.second.second);`
`1283`	`1284`	`}`
`1284`	`1285`	`for (const CKeyID& id : ordered_pubkeys) {`
`1285`	`1286`	`auto entry = pubkey_map.find(id);`
`@@ -1288,20 +1289,20 @@ static UniValue ProcessImport(CWallet * const pwallet, const UniValue& data, con`
`1288`	`1289`	`}`
`1289`	`1290`	`const CPubKey& pubkey = entry->second;`
`1290`	`1291`	`CPubKey temp;`
`1291`		`- if (!pwallet->GetPubKey(id, temp) && !pwallet->AddWatchOnly(GetScriptForRawPubKey(pubkey), timestamp)) {`
	`1292`	`+ if (!pwallet->GetPubKey(id, temp) && !pwallet->AddWatchOnlyWithDB(batch, GetScriptForRawPubKey(pubkey), timestamp)) {`
`1292`	`1293`	`throw JSONRPCError(RPC_WALLET_ERROR, "Error adding address to wallet");`
`1293`	`1294`	`}`
`1294`	`1295`	`pwallet->mapKeyMetadata[id].nCreateTime = timestamp;`
`1295`	`1296`
`1296`	`1297`	`// Add to keypool only works with pubkeys`
`1297`	`1298`	`if (add_keypool) {`
`1298`		`- pwallet->AddKeypoolPubkey(pubkey, internal);`
	`1299`	`+ pwallet->AddKeypoolPubkeyWithDB(pubkey, internal, batch);`
`1299`	`1300`	`}`
`1300`	`1301`	`}`
`1301`	`1302`
`1302`	`1303`	`for (const CScript& script : script_pub_keys) {`
`1303`	`1304`	`if (!have_solving_data \|\| !::IsMine(*pwallet, script)) { // Always call AddWatchOnly for non-solvable watch-only, so that watch timestamp gets updated`
`1304`		`- if (!pwallet->AddWatchOnly(script, timestamp)) {`
	`1305`	`+ if (!pwallet->AddWatchOnlyWithDB(batch, script, timestamp)) {`
`1305`	`1306`	`throw JSONRPCError(RPC_WALLET_ERROR, "Error adding address to wallet");`
`1306`	`1307`	`}`
`1307`	`1308`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3372,13 +3372,6 @@ bool CWallet::TopUpKeyPool(unsigned int kpSize)`
`3372`	`3372`	`return true;`
`3373`	`3373`	`}`
`3374`	`3374`
`3375`		`-void CWallet::AddKeypoolPubkey(const CPubKey& pubkey, const bool internal)`
`3376`		`-{`
`3377`		`- WalletBatch batch(*database);`
`3378`		`- AddKeypoolPubkeyWithDB(pubkey, internal, batch);`
`3379`		`- NotifyCanGetAddressesChanged();`
`3380`		`-}`
`3381`		`-`
`3382`	`3375`	`void CWallet::AddKeypoolPubkeyWithDB(const CPubKey& pubkey, const bool internal, WalletBatch& batch)`
`3383`	`3376`	`{`
`3384`	`3377`	`LOCK(cs_wallet);`