Merge branch 'testnet' into simplify_readme

Author: MauroToscano

.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:

Makefile

@@ -7,7 +7,9 @@ CONFIG_FILE?=config-files/config.yaml
 export OPERATOR_ADDRESS ?= $(shell yq -r '.operator.address' $(CONFIG_FILE))
 AGG_CONFIG_FILE?=config-files/config-aggregator.yaml
 
-OPERATOR_VERSION=v0.13.0
+OPERATOR_VERSION=v0.14.0
+EIGEN_SDK_GO_VERSION_TESTNET=v0.2.0-beta.1
+EIGEN_SDK_GO_VERSION_MAINNET=v0.1.13
 
 ifeq ($(OS),Linux)
 	BUILD_ALL_FFI = $(MAKE) build_all_ffi_linux
@@ -30,6 +32,16 @@ ifeq ($(OS),Darwin)
 	BUILD_OPERATOR = $(MAKE) build_operator_macos
 endif
 
+ifeq ($(ENVIRONMENT), devnet)
+	GET_SDK_VERSION = $(MAKE) operator_set_eigen_sdk_go_version_devnet
+else ifeq ($(ENVIRONMENT), testnet)
+	GET_SDK_VERSION = $(MAKE) operator_set_eigen_sdk_go_version_testnet
+else ifeq ($(ENVIRONMENT), mainnet)
+	GET_SDK_VERSION = $(MAKE) operator_set_eigen_sdk_go_version_mainnet
+else
+	GET_SDK_VERSION = $(MAKE) operator_set_eigen_sdk_go_version_error
+endif
+
 
 FFI_FOR_RELEASE ?= true
 
@@ -140,7 +152,13 @@ anvil_start_with_block_time_with_more_prefunded_accounts:
 
 _AGGREGATOR_:
 
+build_aggregator:
+	$(GET_SDK_VERSION)
+	@echo "Building aggregator"
+	@go build -o ./build/aligned-aggregator ./aggregator/cmd/main.go
+
 aggregator_start:
+	$(GET_SDK_VERSION)
 	@echo "Starting Aggregator..."
 	@go run aggregator/cmd/main.go --config $(AGG_CONFIG_FILE) \
 	2>&1 | zap-pretty
@@ -156,15 +174,31 @@ test_go_retries:
 __OPERATOR__:
 
 operator_start:
+	$(GET_SDK_VERSION)
 	@echo "Starting Operator..."
 	go run operator/cmd/main.go start --config $(CONFIG_FILE) \
 	2>&1 | zap-pretty
 
+operator_set_eigen_sdk_go_version_testnet:
+	@echo "Setting Eigen SDK version to: $(EIGEN_SDK_GO_VERSION_TESTNET)"
+	go get github.com/Layr-Labs/eigensdk-go@$(EIGEN_SDK_GO_VERSION_TESTNET)
+
+operator_set_eigen_sdk_go_version_devnet: operator_set_eigen_sdk_go_version_mainnet
+
+operator_set_eigen_sdk_go_version_mainnet:
+	@echo "Setting Eigen SDK version to: $(EIGEN_SDK_GO_VERSION_MAINNET)"
+	go get github.com/Layr-Labs/eigensdk-go@$(EIGEN_SDK_GO_VERSION_MAINNET)
+
+operator_set_eigen_sdk_go_version_error:
+	@echo "Error setting Eigen SDK version, missing ENVIRONMENT. Possible values for ENVIRONMENT=<devnet|testnet|mainnet>"
+	exit 1
+
 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
 
 build_operator: deps
+	$(GET_SDK_VERSION)
 	$(BUILD_OPERATOR)
 
 build_operator_macos:
@@ -178,6 +212,7 @@ build_operator_linux:
 	@echo "Operator built into /operator/build/aligned-operator"
 
 update_operator:
+	$(GET_SDK_VERSION)
 	@echo "Updating Operator..."
 	@./scripts/fetch_latest_release.sh
 	@make build_operator
@@ -1046,11 +1081,18 @@ docker_verify_proof_submission_success:
 				verification=$$(aligned verify-proof-onchain \
 									--aligned-verification-data $${proof} \
 									--rpc_url $$(echo $(DOCKER_RPC_URL)) 2>&1); \
+				cat $${proof%.cbor}.json; \
+				echo "$$verification"; \
 				if echo "$$verification" | grep -q not; then \
 					echo "ERROR: Proof verification failed for $${proof}"; \
 					exit 1; \
 				elif echo "$$verification" | grep -q verified; then \
 					echo "Proof verification succeeded for $${proof}"; \
+				else \
+					echo "WARNING: Unexpected verification result for $${proof}"; \
+					echo "Output:"; \
+					echo "$$verification"; \
+					exit 1; \
 				fi; \
 				echo "---------------------------------------------------------------------------------------------------"; \
 			done; \

aggregator/pkg/server.go

@@ -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

alerts/balance_alerts.sh

@@ -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"

alerts/contract_alerts.sh

@@ -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

alerts/sender_with_alert.sh

@@ -53,6 +53,22 @@ function fetch_tx_cost() {
   fi
 }
 
+# Function to get the tx cost from the tx hash
+# @param tx_hash
+function get_number_proofs_in_batch_from_create_task_tx() {
+  if [[ -z "$1" ]]; then
+    echo 0
+  else
+    # Get the tx receipt from the blockchain
+    calldata=$(cast tx $1 --rpc-url $RPC_URL input)
+    decoded_calldata=$(cast --calldata-decode --json "createNewTask(bytes32 batchMerkleRoot, string batchDataPointer, address[] proofSubmitters, uint256 feeForAggregator, uint256 feePerProof, uint256 respondToTaskFeeLimit)" $calldata)
+    # We count the number of proofSubmitters within the tx which corresponds to the number of proofs sent in the last batch
+    number_proofs_in_batch=$(echo $decoded_calldata | jq '.[2] | [ match(","; "g")] | length + 1')
+
+    echo $number_proofs_in_batch
+  fi
+}
+
 # Function to send PagerDuty alert
 # @param message
 function send_pagerduty_alert() {
@@ -77,8 +93,15 @@ do
 
   ## Generate Proof
   nonce=$(aligned get-user-nonce --batcher_url $BATCHER_URL --user_addr $SENDER_ADDRESS 2>&1 | awk '{print $9}')
+  echo $nonce
+  if ! [[ "$nonce" =~ ^[0-9]+$ ]]; then
+    echo "Failed getting user nonce, retrying in 10 seconds"
+    sleep 10
+    continue
+  fi
+
   x=$((nonce + 1)) # So we don't have any issues with nonce = 0
-  echo "Generating proof $x != 0"
+  echo "Generating proof $x != 0, nonce: $nonce"
   go run ./scripts/test_files/gnark_groth16_bn254_infinite_script/cmd/main.go $x
 
   ## Send Proof
@@ -94,10 +117,29 @@ do
     --rpc_url $RPC_URL \
     --batcher_url $BATCHER_URL \
     --network $NETWORK \
-    --max_fee 4000000000000000 \
+    --max_fee 0.004ether \
     2>&1)
 
   echo "$submit"
+
+  submit_errors=$(echo "$submit" | grep -oE 'ERROR[^]]*]([^[]*)' | sed 's/^[^]]*]//;s/[[:space:]]*$//')
+
+  # Loop through each error found and print with the custom message
+  is_error=0
+  while IFS= read -r error; do
+      if [[ -n "$error" ]]; then
+          slack_error_message="Error submitting proof to $NETWORK: $error"
+          send_slack_message "$slack_error_message"
+          is_error=1
+      fi
+  done <<< "$submit_errors"
+
+  if [ $is_error -eq 1 ]; then
+    echo "Error submitting proofs to $NETWORK, retrying in 60 seconds"
+    send_slack_message "Error submitting proofs to $NETWORK, retrying in 60 seconds"
+    sleep 60
+    continue
+  fi
 
   echo "Waiting $VERIFICATION_WAIT_TIME seconds for verification"
   sleep $VERIFICATION_WAIT_TIME
@@ -113,6 +155,7 @@ do
   fi
 
   total_fee_in_wei=0
+  total_number_proofs=0
   batch_explorer_urls=()
   for batch_merkle_root in $batch_merkle_roots 
   do
@@ -127,12 +170,16 @@ do
     response_tx_hash=$(echo "$log" | grep -oE "transactionHash: 0x[[:alnum:]]{64}" | awk '{ print $2 }')
 
     # Calculate fees for transactions
+    number_proofs_in_batch=$(get_number_proofs_in_batch_from_create_task_tx $submission_tx_hash)
     submission_fee_in_wei=$(fetch_tx_cost $submission_tx_hash)
     response_fee_in_wei=$(fetch_tx_cost $response_tx_hash)
     batch_fee_in_wei=$((submission_fee_in_wei + response_fee_in_wei))
 
     # Accumulate the fee
     total_fee_in_wei=$(($total_fee_in_wei + $batch_fee_in_wei))
+
+    # Accumulate proofs in batch
+    total_number_proofs=$(($total_number_proofs + $number_proofs_in_batch))
   done
 
   # Calculate the spent amount by converting the fee to ETH
@@ -168,9 +215,9 @@ do
   done
 
   if [ $verified -eq 1 ]; then
-    slack_message="$REPETITIONS Proofs submitted and verified. Spent amount: $spent_amount ETH ($ $spent_amount_usd) [ ${batch_explorer_urls[@]} ]"
+    slack_message="$total_number_proofs proofs submitted and verified. We sent $REPETITIONS proofs. Spent amount: $spent_amount ETH ($ $spent_amount_usd) [ ${batch_explorer_urls[@]} ]"
   else
-    slack_message="$REPETITIONS Proofs submitted but not verified. Spent amount: $spent_amount ETH ($ $spent_amount_usd) [ ${batch_explorer_urls[@]} ]"
+    slack_message="$total_number_proofs proofs submitted but not verified. We sent $REPETITIONS proofs. Spent amount: $spent_amount ETH ($ $spent_amount_usd) [ ${batch_explorer_urls[@]} ]"
   fi
 
   ## Send Update to Slack

batcher/Cargo.lock

@@ -37,6 +37,10 @@ impl NonPayingConfig {
 
 #[derive(Debug, Deserialize)]
 pub struct BatcherConfigFromYaml {
+    #[serde(default = "default_aggregator_fee_percentage_multiplier")]
+    pub aggregator_fee_percentage_multiplier: u128,
+    #[serde(default = "default_aggregator_gas_cost")]
+    pub aggregator_gas_cost: u128,
     pub block_interval: u64,
     pub transaction_wait_timeout: u64,
     pub max_proof_size: usize,
@@ -86,3 +90,11 @@ impl ContractDeploymentOutput {
         serde_json::from_str(&deployment_output).expect("Failed to parse deployment output file")
     }
 }
+
+fn default_aggregator_fee_percentage_multiplier() -> u128 {
+    aligned_sdk::core::constants::DEFAULT_AGGREGATOR_FEE_PERCENTAGE_MULTIPLIER
+}
+
+fn default_aggregator_gas_cost() -> u128 {
+    aligned_sdk::core::constants::DEFAULT_AGGREGATOR_GAS_COST
+}