Update teku_bn.sh

clients/teku-bn/teku_bn.sh

@@ -76,4 +76,6 @@ echo Starting Teku Beacon Node
     --data-storage-mode=ARCHIVE \
     --Xstartup-target-peer-count=0 \
     --p2p-subscribe-all-subnets-enabled \
-    --Xtrusted-setup="$trusted_setup_path"
+    --Xtrusted-setup="$trusted_setup_path" \
+    --Xpeer-rate-limit=100000 \
+    --Xpeer-request-limit=1000

configs/cancun.yaml

@@ -39,6 +39,17 @@
     github: paradigmxyz/reth
     tag: main
 
+- client: teku-bn
+  nametag: evil
+  build_args:
+      baseimage: ethpandaops/teku
+      tag: evil-blobs-fb6275a
+- client: teku-vc
+  nametag: evil
+  build_args:
+      baseimage: ethpandaops/teku
+      tag: evil-blobs-fb6275a
+
 - client: teku-bn
 - client: teku-vc
 

go.mod

@@ -22,7 +22,7 @@ require (
 	github.com/VictoriaMetrics/fastcache v1.12.0 // indirect
 	github.com/allegro/bigcache v1.2.1 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/bits-and-blooms/bitset v1.5.0 // indirect
+	github.com/bits-and-blooms/bitset v1.7.0 // indirect
 	github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/cockroachdb/errors v1.9.1 // indirect

go.sum

@@ -23,8 +23,8 @@ github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5
 github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
 github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
-github.com/bits-and-blooms/bitset v1.5.0 h1:NpE8frKRLGHIcEzkR+gZhiioW1+WbYV6fKwD6ZIpQT8=
-github.com/bits-and-blooms/bitset v1.5.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA=
+github.com/bits-and-blooms/bitset v1.7.0 h1:YjAGVd3XmtK9ktAbX8Zg2g2PwLIMjGREZJHlV4j7NEo=
+github.com/bits-and-blooms/bitset v1.7.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA=
 github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U=
 github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04=
 github.com/btcsuite/btcd/chaincfg/chainhash v1.0.1 h1:q0rUy8C/TYNBQS1+CGKw68tLOFYSNEs0TFnxxnS9+4U=

hivesim/hive_test.go

@@ -400,9 +400,9 @@ func TestStartClientInitialNetworks(t *testing.T) {
 }
 
 func newFakeAPI(hooks *fakes.BackendHooks) (*libhive.TestManager, *httptest.Server) {
-	defs := map[string]*libhive.ClientDefinition{
-		"client-1": {Name: "client-1", Image: "/ignored/in/api", Version: "client-1-version", Meta: libhive.ClientMetadata{Roles: []string{"eth1"}}},
-		"client-2": {Name: "client-2", Image: "/not/exposed/", Version: "client-2-version", Meta: libhive.ClientMetadata{Roles: []string{"beacon"}}},
+	defs := []*libhive.ClientDefinition{
+		{Name: "client-1", Image: "/ignored/in/api", Version: "client-1-version", Meta: libhive.ClientMetadata{Roles: []string{"eth1"}}},
+		{Name: "client-2", Image: "/not/exposed/", Version: "client-2-version", Meta: libhive.ClientMetadata{Roles: []string{"beacon"}}},
 	}
 	env := libhive.SimEnv{}
 	backend := fakes.NewContainerBackend(hooks)

internal/libhive/api.go

@@ -10,7 +10,6 @@ import (
 	"net/http"
 	"path"
 	"path/filepath"
-	"sort"
 	"strconv"
 	"strings"
 	"time"
@@ -61,14 +60,7 @@ type simAPI struct {
 
 // getClientTypes returns all known client types.
 func (api *simAPI) getClientTypes(w http.ResponseWriter, r *http.Request) {
-	clients := make([]*ClientDefinition, 0, len(api.tm.clientDefs))
-	for _, def := range api.tm.clientDefs {
-		clients = append(clients, def)
-	}
-	sort.Slice(clients, func(i, j int) bool {
-		return clients[i].Name < clients[j].Name
-	})
-	serveJSON(w, clients)
+	serveJSON(w, api.tm.clientDefs)
 }
 
 // startSuite starts a suite.
@@ -332,11 +324,12 @@ func (api *simAPI) checkClient(req *simapi.NodeConfig) (*ClientDefinition, error
 	if req.Client == "" {
 		return nil, errors.New("missing client type in start request")
 	}
-	def, ok := api.tm.clientDefs[req.Client]
-	if !ok {
-		return nil, errors.New("unknown client type in start request")
+	for _, client := range api.tm.clientDefs {
+		if client.Name == req.Client {
+			return client, nil
+		}
 	}
-	return def, nil
+	return nil, errors.New("unknown client type in start request")
 }
 
 // checkClientNetworks pre-checks the existence of initial networks for a client container.

internal/libhive/run.go

@@ -30,7 +30,7 @@ type Runner struct {
 
 	// This holds the image names of all built simulators.
 	simImages  map[string]string
-	clientDefs map[string]*ClientDefinition
+	clientDefs []*ClientDefinition
 }
 
 func NewRunner(inv Inventory, b Builder, cb ContainerBackend) *Runner {
@@ -58,11 +58,11 @@ func (r *Runner) buildClients(ctx context.Context, clientList []ClientDesignator
 		return errors.New("client list is empty, cannot simulate")
 	}
 
-	r.clientDefs = make(map[string]*ClientDefinition, len(clientList))
+	r.clientDefs = make([]*ClientDefinition, len(clientList))
 
 	var anyBuilt bool
 	log15.Info(fmt.Sprintf("building %d clients...", len(clientList)))
-	for _, client := range clientList {
+	for i, client := range clientList {
 		image, err := r.builder.BuildClientImage(ctx, client)
 		if err != nil {
 			continue
@@ -72,7 +72,7 @@ func (r *Runner) buildClients(ctx context.Context, clientList []ClientDesignator
 		if err != nil {
 			log15.Warn("can't read version info of "+client.Client, "image", image, "err", err)
 		}
-		r.clientDefs[client.Name()] = &ClientDefinition{
+		r.clientDefs[i] = &ClientDefinition{
 			Name:    client.Name(),
 			Version: strings.TrimSpace(string(version)),
 			Image:   image,
@@ -117,8 +117,11 @@ func (r *Runner) RunDevMode(ctx context.Context, env SimEnv, endpoint string) er
 	if err := createWorkspace(env.LogDir); err != nil {
 		return err
 	}
-
-	tm := NewTestManager(env, r.container, r.clientDefs)
+	clientDefs := make([]*ClientDefinition, 0)
+	for _, def := range r.clientDefs {
+		clientDefs = append(clientDefs, def)
+	}
+	tm := NewTestManager(env, r.container, clientDefs)
 	defer func() {
 		if err := tm.Terminate(); err != nil {
 			log15.Error("could not terminate test manager", "error", err)
@@ -159,19 +162,23 @@ HIVE_SIMULATOR=http://%v
 func (r *Runner) run(ctx context.Context, sim string, env SimEnv) (SimResult, error) {
 	log15.Info(fmt.Sprintf("running simulation: %s", sim))
 
-	clientDefs := make(map[string]*ClientDefinition)
+	clientDefs := make([]*ClientDefinition, 0)
 	if env.ClientList == nil {
 		// Unspecified, make all clients available.
-		for name, def := range r.clientDefs {
-			clientDefs[name] = def
-		}
+		clientDefs = append(clientDefs, r.clientDefs...)
 	} else {
 		for _, client := range env.ClientList {
-			def, ok := r.clientDefs[client.Client]
-			if !ok {
+			found := false
+			for _, def := range r.clientDefs {
+				if def.Name == client.Client {
+					clientDefs = append(clientDefs, def)
+					found = true
+					break
+				}
+			}
+			if !found {
 				return SimResult{}, fmt.Errorf("unknown client %q in simulation client list", client.Client)
 			}
-			clientDefs[client.Client] = def
 		}
 	}
 

internal/libhive/testmanager.go

@@ -61,7 +61,7 @@ type SimResult struct {
 type TestManager struct {
 	config     SimEnv
 	backend    ContainerBackend
-	clientDefs map[string]*ClientDefinition
+	clientDefs []*ClientDefinition
 
 	simContainerID string
 	simLogFile     string
@@ -80,7 +80,7 @@ type TestManager struct {
 	results           map[TestSuiteID]*TestSuite
 }
 
-func NewTestManager(config SimEnv, b ContainerBackend, clients map[string]*ClientDefinition) *TestManager {
+func NewTestManager(config SimEnv, b ContainerBackend, clients []*ClientDefinition) *TestManager {
 	return &TestManager{
 		clientDefs:        clients,
 		config:            config,

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