fini

Author: Wodann

Cargo.lock

@@ -1,9 +1,9 @@
-use std::{cmp::Ordering, fmt::Debug};
+use std::{cmp::Ordering, fmt::Debug, marker::PhantomData, sync::Arc};
 
-use edr_block_api::Block as _;
+use edr_block_api::Block;
 use edr_block_builder_api::{
     BlockBuilder, BlockBuilderCreationError, BlockFinalizeError, BlockInputs,
-    BlockTransactionError, Blockchain, PrecompileFn, WrapDatabaseRef,
+    BlockTransactionError, Blockchain, ExecutionResult, PrecompileFn, WrapDatabaseRef,
 };
 pub use edr_block_builder_api::{BuiltBlockAndState, BuiltBlockAndStateWithMetadata};
 use edr_block_header::{
@@ -19,7 +19,7 @@ use edr_chain_spec_evm::{
 };
 use edr_database_components::DatabaseComponents;
 use edr_mem_pool::{MemPool, OrderedTransaction};
-use edr_primitives::{Address, HashMap, HashSet};
+use edr_primitives::{Address, HashMap, HashSet, B256};
 use edr_signer::SignatureError;
 use edr_state_api::{DynState, StateError};
 use serde::{Deserialize, Serialize};
@@ -89,6 +89,71 @@ pub enum MineBlockError<
     MissingPrevrandao,
 }
 
+/// Helper type for a chain-specific [`MineBlockResultWithMetadata`].
+pub type MineBlockResultWithMetadataForChainSpec<ChainSpecT, InspectorDataT = ()> =
+    MineBlockResultWithMetadata<
+        Arc<<ChainSpecT as BlockChainSpec>::Block>,
+        <ChainSpecT as ChainSpec>::HaltReason,
+        <ChainSpecT as ChainSpec>::SignedTransaction,
+        InspectorDataT,
+    >;
+
+#[derive(Debug)]
+pub struct MineBlockResultWithMetadata<
+    BlockT,
+    HaltReasonT: HaltReasonTrait,
+    SignedTransactionT,
+    InspectorDataT = (),
+> {
+    /// Mined block
+    pub block: BlockT,
+    /// The set of precompile addresses that were available during execution.
+    pub precompile_addresses: HashSet<Address>,
+    /// Data collected from inspectors during mining, indexed by transaction
+    /// number in the block.
+    pub transaction_inspector_data: Vec<InspectorDataT>,
+    /// Transaction results
+    pub transaction_results: Vec<ExecutionResult<HaltReasonT>>,
+    phantom: PhantomData<SignedTransactionT>,
+}
+
+impl<BlockT, HaltReasonT: HaltReasonTrait, SignedTransactionT, InspectorDataT>
+    MineBlockResultWithMetadata<BlockT, HaltReasonT, SignedTransactionT, InspectorDataT>
+{
+    /// Constructs a new instance.
+    pub fn new(
+        block: BlockT,
+        precompile_addresses: HashSet<Address>,
+        transaction_inspector_data: Vec<InspectorDataT>,
+        transaction_results: Vec<ExecutionResult<HaltReasonT>>,
+    ) -> Self {
+        Self {
+            block,
+            precompile_addresses,
+            transaction_inspector_data,
+            transaction_results,
+            phantom: PhantomData,
+        }
+    }
+}
+
+impl<
+        BlockT: Block<SignedTransactionT>,
+        HaltReasonT: HaltReasonTrait,
+        InspectorDataT,
+        SignedTransactionT: ExecutableTransaction,
+    > MineBlockResultWithMetadata<BlockT, HaltReasonT, SignedTransactionT, InspectorDataT>
+{
+    /// Whether the block contains a transaction with the given hash.
+    pub fn has_transaction(&self, transaction_hash: &B256) -> bool {
+        self.block
+            .transactions()
+            .iter()
+            .any(|tx| *tx.transaction_hash() == *transaction_hash)
+    }
+}
+
+#[derive(Debug)]
 pub struct MineBlockResultAndStateWithMetadata<
     BlockT,
     HaltReasonT: HaltReasonTrait,
@@ -141,7 +206,7 @@ pub fn mine_block<ChainSpecT, BlockchainErrorT, InspectorT>(
     min_gas_price: u128,
     mine_ordering: MineOrdering,
     reward: u128,
-    mut inspector: Option<InspectorT>,
+    mut inspector: Option<&mut InspectorT>,
     custom_precompiles: &HashMap<Address, PrecompileFn>,
 ) -> Result<
     MineBlockResultAndStateWithMetadata<
@@ -406,7 +471,6 @@ pub fn mine_block_with_single_transaction<
     ChainSpecT: BlockChainSpec,
     BlockchainErrorT: std::error::Error,
     InspectorT,
-    InspectorResultT,
 >(
     blockchain: &dyn Blockchain<
         ChainSpecT::Receipt,

crates/block/miner/src/lib.rs

@@ -12,6 +12,7 @@ alloy-json-abi.workspace = true
 alloy-sol-types.workspace = true
 derive_more.workspace = true
 derive-where.workspace = true
+edr_artifact.workspace = true
 edr_block_header.workspace = true
 edr_block_miner.workspace = true
 edr_blockchain_fork.workspace = true
@@ -23,6 +24,7 @@ edr_chain_spec_evm.workspace = true
 edr_chain_spec_rpc.workspace = true
 edr_common.workspace = true
 edr_coverage.workspace = true
+edr_decoder_revert.workspace = true
 edr_defaults.workspace = true
 edr_eip1559.workspace = true
 edr_gas_report.workspace = true
@@ -57,6 +59,7 @@ napi = { version = "2.16.17", default-features = false, features = [
     "serde-json",
 ] }
 napi-derive = "2.16.13"
+parking_lot.workspace = true
 rand = { version = "0.8.4", optional = true }
 semver.workspace = true
 serde.workspace = true

crates/edr_napi/Cargo.toml

@@ -10,6 +10,7 @@ use edr_provider::time::CurrentTime;
 use edr_solidity::contract_decoder::ContractDecoder;
 use napi::tokio::runtime;
 use napi_derive::napi;
+use parking_lot::RwLock;
 
 use crate::provider::ProviderFactory;
 
@@ -22,7 +23,7 @@ impl SyncProviderFactory for GenericChainProviderFactory {
         provider_config: edr_napi_core::provider::Config,
         logger_config: edr_napi_core::logger::Config,
         subscription_callback: edr_napi_core::subscription::Callback,
-        contract_decoder: Arc<ContractDecoder>,
+        contract_decoder: Arc<RwLock<ContractDecoder>>,
     ) -> napi::Result<Arc<dyn SyncProvider>> {
         let logger = Logger::<GenericChainSpec, CurrentTime>::new(
             logger_config,

crates/edr_napi/src/chains/generic.rs

@@ -17,6 +17,7 @@ use napi::{
     tokio::runtime,
 };
 use napi_derive::napi;
+use parking_lot::RwLock;
 
 use crate::{account::AccountOverride, provider::ProviderFactory};
 
@@ -29,7 +30,7 @@ impl SyncProviderFactory for L1ProviderFactory {
         provider_config: edr_napi_core::provider::Config,
         logger_config: edr_napi_core::logger::Config,
         subscription_callback: edr_napi_core::subscription::Callback,
-        contract_decoder: Arc<ContractDecoder>,
+        contract_decoder: Arc<RwLock<ContractDecoder>>,
     ) -> napi::Result<Arc<dyn SyncProvider>> {
         let logger =
             Logger::<L1ChainSpec, CurrentTime>::new(logger_config, Arc::clone(&contract_decoder))?;

crates/edr_napi/src/chains/l1.rs

@@ -21,6 +21,7 @@ use napi::{
     tokio::runtime,
 };
 use napi_derive::napi;
+use parking_lot::RwLock;
 
 use crate::{
     account::{AccountOverride, StorageSlot},
@@ -36,7 +37,7 @@ impl SyncProviderFactory for OpProviderFactory {
         provider_config: edr_napi_core::provider::Config,
         logger_config: edr_napi_core::logger::Config,
         subscription_callback: edr_napi_core::subscription::Callback,
-        contract_decoder: Arc<ContractDecoder>,
+        contract_decoder: Arc<RwLock<ContractDecoder>>,
     ) -> napi::Result<Arc<dyn SyncProvider>> {
         let logger =
             Logger::<OpChainSpec, CurrentTime>::new(logger_config, Arc::clone(&contract_decoder))?;

crates/edr_napi/src/chains/op.rs

@@ -1,9 +1,9 @@
 use std::sync::Arc;
 
+use edr_decoder_revert::RevertDecoder;
 use edr_napi_core::{provider::SyncProviderFactory, solidity};
 use edr_primitives::HashMap;
 use edr_solidity_tests::{
-    decode::RevertDecoder,
     multi_runner::{SuiteResultAndArtifactId, TestContract, TestContracts},
     TestFilterConfig,
 };
@@ -251,7 +251,7 @@ impl EdrContext {
 
             let test_suites = try_or_reject_deferred!(test_suites
                 .into_iter()
-                .map(edr_solidity::artifacts::ArtifactId::try_from)
+                .map(edr_artifact::ArtifactId::try_from)
                 .collect::<Result<Vec<_>, _>>());
 
             let contracts = try_or_reject_deferred!(test_suites

crates/edr_napi/src/context.rs

@@ -1,12 +1,13 @@
 use std::sync::Arc;
 
 use napi_derive::napi;
+use parking_lot::RwLock;
 
 use crate::config::TracingConfigWithBuffers;
 
 #[napi]
 pub struct ContractDecoder {
-    inner: Arc<edr_solidity::contract_decoder::ContractDecoder>,
+    inner: Arc<RwLock<edr_solidity::contract_decoder::ContractDecoder>>,
 }
 
 #[napi]
@@ -17,7 +18,7 @@ impl ContractDecoder {
     #[allow(clippy::new_without_default)]
     pub fn new() -> Self {
         Self {
-            inner: Arc::new(edr_solidity::contract_decoder::ContractDecoder::default()),
+            inner: Arc::default(),
         }
     }
 
@@ -32,7 +33,7 @@ impl ContractDecoder {
         let contract_decoder =
             edr_solidity::contract_decoder::ContractDecoder::new(&build_info_config).map_or_else(
                 |error| Err(napi::Error::from_reason(error.to_string())),
-                |contract_decoder| Ok(Arc::new(contract_decoder)),
+                |contract_decoder| Ok(Arc::new(RwLock::new(contract_decoder))),
             )?;
 
         Ok(Self {
@@ -43,13 +44,15 @@ impl ContractDecoder {
 
 impl ContractDecoder {
     /// Returns a reference to the inner contract decoder.
-    pub fn as_inner(&self) -> &Arc<edr_solidity::contract_decoder::ContractDecoder> {
+    pub fn as_inner(&self) -> &Arc<RwLock<edr_solidity::contract_decoder::ContractDecoder>> {
         &self.inner
     }
 }
 
-impl From<Arc<edr_solidity::contract_decoder::ContractDecoder>> for ContractDecoder {
-    fn from(contract_decoder: Arc<edr_solidity::contract_decoder::ContractDecoder>) -> Self {
+impl From<Arc<RwLock<edr_solidity::contract_decoder::ContractDecoder>>> for ContractDecoder {
+    fn from(
+        contract_decoder: Arc<RwLock<edr_solidity::contract_decoder::ContractDecoder>>,
+    ) -> Self {
         Self {
             inner: contract_decoder,
         }

crates/edr_napi/src/contract_decoder.rs

@@ -4,7 +4,6 @@ use std::sync::Arc;
 
 use edr_napi_core::provider::SyncProvider;
 use edr_rpc_client::jsonrpc;
-use edr_solidity::contract_decoder::ContractDecoder;
 use napi::tokio::runtime;
 use napi_derive::napi;
 
@@ -56,7 +55,7 @@ impl EdrContext {
         let provider = Provider::new(
             Arc::new(MockProvider::new(mocked_response)),
             runtime::Handle::current(),
-            Arc::new(ContractDecoder::default()),
+            Arc::default(),
             #[cfg(feature = "scenarios")]
             None,
         );

crates/edr_napi/src/mock.rs

@@ -8,6 +8,7 @@ use edr_napi_core::provider::SyncProvider;
 use edr_solidity::compiler::create_models_and_decode_bytecodes;
 use napi::{tokio::runtime, Env, JsFunction, JsObject, Status};
 use napi_derive::napi;
+use parking_lot::RwLock;
 
 pub use self::factory::ProviderFactory;
 use self::response::Response;
@@ -16,7 +17,7 @@ use crate::{call_override::CallOverrideCallback, contract_decoder::ContractDecod
 /// A JSON-RPC provider for Ethereum.
 #[napi]
 pub struct Provider {
-    contract_decoder: Arc<edr_solidity::contract_decoder::ContractDecoder>,
+    contract_decoder: Arc<RwLock<edr_solidity::contract_decoder::ContractDecoder>>,
     provider: Arc<dyn SyncProvider>,
     runtime: runtime::Handle,
     #[cfg(feature = "scenarios")]
@@ -28,7 +29,7 @@ impl Provider {
     pub fn new(
         provider: Arc<dyn SyncProvider>,
         runtime: runtime::Handle,
-        contract_decoder: Arc<edr_solidity::contract_decoder::ContractDecoder>,
+        contract_decoder: Arc<RwLock<edr_solidity::contract_decoder::ContractDecoder>>,
         #[cfg(feature = "scenarios")] scenario_file: Option<
             napi::tokio::sync::Mutex<napi::tokio::fs::File>,
         >,
@@ -76,6 +77,7 @@ impl Provider {
                     }
                 };
 
+                let mut contract_decoder = contract_decoder.write();
                 for contract in contracts {
                     contract_decoder.add_contract_metadata(contract);
                 }