Handle block checkpoint extrinsics

Author: dimartiro

crates/anvil-polkadot/src/substrate_node/genesis.rs

@@ -162,6 +162,7 @@ pub struct DevelopmentGenesisBlockBuilder<Block: BlockT, B, E> {
     backend: Arc<B>,
     executor: E,
     checkpoint: Option<Block::Header>,
+    checkpoint_extrinsics: Option<Vec<Block::Extrinsic>>,
     _phantom: PhantomData<Block>,
 }
 
@@ -209,6 +210,7 @@ impl<Block: BlockT, B: Backend<Block>, E: RuntimeVersionOf>
             backend,
             executor,
             checkpoint: None,
+            checkpoint_extrinsics: None,
             _phantom: PhantomData::<Block>,
         })
     }
@@ -219,6 +221,7 @@ impl<Block: BlockT, B: Backend<Block>, E: RuntimeVersionOf>
         backend: Arc<B>,
         executor: E,
         checkpoint: Block::Header,
+        checkpoint_extrinsics: Vec<Block::Extrinsic>,
     ) -> sp_blockchain::Result<Self> {
         let genesis_storage =
             build_genesis_storage.build_storage().map_err(sp_blockchain::Error::Storage)?;
@@ -242,6 +245,7 @@ impl<Block: BlockT, B: Backend<Block>, E: RuntimeVersionOf>
             backend,
             executor,
             checkpoint: Some(checkpoint),
+            checkpoint_extrinsics: Some(checkpoint_extrinsics),
             _phantom: PhantomData::<Block>,
         })
     }
@@ -260,6 +264,7 @@ impl<Block: BlockT, B: Backend<Block>, E: RuntimeVersionOf> BuildGenesisBlock<Bl
             backend,
             executor,
             checkpoint,
+            checkpoint_extrinsics,
             _phantom,
         } = self;
 
@@ -272,7 +277,8 @@ impl<Block: BlockT, B: Backend<Block>, E: RuntimeVersionOf> BuildGenesisBlock<Bl
             );
 
             let op = backend.begin_operation()?;
-            let genesis_block = Block::new(checkpoint_header, Default::default());
+            let extrinsics = checkpoint_extrinsics.unwrap_or_default();
+            let genesis_block = Block::new(checkpoint_header, extrinsics);
             Ok((genesis_block, op))
         } else {
             // Normal mode: create new genesis block

crates/anvil-polkadot/src/substrate_node/service/client.rs

@@ -38,8 +38,11 @@ pub fn new_client(
     executor: WasmExecutor,
     storage_overrides: Arc<Mutex<StorageOverrides>>,
 ) -> Result<(Arc<Client>, Arc<Backend>, KeystorePtr, TaskManager), sc_service::error::Error> {
-    let (rpc_client, checkpoint): (Option<Arc<dyn RPCClient<Block>>>, <Block as BlockT>::Header) =
-        if let Some(fork_url) = &anvil_config.eth_rpc_url {
+    let (rpc_client, checkpoint, checkpoint_extrinsics): (
+        Option<Arc<dyn RPCClient<Block>>>,
+        <Block as BlockT>::Header,
+        Vec<<Block as BlockT>::Extrinsic>,
+    ) = if let Some(fork_url) = &anvil_config.eth_rpc_url {
             let http_client = jsonrpsee::http_client::HttpClientBuilder::default()
                 .max_request_size(u32::MAX)
                 .max_response_size(u32::MAX)
@@ -88,14 +91,15 @@ pub fn new_client(
                 .ok_or_else(|| sp_blockchain::Error::Backend("fork checkpoint not found".into()))?;
 
             let checkpoint_header = checkpoint.block.header().clone();
+            let checkpoint_extrinsics = checkpoint.block.extrinsics().to_vec();
 
             tracing::info!(
                 "🔗 Forking from block #{} (hash: {:?})",
                 checkpoint_header.number(),
                 checkpoint_header.hash()
             );
 
-            (Some(Arc::new(rpc_client)), checkpoint_header)
+            (Some(Arc::new(rpc_client)), checkpoint_header, checkpoint_extrinsics)
         } else {
             let checkpoint = Header::new(
                 anvil_config.get_genesis_number().try_into().expect("genesis number too large"),
@@ -105,7 +109,7 @@ pub fn new_client(
                 Default::default(),
             );
 
-            (None, checkpoint)
+            (None, checkpoint, Vec::new())
         };
 
     let backend = new_lazy_loading_backend(rpc_client.clone(), checkpoint.clone())?;
@@ -120,6 +124,7 @@ pub fn new_client(
             backend.clone(),
             executor.clone(),
             checkpoint.clone(),
+            checkpoint_extrinsics.clone(),
         )?
     } else {
         // Normal mode: create standard genesis