[WIP]: jsonrpsee proc macros

examples/examples/fetch_remote.rs

@@ -15,11 +15,17 @@
 // along with subxt.  If not, see <http://www.gnu.org/licenses/>.
 
 use subxt::{
+    rpc::SubxtRpcApiClient,
     ClientBuilder,
+    Config,
     DefaultConfig,
     DefaultExtra,
 };
 
+type Hash = <DefaultConfig as Config>::Hash;
+type Header = <DefaultConfig as Config>::Header;
+type Extrinsic = <DefaultConfig as Config>::Header;
+
 #[subxt::subxt(runtime_metadata_path = "examples/polkadot_metadata.scale")]
 pub mod polkadot {}
 
@@ -35,11 +41,11 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     let block_number = 1;
 
-    let block_hash = api
-        .client
-        .rpc()
-        .block_hash(Some(block_number.into()))
-        .await?;
+    let block_hash = SubxtRpcApiClient::<Hash, Header, Extrinsic>::block_hash(
+        api.client.rpc().inner(),
+        Some(block_number.into()),
+    )
+    .await?;
 
     if let Some(hash) = block_hash {
         println!("Block hash for block number {}: {}", block_number, hash);

examples/examples/transfer_subscribe.rs

@@ -24,13 +24,20 @@
 
 use sp_keyring::AccountKeyring;
 use subxt::{
+    rpc::SubxtRpcApiClient,
     ClientBuilder,
+    Config,
     DefaultConfig,
     DefaultExtra,
+    EventStorageSubscription,
     EventSubscription,
     PairSigner,
 };
 
+type Hash = <DefaultConfig as Config>::Hash;
+type Header = <DefaultConfig as Config>::Header;
+type Extrinsic = <DefaultConfig as Config>::Header;
+
 #[subxt::subxt(runtime_metadata_path = "examples/polkadot_metadata.scale")]
 pub mod polkadot {}
 
@@ -46,7 +53,12 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         .await?
         .to_runtime_api::<polkadot::RuntimeApi<DefaultConfig, DefaultExtra<DefaultConfig>>>();
 
-    let sub = api.client.rpc().subscribe_events().await?;
+    let sub = SubxtRpcApiClient::<Hash, Header, Extrinsic>::subscribe_events(
+        api.client.rpc().inner(),
+    )
+    .await?;
+
+    let sub = EventStorageSubscription::Imported(sub);
     let decoder = api.client.events_decoder();
     let mut sub = EventSubscription::<DefaultConfig>::new(sub, decoder);
     sub.filter_event::<polkadot::balances::events::Transfer>();

subxt/Cargo.toml

@@ -20,7 +20,7 @@ chameleon = "0.1.0"
 scale-info = { version = "1.0.0", features = ["bit-vec"] }
 futures = "0.3.13"
 hex = "0.4.3"
-jsonrpsee = { version = "0.8.0", features = ["async-client", "client-ws-transport"] }
+jsonrpsee = { git = "https://github.com/paritytech/jsonrpsee", branch = "696_trait_bounds", features = ["macros", "async-client", "client-ws-transport"] }
 log = "0.4.14"
 num-traits = { version = "0.2.14", default-features = false }
 serde = { version = "1.0.124", features = ["derive"] }

subxt/src/client.rs

@@ -31,6 +31,7 @@ use crate::{
         Rpc,
         RpcClient,
         RuntimeVersion,
+        SubxtRpcApiClient,
         SystemProperties,
     },
     storage::StorageClient,
@@ -40,7 +41,10 @@ use crate::{
     Config,
     Metadata,
 };
-use codec::Decode;
+use codec::{
+    Decode,
+    Encode,
+};
 use derivative::Derivative;
 use std::sync::Arc;
 
@@ -89,14 +93,17 @@ impl ClientBuilder {
             crate::rpc::ws_client(url).await?
         };
         let rpc = Rpc::new(client);
-        let (metadata, genesis_hash, runtime_version, properties) = future::join4(
-            rpc.metadata(),
-            rpc.genesis_hash(),
-            rpc.runtime_version(None),
-            rpc.system_properties(),
+        let (metadata_bytes, genesis_hash, runtime_version, properties) = future::join4(
+            SubxtRpcApiClient::<T>::metadata(rpc.inner()),
+            SubxtRpcApiClient::<T>::genesis_hash(rpc.inner()),
+            SubxtRpcApiClient::<T>::runtime_version(rpc.inner(), None),
+            SubxtRpcApiClient::<T>::system_properties(rpc.inner()),
         )
         .await;
-        let metadata = metadata?;
+        let metadata_bytes = metadata_bytes?;
+        let meta: frame_metadata::RuntimeMetadataPrefixed =
+            Decode::decode(&mut &metadata_bytes[..])?;
+        let metadata: Metadata = meta.try_into()?;
 
         let events_decoder = EventsDecoder::new(metadata.clone());
 
@@ -230,8 +237,12 @@ where
         // Get a hash of the extrinsic (we'll need this later).
         let ext_hash = T::Hashing::hash_of(&extrinsic);
 
+        let bytes = extrinsic.encode().into();
+
         // Submit and watch for transaction progress.
-        let sub = self.client.rpc().watch_extrinsic(extrinsic).await?;
+        let sub =
+            SubxtRpcApiClient::<T>::watch_extrinsic(self.client.rpc().inner(), bytes)
+                .await?;
 
         Ok(TransactionProgress::new(sub, self.client, ext_hash))
     }
@@ -254,8 +265,15 @@ where
         <A as AccountData>::AccountId: From<<T as Config>::AccountId>,
         <A as AccountData>::Index: Into<<T as Config>::Index>,
     {
-        let extrinsic = self.create_signed(signer, Default::default()).await?;
-        self.client.rpc().submit_extrinsic(extrinsic).await
+        let bytes = self
+            .create_signed(signer, Default::default())
+            .await?
+            .encode()
+            .into();
+
+        SubxtRpcApiClient::<T>::submit_extrinsic(self.client.rpc().inner(), bytes)
+            .await
+            .map_err(Into::into)
     }
 
     /// Creates a signed extrinsic.