Simplify

Author: skunert

core/src/common/empty_block/inherents/custom_idps/para_parachain.rs

@@ -21,11 +21,11 @@
 use std::{ops::DerefMut, sync::Arc};
 
 use parity_scale_codec::{Decode, Encode};
-use polkadot_primitives::{BlockNumber, HeadData};
+use polkadot_primitives::HeadData;
 use sp_consensus_babe::SlotDuration;
 use sp_core::twox_128;
 use sp_inherents::InherentIdentifier;
-use sp_runtime::traits::{Block as BlockT, HashingFor, NumberFor};
+use sp_runtime::traits::{Block as BlockT, HashingFor};
 use sp_state_machine::TestExternalities;
 use tokio::sync::Mutex;
 
@@ -37,26 +37,6 @@ pub fn get_para_id<B: BlockT>(ext: &mut TestExternalities<HashingFor<B>>) -> Opt
         .and_then(|b| -> Option<u32> { Decode::decode(&mut &b[..]).ok() })
 }
 
-/// Get the last relay chain block number if it exists
-pub fn get_last_relay_chain_block_number<B: BlockT>(
-    ext: &mut TestExternalities<HashingFor<B>>,
-) -> Option<BlockNumber> {
-    let last_relay_chain_block_number_key = [
-        twox_128(b"ParachainSystem"),
-        twox_128(b"LastRelayChainBlockNumber"),
-    ]
-    .concat();
-
-    ext.execute_with(|| sp_io::storage::get(&last_relay_chain_block_number_key))
-        .and_then(|b| -> Option<NumberFor<B>> { Decode::decode(&mut &b[..]).ok() })
-        .map(|n| match n.try_into() {
-            Ok(block_number) => block_number,
-            Err(_) => {
-                panic!("Failed to convert relay chain block number")
-            }
-        })
-}
-
 /// Provides parachain-system pallet inherents.
 pub struct InherentDataProvider<B: BlockT> {
     pub timestamp: sp_timestamp::Timestamp,
@@ -74,46 +54,21 @@ impl<B: BlockT> sp_inherents::InherentDataProvider for InherentDataProvider<B> {
     ) -> Result<(), sp_inherents::Error> {
         let mut ext_guard = self.ext_mutex.lock().await;
         let ext = ext_guard.deref_mut();
-        let maybe_last_relay_chain_block_number = get_last_relay_chain_block_number::<B>(ext);
-        let maybe_para_id = get_para_id::<B>(ext);
-        let (last_relay_chain_block_number, para_id) =
-            match (maybe_last_relay_chain_block_number, maybe_para_id) {
-                (Some(last_relay_chain_block_number), Some(para_id)) => {
-                    (last_relay_chain_block_number, para_id)
-                }
-                _ => {
-                    log::debug!("Unable to provide para parachains inherent for this chain.");
-                    return Ok(());
-                }
-            };
+        let Some(para_id) = get_para_id::<B>(ext) else {
+            log::debug!("Unable to provide para parachains inherent for this chain.");
+            return Ok(());
+        };
 
         let relay_chain_slot = cumulus_primitives_core::relay_chain::Slot::from_timestamp(
             self.timestamp,
             SlotDuration::from_millis(self.blocktime_millis),
-        )
-        .encode();
-
-        let additional_key_values: Vec<(Vec<u8>, Vec<u8>)> = vec![
-            // Insert relay chain slot to pass Aura check
-            // https://github.com/paritytech/polkadot-sdk/blob/ef114a422291b44f8973739ab7858a29a523e6a2/cumulus/pallets/aura-ext/src/consensus_hook.rs#L69
-            (
-                cumulus_primitives_core::relay_chain::well_known_keys::CURRENT_SLOT.to_vec(),
-                relay_chain_slot,
-            ),
-            // Insert para header info to pass para inherent check
-            // https://github.com/paritytech/polkadot-sdk/blob/17b56fae2d976a3df87f34076875de8c26da0355/cumulus/pallets/parachain-system/src/lib.rs#L1296
-            (
-                cumulus_primitives_core::relay_chain::well_known_keys::para_head(para_id.into()),
-                HeadData(self.parent_header.encode()).encode(),
-            ),
-        ];
+        );
 
         cumulus_client_parachain_inherent::MockValidationDataInherentDataProvider {
-            relay_offset: last_relay_chain_block_number + 1u32,
+            relay_offset: *relay_chain_slot as u32,
+            current_para_block_head: Some(HeadData(self.parent_header.encode())),
             relay_parent_offset: self.relay_parent_offset,
             relay_randomness_config: (),
-            xcm_config: cumulus_client_parachain_inherent::MockXcmConfig::default(),
-            additional_key_values: Some(additional_key_values),
             para_id: para_id.into(),
             ..Default::default()
         }

core/src/common/empty_block/production.rs

@@ -117,8 +117,6 @@ where
     NumberFor<Block>: FromStr,
     <NumberFor<Block> as FromStr>::Err: Debug,
 {
-    // Query the relay parent offset from the runtime API.
-    // This is needed for parachains that use a non-zero relay parent offset.
     let rp_offset = {
         let ext_guard = ext_mutex.lock().await;
         relay_parent_offset::<Block, HostFns>(&ext_guard, executor)