Merge pull request ethereum#262 from OffchainLabs/fix_apibackend

arbitrum apiBackend: GetEVM handles nil blockContext
streamingfast · Oct 24, 2023 · c2a3d37 · c2a3d37
2 parents 2eaa152 + 09e94e7
commit c2a3d37
Showing 1 changed file with 7 additions and 1 deletion.
diff --git 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 {