simulators/eth2/dencun: Dencun Interop Simulator and Builder Tests

configs/cancun.yaml

@@ -37,7 +37,15 @@
     tag: main
 
 - client: teku-bn
+  nametag: deneb
+  build_args:
+      baseimage: ethpandaops/teku
+      tag: master
 - client: teku-vc
+  nametag: deneb
+  build_args:
+      baseimage: ethpandaops/teku
+      tag: master
 
 - client: prysm-bn
   nametag: deneb
@@ -53,24 +61,24 @@
 - client: lighthouse-bn
   nametag: deneb
   build_args:
-      baseimage: sigp/lighthouse
-      tag: deneb-modern
+      baseimage: ethpandaops/lighthouse
+      tag: unstable-linux-amd64
 - client: lighthouse-vc
   nametag: deneb
   build_args:
-      baseimage: sigp/lighthouse
-      tag: deneb-modern
+      baseimage: ethpandaops/lighthouse
+      tag: unstable-linux-amd64
 
 - client: lodestar-bn
   nametag: deneb
   build_args:
       baseimage: ethpandaops/lodestar
-      tag: deneb-builder
+      tag: unstable-linux-amd64
 - client: lodestar-vc
   nametag: deneb
   build_args:
       baseimage: ethpandaops/lodestar
-      tag: deneb-builder
+      tag: unstable-linux-amd64
 
 - client: nimbus-bn
 - client: nimbus-vc

simulators/eth2/common/clients/hive.go

@@ -16,6 +16,7 @@ type HiveManagedClient struct {
 	T                    *hivesim.T
 	OptionsGenerator     HiveOptionsGenerator
 	HiveClientDefinition *hivesim.ClientDefinition
+	Port                 int64
 
 	hiveClient        *hivesim.Client
 	extraStartOptions []hivesim.StartOption
@@ -63,13 +64,30 @@ func (h *HiveManagedClient) AddStartOption(opts ...interface{}) {
 	}
 }
 
+func (h *HiveManagedClient) GetAddress() string {
+	if h.hiveClient == nil {
+		return ""
+	}
+	if h.Port > 0 {
+		return fmt.Sprintf("http://%s:%d", h.hiveClient.IP, h.Port)
+	}
+	return fmt.Sprintf("http://%s", h.hiveClient.IP)
+}
+
 func (h *HiveManagedClient) GetIP() net.IP {
 	if h.hiveClient == nil {
 		return net.IP{}
 	}
 	return h.hiveClient.IP
 }
 
+func (h *HiveManagedClient) GetHost() string {
+	if h.hiveClient == nil {
+		return ""
+	}
+	return h.hiveClient.IP.String()
+}
+
 func (h *HiveManagedClient) Shutdown() error {
 	if err := h.T.Sim.StopClient(h.T.SuiteID, h.T.TestID, h.hiveClient.Container); err != nil {
 		return err

simulators/eth2/common/config/config.go

@@ -3,8 +3,62 @@ package config
 import (
 	"bytes"
 	"io"
+	"math/big"
 )
 
+type ForkConfig struct {
+	TerminalTotalDifficulty *big.Int `json:"terminal_total_difficulty,omitempty"`
+	AltairForkEpoch         *big.Int `json:"altair_fork_epoch,omitempty"`
+	BellatrixForkEpoch      *big.Int `json:"bellatrix_fork_epoch,omitempty"`
+	CapellaForkEpoch        *big.Int `json:"capella_fork_epoch,omitempty"`
+	DenebForkEpoch          *big.Int `json:"deneb_fork_epoch,omitempty"`
+}
+
+// Choose a configuration value. `b` takes precedence
+func choose(a, b *big.Int) *big.Int {
+	if b != nil {
+		return new(big.Int).Set(b)
+	}
+	if a != nil {
+		return new(big.Int).Set(a)
+	}
+	return nil
+}
+
+// Join two configurations. `b` takes precedence
+func (a *ForkConfig) Join(b *ForkConfig) *ForkConfig {
+	if b == nil {
+		return a
+	}
+	if a == nil {
+		return b
+	}
+	c := ForkConfig{}
+	c.AltairForkEpoch = choose(a.AltairForkEpoch, b.AltairForkEpoch)
+	c.BellatrixForkEpoch = choose(a.BellatrixForkEpoch, b.BellatrixForkEpoch)
+	c.CapellaForkEpoch = choose(a.CapellaForkEpoch, b.CapellaForkEpoch)
+	c.DenebForkEpoch = choose(a.DenebForkEpoch, b.DenebForkEpoch)
+	c.TerminalTotalDifficulty = choose(
+		a.TerminalTotalDifficulty,
+		b.TerminalTotalDifficulty,
+	)
+	return &c
+}
+
+func (c *ForkConfig) GenesisBeaconFork() string {
+	if c.DenebForkEpoch != nil && c.DenebForkEpoch.Uint64() == 0 {
+		return "deneb"
+	} else if c.CapellaForkEpoch != nil && c.CapellaForkEpoch.Uint64() == 0 {
+		return "capella"
+	} else if c.BellatrixForkEpoch != nil && c.BellatrixForkEpoch.Uint64() == 0 {
+		return "bellatrix"
+	} else if c.AltairForkEpoch != nil && c.AltairForkEpoch.Uint64() == 0 {
+		return "altair"
+	} else {
+		return "phase0"
+	}
+}
+
 func BytesSource(data []byte) func() (io.ReadCloser, error) {
 	return func() (io.ReadCloser, error) {
 		return io.NopCloser(bytes.NewReader(data)), nil