TxPool v2 General architecture

CHANGELOG.md

@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - [2131](https://github.com/FuelLabs/fuel-core/pull/2131): Add flow in TxPool in order to ask to newly connected peers to share their transaction pool
 - [2182](https://github.com/FuelLabs/fuel-core/pull/2151): Limit number of transactions that can be fetched via TxSource::next
 - [2189](https://github.com/FuelLabs/fuel-core/pull/2151): Select next DA height to never include more than u16::MAX -1 transactions from L1.
+- [2162](https://github.com/FuelLabs/fuel-core/pull/2162): Pool structure with dependencies, etc.. for the next transaction pool module.
+- [2193](https://github.com/FuelLabs/fuel-core/pull/2193): Insertion in PoolV2 and tests refactoring
 
 
 ### Changed

Cargo.toml

@@ -25,6 +25,7 @@ members = [
   "crates/services/relayer",
   "crates/services/sync",
   "crates/services/txpool",
+  "crates/services/txpool_v2",
   "crates/services/upgradable-executor",
   "crates/services/upgradable-executor/wasm-executor",
   "crates/storage",
@@ -75,6 +76,7 @@ fuel-core-producer = { version = "0.36.0", path = "./crates/services/producer" }
 fuel-core-relayer = { version = "0.36.0", path = "./crates/services/relayer" }
 fuel-core-sync = { version = "0.36.0", path = "./crates/services/sync" }
 fuel-core-txpool = { version = "0.36.0", path = "./crates/services/txpool" }
+fuel-core-txpool-v2 = { version = "0.36.0", path = "./crates/services/txpool_v2" }
 fuel-core-storage = { version = "0.36.0", path = "./crates/storage", default-features = false }
 fuel-core-trace = { version = "0.36.0", path = "./crates/trace" }
 fuel-core-types = { version = "0.36.0", path = "./crates/types", default-features = false }

crates/services/txpool/src/containers/dependency.rs

@@ -294,12 +294,15 @@ impl Dependency {
                                 }
                             } else {
                                 // tx output is in pool
-                                let output_tx = txs.get(utxo_id.tx_id()).unwrap();
-                                let output =
-                                    &output_tx.outputs()[utxo_id.output_index() as usize];
-                                Self::check_if_coin_input_can_spend_output(
-                                    output, input, false,
-                                )?;
+                                let output_tx = txs.get(utxo_id.tx_id());
+                                let output = output_tx.and_then(|tx| {
+                                    tx.outputs().get(utxo_id.output_index() as usize)
+                                });
+                                if let Some(output) = output {
+                                    Self::check_if_coin_input_can_spend_output(
+                                        output, input, false,
+                                    )?;
+                                }
                             }
 
                             collided.push(*spend_by);

crates/services/txpool/src/transaction_selector.rs

@@ -72,7 +72,10 @@ mod tests {
             checked_transaction::builder::TransactionBuilderExt,
             SecretKey,
         },
-        services::txpool::PoolTransaction,
+        services::txpool::{
+            Metadata,
+            PoolTransaction,
+        },
     };
     use itertools::Itertools;
     use std::sync::Arc;
@@ -157,7 +160,7 @@ mod tests {
                 // so it doesn't need to compute valid sigs for tests
                 PoolTransaction::Script(
                     script.finalize_checked_basic(Default::default()),
-                    ConsensusParametersVersion::MIN,
+                    Metadata::new(ConsensusParametersVersion::MIN),
                 )
             })
             .map(Arc::new)

crates/services/txpool/src/txpool.rs

@@ -64,7 +64,10 @@ use fuel_core_types::{
         checked_transaction::CheckPredicateParams,
         interpreter::Memory,
     },
-    services::executor::TransactionExecutionStatus,
+    services::{
+        executor::TransactionExecutionStatus,
+        txpool::Metadata,
+    },
 };
 use std::{
     collections::HashMap,
@@ -343,26 +346,25 @@ where
         tx: Checked<Transaction>,
     ) -> Result<InsertionResult, Error> {
         let view = self.database.latest_view().unwrap();
-        self.insert_inner(tx, ConsensusParametersVersion::MIN, &view)
+        self.insert_inner(tx, Metadata::new(ConsensusParametersVersion::MIN), &view)
     }
 
-    #[tracing::instrument(level = "debug", skip_all, fields(tx_id = %tx.id()), ret, err)]
     // this is atomic operation. Return removed(pushed out/replaced) transactions
     fn insert_inner(
         &mut self,
         tx: Checked<Transaction>,
-        version: ConsensusParametersVersion,
+        metadata: Metadata,
         view: &View,
     ) -> Result<InsertionResult, Error> {
         let tx: CheckedTransaction = tx.into();
 
         let tx = Arc::new(match tx {
-            CheckedTransaction::Script(tx) => PoolTransaction::Script(tx, version),
-            CheckedTransaction::Create(tx) => PoolTransaction::Create(tx, version),
+            CheckedTransaction::Script(tx) => PoolTransaction::Script(tx, metadata),
+            CheckedTransaction::Create(tx) => PoolTransaction::Create(tx, metadata),
             CheckedTransaction::Mint(_) => return Err(Error::MintIsDisallowed),
-            CheckedTransaction::Upgrade(tx) => PoolTransaction::Upgrade(tx, version),
-            CheckedTransaction::Upload(tx) => PoolTransaction::Upload(tx, version),
-            CheckedTransaction::Blob(tx) => PoolTransaction::Blob(tx, version),
+            CheckedTransaction::Upgrade(tx) => PoolTransaction::Upgrade(tx, metadata),
+            CheckedTransaction::Upload(tx) => PoolTransaction::Upload(tx, metadata),
+            CheckedTransaction::Blob(tx) => PoolTransaction::Blob(tx, metadata),
         });
 
         self.check_blacklisting(tx.as_ref())?;
@@ -450,7 +452,7 @@ where
         };
 
         for tx in txs.into_iter() {
-            res.push(self.insert_inner(tx, version, &view));
+            res.push(self.insert_inner(tx, Metadata::new(version), &view));
         }
 
         // announce to subscribers

crates/services/txpool_v2/Cargo.toml

@@ -0,0 +1,39 @@
+[package]
+name = "fuel-core-txpool-v2"
+version = { workspace = true }
+authors = { workspace = true }
+categories = ["cryptography::cryptocurrencies"]
+edition = { workspace = true }
+homepage = { workspace = true }
+keywords = ["blockchain", "cryptocurrencies", "fuel-vm", "vm"]
+license = { workspace = true }
+repository = { workspace = true }
+description = "Transaction pool v2"
+publish = false
+
+[dependencies]
+anyhow = { workspace = true }
+async-trait = { workspace = true }
+derive_more = { workspace = true }
+fuel-core-services = { workspace = true }
+fuel-core-storage = { workspace = true, features = ["std"] }
+fuel-core-types = { workspace = true, features = ["test-helpers"] }
+futures = { workspace = true }
+mockall = { workspace = true, optional = true }
+num-rational = { workspace = true }
+parking_lot = { workspace = true }
+petgraph = "0.6.5"
+rayon = { workspace = true }
+tokio = { workspace = true, default-features = false, features = ["sync"] }
+tracing = { workspace = true }
+
+[dev-dependencies]
+fuel-core-trace = { workspace = true }
+rand = { workspace = true }
+
+[features]
+test-helpers = [
+  "dep:mockall",
+  "fuel-core-types/test-helpers",
+  "fuel-core-storage/test-helpers",
+]