Support differing container names in profiles

Author: QuentinI

espresso/devnet-tests/batcher_restart_test.go

@@ -35,7 +35,7 @@ func testRestart(t *testing.T, tee bool) {
 	require.NoError(t, d.RunSimpleL2Burn())
 
 	// Shut down the batcher and have another transaction submitted while it is down.
-	require.NoError(t, d.ServiceDown("op-batcher"))
+	require.NoError(t, d.ServiceDown(ServiceBatcher))
 	d.SleepOutageDuration()
 
 	receipt, err := d.SubmitSimpleL2Burn()
@@ -48,7 +48,7 @@ func testRestart(t *testing.T, tee bool) {
 
 	// Bring the batcher back up and check that it processes the transaction which was submitted
 	// while it was down.
-	require.NoError(t, d.ServiceUp("op-batcher"))
+	require.NoError(t, d.ServiceUp(ServiceBatcher))
 	require.NoError(t, d.VerifySimpleL2Burn(receipt))
 
 	// Submit another transaction at the end just to check that things stay working.

espresso/devnet-tests/devnet_tools.go

@@ -32,6 +32,82 @@ import (
 	"github.com/ethereum-optimism/optimism/op-e2e/config/secrets"
 )
 
+type Service uint64
+
+const (
+	ServiceBatcher Service = iota
+	ServiceCaffNode
+	ServiceCaffNodeGeth
+	ServiceChallenger
+	ServiceDevNode
+	ServiceHTTPProxy
+	ServiceL1Beacon
+	ServiceL1DataInit
+	ServiceL1Genesis
+	ServiceL1Geth
+	ServiceL1Validator
+	ServiceL2Genesis
+	ServiceL2Rollup
+	ServiceL2Seq
+	ServiceL2SeqGeth
+	ServiceL2Verif
+	ServiceL2VerifGeth
+	ServiceProposer
+)
+
+const (
+	ProfileDefault = "default"
+	ProfileTee     = "tee"
+)
+
+type Profile struct {
+	BatcherService  string
+	ProposerService string
+}
+
+// modifyDefaultProfile creates a new profile based on the default profile with specified modifications
+func modifyDefaultProfile(modifications map[Service]string) map[Service]string {
+	result := make(map[Service]string)
+	// Copy all services from default profile
+	for service, container := range defaultProfile {
+		result[service] = container
+	}
+	// Apply modifications
+	for service, container := range modifications {
+		result[service] = container
+	}
+	return result
+}
+
+var defaultProfile = map[Service]string{
+	ServiceBatcher:      "op-batcher",
+	ServiceCaffNode:     "caff-node",
+	ServiceCaffNodeGeth: "op-geth-caff-node",
+	ServiceChallenger:   "op-challenger",
+	ServiceDevNode:      "espresso-dev-node",
+	ServiceHTTPProxy:    "http-proxy",
+	ServiceL1Beacon:     "l1-beacon",
+	ServiceL1DataInit:   "l1-data-init",
+	ServiceL1Genesis:    "l1-genesis",
+	ServiceL1Geth:       "l1-geth",
+	ServiceL1Validator:  "l1-validator",
+	ServiceL2Genesis:    "l2-genesis",
+	ServiceL2Rollup:     "l2-rollup",
+	ServiceL2Seq:        "op-node-sequencer",
+	ServiceL2SeqGeth:    "op-geth-sequencer",
+	ServiceL2Verif:      "op-node-verifier",
+	ServiceL2VerifGeth:  "op-geth-verifier",
+	ServiceProposer:     "op-proposer",
+}
+
+var Profiles = map[string]map[Service]string{
+	ProfileDefault: defaultProfile,
+	ProfileTee: modifyDefaultProfile(map[Service]string{
+		ServiceBatcher:  "op-batcher-tee",
+		ServiceProposer: "op-proposer-tee",
+	}),
+}
+
 type Devnet struct {
 	ctx           context.Context
 	tee           bool
@@ -98,6 +174,27 @@ func (d *Devnet) isRunning() bool {
 	return len(out) > 0
 }
 
+// getProfile returns the current profile name based on devnet configuration
+func (d *Devnet) getProfile() string {
+	if d.tee {
+		return ProfileTee
+	}
+	return ProfileDefault
+}
+
+// getServiceName returns the container name for a given service in the current profile
+func (d *Devnet) getServiceName(service Service) string {
+	profile := d.getProfile()
+	if container, ok := Profiles[profile][service]; ok {
+		return container
+	}
+	// Fall back to default profile if service not found
+	if container, ok := Profiles[ProfileDefault][service]; ok {
+		return container
+	}
+	return ""
+}
+
 func (d *Devnet) Up() (err error) {
 	if d.isRunning() {
 		if err := d.Down(); err != nil {
@@ -107,12 +204,9 @@ func (d *Devnet) Up() (err error) {
 		// up any existing state.
 		return fmt.Errorf("devnet is already running, this should be a clean state; please shut it down first")
 	}
-	var profile string
-	if d.tee {
-		profile = "tee"
-	} else {
-		profile = "default"
-	}
+
+	profile := d.getProfile()
+
 	cmd := exec.CommandContext(
 		d.ctx,
 		"docker", "compose", "--profile", profile, "up", "-d",
@@ -150,7 +244,7 @@ func (d *Devnet) Up() (err error) {
 		// Stream logs to stdout while the test runs. This goroutine will automatically exit when
 		// the context is cancelled.
 		go func() {
-			cmd = exec.CommandContext(d.ctx, "docker", "compose", "logs", "-f")
+			cmd = exec.CommandContext(d.ctx, "docker", "compose", "--profile", profile, "logs", "-f")
 			cmd.Stdout = os.Stdout
 			// We don't care about the error return of this command, since it's always going to be
 			// killed by the context cancellation.
@@ -159,50 +253,52 @@ func (d *Devnet) Up() (err error) {
 	}
 
 	// Open RPC clients for the different nodes.
-	d.L2Seq, err = d.serviceClient("op-geth-sequencer", 8546)
+	d.L2Seq, err = d.serviceClient(d.getServiceName(ServiceL2SeqGeth), 8546)
 	if err != nil {
 		return err
 	}
-	d.L2SeqRollup, err = d.rollupClient("op-node-sequencer", 9545)
+	d.L2SeqRollup, err = d.rollupClient(d.getServiceName(ServiceL2Seq), 9545)
 	if err != nil {
 		return err
 	}
-	d.L2Verif, err = d.serviceClient("op-geth-verifier", 8546)
+	d.L2Verif, err = d.serviceClient(d.getServiceName(ServiceL2VerifGeth), 8546)
 	if err != nil {
 		return err
 	}
-	d.L2VerifRollup, err = d.rollupClient("op-node-verifier", 9546)
+	d.L2VerifRollup, err = d.rollupClient(d.getServiceName(ServiceL2Verif), 9546)
 	if err != nil {
 		return err
 	}
 
-	d.L1, err = d.serviceClient("l1-geth", 8545)
+	d.L1, err = d.serviceClient(d.getServiceName(ServiceL1Geth), 8545)
 	if err != nil {
 		return err
 	}
 
 	return nil
 }
 
-func (d *Devnet) ServiceUp(service string) error {
-	log.Info("bringing up service", "service", service)
+func (d *Devnet) ServiceUp(service Service) error {
+	serviceName := d.getServiceName(service)
+	log.Info("bringing up service", "service", serviceName)
 	cmd := exec.CommandContext(
 		d.ctx,
-		"docker", "compose", "up", "-d", service,
+		"docker", "compose", "--profile", d.getProfile(), "up", "-d", serviceName,
 	)
 	return cmd.Run()
 }
 
-func (d *Devnet) ServiceDown(service string) error {
-	log.Info("shutting down service", "service", service)
+func (d *Devnet) ServiceDown(service Service) error {
+	serviceName := d.getServiceName(service)
+	log.Info("shutting down service", "service", serviceName)
 	cmd := exec.CommandContext(
 		d.ctx,
-		"docker", "compose", "down", service,
+		"docker", "compose", "--profile", d.getProfile(), "down", serviceName,
 	)
 	return cmd.Run()
 }
 
-func (d *Devnet) ServiceRestart(service string) error {
+func (d *Devnet) ServiceRestart(service Service) error {
 	if err := d.ServiceDown(service); err != nil {
 		return err
 	}
@@ -428,7 +524,7 @@ func (d *Devnet) Down() error {
 	// Use timeout flag for faster Docker shutdown
 	cmd := exec.CommandContext(
 		d.ctx,
-		"docker", "compose", "down", "-v", "--remove-orphans", "--timeout", "10",
+		"docker", "compose", "--profile", d.getProfile(), "down", "-v", "--remove-orphans", "--timeout", "10",
 	)
 	return cmd.Run()
 }
@@ -574,7 +670,8 @@ func (d *Devnet) OpChallengerOutput(opts ...string) (string, error) {
 }
 
 func (d *Devnet) opChallengerCmd(opts ...string) *exec.Cmd {
-	opts = append([]string{"compose", "exec", "op-challenger", "entrypoint.sh", "op-challenger"}, opts...)
+	serviceName := d.getServiceName(ServiceChallenger)
+	opts = append([]string{"compose", "--profile", d.getProfile(), "exec", serviceName, "entrypoint.sh", "op-challenger"}, opts...)
 	cmd := exec.CommandContext(
 		d.ctx,
 		"docker",
@@ -594,7 +691,7 @@ func (d *Devnet) hostPort(service string, privatePort uint16) (uint16, error) {
 	errBuf := new(bytes.Buffer)
 	cmd := exec.CommandContext(
 		d.ctx,
-		"docker", "compose", "port", service, fmt.Sprint(privatePort),
+		"docker", "compose", "--profile", d.getProfile(), "port", service, fmt.Sprint(privatePort),
 	)
 	cmd.Stdout = buf
 	cmd.Stderr = errBuf