From 4fc6ae82ec9e6f9825935245f5cd6bbff0cd3125 Mon Sep 17 00:00:00 2001 From: Tsahi Zidenberg Date: Wed, 18 Oct 2023 12:08:17 -0600 Subject: [PATCH] arbitrum apiBackend: GetEVM handles nil blokContext --- arbitrum/apibackend.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/arbitrum/apibackend.go b/arbitrum/apibackend.go index 4d5c308dc845..ce4dea0951e7 100644 --- a/arbitrum/apibackend.go +++ b/arbitrum/apibackend.go @@ -504,7 +504,13 @@ func (a *APIBackend) GetEVM(ctx context.Context, msg *core.Message, state *state vmConfig = a.BlockChain().GetVMConfig() } txContext := core.NewEVMTxContext(msg) - return vm.NewEVM(*blockCtx, txContext, state, a.BlockChain().Config(), *vmConfig), vmError + var context vm.BlockContext + if blockCtx != nil { + context = *blockCtx + } else { + context = core.NewEVMBlockContext(header, a.BlockChain(), nil) + } + return vm.NewEVM(context, txContext, state, a.BlockChain().Config(), *vmConfig), vmError } func (a *APIBackend) SubscribeChainEvent(ch chan<- core.ChainEvent) event.Subscription {