Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix get_storage_at #2065

Merged
merged 1 commit into from
Sep 29, 2024
Merged

fix get_storage_at #2065

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions go/enclave/rpc/TenStorageRead.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package rpc
import (
"errors"
"fmt"
"math/big"

"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/common/hexutil"
Expand Down Expand Up @@ -74,19 +75,24 @@ func TenStorageReadExecute(builder *CallBuilder[storageReadWithBlock, string], r
stateDb, err = rpc.registry.GetBatchStateAtHeight(builder.ctx, number)
}
if err != nil {
builder.Err = err
builder.Err = fmt.Errorf("unable to read block number - %w", err)
return nil
}

storageSlot, err := common.ParseHexOrString(builder.Param.storageSlot)
if err != nil {
builder.Err = err
sl := new(big.Int)
sl, ok := sl.SetString(builder.Param.storageSlot, 0)
if !ok {
builder.Err = fmt.Errorf("unable to parse storage slot (%s)", builder.Param.storageSlot)
return nil
}

// the storage slot needs to be 32 bytes padded with 0s
storageSlot := common.Hash{}
storageSlot.SetBytes(sl.Bytes())

account, err := stateDb.GetTrie().GetAccount(*builder.Param.address)
if err != nil {
builder.Err = err
builder.Err = fmt.Errorf("unable to get acct address - %w", err)
return nil
}

Expand All @@ -96,16 +102,16 @@ func TenStorageReadExecute(builder *CallBuilder[storageReadWithBlock, string], r
return nil
}

value, err := trie.GetStorage(*builder.Param.address, storageSlot)
value, err := trie.GetStorage(*builder.Param.address, storageSlot.Bytes())
if err != nil {
rpc.logger.Debug("Failed eth_getStorageAt.", log.ErrKey, err)

// return system errors to the host
if errors.Is(err, syserr.InternalError{}) {
return err
return fmt.Errorf("unable to get storage slot - %w", err)
}

builder.Err = err
builder.Err = fmt.Errorf("unable to get storage slot - %w", err)
return nil
}

Expand Down