Merge pull request #87 from crytic/main

merge
crytic · Mar 18, 2024 · f80eba2 · f80eba2
2 parents c02318e + 3ea4eed
commit f80eba2
Show file tree

Hide file tree

Showing 28 changed files with 2,263 additions and 194 deletions.
diff --git a/README.md b/README.md
@@ -72,7 +72,7 @@ When making pull requests, **please target the `develop` branch, not main.**
 
 ## Changelog
 
-**March 18, 2024 version v0.4**
+**March 18, 2024 version v1.0.0**
 
 First public release!
 

diff --git a/docs/DOCUMENTATION.md b/docs/DOCUMENTATION.md
@@ -62,7 +62,7 @@ attacknetConfig:
   allowPostFaultInspection: true
   waitBeforeInjectionSeconds: 600 # we want to wait until all the nodes are synced and emitting attestations
   reuseDevnetBetweenRuns: true
-  existingDevnetNamespace: pre-existing-namespace
+  existingDevnetNamespace: non-existing-namespace # we use a new namespace to ensure that the chaos is applied to a fresh network
 
 harnessConfig:
   networkType: ethereum

diff --git a/go.mod b/go.mod
@@ -133,7 +133,7 @@ require (
 	google.golang.org/genproto/googleapis/api v0.0.0-20240108191215-35c7eff3a6b1 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1 // indirect
 	google.golang.org/grpc v1.60.1 // indirect
-	google.golang.org/protobuf v1.32.0 // indirect
+	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/cenkalti/backoff.v1 v1.1.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect

diff --git a/go.sum b/go.sum
@@ -464,8 +464,8 @@ google.golang.org/grpc v1.60.1 h1:26+wFr+cNqSGFcOXcabYC0lUVJVRa2Sb2ortSK7VrEU=
 google.golang.org/grpc v1.60.1/go.mod h1:OlCHIeLYqSSsLi6i49B5QGdzaMZK9+M7LXN2FKz4eGM=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
-google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
+google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
 gopkg.in/cenkalti/backoff.v1 v1.1.0 h1:Arh75ttbsvlpVA7WtVpH4u9h6Zl46xuptxqLxPiSo4Y=
 gopkg.in/cenkalti/backoff.v1 v1.1.0/go.mod h1:J6Vskwqd+OMVJl8C33mmtxTBs2gyzfv7UDAkHu8BrjI=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

diff --git a/network-configs/default.yaml b/network-configs/default.yaml
@@ -1,8 +1,8 @@
 participants:
   - el_type: geth
-    el_image: ethereum/client-go:latest
+    el_image: ethereum/client-go:v1.13.14
     cl_type: lighthouse
-    cl_image: sigp/lighthouse:latest
+    cl_image: sigp/lighthouse:v5.1.1
     el_min_cpu: 1000
     el_max_cpu: 1000
     el_min_mem: 1024
@@ -17,9 +17,9 @@ participants:
     vc_max_mem: 1028
     count: 1
   - el_type: geth
-    el_image: ethereum/client-go:latest
+    el_image: ethereum/client-go:v1.13.14
     cl_type: prysm
-    cl_image: prysmaticlabs/prysm-beacon-chain:latest
+    cl_image: gcr.io/prysmaticlabs/prysm/beacon-chain:v5.0.1
     el_min_cpu: 1000
     el_max_cpu: 1000
     el_min_mem: 1024

diff --git a/network-configs/devnet-12.yaml b/network-configs/devnet-12.yaml
@@ -1,11 +1,11 @@
 participants:
   - el_type: geth
-    el_image: ethereum/client-go:v1.13.13
+    el_image: ethereum/client-go:v1.13.14
     el_extra_labels: {"ethereum-package.partition": "partA"}
     cl_type: lighthouse
-    cl_image: sigp/lighthouse:v5.0.0
-    beacon_extra_labels: {"ethereum-package.partition": "partA"}
-    validator_extra_labels: {"ethereum-package.partition": "partA"}
+    cl_image: sigp/lighthouse:v5.1.1
+    cl_extra_labels: {"ethereum-package.partition": "partA"}
+    vc_extra_labels: {"ethereum-package.partition": "partA"}
     el_min_cpu: 1000
     el_max_cpu: 1000
     el_min_mem: 1024
@@ -23,9 +23,9 @@ participants:
     el_image: nethermind/nethermind:1.25.4
     el_extra_labels: {"ethereum-package.partition": "partA"}
     cl_type: teku
-    cl_image: consensys/teku:24.2.0-amd64
-    beacon_extra_labels: {"ethereum-package.partition": "partA"}
-    validator_extra_labels: {"ethereum-package.partition": "partA"}
+    cl_image: consensys/teku:24.3.0-amd64
+    cl_extra_labels: {"ethereum-package.partition": "partA"}
+    vc_extra_labels: {"ethereum-package.partition": "partA"}
     el_min_cpu: 1000
     el_max_cpu: 1000
     el_min_mem: 1024
@@ -40,12 +40,13 @@ participants:
     vc_max_mem: 1028
     count: 1
   - el_type: reth
-    el_image: ghcr.io/paradigmxyz/reth:v0.1.0-alpha.19
+    el_image: ghcr.io/paradigmxyz/reth:v0.2.0-beta.2
     el_extra_labels: {"ethereum-package.partition": "partB"}
     cl_type: prysm
-    cl_image: gcr.io/prysmaticlabs/prysm/beacon-chain:v5.0.0,gcr.io/prysmaticlabs/prysm/validator:v5.0.0
-    beacon_extra_labels: {"ethereum-package.partition": "partB"}
-    validator_extra_labels: {"ethereum-package.partition": "partB"}
+    cl_image: gcr.io/prysmaticlabs/prysm/beacon-chain:v5.0.1
+    vc_image: gcr.io/prysmaticlabs/prysm/validator:v5.0.1
+    cl_extra_labels: {"ethereum-package.partition": "partB"}
+    vc_extra_labels: {"ethereum-package.partition": "partB"}
     el_min_cpu: 1000
     el_max_cpu: 1000
     el_min_mem: 1024
@@ -68,4 +69,4 @@ additional_services:
   - tx_spammer
   - blob_spammer
 persistent: true
-global_client_log_level: info
+global_log_level: info
diff --git a/network-configs/plan/clock-skew-nethermind.yaml b/network-configs/plan/clock-skew-nethermind.yaml
@@ -0,0 +1,103 @@
+participants:
+    - el_client_type: nethermind
+      el_client_image: nethermind/nethermind:1.25.4
+      cl_type: lighthouse
+      cl_image: sigp/lighthouse:v5.1.1
+      el_min_cpu: 768
+      el_max_cpu: 768
+      el_min_mem: 1024
+      el_max_mem: 1024
+      cl_min_cpu: 1000
+      cl_max_cpu: 1000
+      cl_min_mem: 1536
+      cl_max_mem: 1536
+      vc_min_cpu: 500
+      vc_max_cpu: 500
+      vc_min_mem: 512
+      vc_max_mem: 512
+      count: 1
+    - el_client_type: nethermind
+      el_client_image: nethermind/nethermind:1.25.4
+      cl_type: lighthouse
+      cl_image: sigp/lighthouse:v5.1.1
+      el_min_cpu: 768
+      el_max_cpu: 768
+      el_min_mem: 1024
+      el_max_mem: 1024
+      cl_min_cpu: 1000
+      cl_max_cpu: 1000
+      cl_min_mem: 1536
+      cl_max_mem: 1536
+      vc_min_cpu: 500
+      vc_max_cpu: 500
+      vc_min_mem: 512
+      vc_max_mem: 512
+      count: 1
+    - el_client_type: nethermind
+      el_client_image: nethermind/nethermind:1.25.4
+      cl_type: prysm
+      cl_image: gcr.io/prysmaticlabs/prysm/beacon-chain:v5.0.1,gcr.io/prysmaticlabs/prysm/validator:v5.0.1
+      el_min_cpu: 768
+      el_max_cpu: 768
+      el_min_mem: 1024
+      el_max_mem: 1024
+      cl_min_cpu: 1000
+      cl_max_cpu: 1000
+      cl_min_mem: 1536
+      cl_max_mem: 1536
+      vc_min_cpu: 500
+      vc_max_cpu: 500
+      vc_min_mem: 512
+      vc_max_mem: 512
+      count: 1
+    - el_client_type: nethermind
+      el_client_image: nethermind/nethermind:1.25.4
+      cl_type: teku
+      cl_image: consensys/teku:24.3.0-amd64
+      el_min_cpu: 768
+      el_max_cpu: 768
+      el_min_mem: 1024
+      el_max_mem: 1024
+      cl_min_cpu: 1000
+      cl_max_cpu: 1000
+      cl_min_mem: 1536
+      cl_max_mem: 1536
+      count: 1
+    - el_client_type: nethermind
+      el_client_image: nethermind/nethermind:1.25.4
+      cl_type: lodestar
+      cl_image: chainsafe/lodestar:v1.17.0
+      el_min_cpu: 768
+      el_max_cpu: 768
+      el_min_mem: 1024
+      el_max_mem: 1024
+      cl_min_cpu: 1000
+      cl_max_cpu: 1000
+      cl_min_mem: 1536
+      cl_max_mem: 1536
+      vc_min_cpu: 500
+      vc_max_cpu: 500
+      vc_min_mem: 512
+      vc_max_mem: 512
+      count: 1
+    - el_client_type: nethermind
+      el_client_image: nethermind/nethermind:1.25.4
+      cl_type: nimbus
+      cl_image: statusim/nimbus-eth2:multiarch-v24.2.2
+      el_min_cpu: 768
+      el_max_cpu: 768
+      el_min_mem: 1024
+      el_max_mem: 1024
+      cl_min_cpu: 1000
+      cl_max_cpu: 1000
+      cl_min_mem: 1536
+      cl_max_mem: 1536
+      count: 1
+network_params:
+    num_validator_keys_per_node: 32
+additional_services:
+    - prometheus_grafana
+    - dora
+parallel_keystore_generation: false
+persistent: false
+disable_peer_scoring: true
diff --git a/network-configs/plan/network-latency-reth.yaml b/network-configs/plan/network-latency-reth.yaml
@@ -1,8 +1,8 @@
 participants:
     - el_type: geth
-      el_image: ethereum/client-go:v1.13.11
+      el_image: ethereum/client-go:v1.13.14
       cl_type: prysm
-      cl_image: gcr.io/prysmaticlabs/prysm/beacon-chain:v4.2.1
+      cl_image: gcr.io/prysmaticlabs/prysm/beacon-chain:v5.0.1
       el_min_cpu: 768
       el_max_cpu: 768
       el_min_mem: 1024
@@ -17,9 +17,9 @@ participants:
       vc_max_mem: 512
       count: 1
     - el_type: reth
-      el_image: parithoshj/reth:main-1a8440a-debug
+      el_image: ghcr.io/paradigmxyz/reth:v0.2.0-beta.2
       cl_type: lighthouse
-      cl_image: sigp/lighthouse:v4.6.0
+      cl_image: sigp/lighthouse:v5.1.1
       el_min_cpu: 768
       el_max_cpu: 768
       el_min_mem: 1024
@@ -34,9 +34,9 @@ participants:
       vc_max_mem: 512
       count: 1
     - el_type: reth
-      el_image: parithoshj/reth:main-1a8440a-debug
+      el_image: ghcr.io/paradigmxyz/reth:v0.2.0-beta.2
       cl_type: prysm
-      cl_image: gcr.io/prysmaticlabs/prysm/beacon-chain:v4.2.1
+      cl_image: gcr.io/prysmaticlabs/prysm/beacon-chain:v5.0.1
       el_min_cpu: 768
       el_max_cpu: 768
       el_min_mem: 1024
@@ -51,9 +51,9 @@ participants:
       vc_max_mem: 512
       count: 1
     - el_type: reth
-      el_image: parithoshj/reth:main-1a8440a-debug
+      el_image: ghcr.io/paradigmxyz/reth:v0.2.0-beta.2
       cl_type: teku
-      cl_image: consensys/teku:24.1.1-amd64
+      cl_image: consensys/teku:24.3.0-amd64
       el_min_cpu: 768
       el_max_cpu: 768
       el_min_mem: 1024
@@ -64,9 +64,9 @@ participants:
       cl_max_mem: 1536
       count: 1
     - el_type: reth
-      el_image: parithoshj/reth:main-1a8440a-debug
+      el_image: ghcr.io/paradigmxyz/reth:v0.2.0-beta.2
       cl_type: lodestar
-      cl_image: chainsafe/lodestar:v1.15.0
+      cl_image: chainsafe/lodestar:v1.17.0
       el_min_cpu: 768
       el_max_cpu: 768
       el_min_mem: 1024
@@ -81,9 +81,9 @@ participants:
       vc_max_mem: 512
       count: 1
     - el_type: reth
-      el_image: parithoshj/reth:main-1a8440a-debug
+      el_image: ghcr.io/paradigmxyz/reth:v0.2.0-beta.2
       cl_type: nimbus
-      cl_image: ethpandaops/nimbus:unstable
+      cl_image: statusim/nimbus-eth2:multiarch-v24.2.2
       el_min_cpu: 768
       el_max_cpu: 768
       el_min_mem: 1024
@@ -94,9 +94,9 @@ participants:
       cl_max_mem: 1536
       count: 1
     - el_type: geth
-      el_image: ethereum/client-go:v1.13.11
+      el_image: ethereum/client-go:v1.13.14
       cl_type: lighthouse
-      cl_image: sigp/lighthouse:v4.6.0
+      cl_image: sigp/lighthouse:v5.1.1
       el_min_cpu: 768
       el_max_cpu: 768
       el_min_mem: 1024
@@ -111,9 +111,9 @@ participants:
       vc_max_mem: 512
       count: 1
     - el_type: geth
-      el_image: ethereum/client-go:v1.13.11
+      el_image: ethereum/client-go:v1.13.14
       cl_type: prysm
-      cl_image: gcr.io/prysmaticlabs/prysm/beacon-chain:v4.2.1
+      cl_image: gcr.io/prysmaticlabs/prysm/beacon-chain:v5.0.1
       el_min_cpu: 768
       el_max_cpu: 768
       el_min_mem: 1024
@@ -128,9 +128,9 @@ participants:
       vc_max_mem: 512
       count: 1
     - el_type: geth
-      el_image: ethereum/client-go:v1.13.11
+      el_image: ethereum/client-go:v1.13.14
       cl_type: teku
-      cl_image: consensys/teku:24.1.1-amd64
+      cl_image: consensys/teku:24.3.0-amd64
       el_min_cpu: 768
       el_max_cpu: 768
       el_min_mem: 1024
@@ -141,9 +141,9 @@ participants:
       cl_max_mem: 1536
       count: 1
     - el_type: geth
-      el_image: ethereum/client-go:v1.13.11
+      el_image: ethereum/client-go:v1.13.14
       cl_type: lodestar
-      cl_image: chainsafe/lodestar:v1.15.0
+      cl_image: chainsafe/lodestar:v1.17.0
       el_min_cpu: 768
       el_max_cpu: 768
       el_min_mem: 1024
@@ -158,9 +158,9 @@ participants:
       vc_max_mem: 512
       count: 1
     - el_type: geth
-      el_image: ethereum/client-go:v1.13.11
+      el_image: ethereum/client-go:v1.13.14
       cl_type: nimbus
-      cl_image: ethpandaops/nimbus:unstable
+      cl_image: statusim/nimbus-eth2:multiarch-v24.2.2
       el_min_cpu: 768
       el_max_cpu: 768
       el_min_mem: 1024
@@ -171,9 +171,9 @@ participants:
       cl_max_mem: 1536
       count: 1
     - el_type: erigon
-      el_image: thorax/erigon:v2.57.3
+      el_image: thorax/erigon:v2.58.4
       cl_type: lighthouse
-      cl_image: sigp/lighthouse:v4.6.0
+      cl_image: sigp/lighthouse:v5.1.1
       el_min_cpu: 768
       el_max_cpu: 768
       el_min_mem: 1024