disable setting of block ctx BaseFee to 0 when basefee tracking is di…

…sabled
skalarfeilds79 · Apr 11, 2024 · d717fc5 · d717fc5
1 parent 932be47
commit d717fc5
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/core/vm/evm.go b/core/vm/evm.go
@@ -138,7 +138,8 @@ func NewEVM(blockCtx BlockContext, txCtx TxContext, statedb StateDB, chainConfig
 	// gas prices were specified, lower the basefee to 0 to avoid breaking EVM
 	// invariants (basefee < feecap)
 	if config.NoBaseFee {
-		if txCtx.GasPrice.BitLen() == 0 {
+		// Currently we don't set block context's BaseFee to zero, since nitro uses this field
+		if txCtx.GasPrice.BitLen() == 0 && !chainConfig.IsArbitrum() {
 			blockCtx.BaseFee = new(big.Int)
 		}
 		if txCtx.BlobFeeCap != nil && txCtx.BlobFeeCap.BitLen() == 0 {