fix: Merge testnet to staging v3 (#983)

Author: MauroToscano

aggregator/cmd/main.go

@@ -49,7 +49,7 @@ func aggregatorMain(ctx *cli.Context) error {
 		return err
 	}
 
-	// Listen for new task created in the ServiceManager contract in a separate goroutine
+	// Listen for new task created in the ServiceManager contract in a separate goroutine, both V1 and V2 subscriptions:
 	go func() {
 		listenErr := aggregator.SubscribeToNewTasks()
 		if listenErr != nil {

aggregator/internal/pkg/aggregator.go

@@ -276,14 +276,13 @@ 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(batchData.BatchMerkleRoot, batchData.SenderAddress, nonSignerStakesAndSignature)
 		if err == nil {
 			agg.logger.Info("Aggregator successfully responded to task",
 				"taskIndex", blsAggServiceResp.TaskIndex,
 				"batchIdentifierHash", "0x"+hex.EncodeToString(batchIdentifierHash[:]))
-
+				
 			return
 		}
 

batcher/aligned-sdk/abi/AlignedLayerServiceManager.json

@@ -95,12 +95,14 @@ contract AlignedLayerServiceManager is
 
         batchesState[batchIdentifier] = batchState;
 
+        // For operators in v0.5.2 and v0.6.0
         emit NewBatchV2(
             batchMerkleRoot,
             msg.sender,
             uint32(block.number),
             batchDataPointer
         );
+        // For aggregator and operators in v0.7.0
         emit NewBatchV3(
             batchMerkleRoot,
             msg.sender,

contracts/bindings/AlignedLayerServiceManager/binding.go

@@ -207,7 +207,7 @@ func (s *AvsSubscriber) getLatestTaskFromEthereum() (*servicemanager.ContractAli
 	}
 
 	// We just care about the NewBatch event
-	newBatchEvent := alignedLayerServiceManagerABI.Events["NewBatch"]
+	newBatchEvent := alignedLayerServiceManagerABI.Events["NewBatchV3"]
 	if newBatchEvent.ID == (ethcommon.Hash{}) {
 		return nil, fmt.Errorf("NewBatch event not found in ABI")
 	}
@@ -234,7 +234,7 @@ func (s *AvsSubscriber) getLatestTaskFromEthereum() (*servicemanager.ContractAli
 	lastLog := logs[len(logs)-1]
 
 	var latestTask servicemanager.ContractAlignedLayerServiceManagerNewBatchV3
-	err = alignedLayerServiceManagerABI.UnpackIntoInterface(&latestTask, "NewBatch", lastLog.Data)
+	err = alignedLayerServiceManagerABI.UnpackIntoInterface(&latestTask, "NewBatchV3", lastLog.Data)
 	if err != nil {
 		return nil, fmt.Errorf("failed to unpack log data: %w", err)
 	}

contracts/bindings/ERC20Mock/binding.go

@@ -116,12 +116,13 @@ The proof submission and verification can be done either with the SDK or by usin
 
 #### Using the SDK
 
-To submit a proof using the SDK, you can use the `submit` function, and then you can use the `verify_proof_onchain` function to check if the proof was correctly verified in Aligned.
-
+To submit a proof using the SDK, you can use the `submit_and_wait_verification` function.
+This function submits the proof to aligned and waits for it to be verified in Aligned.
+Alternatively you can call `submit` if you dont want to wait for proof verification.
 The following code is an example of how to submit a proof using the SDK:
 
 ```rust
-use aligned_sdk::sdk::{submit, get_next_nonce};
+use aligned_sdk::sdk::{submit_and_wait_verification, get_next_nonce};
 use aligned_sdk::types::{ProvingSystemId, VerificationData};
 use ethers::prelude::*;
 
@@ -147,13 +148,23 @@ async fn submit_proof_to_aligned(
         .await
         .map_err(|e| anyhow::anyhow!("Failed to get next nonce: {:?}", e))?;
 
-    submit(BATCHER_URL, &verification_data, wallet, nonce).await
-        .map_err(|e| anyhow::anyhow!("Failed to submit proof: {:?}", e))
+    match submit_and_wait_verification(
+        BATCHER_URL,
+        RPC_URL,
+        Chain::Holesky,
+        &verification_data,
+        wallet,
+        nonce,
+        BATCHER_CONTRACT_ADDRESS
+    ).await.map_err(|e| anyhow::anyhow!("Failed to submit proof: {:?}", e))
 }
 
 #[tokio::main]
 async fn main() {
     let wallet = // Initialize wallet
+
+    let wallet = wallet.with_chain_id(17000u64)
+
     let proof = // Generate or obtain proof
 
     match submit_proof_to_aligned(proof, wallet).await {
@@ -163,41 +174,6 @@ async fn main() {
 }
 ```
 
-The following code is an example of how to verify the proof was correctly verified in Aligned using the SDK:
-
-```rust
-use aligned_sdk::sdk::verify_proof_onchain;
-use aligned_sdk::types::{AlignedVerificationData, Chain};
-use ethers::prelude::*;
-use tokio::time::{sleep, Duration};
-
-async fn wait_for_proof_verification(
-    aligned_verification_data: AlignedVerificationData,
-    rpc_url: String,
-) -> Result<(), anyhow::Error> {
-    for _ in 0..10 {
-        if verify_proof_onchain(aligned_verification_data.clone(), Chain::Holesky, rpc_url.as_str()).await.is_ok_and(|r| r) {
-            println!("Proof verified successfully.");
-            return Ok(());
-        }
-        println!("Proof not verified yet. Waiting 10 seconds before checking again...");
-        sleep(Duration::from_secs(10)).await;
-    }
-    anyhow::bail!("Proof verification failed")
-}
-
-#[tokio::main]
-async fn main() {
-    let aligned_verification_data = // Obtain aligned verification data
-    let rpc_url = "https://ethereum-holesky-rpc.publicnode.com".to_string();
-
-    match wait_for_proof_verification(aligned_verification_data, rpc_url).await {
-        Ok(_) => println!("Proof verified"),
-        Err(err) => println!("Error: {:?}", err),
-    }
-}
-```
-
 You can find an example of the proof submission and verification in the [ZKQuiz Program](../../examples/zkquiz/quiz/script/src/main.rs).
 
 This example generates a proof, instantiates a wallet to submit the proof, and then submits the proof to Aligned for verification. It then waits for the proof to be verified in Aligned.

contracts/scripts/anvil/state/alignedlayer-deployed-anvil-state.json

@@ -10,7 +10,7 @@ This guide assumes you are in the `examples/validating-public-input` directory.
 
 ## Generate your ZK Proof
 
-> [!IMPORTANT]  
+> [!IMPORTANT]
 > To generate the proof ensure you have [docker](https://www.docker.com/get-started/) installed and the docker daemon running.
 > This is necessary to ensure deterministic builds of the binary we want to generate a proof of. If not used, builds may differ depending on the system you are running on. To know more about this, check [this link](https://dev.risczero.com/terminology#deterministic-builds) from RiscZero docs.
 
@@ -42,15 +42,17 @@ pragma solidity ^0.8.12;
 
 contract FibonacciValidator {
     address public alignedServiceManager;
+    address public paymentServiceAddr;
     bytes32 public fibonacciProgramId;
 
     bytes32 public fibonacciProgramIdCommitment =
         0x069ed9f3972550a2901523723f4beb5e240749dcafa30e1623d0778e17d69d70;
 
     event FibonacciNumbers(uint32 fibN, uint32 fibNPlusOne);
 
-    constructor(address _alignedServiceManager) {
+    constructor(address _alignedServiceManager, address _paymentServiceAddr) {
         alignedServiceManager = _alignedServiceManager;
+        paymentServiceAddr = _paymentServiceAddr;
     }
 
     function verifyBatchInclusion(
@@ -78,14 +80,15 @@ contract FibonacciValidator {
             bytes memory proofIsIncluded
         ) = alignedServiceManager.staticcall(
                 abi.encodeWithSignature(
-                    "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256)",
+                    "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256,address)",
                     proofCommitment,
                     pubInputCommitment,
                     programIdCommitment,
                     proofGeneratorAddr,
                     batchMerkleRoot,
                     merkleProof,
-                    verificationDataBatchIndex
+                    verificationDataBatchIndex,
+                    paymentServiceAddr
                 )
             );
 
@@ -116,6 +119,7 @@ contract FibonacciValidator {
         return (first, second);
     }
 }
+
 ```
 
 ### Explanation
@@ -146,14 +150,15 @@ require(
     bytes memory proofIsIncluded
 ) = alignedServiceManager.staticcall(
     abi.encodeWithSignature(
-        "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256)",
+        "verifyBatchInclusion(bytes32,bytes32,bytes32,bytes20,bytes32,bytes,uint256,address)",
         proofCommitment,
         pubInputCommitment,
         programIdCommitment,
         proofGeneratorAddr,
         batchMerkleRoot,
         merkleProof,
-        verificationDataBatchIndex
+        verificationDataBatchIndex,
+        paymentServiceAddr
         )
 );
 
@@ -192,6 +197,7 @@ To deploy the contract, first you will need to set up the `.env` file in the con
 RPC_URL=<rpc_url> #You can use publicnode RPC: https://ethereum-holesky-rpc.publicnode.com
 PRIVATE_KEY=<private_key>
 ALIGNED_SERVICE_MANAGER_ADDRESS=<service_manager_address> #0x58F280BeBE9B34c9939C3C39e0890C81f163B623 for Holesky
+PAYMENT_SERVICE_ADDRESS=<payment_service_address> #0x815aeCA64a974297942D2Bbf034ABEe22a38A003 for Holesky
 ```
 
 Then, run `make deploy_fibonacci_validator`.