refactor(batcher-client): set verifybatchinclusion as view and remove signer from client (#404)

Co-authored-by: JuArce <52429267+JuArce@users.noreply.github.com>

Author: entropidelic

README.md

@@ -122,24 +122,22 @@ aligned submit \
 ```
 
 ### Creating a transaction from the CLI to verify proof in Ethereum
-After running the commands of the previous section to submit proofs to the batcher, you will receive responses that will be written to disk in a JSON format inside the `<batch_inclusion_data_directory_path>`, for example `19f04bbb143af72105e2287935c320cc2aa9eeda0fe1f3ffabbe4e59cdbab691_0.json`. By default, the `batch_inclusion_data` directory will be created where the submit command is being executed, but you can specify it with the `<batch_inclusion_data_directory_path>` argument. To verify their inclusion in a batch, run the following command, replacing the `<path_to_batch_inclusion_data>` placeholder with the path to your response file, and `<private_key_store>` with the path to your ECDSA key store:
+After running the commands of the previous section to submit proofs to the batcher, you will receive responses that will be written to disk in a JSON format inside the `<batch_inclusion_data_directory_path>`, for example `19f04bbb143af72105e2287935c320cc2aa9eeda0fe1f3ffabbe4e59cdbab691_0.json`. By default, the `batch_inclusion_data` directory will be created where the submit command is being executed, but you can specify it with the `<batch_inclusion_data_directory_path>` argument. To verify their inclusion in a batch, run the following command, replacing the `<path_to_batch_inclusion_data>` placeholder with the path to your response file.
 
 ```bash
 aligned verify-proof-onchain \
---aligned-verification-data <path_to_verification_data> \
---private-key-store <path_to_private_key_store> \
---eth_rpc_url <holesky_rpc_url> \
+--aligned-verification-data <path_to_your_verification_data> \
+--rpc <holesky_rpc_url> \
 --chain holesky
 ```
 
-As an example,
+As a quick example for trying it out, you can use verification data provided by us in `./batcher/aligned/test_files/batch_inclusion_data/17bd5db82ef731ba3710b22df8e3c1ca6a5cde0a8d1ca1681664e4ff9b25574f_295.json`:
 
 ```bash
 aligned verify-proof-onchain \
---aligned-verification-data 19f04bbb143af72105e2287935c320cc2aa9eeda0fe1f3ffabbe4e59cdbab691_0.json --private-key-store config-files/anvil.ecdsa.key.json \
---eth_rpc_url https://ethereum-holesky-rpc.publicnode.com \
+--aligned-verification-data ./batcher/aligned/test_files/batch_inclusion_data/17bd5db82ef731ba3710b22df8e3c1ca6a5cde0a8d1ca1681664e4ff9b25574f_295.json \
+--rpc https://ethereum-holesky-rpc.publicnode.com \
 --chain holesky
-
 ```
 
 ## Register as an Aligned operator in testnet

batcher/aligned/abi/AlignedLayerServiceManager.json

@@ -1,9 +1,8 @@
-use crate::eth::k256::ecdsa::SigningKey;
-use ethers::prelude::*;
-use std::path::PathBuf;
 use std::str::FromStr;
 use std::sync::Arc;
 
+use ethers::prelude::*;
+
 use crate::errors::BatcherClientError;
 
 abigen!(
@@ -12,23 +11,15 @@ abigen!(
 );
 
 pub type AlignedLayerServiceManager =
-    AlignedLayerServiceManagerContract<SignerMiddleware<Provider<Http>, Wallet<SigningKey>>>;
+    AlignedLayerServiceManagerContract<Provider<Http>>;
 
 pub async fn aligned_service_manager(
     provider: Provider<Http>,
     contract_address: &str,
-    private_key_store_path: PathBuf,
-    private_key_store_password: &str,
 ) -> Result<AlignedLayerServiceManager, BatcherClientError> {
-    let chain_id = provider.get_chainid().await?;
-
-    let wallet = Wallet::decrypt_keystore(private_key_store_path, private_key_store_password)?
-        .with_chain_id(chain_id.as_u64());
-
-    let signer = Arc::new(SignerMiddleware::new(provider, wallet));
-
+    let client = Arc::new(provider);
     let contract_addr = H160::from_str(contract_address)
         .map_err(|e| BatcherClientError::EthError(e.to_string()))?;
 
-    Ok(AlignedLayerServiceManager::new(contract_addr, signer))
+    Ok(AlignedLayerServiceManager::new(contract_addr, client))
 }

batcher/aligned/src/eth.rs

@@ -97,8 +97,6 @@ pub struct VerifyProofOnchainArgs {
         default_value = "http://localhost:8545"
     )]
     eth_rpc_url: String,
-    #[arg(name = "Private key store path", long = "private-key-store")]
-    private_key_store_path: PathBuf,
     #[arg(
         name = "The Ethereum network's name",
         long = "chain",
@@ -178,15 +176,12 @@ async fn main() -> Result<(), errors::BatcherClientError> {
             let eth_rpc_url = verify_inclusion_args.eth_rpc_url;
 
             let eth_rpc_provider = Provider::<Http>::try_from(eth_rpc_url).unwrap();
-            let private_key_store_path = verify_inclusion_args.private_key_store_path;
 
             // FIXME(marian): We are passing an empty string as the private key password for the moment.
             // We should think how to handle this correctly.
             let service_manager = eth::aligned_service_manager(
                 eth_rpc_provider,
                 contract_address,
-                private_key_store_path,
-                "",
             )
             .await?;
 
@@ -201,7 +196,14 @@ async fn main() -> Result<(), errors::BatcherClientError> {
             );
 
             match call.call().await {
-                Ok(response) => info!("Batch inclusion verification response: {}", response),
+                Ok(response) => {
+                    if response {
+                        info!("Your proof was verified in Aligned and included in the batch!");
+                    } else {
+                        info!("Your proof was not included in the batch.");
+                    }
+                }
+
                 Err(err) => error!("Error while reading batch inclusion verification: {}", err),
             }
         }

batcher/aligned/src/main.rs

@@ -0,0 +1 @@
+{"verification_data_commitment":{"proof_commitment":[214,153,226,186,70,52,178,56,177,95,26,155,222,79,140,50,16,155,247,253,148,212,127,204,137,72,56,104,37,241,65,62],"pub_input_commitment":[0,30,254,69,168,234,6,219,2,20,107,191,249,51,172,61,209,244,50,36,244,58,60,169,40,101,175,43,84,253,91,178],"proving_system_aux_data_commitment":[187,126,20,41,108,203,7,235,181,242,102,121,103,110,241,178,222,85,174,142,101,224,148,217,28,219,62,22,206,111,168,95],"proof_generator_addr":[243,159,214,229,26,173,136,246,244,206,106,184,130,114,121,207,255,185,34,102]},"batch_merkle_root":[23,189,93,184,46,247,49,186,55,16,178,45,248,227,193,202,106,92,222,10,141,28,161,104,22,100,228,255,155,37,87,79],"batch_inclusion_proof":{"merkle_path":[[63,251,248,123,110,43,112,178,235,0,20,163,98,123,126,86,68,71,78,87,1,102,16,53,238,17,69,23,177,217,236,129],[14,55,193,146,95,206,25,61,144,141,112,149,191,150,167,136,46,62,15,54,159,1,16,80,234,71,200,6,95,219,115,184],[142,175,116,202,189,155,221,98,214,131,106,167,59,2,158,68,221,61,242,178,36,126,175,127,141,80,48,217,83,50,20,168],[70,59,66,54,71,169,209,88,75,85,121,164,197,29,251,122,144,28,162,49,225,235,147,253,93,148,163,97,180,167,237,30],[189,10,11,46,122,80,130,159,166,185,247,248,107,171,208,220,144,55,39,114,179,187,59,226,1,201,242,141,187,52,94,136],[30,23,91,191,80,173,188,191,233,79,118,209,180,9,251,59,121,246,74,46,4,226,69,174,177,19,77,41,228,107,95,162],[73,110,239,135,220,81,154,222,107,134,69,31,179,107,234,96,86,95,90,230,39,173,6,182,199,85,158,138,237,148,128,118],[45,2,66,15,179,156,150,221,63,156,215,131,43,0,195,48,96,107,97,25,152,214,152,35,120,154,86,197,161,40,170,65],[84,37,53,249,226,35,85,7,203,93,123,214,164,219,163,115,221,78,11,27,236,178,204,26,151,20,126,56,239,38,190,55],[105,197,236,110,121,124,150,108,56,151,149,153,173,129,59,117,99,45,5,179,118,90,115,22,172,5,85,142,21,236,223,42]]},"verification_data_batch_index":295}

batcher/aligned/test_files/batch_inclusion_data/17bd5db82ef731ba3710b22df8e3c1ca6a5cde0a8d1ca1681664e4ff9b25574f_295.json

@@ -123,7 +123,7 @@ contract AlignedLayerServiceManager is
         bytes32 batchMerkleRoot,
         bytes memory merkleProof,
         uint verificationDataBatchIndex
-    ) external returns (bool) {
+    ) external view returns (bool) {
         require(
             batchesState[batchMerkleRoot].taskCreatedBlock != 0,
             "Batch doesn't exist"