Add helper methode api.compose_extrsinic_offline

examples/examples/benchmark_bulk_xt.rs

@@ -21,8 +21,7 @@
 use kitchensink_runtime::{BalancesCall, Runtime, RuntimeCall};
 use sp_keyring::AccountKeyring;
 use substrate_api_client::{
-	compose_extrinsic_offline, rpc::JsonrpseeClient, Api, AssetTipExtrinsicParams, SubmitExtrinsic,
-	UncheckedExtrinsicV4,
+	rpc::JsonrpseeClient, Api, AssetTipExtrinsicParams, GenericAddress, SubmitExtrinsic,
 };
 
 #[tokio::main]
@@ -44,15 +43,11 @@ async fn main() {
 	let first_nonce = nonce;
 	while nonce < first_nonce + 500 {
 		// compose the extrinsic with all the element
-		#[allow(clippy::redundant_clone)]
-		let xt: UncheckedExtrinsicV4<_, _> = compose_extrinsic_offline!(
-			api.signer().unwrap().clone(),
-			RuntimeCall::Balances(BalancesCall::transfer {
-				dest: GenericAddress::Id(to.clone()),
-				value: 1_000_000
-			}),
-			api.extrinsic_params(nonce)
-		);
+		let call = RuntimeCall::Balances(BalancesCall::transfer {
+			dest: GenericAddress::Id(to.clone()),
+			value: 1_000_000,
+		});
+		let xt = api.compose_extrinsic_offline(call, nonce);
 
 		println!("sending extrinsic with nonce {}", nonce);
 		let _tx_hash = api.submit_extrinsic(xt.hex_encode()).unwrap();

examples/examples/compose_extrinsic_offline.rs

@@ -20,8 +20,8 @@ use kitchensink_runtime::{BalancesCall, Header, Runtime, RuntimeCall};
 use sp_keyring::AccountKeyring;
 use sp_runtime::{generic::Era, MultiAddress};
 use substrate_api_client::{
-	compose_extrinsic_offline, rpc::JsonrpseeClient, Api, AssetTipExtrinsicParams,
-	AssetTipExtrinsicParamsBuilder, GetHeader, SubmitAndWatch, UncheckedExtrinsicV4, XtStatus,
+	rpc::JsonrpseeClient, Api, AssetTipExtrinsicParams, AssetTipExtrinsicParamsBuilder, GetHeader,
+	SubmitAndWatch, XtStatus,
 };
 
 #[tokio::main]
@@ -55,12 +55,8 @@ async fn main() {
 	let to = MultiAddress::Id(AccountKeyring::Bob.to_account_id());
 
 	// Compose the extrinsic.
-	#[allow(clippy::redundant_clone)]
-	let xt: UncheckedExtrinsicV4<_, _> = compose_extrinsic_offline!(
-		api.signer().unwrap().clone(),
-		RuntimeCall::Balances(BalancesCall::transfer { dest: to.clone(), value: 42 }),
-		api.extrinsic_params(alice_nonce)
-	);
+	let call = RuntimeCall::Balances(BalancesCall::transfer { dest: to, value: 42 });
+	let xt = api.compose_extrinsic_offline(call, alice_nonce);
 
 	println!("[+] Composed Extrinsic:\n {:?}\n", xt);
 

examples/examples/custom_nonce.rs

@@ -20,8 +20,8 @@ use kitchensink_runtime::{BalancesCall, Runtime, RuntimeCall};
 use sp_keyring::AccountKeyring;
 use sp_runtime::{generic::Era, MultiAddress};
 use substrate_api_client::{
-	compose_extrinsic_offline, rpc::JsonrpseeClient, Api, AssetTipExtrinsicParams,
-	AssetTipExtrinsicParamsBuilder, GetHeader, SubmitAndWatch, UncheckedExtrinsicV4, XtStatus,
+	rpc::JsonrpseeClient, Api, AssetTipExtrinsicParams, AssetTipExtrinsicParamsBuilder, GetHeader,
+	SubmitAndWatch, XtStatus,
 };
 
 #[tokio::main]
@@ -55,13 +55,8 @@ async fn main() {
 	let to = MultiAddress::Id(AccountKeyring::Bob.to_account_id());
 
 	// Create an extrinsic that should get included in the future pool due to a nonce that is too high.
-	#[allow(clippy::redundant_clone)]
-	let xt: UncheckedExtrinsicV4<_, _> = compose_extrinsic_offline!(
-		api.signer().unwrap().clone(),
-		RuntimeCall::Balances(BalancesCall::transfer { dest: to.clone(), value: 42 }),
-		api.extrinsic_params(alice_nonce + 1)
-	);
-
+	let call = RuntimeCall::Balances(BalancesCall::transfer { dest: to, value: 42 });
+	let xt = api.compose_extrinsic_offline(call, alice_nonce + 1);
 	println!("[+] Composed Extrinsic:\n {:?}\n", xt);
 
 	// Send and watch extrinsic until InBlock.

examples/examples/generic_extrinsic.rs

@@ -39,14 +39,8 @@ async fn main() {
 
 	// call Balances::transfer
 	// the names are given as strings
-	#[allow(clippy::redundant_clone)]
-	let xt: UncheckedExtrinsicV4<_, _> = compose_extrinsic!(
-		api.clone(),
-		"Balances",
-		"transfer",
-		GenericAddress::Id(to),
-		Compact(42_u128)
-	);
+	let xt: UncheckedExtrinsicV4<_, _> =
+		compose_extrinsic!(&api, "Balances", "transfer", GenericAddress::Id(to), Compact(42_u128));
 
 	println!("[+] Composed Extrinsic:\n {:?}\n", xt);
 

examples/examples/sudo.rs

@@ -39,9 +39,8 @@ async fn main() {
 	let to = AccountKeyring::Bob.to_account_id();
 
 	// this call can only be called by sudo
-	#[allow(clippy::redundant_clone)]
 	let call = compose_call!(
-		api.metadata().clone(),
+		api.metadata(),
 		"Balances",
 		"set_balance",
 		GenericAddress::Id(to),

src/extrinsic/mod.rs

@@ -20,6 +20,7 @@
 pub mod balances;
 pub mod common;
 pub mod contracts;
+pub mod offline_extrinsic;
 #[cfg(feature = "staking-xt")]
 pub mod staking;
 pub mod utility;

src/extrinsic/offline_extrinsic.rs

@@ -0,0 +1,47 @@
+/*
+   Copyright 2019 Supercomputing Systems AG
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+	   http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+*/
+
+//! Helper function to easily create extrinsics offline (without getter calls to the node).
+
+use crate::Api;
+use ac_compose_macros::compose_extrinsic_offline;
+use ac_primitives::{ExtrinsicParams, FrameSystemConfig, UncheckedExtrinsicV4};
+use codec::Encode;
+use sp_core::Pair;
+use sp_runtime::{MultiSignature, MultiSigner};
+
+impl<Signer, Client, Params, Runtime> Api<Signer, Client, Params, Runtime>
+where
+	Signer: Pair,
+	MultiSignature: From<Signer::Signature>,
+	MultiSigner: From<Signer::Public>,
+	Params: ExtrinsicParams<Runtime::Index, Runtime::Hash>,
+	Runtime: FrameSystemConfig,
+	Runtime::AccountId: From<Signer::Public>,
+{
+	/// Wrapper around the `compose_extrinsic_offline!` macro to be less verbose.
+	pub fn compose_extrinsic_offline<Call: Encode + Clone>(
+		&self,
+		call: Call,
+		nonce: Runtime::Index,
+	) -> UncheckedExtrinsicV4<Call, Params::SignedExtra> {
+		match self.signer() {
+			Some(signer) => compose_extrinsic_offline!(signer, call, self.extrinsic_params(nonce)),
+			None => UncheckedExtrinsicV4 { signature: None, function: call },
+		}
+	}
+}