chore: Finalized flag in all commands

Cargo.toml

@@ -35,6 +35,7 @@ thiserror = "2.0"
 
 # Terminal UI
 colored = "3.0"
+indicatif = "0.17"
 
 # Additional utilities
 sha2 = "0.10"

src/cli/common.rs

@@ -113,25 +113,15 @@ pub async fn get_incremented_nonce_with_client(
 	Ok(incremented_nonce)
 }
 
-/// Default function for transaction submission, waits until transaction is in the best block
+/// Submit transaction with optional finalization check
+///
+/// By default (finalized=false), waits until transaction is in the best block (fast)
+/// With finalized=true, waits until transaction is in a finalized block (slow in PoW chains)
 pub async fn submit_transaction<Call>(
 	quantus_client: &crate::chain::client::QuantusClient,
 	from_keypair: &crate::wallet::QuantumKeyPair,
 	call: Call,
 	tip: Option<u128>,
-) -> crate::error::Result<subxt::utils::H256>
-where
-	Call: subxt::tx::Payload,
-{
-	submit_transaction_with_finalization(quantus_client, from_keypair, call, tip, false).await
-}
-
-/// Helper function to submit transaction with an optional finalization check
-pub async fn submit_transaction_with_finalization<Call>(
-	quantus_client: &crate::chain::client::QuantusClient,
-	from_keypair: &crate::wallet::QuantumKeyPair,
-	call: Call,
-	tip: Option<u128>,
 	finalized: bool,
 ) -> crate::error::Result<subxt::utils::H256>
 where
@@ -332,23 +322,64 @@ async fn wait_tx_inclusion(
 	tx_progress: &mut TxProgress<ChainConfig, OnlineClient<ChainConfig>>,
 	finalized: bool,
 ) -> Result<()> {
+	use indicatif::{ProgressBar, ProgressStyle};
+
+	// Create spinner (only in non-verbose mode)
+	let spinner = if !crate::log::is_verbose() {
+		let pb = ProgressBar::new_spinner();
+		pb.set_style(
+			ProgressStyle::default_spinner()
+				.tick_chars("⠋⠙⠹⠸⠼⠴⠦⠧⠇⠏")
+				.template("{spinner:.cyan} {msg} {elapsed:.dim}")
+				.unwrap(),
+		);
+
+		if finalized {
+			pb.set_message("Waiting for finalized block...");
+		} else {
+			pb.set_message("Waiting for block inclusion...");
+		}
+
+		pb.enable_steady_tick(std::time::Duration::from_millis(100));
+		Some(pb)
+	} else {
+		None
+	};
+
 	while let Some(Ok(status)) = tx_progress.next().await {
 		crate::log_verbose!("   Transaction status: {:?}", status);
+
 		match status {
+			TxStatus::Validated =>
+				if let Some(ref pb) = spinner {
+					pb.set_message("Transaction validated ✓");
+				},
 			TxStatus::InBestBlock(block_hash) => {
 				crate::log_verbose!("   Transaction included in block: {:?}", block_hash);
 				if finalized {
+					if let Some(ref pb) = spinner {
+						pb.set_message("In best block, waiting for finalization...");
+					}
 					continue;
 				} else {
+					if let Some(pb) = spinner {
+						pb.finish_with_message("✅ Transaction included in block!");
+					}
 					break;
 				};
 			},
 			TxStatus::InFinalizedBlock(block_hash) => {
 				crate::log_verbose!("   Transaction finalized in block: {:?}", block_hash);
+				if let Some(pb) = spinner {
+					pb.finish_with_message("✅ Transaction finalized!");
+				}
 				break;
 			},
 			TxStatus::Error { message } | TxStatus::Invalid { message } => {
 				crate::log_error!("   Transaction error: {}", message);
+				if let Some(pb) = spinner {
+					pb.finish_with_message("❌ Transaction error!");
+				}
 				break;
 			},
 			_ => continue,

src/cli/generic_call.rs

@@ -165,14 +165,20 @@ async fn submit_balance_transfer(
 			subxt::ext::subxt_core::utils::MultiAddress::Id(to_account_id_subxt),
 			amount,
 		);
-		crate::cli::common::submit_transaction(quantus_client, from_keypair, transfer_call, tip)
-			.await
+		crate::cli::common::submit_transaction(
+			quantus_client,
+			from_keypair,
+			transfer_call,
+			tip,
+			finalized,
+		)
+		.await
 	} else {
 		let transfer_call = quantus_subxt::api::tx().balances().transfer_allow_death(
 			subxt::ext::subxt_core::utils::MultiAddress::Id(to_account_id_subxt),
 			amount,
 		);
-		crate::cli::common::submit_transaction_with_finalization(
+		crate::cli::common::submit_transaction(
 			quantus_client,
 			from_keypair,
 			transfer_call,
@@ -203,7 +209,7 @@ async fn submit_system_remark(
 
 	let remark_call = quantus_subxt::api::tx().system().remark(remark.as_bytes().to_vec());
 
-	crate::cli::common::submit_transaction_with_finalization(
+	crate::cli::common::submit_transaction(
 		quantus_client,
 		from_keypair,
 		remark_call,
@@ -259,14 +265,8 @@ async fn submit_tech_collective_add_member(
 		},
 	));
 
-	crate::cli::common::submit_transaction_with_finalization(
-		quantus_client,
-		from_keypair,
-		sudo_call,
-		None,
-		finalized,
-	)
-	.await
+	crate::cli::common::submit_transaction(quantus_client, from_keypair, sudo_call, None, finalized)
+		.await
 }
 
 /// Submit tech collective remove member
@@ -302,14 +302,8 @@ async fn submit_tech_collective_remove_member(
 		},
 	));
 
-	crate::cli::common::submit_transaction_with_finalization(
-		quantus_client,
-		from_keypair,
-		sudo_call,
-		None,
-		finalized,
-	)
-	.await
+	crate::cli::common::submit_transaction(quantus_client, from_keypair, sudo_call, None, finalized)
+		.await
 }
 
 /// Submit tech collective vote
@@ -330,14 +324,8 @@ async fn submit_tech_collective_vote(
 
 	let vote_call = quantus_subxt::api::tx().tech_collective().vote(referendum_index, aye);
 
-	crate::cli::common::submit_transaction_with_finalization(
-		quantus_client,
-		from_keypair,
-		vote_call,
-		None,
-		finalized,
-	)
-	.await
+	crate::cli::common::submit_transaction(quantus_client, from_keypair, vote_call, None, finalized)
+		.await
 }
 
 /// Submit reversible transfer
@@ -374,7 +362,7 @@ async fn submit_reversible_transfer(
 		amount,
 	);
 
-	crate::cli::common::submit_transaction_with_finalization(
+	crate::cli::common::submit_transaction(
 		quantus_client,
 		from_keypair,
 		schedule_call,

src/cli/high_security.rs

@@ -160,7 +160,7 @@ pub async fn handle_high_security_command(
 				.reversible_transfers()
 				.set_high_security(delay_value, interceptor_subxt);
 
-			let tx_hash = crate::cli::common::submit_transaction_with_finalization(
+			let tx_hash = crate::cli::common::submit_transaction(
 				&quantus_client,
 				&keypair,
 				tx_call,

src/cli/mod.rs

@@ -272,19 +272,25 @@ pub async fn execute_command(
 		Commands::Scheduler(scheduler_cmd) =>
 			scheduler::handle_scheduler_command(scheduler_cmd, node_url, finalized).await,
 		Commands::Storage(storage_cmd) =>
-			storage::handle_storage_command(storage_cmd, node_url).await,
+			storage::handle_storage_command(storage_cmd, node_url, finalized).await,
 		Commands::TechCollective(tech_collective_cmd) =>
-			tech_collective::handle_tech_collective_command(tech_collective_cmd, node_url).await,
+			tech_collective::handle_tech_collective_command(
+				tech_collective_cmd,
+				node_url,
+				finalized,
+			)
+			.await,
 		Commands::Preimage(preimage_cmd) =>
 			preimage::handle_preimage_command(preimage_cmd, node_url, finalized).await,
 		Commands::TechReferenda(tech_referenda_cmd) =>
-			tech_referenda::handle_tech_referenda_command(tech_referenda_cmd, node_url).await,
+			tech_referenda::handle_tech_referenda_command(tech_referenda_cmd, node_url, finalized)
+				.await,
 		Commands::Referenda(referenda_cmd) =>
-			referenda::handle_referenda_command(referenda_cmd, node_url).await,
+			referenda::handle_referenda_command(referenda_cmd, node_url, finalized).await,
 		Commands::Treasury(treasury_cmd) =>
-			treasury::handle_treasury_command(treasury_cmd, node_url).await,
+			treasury::handle_treasury_command(treasury_cmd, node_url, finalized).await,
 		Commands::Runtime(runtime_cmd) =>
-			runtime::handle_runtime_command(runtime_cmd, node_url).await,
+			runtime::handle_runtime_command(runtime_cmd, node_url, finalized).await,
 		Commands::Call {
 			pallet,
 			call,

src/cli/preimage.rs

@@ -309,7 +309,7 @@ async fn request_preimage(
 	let request_call = quantus_subxt::api::tx().preimage().request_preimage(preimage_hash);
 
 	// Submit transaction
-	let tx_hash = crate::cli::common::submit_transaction_with_finalization(
+	let tx_hash = crate::cli::common::submit_transaction(
 		quantus_client,
 		&keypair,
 		request_call,
@@ -346,7 +346,7 @@ async fn note_preimage(
 	let note_call = quantus_subxt::api::tx().preimage().note_preimage(content);
 
 	// Submit transaction
-	let tx_hash = crate::cli::common::submit_transaction_with_finalization(
+	let tx_hash = crate::cli::common::submit_transaction(
 		quantus_client,
 		&keypair,
 		note_call,
@@ -410,7 +410,7 @@ async fn create_preimage(
 
 	log_print!("📝 Submitting preimage...");
 	let note_preimage_tx = quantus_subxt::api::tx().preimage().note_preimage(bounded_bytes);
-	let preimage_tx_hash = crate::cli::common::submit_transaction_with_finalization(
+	let preimage_tx_hash = crate::cli::common::submit_transaction(
 		quantus_client,
 		&keypair,
 		note_preimage_tx,