fix: cache extrinsic events

codegen/src/types/mod.rs

@@ -21,7 +21,7 @@ use crate::error::CodegenError;
 pub use self::{
     composite_def::{CompositeDef, CompositeDefFieldType, CompositeDefFields},
     derives::{Derives, DerivesRegistry},
-    substitutes::{AbsolutePath, TypeSubstitutes},
+    substitutes::TypeSubstitutes,
     type_def::TypeDefGen,
     type_def_params::TypeDefParameters,
     type_path::{TypeParameter, TypePath, TypePathType},

subxt/src/backend/rpc/rpc_client.rs

@@ -230,10 +230,7 @@ impl<Res: DeserializeOwned> Stream for RpcSubscription<Res> {
 mod jsonrpsee_helpers {
     pub use jsonrpsee::{
         client_transport::ws::{Receiver, Sender, Url, WsTransportClientBuilder},
-        core::{
-            client::{Client, ClientBuilder},
-            Error,
-        },
+        core::{client::Client, Error},
     };
 
     /// Build WS RPC client from URL

subxt/src/blocks/block_types.rs

@@ -123,13 +123,15 @@ where
     // Acquire lock on the events cache. We either get back our events or we fetch and set them
     // before unlocking, so only one fetch call should ever be made. We do this because the
     // same events can be shared across all extrinsics in the block.
-    let lock = cached_events.lock().await;
+    let mut lock = cached_events.lock().await;
     let events = match &*lock {
         Some(events) => events.clone(),
         None => {
-            events::EventsClient::new(client.clone())
+            let events = events::EventsClient::new(client.clone())
                 .at(block_hash)
-                .await?
+                .await?;
+            lock.replace(events.clone());
+            events
         }
     };
 

testing/test-runtime/build.rs

@@ -103,10 +103,7 @@ async fn run() {
 mod client {
     pub use jsonrpsee::{
         client_transport::ws::{Receiver, Sender, Url, WsTransportClientBuilder},
-        core::{
-            client::{Client, ClientBuilder},
-            Error,
-        },
+        core::{client::Client, Error},
     };
 
     pub use jsonrpsee::core::{client::ClientT, rpc_params};