mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-05-20 23:09:27 +00:00
internal/ethapi: add eth_getStorageValues method (#32591)
Implements the new eth_getStorageValues method. It returns storage values for a list of contracts. Spec: https://github.com/ethereum/execution-apis/pull/756 --------- Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com>
This commit is contained in:
parent
1625064c68
commit
82fad31540
3 changed files with 133 additions and 0 deletions
|
|
@ -53,6 +53,10 @@ import (
|
||||||
// allowed to produce in order to speed up calculations.
|
// allowed to produce in order to speed up calculations.
|
||||||
const estimateGasErrorRatio = 0.015
|
const estimateGasErrorRatio = 0.015
|
||||||
|
|
||||||
|
// maxGetStorageSlots is the maximum total number of storage slots that can
|
||||||
|
// be requested in a single eth_getStorageValues call.
|
||||||
|
const maxGetStorageSlots = 1024
|
||||||
|
|
||||||
var errBlobTxNotSupported = errors.New("signing blob transactions not supported")
|
var errBlobTxNotSupported = errors.New("signing blob transactions not supported")
|
||||||
var errSubClosed = errors.New("chain subscription closed")
|
var errSubClosed = errors.New("chain subscription closed")
|
||||||
|
|
||||||
|
|
@ -589,6 +593,41 @@ func (api *BlockChainAPI) GetStorageAt(ctx context.Context, address common.Addre
|
||||||
return res[:], state.Error()
|
return res[:], state.Error()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// GetStorageValues returns multiple storage slot values for multiple accounts
|
||||||
|
// at the given block.
|
||||||
|
func (api *BlockChainAPI) GetStorageValues(ctx context.Context, requests map[common.Address][]common.Hash, blockNrOrHash rpc.BlockNumberOrHash) (map[common.Address][]hexutil.Bytes, error) {
|
||||||
|
// Count total slots requested.
|
||||||
|
var totalSlots int
|
||||||
|
for _, keys := range requests {
|
||||||
|
totalSlots += len(keys)
|
||||||
|
if totalSlots > maxGetStorageSlots {
|
||||||
|
return nil, &clientLimitExceededError{message: fmt.Sprintf("too many slots (max %d)", maxGetStorageSlots)}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if totalSlots == 0 {
|
||||||
|
return nil, &invalidParamsError{message: "empty request"}
|
||||||
|
}
|
||||||
|
|
||||||
|
state, _, err := api.b.StateAndHeaderByNumberOrHash(ctx, blockNrOrHash)
|
||||||
|
if state == nil || err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
result := make(map[common.Address][]hexutil.Bytes, len(requests))
|
||||||
|
for addr, keys := range requests {
|
||||||
|
vals := make([]hexutil.Bytes, len(keys))
|
||||||
|
for i, key := range keys {
|
||||||
|
v := state.GetState(addr, key)
|
||||||
|
vals[i] = v[:]
|
||||||
|
}
|
||||||
|
if err := state.Error(); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
result[addr] = vals
|
||||||
|
}
|
||||||
|
return result, nil
|
||||||
|
}
|
||||||
|
|
||||||
// GetBlockReceipts returns the block receipts for the given block hash or number or tag.
|
// GetBlockReceipts returns the block receipts for the given block hash or number or tag.
|
||||||
func (api *BlockChainAPI) GetBlockReceipts(ctx context.Context, blockNrOrHash rpc.BlockNumberOrHash) ([]map[string]interface{}, error) {
|
func (api *BlockChainAPI) GetBlockReceipts(ctx context.Context, blockNrOrHash rpc.BlockNumberOrHash) ([]map[string]interface{}, error) {
|
||||||
var (
|
var (
|
||||||
|
|
|
||||||
|
|
@ -4065,3 +4065,91 @@ func TestSendRawTransactionSync_Timeout(t *testing.T) {
|
||||||
t.Fatalf("expected ErrorData=%s, got %v", want, got)
|
t.Fatalf("expected ErrorData=%s, got %v", want, got)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestGetStorageValues(t *testing.T) {
|
||||||
|
t.Parallel()
|
||||||
|
|
||||||
|
var (
|
||||||
|
addr1 = common.HexToAddress("0x1111")
|
||||||
|
addr2 = common.HexToAddress("0x2222")
|
||||||
|
slot0 = common.Hash{}
|
||||||
|
slot1 = common.BigToHash(big.NewInt(1))
|
||||||
|
slot2 = common.BigToHash(big.NewInt(2))
|
||||||
|
val0 = common.BigToHash(big.NewInt(42))
|
||||||
|
val1 = common.BigToHash(big.NewInt(100))
|
||||||
|
val2 = common.BigToHash(big.NewInt(200))
|
||||||
|
|
||||||
|
genesis = &core.Genesis{
|
||||||
|
Config: params.MergedTestChainConfig,
|
||||||
|
Alloc: types.GenesisAlloc{
|
||||||
|
addr1: {
|
||||||
|
Balance: big.NewInt(params.Ether),
|
||||||
|
Storage: map[common.Hash]common.Hash{
|
||||||
|
slot0: val0,
|
||||||
|
slot1: val1,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
addr2: {
|
||||||
|
Balance: big.NewInt(params.Ether),
|
||||||
|
Storage: map[common.Hash]common.Hash{
|
||||||
|
slot2: val2,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
)
|
||||||
|
api := NewBlockChainAPI(newTestBackend(t, 1, genesis, beacon.New(ethash.NewFaker()), func(i int, b *core.BlockGen) {
|
||||||
|
b.SetPoS()
|
||||||
|
}))
|
||||||
|
latest := rpc.BlockNumberOrHashWithNumber(rpc.LatestBlockNumber)
|
||||||
|
|
||||||
|
// Happy path: multiple addresses, multiple slots.
|
||||||
|
result, err := api.GetStorageValues(context.Background(), map[common.Address][]common.Hash{
|
||||||
|
addr1: {slot0, slot1},
|
||||||
|
addr2: {slot2},
|
||||||
|
}, latest)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("unexpected error: %v", err)
|
||||||
|
}
|
||||||
|
if len(result) != 2 {
|
||||||
|
t.Fatalf("expected 2 addresses in result, got %d", len(result))
|
||||||
|
}
|
||||||
|
if got := common.BytesToHash(result[addr1][0]); got != val0 {
|
||||||
|
t.Errorf("addr1 slot0: want %x, got %x", val0, got)
|
||||||
|
}
|
||||||
|
if got := common.BytesToHash(result[addr1][1]); got != val1 {
|
||||||
|
t.Errorf("addr1 slot1: want %x, got %x", val1, got)
|
||||||
|
}
|
||||||
|
if got := common.BytesToHash(result[addr2][0]); got != val2 {
|
||||||
|
t.Errorf("addr2 slot2: want %x, got %x", val2, got)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Missing slot returns zero.
|
||||||
|
result, err = api.GetStorageValues(context.Background(), map[common.Address][]common.Hash{
|
||||||
|
addr1: {common.HexToHash("0xff")},
|
||||||
|
}, latest)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("unexpected error: %v", err)
|
||||||
|
}
|
||||||
|
if got := common.BytesToHash(result[addr1][0]); got != (common.Hash{}) {
|
||||||
|
t.Errorf("missing slot: want zero, got %x", got)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Empty request returns error.
|
||||||
|
_, err = api.GetStorageValues(context.Background(), map[common.Address][]common.Hash{}, latest)
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("expected error for empty request")
|
||||||
|
}
|
||||||
|
|
||||||
|
// Exceeding slot limit returns error.
|
||||||
|
tooMany := make([]common.Hash, maxGetStorageSlots+1)
|
||||||
|
for i := range tooMany {
|
||||||
|
tooMany[i] = common.BigToHash(big.NewInt(int64(i)))
|
||||||
|
}
|
||||||
|
_, err = api.GetStorageValues(context.Background(), map[common.Address][]common.Hash{
|
||||||
|
addr1: tooMany,
|
||||||
|
}, latest)
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("expected error for exceeding slot limit")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -567,6 +567,12 @@ web3._extend({
|
||||||
params: 3,
|
params: 3,
|
||||||
inputFormatter: [web3._extend.formatters.inputAddressFormatter, null, web3._extend.formatters.inputBlockNumberFormatter]
|
inputFormatter: [web3._extend.formatters.inputAddressFormatter, null, web3._extend.formatters.inputBlockNumberFormatter]
|
||||||
}),
|
}),
|
||||||
|
new web3._extend.Method({
|
||||||
|
name: 'getStorageValues',
|
||||||
|
call: 'eth_getStorageValues',
|
||||||
|
params: 2,
|
||||||
|
inputFormatter: [null, web3._extend.formatters.inputBlockNumberFormatter]
|
||||||
|
}),
|
||||||
new web3._extend.Method({
|
new web3._extend.Method({
|
||||||
name: 'createAccessList',
|
name: 'createAccessList',
|
||||||
call: 'eth_createAccessList',
|
call: 'eth_createAccessList',
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue