fix(kt-devnet): expose L2 rollup config (ethereum-optimism#15933)

Author: sigma

devnet-sdk/descriptors/deployment.go

@@ -5,6 +5,7 @@ import (
 	"net/http"
 
 	"github.com/ethereum-optimism/optimism/devnet-sdk/types"
+	"github.com/ethereum-optimism/optimism/op-node/rollup"
 	"github.com/ethereum/go-ethereum/params"
 )
 
@@ -55,8 +56,9 @@ type Chain struct {
 
 type L2Chain struct {
 	*Chain
-	L1Addresses AddressMap `json:"l1_addresses,omitempty"`
-	L1Wallets   WalletMap  `json:"l1_wallets,omitempty"`
+	L1Addresses  AddressMap     `json:"l1_addresses,omitempty"`
+	L1Wallets    WalletMap      `json:"l1_wallets,omitempty"`
+	RollupConfig *rollup.Config `json:"rollup_config"`
 }
 
 // Wallet represents a wallet with an address and optional private key.

kurtosis-devnet/pkg/kurtosis/kurtosis.go

@@ -247,6 +247,7 @@ func (d *KurtosisDeployer) GetEnvironmentInfo(ctx context.Context, s *spec.Encla
 				chain.L1Addresses = descriptors.AddressMap(deployment.L1Addresses)
 				chain.Addresses = descriptors.AddressMap(deployment.L2Addresses)
 				chain.Config = deployment.Config
+				chain.RollupConfig = deployment.RollupConfig
 				chain.Wallets = d.getWallets(deployment.L2Wallets)
 				chain.L1Wallets = d.getWallets(deployment.L1Wallets)
 			}

kurtosis-devnet/pkg/kurtosis/sources/deployer/deployer.go

@@ -13,6 +13,7 @@ import (
 	ktfs "github.com/ethereum-optimism/optimism/devnet-sdk/kt/fs"
 	"github.com/ethereum-optimism/optimism/devnet-sdk/types"
 	"github.com/ethereum-optimism/optimism/op-chain-ops/devkeys"
+	"github.com/ethereum-optimism/optimism/op-node/rollup"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/core"
@@ -28,6 +29,7 @@ const (
 	defaultGenesisArtifactName  = "el_cl_genesis_data"
 	defaultMnemonicName         = "mnemonics.yaml"
 	defaultGenesisNameTemplate  = "genesis-{{.ChainID}}.json"
+	defaultRollupNameTemplate   = "rollup-{{.ChainID}}.json"
 	defaultL1GenesisName        = "genesis.json"
 )
 
@@ -38,11 +40,12 @@ type DeploymentAddresses map[string]types.Address
 type DeploymentStateAddresses map[string]DeploymentAddresses
 
 type DeploymentState struct {
-	L1Addresses DeploymentAddresses `json:"l1_addresses"`
-	L2Addresses DeploymentAddresses `json:"l2_addresses"`
-	L1Wallets   WalletList          `json:"l1_wallets"`
-	L2Wallets   WalletList          `json:"l2_wallets"`
-	Config      *params.ChainConfig `json:"chain_config"`
+	L1Addresses  DeploymentAddresses `json:"l1_addresses"`
+	L2Addresses  DeploymentAddresses `json:"l2_addresses"`
+	L1Wallets    WalletList          `json:"l1_wallets"`
+	L2Wallets    WalletList          `json:"l2_wallets"`
+	Config       *params.ChainConfig `json:"chain_config"`
+	RollupConfig *rollup.Config      `json:"rollup_config"`
 }
 
 type DeployerState struct {
@@ -83,6 +86,7 @@ type Deployer struct {
 	genesisArtifactName     string
 	l1ValidatorMnemonicName string
 	l2GenesisNameTemplate   string
+	l2RollupNameTemplate    string
 	l1GenesisName           string
 }
 
@@ -124,6 +128,12 @@ func WithGenesisNameTemplate(name string) DeployerOption {
 	}
 }
 
+func WithRollupNameTemplate(name string) DeployerOption {
+	return func(d *Deployer) {
+		d.l2RollupNameTemplate = name
+	}
+}
+
 func NewDeployer(enclave string, opts ...DeployerOption) *Deployer {
 	d := &Deployer{
 		enclave:                 enclave,
@@ -133,6 +143,7 @@ func NewDeployer(enclave string, opts ...DeployerOption) *Deployer {
 		genesisArtifactName:     defaultGenesisArtifactName,
 		l1ValidatorMnemonicName: defaultMnemonicName,
 		l2GenesisNameTemplate:   defaultGenesisNameTemplate,
+		l2RollupNameTemplate:    defaultRollupNameTemplate,
 		l1GenesisName:           defaultL1GenesisName,
 	}
 
@@ -354,6 +365,29 @@ func (d *Deployer) ExtractData(ctx context.Context) (*DeployerData, error) {
 
 		// Store the genesis data in the deployment state
 		deployment.Config = genesis.Config
+
+		rollupBuffer := bytes.NewBuffer(nil)
+		rollupName, err := d.renderRollupNameTemplate(id)
+		if err != nil {
+			return nil, err
+		}
+
+		if err := deployerArtifact.ExtractFiles(
+			ktfs.NewArtifactFileWriter(rollupName, rollupBuffer),
+		); err != nil {
+			return nil, err
+		}
+
+		// Parse the genesis file JSON into a core.Genesis struct
+		var rollupCfg rollup.Config
+		if err := json.NewDecoder(rollupBuffer).Decode(&rollupCfg); err != nil {
+			return nil, fmt.Errorf("failed to parse rollup file %s in artifact %s for chain ID %s: %w", rollupName, d.deployerArtifactName, id, err)
+		}
+
+		// Store the data in the deployment state
+		deployment.Config = genesis.Config
+		deployment.RollupConfig = &rollupCfg
+
 		state.Deployments[id] = deployment
 	}
 
@@ -381,15 +415,23 @@ func (d *Deployer) ExtractData(ctx context.Context) (*DeployerData, error) {
 }
 
 func (d *Deployer) renderGenesisNameTemplate(chainID string) (string, error) {
-	tmpl, err := template.New("genesis").Parse(d.l2GenesisNameTemplate)
+	return d.renderNameTemplate(d.l2GenesisNameTemplate, chainID)
+}
+
+func (d *Deployer) renderRollupNameTemplate(chainID string) (string, error) {
+	return d.renderNameTemplate(d.l2RollupNameTemplate, chainID)
+}
+
+func (d *Deployer) renderNameTemplate(t, chainID string) (string, error) {
+	tmpl, err := template.New("").Parse(t)
 	if err != nil {
-		return "", fmt.Errorf("failed to compile genesis name template %s: %w", d.l2GenesisNameTemplate, err)
+		return "", fmt.Errorf("failed to compile name template %s: %w", t, err)
 	}
 
 	var buf bytes.Buffer
 	err = tmpl.Execute(&buf, map[string]string{"ChainID": chainID})
 	if err != nil {
-		return "", fmt.Errorf("failed to execute name template %s: %w", d.l2GenesisNameTemplate, err)
+		return "", fmt.Errorf("failed to execute name template %s: %w", t, err)
 	}
 
 	return buf.String(), nil

op-devstack/sysext/l2.go

@@ -10,7 +10,6 @@ import (
 	"github.com/ethereum-optimism/optimism/op-devstack/shim"
 	"github.com/ethereum-optimism/optimism/op-devstack/stack"
 	"github.com/ethereum-optimism/optimism/op-devstack/stack/match"
-	"github.com/ethereum-optimism/optimism/op-node/rollup"
 	"github.com/ethereum-optimism/optimism/op-service/eth"
 )
 
@@ -32,16 +31,12 @@ func (o *Orchestrator) hydrateL2(net *descriptors.L2Chain, system stack.Extensib
 			CommonConfig: commonConfig,
 			ChainConfig:  net.Config,
 		},
-		ID: l2ID,
-		RollupConfig: &rollup.Config{
-			L1ChainID: l1.ChainID().ToBig(),
-			L2ChainID: l2ID.ChainID().ToBig(),
-			// TODO this rollup config should be loaded from kurtosis artifacts
-		},
-		Deployment: newL2AddressBook(t, net.L1Addresses),
-		Keys:       o.defineSystemKeys(t),
-		Superchain: system.Superchain(stack.SuperchainID(env.Env.Name)),
-		L1:         l1,
+		ID:           l2ID,
+		RollupConfig: net.RollupConfig,
+		Deployment:   newL2AddressBook(t, net.L1Addresses),
+		Keys:         o.defineSystemKeys(t),
+		Superchain:   system.Superchain(stack.SuperchainID(env.Env.Name)),
+		L1:           l1,
 	}
 	if o.isInterop() {
 		cfg.Cluster = system.Cluster(stack.ClusterID(env.Env.Name))