cerc-io/ipld-eth-statedb
16
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix storage paths

Browse Source 
GetState takes a slot, not a leaf path
This commit is contained in:
Roy Crihfield 2023-04-20 17:29:53 +08:00
parent 49177ee0ab
commit e3e4e1e41c
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
state_object.go
View File

@ -159,7 +159,8 @@ func (s *stateObject) GetCommittedState(db StateDatabase, key common.Hash) commo
} }
// If no live objects are available, load from database // If no live objects are available, load from database
start := time.Now() start := time.Now()
enc, err := db.StorageValue(s.addrHash, key, s.blockHash) keyHash := crypto.Keccak256Hash(key[:])
enc, err := db.StorageValue(s.addrHash, keyHash, s.blockHash)
if metrics.EnabledExpensive { if metrics.EnabledExpensive {
s.db.StorageReads += time.Since(start) s.db.StorageReads += time.Since(start)
} }

15
statedb_test.go
View File

@ -64,7 +64,8 @@ var (
Root: common.Hash{}, Root: common.Hash{},
} }
StorageLeafKey = crypto.Keccak256Hash(common.HexToHash("0").Bytes()) StorageSlot = common.HexToHash("0")
StorageLeafKey = crypto.Keccak256Hash(StorageSlot[:])
StoredValue = crypto.Keccak256Hash([]byte{1, 2, 3, 4, 5}) StoredValue = crypto.Keccak256Hash([]byte{1, 2, 3, 4, 5})
StoragePartialPath = []byte{0, 1, 0, 2, 0, 4} StoragePartialPath = []byte{0, 1, 0, 2, 0, 4}
@ -301,7 +302,7 @@ func testSuite(t *testing.T, db statedb.StateDatabase) {
checkAccountUnchanged := func() { checkAccountUnchanged := func() {
require.Equal(t, Account.Balance, sdb.GetBalance(AccountAddress)) require.Equal(t, Account.Balance, sdb.GetBalance(AccountAddress))
require.Equal(t, Account.Nonce, sdb.GetNonce(AccountAddress)) require.Equal(t, Account.Nonce, sdb.GetNonce(AccountAddress))
require.Equal(t, StoredValue, sdb.GetState(AccountAddress, StorageLeafKey)) require.Equal(t, StoredValue, sdb.GetState(AccountAddress, StorageSlot))
require.Equal(t, AccountCodeHash, sdb.GetCodeHash(AccountAddress)) require.Equal(t, AccountCodeHash, sdb.GetCodeHash(AccountAddress))
require.Equal(t, AccountCode, sdb.GetCode(AccountAddress)) require.Equal(t, AccountCode, sdb.GetCode(AccountAddress))
require.Equal(t, len(AccountCode), sdb.GetCodeSize(AccountAddress)) require.Equal(t, len(AccountCode), sdb.GetCodeSize(AccountAddress))
@ -319,17 +320,17 @@ func testSuite(t *testing.T, db statedb.StateDatabase) {
sdb.AddBalance(AccountAddress, big.NewInt(200)) sdb.AddBalance(AccountAddress, big.NewInt(200))
sdb.SubBalance(AccountAddress, big.NewInt(100)) sdb.SubBalance(AccountAddress, big.NewInt(100))
sdb.SetNonce(AccountAddress, 42) sdb.SetNonce(AccountAddress, 42)
sdb.SetState(AccountAddress, StorageLeafKey, newStorage) sdb.SetState(AccountAddress, StorageSlot, newStorage)
sdb.SetCode(AccountAddress, newCode) sdb.SetCode(AccountAddress, newCode)
require.Equal(t, big.NewInt(400), sdb.GetBalance(AccountAddress)) require.Equal(t, big.NewInt(400), sdb.GetBalance(AccountAddress))
require.Equal(t, uint64(42), sdb.GetNonce(AccountAddress)) require.Equal(t, uint64(42), sdb.GetNonce(AccountAddress))
require.Equal(t, newStorage, sdb.GetState(AccountAddress, StorageLeafKey)) require.Equal(t, newStorage, sdb.GetState(AccountAddress, StorageSlot))
require.Equal(t, newCode, sdb.GetCode(AccountAddress)) require.Equal(t, newCode, sdb.GetCode(AccountAddress))
sdb.AddSlotToAccessList(AccountAddress, StorageLeafKey) sdb.AddSlotToAccessList(AccountAddress, StorageSlot)
require.True(t, sdb.AddressInAccessList(AccountAddress)) require.True(t, sdb.AddressInAccessList(AccountAddress))
hasAddr, hasSlot := sdb.SlotInAccessList(AccountAddress, StorageLeafKey) hasAddr, hasSlot := sdb.SlotInAccessList(AccountAddress, StorageSlot)
require.True(t, hasAddr) require.True(t, hasAddr)
require.True(t, hasSlot) require.True(t, hasSlot)
@ -337,7 +338,7 @@ func testSuite(t *testing.T, db statedb.StateDatabase) {
checkAccountUnchanged() checkAccountUnchanged()
require.False(t, sdb.AddressInAccessList(AccountAddress)) require.False(t, sdb.AddressInAccessList(AccountAddress))
hasAddr, hasSlot = sdb.SlotInAccessList(AccountAddress, StorageLeafKey) hasAddr, hasSlot = sdb.SlotInAccessList(AccountAddress, StorageSlot)
require.False(t, hasAddr) require.False(t, hasAddr)
require.False(t, hasSlot) require.False(t, hasSlot)
}) })