mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-26 14:46:42 +00:00
eth, debug: make txIndex parameter optional in storageRangeAt
This commit is contained in:
parent
a9444ea312
commit
048bc9b064
2 changed files with 14 additions and 2 deletions
|
|
@ -28,6 +28,7 @@ import (
|
|||
"github.com/ethereum/go-ethereum/core/state"
|
||||
"github.com/ethereum/go-ethereum/core/types"
|
||||
"github.com/ethereum/go-ethereum/crypto"
|
||||
"github.com/ethereum/go-ethereum/eth/tracers"
|
||||
"github.com/ethereum/go-ethereum/internal/ethapi"
|
||||
"github.com/ethereum/go-ethereum/log"
|
||||
"github.com/ethereum/go-ethereum/rlp"
|
||||
|
|
@ -210,7 +211,8 @@ type storageEntry struct {
|
|||
}
|
||||
|
||||
// StorageRangeAt returns the storage at the given block height and transaction index.
|
||||
func (api *DebugAPI) StorageRangeAt(ctx context.Context, blockNrOrHash rpc.BlockNumberOrHash, txIndex int, contractAddress common.Address, keyStart hexutil.Bytes, maxResult int) (StorageRangeResult, error) {
|
||||
// If txIndex is nil, it returns the storage at the end of the given block.
|
||||
func (api *DebugAPI) StorageRangeAt(ctx context.Context, blockNrOrHash rpc.BlockNumberOrHash, txIndex *int, contractAddress common.Address, keyStart hexutil.Bytes, maxResult int) (StorageRangeResult, error) {
|
||||
var block *types.Block
|
||||
|
||||
block, err := api.eth.APIBackend.BlockByNumberOrHash(ctx, blockNrOrHash)
|
||||
|
|
@ -220,7 +222,16 @@ func (api *DebugAPI) StorageRangeAt(ctx context.Context, blockNrOrHash rpc.Block
|
|||
if block == nil {
|
||||
return StorageRangeResult{}, fmt.Errorf("block %v not found", blockNrOrHash)
|
||||
}
|
||||
_, _, statedb, release, err := api.eth.stateAtTransaction(ctx, block, txIndex, 0)
|
||||
|
||||
var statedb *state.StateDB
|
||||
var release tracers.StateReleaseFunc
|
||||
|
||||
if txIndex != nil {
|
||||
_, _, statedb, release, err = api.eth.stateAtTransaction(ctx, block, *txIndex, 0)
|
||||
} else {
|
||||
statedb, release, err = api.eth.stateAtBlock(ctx, block, 0, nil, true, false)
|
||||
}
|
||||
|
||||
if err != nil {
|
||||
return StorageRangeResult{}, err
|
||||
}
|
||||
|
|
|
|||
|
|
@ -419,6 +419,7 @@ web3._extend({
|
|||
name: 'storageRangeAt',
|
||||
call: 'debug_storageRangeAt',
|
||||
params: 5,
|
||||
inputFormatter: [null, null, null, null, null]
|
||||
}),
|
||||
new web3._extend.Method({
|
||||
name: 'getModifiedAccountsByNumber',
|
||||
|
|
|
|||
Loading…
Reference in a new issue