Keep prestate as before if input is zero

op-chain-ops/genesis/config.go

@@ -1111,6 +1111,8 @@ type L1Deployments struct {
 	OptimismMintableERC20FactoryProxy common.Address `json:"OptimismMintableERC20FactoryProxy"`
 	OptimismPortal                    common.Address `json:"OptimismPortal"`
 	OptimismPortalProxy               common.Address `json:"OptimismPortalProxy"`
+	ETHLockbox                        common.Address `json:"ETHLockbox"`
+	ETHLockboxProxy                   common.Address `json:"ETHLockboxProxy"`
 	ProxyAdmin                        common.Address `json:"ProxyAdmin"`
 	SystemConfig                      common.Address `json:"SystemConfig"`
 	SystemConfigProxy                 common.Address `json:"SystemConfigProxy"`
@@ -1156,6 +1158,7 @@ func (d *L1Deployments) Check(deployConfig *DeployConfig) error {
 				name == "DataAvailabilityChallengeProxy") {
 			continue
 		}
+
 		if val.Field(i).Interface().(common.Address) == (common.Address{}) {
 			return fmt.Errorf("%s is not set", name)
 		}

op-chain-ops/interopgen/configs.go

@@ -74,15 +74,16 @@ type L2Config struct {
 	Challenger        common.Address
 	SystemConfigOwner common.Address
 	genesis.L2InitializationConfig
-	Prefund                 map[common.Address]*big.Int
-	SaltMixer               string
-	GasLimit                uint64
-	DisputeGameType         uint32
-	DisputeAbsolutePrestate common.Hash
-	DisputeMaxGameDepth     uint64
-	DisputeSplitDepth       uint64
-	DisputeClockExtension   uint64
-	DisputeMaxClockDuration uint64
+	Prefund                   map[common.Address]*big.Int
+	SaltMixer                 string
+	GasLimit                  uint64
+	DisputeGameUsesSuperRoots bool
+	DisputeGameType           uint32
+	DisputeAbsolutePrestate   common.Hash
+	DisputeMaxGameDepth       uint64
+	DisputeSplitDepth         uint64
+	DisputeClockExtension     uint64
+	DisputeMaxClockDuration   uint64
 }
 
 func (c *L2Config) Check(log log.Logger) error {

op-chain-ops/interopgen/deploy.go

@@ -198,24 +198,25 @@ func DeployL2ToL1(l1Host *script.Host, superCfg *SuperchainConfig, superDeployme
 	l1Host.SetTxOrigin(cfg.Deployer)
 
 	output, err := opcm.DeployOPChain(l1Host, opcm.DeployOPChainInput{
-		OpChainProxyAdminOwner:  cfg.ProxyAdminOwner,
-		SystemConfigOwner:       cfg.SystemConfigOwner,
-		Batcher:                 cfg.BatchSenderAddress,
-		UnsafeBlockSigner:       cfg.P2PSequencerAddress,
-		Proposer:                cfg.Proposer,
-		Challenger:              cfg.Challenger,
-		BasefeeScalar:           cfg.GasPriceOracleBaseFeeScalar,
-		BlobBaseFeeScalar:       cfg.GasPriceOracleBlobBaseFeeScalar,
-		L2ChainId:               new(big.Int).SetUint64(cfg.L2ChainID),
-		Opcm:                    superDeployment.Opcm,
-		SaltMixer:               cfg.SaltMixer,
-		GasLimit:                cfg.GasLimit,
-		DisputeGameType:         cfg.DisputeGameType,
-		DisputeAbsolutePrestate: cfg.DisputeAbsolutePrestate,
-		DisputeMaxGameDepth:     cfg.DisputeMaxGameDepth,
-		DisputeSplitDepth:       cfg.DisputeSplitDepth,
-		DisputeClockExtension:   cfg.DisputeClockExtension,
-		DisputeMaxClockDuration: cfg.DisputeMaxClockDuration,
+		OpChainProxyAdminOwner:    cfg.ProxyAdminOwner,
+		SystemConfigOwner:         cfg.SystemConfigOwner,
+		Batcher:                   cfg.BatchSenderAddress,
+		UnsafeBlockSigner:         cfg.P2PSequencerAddress,
+		Proposer:                  cfg.Proposer,
+		Challenger:                cfg.Challenger,
+		BasefeeScalar:             cfg.GasPriceOracleBaseFeeScalar,
+		BlobBaseFeeScalar:         cfg.GasPriceOracleBlobBaseFeeScalar,
+		L2ChainId:                 new(big.Int).SetUint64(cfg.L2ChainID),
+		Opcm:                      superDeployment.Opcm,
+		SaltMixer:                 cfg.SaltMixer,
+		GasLimit:                  cfg.GasLimit,
+		DisputeGameUsesSuperRoots: cfg.DisputeGameUsesSuperRoots,
+		DisputeGameType:           cfg.DisputeGameType,
+		DisputeAbsolutePrestate:   cfg.DisputeAbsolutePrestate,
+		DisputeMaxGameDepth:       cfg.DisputeMaxGameDepth,
+		DisputeSplitDepth:         cfg.DisputeSplitDepth,
+		DisputeClockExtension:     cfg.DisputeClockExtension,
+		DisputeMaxClockDuration:   cfg.DisputeMaxClockDuration,
 	})
 	if err != nil {
 		return nil, fmt.Errorf("failed to deploy L2 OP chain: %w", err)

op-chain-ops/interopgen/deployments.go

@@ -16,6 +16,7 @@ type Implementations struct {
 	OpcmUpgrader                     common.Address `json:"OPCMUpgrader"`
 	DelayedWETHImpl                  common.Address `json:"DelayedWETHImpl"`
 	OptimismPortalImpl               common.Address `json:"OptimismPortalImpl"`
+	ETHLockboxImpl                   common.Address `json:"ETHLockboxImpl"`
 	PreimageOracleSingleton          common.Address `json:"PreimageOracleSingleton"`
 	MipsSingleton                    common.Address `json:"MipsSingleton"`
 	SystemConfigImpl                 common.Address `json:"SystemConfigImpl"`
@@ -51,6 +52,7 @@ type L2OpchainDeployment struct {
 	L1CrossDomainMessengerProxy       common.Address `json:"L1CrossDomainMessengerProxy"`
 	// Fault proof contracts below.
 	OptimismPortalProxy                common.Address `json:"OptimismPortalProxy"`
+	ETHLockboxProxy                    common.Address `json:"ETHLockboxProxy"`
 	DisputeGameFactoryProxy            common.Address `json:"DisputeGameFactoryProxy"`
 	AnchorStateRegistryProxy           common.Address `json:"AnchorStateRegistryProxy"`
 	FaultDisputeGame                   common.Address `json:"FaultDisputeGame"`

op-chain-ops/interopgen/recipe.go

@@ -275,15 +275,16 @@ func (r *InteropDevL2Recipe) build(l1ChainID uint64, addrs devkeys.Addresses) (*
 				UseAltDA: false,
 			},
 		},
-		Prefund:                 make(map[common.Address]*big.Int),
-		SaltMixer:               "",
-		GasLimit:                60_000_000,
-		DisputeGameType:         1, // PERMISSIONED_CANNON Game Type
-		DisputeAbsolutePrestate: common.HexToHash("0x038512e02c4c3f7bdaec27d00edf55b7155e0905301e1a88083e4e0a6764d54c"),
-		DisputeMaxGameDepth:     73,
-		DisputeSplitDepth:       30,
-		DisputeClockExtension:   10800,  // 3 hours (input in seconds)
-		DisputeMaxClockDuration: 302400, // 3.5 days (input in seconds)
+		Prefund:                   make(map[common.Address]*big.Int),
+		SaltMixer:                 "",
+		GasLimit:                  60_000_000,
+		DisputeGameUsesSuperRoots: true,
+		DisputeGameType:           1, // PERMISSIONED_CANNON Game Type
+		DisputeAbsolutePrestate:   common.HexToHash("0x038512e02c4c3f7bdaec27d00edf55b7155e0905301e1a88083e4e0a6764d54c"),
+		DisputeMaxGameDepth:       73,
+		DisputeSplitDepth:         30,
+		DisputeClockExtension:     10800,  // 3 hours (input in seconds)
+		DisputeMaxClockDuration:   302400, // 3.5 days (input in seconds)
 	}
 
 	l2Users := devkeys.ChainUserKeys(new(big.Int).SetUint64(r.ChainID))

op-chain-ops/solc/types.go

@@ -263,6 +263,8 @@ type Expression struct {
 	ReferencedDeclaration  int                   `json:"referencedDeclaration,omitempty"`
 	ArgumentTypes          []AstTypeDescriptions `json:"argumentTypes,omitempty"`
 	Value                  interface{}           `json:"value,omitempty"`
+	Kind                   string                `json:"kind,omitempty"`
+	Expression             *Expression           `json:"expression,omitempty"`
 }
 
 type ForgeArtifact struct {

op-deployer/pkg/deployer/bootstrap/validator.go

@@ -47,6 +47,7 @@ type ValidatorInput struct {
 	ProtocolVersionsImpl             common.Address `json:"protocolVersionsImpl"`
 	L1ERC721BridgeImpl               common.Address `json:"l1ERC721BridgeImpl"`
 	OptimismPortalImpl               common.Address `json:"optimismPortalImpl"`
+	ETHLockboxImpl                   common.Address `json:"ethLockboxImpl" evm:"ethLockboxImpl"`
 	SystemConfigImpl                 common.Address `json:"systemConfigImpl"`
 	OptimismMintableERC20FactoryImpl common.Address `json:"optimismMintableERC20FactoryImpl"`
 	L1CrossDomainMessengerImpl       common.Address `json:"l1CrossDomainMessengerImpl"`

op-deployer/pkg/deployer/bootstrap/validator_test.go

@@ -62,6 +62,7 @@ func testValidator(t *testing.T, forkRPCURL string, loc *artifacts.Locator, rele
 		ProtocolVersionsImpl:             common.Address{'2'},
 		L1ERC721BridgeImpl:               common.Address{'3'},
 		OptimismPortalImpl:               common.Address{'4'},
+		ETHLockboxImpl:                   common.Address{'5'},
 		SystemConfigImpl:                 common.Address{'5'},
 		OptimismMintableERC20FactoryImpl: common.Address{'6'},
 		L1CrossDomainMessengerImpl:       common.Address{'7'},

op-deployer/pkg/deployer/inspect/l1.go

@@ -71,6 +71,8 @@ func (l L1Contracts) AsL1Deployments() *genesis.L1Deployments {
 		OptimismMintableERC20FactoryProxy: l.OpChainDeployment.OptimismMintableERC20FactoryProxyAddress,
 		OptimismPortal:                    l.ImplementationsDeployment.OptimismPortalImplAddress,
 		OptimismPortalProxy:               l.OpChainDeployment.OptimismPortalProxyAddress,
+		ETHLockbox:                        l.ImplementationsDeployment.ETHLockboxImplAddress,
+		ETHLockboxProxy:                   l.OpChainDeployment.ETHLockboxProxyAddress,
 		ProxyAdmin:                        l.OpChainDeployment.ProxyAdminAddress,
 		SystemConfig:                      l.ImplementationsDeployment.SystemConfigImplAddress,
 		SystemConfigProxy:                 l.OpChainDeployment.SystemConfigProxyAddress,
@@ -98,6 +100,7 @@ type OpChainDeployment struct {
 	L1StandardBridgeProxyAddress             common.Address `json:"l1StandardBridgeProxyAddress"`
 	L1CrossDomainMessengerProxyAddress       common.Address `json:"l1CrossDomainMessengerProxyAddress"`
 	OptimismPortalProxyAddress               common.Address `json:"optimismPortalProxyAddress"`
+	ETHLockboxProxyAddress                   common.Address `json:"ethLockboxProxyAddress"`
 	DisputeGameFactoryProxyAddress           common.Address `json:"disputeGameFactoryProxyAddress"`
 	AnchorStateRegistryProxyAddress          common.Address `json:"anchorStateRegistryProxyAddress"`
 	AnchorStateRegistryImplAddress           common.Address `json:"anchorStateRegistryImplAddress"`
@@ -113,6 +116,7 @@ type ImplementationsDeployment struct {
 	OpcmAddress                             common.Address `json:"opcmAddress"`
 	DelayedWETHImplAddress                  common.Address `json:"delayedWETHImplAddress"`
 	OptimismPortalImplAddress               common.Address `json:"optimismPortalImplAddress"`
+	ETHLockboxImplAddress                   common.Address `json:"ethLockboxImplAddress"`
 	PreimageOracleSingletonAddress          common.Address `json:"preimageOracleSingletonAddress"`
 	MipsSingletonAddress                    common.Address `json:"mipsSingletonAddress"`
 	SystemConfigImplAddress                 common.Address `json:"systemConfigImplAddress"`
@@ -169,6 +173,7 @@ func L1(globalState *state.State, chainID common.Hash) (*L1Contracts, error) {
 			L1StandardBridgeProxyAddress:             chainState.L1StandardBridgeProxyAddress,
 			L1CrossDomainMessengerProxyAddress:       chainState.L1CrossDomainMessengerProxyAddress,
 			OptimismPortalProxyAddress:               chainState.OptimismPortalProxyAddress,
+			ETHLockboxProxyAddress:                   chainState.ETHLockboxProxyAddress,
 			DisputeGameFactoryProxyAddress:           chainState.DisputeGameFactoryProxyAddress,
 			AnchorStateRegistryProxyAddress:          chainState.AnchorStateRegistryProxyAddress,
 			FaultDisputeGameAddress:                  chainState.FaultDisputeGameAddress,
@@ -182,6 +187,7 @@ func L1(globalState *state.State, chainID common.Hash) (*L1Contracts, error) {
 			OpcmAddress:                             globalState.ImplementationsDeployment.OpcmAddress,
 			DelayedWETHImplAddress:                  globalState.ImplementationsDeployment.DelayedWETHImplAddress,
 			OptimismPortalImplAddress:               globalState.ImplementationsDeployment.OptimismPortalImplAddress,
+			ETHLockboxImplAddress:                   globalState.ImplementationsDeployment.ETHLockboxImplAddress,
 			PreimageOracleSingletonAddress:          globalState.ImplementationsDeployment.PreimageOracleSingletonAddress,
 			MipsSingletonAddress:                    globalState.ImplementationsDeployment.MipsSingletonAddress,
 			SystemConfigImplAddress:                 globalState.ImplementationsDeployment.SystemConfigImplAddress,

op-deployer/pkg/deployer/integration_test/apply_test.go

@@ -297,7 +297,7 @@ func TestProofParamOverrides(t *testing.T) {
 		{
 			"disputeGameFinalityDelaySeconds",
 			uint64Caster,
-			st.ImplementationsDeployment.OptimismPortalImplAddress,
+			st.ImplementationsDeployment.AnchorStateRegistryImplAddress,
 		},
 		{
 			"faultGameAbsolutePrestate",
@@ -462,6 +462,7 @@ func TestAdditionalDisputeGames(t *testing.T) {
 	intent.Chains[0].AdditionalDisputeGames = []state.AdditionalDisputeGame{
 		{
 			ChainProofParams: state.ChainProofParams{
+				DisputeGameUsesSuperRoots:               false,
 				DisputeGameType:                         255,
 				DisputeAbsolutePrestate:                 standard.DisputeAbsolutePrestate,
 				DisputeMaxGameDepth:                     50,
@@ -675,10 +676,11 @@ func validateSuperchainDeployment(t *testing.T, st *state.State, cg codeGetter)
 func validateOPChainDeployment(t *testing.T, cg codeGetter, st *state.State, intent *state.Intent, govEnabled bool) {
 	// Validate that the implementation addresses are always set, even in subsequent deployments
 	// that pull from an existing OPCM deployment.
-	implAddrs := []struct {
+	type addrTuple struct {
 		name string
 		addr common.Address
-	}{
+	}
+	implAddrs := []addrTuple{
 		{"DelayedWETHImplAddress", st.ImplementationsDeployment.DelayedWETHImplAddress},
 		{"OptimismPortalImplAddress", st.ImplementationsDeployment.OptimismPortalImplAddress},
 		{"SystemConfigImplAddress", st.ImplementationsDeployment.SystemConfigImplAddress},
@@ -690,6 +692,11 @@ func validateOPChainDeployment(t *testing.T, cg codeGetter, st *state.State, int
 		{"MipsSingletonAddress", st.ImplementationsDeployment.MipsSingletonAddress},
 		{"PreimageOracleSingletonAddress", st.ImplementationsDeployment.PreimageOracleSingletonAddress},
 	}
+
+	if !intent.L1ContractsLocator.IsTag() {
+		implAddrs = append(implAddrs, addrTuple{"ETHLockboxImplAddress", st.ImplementationsDeployment.ETHLockboxImplAddress})
+	}
+
 	for _, addr := range implAddrs {
 		require.NotEmpty(t, addr.addr, "%s should be set", addr.name)
 		code := cg(t, addr.addr)

op-deployer/pkg/deployer/opcm/dispute_game_factory.go

@@ -8,7 +8,6 @@ import (
 type SetDisputeGameImplInput struct {
 	Factory             common.Address
 	Impl                common.Address
-	Portal              common.Address
 	AnchorStateRegistry common.Address
 	GameType            uint32
 }

op-deployer/pkg/deployer/opcm/implementations.go

@@ -37,6 +37,7 @@ type DeployImplementationsOutput struct {
 	OpcmUpgrader                     common.Address `json:"opcmUpgraderAddress"`
 	DelayedWETHImpl                  common.Address `json:"delayedWETHImplAddress"`
 	OptimismPortalImpl               common.Address `json:"optimismPortalImplAddress"`
+	ETHLockboxImpl                   common.Address `json:"ethLockboxImplAddress" evm:"ethLockboxImpl"`
 	PreimageOracleSingleton          common.Address `json:"preimageOracleSingletonAddress"`
 	MipsSingleton                    common.Address `json:"mipsSingletonAddress"`
 	SystemConfigImpl                 common.Address `json:"systemConfigImplAddress"`

op-deployer/pkg/deployer/opcm/opchain.go

@@ -33,6 +33,7 @@ type DeployOPChainInput struct {
 	SaltMixer         string
 	GasLimit          uint64
 
+	DisputeGameUsesSuperRoots    bool
 	DisputeGameType              uint32
 	DisputeAbsolutePrestate      common.Hash
 	DisputeMaxGameDepth          uint64
@@ -63,6 +64,7 @@ type DeployOPChainOutput struct {
 	L1CrossDomainMessengerProxy       common.Address
 	// Fault proof contracts below.
 	OptimismPortalProxy                common.Address
+	ETHLockboxProxy                    common.Address `evm:"ethLockboxProxy"`
 	DisputeGameFactoryProxy            common.Address
 	AnchorStateRegistryProxy           common.Address
 	FaultDisputeGame                   common.Address
@@ -92,6 +94,7 @@ type ReadImplementationAddressesInput struct {
 type ReadImplementationAddressesOutput struct {
 	DelayedWETH                  common.Address
 	OptimismPortal               common.Address
+	ETHLockbox                   common.Address `evm:"ethLockbox"`
 	SystemConfig                 common.Address
 	L1CrossDomainMessenger       common.Address
 	L1ERC721Bridge               common.Address

op-deployer/pkg/deployer/pipeline/dispute_games.go

@@ -127,13 +127,12 @@ func deployDisputeGame(
 
 	lgr.Info("setting dispute game impl on factory", "respected", game.MakeRespected)
 	sdgiInput := opcm.SetDisputeGameImplInput{
-		Factory:             thisState.DisputeGameFactoryProxyAddress,
-		Impl:                out.DisputeGameImpl,
-		GameType:            game.DisputeGameType,
-		AnchorStateRegistry: thisState.AnchorStateRegistryProxyAddress,
+		Factory:  thisState.DisputeGameFactoryProxyAddress,
+		Impl:     out.DisputeGameImpl,
+		GameType: game.DisputeGameType,
 	}
 	if game.MakeRespected {
-		sdgiInput.Portal = thisState.OptimismPortalProxyAddress
+		sdgiInput.AnchorStateRegistry = thisState.AnchorStateRegistryProxyAddress
 	}
 	if err := opcm.SetDisputeGameImpl(
 		env.L1ScriptHost,

op-deployer/pkg/deployer/pipeline/implementations.go

@@ -72,6 +72,7 @@ func DeployImplementations(env *Env, intent *state.Intent, st *state.State) erro
 		OpcmUpgraderAddress:                     dio.OpcmUpgrader,
 		DelayedWETHImplAddress:                  dio.DelayedWETHImpl,
 		OptimismPortalImplAddress:               dio.OptimismPortalImpl,
+		ETHLockboxImplAddress:                   dio.ETHLockboxImpl,
 		PreimageOracleSingletonAddress:          dio.PreimageOracleSingleton,
 		MipsSingletonAddress:                    dio.MipsSingleton,
 		SystemConfigImplAddress:                 dio.SystemConfigImpl,

op-deployer/pkg/deployer/pipeline/opchain.go

@@ -58,6 +58,7 @@ func DeployOPChain(env *Env, intent *state.Intent, st *state.State, chainID comm
 
 	st.ImplementationsDeployment.DelayedWETHImplAddress = impls.DelayedWETH
 	st.ImplementationsDeployment.OptimismPortalImplAddress = impls.OptimismPortal
+	st.ImplementationsDeployment.ETHLockboxImplAddress = impls.ETHLockbox
 	st.ImplementationsDeployment.SystemConfigImplAddress = impls.SystemConfig
 	st.ImplementationsDeployment.L1CrossDomainMessengerImplAddress = impls.L1CrossDomainMessenger
 	st.ImplementationsDeployment.L1ERC721BridgeImplAddress = impls.L1ERC721Bridge
@@ -73,12 +74,13 @@ func DeployOPChain(env *Env, intent *state.Intent, st *state.State, chainID comm
 func makeDCI(intent *state.Intent, thisIntent *state.ChainIntent, chainID common.Hash, st *state.State) (opcm.DeployOPChainInput, error) {
 	proofParams, err := jsonutil.MergeJSON(
 		state.ChainProofParams{
-			DisputeGameType:         standard.DisputeGameType,
-			DisputeAbsolutePrestate: standard.DisputeAbsolutePrestate,
-			DisputeMaxGameDepth:     standard.DisputeMaxGameDepth,
-			DisputeSplitDepth:       standard.DisputeSplitDepth,
-			DisputeClockExtension:   standard.DisputeClockExtension,
-			DisputeMaxClockDuration: standard.DisputeMaxClockDuration,
+			DisputeGameUsesSuperRoots: standard.DisputeGameUsesSuperRoots,
+			DisputeGameType:           standard.DisputeGameType,
+			DisputeAbsolutePrestate:   standard.DisputeAbsolutePrestate,
+			DisputeMaxGameDepth:       standard.DisputeMaxGameDepth,
+			DisputeSplitDepth:         standard.DisputeSplitDepth,
+			DisputeClockExtension:     standard.DisputeClockExtension,
+			DisputeMaxClockDuration:   standard.DisputeMaxClockDuration,
 		},
 		intent.GlobalDeployOverrides,
 		thisIntent.DeployOverrides,
@@ -100,6 +102,7 @@ func makeDCI(intent *state.Intent, thisIntent *state.ChainIntent, chainID common
 		Opcm:                         st.ImplementationsDeployment.OpcmAddress,
 		SaltMixer:                    st.Create2Salt.String(), // passing through salt generated at state initialization
 		GasLimit:                     standard.GasLimit,
+		DisputeGameUsesSuperRoots:    proofParams.DisputeGameUsesSuperRoots,
 		DisputeGameType:              proofParams.DisputeGameType,
 		DisputeAbsolutePrestate:      proofParams.DisputeAbsolutePrestate,
 		DisputeMaxGameDepth:          proofParams.DisputeMaxGameDepth,
@@ -123,6 +126,7 @@ func makeChainState(chainID common.Hash, dco opcm.DeployOPChainOutput) *state.Ch
 		L1StandardBridgeProxyAddress:              dco.L1StandardBridgeProxy,
 		L1CrossDomainMessengerProxyAddress:        dco.L1CrossDomainMessengerProxy,
 		OptimismPortalProxyAddress:                dco.OptimismPortalProxy,
+		ETHLockboxProxyAddress:                    dco.ETHLockboxProxy,
 		DisputeGameFactoryProxyAddress:            dco.DisputeGameFactoryProxy,
 		AnchorStateRegistryProxyAddress:           dco.AnchorStateRegistryProxy,
 		FaultDisputeGameAddress:                   dco.FaultDisputeGame,