fix: public inputs sdk integration (#945)

Author: NicolasRampoldi

docs/guides/3_validating_public_input.md

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

examples/validating-public-input/aligned-integration/Cargo.lock

@@ -4,7 +4,7 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-aligned-sdk = { git = "https://github.com/yetanotherco/aligned_layer", tag="v0.4.0" }
+aligned-sdk = { git = "https://github.com/yetanotherco/aligned_layer", rev="6908110aaa04ec3107f15ab8a8bb2603e7bbead9" }
 tokio = { version = "1.37.0", features = ["io-std", "time", "macros", "rt", "rt-multi-thread", "sync"] }
 ethers = { tag = "v2.0.15-fix-reconnections", features = ["ws", "rustls"], git = "https://github.com/yetanotherco/ethers-rs.git" }
 serde = { version = "1.0.201", features = ["derive"] }

examples/validating-public-input/aligned-integration/Cargo.toml

@@ -1,3 +1,4 @@
+use std::env;
 use std::fs::File;
 use std::io::Write;
 use std::path::PathBuf;
@@ -6,7 +7,7 @@ use std::str::FromStr;
 use aligned_sdk::core::errors::SubmitError;
 use aligned_sdk::core::types::Chain::Holesky;
 use aligned_sdk::core::types::{AlignedVerificationData, ProvingSystemId, VerificationData};
-use aligned_sdk::sdk::{get_next_nonce, submit_and_wait};
+use aligned_sdk::sdk::{get_next_nonce, submit_and_wait_verification};
 use env_logger::Env;
 use ethers::signers::{LocalWallet, Signer};
 use ethers::types::Address;
@@ -49,20 +50,23 @@ async fn main() -> Result<(), SubmitError> {
         proof_generator_addr,
     };
 
-    let wallet = LocalWallet::from_str(WALLET_PRIVATE_KEY).expect("Failed to create wallet");
+    let wallet = LocalWallet::from_str(WALLET_PRIVATE_KEY)
+        .expect("Failed to create wallet")
+        .with_chain_id(17000u64);
 
     let nonce = get_next_nonce(RPC_URL, wallet.address(), BATCHER_PAYMENTS_ADDRESS)
         .await
         .expect("Failed to get next nonce");
 
     info!("Submitting Fibonacci proof to Aligned and waiting for verification...");
-    let aligned_verification_data = submit_and_wait(
+    let aligned_verification_data = submit_and_wait_verification(
         BATCHER_URL,
         RPC_URL,
         Holesky,
         &verification_data,
         wallet,
         nonce,
+        BATCHER_PAYMENTS_ADDRESS,
     )
     .await?;
 
@@ -72,14 +76,11 @@ async fn main() -> Result<(), SubmitError> {
         "Saving verification data to {:?}",
         batch_inclusion_data_directory_path
     );
-    if let Some(aligned_verification_data) = aligned_verification_data {
-        save_response(
-            batch_inclusion_data_directory_path,
-            &aligned_verification_data,
-        )?;
-    } else {
-        return Err(SubmitError::EmptyVerificationDataList);
-    }
+
+    save_response(
+        batch_inclusion_data_directory_path,
+        &aligned_verification_data,
+    )?;
 
     Ok(())
 }
@@ -104,13 +105,19 @@ fn save_response(
     let batch_inclusion_data_path =
         batch_inclusion_data_directory_path.join(batch_inclusion_data_file_name);
 
-    let data = serde_json::to_vec(&aligned_verification_data)?;
+    let data = serde_json::to_vec(&aligned_verification_data).unwrap();
 
     let mut file = File::create(&batch_inclusion_data_path)
         .map_err(|e| SubmitError::IoError(batch_inclusion_data_path.clone(), e))?;
-
     file.write_all(data.as_slice())
         .map_err(|e| SubmitError::IoError(batch_inclusion_data_path.clone(), e))?;
 
+    let current_dir = env::current_dir().expect("Failed to get current directory");
+
+    info!(
+        "Saved batch inclusion data to {:?}",
+        current_dir.join(batch_inclusion_data_path)
+    );
+
     Ok(())
 }

examples/validating-public-input/aligned-integration/src/main.rs

@@ -1,3 +1,4 @@
 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

examples/validating-public-input/contracts/.env.example

@@ -11,6 +11,11 @@ if [ -z "$ALIGNED_SERVICE_MANAGER_ADDRESS" ]; then
     exit 1
 fi
 
+if [ -z "$PAYMENT_SERVICE_ADDRESS" ]; then
+    echo "PAYMENT_SERVICE_ADDRESS is not set. Please set it in .env"
+    exit 1
+fi
+
 if [ -z "$RPC_URL" ]; then
     echo "RPC_URL is not set. Please set it in .env"
     exit 1
@@ -25,7 +30,8 @@ forge install
 
 forge script script/Deployer.s.sol \
     "$ALIGNED_SERVICE_MANAGER_ADDRESS" \
+    "$PAYMENT_SERVICE_ADDRESS" \
     --rpc-url "$RPC_URL" \
     --private-key "$PRIVATE_KEY" \
     --broadcast \
-    --sig "run(address _alignedServiceManager)"
+    --sig "run(address _alignedServiceManager,address _paymentServiceAddr)"

examples/validating-public-input/contracts/deploy.sh

@@ -7,11 +7,15 @@ import {FibonacciValidator} from "../src/FibonacciValidator.sol";
 contract FibonacciDeployer is Script {
     function setUp() public {}
 
-    function run(address _targetContract) external returns (address) {
+    function run(
+        address _alignedServiceManager,
+        address _paymentServiceAddr
+    ) external returns (address) {
         vm.startBroadcast();
 
         FibonacciValidator fibonacciContract = new FibonacciValidator(
-            _targetContract
+            _alignedServiceManager,
+            _paymentServiceAddr
         );
 
         vm.stopBroadcast();

examples/validating-public-input/contracts/script/Deployer.s.sol

@@ -3,15 +3,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(
@@ -39,14 +41,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
                 )
             );