feat: add scroll_getTxBlockTraceOnTopOfBlock API (#558)

* init

* more

* fix draft

* refactor

* fix

* clean up

* minor

* fix

* fix

* clean up

* clean up

* improve
This commit is contained in:
HAOYUatHZ 2023-11-20 13:59:20 +08:00 committed by GitHub
parent 3f9b23d33e
commit f4b247da15
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 53 additions and 13 deletions

View file

@ -13,6 +13,7 @@ import (
type TraceBlock interface { type TraceBlock interface {
GetBlockTraceByNumberOrHash(ctx context.Context, blockNrOrHash rpc.BlockNumberOrHash, config *TraceConfig) (trace *types.BlockTrace, err error) GetBlockTraceByNumberOrHash(ctx context.Context, blockNrOrHash rpc.BlockNumberOrHash, config *TraceConfig) (trace *types.BlockTrace, err error)
GetTxBlockTraceOnTopOfBlock(ctx context.Context, tx *types.Transaction, blockNrOrHash rpc.BlockNumberOrHash, config *TraceConfig) (*types.BlockTrace, error)
} }
// GetBlockTraceByNumberOrHash replays the block and returns the structured BlockTrace by hash or number. // GetBlockTraceByNumberOrHash replays the block and returns the structured BlockTrace by hash or number.
@ -20,9 +21,10 @@ func (api *API) GetBlockTraceByNumberOrHash(ctx context.Context, blockNrOrHash r
var block *types.Block var block *types.Block
if number, ok := blockNrOrHash.Number(); ok { if number, ok := blockNrOrHash.Number(); ok {
block, err = api.blockByNumber(ctx, number) block, err = api.blockByNumber(ctx, number)
} } else if hash, ok := blockNrOrHash.Hash(); ok {
if hash, ok := blockNrOrHash.Hash(); ok {
block, err = api.blockByHash(ctx, hash) block, err = api.blockByHash(ctx, hash)
} else {
return nil, errors.New("invalid arguments; neither block number nor hash specified")
} }
if err != nil { if err != nil {
return nil, err return nil, err
@ -30,17 +32,36 @@ func (api *API) GetBlockTraceByNumberOrHash(ctx context.Context, blockNrOrHash r
if block.NumberU64() == 0 { if block.NumberU64() == 0 {
return nil, errors.New("genesis is not traceable") return nil, errors.New("genesis is not traceable")
} }
if config == nil {
config = &TraceConfig{ env, err := api.createTraceEnv(ctx, config, block)
LogConfig: &vm.LogConfig{ if err != nil {
EnableMemory: false, return nil, err
EnableReturnData: true,
},
} }
} else if config.Tracer != nil {
config.Tracer = nil return env.GetBlockTrace(block)
log.Warn("Tracer params is unsupported") }
func (api *API) GetTxBlockTraceOnTopOfBlock(ctx context.Context, tx *types.Transaction, blockNrOrHash rpc.BlockNumberOrHash, config *TraceConfig) (*types.BlockTrace, error) {
// Try to retrieve the specified block
var (
err error
block *types.Block
)
if number, ok := blockNrOrHash.Number(); ok {
block, err = api.blockByNumber(ctx, number)
} else if hash, ok := blockNrOrHash.Hash(); ok {
block, err = api.blockByHash(ctx, hash)
} else {
return nil, errors.New("invalid arguments; neither block number nor hash specified")
} }
if err != nil {
return nil, err
}
if block.NumberU64() == 0 {
return nil, errors.New("genesis is not traceable")
}
block = types.NewBlockWithHeader(block.Header()).WithBody([]*types.Transaction{tx}, nil)
// create current execution environment. // create current execution environment.
env, err := api.createTraceEnv(ctx, config, block) env, err := api.createTraceEnv(ctx, config, block)
@ -53,6 +74,18 @@ func (api *API) GetBlockTraceByNumberOrHash(ctx context.Context, blockNrOrHash r
// Make trace environment for current block. // Make trace environment for current block.
func (api *API) createTraceEnv(ctx context.Context, config *TraceConfig, block *types.Block) (*core.TraceEnv, error) { func (api *API) createTraceEnv(ctx context.Context, config *TraceConfig, block *types.Block) (*core.TraceEnv, error) {
if config == nil {
config = &TraceConfig{
LogConfig: &vm.LogConfig{
EnableMemory: false,
EnableReturnData: true,
},
}
} else if config.Tracer != nil {
config.Tracer = nil
log.Warn("Tracer params is unsupported")
}
parent, err := api.blockByNumberAndHash(ctx, rpc.BlockNumber(block.NumberU64()-1), block.ParentHash()) parent, err := api.blockByNumberAndHash(ctx, rpc.BlockNumber(block.NumberU64()-1), block.ParentHash())
if err != nil { if err != nil {
return nil, err return nil, err
@ -65,6 +98,7 @@ func (api *API) createTraceEnv(ctx context.Context, config *TraceConfig, block *
if err != nil { if err != nil {
return nil, err return nil, err
} }
chaindb := api.backend.ChainDb() chaindb := api.backend.ChainDb()
return core.CreateTraceEnv(api.backend.ChainConfig(), api.chainContext(ctx), api.backend.Engine(), chaindb, statedb, parent, block, true) return core.CreateTraceEnv(api.backend.ChainConfig(), api.chainContext(ctx), api.backend.Engine(), chaindb, statedb, parent, block, true)
} }

View file

@ -865,6 +865,12 @@ web3._extend({
call: 'scroll_getBlockTraceByNumberOrHash', call: 'scroll_getBlockTraceByNumberOrHash',
params: 1 params: 1
}), }),
new web3._extend.Method({
name: 'getTxBlockTraceOnTopOfBlock',
call: 'scroll_getTxBlockTraceOnTopOfBlock',
params: 3,
inputFormatter: [web3._extend.formatters.inputTransactionFormatter, null, null]
}),
new web3._extend.Method({ new web3._extend.Method({
name: 'getL1MessageByIndex', name: 'getL1MessageByIndex',
call: 'scroll_getL1MessageByIndex', call: 'scroll_getL1MessageByIndex',

View file

@ -24,7 +24,7 @@ import (
const ( const (
VersionMajor = 5 // Major version component of the current release VersionMajor = 5 // Major version component of the current release
VersionMinor = 1 // Minor version component of the current release VersionMinor = 1 // Minor version component of the current release
VersionPatch = 3 // Patch version component of the current release VersionPatch = 4 // Patch version component of the current release
VersionMeta = "mainnet" // Version metadata to append to the version string VersionMeta = "mainnet" // Version metadata to append to the version string
) )