wip

Author: kariy

crates/node/src/full/mod.rs

@@ -15,7 +15,7 @@ use katana_gateway_client::Client as SequencerGateway;
 use katana_metrics::exporters::prometheus::PrometheusRecorder;
 use katana_metrics::{Report, Server as MetricsServer};
 use katana_pipeline::{Pipeline, PipelineHandle};
-use katana_pool::ordering::FiFo;
+use katana_pool::ordering::{FiFo, TipOrdering};
 use katana_provider::providers::db::DbProvider;
 use katana_provider::BlockchainProvider;
 use katana_rpc::cors::Cors;
@@ -114,7 +114,7 @@ impl Node {
         // --- build transaction pool
 
         let validator = GatewayProxyValidator::new(gateway_client.clone());
-        let pool = FullNodePool::new(validator, FiFo::new());
+        let pool = FullNodePool::new(validator, TipOrdering::new());
 
         // --- build pipeline
 

crates/node/src/full/pool.rs

@@ -1,22 +1,13 @@
 use std::future::Future;
 
-use katana_pool::ordering::FiFo;
+use katana_pool::ordering::TipOrdering;
 use katana_pool::pool::Pool;
-use katana_pool::validation::stateful::TxValidator;
-use katana_pool::PoolTransaction;
 use katana_pool_api::validation::{ValidationOutcome, ValidationResult, Validator};
-use katana_primitives::chain::ChainId;
-use katana_primitives::fee::ResourceBoundsMapping;
-use katana_primitives::transaction::{
-    DeclareTx, DeployAccountTx, ExecutableTxWithHash, InvokeTx, TxHash,
-};
-use katana_primitives::{ContractAddress, Felt};
-use katana_rpc_types::{
-    BroadcastedDeclareTx, BroadcastedDeployAccountTx, BroadcastedInvokeTx, BroadcastedTx,
-};
+use katana_primitives::transaction::ExecutableTxWithHash;
+use katana_rpc_types::BroadcastedTx;
 
 pub type FullNodePool =
-    Pool<ExecutableTxWithHash, GatewayProxyValidator, FiFo<ExecutableTxWithHash>>;
+    Pool<ExecutableTxWithHash, GatewayProxyValidator, TipOrdering<ExecutableTxWithHash>>;
 
 /// This is an implementation of the [`Validator`] trait that proxies incoming transactions to a
 /// Starknet sequencer via the gateway endpoint.

crates/rpc/rpc/src/starknet/blockifier.rs

@@ -1,27 +1,20 @@
 use std::sync::Arc;
 
 use katana_chain_spec::ChainSpec;
-use katana_executor::implementation::blockifier::blockifier::context::BlockContext;
 use katana_executor::implementation::blockifier::cache::ClassCache;
 use katana_executor::implementation::blockifier::call::execute_call;
 use katana_executor::implementation::blockifier::state::CachedState;
 use katana_executor::implementation::blockifier::utils::{self, block_context_from_envs};
 use katana_executor::{ExecutionError, ExecutionFlags, ExecutionResult, ResultAndStates};
 use katana_primitives::env::{BlockEnv, VersionedConstantsOverrides};
 use katana_primitives::transaction::ExecutableTxWithHash;
-use katana_primitives::{chain, Felt};
+use katana_primitives::Felt;
 use katana_provider::api::state::StateProvider;
 use katana_rpc_api::error::starknet::{ContractErrorData, StarknetApiError};
 use katana_rpc_types::{FeeEstimate, FunctionCall};
 
 use crate::starknet::StarknetApiResult;
 
-pub struct ExecutionCtx {
-    state: Box<dyn StateProvider>,
-    block_context: Arc<BlockContext>,
-    simulation_flags: ExecutionFlags,
-}
-
 #[tracing::instrument(level = "trace", target = "rpc", skip_all, fields(total_txs = transactions.len()))]
 pub fn simulate(
     chain_spec: &ChainSpec,