Add api traits

Cargo.toml

@@ -25,7 +25,7 @@ serde = { version = "1.0.136", default-features = false, features = ["derive"] }
 serde_json = { version = "1.0.79", default-features = false }
 thiserror = { version = "1.0.30", optional = true }
 tungstenite = { version = "0.18.0", optional = true, features = ["native-tls"] }
-url = { verson = "2.0.0", optional = true }
+url = { version = "2.0.0", optional = true }
 ws = { version = "0.9.2", optional = true, features = ["ssl"] }
 
 

compose-macros/src/lib.rs

@@ -68,7 +68,7 @@ macro_rules! compose_extrinsic_offline {
     $params: expr) => {{
 		use $crate::{
 			primitives::{ExtrinsicParams, GenericAddress, SignedPayload, UncheckedExtrinsicV4},
-			sp_core::crypto::Pair,
+			sp_core::{crypto::Pair, Public},
 			sp_runtime::{generic::Era, traits::IdentifyAccount, MultiSigner},
 		};
 

examples/batch_payout.rs

@@ -11,7 +11,10 @@ use sp_keyring::AccountKeyring;
 #[cfg(feature = "staking-xt")]
 use sp_runtime::{app_crypto::Ss58Codec, AccountId32};
 #[cfg(feature = "staking-xt")]
-use substrate_api_client::{rpc::JsonrpseeClient, Api, PlainTipExtrinsicParams, XtStatus};
+use substrate_api_client::{
+	rpc::JsonrpseeClient, Api, GetGenericStorage, NodeSubscription, PlainTipExtrinsicParams,
+	XtStatus,
+};
 
 #[cfg(feature = "staking-xt")]
 #[tokio::main]

examples/benchmark_bulk_xt.rs

@@ -21,7 +21,8 @@
 use kitchensink_runtime::{BalancesCall, Runtime, RuntimeCall};
 use sp_keyring::AccountKeyring;
 use substrate_api_client::{
-	compose_extrinsic_offline, Api, AssetTipExtrinsicParams, JsonrpseeClient, UncheckedExtrinsicV4,
+	compose_extrinsic_offline, Api, AssetTipExtrinsicParams, JsonrpseeClient, SubmitExtrinsic,
+	UncheckedExtrinsicV4,
 };
 
 #[tokio::main]

examples/compose_extrinsic_offline.rs

@@ -21,8 +21,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,
-	UncheckedExtrinsicV4, XtStatus,
+	compose_extrinsic_offline, rpc::JsonrpseeClient, Api, AssetTipExtrinsicParams, GetHeader,
+	NodeSubscription, UncheckedExtrinsicV4, XtStatus,
 };
 
 #[tokio::main]

examples/contract_instantiate_with_code.rs

@@ -19,7 +19,8 @@ use codec::Decode;
 use kitchensink_runtime::Runtime;
 use sp_keyring::AccountKeyring;
 use substrate_api_client::{
-	rpc::JsonrpseeClient, AccountId, Api, PlainTipExtrinsicParams, StaticEvent, XtStatus,
+	rpc::JsonrpseeClient, AccountId, Api, NodeSubscription, PlainTipExtrinsicParams, StaticEvent,
+	XtStatus,
 };
 
 #[allow(unused)]

examples/custom_nonce.rs

@@ -21,8 +21,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,
-	UncheckedExtrinsicV4, XtStatus,
+	compose_extrinsic_offline, rpc::JsonrpseeClient, Api, AssetTipExtrinsicParams, GetHeader,
+	NodeSubscription, UncheckedExtrinsicV4, XtStatus,
 };
 
 #[tokio::main]

examples/event_callback.rs

@@ -19,7 +19,7 @@ use codec::Decode;
 use kitchensink_runtime::Runtime;
 use log::debug;
 use sp_core::{sr25519, H256 as Hash};
-use substrate_api_client::HandleSubscription;
+use substrate_api_client::{HandleSubscription, NodeSubscription};
 
 use substrate_api_client::{rpc::JsonrpseeClient, Api, AssetTipExtrinsicParams};
 

examples/event_error_details.rs

@@ -19,7 +19,8 @@ use sp_core::crypto::Pair;
 use sp_keyring::AccountKeyring;
 use sp_runtime::{AccountId32 as AccountId, MultiAddress};
 use substrate_api_client::{
-	rpc::JsonrpseeClient, Api, ApiResult, AssetTipExtrinsicParams, StaticEvent, XtStatus,
+	rpc::JsonrpseeClient, Api, ApiResult, AssetTipExtrinsicParams, GetAccountInformation,
+	NodeSubscription, StaticEvent, XtStatus,
 };
 
 #[derive(Decode)]

examples/generic_event_callback.rs

@@ -22,7 +22,7 @@ use sp_keyring::AccountKeyring;
 use sp_runtime::{AccountId32 as AccountId, MultiAddress};
 use std::thread;
 use substrate_api_client::{
-	rpc::JsonrpseeClient, Api, AssetTipExtrinsicParams, StaticEvent, XtStatus,
+	rpc::JsonrpseeClient, Api, AssetTipExtrinsicParams, NodeSubscription, StaticEvent, XtStatus,
 };
 
 // Look at the how the transfer event looks like in in the metadata

examples/generic_extrinsic.rs

@@ -20,7 +20,7 @@ use kitchensink_runtime::Runtime;
 use sp_keyring::AccountKeyring;
 use substrate_api_client::{
 	compose_extrinsic, rpc::JsonrpseeClient, Api, AssetTipExtrinsicParams, GenericAddress,
-	UncheckedExtrinsicV4, XtStatus,
+	NodeSubscription, UncheckedExtrinsicV4, XtStatus,
 };
 
 #[tokio::main]

examples/get_account_identity.rs

@@ -21,8 +21,8 @@ use pallet_identity::{Data, IdentityInfo, Registration};
 use sp_core::{crypto::Pair, H256};
 use sp_keyring::AccountKeyring;
 use substrate_api_client::{
-	compose_extrinsic, rpc::JsonrpseeClient, Api, AssetTipExtrinsicParams, UncheckedExtrinsicV4,
-	XtStatus,
+	compose_extrinsic, rpc::JsonrpseeClient, Api, AssetTipExtrinsicParams, GetGenericStorage,
+	NodeSubscription, UncheckedExtrinsicV4, XtStatus,
 };
 
 type BalanceOf<T> = <<T as pallet_identity::Config>::Currency as Currency<

examples/get_blocks.rs

@@ -19,7 +19,8 @@
 use kitchensink_runtime::Runtime;
 use sp_core::sr25519;
 use substrate_api_client::{
-	rpc::JsonrpseeClient, Api, AssetTipExtrinsicParams, HandleSubscription,
+	rpc::JsonrpseeClient, Api, AssetTipExtrinsicParams, GetBlock, GetHeader, HandleSubscription,
+	NodeSubscription,
 };
 
 #[tokio::main]

examples/get_existential_deposit.rs

@@ -17,7 +17,7 @@ limitations under the License.
 
 use kitchensink_runtime::Runtime;
 use sp_runtime::app_crypto::sp_core::sr25519;
-use substrate_api_client::{rpc::JsonrpseeClient, Api, AssetTipExtrinsicParams};
+use substrate_api_client::{rpc::JsonrpseeClient, Api, AssetTipExtrinsicParams, GetBalance};
 
 #[tokio::main]
 async fn main() {

examples/get_storage.rs

@@ -18,7 +18,7 @@
 use frame_system::AccountInfo as GenericAccountInfo;
 use kitchensink_runtime::Runtime;
 use sp_keyring::AccountKeyring;
-use substrate_api_client::{rpc::JsonrpseeClient, Api, AssetTipExtrinsicParams};
+use substrate_api_client::{rpc::JsonrpseeClient, Api, AssetTipExtrinsicParams, GetGenericStorage};
 
 type IndexFor<T> = <T as frame_system::Config>::Index;
 type AccountDataFor<T> = <T as frame_system::Config>::AccountData;

examples/staking_payout.rs

@@ -7,7 +7,10 @@ use sp_keyring::AccountKeyring;
 #[cfg(feature = "staking-xt")]
 use sp_runtime::{app_crypto::Ss58Codec, AccountId32};
 #[cfg(feature = "staking-xt")]
-use substrate_api_client::{rpc::JsonrpseeClient, Api, AssetTipExtrinsicParams, XtStatus};
+use substrate_api_client::{
+	rpc::JsonrpseeClient, Api, AssetTipExtrinsicParams, GetGenericStorage, NodeSubscription,
+	XtStatus,
+};
 
 #[cfg(feature = "staking-xt")]
 #[tokio::main]

examples/sudo.rs

@@ -21,7 +21,7 @@ use kitchensink_runtime::Runtime;
 use sp_keyring::AccountKeyring;
 use substrate_api_client::{
 	compose_call, compose_extrinsic, rpc::JsonrpseeClient, Api, AssetTipExtrinsicParams,
-	GenericAddress, UncheckedExtrinsicV4, XtStatus,
+	GenericAddress, NodeSubscription, UncheckedExtrinsicV4, XtStatus,
 };
 
 #[tokio::main]

examples/transfer_using_seed.rs

@@ -21,7 +21,10 @@ use sp_core::{
 	sr25519,
 };
 use sp_runtime::MultiAddress;
-use substrate_api_client::{rpc::JsonrpseeClient, Api, AssetTipExtrinsicParams, XtStatus};
+use substrate_api_client::{
+	rpc::JsonrpseeClient, Api, AssetTipExtrinsicParams, GetAccountInformation, NodeSubscription,
+	XtStatus,
+};
 
 #[tokio::main]
 async fn main() {

examples/transfer_with_tungstenite_client.rs

@@ -21,7 +21,10 @@ use sp_core::{
 	sr25519,
 };
 use sp_runtime::MultiAddress;
-use substrate_api_client::{rpc::TungsteniteRpcClient, Api, AssetTipExtrinsicParams, XtStatus};
+use substrate_api_client::{
+	rpc::TungsteniteRpcClient, Api, AssetTipExtrinsicParams, GetAccountInformation,
+	NodeSubscription, XtStatus,
+};
 
 fn main() {
 	env_logger::init();

examples/transfer_with_ws_client.rs

@@ -21,7 +21,10 @@ use sp_core::{
 	sr25519,
 };
 use sp_runtime::MultiAddress;
-use substrate_api_client::{rpc::WsRpcClient, Api, AssetTipExtrinsicParams, XtStatus};
+use substrate_api_client::{
+	rpc::WsRpcClient, Api, AssetTipExtrinsicParams, GetAccountInformation, NodeSubscription,
+	XtStatus,
+};
 
 fn main() {
 	env_logger::init();

primitives/src/pallet_traits/frame_system_config.rs

@@ -14,7 +14,7 @@
    limitations under the License.
 
 */
-use codec::{Codec, EncodeLike, FullCodec, MaxEncodedLen};
+use codec::{Codec, Decode, EncodeLike, FullCodec, MaxEncodedLen};
 use core::fmt::Debug;
 use scale_info::TypeInfo;
 use sp_runtime::traits::{
@@ -37,18 +37,13 @@ pub trait FrameSystemConfig {
 		+ TypeInfo
 		+ Dispatchable<RuntimeOrigin = Self::RuntimeOrigin>
 		+ Debug;
-	type Index: Codec
-		+ EncodeLike
-		+ Clone
-		+ Eq
-		+ Debug
-		+ TypeInfo
-		+ MaybeSerializeDeserialize
+	type Index: MaybeSerializeDeserialize
 		+ Debug
 		+ Default
 		+ AtLeast32Bit
 		+ Copy
-		+ MaxEncodedLen;
+		+ MaxEncodedLen
+		+ Decode;
 	type BlockNumber: Codec
 		+ EncodeLike
 		+ Clone