run native

Author: einar-polygon

zero_bin/rpc/src/jerigon.rs

@@ -1,20 +1,18 @@
-use std::result;
-
 use alloy::{
-    primitives::B256,
-    providers::{ext::DebugApi as _, Provider},
-    rpc::types::eth::BlockId,
-    transports::Transport,
+    primitives::B256, providers::Provider, rpc::types::eth::BlockId, transports::Transport,
 };
 use anyhow::Context as _;
-use futures::future::join_all;
+use futures::try_join;
 use prover::BlockProverInput;
 use serde::Deserialize;
 use serde_json::json;
 use trace_decoder::{BlockTrace, BlockTraceTriePreImages, CombinedPreImages, TxnInfo, TxnMeta};
 
 use super::fetch_other_block_data;
-use crate::{native::txn::{generate_jumpdest_table, structlog_tracing_options}, provider::CachedProvider};
+use crate::{
+    native::{self},
+    provider::CachedProvider,
+};
 
 /// Transaction traces retrieved from Erigon zeroTracer.
 #[derive(Debug, Deserialize)]
@@ -41,7 +39,10 @@ where
             "debug_traceBlockByNumber".into(),
             (target_block_id, json!({"tracer": "zeroTracer"})),
         )
-        .await?;
+        .await?
+        .into_iter()
+        .map(|ztr| ztr.result)
+        .collect::<Vec<_>>();
 
     // Grab block witness info (packed as combined trie pre-images)
     let block_witness = cached_provider
@@ -50,48 +51,48 @@ where
         .raw_request::<_, String>("eth_getWitness".into(), vec![target_block_id])
         .await?;
 
-    let other_data =
-        fetch_other_block_data(cached_provider, target_block_id, checkpoint_state_trie_root)
-            .await?;
-
-    let prov = cached_provider.get_provider().await?;
-    let structlog_futs = tx_results.into_iter().map(
-        |ZeroTxResult {
-             tx_hash,
-             result:
-                 TxnInfo {
-                     traces,
-                     meta:
-                         TxnMeta {
-                             byte_code,
-                             new_receipt_trie_node_byte,
-                             gas_used,
-                             jumpdest_table,
-                         },
-                 },
-         }| {
-            let structlog_trace =
-                prov.debug_trace_transaction(tx_hash, structlog_tracing_options()).await?;
-            let tx = todo!();
-            let jdt_opt =
-                generate_jumpdest_table(tx, structlog_trace, traces)
-                    .map(Some)
-                    .unwrap_or_default();
+    // This is wasteful
+    let (native_block_trace, _native_other_data) = try_join!(
+        native::process_block_trace(cached_provider.clone(), target_block_id),
+        crate::fetch_other_block_data(
+            cached_provider.clone(),
+            target_block_id,
+            checkpoint_state_trie_root,
+        )
+    )?;
 
-            ZeroTxResult {
-                tx_hash,
-                result: TxnInfo {
+    // weave in the JDTs
+    let txn_info = tx_results
+        .into_iter()
+        .zip(native_block_trace.txn_info)
+        .map(
+            |(
+                TxnInfo {
                     traces,
-                    meta: TxnMeta {
-                        byte_code,
-                        new_receipt_trie_node_byte,
-                        gas_used,
-                        jumpdest_table: jdt_opt,
-                    },
+                    meta:
+                        TxnMeta {
+                            byte_code,
+                            new_receipt_trie_node_byte,
+                            gas_used,
+                            jumpdest_table: _,
+                        },
                 },
-            }
-        },
-    );
+                ntx,
+            )| TxnInfo {
+                traces,
+                meta: TxnMeta {
+                    byte_code,
+                    new_receipt_trie_node_byte,
+                    gas_used,
+                    jumpdest_table: ntx.meta.jumpdest_table,
+                },
+            },
+        )
+        .collect();
+
+    let other_data =
+        fetch_other_block_data(cached_provider, target_block_id, checkpoint_state_trie_root)
+            .await?;
 
     // Assemble
     Ok(BlockProverInput {
@@ -100,7 +101,7 @@ where
                 compact: hex::decode(block_witness.strip_prefix("0x").unwrap_or(&block_witness))
                     .context("invalid hex returned from call to eth_getWitness")?,
             }),
-            txn_info: tx_results.into_iter().map(|it| it.result).collect(),
+            txn_info,
             code_db: Default::default(),
         },
         other_data,

zero_bin/rpc/src/native/mod.rs

@@ -39,7 +39,7 @@ where
 }
 
 /// Processes the block with the given block number and returns the block trace.
-async fn process_block_trace<ProviderT, TransportT>(
+pub(crate) async fn process_block_trace<ProviderT, TransportT>(
     cached_provider: Arc<CachedProvider<ProviderT, TransportT>>,
     block_number: BlockId,
 ) -> anyhow::Result<BlockTrace>