Merge branch 'staging' into ci/aggregation-mode

MarcosNicolau · web-flow · commit 72317865c804 · 2025-06-11T12:15:19.000-03:00
diff --git a/.github/workflows/build-and-test-go.yml b/.github/workflows/build-and-test-go.yml
@@ -2,7 +2,9 @@ name: build-go-projects
 
 on:
   push:
-    branches: [main]
+    branches:
+      - testnet
+      - staging
   pull_request:
     branches: ["*"]
     paths:
diff --git a/.github/workflows/build-and-test-rust.yml b/.github/workflows/build-and-test-rust.yml
@@ -2,7 +2,9 @@ name: build-and-test-rust-projects
 
 on:
   push:
-    branches: [main]
+    branches:
+      - testnet
+      - staging
   pull_request:
     branches: ["*"]
     paths:
diff --git a/.github/workflows/build-contracts.yml b/.github/workflows/build-contracts.yml
@@ -1,7 +1,9 @@
 name: Build contracts
 on:
   push:
-    branches: [main]
+    branches:
+      - testnet
+      - staging
   pull_request:
     branches: ["*"]
     paths:
diff --git a/.github/workflows/foundry-gas-diff.yml b/.github/workflows/foundry-gas-diff.yml
@@ -3,7 +3,8 @@ name: Report gas diff
 on:
   push:
     branches:
-      - main
+      - testnet
+      - staging
   pull_request:
     # Run only for changes in specific files.
      paths:
diff --git a/.github/workflows/lint-contracts.yml b/.github/workflows/lint-contracts.yml
@@ -1,7 +1,9 @@
 name: Lint contracts
 on:
   push:
-    branches: [main]
+    branches:
+      - testnet
+      - staging
   pull_request:
     branches: ["*"]
     paths:
diff --git a/.github/workflows/test-merkle-tree.yml b/.github/workflows/test-merkle-tree.yml
@@ -2,7 +2,9 @@ name: test-merkle-tree
 
 on:
   push:
-    branches: [main]
+    branches:
+      - testnet
+      - staging
   pull_request:
     branches: ["*"]
     paths:
diff --git a/.github/workflows/test-risc-zero.yml b/.github/workflows/test-risc-zero.yml
@@ -2,7 +2,9 @@ name: test-risc-zero
 
 on:
   push:
-    branches: [main]
+    branches:
+      - testnet
+      - staging
   pull_request:
     branches: ["*"]
     paths:
diff --git a/.github/workflows/test-sp1.yml b/.github/workflows/test-sp1.yml
@@ -2,7 +2,9 @@ name: test-sp1
 
 on:
   push:
-    branches: [main]
+    branches:
+      - testnet
+      - staging
   pull_request:
     branches: ["*"]
     paths:
diff --git a/Makefile b/Makefile
diff --git a/aggregation_mode/README.md b/aggregation_mode/README.md
@@ -19,7 +19,7 @@ make anvil_start
 3. Start batcher
 
 ```shell
-make start_batcher_local
+make batcher_start_local
 ```
 
 4. Send SP1/Risc0 proofs:
@@ -38,13 +38,13 @@ Notes:
 
 ```shell
 # This will not run a real prover but a mocked one see below to run a real prover
-make start_proof_aggregator_dev AGGREGATOR="sp1|risc0"
+make proof_aggregator_start_dev AGGREGATOR="sp1|risc0"
 ```
 
 or
 
 ```shell
-make start_proof_aggregator AGGREGATOR="sp1|risc0"
+make proof_aggregator_start AGGREGATOR="sp1|risc0"
 ```
 
 Notes:
@@ -53,7 +53,7 @@ Notes:
 -   Proving can be quite slow without GPUs, to activate gpu run:
 
 ```shell
-make start_proof_aggregator_gpu AGGREGATOR="sp1|risc0"
+make proof_aggregator_start_gpu AGGREGATOR="sp1|risc0"
 ```
 
 ### Check the logs
@@ -69,7 +69,7 @@ cast logs 0xc351628EB244ec633d5f21fBD6621e1a683B1181 'AggregatedProofVerified(by
 Whenever any of the programs change, you must recompile them and update their corresponding program ids in `aggregation_mode/program_ids.json`. To do this, run the following command:
 
 ```shell
-make agg_mode_write_program_ids
+make proof_aggregator_write_program_ids
 ```
 
 We are using docker to produce deterministic builds so that the program ids are the same for all systems.
diff --git a/docs/0_internal/2_deploy_contracts.md b/docs/0_internal/2_deploy_contracts.md
@@ -17,7 +17,7 @@ Also, you will be able to deploy the Batcher Payment Service contract.
 - Install foundry
 
     ```shell
-    make install_foundry
+    make foundry_install
     foundryup -i nightly-a428ba6ad8856611339a6319290aade3347d25d9
     ```
   
diff --git a/docs/0_internal/ethereum_package.md b/docs/0_internal/ethereum_package.md
@@ -40,21 +40,21 @@ make aggregator_start_ethereum_package
 To start an operator run:
 
 ```bash
-make operator_register_start_ethereum_package
+make operator_full_registration_and_start_ethereum_package
 ```
 
 If you want to deploy more operators, you must duplicate the config-operator-1-ethereum-package.yaml and change the private and bls keys and the address.
 
 To start Telemetry and the Explorer, run the usual commands:
 
 ```bash
-make telemetry_full_start
-make run_explorer
+make telemetry_start_all
+make explorer_start
 ```
 
 To spam transactions install spamoor:
 ```bash
-make install_spamoor
+make spamoor_install
 ```
 
 and run the following make targets:
diff --git a/docs/3_guides/6_setup_aligned.md b/docs/3_guides/6_setup_aligned.md
@@ -47,11 +47,7 @@ If EigenLayer contracts change, the anvil state needs to be updated with:
 make anvil_deploy_eigen_contracts
 ```
 
-You will also need to redeploy the MockStrategy & MockERC20 contracts:
-
-```bash
-make anvil_deploy_mock_strategy
-```
+This also deploys an ERC20 token with a strategy that can be used to test the EigenLayer restaking.
 
 ### Aligned Contracts
 
@@ -80,21 +76,21 @@ make aggregator_start ENVIRONMENT=devnet
 or with a custom config:
 
 ```bash
-make aggregator_start ENVIRONMENT=devnet CONFIG_FILE=<path_to_config_file>
+make aggregator_start ENVIRONMENT=devnet AGG_CONFIG_FILE=<path_to_config_file>
 ```
 
 ## Operator
 
 To setup an [Operator](../2_architecture/components/4_operator.md) run:
 
 ```bash
-make operator_register_and_start ENVIRONMENT=devnet
+make operator_full_registration_and_start ENVIRONMENT=devnet
 ```
 
 or with a custom config:
 
 ```bash
-make operator_register_and_start ENVIRONMENT=devnet CONFIG_FILE=<path_to_config_file>
+make operator_full_registration_and_start ENVIRONMENT=devnet CONFIG_FILE=<path_to_config_file>
 ```
 
 Different configs for operators can be found in `config-files/config-operator`.
@@ -161,7 +157,7 @@ Then start the explorer:
 
 ```shell
 make explorer_build_db
-make run_explorer
+make explorer_start
 ```
 
 This will:
@@ -170,12 +166,6 @@ This will:
 - Run ecto setup
 - Start the explorer on http://localhost:4000.
 
-If you want to run the explorer without docker run:
-
-```shell
-make run_explorer_without_docker_db
-```
-
 <details>
 <summary>Clean, dump and recover DB</summary>
 
@@ -245,7 +235,7 @@ Ensure you have the following installed:
 To run Prometheus and Grafana, run:
 
 ```bash
-make run_metrics
+make metrics_start
 ```
 
 This will start containers for Prometheus and Grafana. You can access Grafana on `http://localhost:3000` with the default credentials `admin:admin`.
@@ -266,12 +256,12 @@ make telemetry_build_db
 Then, to start the service:
 
 ```bash
-make telemetry_full_start
+make telemetry_start_all
 ```
 
 This will:
 
-- Start OpenJaeger container for the traces: available at `http://localhost:16686/`
+- Start OpenTelemetry and Jaeger containers for the traces: available at `http://localhost:16686/`
 - Start telemetry server: available at `http://localhost:4001/`
 
 ---
@@ -295,7 +285,7 @@ make batcher_send_risc0_burst BURST_SIZE=<N>
 Send an infinite stream of groth_16 proofs:
 
 ```shell
-make batcher_send_burst_groth16 BURST_SIZE=2
+make batcher_send_groth16_bn254_infinite BURST_SIZE=2
 ```
 
 Feel free to explore the rest of targets.
diff --git a/docs/3_guides/setup_holesky.md b/docs/3_guides/setup_holesky.md
@@ -132,11 +132,3 @@ Also, you must re-generate the Go smart contract bindings:
 ```bash
 make bindings
 ```
-
-### Deployment
-
-And finally you must rebuild go binaries, for Operator and Aggregator:
-
-```bash
-make build_binaries
-```
diff --git a/docs/operator_guides/0_running_an_operator.md b/docs/operator_guides/0_running_an_operator.md
@@ -51,34 +51,34 @@ Also, you have to install the following dependencies for Linux:
 To install foundry, run:
 
 ```bash
-make install_foundry
+make foundry_install
 foundryup
 ```
 
 To build the operator binary for **Testnet**, run:
 
 ```bash
-make build_operator ENVIRONMENT=testnet
+make operator_build ENVIRONMENT=testnet
 ```
 
 To build the operator binary for **Mainnet**, run:
 
 ```bash
-make build_operator ENVIRONMENT=mainnet
+make operator_build ENVIRONMENT=mainnet
 ```
 
 ### Upgrading the Operator
 
 If you want to upgrade the operator in **Testnet**, run:
 
 ```bash
-make update_operator ENVIRONMENT=testnet
+make operator_start ENVIRONMENT=testnet
 ```
 
 If you want to upgrade the operator in **Mainnet**, run:
 
 ```bash
-make update_operator ENVIRONMENT=mainnet
+make operator_start ENVIRONMENT=mainnet
 ```
 
 This will recreate the binaries. You can then proceed to restart the operator.
diff --git a/telemetry-docker-compose.yaml b/telemetry-docker-compose.yaml
@@ -8,7 +8,7 @@ services:
     volumes:
       - ./otel-collector.yaml:/etc/otel-collector.yaml
     ports:
-      - "4317:4317"
+      - "4319:4317"
 
   cassandra:
     image: cassandra:latest
