core integration into subxt, except for examples

core/src/client/mod.rs

@@ -8,7 +8,7 @@ use crate::{config::Config, metadata::Metadata};
 /// - metadata
 
 #[derive(Derivative)]
-#[derivative(Debug(bound = ""))]
+#[derivative(Debug(bound = ""), Clone(bound = ""))]
 pub struct ClientBase<C: Config> {
     pub genesis_hash: C::Hash,
     pub runtime_version: RuntimeVersion,
@@ -17,6 +17,15 @@ pub struct ClientBase<C: Config> {
 }
 
 impl<C: Config> ClientBase<C> {
+    pub fn new(genesis_hash: C::Hash, runtime_version: RuntimeVersion, metadata: Metadata) -> Self {
+        Self {
+            genesis_hash,
+            runtime_version,
+            metadata,
+            marker: core::marker::PhantomData,
+        }
+    }
+
     pub fn metadata(&self) -> Metadata {
         self.metadata.clone()
     }

core/src/config/extrinsic_params.rs

@@ -10,54 +10,13 @@
 use crate::client::ClientBase;
 
 use super::Config;
+use crate::ExtrinsicParamsError;
 use alloc::string::String;
 use alloc::vec::Vec;
 use core::fmt::Debug;
 
 use derive_more::Display;
 
-/// An error that can be emitted when trying to construct an instance of [`ExtrinsicParams`],
-/// encode data from the instance, or match on signed extensions.
-#[derive(Display, Debug)]
-#[non_exhaustive]
-pub enum ExtrinsicParamsError {
-    /// Cannot find a type id in the metadata. The context provides some additional
-    /// information about the source of the error (eg the signed extension name).
-    #[display(fmt = "Cannot find type id '{type_id} in the metadata (context: {context})")]
-    MissingTypeId {
-        /// Type ID.
-        type_id: u32,
-        /// Some arbitrary context to help narrow the source of the error.
-        context: &'static str,
-    },
-    /// A signed extension in use on some chain was not provided.
-    #[display(
-        fmt = "The chain expects a signed extension with the name {_0}, but we did not provide one"
-    )]
-    UnknownSignedExtension(String),
-    /// Some custom error.
-    #[display(fmt = "Error constructing extrinsic parameters: {_0}")]
-    #[cfg(feature = "std")]
-    Custom(CustomExtrinsicParamsError),
-}
-
-/// A custom error.
-#[cfg(feature = "std")]
-pub type CustomExtrinsicParamsError = Box<dyn std::error::Error + Send + Sync + 'static>;
-
-impl From<core::convert::Infallible> for ExtrinsicParamsError {
-    fn from(value: core::convert::Infallible) -> Self {
-        match value {}
-    }
-}
-
-#[cfg(feature = "std")]
-impl From<CustomExtrinsicParamsError> for ExtrinsicParamsError {
-    fn from(value: CustomExtrinsicParamsError) -> Self {
-        ExtrinsicParamsError::Custom(value)
-    }
-}
-
 /// This trait allows you to configure the "signed extra" and
 /// "additional" parameters that are a part of the transaction payload
 /// or the signer payload respectively.

core/src/config/mod.rs

@@ -23,7 +23,7 @@ use scale_encode::EncodeAsType;
 use serde::{de::DeserializeOwned, Serialize};
 
 pub use default_extrinsic_params::{DefaultExtrinsicParams, DefaultExtrinsicParamsBuilder};
-pub use extrinsic_params::{ExtrinsicParams, ExtrinsicParamsEncoder, ExtrinsicParamsError};
+pub use extrinsic_params::{ExtrinsicParams, ExtrinsicParamsEncoder};
 pub use polkadot::{PolkadotConfig, PolkadotExtrinsicParams, PolkadotExtrinsicParamsBuilder};
 pub use signed_extensions::SignedExtension;
 pub use substrate::{SubstrateConfig, SubstrateExtrinsicParams, SubstrateExtrinsicParamsBuilder};

core/src/config/signed_extensions.rs

@@ -7,10 +7,11 @@
 //! [`AnyOf`] to configure the set of signed extensions which are known about
 //! when interacting with a chain.
 
-use super::extrinsic_params::{ExtrinsicParams, ExtrinsicParamsEncoder, ExtrinsicParamsError};
+use super::extrinsic_params::{ExtrinsicParams, ExtrinsicParamsEncoder};
 use super::Config;
 use crate::client::ClientBase;
 use crate::utils::Era;
+use crate::ExtrinsicParamsError;
 use alloc::borrow::ToOwned;
 use alloc::boxed::Box;
 use alloc::collections::BTreeMap;

core/src/error.rs

@@ -6,13 +6,16 @@ pub enum Error {
     #[display(fmt = "Metadata Error: {_0}")]
     Metadata(MetadataError),
     #[display(fmt = "Storage Error: {_0}")]
-    Storage(StorageAddressError),
+    StorageAddress(StorageAddressError),
     /// Error decoding to a [`crate::dynamic::Value`].
     #[display(fmt = "Error decoding into dynamic value: {_0}")]
     Decode(scale_decode::Error),
     /// Error encoding from a [`crate::dynamic::Value`].
     #[display(fmt = "Error encoding from dynamic value: {_0}")]
     Encode(scale_encode::Error),
+    /// Error constructing the appropriate extrinsic params.
+    #[display(fmt = "Extrinsic params error: {_0}")]
+    ExtrinsicParams(ExtrinsicParamsError),
 }
 
 #[cfg(feature = "std")]
@@ -98,3 +101,51 @@ pub enum StorageAddressError {
         fields: usize,
     },
 }
+
+#[cfg(feature = "std")]
+impl std::error::Error for StorageAddressError {}
+
+/// An error that can be emitted when trying to construct an instance of [`ExtrinsicParams`],
+/// encode data from the instance, or match on signed extensions.
+#[derive(Display, Debug)]
+#[non_exhaustive]
+pub enum ExtrinsicParamsError {
+    /// Cannot find a type id in the metadata. The context provides some additional
+    /// information about the source of the error (eg the signed extension name).
+    #[display(fmt = "Cannot find type id '{type_id} in the metadata (context: {context})")]
+    MissingTypeId {
+        /// Type ID.
+        type_id: u32,
+        /// Some arbitrary context to help narrow the source of the error.
+        context: &'static str,
+    },
+    /// A signed extension in use on some chain was not provided.
+    #[display(
+        fmt = "The chain expects a signed extension with the name {_0}, but we did not provide one"
+    )]
+    UnknownSignedExtension(String),
+    /// Some custom error.
+    #[display(fmt = "Error constructing extrinsic parameters: {_0}")]
+    #[cfg(feature = "std")]
+    Custom(CustomExtrinsicParamsError),
+}
+
+/// A custom error.
+#[cfg(feature = "std")]
+pub type CustomExtrinsicParamsError = Box<dyn std::error::Error + Send + Sync + 'static>;
+
+#[cfg(feature = "std")]
+impl std::error::Error for ExtrinsicParamsError {}
+
+impl From<core::convert::Infallible> for ExtrinsicParamsError {
+    fn from(value: core::convert::Infallible) -> Self {
+        match value {}
+    }
+}
+
+#[cfg(feature = "std")]
+impl From<CustomExtrinsicParamsError> for ExtrinsicParamsError {
+    fn from(value: CustomExtrinsicParamsError) -> Self {
+        ExtrinsicParamsError::Custom(value)
+    }
+}

core/src/lib.rs

@@ -23,18 +23,17 @@ pub mod storage;
 pub mod tx;
 pub mod utils;
 
-pub use error::{Error, MetadataError, StorageAddressError};
+pub use error::{Error, ExtrinsicParamsError, MetadataError, StorageAddressError};
 
+pub use client::{ClientBase, RuntimeVersion};
 pub use config::{
     BlockHash, Config, ExtrinsicParams, ExtrinsicParamsEncoder, PolkadotConfig,
     PolkadotExtrinsicParams, SubstrateConfig, SubstrateExtrinsicParams,
 };
-
-pub use utils::{AccountId32, MultiAddress, MultiSignature, H160, H256, H512};
-
-pub use signer::Signer;
-
 pub use metadata::Metadata;
+pub use signer::Signer;
+pub use storage::StorageAddress;
+pub use utils::{AccountId32, MultiAddress, MultiSignature, H160, H256, H512};
 
 #[macro_use]
 mod macros;