@@ -1005,7 +1005,7 @@ static DBErrors LoadAddressBookRecords(CWallet* pwallet, DatabaseBatch& batch) E
1005
1005
return result;
1006
1006
}
1007
1007
1008
- static DBErrors LoadTxRecords (CWallet* pwallet, DatabaseBatch& batch, std::vector<Txid>& upgraded_txs, bool & any_unordered) EXCLUSIVE_LOCKS_REQUIRED(pwallet->cs_wallet)
1008
+ static DBErrors LoadTxRecords (CWallet* pwallet, DatabaseBatch& batch, bool & any_unordered) EXCLUSIVE_LOCKS_REQUIRED(pwallet->cs_wallet)
1009
1009
{
1010
1010
AssertLockHeld (pwallet->cs_wallet );
1011
1011
DBErrors result = DBErrors::LOAD_OK;
@@ -1128,7 +1128,6 @@ DBErrors WalletBatch::LoadWallet(CWallet* pwallet)
1128
1128
{
1129
1129
DBErrors result = DBErrors::LOAD_OK;
1130
1130
bool any_unordered = false ;
1131
- std::vector<Txid> upgraded_txs;
1132
1131
1133
1132
LOCK (pwallet->cs_wallet );
1134
1133
@@ -1165,7 +1164,7 @@ DBErrors WalletBatch::LoadWallet(CWallet* pwallet)
1165
1164
result = std::max (LoadAddressBookRecords (pwallet, *m_batch), result);
1166
1165
1167
1166
// Load tx records
1168
- result = std::max (LoadTxRecords (pwallet, *m_batch, upgraded_txs, any_unordered), result);
1167
+ result = std::max (LoadTxRecords (pwallet, *m_batch, any_unordered), result);
1169
1168
1170
1169
// Load SPKMs
1171
1170
result = std::max (LoadActiveSPKMs (pwallet, *m_batch), result);
@@ -1189,9 +1188,6 @@ DBErrors WalletBatch::LoadWallet(CWallet* pwallet)
1189
1188
if (result != DBErrors::LOAD_OK)
1190
1189
return result;
1191
1190
1192
- for (const Txid& hash : upgraded_txs)
1193
- WriteTx (pwallet->mapWallet .at (hash));
1194
-
1195
1191
if (!has_last_client || last_client != CLIENT_VERSION) // Update
1196
1192
m_batch->Write (DBKeys::VERSION, CLIENT_VERSION);
1197
1193
0 commit comments