Merge pull request #102 from hl-archive-node/fix/testnet-txs-tracking

fix: Fix testnet transaction types

src/addons/hl_node_compliance.rs

@@ -347,8 +347,10 @@ where
                     pubsub.log_stream(filter).filter_map(|log| adjust_log::<Eth>(log, &provider)),
                 )
                 .await;
-            } else {
+            } else if kind == SubscriptionKind::NewHeads {
                 let _ = pipe_from_stream(sink, new_headers_stream::<Eth>(&provider)).await;
+            } else {
+                let _ = pubsub.handle_accepted(sink, kind, params).await;
             }
         }));
         Ok(())

src/main.rs

@@ -63,16 +63,6 @@ fn main() -> eyre::Result<()> {
                         info!("Call/gas estimation will be forwarded to {}", upstream_rpc_url);
                     }
 
-                    if ext.hl_node_compliant {
-                        install_hl_node_compliance(&mut ctx)?;
-                        info!("hl-node compliant mode enabled");
-                    }
-
-                    if !ext.experimental_eth_get_proof {
-                        ctx.modules.remove_method_from_configured("eth_getProof");
-                        info!("eth_getProof is disabled by default");
-                    }
-
                     // This is a temporary workaround to fix the issue with custom headers
                     // affects `eth_subscribe[type=newHeads]`
                     ctx.modules.replace_configured(
@@ -84,6 +74,16 @@ fn main() -> eyre::Result<()> {
                         .into_rpc(),
                     )?;
 
+                    if ext.hl_node_compliant {
+                        install_hl_node_compliance(&mut ctx)?;
+                        info!("hl-node compliant mode enabled");
+                    }
+
+                    if !ext.experimental_eth_get_proof {
+                        ctx.modules.remove_method_from_configured("eth_getProof");
+                        info!("eth_getProof is disabled by default");
+                    }
+
                     ctx.modules.merge_configured(
                         HlBlockPrecompileExt::new(ctx.registry.eth_api().clone()).into_rpc(),
                     )?;

src/node/cli.rs

@@ -145,8 +145,12 @@ where
 
         match self.command {
             Commands::Node(command) => runner.run_command_until_exit(|ctx| {
+                // NOTE: This is for one time migration around Oct 10 upgrade:
+                // It's not necessary anymore, an environment variable gate is added here.
+                if std::env::var("CHECK_DB_MIGRATION").is_ok() {
                     Self::migrate_db(&command.chain, &command.datadir, &command.db)
                         .expect("Failed to migrate database");
+                }
                 command.execute(ctx, FnLauncher::new::<C, Ext>(launcher))
             }),
             Commands::Init(command) => {

src/node/migrate.rs

@@ -346,7 +346,7 @@ fn migrate_single_static_file<N: HlNodeType>(
 
     // block_ranges into chunks of 50000 blocks
     const CHUNK_SIZE: u64 = 50000;
-    for chunk in (0..=block_range.end()).step_by(CHUNK_SIZE as usize) {
+    for chunk in (block_range.start()..=block_range.end()).step_by(CHUNK_SIZE as usize) {
         let end = std::cmp::min(chunk + CHUNK_SIZE - 1, block_range.end());
         let block_range = chunk..=end;
         let headers = old_headers_range(sf_in, block_range.clone())?;

src/node/types/mod.rs

@@ -127,6 +127,19 @@ pub struct SystemTx {
     pub receipt: Option<LegacyReceipt>,
 }
 
+impl SystemTx {
+    pub fn gas_limit(&self) -> u64 {
+        use reth_compat::Transaction;
+        match &self.tx {
+            Transaction::Legacy(tx) => tx.gas_limit,
+            Transaction::Eip2930(tx) => tx.gas_limit,
+            Transaction::Eip1559(tx) => tx.gas_limit,
+            Transaction::Eip4844(tx) => tx.gas_limit,
+            Transaction::Eip7702(tx) => tx.gas_limit,
+        }
+    }
+}
+
 #[derive(
     Debug,
     Clone,

src/node/types/reth_compat.rs

@@ -1,4 +1,5 @@
 //! Copy of reth codebase to preserve serialization compatibility
+use crate::chainspec::TESTNET_CHAIN_ID;
 use alloy_consensus::{Header, Signed, TxEip1559, TxEip2930, TxEip4844, TxEip7702, TxLegacy};
 use alloy_primitives::{Address, BlockHash, Signature, TxKind, U256};
 use reth_primitives::TransactionSigned as RethTxSigned;
@@ -113,10 +114,16 @@ impl SealedBlock {
         &self,
         read_precompile_calls: ReadPrecompileCalls,
         highest_precompile_address: Option<Address>,
-        system_txs: Vec<super::SystemTx>,
+        mut system_txs: Vec<super::SystemTx>,
         receipts: Vec<LegacyReceipt>,
         chain_id: u64,
     ) -> HlBlock {
+        // NOTE: Filter out system transactions that may be rejected by the EVM (tracked by #97,
+        // testnet only).
+        if chain_id == TESTNET_CHAIN_ID {
+            system_txs = system_txs.into_iter().filter(|tx| tx.receipt.is_some()).collect();
+        }
+
         let mut merged_txs = vec![];
         merged_txs.extend(system_txs.iter().map(|tx| system_tx_to_reth_transaction(tx, chain_id)));
         merged_txs.extend(self.body.transactions.iter().map(|tx| tx.to_reth_transaction()));