blockworks-foundation
/
solana-with-rpc-optimizations
mirror of https://github.com/blockworks-foundation/solana-with-rpc-optimizations.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

don't rely on write_version increasing - just assert that it is for now (#29180)

This commit is contained in:
Jeff Washington (jwash) 2022-12-12 21:24:45 -06:00 committed by GitHub
parent ceeec9d625
commit c3001abef7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
runtime/src/accounts_db.rs
View File

@ -3720,11 +3720,11 @@ impl AccountsDb {
let new_entry = FoundStoredAccount { account, store_id };
match stored_accounts.entry(*new_entry.account.pubkey()) {
Entry::Occupied(mut occupied_entry) => {
if new_entry.account.meta.write_version
> occupied_entry.get().account.meta.write_version
{
occupied_entry.insert(new_entry);
}
assert!(
new_entry.account.meta.write_version
> occupied_entry.get().account.meta.write_version
);
occupied_entry.insert(new_entry);
}
Entry::Vacant(vacant_entry) => {
vacant_entry.insert(new_entry);
@ -8680,15 +8680,12 @@ impl AccountsDb {
}
Entry::Occupied(mut entry) => {
let occupied_version = entry.get().write_version;
if occupied_version < this_version {
entry.insert(IndexAccountMapEntry {
write_version: this_version,
store_id: storage.append_vec_id(),
stored_account,
});
} else {
assert_ne!(occupied_version, this_version);
}
assert!(occupied_version < this_version);
entry.insert(IndexAccountMapEntry {
write_version: this_version,
store_id: storage.append_vec_id(),
stored_account,
});
}
}
})