Subscribe to Runtime upgrades for proper extrinsic construction

codegen/src/api/calls.rs

@@ -96,13 +96,13 @@ pub fn generate_calls(
             };
             let client_fn = quote! {
                 #docs
-                pub async fn #fn_name(
+                pub fn #fn_name(
                     &self,
                     #( #call_fn_args, )*
                 ) -> Result<::subxt::SubmittableExtrinsic<'a, T, X, #struct_name, DispatchError, root_mod::Event>, ::subxt::BasicError> {
                     let runtime_call_hash = {
                         let locked_metadata = self.client.metadata();
-                        let metadata = locked_metadata.lock().await;
+                        let metadata = locked_metadata.read();
                         metadata.call_hash::<#struct_name>()?
                     };
                     if runtime_call_hash == [#(#call_hash,)*] {

codegen/src/api/constants.rs

@@ -48,9 +48,9 @@ pub fn generate_constants(
 
         quote! {
             #( #[doc = #docs ] )*
-            pub async fn #fn_name(&self) -> ::core::result::Result<#return_ty, ::subxt::BasicError> {
+            pub fn #fn_name(&self) -> ::core::result::Result<#return_ty, ::subxt::BasicError> {
                 let locked_metadata = self.client.metadata();
-                let metadata = locked_metadata.lock().await;
+                let metadata = locked_metadata.read();
                 if metadata.constant_hash(#pallet_name, #constant_name)? == [#(#constant_hash,)*] {
                     let pallet = metadata.pallet(#pallet_name)?;
                     let constant = pallet.constant(#constant_name)?;

codegen/src/api/mod.rs

@@ -311,9 +311,9 @@ impl RuntimeGenerator {
                     T: ::subxt::Config,
                     X: ::subxt::extrinsic::ExtrinsicParams<T>,
                 {
-                    pub async fn validate_metadata(&'a self) -> Result<(), ::subxt::MetadataError> {
+                    pub fn validate_metadata(&'a self) -> Result<(), ::subxt::MetadataError> {
                         let locked_metadata = self.client.metadata();
-                        let metadata = locked_metadata.lock().await;
+                        let metadata = locked_metadata.read();
                         if metadata.metadata_hash(&PALLETS) != [ #(#metadata_hash,)* ] {
                             Err(::subxt::MetadataError::IncompatibleMetadata)
                         } else {

codegen/src/api/storage.rs

@@ -273,7 +273,7 @@ fn generate_storage_entry_fns(
             ) -> ::core::result::Result<::subxt::KeyIter<'a, T, #entry_struct_ident #lifetime_param>, ::subxt::BasicError> {
                 let runtime_storage_hash = {
                     let locked_metadata = self.client.metadata();
-                    let metadata = locked_metadata.lock().await;
+                    let metadata = locked_metadata.read();
                     metadata.storage_hash::<#entry_struct_ident>()?
                 };
                 if runtime_storage_hash == [#(#storage_hash,)*] {
@@ -307,7 +307,7 @@ fn generate_storage_entry_fns(
         ) -> ::core::result::Result<#return_ty, ::subxt::BasicError> {
             let runtime_storage_hash = {
                 let locked_metadata = self.client.metadata();
-                let metadata = locked_metadata.lock().await;
+                let metadata = locked_metadata.read();
                 metadata.storage_hash::<#entry_struct_ident>()?
             };
             if runtime_storage_hash == [#(#storage_hash,)*] {

examples/examples/balance_transfer.rs

@@ -47,8 +47,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let hash = api
         .tx()
         .balances()
-        .transfer(dest, 123_456_789_012_345)
-        .await?
+        .transfer(dest, 123_456_789_012_345)?
         .sign_and_submit_default(&signer)
         .await?;
 

examples/examples/balance_transfer_with_params.rs

@@ -59,8 +59,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let hash = api
         .tx()
         .balances()
-        .transfer(dest, 123_456_789_012_345)
-        .await?
+        .transfer(dest, 123_456_789_012_345)?
         .sign_and_submit(&signer, tx_params)
         .await?;
 

examples/examples/custom_config.rs

@@ -68,8 +68,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let hash = api
         .tx()
         .balances()
-        .transfer(dest, 10_000)
-        .await?
+        .transfer(dest, 10_000)?
         .sign_and_submit_default(&signer)
         .await?;
 

examples/examples/metadata_compatibility.rs

@@ -46,7 +46,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     //
     // To make sure that all of our statically generated pallets are compatible with the
     // runtime node, we can run this check:
-    api.validate_metadata().await?;
+    api.validate_metadata()?;
 
     Ok(())
 }

examples/examples/submit_and_watch.rs

@@ -60,8 +60,7 @@ async fn simple_transfer() -> Result<(), Box<dyn std::error::Error>> {
     let balance_transfer = api
         .tx()
         .balances()
-        .transfer(dest, 10_000)
-        .await?
+        .transfer(dest, 10_000)?
         .sign_and_submit_then_watch_default(&signer)
         .await?
         .wait_for_finalized_success()
@@ -93,8 +92,7 @@ async fn simple_transfer_separate_events() -> Result<(), Box<dyn std::error::Err
     let balance_transfer = api
         .tx()
         .balances()
-        .transfer(dest, 10_000)
-        .await?
+        .transfer(dest, 10_000)?
         .sign_and_submit_then_watch_default(&signer)
         .await?
         .wait_for_finalized()
@@ -145,8 +143,7 @@ async fn handle_transfer_events() -> Result<(), Box<dyn std::error::Error>> {
     let mut balance_transfer_progress = api
         .tx()
         .balances()
-        .transfer(dest, 10_000)
-        .await?
+        .transfer(dest, 10_000)?
         .sign_and_submit_then_watch_default(&signer)
         .await?;
 

examples/examples/subscribe_all_events.rs

@@ -69,7 +69,6 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
             api.tx()
                 .balances()
                 .transfer(AccountKeyring::Bob.to_account_id().into(), transfer_amount)
-                .await
                 .expect("compatible transfer call on runtime node")
                 .sign_and_submit_default(&signer)
                 .await

examples/examples/subscribe_one_event.rs

@@ -73,7 +73,6 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
             api.tx()
                 .balances()
                 .transfer(AccountKeyring::Bob.to_account_id().into(), 1_000_000_000)
-                .await
                 .expect("compatible transfer call on runtime node")
                 .sign_and_submit_default(&signer)
                 .await

examples/examples/subscribe_runtime_updates.rs

@@ -69,7 +69,6 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
                 AccountKeyring::Bob.to_account_id().into(),
                 123_456_789_012_345,
             )
-            .await
             .unwrap()
             .sign_and_submit_default(&signer)
             .await

examples/examples/subscribe_some_events.rs

@@ -74,7 +74,6 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
             api.tx()
                 .balances()
                 .transfer(AccountKeyring::Bob.to_account_id().into(), 1_000_000_000)
-                .await
                 .expect("compatible transfer call on runtime node")
                 .sign_and_submit_default(&signer)
                 .await