support json rpc 2.0 with author_submitAndWatchExtrinsic trusted calls

cli/src/benchmark/mod.rs

@@ -20,7 +20,10 @@ use crate::{
 	get_layer_two_nonce,
 	trusted_cli::TrustedCli,
 	trusted_command_utils::{get_identifiers, get_keystore_path, get_pair_from_str},
-	trusted_operation::{get_json_request, get_state, perform_trusted_operation, wait_until},
+	trusted_operation::{
+		await_status, await_subscription_response, get_json_request, get_state,
+		perform_trusted_operation,
+	},
 	Cli, CliResult, CliResultOk, SR25519_KEY_TYPE,
 };
 use codec::Decode;
@@ -35,7 +38,7 @@ use itp_stf_primitives::{
 };
 use itp_types::{
 	AccountInfo, Balance, ShardIdentifier, TrustedOperationStatus,
-	TrustedOperationStatus::{InSidechainBlock, Submitted},
+	TrustedOperationStatus::InSidechainBlock,
 };
 use log::*;
 use rand::Rng;
@@ -47,7 +50,7 @@ use sp_keystore::Keystore;
 use std::{
 	boxed::Box,
 	string::ToString,
-	sync::mpsc::{channel, Receiver},
+	sync::mpsc::{channel, Receiver, Sender},
 	thread, time,
 	time::Instant,
 	vec::Vec,
@@ -89,6 +92,7 @@ struct BenchmarkClient {
 	account: sr25519_core::Pair,
 	current_balance: u128,
 	client_api: DirectClient,
+	sender: Sender<String>,
 	receiver: Receiver<String>,
 }
 
@@ -104,8 +108,8 @@ impl BenchmarkClient {
 
 		debug!("setup sender and receiver");
 		let (sender, receiver) = channel();
-		client_api.watch(initial_request, sender);
-		BenchmarkClient { account, current_balance: initial_balance, client_api, receiver }
+		client_api.watch(initial_request, sender.clone());
+		BenchmarkClient { account, current_balance: initial_balance, client_api, sender, receiver }
 	}
 }
 
@@ -161,7 +165,7 @@ impl BenchmarkCommand {
 				&mrenclave,
 				&shard,
 			)
-			.into_trusted_operation(trusted_args.direct);
+			.into_trusted_operation(true);
 
 			// For the last account we wait for confirmation in order to ensure all accounts were setup correctly
 			let wait_for_confirmation = i == self.number_clients - 1;
@@ -218,7 +222,8 @@ impl BenchmarkCommand {
 
 					let last_iteration = i == self.number_iterations - 1;
 					let jsonrpc_call = get_json_request(shard, &top, shielding_pubkey);
-					client.client_api.send(&jsonrpc_call).unwrap();
+
+					client.client_api.watch(jsonrpc_call, client.sender.clone());
 					let result = wait_for_top_confirmation(
 						self.wait_for_confirmation || last_iteration,
 						&client,
@@ -337,15 +342,22 @@ fn wait_for_top_confirmation(
 ) -> BenchmarkTransaction {
 	let started = Instant::now();
 
-	let submitted = wait_until(&client.receiver, is_submitted);
+	// the first response of `submitAndWatch` is just the plain top hash
+	let submitted = match await_subscription_response(&client.receiver) {
+		Ok(hash) => Some((hash, Instant::now())),
+		Err(e) => {
+			error!("recv error: {e:?}");
+			None
+		},
+	};
 
 	let confirmed = if wait_for_sidechain_block {
 		// We wait for the transaction hash that actually matches the submitted hash
 		loop {
-			let transaction_information = wait_until(&client.receiver, is_sidechain_block);
-			if let Some((hash, _)) = transaction_information {
+			let transaction_information = await_status(&client.receiver, is_sidechain_block).ok();
+			if let Some((hash, _status)) = transaction_information {
 				if hash == submitted.unwrap().0 {
-					break transaction_information
+					break Some((hash, Instant::now()))
 				}
 			}
 		}
@@ -364,10 +376,6 @@ fn wait_for_top_confirmation(
 	}
 }
 
-fn is_submitted(s: TrustedOperationStatus) -> bool {
-	matches!(s, Submitted)
-}
-
 fn is_sidechain_block(s: TrustedOperationStatus) -> bool {
 	matches!(s, InSidechainBlock(_))
 }

cli/src/evm/commands/evm_call.rs

@@ -19,7 +19,7 @@ use crate::{
 	get_layer_two_evm_nonce, get_layer_two_nonce,
 	trusted_cli::TrustedCli,
 	trusted_command_utils::{get_identifiers, get_pair_from_str},
-	trusted_operation::perform_trusted_operation,
+	trusted_operation::{perform_trusted_operation, send_direct_request},
 	Cli, CliResult, CliResultOk,
 };
 use ita_stf::{Index, TrustedCall, TrustedGetter};
@@ -31,6 +31,7 @@ use itp_types::AccountId;
 use log::*;
 use sp_core::{crypto::Ss58Codec, Pair, H160, U256};
 use std::{boxed::Box, vec::Vec};
+
 #[derive(Parser)]
 pub struct EvmCallCommands {
 	/// Sender's incognito AccountId in ss58check format, mnemonic or hex seed
@@ -81,7 +82,12 @@ impl EvmCallCommands {
 		)
 		.sign(&KeyPair::Sr25519(Box::new(sender)), nonce, &mrenclave, &shard)
 		.into_trusted_operation(trusted_args.direct);
-		Ok(perform_trusted_operation::<()>(cli, trusted_args, &function_call)
-			.map(|_| CliResultOk::None)?)
+
+		if trusted_args.direct {
+			Ok(send_direct_request(cli, trusted_args, &function_call).map(|_| CliResultOk::None)?)
+		} else {
+			Ok(perform_trusted_operation::<()>(cli, trusted_args, &function_call)
+				.map(|_| CliResultOk::None)?)
+		}
 	}
 }

cli/src/evm/commands/evm_create.rs

@@ -19,7 +19,7 @@ use crate::{
 	get_layer_two_evm_nonce, get_layer_two_nonce,
 	trusted_cli::TrustedCli,
 	trusted_command_utils::{get_identifiers, get_pair_from_str},
-	trusted_operation::perform_trusted_operation,
+	trusted_operation::{perform_trusted_operation, send_direct_request},
 	Cli, CliResult, CliResultOk,
 };
 use ita_stf::{evm_helpers::evm_create_address, Index, TrustedCall, TrustedGetter};
@@ -33,6 +33,7 @@ use pallet_evm::{AddressMapping, HashedAddressMapping};
 use sp_core::{crypto::Ss58Codec, Pair, H160, U256};
 use sp_runtime::traits::BlakeTwo256;
 use std::vec::Vec;
+
 #[derive(Parser)]
 pub struct EvmCreateCommands {
 	/// Sender's incognito AccountId in ss58check format, mnemonic or hex seed
@@ -79,7 +80,11 @@ impl EvmCreateCommands {
 		.sign(&from.into(), nonce, &mrenclave, &shard)
 		.into_trusted_operation(trusted_args.direct);
 
-		perform_trusted_operation::<()>(cli, trusted_args, &top)?;
+		if trusted_args.direct {
+			send_direct_request(cli, trusted_args, &top).map(|_| CliResultOk::None)?;
+		} else {
+			perform_trusted_operation::<()>(cli, trusted_args, &top).map(|_| CliResultOk::None)?;
+		}
 
 		let execution_address = evm_create_address(sender_evm_acc, evm_account_nonce);
 		info!("trusted call evm_create executed");

cli/src/guess_the_number/commands/guess.rs

@@ -23,6 +23,7 @@ use crate::{
 	Cli, CliResult, CliResultOk,
 };
 
+use crate::trusted_operation::send_direct_request;
 use ita_stf::{
 	guess_the_number::GuessTheNumberTrustedCall, Getter, Index, TrustedCall, TrustedCallSigned,
 };
@@ -55,6 +56,12 @@ impl GuessCommand {
 		)
 		.sign(&KeyPair::Sr25519(Box::new(signer)), nonce, &mrenclave, &shard)
 		.into_trusted_operation(trusted_args.direct);
-		Ok(perform_trusted_operation::<()>(cli, trusted_args, &top).map(|_| CliResultOk::None)?)
+
+		if trusted_args.direct {
+			Ok(send_direct_request(cli, trusted_args, &top).map(|_| CliResultOk::None)?)
+		} else {
+			Ok(perform_trusted_operation::<()>(cli, trusted_args, &top)
+				.map(|_| CliResultOk::None)?)
+		}
 	}
 }

cli/src/guess_the_number/commands/push_by_one_day.rs

@@ -23,6 +23,7 @@ use crate::{
 	Cli, CliResult, CliResultOk,
 };
 
+use crate::trusted_operation::send_direct_request;
 use ita_stf::{
 	guess_the_number::GuessTheNumberTrustedCall, Getter, Index, TrustedCall, TrustedCallSigned,
 };
@@ -53,6 +54,12 @@ impl PushByOneDayCommand {
 		)
 		.sign(&KeyPair::Sr25519(Box::new(signer)), nonce, &mrenclave, &shard)
 		.into_trusted_operation(trusted_args.direct);
-		Ok(perform_trusted_operation::<()>(cli, trusted_args, &top).map(|_| CliResultOk::None)?)
+
+		if trusted_args.direct {
+			Ok(send_direct_request(cli, trusted_args, &top).map(|_| CliResultOk::None)?)
+		} else {
+			Ok(perform_trusted_operation::<()>(cli, trusted_args, &top)
+				.map(|_| CliResultOk::None)?)
+		}
 	}
 }

cli/src/guess_the_number/commands/set_winnings.rs

@@ -19,7 +19,7 @@ use crate::{
 	get_layer_two_nonce,
 	trusted_cli::TrustedCli,
 	trusted_command_utils::{get_identifiers, get_pair_from_str},
-	trusted_operation::perform_trusted_operation,
+	trusted_operation::{perform_trusted_operation, send_direct_request},
 	Cli, CliResult, CliResultOk,
 };
 use ita_parentchain_interface::integritee::Balance;
@@ -59,6 +59,12 @@ impl SetWinningsCommand {
 		)
 		.sign(&KeyPair::Sr25519(Box::new(signer)), nonce, &mrenclave, &shard)
 		.into_trusted_operation(trusted_args.direct);
-		Ok(perform_trusted_operation::<()>(cli, trusted_args, &top).map(|_| CliResultOk::None)?)
+
+		if trusted_args.direct {
+			Ok(send_direct_request(cli, trusted_args, &top).map(|_| CliResultOk::None)?)
+		} else {
+			Ok(perform_trusted_operation::<()>(cli, trusted_args, &top)
+				.map(|_| CliResultOk::None)?)
+		}
 	}
 }

cli/src/trusted_base_cli/commands/set_balance.rs

@@ -19,7 +19,7 @@ use crate::{
 	get_layer_two_nonce,
 	trusted_cli::TrustedCli,
 	trusted_command_utils::{get_identifiers, get_pair_from_str},
-	trusted_operation::perform_trusted_operation,
+	trusted_operation::{perform_trusted_operation, send_direct_request},
 	Cli, CliResult, CliResultOk,
 };
 use ita_parentchain_interface::integritee::Balance;
@@ -59,6 +59,12 @@ impl SetBalanceCommand {
 		)
 		.sign(&KeyPair::Sr25519(Box::new(signer)), nonce, &mrenclave, &shard)
 		.into_trusted_operation(trusted_args.direct);
-		Ok(perform_trusted_operation::<()>(cli, trusted_args, &top).map(|_| CliResultOk::None)?)
+
+		if trusted_args.direct {
+			Ok(send_direct_request(cli, trusted_args, &top).map(|_| CliResultOk::None)?)
+		} else {
+			Ok(perform_trusted_operation::<()>(cli, trusted_args, &top)
+				.map(|_| CliResultOk::None)?)
+		}
 	}
 }

cli/src/trusted_base_cli/commands/transfer.rs

@@ -19,7 +19,7 @@ use crate::{
 	get_layer_two_nonce,
 	trusted_cli::TrustedCli,
 	trusted_command_utils::{get_accountid_from_str, get_identifiers, get_pair_from_str},
-	trusted_operation::perform_trusted_operation,
+	trusted_operation::{perform_trusted_operation, send_direct_request},
 	Cli, CliResult, CliResultOk,
 };
 use base58::ToBase58;
@@ -65,9 +65,12 @@ impl TransferCommand {
 			TrustedCall::balance_transfer(from.public().into(), to, self.amount)
 				.sign(&KeyPair::Sr25519(Box::new(from)), nonce, &mrenclave, &shard)
 				.into_trusted_operation(trusted_args.direct);
-		let res =
-			perform_trusted_operation::<()>(cli, trusted_args, &top).map(|_| CliResultOk::None)?;
-		info!("trusted call transfer executed");
-		Ok(res)
+
+		if trusted_args.direct {
+			Ok(send_direct_request(cli, trusted_args, &top).map(|_| CliResultOk::None)?)
+		} else {
+			Ok(perform_trusted_operation::<()>(cli, trusted_args, &top)
+				.map(|_| CliResultOk::None)?)
+		}
 	}
 }

cli/src/trusted_base_cli/commands/unshield_funds.rs

@@ -19,7 +19,7 @@ use crate::{
 	get_layer_two_nonce,
 	trusted_cli::TrustedCli,
 	trusted_command_utils::{get_accountid_from_str, get_identifiers, get_pair_from_str},
-	trusted_operation::perform_trusted_operation,
+	trusted_operation::{perform_trusted_operation, send_direct_request},
 	Cli, CliResult, CliResultOk,
 };
 use ita_parentchain_interface::integritee::Balance;
@@ -31,6 +31,7 @@ use itp_stf_primitives::{
 use log::*;
 use sp_core::{crypto::Ss58Codec, Pair};
 use std::boxed::Box;
+
 #[derive(Parser)]
 pub struct UnshieldFundsCommand {
 	/// Sender's incognito AccountId in ss58check format, mnemonic or hex seed
@@ -63,6 +64,12 @@ impl UnshieldFundsCommand {
 			TrustedCall::balance_unshield(from.public().into(), to, self.amount, shard)
 				.sign(&KeyPair::Sr25519(Box::new(from)), nonce, &mrenclave, &shard)
 				.into_trusted_operation(trusted_args.direct);
-		Ok(perform_trusted_operation::<()>(cli, trusted_args, &top).map(|_| CliResultOk::None)?)
+
+		if trusted_args.direct {
+			Ok(send_direct_request(cli, trusted_args, &top).map(|_| CliResultOk::None)?)
+		} else {
+			Ok(perform_trusted_operation::<()>(cli, trusted_args, &top)
+				.map(|_| CliResultOk::None)?)
+		}
 	}
 }