Merge branch 'staging' into mina

Author: gabrielbosio

.github/workflows/build-and-test-go.yml

@@ -20,27 +20,32 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+
       - uses: actions/setup-go@v5
         with:
           go-version: "1.23"
           cache: false
+
       - name: foundry-toolchain
         uses: foundry-rs/foundry-toolchain@v1.2.0
+
       - name: Build SP1 bindings
         run: make build_sp1_linux
-      - name: Build Old SP1 bindings
-        run: make build_sp1_linux_old
+
       - name: Build Risc Zero go bindings
         run: make build_risc_zero_linux
-      - name: Build Old Risc Zero go bindings
-        run: make build_risc_zero_linux_old
+
       - name: Build Merkle Tree bindings
         run: make build_merkle_tree_linux
+        
       - name: Build Mina bindings
         run: make build_mina_linux
+      
       - name: Build Mina Account bindings
         run: make build_mina_account_linux
+      
       - name: Build operator
         run: go build operator/cmd/main.go
+
       - name: Build aggregator
         run: go build aggregator/cmd/main.go

.github/workflows/foundry-gas-diff.yml

@@ -35,7 +35,7 @@ jobs:
           FOUNDRY_FUZZ_SEED: 0x${{ github.event.pull_request.base.sha || github.sha }}
 
       - name: Compare gas reports
-        uses: Rubilmax/foundry-gas-diff@v3.16
+        uses: Rubilmax/foundry-gas-diff@v3.21
         with:
           summaryQuantile: 0.9 # only display the 10% most significant gas diffs in the summary (defaults to 20%)
           sortCriteria: avg,max # sort diff rows by criteria

.github/workflows/send-proofs-docker.yml

@@ -10,7 +10,7 @@ on:
       - '**.md'
 
 concurrency:
-  group: pull_request-${{ github.event.pull_request.number }}
+  group: ${{ github.event_name == 'merge_group' && format('merge_group-{0}', github.event.merge_group.head_sha) || format('pull_request-{0}', github.event.pull_request.number) }}
   cancel-in-progress: true
 
 jobs:

.github/workflows/test-risc-zero-old.yml

@@ -16,3 +16,4 @@ config-files/*.last_processed_batch.json
 nonce_*.bin
 
 infra/ansible/playbooks/ini/**.ini
+infra/ansible/playbooks/files/**.pem

.github/workflows/test-sp1-old.yml

@@ -20,8 +20,8 @@ ifeq ($(OS),Darwin)
 endif
 
 ifeq ($(OS),Linux)
-	export LD_LIBRARY_PATH+=$(CURDIR)/operator/risc_zero_old/lib:$(CURDIR)/operator/risc_zero/lib:$(CURDIR)/operator/mina/lib:$(CURDIR)/operator/mina_account/lib
-	OPERATOR_FFIS=$(CURDIR)/operator/risc_zero_old/lib:$(CURDIR)/operator/risc_zero/lib:$(CURDIR)/operator/mina/lib:$(CURDIR)/operator/mina_account/lib
+	export LD_LIBRARY_PATH+=$(CURDIR)/operator/risc_zero/lib:$(CURDIR)/operator/mina/lib:$(CURDIR)/operator/mina_account/lib
+	OPERATOR_FFIS=$(CURDIR)/operator/risc_zero/lib:$(CURDIR)/operator/mina/lib:$(CURDIR)/operator/mina_account/lib
 endif
 
 ifeq ($(OS),Linux)
@@ -195,7 +195,7 @@ operator_set_eigen_sdk_go_version_error:
 
 operator_full_registration: operator_get_eth operator_register_with_eigen_layer operator_mint_mock_tokens operator_deposit_into_mock_strategy operator_whitelist_devnet operator_register_with_aligned_layer
 
-operator_register_and_start: operator_full_registration operator_start
+operator_register_and_start: $(GET_SDK_VERSION) operator_full_registration operator_start
 
 build_operator: deps
 	$(GET_SDK_VERSION)
@@ -779,25 +779,6 @@ generate_risc_zero_empty_journal_proof:
 	@cd scripts/test_files/risc_zero/no_public_inputs && RUST_LOG=info cargo run --release
 	@echo "Fibonacci proof and ELF with empty journal generated in scripts/test_files/risc_zero/no_public_inputs folder"
 
-build_sp1_macos_old:
-	@cd operator/sp1_old/lib && cargo build $(RELEASE_FLAG)
-	@cp operator/sp1_old/lib/target/$(TARGET_REL_PATH)/libsp1_verifier_old_ffi.dylib operator/sp1_old/lib/libsp1_verifier_old_ffi.dylib
-
-build_sp1_linux_old:
-	@cd operator/sp1_old/lib && cargo build $(RELEASE_FLAG)
-	@cp operator/sp1_old/lib/target/$(TARGET_REL_PATH)/libsp1_verifier_old_ffi.so operator/sp1_old/lib/libsp1_verifier_old_ffi.so
-
-test_sp1_rust_ffi_old:
-	@echo "Testing SP1 Rust FFI source code..."
-	@cd operator/sp1_old/lib && RUST_MIN_STACK=83886080 cargo t --release
-
-test_sp1_go_bindings_macos_old: build_sp1_macos_old
-	@echo "Testing SP1 Go bindings..."
-	go test ./operator/sp1_old/... -v
-
-test_sp1_go_bindings_linux_old: build_sp1_linux_old
-	@echo "Testing SP1 Go bindings..."
-	go test ./operator/sp1_old/... -v
 
 __RISC_ZERO_FFI__: ##
 build_risc_zero_macos:
@@ -825,26 +806,6 @@ generate_risc_zero_fibonacci_proof:
 		RUST_LOG=info cargo run --release && \
 		echo "Fibonacci proof, pub input and image ID generated in scripts/test_files/risc_zero folder"
 
-build_risc_zero_macos_old:
-	@cd operator/risc_zero_old/lib && cargo build $(RELEASE_FLAG)
-	@cp operator/risc_zero_old/lib/target/$(TARGET_REL_PATH)/librisc_zero_verifier_old_ffi.dylib operator/risc_zero_old/lib/librisc_zero_verifier_old_ffi.dylib
-
-build_risc_zero_linux_old:
-	@cd operator/risc_zero_old/lib && cargo build $(RELEASE_FLAG)
-	@cp operator/risc_zero_old/lib/target/$(TARGET_REL_PATH)/librisc_zero_verifier_old_ffi.so operator/risc_zero_old/lib/librisc_zero_verifier_old_ffi.so
-
-test_risc_zero_rust_ffi_old:
-	@echo "Testing RISC Zero Rust FFI source code..."
-	@cd operator/risc_zero_old/lib && cargo test --release
-
-test_risc_zero_go_bindings_macos_old: build_risc_zero_macos_old
-	@echo "Testing RISC Zero Go bindings..."
-	go test ./operator/risc_zero_old/... -v
-
-test_risc_zero_go_bindings_linux_old: build_risc_zero_linux_old
-	@echo "Testing RISC Zero Go bindings..."
-	go test ./operator/risc_zero_old/... -v
-
 
 __MERKLE_TREE_FFI__: ##
 build_merkle_tree_macos:
@@ -869,11 +830,6 @@ test_merkle_tree_go_bindings_linux: build_merkle_tree_linux
 	@echo "Testing Merkle Tree Go bindings..."
 	go test ./operator/merkle_tree/... -v
 
-test_merkle_tree_old_go_bindings_macos: build_merkle_tree_macos_old
-	@echo "Testing Old Merkle Tree Go bindings..."
-	go test ./operator/merkle_tree_old/... -v
-
-
 __MINA_FFI__: ##
 build_mina_macos:
 	@cd operator/mina/lib && cargo build --release ${MINA_FEATURES_FLAG}
@@ -926,8 +882,6 @@ build_all_ffi_macos: ## Build all FFIs for macOS
 	@echo "Building all FFIs for macOS..."
 	@$(MAKE) build_sp1_macos
 	@$(MAKE) build_risc_zero_macos
-	@$(MAKE) build_sp1_macos_old
-	@$(MAKE) build_risc_zero_macos_old
 	@$(MAKE) build_merkle_tree_macos
 	@$(MAKE) build_mina_macos
 	@$(MAKE) build_mina_account_macos
@@ -937,8 +891,6 @@ build_all_ffi_linux: ## Build all FFIs for Linux
 	@echo "Building all FFIs for Linux..."
 	@$(MAKE) build_sp1_linux
 	@$(MAKE) build_risc_zero_linux
-	@$(MAKE) build_sp1_linux_old
-	@$(MAKE) build_risc_zero_linux_old
 	@$(MAKE) build_merkle_tree_linux
 	@$(MAKE) build_mina_linux
 	@$(MAKE) build_mina_account_linux
@@ -1381,6 +1333,19 @@ ansible_operator_deploy: ## Deploy the Operator. Parameters: INVENTORY
 		-e "ecdsa_keystore_path=$(ECDSA_KEYSTORE)" \
 		-e "bls_keystore_path=$(BLS_KEYSTORE)"
 
+ansible_explorer_deploy:
+	@ansible-playbook infra/ansible/playbooks/explorer.yaml \
+		-i $(INVENTORY)
+
+ansible_telemetry_create_env:
+	@cp -n infra/ansible/playbooks/ini/config-telemetry.ini.example infra/ansible/playbooks/ini/config-telemetry.ini
+	@echo "Config files for Telemetry created in infra/ansible/playbooks/ini"
+	@echo "Please complete the values and run make ansible_telemetry_deploy"
+
+ansible_telemetry_deploy:
+	@ansible-playbook infra/ansible/playbooks/telemetry.yaml \
+		-i $(INVENTORY)
+
 __ETHEREUM_PACKAGE__:  ## ____
 
 ethereum_package_start: ## Starts the ethereum_package environment

.gitignore

@@ -3,6 +3,7 @@ package pkg
 import (
 	"context"
 	"encoding/hex"
+	"errors"
 	"fmt"
 	"net/http"
 	"net/rpc"
@@ -48,6 +49,17 @@ func (agg *Aggregator) ProcessOperatorSignedTaskResponseV2(signedTaskResponse *t
 		"SenderAddress", "0x"+hex.EncodeToString(signedTaskResponse.SenderAddress[:]),
 		"BatchIdentifierHash", "0x"+hex.EncodeToString(signedTaskResponse.BatchIdentifierHash[:]),
 		"operatorId", hex.EncodeToString(signedTaskResponse.OperatorId[:]))
+
+	if signedTaskResponse.BlsSignature.G1Point == nil {
+		agg.logger.Warn("invalid operator response with nil signature",
+			"BatchMerkleRoot", "0x"+hex.EncodeToString(signedTaskResponse.BatchMerkleRoot[:]),
+			"SenderAddress", "0x"+hex.EncodeToString(signedTaskResponse.SenderAddress[:]),
+			"BatchIdentifierHash", "0x"+hex.EncodeToString(signedTaskResponse.BatchIdentifierHash[:]),
+			"operatorId", hex.EncodeToString(signedTaskResponse.OperatorId[:]))
+		*reply = 1
+		return errors.New("invalid response: nil signature")
+	}
+
 	taskIndex := uint32(0)
 
 	// The Aggregator may receive the Task Identifier after the operators.
@@ -69,7 +81,7 @@ func (agg *Aggregator) ProcessOperatorSignedTaskResponseV2(signedTaskResponse *t
 	defer cancel() // Ensure the cancel function is called to release resources
 
 	// Create a channel to signal when the task is done
-	done := make(chan struct{})
+	done := make(chan uint8)
 
 	agg.logger.Info("Starting bls signature process")
 	go func() {
@@ -80,9 +92,11 @@ func (agg *Aggregator) ProcessOperatorSignedTaskResponseV2(signedTaskResponse *t
 
 		if err != nil {
 			agg.logger.Warnf("BLS aggregation service error: %s", err)
+			done<- 1
 			// todo shouldn't we here close the channel with a reply = 1?
 		} else {
 			agg.logger.Info("BLS process succeeded")
+			done<- 0
 		}
 
 		close(done)
@@ -94,10 +108,10 @@ func (agg *Aggregator) ProcessOperatorSignedTaskResponseV2(signedTaskResponse *t
 	case <-ctx.Done():
 		// The context's deadline was exceeded or it was canceled
 		agg.logger.Info("Bls process timed out, operator signature will be lost. Batch may not reach quorum")
-	case <-done:
+	case res := <-done:
 		// The task completed successfully
-		agg.logger.Info("Bls context finished correctly")
-		*reply = 0
+		agg.logger.Info("Bls context finished on time")
+		*reply = res
 	}
 
 	return nil

Makefile

@@ -38,7 +38,7 @@ do
     fi
     balance_alert=true
   else
-    message="🟩 INFO: Wallet $WALLET_ADDRESS balance ($balance_eth ETH) is above $BALANCE_THRESHOLD ETH"
+    message="🟩 INFO: $WALLET_NAME ($NETWORK) Wallet $WALLET_ADDRESS balance ($balance_eth ETH) is above $BALANCE_THRESHOLD ETH"
     printf "$message\n"
     if [ "$balance_alert" = true ]; then
       send_slack_message "$message"

aggregator/pkg/server.go

@@ -41,7 +41,8 @@ do
   if [ -z "$new_batch_logs" ]; then
     printf "No new batches logs found\n"
     if [ "$no_new_batches_alert" = false ]; then
-      message="🚨 ALERT: No new batches in Service Manager since block $from_block"
+      message="🚨 $NETWORK ALERT: No new batches in Service Manager since block $from_block"
+      printf "$message\n"
       send_slack_message "$message"
       send_telegram_message "$message"
       send_pagerduty_alert "$message"
@@ -50,7 +51,8 @@ do
   else
     printf "New batches logs found\n"
     if [ "$no_new_batches_alert" = true ]; then
-      message="🟩 INFO: Batches creation resumed in Service Manager since block $from_block"
+      message="🟩 $NETWORK INFO: Batches creation resumed in Service Manager since block $from_block"
+      printf "$message\n"
       send_slack_message "$message"
       send_telegram_message "$message"
     fi
@@ -61,7 +63,8 @@ do
   if [ -z "$verified_batch_logs" ]; then
     printf "No verified batches logs found\n"
     if [ "$no_verified_batches_alert" = false ]; then
-      message="🚨 ALERT: No verified batches in Service Manager since block $from_block"
+      message="🚨 $NETWORK ALERT: No verified batches in Service Manager since block $from_block"
+      printf "$message\n"
       send_slack_message "$message"
       send_telegram_message "$message"
       send_pagerduty_alert "$message"
@@ -70,7 +73,8 @@ do
   else
     printf "Verified batches logs found\n"
     if [ "$no_verified_batches_alert" = true ]; then
-      message="🟩 INFO: Batches verification resumed in Service Manager since block $from_block"
+      message="🟩 $NETWORK INFO: Batches verification resumed in Service Manager since block $from_block"
+      printf "$message\n"
       send_slack_message "$message"
       send_telegram_message "$message"
     fi