handle transition to async-backing

AstarNetwork · Jul 30, 2024 · 6ac7234 · 6ac7234
1 parent 98c1669
commit 6ac7234
Showing 1 changed file with 36 additions and 25 deletions.
diff --git a/bin/collator/src/parachain/service.rs b/bin/collator/src/parachain/service.rs
@@ -957,29 +957,34 @@ where
         sc_client_api::StateBackend<BlakeTwo256>,
     Executor: sc_executor::NativeExecutionDispatch + 'static,
 {
-    let client2 = client.clone();
+    let verifier_client = client.clone();
 
     let aura_verifier = move || {
-        let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client2).unwrap();
-
         Box::new(cumulus_client_consensus_aura::build_verifier::<
             AuraPair,
             _,
             _,
             _,
         >(
             cumulus_client_consensus_aura::BuildVerifierParams {
-                client: client2.clone(),
-                create_inherent_data_providers: move |_, _| async move {
-                    let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
-
-                    let slot =
-                    sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration(
-                        *timestamp,
-                        slot_duration,
-                    );
-
-                    Ok((slot, timestamp))
+                client: verifier_client.clone(),
+                create_inherent_data_providers: move |parent_hash, _| {
+                    let cidp_client = verifier_client.clone();
+                    async move {
+                        let slot_duration = cumulus_client_consensus_aura::slot_duration_at(
+                            &*cidp_client,
+                            parent_hash,
+                        )?;
+                        let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
+
+                        let slot =
+                            sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration(
+                                *timestamp,
+                                slot_duration,
+                            );
+
+                        Ok((slot, timestamp))
+                    }
                 },
                 telemetry: telemetry_handle,
             },
@@ -1041,8 +1046,7 @@ where
         sc_client_api::StateBackend<BlakeTwo256>,
     Executor: sc_executor::NativeExecutionDispatch + 'static,
 {
-    let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?;
-
+    let cidp_client = client.clone();
     cumulus_client_consensus_aura::import_queue::<
         AuraPair,
         _,
@@ -1053,16 +1057,23 @@ where
     >(cumulus_client_consensus_aura::ImportQueueParams {
         block_import,
         client,
-        create_inherent_data_providers: move |_, _| async move {
-            let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
-
-            let slot =
-                sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration(
-                    *timestamp,
-                    slot_duration,
-                );
+        create_inherent_data_providers: move |parent_hash, _| {
+            let cidp_client = cidp_client.clone();
+            async move {
+                let slot_duration = sc_consensus_aura::standalone::slot_duration_at(
+                    &*cidp_client,
+                    parent_hash,
+                )?;
+                let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
+
+                let slot =
+                    sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration(
+                        *timestamp,
+                        slot_duration,
+                    );
 
-            Ok((slot, timestamp))
+                Ok((slot, timestamp))
+            }
         },
         registry: config.prometheus_registry(),
         spawner: &task_manager.spawn_essential_handle(),