Merge branch 'refs/heads/1344-ci-improve-servers-setup' into batcher_ansible

Author: JuArce

.dockerignore

@@ -11,4 +11,4 @@ volume
 nonce_*.bin
 docker-compose.yaml
 .github/**
-**.md
+**.md

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

@@ -1,7 +1,6 @@
 name: build-go-projects
 
 on:
-  merge_group:
   push:
     branches: [main]
   pull_request:

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

@@ -1,7 +1,6 @@
 name: build-and-test-rust-projects
 
 on:
-  merge_group:
   push:
     branches: [main]
   pull_request:
@@ -52,6 +51,8 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
+      - name: foundry-toolchain
+        uses: foundry-rs/[email protected]
       - name: Cache Rust dependencies
         uses: actions/cache@v3
         with:

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

@@ -1,6 +1,7 @@
 name: "[CI] Send proofs to network"
 
 on:
+  merge_group:
   pull_request:
     types:
       - opened
@@ -23,7 +24,7 @@ jobs:
 
     steps:
     - name: Log in to GitHub Container Registry
-      uses: docker/login-action@v2
+      uses: docker/login-action@v3
       with:
         registry: ghcr.io
         username: ${{ github.actor }}

.github/workflows/test-merkle-tree.yml

@@ -1,7 +1,6 @@
 name: test-merkle-tree
 
 on:
-  merge_group:
   push:
     branches: [main]
   pull_request:

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

@@ -1,7 +1,6 @@
 name: test-risc-zero-old
 
 on:
-  merge_group:
   push:
     branches: [main]
   pull_request:

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

@@ -1,7 +1,6 @@
 name: test-risc-zero
 
 on:
-  merge_group:
   push:
     branches: [main]
   pull_request:

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

@@ -1,7 +1,6 @@
 name: test-sp1-old
 
 on:
-  merge_group:
   push:
     branches: [main]
   pull_request:

.github/workflows/test-sp1.yml

@@ -1,7 +1,6 @@
 name: test-sp1
 
 on:
-  merge_group:
   push:
     branches: [main]
   pull_request:

aggregator/internal/pkg/aggregator.go

@@ -272,8 +272,9 @@ func (agg *Aggregator) handleBlsAggServiceResponse(blsAggServiceResp blsagg.BlsA
 	agg.logger.Info("Sending aggregated response onchain", "taskIndex", blsAggServiceResp.TaskIndex,
 		"batchIdentifierHash", "0x"+hex.EncodeToString(batchIdentifierHash[:]))
 	for i := 0; i < MaxSentTxRetries; i++ {
-		_, err = agg.sendAggregatedResponse(batchIdentifierHash, batchData.BatchMerkleRoot, batchData.SenderAddress, nonSignerStakesAndSignature)
+		receipt, err := agg.sendAggregatedResponse(batchIdentifierHash, batchData.BatchMerkleRoot, batchData.SenderAddress, nonSignerStakesAndSignature)
 		if err == nil {
+			agg.telemetry.TaskSentToEthereum(batchData.BatchMerkleRoot, receipt.TxHash.String())
 			agg.logger.Info("Aggregator successfully responded to task",
 				"taskIndex", blsAggServiceResp.TaskIndex,
 				"batchIdentifierHash", "0x"+hex.EncodeToString(batchIdentifierHash[:]))