feat(cli): get_first_nonce_in_queue

Author: MarcosNicolau

batcher/aligned/src/main.rs

@@ -11,8 +11,8 @@ use aligned_sdk::core::{
     types::{AlignedVerificationData, Network, ProvingSystemId, VerificationData},
 };
 use aligned_sdk::sdk::get_chain_id;
+use aligned_sdk::sdk::get_first_nonce_in_queue_from_batcher;
 use aligned_sdk::sdk::get_nonce_from_batcher;
-use aligned_sdk::sdk::get_nonce_from_ethereum;
 use aligned_sdk::sdk::{deposit_to_aligned, get_balance_in_aligned};
 use aligned_sdk::sdk::{get_vk_commitment, is_proof_verified, save_response, submit_multiple};
 use clap::Parser;
@@ -29,7 +29,7 @@ use transaction::eip2718::TypedTransaction;
 
 use crate::AlignedCommands::DepositToBatcher;
 use crate::AlignedCommands::GetUserBalance;
-use crate::AlignedCommands::GetUserFirstNonce;
+use crate::AlignedCommands::GetUserFirstNonceInBatcherQueue;
 use crate::AlignedCommands::GetUserNonce;
 use crate::AlignedCommands::GetVkCommitment;
 use crate::AlignedCommands::Submit;
@@ -61,10 +61,10 @@ pub enum AlignedCommands {
     #[clap(about = "Get user nonce from the batcher", name = "get-user-nonce")]
     GetUserNonce(GetUserNonceArgs),
     #[clap(
-        about = "Get the first user nonce from ethereum",
-        name = "get-user-first-nonce"
+        about = "Returns the nonce of the proof with the lowest nonce inside the batcher queue for a given address. Useful when your proofs are stuck in the batcher due to a low fee and you need to bump them.",
+        name = "get-user-first-nonce-in-batcher-queue"
     )]
-    GetUserFirstNonce(GetUserFirstNonceArgs),
+    GetUserFirstNonceInBatcherQueue(GetUserFirstNonceInBatcherQueueArgs),
 }
 
 #[derive(Parser, Debug)]
@@ -227,25 +227,19 @@ pub struct GetUserNonceArgs {
 
 #[derive(Parser, Debug)]
 #[command(version, about, long_about = None)]
-pub struct GetUserFirstNonceArgs {
-    #[arg(
-        name = "Ethereum RPC provider address",
-        long = "rpc_url",
-        default_value = "http://localhost:8545"
-    )]
-    eth_rpc_url: String,
+pub struct GetUserFirstNonceInBatcherQueueArgs {
     #[arg(
         name = "The user's Ethereum address",
         long = "user_addr",
         required = true
     )]
     address: String,
     #[arg(
-        name = "The working network's name",
-        long = "network",
-        default_value = "devnet"
+        name = "Batcher connection address",
+        long = "batcher_url",
+        default_value = "ws://localhost:8080"
     )]
-    network: NetworkArg,
+    batcher_url: String,
 }
 
 #[derive(Debug, Clone, ValueEnum, Copy)]
@@ -558,13 +552,14 @@ async fn main() -> Result<(), AlignedError> {
                 }
             }
         }
-        GetUserFirstNonce(args) => {
+        GetUserFirstNonceInBatcherQueue(args) => {
             let address = H160::from_str(&args.address).unwrap();
-            let network = args.network.into();
-            match get_nonce_from_ethereum(&args.eth_rpc_url, address, network).await {
+            match get_first_nonce_in_queue_from_batcher(&args.batcher_url, address).await {
                 Ok(nonce) => {
-                    let first_nonce = nonce + 1;
-                    info!("Nonce for address {} is {}", address, first_nonce);
+                    info!(
+                        "First nonce in batcher queue for address {} is {}",
+                        address, nonce
+                    );
                 }
                 Err(e) => {
                     error!("Error while getting nonce: {:?}", e);