cerc-io/laconicd-deprecated
19
0
Fork 1
Code Issues 21 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Update stateObject interface implementation

Browse Source
This commit is contained in:
Aleksandr Bezobchuk 2018-10-03 12:42:38 -04:00
parent 355244b5bc
commit e4c1e28f30
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
state/state_object.go
View File

@ -222,7 +222,8 @@ func (so *stateObject) Code(_ ethstate.Database) []byte {
return nil return nil
} }
store := so.stateDB.ctx.KVStore(so.stateDB.codeKey) ctx := so.stateDB.ctx
store := ctx.KVStore(so.stateDB.codeKey)
code := store.Get(so.CodeHash()) code := store.Get(so.CodeHash())
if len(code) == 0 { if len(code) == 0 {
@ -235,7 +236,7 @@ func (so *stateObject) Code(_ ethstate.Database) []byte {
// GetState retrieves a value from the account storage trie. Note, the key must // GetState retrieves a value from the account storage trie. Note, the key must
// be prefixed with the address. // be prefixed with the address.
func (so *stateObject) GetState(_ ethstate.Database, key ethcmn.Hash) ethcmn.Hash { func (so *stateObject) GetState(db ethstate.Database, key ethcmn.Hash) ethcmn.Hash {
// if we have a dirty value for this state entry, return it // if we have a dirty value for this state entry, return it
value, dirty := so.dirtyStorage[key] value, dirty := so.dirtyStorage[key]
if dirty { if dirty {
@ -243,12 +244,12 @@ func (so *stateObject) GetState(_ ethstate.Database, key ethcmn.Hash) ethcmn.Has
} }
// otherwise return the entry's original value // otherwise return the entry's original value
return so.getCommittedState(so.stateDB.ctx, key) return so.GetCommittedState(db, key)
} }
// GetCommittedState retrieves a value from the committed account storage trie. // GetCommittedState retrieves a value from the committed account storage trie.
// Note, the must be prefixed with the address. // Note, the must be prefixed with the address.
func (so *stateObject) getCommittedState(ctx sdk.Context, key ethcmn.Hash) ethcmn.Hash { func (so *stateObject) GetCommittedState(_ ethstate.Database, key ethcmn.Hash) ethcmn.Hash {
// if we have the original value cached, return that // if we have the original value cached, return that
value, cached := so.originStorage[key] value, cached := so.originStorage[key]
if cached { if cached {
@ -256,6 +257,7 @@ func (so *stateObject) getCommittedState(ctx sdk.Context, key ethcmn.Hash) ethcm
} }
// otherwise load the value from the KVStore // otherwise load the value from the KVStore
ctx := so.stateDB.ctx
store := ctx.KVStore(so.stateDB.storageKey) store := ctx.KVStore(so.stateDB.storageKey)
rawValue := store.Get(key.Bytes()) rawValue := store.Get(key.Bytes())
@ -307,8 +309,9 @@ func (so *stateObject) touch() {
} }
} }
// prefixStorageKey prefixes a storage key with the state object's address. // GetStorageByAddressKey returns a composite key for a state object's storage
func (so stateObject) prefixStorageKey(key []byte) []byte { // prefixed with it's address.
func (so stateObject) GetStorageByAddressKey(key []byte) []byte {
prefix := so.Address().Bytes() prefix := so.Address().Bytes()
compositeKey := make([]byte, len(prefix)+len(key)) compositeKey := make([]byte, len(prefix)+len(key))