Merge pull request #8085 from onflow/mpeter/enable-testnet-fusaka-hard-fork

Enable EVM Fusaka hard-fork for `PreviewNet` (a.k.a Emulator) & `Testnet`

Author: j1010001

fvm/evm/emulator/config.go

@@ -21,6 +21,10 @@ var (
 	PreviewnetPragueActivation = uint64(0)          // already on Prague for PreviewNet
 	TestnetPragueActivation    = uint64(1746723600) // Thu May 08 2025 17:00:00 GMT+0000 (10am PDT)
 	MainnetPragueActivation    = uint64(1747328400) // Thu May 15 2025 17:00:00 GMT+0000 (10am PDT)
+
+	PreviewnetOsakaActivation = uint64(0)          // already on Osaka for PreviewNet
+	TestnetOsakaActivation    = uint64(1763575200) // Wednesday, November 19, 2025 18:00:00 GMT+0000
+	MainnetOsakaActivation    = uint64(1764784800) // Wednesday, December 03, 2025 18:00:00 GMT+0000
 )
 
 // Config aggregates all the configuration (chain, evm, block, tx, ...)
@@ -101,15 +105,19 @@ func MakeChainConfig(chainID *big.Int) *gethParams.ChainConfig {
 		ShanghaiTime: &zero, // already on Shanghai
 		CancunTime:   &zero, // already on Cancun
 		PragueTime:   nil,   // this is conditionally set below
+		OsakaTime:    nil,   // this is conditionally set below
 		VerkleTime:   nil,   // not on Verkle
 	}
 
 	if chainID.Cmp(types.FlowEVMPreviewNetChainID) == 0 {
 		chainConfig.PragueTime = &PreviewnetPragueActivation
+		chainConfig.OsakaTime = &PreviewnetOsakaActivation
 	} else if chainID.Cmp(types.FlowEVMTestNetChainID) == 0 {
 		chainConfig.PragueTime = &TestnetPragueActivation
+		chainConfig.OsakaTime = &TestnetOsakaActivation
 	} else if chainID.Cmp(types.FlowEVMMainNetChainID) == 0 {
 		chainConfig.PragueTime = &MainnetPragueActivation
+		chainConfig.OsakaTime = &MainnetOsakaActivation
 	}
 
 	return chainConfig

fvm/evm/emulator/emulator.go

@@ -2,11 +2,11 @@ package emulator
 
 import (
 	"errors"
+	"fmt"
 	"math/big"
 
 	gethCommon "github.com/ethereum/go-ethereum/common"
 	gethCore "github.com/ethereum/go-ethereum/core"
-	"github.com/ethereum/go-ethereum/core/tracing"
 	gethTracing "github.com/ethereum/go-ethereum/core/tracing"
 	gethTypes "github.com/ethereum/go-ethereum/core/types"
 	gethVM "github.com/ethereum/go-ethereum/core/vm"
@@ -120,6 +120,22 @@ func (bl *BlockView) DirectCall(call *types.DirectCall) (res *types.Result, err
 	// Set the nonce for the call (needed for some operations like deployment)
 	call.Nonce = proc.state.GetNonce(call.From.ToCommon())
 
+	if !call.ValidEIP7825GasLimit(proc.config.ChainRules()) {
+		res := &types.Result{
+			TxType: call.Type,
+			TxHash: call.Hash(),
+		}
+		res.SetValidationError(
+			fmt.Errorf(
+				"%w (cap: %d, tx: %d)",
+				gethCore.ErrGasLimitTooHigh,
+				gethParams.MaxTxGas,
+				call.GasLimit,
+			),
+		)
+		return res, nil
+	}
+
 	// Call tx tracer
 	if proc.evm.Config.Tracer != nil && proc.evm.Config.Tracer.OnTxStart != nil {
 		proc.evm.Config.Tracer.OnTxStart(proc.evm.GetVMContext(), call.Transaction(), call.From.ToCommon())
@@ -596,7 +612,7 @@ func (proc *procedure) deployAt(
 	res.DeployedContractAddress = &call.To
 	res.CumulativeGasUsed = proc.config.BlockTotalGasUsedSoFar + res.GasConsumed
 
-	proc.state.SetCode(addr, ret, tracing.CodeChangeContractCreation)
+	proc.state.SetCode(addr, ret, gethTracing.CodeChangeContractCreation)
 	res.StateChangeCommitment, err = proc.commit(true)
 	return res, err
 }

fvm/evm/emulator/emulator_test.go

@@ -3,7 +3,6 @@ package emulator_test
 import (
 	"encoding/hex"
 	"fmt"
-	"math"
 	"math/big"
 	"strings"
 	"testing"
@@ -211,7 +210,7 @@ func TestContractInteraction(t *testing.T) {
 						call := types.NewDeployCall(
 							testAccount,
 							testContract.ByteCode,
-							math.MaxUint64,
+							gethParams.MaxTxGas,
 							amountToBeTransfered,
 							testAccountNonce)
 						res, err := blk.DirectCall(call)
@@ -599,7 +598,7 @@ func TestDeployAtFunctionality(t *testing.T) {
 								testAccount,
 								target,
 								testContract.ByteCode,
-								math.MaxUint64,
+								gethParams.MaxTxGas,
 								amountToBeTransfered,
 								0,
 							),
@@ -629,7 +628,7 @@ func TestDeployAtFunctionality(t *testing.T) {
 								testAccount,
 								target,
 								testContract.ByteCode,
-								math.MaxUint64,
+								gethParams.MaxTxGas,
 								amountToBeTransfered,
 								0),
 						)
@@ -687,7 +686,7 @@ func TestSelfdestruct(t *testing.T) {
 							types.NewDeployCall(
 								testAddress,
 								testContract.ByteCode,
-								math.MaxUint64,
+								gethParams.MaxTxGas,
 								deployBalance,
 								0),
 						)
@@ -768,7 +767,7 @@ func TestFactoryPatterns(t *testing.T) {
 							types.NewDeployCall(
 								factoryDeployer,
 								factoryContract.ByteCode,
-								math.MaxUint64,
+								gethParams.MaxTxGas,
 								factoryBalance,
 								0),
 						)