Merge pull request #24288 from holiman/prefer_prefixed

core/rawdb: do prefixed lookup first
This commit is contained in:
Péter Szilágyi 2022-01-25 12:18:16 +02:00 committed by GitHub
commit 78f13a3a57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -41,16 +41,14 @@ func WritePreimages(db ethdb.KeyValueWriter, preimages map[common.Hash][]byte) {
// ReadCode retrieves the contract code of the provided code hash. // ReadCode retrieves the contract code of the provided code hash.
func ReadCode(db ethdb.KeyValueReader, hash common.Hash) []byte { func ReadCode(db ethdb.KeyValueReader, hash common.Hash) []byte {
// Try with the legacy code scheme first, if not then try with current // Try with the prefixed code scheme first, if not then try with legacy
// scheme. Since most of the code will be found with legacy scheme. // scheme.
// data := ReadCodeWithPrefix(db, hash)
// todo(rjl493456442) change the order when we forcibly upgrade the code
// scheme with snapshot.
data, _ := db.Get(hash[:])
if len(data) != 0 { if len(data) != 0 {
return data return data
} }
return ReadCodeWithPrefix(db, hash) data, _ := db.Get(hash[:])
return data
} }
// ReadCodeWithPrefix retrieves the contract code of the provided code hash. // ReadCodeWithPrefix retrieves the contract code of the provided code hash.