defi-wonderland · 0xDiscotech · Nov 5, 2025 · Nov 3, 2025 · Nov 3, 2025 · Nov 3, 2025
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1146,6 +1146,10 @@ jobs:
       fork_base_rpc:
         description: Fork Base RPC
         type: string
+      dev_features:
+        description: Comma-separated list of dev features to enable (e.g., "OPTIMISM_PORTAL_INTEROP,ANOTHER_FEATURE")
+        type: string
+        default: ""
     docker:
       - image: <<pipeline.parameters.default_docker_image>>
     resource_class: xlarge
@@ -1176,6 +1180,8 @@ jobs:
       - restore_cache:
           name: Restore forked state
           key: forked-state-contracts-bedrock-tests-upgrade-<<parameters.fork_op_chain>>-<<parameters.fork_base_chain>>-{{ checksum "packages/contracts-bedrock/pinnedBlockNumber.txt" }}
+      - setup-dev-features:
+          dev_features: <<parameters.dev_features>>
       - run:
           name: Run tests
           command: just test-upgrade
@@ -1594,14 +1600,10 @@ jobs:
         description: Timeout for when CircleCI kills the job if there's no output
         type: string
         default: 30m
-      use_circleci_runner:
-        description: Whether to use CircleCI runners (with Docker) instead of self-hosted runners
-        type: boolean
-        default: false
-    machine:
-      image: <<# parameters.use_circleci_runner >>ubuntu-2404:current<</ parameters.use_circleci_runner >><<^ parameters.use_circleci_runner >>true<</ parameters.use_circleci_runner >>
-      docker_layer_caching: <<parameters.use_circleci_runner>>
-    resource_class: <<# parameters.use_circleci_runner >>xlarge<</ parameters.use_circleci_runner >><<^ parameters.use_circleci_runner >>ethereum-optimism/latitude-1<</ parameters.use_circleci_runner >>
+    docker:
+      - image: <<pipeline.parameters.default_docker_image>>
+    circleci_ip_ranges: true
+    resource_class: 2xlarge
     steps:
       - checkout-from-workspace
       # Restore cached Go modules
@@ -2453,14 +2455,27 @@ workflows:
             - circleci-repo-readonly-authenticated-github-token
           requires:
             - initialize
+      - contracts-bedrock-tests-upgrade:
+          name: contracts-bedrock-tests-upgrade op-mainnet <<matrix.dev_features>>
+          fork_op_chain: op
+          fork_base_chain: mainnet
+          fork_base_rpc: https://ci-mainnet-l1-archive.optimism.io
+          dev_features: <<matrix.dev_features>>
+          matrix:
+            parameters:
+              dev_features: *dev_features_matrix
+          context:
+            - circleci-repo-readonly-authenticated-github-token
+          requires:
+            - initialize
       - contracts-bedrock-tests-upgrade:
           name: contracts-bedrock-tests-upgrade <<matrix.fork_op_chain>>-mainnet
           fork_op_chain: <<matrix.fork_op_chain>>
           fork_base_chain: mainnet
           fork_base_rpc: https://ci-mainnet-l1-archive.optimism.io
           matrix:
             parameters:
-              fork_op_chain: ["op", "base", "ink", "unichain"]
+              fork_op_chain: ["base", "ink", "unichain"]
           context:
             - circleci-repo-readonly-authenticated-github-token
           requires:
@@ -3189,6 +3204,7 @@ workflows:
           no_output_timeout: 90m
           context:
             - circleci-repo-readonly-authenticated-github-token
+            - slack
             - discord
           requires:
             - contracts-bedrock-build

diff --git a/devnet-sdk/testing/testlib/validators/forks.go b/devnet-sdk/testing/testlib/validators/forks.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/ethereum-optimism/optimism/devnet-sdk/system"
 	"github.com/ethereum-optimism/optimism/devnet-sdk/testing/systest"
-	"github.com/ethereum-optimism/optimism/op-node/rollup"
+	"github.com/ethereum-optimism/optimism/op-core/forks"
 	"github.com/ethereum/go-ethereum/params"
 )
 
@@ -39,40 +39,40 @@ func getChainConfig(t systest.T, sys system.System, chainIdx uint64) (*params.Ch
 
 // IsForkActivated checks if a specific fork is activated at the given timestamp
 // based on the chain configuration.
-func IsForkActivated(c *params.ChainConfig, forkName rollup.ForkName, timestamp uint64) (bool, error) {
+func IsForkActivated(c *params.ChainConfig, forkName forks.Name, timestamp uint64) (bool, error) {
 	if c == nil {
 		return false, fmt.Errorf("provided chain config is nil")
 	}
 
 	switch forkName {
-	case rollup.Bedrock:
+	case forks.Bedrock:
 		// Bedrock is activated based on block number, not timestamp
 		return true, nil // Assuming bedrock is always active in the context of this validator
-	case rollup.Regolith:
+	case forks.Regolith:
 		return c.IsOptimismRegolith(timestamp), nil
-	case rollup.Canyon:
+	case forks.Canyon:
 		return c.IsOptimismCanyon(timestamp), nil
-	case rollup.Ecotone:
+	case forks.Ecotone:
 		return c.IsOptimismEcotone(timestamp), nil
-	case rollup.Fjord:
+	case forks.Fjord:
 		return c.IsOptimismFjord(timestamp), nil
-	case rollup.Granite:
+	case forks.Granite:
 		return c.IsOptimismGranite(timestamp), nil
-	case rollup.Holocene:
+	case forks.Holocene:
 		return c.IsOptimismHolocene(timestamp), nil
-	case rollup.Isthmus:
+	case forks.Isthmus:
 		return c.IsOptimismIsthmus(timestamp), nil
-	case rollup.Jovian:
+	case forks.Jovian:
 		return c.IsOptimismJovian(timestamp), nil
-	case rollup.Interop:
+	case forks.Interop:
 		return c.IsInterop(timestamp), nil
 	default:
 		return false, fmt.Errorf("unknown fork name: %s", forkName)
 	}
 }
 
 // forkConfigValidator is a helper function that checks if a specific L2 chain meets a fork condition.
-func forkConfigValidator(chainIdx uint64, forkName rollup.ForkName, shouldBeActive bool, forkConfigMarker interface{}) systest.PreconditionValidator {
+func forkConfigValidator(chainIdx uint64, forkName forks.Name, shouldBeActive bool, forkConfigMarker interface{}) systest.PreconditionValidator {
 	return func(t systest.T, sys system.System) (context.Context, error) {
 		chainConfig, timestamp, err := getChainConfig(t, sys, chainIdx)
 		if err != nil {
@@ -105,7 +105,7 @@ type ChainConfigGetter = func(context.Context) *params.ChainConfig
 // AcquireForkConfig returns a ForkConfigGetter and a PreconditionValidator
 // that ensures a ForkConfig is available for the specified L2 chain.
 // The ForkConfig can be used to check if various forks are activated.
-func acquireForkConfig(chainIdx uint64, forkName rollup.ForkName, shouldBeActive bool) (ChainConfigGetter, systest.PreconditionValidator) {
+func acquireForkConfig(chainIdx uint64, forkName forks.Name, shouldBeActive bool) (ChainConfigGetter, systest.PreconditionValidator) {
 	chainConfigMarker := new(byte)
 	validator := forkConfigValidator(chainIdx, forkName, shouldBeActive, chainConfigMarker)
 	return func(ctx context.Context) *params.ChainConfig {
@@ -114,13 +114,13 @@ func acquireForkConfig(chainIdx uint64, forkName rollup.ForkName, shouldBeActive
 }
 
 // RequiresFork returns a validator that ensures a specific L2 chain has a specific fork activated.
-func AcquireL2WithFork(chainIdx uint64, forkName rollup.ForkName) (ChainConfigGetter, systest.PreconditionValidator) {
+func AcquireL2WithFork(chainIdx uint64, forkName forks.Name) (ChainConfigGetter, systest.PreconditionValidator) {
 	return acquireForkConfig(chainIdx, forkName, true)
 }
 
 // RequiresNotFork returns a validator that ensures a specific L2 chain does not
 // have a specific fork activated. Will not work with the interop fork
 // specifically since interop is not an ordered release fork.
-func AcquireL2WithoutFork(chainIdx uint64, forkName rollup.ForkName) (ChainConfigGetter, systest.PreconditionValidator) {
+func AcquireL2WithoutFork(chainIdx uint64, forkName forks.Name) (ChainConfigGetter, systest.PreconditionValidator) {
 	return acquireForkConfig(chainIdx, forkName, false)
 }
diff --git a/devnet-sdk/testing/testlib/validators/validators_test.go b/devnet-sdk/testing/testlib/validators/validators_test.go
@@ -11,7 +11,7 @@ import (
 	"github.com/ethereum-optimism/optimism/devnet-sdk/system"
 	"github.com/ethereum-optimism/optimism/devnet-sdk/testing/systest"
 	"github.com/ethereum-optimism/optimism/devnet-sdk/types"
-	"github.com/ethereum-optimism/optimism/op-node/rollup"
+	"github.com/ethereum-optimism/optimism/op-core/forks"
 	"github.com/ethereum-optimism/optimism/op-service/eth"
 	"github.com/ethereum-optimism/optimism/op-service/sources"
 	"github.com/ethereum/go-ethereum/accounts/abi/bind"
@@ -33,7 +33,7 @@ func TestValidators(t *testing.T) {
 	t.Run("multiple validators", func(t *testing.T) {
 		walletGetter1, validator1 := AcquireL2WalletWithFunds(0, types.NewBalance(big.NewInt(1)))
 		walletGetter2, validator2 := AcquireL2WalletWithFunds(0, types.NewBalance(big.NewInt(10)))
-		chainConfigGetter, l2ForkValidator := AcquireL2WithFork(0, rollup.Isthmus)
+		chainConfigGetter, l2ForkValidator := AcquireL2WithFork(0, forks.Isthmus)
 
 		// We create a system that has a low-level L1 chain and at least one wallet
 		systestSystem := &mockSystem{
@@ -109,7 +109,7 @@ func TestValidators(t *testing.T) {
 		}
 
 		// Get the validator for requiring Isthmus fork to be active
-		chainConfigGetter, validator := AcquireL2WithFork(0, rollup.Isthmus)
+		chainConfigGetter, validator := AcquireL2WithFork(0, forks.Isthmus)
 		systestT := systest.NewT(t)
 
 		// Apply the validator
@@ -119,7 +119,7 @@ func TestValidators(t *testing.T) {
 		// Verify the chain config getter works
 		chainConfig := chainConfigGetter(ctx)
 		require.NotNil(t, chainConfig)
-		isActive, err := IsForkActivated(chainConfig, rollup.Isthmus, 100)
+		isActive, err := IsForkActivated(chainConfig, forks.Isthmus, 100)
 		require.NoError(t, err)
 		require.True(t, isActive)
 	})
@@ -143,7 +143,7 @@ func TestValidators(t *testing.T) {
 		}
 
 		// Get the validator for requiring Isthmus fork to be active
-		_, validator := AcquireL2WithFork(0, rollup.Isthmus)
+		_, validator := AcquireL2WithFork(0, forks.Isthmus)
 		systestT := systest.NewT(t)
 
 		// Apply the validator - should fail since fork is not active
@@ -171,7 +171,7 @@ func TestValidators(t *testing.T) {
 		}
 
 		// Get the validator for requiring Isthmus fork to not be active
-		chainConfigGetter, validator := AcquireL2WithoutFork(0, rollup.Isthmus)
+		chainConfigGetter, validator := AcquireL2WithoutFork(0, forks.Isthmus)
 		systestT := systest.NewT(t)
 
 		// Apply the validator
@@ -181,7 +181,7 @@ func TestValidators(t *testing.T) {
 		// Verify the chain config getter works
 		chainConfig := chainConfigGetter(ctx)
 		require.NotNil(t, chainConfig)
-		isActive, err := IsForkActivated(chainConfig, rollup.Isthmus, 100)
+		isActive, err := IsForkActivated(chainConfig, forks.Isthmus, 100)
 		require.NoError(t, err)
 		require.False(t, isActive)
 	})
@@ -205,7 +205,7 @@ func TestValidators(t *testing.T) {
 		}
 
 		// Get the validator for requiring Isthmus fork to not be active
-		_, validator := AcquireL2WithoutFork(0, rollup.Isthmus)
+		_, validator := AcquireL2WithoutFork(0, forks.Isthmus)
 		systestT := systest.NewT(t)
 
 		// Apply the validator - should fail since fork is active
@@ -221,7 +221,7 @@ func TestValidators(t *testing.T) {
 		}
 
 		// Try to get chain config for an invalid chain index
-		_, validator := AcquireL2WithFork(0, rollup.Isthmus)
+		_, validator := AcquireL2WithFork(0, forks.Isthmus)
 		systestT := systest.NewT(t)
 
 		// Apply the validator - should fail since chain index is out of range

diff --git a/go.mod b/go.mod
@@ -162,7 +162,7 @@ require (
 	github.com/hashicorp/golang-lru v0.5.0 // indirect
 	github.com/hashicorp/golang-lru/arc/v2 v2.0.7 // indirect
 	github.com/hashicorp/raft-boltdb v0.0.0-20231211162105-6c830fa4535e // indirect
-	github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4 // indirect
+	github.com/holiman/billy v0.0.0-20250707135307-f2f9b9aae7db // indirect
 	github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
 	github.com/huin/goupnp v1.3.0 // indirect
 	github.com/influxdata/influxdb-client-go/v2 v2.4.0 // indirect
@@ -308,7 +308,7 @@ require (
 	lukechampine.com/blake3 v1.3.0 // indirect
 )
 
-replace github.com/ethereum/go-ethereum => github.com/ethereum-optimism/op-geth v1.101603.3-rc.3
+replace github.com/ethereum/go-ethereum => github.com/ethereum-optimism/op-geth v1.101603.4-rc.1
 
 // replace github.com/ethereum/go-ethereum => ../op-geth
 

diff --git a/go.sum b/go.sum
@@ -238,8 +238,8 @@ github.com/emicklei/dot v1.6.2 h1:08GN+DD79cy/tzN6uLCT84+2Wk9u+wvqP+Hkx/dIR8A=
 github.com/emicklei/dot v1.6.2/go.mod h1:DeV7GvQtIw4h2u73RKBkkFdvVAz0D9fzeJrgPW6gy/s=
 github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.4-0.20251001155152-4eb15ccedf7e h1:iy1vBIzACYUyOVyoADUwvAiq2eOPC0yVsDUdolPwQjk=
 github.com/ethereum-optimism/go-ethereum-hdwallet v0.1.4-0.20251001155152-4eb15ccedf7e/go.mod h1:DYj7+vYJ4cIB7zera9mv4LcAynCL5u4YVfoeUu6Wa+w=
-github.com/ethereum-optimism/op-geth v1.101603.3-rc.3 h1:KGpZouRMsMcl9MWOmYKJi+XR1gTT9/2STANv1G7oaNA=
-github.com/ethereum-optimism/op-geth v1.101603.3-rc.3/go.mod h1:Wiy9cngs7ll1slc/dcHHRVuGhozWOpF1y6f31xENR7k=
+github.com/ethereum-optimism/op-geth v1.101603.4-rc.1 h1:5ByBDUKBY/IHibukF/C9kjzaTk4SxUoXH449VuDrMn4=
+github.com/ethereum-optimism/op-geth v1.101603.4-rc.1/go.mod h1:cnGR2M8zX91+rRQxXyNTEOEpw/IwdR8P11FQX7Xaqwk=
 github.com/ethereum-optimism/superchain-registry/validation v0.0.0-20251009180028-9b4658b9b7af h1:WWz0gJM/boaUImtJnROecPirAerKCLpAU4m6Tx0ArOg=
 github.com/ethereum-optimism/superchain-registry/validation v0.0.0-20251009180028-9b4658b9b7af/go.mod h1:NZ816PzLU1TLv1RdAvYAb6KWOj4Zm5aInT0YpDVml2Y=
 github.com/ethereum/c-kzg-4844/v2 v2.1.5 h1:aVtoLK5xwJ6c5RiqO8g8ptJ5KU+2Hdquf6G3aXiHh5s=
@@ -432,8 +432,8 @@ github.com/hashicorp/raft-boltdb v0.0.0-20231211162105-6c830fa4535e h1:SK4y8oR4Z
 github.com/hashicorp/raft-boltdb v0.0.0-20231211162105-6c830fa4535e/go.mod h1:EMz/UIuG93P0MBeHh6CbXQAEe8ckVJLZjhD17lBzK5Q=
 github.com/hashicorp/raft-boltdb/v2 v2.3.1 h1:ackhdCNPKblmOhjEU9+4lHSJYFkJd6Jqyvj6eW9pwkc=
 github.com/hashicorp/raft-boltdb/v2 v2.3.1/go.mod h1:n4S+g43dXF1tqDT+yzcXHhXM6y7MrlUd3TTwGRcUvQE=
-github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4 h1:X4egAf/gcS1zATw6wn4Ej8vjuVGxeHdan+bRb2ebyv4=
-github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4/go.mod h1:5GuXa7vkL8u9FkFuWdVvfR5ix8hRB7DbOAaYULamFpc=
+github.com/holiman/billy v0.0.0-20250707135307-f2f9b9aae7db h1:IZUYC/xb3giYwBLMnr8d0TGTzPKFGNTCGgGLoyeX330=
+github.com/holiman/billy v0.0.0-20250707135307-f2f9b9aae7db/go.mod h1:xTEYN9KCHxuYHs+NmrmzFcnvHMzLLNiGFafCb1n3Mfg=
 github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao=
 github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA=
 github.com/holiman/uint256 v1.3.2 h1:a9EgMPSC1AAaj1SZL5zIQD3WbwTuHrMGOerLjGmM/TA=

diff --git a/mise.toml b/mise.toml
@@ -38,7 +38,7 @@ anvil = "1.1.0"
 codecov-uploader = "0.8.0"
 goreleaser-pro = "2.11.2"
 kurtosis = "1.8.1"
-op-acceptor = "op-acceptor/v3.6.1"
+op-acceptor = "op-acceptor/v3.6.2"
 
 # Fake dependencies
 # Put things here if you need to track versions of tools or projects that can't

diff --git a/op-acceptance-tests/justfile b/op-acceptance-tests/justfile
@@ -1,6 +1,6 @@
 REPO_ROOT := `realpath ..`  # path to the root of the optimism monorepo
 KURTOSIS_DIR := REPO_ROOT + "/kurtosis-devnet"
-ACCEPTOR_VERSION := env_var_or_default("ACCEPTOR_VERSION", "v3.6.1")
+ACCEPTOR_VERSION := env_var_or_default("ACCEPTOR_VERSION", "v3.6.2")
 DOCKER_REGISTRY := env_var_or_default("DOCKER_REGISTRY", "us-docker.pkg.dev/oplabs-tools-artifacts/images")
 ACCEPTOR_IMAGE := env_var_or_default("ACCEPTOR_IMAGE", DOCKER_REGISTRY + "/op-acceptor:" + ACCEPTOR_VERSION)
 

diff --git a/op-acceptance-tests/tests/base/withdrawal/init_test.go b/op-acceptance-tests/tests/base/withdrawal/init_test.go
@@ -3,7 +3,6 @@ package withdrawal
 import (
 	"testing"
 
-	faultTypes "github.com/ethereum-optimism/optimism/op-challenger/game/fault/types"
 	"github.com/ethereum-optimism/optimism/op-devstack/compat"
 	"github.com/ethereum-optimism/optimism/op-devstack/presets"
 )
@@ -13,14 +12,7 @@ func TestMain(m *testing.M) {
 		// TODO(infra#401): Re-enable the test when the sysext missing toolset is implemented
 		presets.WithCompatibleTypes(compat.SysGo),
 		presets.WithMinimal(),
-		presets.WithProposerGameType(faultTypes.FastGameType),
-		// Fast game for test
-		presets.WithFastGame(),
-		// Deployer must be L1PAO to make op-deployer happy
-		presets.WithDeployerMatchL1PAO(),
-		// Guardian must be L1PAO to make AnchorStateRegistry's setRespectedGameType method work
-		presets.WithGuardianMatchL1PAO(),
-		// Fast finalization for fast withdrawal
+		presets.WithTimeTravel(),
 		presets.WithFinalizationPeriodSeconds(1),
 		// Satisfy OptimismPortal2 PROOF_MATURITY_DELAY_SECONDS check, avoid OptimismPortal_ProofNotOldEnough() revert
 		presets.WithProofMaturityDelaySeconds(2),

diff --git a/op-acceptance-tests/tests/base/withdrawal/withdrawal_test.go b/op-acceptance-tests/tests/base/withdrawal/withdrawal_test.go
@@ -15,7 +15,7 @@ func TestWithdrawal(gt *testing.T) {
 	require := sys.T.Require()
 
 	bridge := sys.StandardBridge()
-	require.EqualValues(faultTypes.FastGameType, bridge.RespectedGameType(), "Respected game type must be FastGame")
+	require.EqualValues(faultTypes.PermissionedGameType, bridge.RespectedGameType(), "Respected game type must be PermissionedGameType")
 
 	initialL1Balance := eth.OneThirdEther
 
@@ -45,6 +45,13 @@ func TestWithdrawal(gt *testing.T) {
 	expectedL1UserBalance = expectedL1UserBalance.Sub(withdrawal.ProveGasCost())
 	l1User.VerifyBalanceExact(expectedL1UserBalance)
 
+	// Advance time until game is resolvable
+	sys.AdvanceTime(bridge.GameResolutionDelay())
+	withdrawal.WaitForDisputeGameResolved()
+
+	// Advance time to when game finalization and proof finalization delay has expired
+	sys.AdvanceTime(max(bridge.WithdrawalDelay()-bridge.GameResolutionDelay(), bridge.DisputeGameFinalityDelay()))
+
 	t.Logger().Info("Attempting to finalize", "proofMaturity", bridge.WithdrawalDelay(), "gameResolutionDelay", bridge.GameResolutionDelay(), "gameFinalityDelay", bridge.DisputeGameFinalityDelay())
 	withdrawal.Finalize(l1User)
 	expectedL1UserBalance = expectedL1UserBalance.Sub(withdrawal.FinalizeGasCost()).Add(withdrawalAmount)

diff --git a/op-acceptance-tests/tests/ecotone/fees_test.go b/op-acceptance-tests/tests/ecotone/fees_test.go
@@ -4,10 +4,10 @@ import (
 	"math/big"
 	"testing"
 
+	"github.com/ethereum-optimism/optimism/op-core/forks"
 	"github.com/ethereum-optimism/optimism/op-devstack/devtest"
 	"github.com/ethereum-optimism/optimism/op-devstack/dsl"
 	"github.com/ethereum-optimism/optimism/op-devstack/presets"
-	"github.com/ethereum-optimism/optimism/op-node/rollup"
 	"github.com/ethereum-optimism/optimism/op-service/eth"
 )
 
@@ -16,7 +16,7 @@ func TestFees(gt *testing.T) {
 	sys := presets.NewMinimal(t)
 	require := t.Require()
 
-	err := dsl.RequiresL2Fork(t.Ctx(), sys, 0, rollup.Ecotone)
+	err := dsl.RequiresL2Fork(t.Ctx(), sys, 0, forks.Ecotone)
 	require.NoError(err, "Ecotone fork must be active for this test")
 
 	alice := sys.FunderL2.NewFundedEOA(eth.OneTenthEther)

diff --git a/op-acceptance-tests/tests/fjord/check_scripts_test.go b/op-acceptance-tests/tests/fjord/check_scripts_test.go
@@ -7,12 +7,12 @@ import (
 
 	"github.com/ethereum/go-ethereum/rpc"
 
+	"github.com/ethereum-optimism/optimism/op-core/forks"
+	"github.com/ethereum-optimism/optimism/op-core/predeploys"
 	"github.com/ethereum-optimism/optimism/op-devstack/devtest"
 	"github.com/ethereum-optimism/optimism/op-devstack/dsl"
 	"github.com/ethereum-optimism/optimism/op-devstack/presets"
-	"github.com/ethereum-optimism/optimism/op-node/rollup"
 	"github.com/ethereum-optimism/optimism/op-service/eth"
-	"github.com/ethereum-optimism/optimism/op-service/predeploys"
 	txib "github.com/ethereum-optimism/optimism/op-service/txintent/bindings"
 	"github.com/ethereum-optimism/optimism/op-service/txintent/contractio"
 	"github.com/ethereum-optimism/optimism/op-service/txplan"
@@ -34,7 +34,7 @@ func TestCheckFjordScript(gt *testing.T) {
 	require := t.Require()
 	ctx := t.Ctx()
 
-	err := dsl.RequiresL2Fork(ctx, sys, 0, rollup.Fjord)
+	err := dsl.RequiresL2Fork(ctx, sys, 0, forks.Fjord)
 	require.NoError(err)
 
 	wallet := sys.FunderL2.NewFundedEOA(eth.OneThirdEther)