diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d8812c2624..c77eac5df71 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,17 +6,55 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## Fixed
+- [2320](https://github.com/FuelLabs/fuel-core/issues/2320): Prevent `/health` and `/v1/health` from being throttled by the concurrency limiter.
+
+## [Version 0.38.0]
+
 ### Added
+- [2309](https://github.com/FuelLabs/fuel-core/pull/2309): Limit number of concurrent queries to the graphql service.
+- [2216](https://github.com/FuelLabs/fuel-core/pull/2216): Add more function to the state and task of TxPoolV2 to handle the future interactions with others modules (PoA, BlockProducer, BlockImporter and P2P).
+- [2263](https://github.com/FuelLabs/fuel-core/pull/2263): Transaction pool is now included in all modules of the code it has requires modifications on different modules : 
+    - The PoA is now notify only when there is new transaction and not using the `tx_update_sender` anymore.
+    - The Pool transaction source for the executor is now locking the pool until the block production is finished.
+    - Reading operations on the pool is now asynchronous and it’s the less prioritized operation on the Pool, API has been updated accordingly.
+    - GasPrice is no more using async to allow the transactions verifications to not use async anymore 
+
+    We also added a lot of new configuration cli parameters to fine-tune TxPool configuration.
+    This PR also changes the way we are making the heavy work processor and a sync and asynchronous version is available in services folder (usable by anyone)
+    P2P now use separate heavy work processor for DB and TxPool interactions.
+
+### Removed
+- [2306](https://github.com/FuelLabs/fuel-core/pull/2306): Removed hack for genesis asset contract from the code.
+
+## [Version 0.37.1]
+
+### Fixed
+- [2304](https://github.com/FuelLabs/fuel-core/pull/2304): Add initialization for the genesis base asset contract.
+
+## [Version 0.37.0]
+
+### Added
+- [1609](https://github.com/FuelLabs/fuel-core/pull/1609): Add DA compression support. Compressed blocks are stored in the offchain database when blocks are produced, and can be fetched using the GraphQL API.
+- [2290](https://github.com/FuelLabs/fuel-core/pull/2290): Added a new CLI argument `--graphql-max-directives`. The default value is `10`.
 - [2195](https://github.com/FuelLabs/fuel-core/pull/2195): Added enforcement of the limit on the size of the L2 transactions per block according to the `block_transaction_size_limit` parameter.
 - [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.
-
+- [2265](https://github.com/FuelLabs/fuel-core/pull/2265): Integrate Block Committer API for DA Block Costs.
+- [2162](https://github.com/FuelLabs/fuel-core/pull/2162): Pool structure with dependencies, etc.. for the next transaction pool module. Also adds insertion/verification process in PoolV2 and tests refactoring
+- [2280](https://github.com/FuelLabs/fuel-core/pull/2280): Allow comma separated relayer addresses in cli
+- [2299](https://github.com/FuelLabs/fuel-core/pull/2299): Support blobs in the predicates.
+- [2300](https://github.com/FuelLabs/fuel-core/pull/2300): Added new function to `fuel-core-client` for checking whether a blob exists.
 
 ### Changed
 - [2233]((https://github.com/FuelLabs/fuel-core/pull/2233): New changes to HistoricalRocksDB are written to ModificationsHistoryV2
 
 #### Breaking
+- [2299](https://github.com/FuelLabs/fuel-core/pull/2299): Anyone who wants to participate in the transaction broadcasting via p2p must upgrade to support new predicates on the TxPool level.
+- [2299](https://github.com/FuelLabs/fuel-core/pull/2299): Upgraded `fuel-vm` to `0.58.0`. More information in the [release](https://github.com/FuelLabs/fuel-vm/releases/tag/v0.58.0).
+- [2276](https://github.com/FuelLabs/fuel-core/pull/2276): Changed how complexity for blocks is calculated. The default complexity now is 80_000. All queries that somehow touch the block header now are more expensive.
+- [2290](https://github.com/FuelLabs/fuel-core/pull/2290): Added a new GraphQL limit on number of `directives`. The default value is `10`.
 - [2206](https://github.com/FuelLabs/fuel-core/pull/2206): Use timestamp of last block when dry running transactions.
 - [2153](https://github.com/FuelLabs/fuel-core/pull/2153): Updated default gas costs for the local testnet configuration to match `fuel-core 0.35.0`.
 
diff --git a/Cargo.lock b/Cargo.lock
index 0b4f1eae4d7..41fe878f550 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -14,11 +14,11 @@ dependencies = [
 
 [[package]]
 name = "addr2line"
-version = "0.24.1"
+version = "0.24.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
 dependencies = [
- "gimli 0.31.0",
+ "gimli 0.31.1",
 ]
 
 [[package]]
@@ -353,7 +353,7 @@ dependencies = [
  "futures-timer",
  "futures-util",
  "http 1.1.0",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "mime",
  "multer",
  "num-traits",
@@ -405,7 +405,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef5ec94176a12a8cbe985cd73f2e54dc9c702c88c766bdef12f1f3a67cedbee1"
 dependencies = [
  "bytes",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "serde",
  "serde_json",
 ]
@@ -543,9 +543,9 @@ dependencies = [
 
 [[package]]
 name = "async-stream"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51"
+checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
 dependencies = [
  "async-stream-impl",
  "futures-core",
@@ -554,9 +554,9 @@ dependencies = [
 
 [[package]]
 name = "async-stream-impl"
-version = "0.3.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193"
+checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -673,9 +673,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "aws-config"
-version = "1.5.7"
+version = "1.5.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8191fb3091fa0561d1379ef80333c3c7191c6f0435d986e85821bcf7acbd1126"
+checksum = "7198e6f03240fdceba36656d8be440297b6b82270325908c7381f37d826a74f6"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -740,9 +740,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-kms"
-version = "1.45.0"
+version = "1.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0caf20b8855dbeb458552e6c8f8f9eb92b95e4a131725b93540ec73d60c38eb3"
+checksum = "e33590e8d45206fdc4273ded8a1f292bcceaadd513037aa790fc67b237bc30ee"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -762,9 +762,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sso"
-version = "1.44.0"
+version = "1.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b90cfe6504115e13c41d3ea90286ede5aa14da294f3fe077027a6e83850843c"
+checksum = "e33ae899566f3d395cbf42858e433930682cc9c1889fa89318896082fef45efb"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -784,9 +784,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-ssooidc"
-version = "1.45.0"
+version = "1.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "167c0fad1f212952084137308359e8e4c4724d1c643038ce163f06de9662c1d0"
+checksum = "f39c09e199ebd96b9f860b0fce4b6625f211e064ad7c8693b72ecf7ef03881e0"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -806,9 +806,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sts"
-version = "1.44.0"
+version = "1.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cb5f98188ec1435b68097daa2a37d74b9d17c9caa799466338a8d1544e71b9d"
+checksum = "3d95f93a98130389eb6233b9d615249e543f6c24a68ca1f109af9ca5164a8765"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
@@ -902,9 +902,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-runtime"
-version = "1.7.1"
+version = "1.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1ce695746394772e7000b39fe073095db6d45a862d0767dd5ad0ac0d7f8eb87"
+checksum = "a065c0fe6fdbdf9f11817eb68582b2ab4aff9e9c39e986ae48f7ec576c6322db"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-http",
@@ -1019,7 +1019,7 @@ dependencies = [
  "sync_wrapper",
  "tokio",
  "tower",
- "tower-http",
+ "tower-http 0.3.5",
  "tower-layer",
  "tower-service",
 ]
@@ -1228,7 +1228,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c"
 dependencies = [
  "memchr",
- "regex-automata 0.4.7",
+ "regex-automata 0.4.8",
  "serde",
 ]
 
@@ -1330,9 +1330,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "cc"
-version = "1.1.22"
+version = "1.1.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9540e661f81799159abee814118cc139a2004b3a3aa3ea37724a1b66530b90e0"
+checksum = "2e80e3b6a3ab07840e1cae9b0666a63970dc28e8ed5ffbcdacbfc760c281bfc1"
 dependencies = [
  "jobserver",
  "libc",
@@ -1465,9 +1465,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.18"
+version = "4.5.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3"
+checksum = "b97f376d85a664d5837dbae44bf546e6477a679ff6610010f17276f686d867e8"
 dependencies = [
  "clap_builder",
  "clap_derive 4.5.18",
@@ -1475,9 +1475,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.18"
+version = "4.5.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b"
+checksum = "19bc80abd44e4bed93ca373a0704ccbd1b710dc5749406201bb018272808dc54"
 dependencies = [
  "anstream",
  "anstyle",
@@ -1626,9 +1626,9 @@ dependencies = [
 
 [[package]]
 name = "const-hex"
-version = "1.12.0"
+version = "1.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94fb8a24a26d37e1ffd45343323dc9fe6654ceea44c12f2fcb3d7ac29e610bc6"
+checksum = "0121754e84117e65f9d90648ee6aa4882a6e63110307ab73967a4c5e7e69e586"
 dependencies = [
  "cfg-if",
  "cpufeatures",
@@ -1777,18 +1777,18 @@ dependencies = [
 
 [[package]]
 name = "cranelift-bforest"
-version = "0.110.2"
+version = "0.110.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "305d51c180ebdc46ef61bc60c54ae6512db3bc9a05842a1f1e762e45977019ab"
+checksum = "4a41b85213deedf877555a7878ca9fb680ccba8183611c4bb8030ed281b2ad83"
 dependencies = [
  "cranelift-entity",
 ]
 
 [[package]]
 name = "cranelift-bitset"
-version = "0.110.2"
+version = "0.110.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3247afacd9b13d620033f3190d9e49d1beefc1acb33d5604a249956c9c13709"
+checksum = "690d8ae6c73748e5ce3d8fe59034dceadb8823e6c8994ba324141c5eae909b0e"
 dependencies = [
  "serde",
  "serde_derive",
@@ -1796,9 +1796,9 @@ dependencies = [
 
 [[package]]
 name = "cranelift-codegen"
-version = "0.110.2"
+version = "0.110.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd7ca95e831c18d1356da783765c344207cbdffea91e13e47fa9327dbb2e0719"
+checksum = "0ce027a7b16f8b86f60ff6819615273635186d607a0c225ee6ac340d7d18f978"
 dependencies = [
  "bumpalo",
  "cranelift-bforest",
@@ -1819,33 +1819,33 @@ dependencies = [
 
 [[package]]
 name = "cranelift-codegen-meta"
-version = "0.110.2"
+version = "0.110.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "450c105fa1e51bfba4e95a86e926504a867ad5639d63f31d43fe3b7ec1f1c9ef"
+checksum = "f0a2d2ab65e6cbf91f81781d8da65ec2005510f18300eff21a99526ed6785863"
 dependencies = [
  "cranelift-codegen-shared",
 ]
 
 [[package]]
 name = "cranelift-codegen-shared"
-version = "0.110.2"
+version = "0.110.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5479117cd1266881479908d383086561cee37e49affbea9b1e6b594cc21cc220"
+checksum = "efcff860573cf3db9ae98fbd949240d78b319df686cc306872e7fab60e9c84d7"
 
 [[package]]
 name = "cranelift-control"
-version = "0.110.2"
+version = "0.110.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34378804f0abfdd22c068a741cfeed86938b92375b2a96fb0b42c878e0141bfb"
+checksum = "69d70e5b75c2d5541ef80a99966ccd97aaa54d2a6af19ea31759a28538e1685a"
 dependencies = [
  "arbitrary",
 ]
 
 [[package]]
 name = "cranelift-entity"
-version = "0.110.2"
+version = "0.110.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a48cb0a194c9ba82fec35a1e492055388d89b2e3c03dee9dcf2488892be8004d"
+checksum = "d21d3089714278920030321829090d9482c91e5ff2339f2f697f8425bffdcba3"
 dependencies = [
  "cranelift-bitset",
  "serde",
@@ -1854,9 +1854,9 @@ dependencies = [
 
 [[package]]
 name = "cranelift-frontend"
-version = "0.110.2"
+version = "0.110.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8327afc6c1c05f4be62fefce5b439fa83521c65363a322e86ea32c85e7ceaf64"
+checksum = "7308482930f2a2fad4fe25a06054f6f9a4ee1ab97264308c661b037cb60001a3"
 dependencies = [
  "cranelift-codegen",
  "log",
@@ -1866,15 +1866,15 @@ dependencies = [
 
 [[package]]
 name = "cranelift-isle"
-version = "0.110.2"
+version = "0.110.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56b08621c00321efcfa3eee6a3179adc009e21ea8d24ca7adc3c326184bc3f48"
+checksum = "ab4c59e259dab0e6958dabcc536b30845574f027ba6e5000498cdaf7e7ed2d30"
 
 [[package]]
 name = "cranelift-native"
-version = "0.110.2"
+version = "0.110.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d51180b147c8557c1196c77b098f04140c91962e135ea152cd2fcabf40cf365c"
+checksum = "d77ac3dfb61ef3159998105116acdfeaec75e4296c43ee2dcc4ea39838c0080e"
 dependencies = [
  "cranelift-codegen",
  "libc",
@@ -1883,9 +1883,9 @@ dependencies = [
 
 [[package]]
 name = "cranelift-wasm"
-version = "0.110.2"
+version = "0.110.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "019e3dccb7f15e0bc14f0ddc034ec608a66df8e05c9e1e16f75a7716f8461799"
+checksum = "1d883f1b8d3d1dab4797407117bc8a1824f4a1fe86654aee2ee3205613f77d3e"
 dependencies = [
  "cranelift-codegen",
  "cranelift-entity",
@@ -1915,7 +1915,7 @@ dependencies = [
  "anes",
  "cast",
  "ciborium",
- "clap 4.5.18",
+ "clap 4.5.20",
  "criterion-plot",
  "futures",
  "is-terminal",
@@ -2984,9 +2984,9 @@ dependencies = [
 
 [[package]]
 name = "eventsource-client"
-version = "0.12.2"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c80c6714d1a380314fcb11a22eeff022e1e1c9642f0bb54e15dc9cb29f37b29"
+checksum = "43ddc25e1ad2cc0106d5e2d967397b4fb2068a66677ee9b0eea4600e5cfe8fb4"
 dependencies = [
  "futures",
  "hyper",
@@ -3100,6 +3100,12 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "foldhash"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f81ec6369c545a7d40e4589b5597581fa1c441fe1cce96dd1de43159910a36a2"
+
 [[package]]
 name = "form_urlencoded"
 version = "1.2.1"
@@ -3139,30 +3145,42 @@ dependencies = [
 
 [[package]]
 name = "fuel-asm"
-version = "0.57.1"
+version = "0.58.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711b83807968cd62babe6cd70c94b76c86f302c8573da18b3c69135688eceecd"
+checksum = "5f325971bf9047ec70004f80a989e03456316bc19cbef3ff3a39a38b192ab56e"
 dependencies = [
  "bitflags 2.6.0",
- "fuel-types 0.57.1",
+ "fuel-types 0.58.2",
  "serde",
  "strum 0.24.1",
 ]
 
+[[package]]
+name = "fuel-compression"
+version = "0.58.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24e42841f56f76ed759b3f516e5188d5c42de47015bee951651660c13b6dfa6c"
+dependencies = [
+ "fuel-derive 0.58.2",
+ "fuel-types 0.58.2",
+ "serde",
+]
+
 [[package]]
 name = "fuel-core"
-version = "0.36.0"
+version = "0.38.0"
 dependencies = [
  "anyhow",
  "assert_matches",
  "async-graphql",
  "async-trait",
  "axum",
- "clap 4.5.18",
+ "clap 4.5.20",
  "derive_more",
  "enum-iterator",
  "fuel-core",
  "fuel-core-chain-config",
+ "fuel-core-compression",
  "fuel-core-consensus-module",
  "fuel-core-database",
  "fuel-core-executor",
@@ -3178,7 +3196,7 @@ dependencies = [
  "fuel-core-sync",
  "fuel-core-trace",
  "fuel-core-txpool",
- "fuel-core-types 0.36.0",
+ "fuel-core-types 0.38.0",
  "fuel-core-upgradable-executor",
  "futures",
  "hex",
@@ -3188,6 +3206,7 @@ dependencies = [
  "mockall",
  "num_cpus",
  "parking_lot",
+ "paste",
  "postcard",
  "proptest",
  "rand",
@@ -3204,7 +3223,8 @@ dependencies = [
  "tokio-rayon",
  "tokio-stream",
  "tokio-util",
- "tower-http",
+ "tower",
+ "tower-http 0.4.4",
  "tracing",
  "uuid 1.10.0",
 ]
@@ -3215,7 +3235,7 @@ version = "0.0.0"
 dependencies = [
  "anyhow",
  "async-trait",
- "clap 4.5.18",
+ "clap 4.5.20",
  "criterion",
  "ctrlc",
  "ed25519-dalek",
@@ -3227,7 +3247,7 @@ dependencies = [
  "fuel-core-services",
  "fuel-core-storage",
  "fuel-core-sync",
- "fuel-core-types 0.36.0",
+ "fuel-core-types 0.38.0",
  "futures",
  "itertools 0.12.1",
  "num_enum",
@@ -3248,24 +3268,25 @@ dependencies = [
 
 [[package]]
 name = "fuel-core-bft"
-version = "0.36.0"
+version = "0.38.0"
 
 [[package]]
 name = "fuel-core-bin"
-version = "0.36.0"
+version = "0.38.0"
 dependencies = [
  "anyhow",
  "aws-config",
  "aws-sdk-kms",
- "clap 4.5.18",
+ "clap 4.5.20",
  "const_format",
  "dirs 4.0.0",
  "dotenvy",
  "fuel-core",
  "fuel-core-chain-config",
+ "fuel-core-compression",
  "fuel-core-poa",
  "fuel-core-storage",
- "fuel-core-types 0.36.0",
+ "fuel-core-types 0.38.0",
  "hex",
  "humantime",
  "itertools 0.12.1",
@@ -3286,7 +3307,7 @@ dependencies = [
 
 [[package]]
 name = "fuel-core-chain-config"
-version = "0.36.0"
+version = "0.38.0"
 dependencies = [
  "anyhow",
  "bech32",
@@ -3294,7 +3315,7 @@ dependencies = [
  "derivative",
  "fuel-core-chain-config",
  "fuel-core-storage",
- "fuel-core-types 0.36.0",
+ "fuel-core-types 0.38.0",
  "insta",
  "itertools 0.12.1",
  "parquet",
@@ -3312,13 +3333,14 @@ dependencies = [
 
 [[package]]
 name = "fuel-core-client"
-version = "0.36.0"
+version = "0.38.0"
 dependencies = [
  "anyhow",
+ "base64 0.22.1",
  "cynic",
  "derive_more",
  "eventsource-client",
- "fuel-core-types 0.36.0",
+ "fuel-core-types 0.38.0",
  "futures",
  "hex",
  "hyper-rustls",
@@ -3335,41 +3357,58 @@ dependencies = [
 
 [[package]]
 name = "fuel-core-client-bin"
-version = "0.36.0"
+version = "0.38.0"
 dependencies = [
- "clap 4.5.18",
+ "clap 4.5.20",
  "fuel-core-client",
- "fuel-core-types 0.36.0",
+ "fuel-core-types 0.38.0",
  "serde_json",
  "tokio",
 ]
 
+[[package]]
+name = "fuel-core-compression"
+version = "0.38.0"
+dependencies = [
+ "anyhow",
+ "fuel-core-compression",
+ "fuel-core-types 0.38.0",
+ "paste",
+ "postcard",
+ "proptest",
+ "rand",
+ "serde",
+ "strum 0.25.0",
+ "strum_macros 0.25.3",
+ "tokio",
+]
+
 [[package]]
 name = "fuel-core-consensus-module"
-version = "0.36.0"
+version = "0.38.0"
 dependencies = [
  "anyhow",
  "fuel-core-chain-config",
  "fuel-core-poa",
  "fuel-core-storage",
- "fuel-core-types 0.36.0",
+ "fuel-core-types 0.38.0",
  "test-case",
 ]
 
 [[package]]
 name = "fuel-core-database"
-version = "0.36.0"
+version = "0.38.0"
 dependencies = [
  "anyhow",
  "derive_more",
  "fuel-core-storage",
  "fuel-core-trace",
- "fuel-core-types 0.36.0",
+ "fuel-core-types 0.38.0",
 ]
 
 [[package]]
 name = "fuel-core-e2e-client"
-version = "0.36.0"
+version = "0.38.0"
 dependencies = [
  "anyhow",
  "assert_cmd",
@@ -3377,7 +3416,7 @@ dependencies = [
  "fuel-core-chain-config",
  "fuel-core-client",
  "fuel-core-trace",
- "fuel-core-types 0.36.0",
+ "fuel-core-types 0.38.0",
  "futures",
  "hex",
  "humantime-serde",
@@ -3394,12 +3433,12 @@ dependencies = [
 
 [[package]]
 name = "fuel-core-executor"
-version = "0.36.0"
+version = "0.38.0"
 dependencies = [
  "anyhow",
  "fuel-core-storage",
  "fuel-core-trace",
- "fuel-core-types 0.36.0",
+ "fuel-core-types 0.38.0",
  "hex",
  "parking_lot",
  "serde",
@@ -3408,17 +3447,18 @@ dependencies = [
 
 [[package]]
 name = "fuel-core-gas-price-service"
-version = "0.36.0"
+version = "0.38.0"
 dependencies = [
  "anyhow",
  "async-trait",
  "enum-iterator",
  "fuel-core-services",
  "fuel-core-storage",
- "fuel-core-types 0.36.0",
+ "fuel-core-types 0.38.0",
  "fuel-gas-price-algorithm",
  "futures",
  "num_enum",
+ "parking_lot",
  "reqwest",
  "serde",
  "strum 0.25.0",
@@ -3431,14 +3471,14 @@ dependencies = [
 
 [[package]]
 name = "fuel-core-importer"
-version = "0.36.0"
+version = "0.38.0"
 dependencies = [
  "anyhow",
  "derive_more",
  "fuel-core-metrics",
  "fuel-core-storage",
  "fuel-core-trace",
- "fuel-core-types 0.36.0",
+ "fuel-core-types 0.38.0",
  "mockall",
  "parking_lot",
  "rayon",
@@ -3449,22 +3489,22 @@ dependencies = [
 
 [[package]]
 name = "fuel-core-keygen"
-version = "0.36.0"
+version = "0.38.0"
 dependencies = [
  "anyhow",
- "clap 4.5.18",
- "fuel-core-types 0.36.0",
+ "clap 4.5.20",
+ "fuel-core-types 0.38.0",
  "libp2p-identity",
  "serde",
 ]
 
 [[package]]
 name = "fuel-core-keygen-bin"
-version = "0.36.0"
+version = "0.38.0"
 dependencies = [
  "anyhow",
  "atty",
- "clap 4.5.18",
+ "clap 4.5.20",
  "crossterm",
  "fuel-core-keygen",
  "serde_json",
@@ -3473,7 +3513,7 @@ dependencies = [
 
 [[package]]
 name = "fuel-core-metrics"
-version = "0.36.0"
+version = "0.38.0"
 dependencies = [
  "parking_lot",
  "pin-project-lite",
@@ -3485,7 +3525,7 @@ dependencies = [
 
 [[package]]
 name = "fuel-core-p2p"
-version = "0.36.0"
+version = "0.38.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3496,7 +3536,7 @@ dependencies = [
  "fuel-core-services",
  "fuel-core-storage",
  "fuel-core-trace",
- "fuel-core-types 0.36.0",
+ "fuel-core-types 0.38.0",
  "futures",
  "hex",
  "hickory-resolver",
@@ -3523,7 +3563,7 @@ dependencies = [
 
 [[package]]
 name = "fuel-core-poa"
-version = "0.36.0"
+version = "0.38.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3533,7 +3573,8 @@ dependencies = [
  "fuel-core-poa",
  "fuel-core-services",
  "fuel-core-storage",
- "fuel-core-types 0.36.0",
+ "fuel-core-trace",
+ "fuel-core-types 0.38.0",
  "k256",
  "mockall",
  "rand",
@@ -3547,7 +3588,7 @@ dependencies = [
 
 [[package]]
 name = "fuel-core-producer"
-version = "0.36.0"
+version = "0.38.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3555,7 +3596,7 @@ dependencies = [
  "fuel-core-producer",
  "fuel-core-storage",
  "fuel-core-trace",
- "fuel-core-types 0.36.0",
+ "fuel-core-types 0.38.0",
  "mockall",
  "proptest",
  "rand",
@@ -3566,7 +3607,7 @@ dependencies = [
 
 [[package]]
 name = "fuel-core-relayer"
-version = "0.36.0"
+version = "0.38.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -3580,7 +3621,7 @@ dependencies = [
  "fuel-core-services",
  "fuel-core-storage",
  "fuel-core-trace",
- "fuel-core-types 0.36.0",
+ "fuel-core-types 0.38.0",
  "futures",
  "mockall",
  "once_cell",
@@ -3599,28 +3640,30 @@ dependencies = [
 
 [[package]]
 name = "fuel-core-services"
-version = "0.36.0"
+version = "0.38.0"
 dependencies = [
  "anyhow",
  "async-trait",
  "fuel-core-metrics",
+ "fuel-core-services",
  "futures",
  "mockall",
  "parking_lot",
+ "rayon",
  "tokio",
  "tracing",
 ]
 
 [[package]]
 name = "fuel-core-storage"
-version = "0.36.0"
+version = "0.38.0"
 dependencies = [
  "anyhow",
  "derive_more",
  "enum-iterator",
  "fuel-core-storage",
- "fuel-core-types 0.36.0",
- "fuel-vm 0.57.1",
+ "fuel-core-types 0.38.0",
+ "fuel-vm 0.58.2",
  "impl-tools",
  "itertools 0.12.1",
  "mockall",
@@ -3637,13 +3680,13 @@ dependencies = [
 
 [[package]]
 name = "fuel-core-sync"
-version = "0.36.0"
+version = "0.38.0"
 dependencies = [
  "anyhow",
  "async-trait",
  "fuel-core-services",
  "fuel-core-trace",
- "fuel-core-types 0.36.0",
+ "fuel-core-types 0.38.0",
  "futures",
  "mockall",
  "rand",
@@ -3662,13 +3705,14 @@ dependencies = [
  "async-trait",
  "aws-config",
  "aws-sdk-kms",
- "clap 4.5.18",
+ "clap 4.5.20",
  "cynic",
  "ethers",
  "fuel-core",
  "fuel-core-benches",
  "fuel-core-bin",
  "fuel-core-client",
+ "fuel-core-compression",
  "fuel-core-executor",
  "fuel-core-gas-price-service",
  "fuel-core-p2p",
@@ -3677,7 +3721,7 @@ dependencies = [
  "fuel-core-storage",
  "fuel-core-trace",
  "fuel-core-txpool",
- "fuel-core-types 0.36.0",
+ "fuel-core-types 0.38.0",
  "fuel-core-upgradable-executor",
  "futures",
  "hex",
@@ -3685,6 +3729,7 @@ dependencies = [
  "insta",
  "itertools 0.12.1",
  "k256",
+ "postcard",
  "pretty_assertions",
  "primitive-types",
  "proptest",
@@ -3702,7 +3747,7 @@ dependencies = [
 
 [[package]]
 name = "fuel-core-trace"
-version = "0.36.0"
+version = "0.38.0"
 dependencies = [
  "ctor",
  "tracing",
@@ -3712,28 +3757,25 @@ dependencies = [
 
 [[package]]
 name = "fuel-core-txpool"
-version = "0.36.0"
+version = "0.38.0"
 dependencies = [
  "anyhow",
  "async-trait",
  "derive_more",
- "fuel-core-metrics",
  "fuel-core-services",
  "fuel-core-storage",
  "fuel-core-trace",
  "fuel-core-txpool",
- "fuel-core-types 0.36.0",
+ "fuel-core-types 0.38.0",
  "futures",
- "itertools 0.12.1",
  "mockall",
  "num-rational",
  "parking_lot",
+ "petgraph",
  "proptest",
- "rayon",
- "rstest",
+ "rand",
  "test-strategy",
  "tokio",
- "tokio-rayon",
  "tokio-stream",
  "tracing",
 ]
@@ -3756,13 +3798,13 @@ dependencies = [
 
 [[package]]
 name = "fuel-core-types"
-version = "0.36.0"
+version = "0.38.0"
 dependencies = [
  "anyhow",
  "bs58",
  "derivative",
  "derive_more",
- "fuel-vm 0.57.1",
+ "fuel-vm 0.58.2",
  "rand",
  "secrecy",
  "serde",
@@ -3772,13 +3814,13 @@ dependencies = [
 
 [[package]]
 name = "fuel-core-upgradable-executor"
-version = "0.36.0"
+version = "0.38.0"
 dependencies = [
  "anyhow",
  "derive_more",
  "fuel-core-executor",
  "fuel-core-storage",
- "fuel-core-types 0.36.0",
+ "fuel-core-types 0.38.0",
  "fuel-core-wasm-executor",
  "ntest",
  "parking_lot",
@@ -3789,13 +3831,13 @@ dependencies = [
 
 [[package]]
 name = "fuel-core-wasm-executor"
-version = "0.36.0"
+version = "0.38.0"
 dependencies = [
  "anyhow",
  "fuel-core-executor",
  "fuel-core-storage",
  "fuel-core-types 0.35.0",
- "fuel-core-types 0.36.0",
+ "fuel-core-types 0.38.0",
  "postcard",
  "proptest",
  "serde",
@@ -3820,15 +3862,15 @@ dependencies = [
 
 [[package]]
 name = "fuel-crypto"
-version = "0.57.1"
+version = "0.58.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5a4ca62d0a8a361b66a6eab3456285883d0aa92c407e249fc76f195c332fbb2"
+checksum = "65e318850ca64890ff123a99b6b866954ef49da94ab9bc6827cf6ee045568585"
 dependencies = [
  "coins-bip32",
  "coins-bip39",
  "ecdsa",
  "ed25519-dalek",
- "fuel-types 0.57.1",
+ "fuel-types 0.58.2",
  "k256",
  "lazy_static",
  "p256",
@@ -3853,9 +3895,9 @@ dependencies = [
 
 [[package]]
 name = "fuel-derive"
-version = "0.57.1"
+version = "0.58.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ca99d9c264fec231a01e55bbdb6adb3080266dc44c4cc88de870b089ee2a015"
+checksum = "ab0bc46a3552964bae5169e79b383761a54bd115ea66951a1a7a229edcefa55a"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -3865,7 +3907,7 @@ dependencies = [
 
 [[package]]
 name = "fuel-gas-price-algorithm"
-version = "0.36.0"
+version = "0.38.0"
 dependencies = [
  "proptest",
  "rand",
@@ -3890,13 +3932,13 @@ dependencies = [
 
 [[package]]
 name = "fuel-merkle"
-version = "0.57.1"
+version = "0.58.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02f3c08f22f7c24170a4ac255e7dfe52d52ae2e85c4a8e26ed6df4f1bd380210"
+checksum = "c79eca6a452311c70978a5df796c0f99f27e474b69719e0db4c1d82e68800d07"
 dependencies = [
  "derive_more",
  "digest 0.10.7",
- "fuel-storage 0.57.1",
+ "fuel-storage 0.58.2",
  "hashbrown 0.13.2",
  "hex",
  "serde",
@@ -3911,9 +3953,9 @@ checksum = "4c1b711f28553ddc5f3546711bd220e144ce4c1af7d9e9a1f70b2f20d9f5b791"
 
 [[package]]
 name = "fuel-storage"
-version = "0.57.1"
+version = "0.58.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d676ea5d926bf90c8ea442e5f6fc23c0e86c2e4d663f303842b4afe5b7928084"
+checksum = "2d0c46b5d76b3e11197bd31e036cd8b1cb46c4d822cacc48836638080c6d2b76"
 
 [[package]]
 name = "fuel-tx"
@@ -3939,23 +3981,23 @@ dependencies = [
 
 [[package]]
 name = "fuel-tx"
-version = "0.57.1"
+version = "0.58.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86158d08fe2a936ac765a1e2cb9bf60be704203b3085882e7cc6cd4c48de38ef"
+checksum = "6723bb8710ba2b70516ac94d34459593225870c937670fb3afaf82e0354667ac"
 dependencies = [
  "bitflags 2.6.0",
  "derivative",
  "derive_more",
- "fuel-asm 0.57.1",
- "fuel-crypto 0.57.1",
- "fuel-merkle 0.57.1",
- "fuel-types 0.57.1",
+ "fuel-asm 0.58.2",
+ "fuel-compression",
+ "fuel-crypto 0.58.2",
+ "fuel-merkle 0.58.2",
+ "fuel-types 0.58.2",
  "hashbrown 0.14.5",
  "itertools 0.10.5",
  "postcard",
  "rand",
  "serde",
- "serde_json",
  "strum 0.24.1",
  "strum_macros 0.24.3",
 ]
@@ -3973,11 +4015,11 @@ dependencies = [
 
 [[package]]
 name = "fuel-types"
-version = "0.57.1"
+version = "0.58.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42b4430c6a20669fffd8f2c17d2be6809a356f623243a78b5eedf8ba7897c036"
+checksum = "982265415a99b5bd6277bc24194a233bb2e18764df11c937b3dbb11a02c9e545"
 dependencies = [
- "fuel-derive 0.57.1",
+ "fuel-derive 0.58.2",
  "hex",
  "rand",
  "serde",
@@ -4016,9 +4058,9 @@ dependencies = [
 
 [[package]]
 name = "fuel-vm"
-version = "0.57.1"
+version = "0.58.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1b04a4e971d58b3662ff8b84b3176094e25f4b372728a13ea903fdf79c7e426"
+checksum = "54b5362d7d072c72eec20581f67fc5400090c356a7f3ae77c79880b3b177b667"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -4027,12 +4069,13 @@ dependencies = [
  "derivative",
  "derive_more",
  "ethnum",
- "fuel-asm 0.57.1",
- "fuel-crypto 0.57.1",
- "fuel-merkle 0.57.1",
- "fuel-storage 0.57.1",
- "fuel-tx 0.57.1",
- "fuel-types 0.57.1",
+ "fuel-asm 0.58.2",
+ "fuel-compression",
+ "fuel-crypto 0.58.2",
+ "fuel-merkle 0.58.2",
+ "fuel-storage 0.58.2",
+ "fuel-tx 0.58.2",
+ "fuel-types 0.58.2",
  "hashbrown 0.14.5",
  "itertools 0.10.5",
  "libm",
@@ -4056,9 +4099,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "futures"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -4081,9 +4124,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -4091,15 +4134,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -4109,9 +4152,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 
 [[package]]
 name = "futures-lite"
@@ -4153,9 +4196,9 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4169,21 +4212,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8f2f12607f92c69b12ed746fabf9ca4f5c482cba46679c1a75b874ed7c26adb"
 dependencies = [
  "futures-io",
- "rustls 0.23.13",
+ "rustls 0.23.14",
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "futures-sink"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
 
 [[package]]
 name = "futures-task"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
 
 [[package]]
 name = "futures-ticker"
@@ -4208,9 +4251,9 @@ dependencies = [
 
 [[package]]
 name = "futures-util"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -4272,15 +4315,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
 dependencies = [
  "fallible-iterator",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "stable_deref_trait",
 ]
 
 [[package]]
 name = "gimli"
-version = "0.31.0"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
 [[package]]
 name = "glob"
@@ -4345,7 +4388,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http 0.2.12",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -4397,6 +4440,17 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+dependencies = [
+ "allocator-api2",
+ "equivalent",
+ "foldhash",
+]
+
 [[package]]
 name = "hashers"
 version = "1.0.1"
@@ -4637,9 +4691,9 @@ checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f"
 
 [[package]]
 name = "httparse"
-version = "1.9.4"
+version = "1.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
+checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
 
 [[package]]
 name = "httpdate"
@@ -4911,12 +4965,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68b900aa2f7301e21c36462b170ee99994de34dff39a4a6a528e80e7376d07e5"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.0",
  "serde",
 ]
 
@@ -5000,9 +5054,9 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.10.0"
+version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4"
+checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"
 
 [[package]]
 name = "is-terminal"
@@ -5065,9 +5119,9 @@ dependencies = [
 
 [[package]]
 name = "js-sys"
-version = "0.3.70"
+version = "0.3.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
+checksum = "0cb94a0ffd3f3ee755c20f7d8752f45cac88605a4dcf808abcff72873296ec7b"
 dependencies = [
  "wasm-bindgen",
 ]
@@ -5137,7 +5191,7 @@ dependencies = [
  "lalrpop-util",
  "petgraph",
  "regex",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.5",
  "string_cache",
  "term",
  "tiny-keccak",
@@ -5151,7 +5205,7 @@ version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553"
 dependencies = [
- "regex-automata 0.4.7",
+ "regex-automata 0.4.8",
 ]
 
 [[package]]
@@ -5538,7 +5592,7 @@ dependencies = [
  "quinn",
  "rand",
  "ring 0.17.8",
- "rustls 0.23.13",
+ "rustls 0.23.14",
  "socket2 0.5.7",
  "thiserror",
  "tokio",
@@ -5651,7 +5705,7 @@ dependencies = [
  "libp2p-identity",
  "rcgen",
  "ring 0.17.8",
- "rustls 0.23.13",
+ "rustls 0.23.14",
  "rustls-webpki 0.101.7",
  "thiserror",
  "x509-parser",
@@ -5801,7 +5855,7 @@ version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6d8de370f98a6cb8a4606618e53e802f93b094ddec0f96988eaec2c27e6e9ce7"
 dependencies = [
- "clap 4.5.18",
+ "clap 4.5.20",
  "termcolor",
  "threadpool",
 ]
@@ -5856,11 +5910,11 @@ dependencies = [
 
 [[package]]
 name = "lru"
-version = "0.12.4"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37ee39891760e7d94734f6f63fedc29a2e4a152f836120753a72503f09fcf904"
+checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38"
 dependencies = [
- "hashbrown 0.14.5",
+ "hashbrown 0.15.0",
 ]
 
 [[package]]
@@ -6395,13 +6449,13 @@ checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef"
 
 [[package]]
 name = "object"
-version = "0.36.4"
+version = "0.36.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
+checksum = "aedf0a2d09c573ed1d8d85b30c119153926a2b36dce0ab28322c09a117a4683e"
 dependencies = [
  "crc32fast",
- "hashbrown 0.14.5",
- "indexmap 2.5.0",
+ "hashbrown 0.15.0",
+ "indexmap 2.6.0",
  "memchr",
 ]
 
@@ -6416,9 +6470,9 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
 
 [[package]]
 name = "oorandom"
@@ -6558,7 +6612,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.5.6",
+ "redox_syscall 0.5.7",
  "smallvec",
  "windows-targets 0.52.6",
 ]
@@ -6676,7 +6730,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
 ]
 
 [[package]]
@@ -6742,18 +6796,18 @@ dependencies = [
 
 [[package]]
 name = "pin-project"
-version = "1.1.5"
+version = "1.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
+checksum = "baf123a161dde1e524adf36f90bc5d8d3462824a9c43553ad07a8183161189ec"
 dependencies = [
  "pin-project-internal",
 ]
 
 [[package]]
 name = "pin-project-internal"
-version = "1.1.5"
+version = "1.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
+checksum = "a4502d8515ca9f32f1fb543d987f63d95a14934883db45bdb48060b6b69257f8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -7060,9 +7114,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a"
 dependencies = [
  "unicode-ident",
 ]
@@ -7104,7 +7158,7 @@ dependencies = [
  "rand",
  "rand_chacha",
  "rand_xorshift",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.5",
  "rusty-fork",
  "tempfile",
  "unarray",
@@ -7256,7 +7310,7 @@ dependencies = [
  "quinn-proto",
  "quinn-udp",
  "rustc-hash 2.0.0",
- "rustls 0.23.13",
+ "rustls 0.23.14",
  "socket2 0.5.7",
  "thiserror",
  "tokio",
@@ -7273,7 +7327,7 @@ dependencies = [
  "rand",
  "ring 0.17.8",
  "rustc-hash 2.0.0",
- "rustls 0.23.13",
+ "rustls 0.23.14",
  "slab",
  "thiserror",
  "tinyvec",
@@ -7349,9 +7403,9 @@ dependencies = [
 
 [[package]]
 name = "raw-cpuid"
-version = "11.1.0"
+version = "11.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cb9ee317cfe3fbd54b36a511efc1edd42e216903c9cd575e686dd68a2ba90d8d"
+checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0"
 dependencies = [
  "bitflags 2.6.0",
 ]
@@ -7399,9 +7453,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.6"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "355ae415ccd3a04315d3f8246e86d67689ea74d88d915576e1589a351062a13b"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
 dependencies = [
  "bitflags 2.6.0",
 ]
@@ -7438,14 +7492,14 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.6"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.7",
- "regex-syntax 0.8.4",
+ "regex-automata 0.4.8",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -7459,13 +7513,13 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -7482,9 +7536,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "reqwest"
@@ -7750,9 +7804,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.23.13"
+version = "0.23.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2dabaac7466917e566adb06783a81ca48944c6898a1b08b9374106dd671f4c8"
+checksum = "415d9944693cb90382053259f89fbb077ea730ad7273047ec63b19bc9b160ba8"
 dependencies = [
  "once_cell",
  "ring 0.17.8",
@@ -7889,9 +7943,9 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.24"
+version = "0.1.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b"
+checksum = "01227be5826fa0690321a2ba6c5cd57a19cf3f6a09e76973b58e61de6ab9d1c1"
 dependencies = [
  "windows-sys 0.59.0",
 ]
@@ -8097,15 +8151,15 @@ dependencies = [
 
 [[package]]
 name = "serde_with"
-version = "3.9.0"
+version = "3.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cecfa94848272156ea67b2b1a53f20fc7bc638c4a46d2f8abde08f05f4b857"
+checksum = "8e28bdad6db2b8340e449f7108f020b3b092e8583a9e3fb82713e1d4e71fe817"
 dependencies = [
  "base64 0.22.1",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "serde",
  "serde_derive",
  "serde_json",
@@ -8115,9 +8169,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.9.0"
+version = "3.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8fee4991ef4f274617a51ad4af30519438dacb2f56ac773b08a1922ff743350"
+checksum = "9d846214a9854ef724f3da161b426242d8de7c1fc7de2f89bb1efcb154dca79d"
 dependencies = [
  "darling 0.20.10",
  "proc-macro2",
@@ -8131,7 +8185,7 @@ version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "itoa",
  "ryu",
  "serde",
@@ -8560,9 +8614,9 @@ dependencies = [
 
 [[package]]
 name = "symbolic-common"
-version = "12.11.1"
+version = "12.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fdf97c441f18a4f92425b896a4ec7a27e03631a0b1047ec4e34e9916a9a167e"
+checksum = "366f1b4c6baf6cfefc234bbd4899535fca0b06c74443039a73f6dfb2fad88d77"
 dependencies = [
  "debugid",
  "memmap2",
@@ -8572,9 +8626,9 @@ dependencies = [
 
 [[package]]
 name = "symbolic-demangle"
-version = "12.11.1"
+version = "12.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc8ece6b129e97e53d1fbb3f61d33a6a9e5369b11d01228c068094d6d134eaea"
+checksum = "aba05ba5b9962ea5617baf556293720a8b2d0a282aa14ee4bf10e22efc7da8c8"
 dependencies = [
  "cpp_demangle",
  "rustc-demangle",
@@ -8751,7 +8805,7 @@ name = "test-helpers"
 version = "0.0.0"
 dependencies = [
  "anyhow",
- "clap 4.5.18",
+ "clap 4.5.20",
  "fuel-core",
  "fuel-core-bin",
  "fuel-core-client",
@@ -8761,7 +8815,7 @@ dependencies = [
  "fuel-core-storage",
  "fuel-core-trace",
  "fuel-core-txpool",
- "fuel-core-types 0.36.0",
+ "fuel-core-types 0.38.0",
  "futures",
  "itertools 0.12.1",
  "rand",
@@ -9058,7 +9112,7 @@ version = "0.22.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
 dependencies = [
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -9076,6 +9130,7 @@ dependencies = [
  "pin-project",
  "pin-project-lite",
  "tokio",
+ "tokio-util",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -9095,10 +9150,28 @@ dependencies = [
  "http-body 0.4.6",
  "http-range-header",
  "pin-project-lite",
- "tokio",
  "tower",
  "tower-layer",
  "tower-service",
+]
+
+[[package]]
+name = "tower-http"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140"
+dependencies = [
+ "bitflags 2.6.0",
+ "bytes",
+ "futures-core",
+ "futures-util",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "http-range-header",
+ "pin-project-lite",
+ "tokio",
+ "tower-layer",
+ "tower-service",
  "tracing",
 ]
 
@@ -9257,9 +9330,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "ucd-trie"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
+checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
 
 [[package]]
 name = "uint"
@@ -9281,9 +9354,9 @@ checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94"
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.15"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
 
 [[package]]
 name = "unicode-ident"
@@ -9491,9 +9564,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.93"
+version = "0.2.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
+checksum = "ef073ced962d62984fb38a36e5fdc1a2b23c9e0e1fa0689bb97afa4202ef6887"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -9502,9 +9575,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.93"
+version = "0.2.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
+checksum = "c4bfab14ef75323f4eb75fa52ee0a3fb59611977fd3240da19b2cf36ff85030e"
 dependencies = [
  "bumpalo",
  "log",
@@ -9517,9 +9590,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.43"
+version = "0.4.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
+checksum = "65471f79c1022ffa5291d33520cbbb53b7687b01c2f8e83b57d102eed7ed479d"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -9529,9 +9602,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.93"
+version = "0.2.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
+checksum = "a7bec9830f60924d9ceb3ef99d55c155be8afa76954edffbb5936ff4509474e7"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -9539,9 +9612,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.93"
+version = "0.2.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
+checksum = "4c74f6e152a76a2ad448e223b0fc0b6b5747649c3d769cc6bf45737bf97d0ed6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9552,9 +9625,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.93"
+version = "0.2.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
+checksum = "a42f6c679374623f295a8623adfe63d9284091245c3504bde47c17a3ce2777d9"
 
 [[package]]
 name = "wasm-encoder"
@@ -9574,7 +9647,7 @@ dependencies = [
  "ahash",
  "bitflags 2.6.0",
  "hashbrown 0.14.5",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "semver",
  "serde",
 ]
@@ -9592,9 +9665,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime"
-version = "23.0.2"
+version = "23.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07232e0b473af36112da7348f51e73fa8b11047a6cb546096da3812930b7c93a"
+checksum = "fe501caefeb9f7b15360bdd7e47ad96e20223846f1c7db485ae5820ba5acc3d2"
 dependencies = [
  "anyhow",
  "bitflags 2.6.0",
@@ -9602,7 +9675,7 @@ dependencies = [
  "cc",
  "cfg-if",
  "hashbrown 0.14.5",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "libc",
  "libm",
  "log",
@@ -9634,18 +9707,18 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-asm-macros"
-version = "23.0.2"
+version = "23.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5a9c42562d879c749288d9a26acc0d95d2ca069e30c2ec2efce84461c4d62b3"
+checksum = "c904a057d74bfa0ad9369a3fd99231d81ba0345f059d03c9148c3bb2abbf310f"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "wasmtime-cache"
-version = "23.0.2"
+version = "23.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d5d5aac98c8ae87cf5244495da7722e3fa022aa6f3f4fcd5e3d6e5699ce422"
+checksum = "8dff4d467d6b5bd0d137f5426f45178222e40b59e49ab3a7361420262b9f00df"
 dependencies = [
  "anyhow",
  "base64 0.21.7",
@@ -9663,9 +9736,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-component-macro"
-version = "23.0.2"
+version = "23.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0c3f57c4bc96f9b4a6ff4d6cb6e837913eff32e98d09e2b6d79b5c4647b415b"
+checksum = "3a96185dab1c14ffb986ff2b3a2185d15acf2b801ca7895aa35ee80328e2ce38"
 dependencies = [
  "anyhow",
  "proc-macro2",
@@ -9678,15 +9751,15 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-component-util"
-version = "23.0.2"
+version = "23.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1da707969bc31a565da9b32d087eb2370c95c6f2087c5539a15f2e3b27e77203"
+checksum = "71a40200d42a8985edadb4007a0ed320756cbe28065b83e0027e39524c1b1b22"
 
 [[package]]
 name = "wasmtime-cranelift"
-version = "23.0.2"
+version = "23.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62cb6135ec46994299be711b78b03acaa9480de3715f827d450f0c947a84977c"
+checksum = "b099ef9b7808fa8d18cad32243e78e9c07a4a8aacfa913d88dc08704b1643c49"
 dependencies = [
  "anyhow",
  "cfg-if",
@@ -9708,15 +9781,15 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-environ"
-version = "23.0.2"
+version = "23.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bcaa3b42a0718e9123da7fb75e8e13fc95df7db2a7e32e2f2f4f0d3333b7d6f"
+checksum = "e2f1765f6ca1a166927bee13ad4aed7bf18269f34c0cd7d6d523889a0b52e6ee"
 dependencies = [
  "anyhow",
  "cranelift-bitset",
  "cranelift-entity",
  "gimli 0.28.1",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "log",
  "object",
  "postcard",
@@ -9731,9 +9804,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-jit-icache-coherence"
-version = "23.0.2"
+version = "23.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cfee42dac5148fc2664ab1f5cb8d7fa77a28d1a2cf1d9483abc2c3d751a58b9"
+checksum = "1e1a826e4ccd0803b2f7463289cad104f40d09d06bc8acf1a614230a47b4d96f"
 dependencies = [
  "anyhow",
  "cfg-if",
@@ -9743,15 +9816,15 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-slab"
-version = "23.0.2"
+version = "23.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42eb8f6515708ec67974998c3e644101db4186308985f5ef7c2ef324ff33c948"
+checksum = "f92a137c17c992eb5eaacfa0f0590353471e49dbb4bdbdf9cf7536d66109e63a"
 
 [[package]]
 name = "wasmtime-types"
-version = "23.0.2"
+version = "23.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "046873fb8fb3e9652f3fd76fe99c8c8129007695c3d73b2e307fdae40f6e324c"
+checksum = "a6072ac3267866d99ca726b6a4f157df9b733aac8082e902d527368f07c303ba"
 dependencies = [
  "anyhow",
  "cranelift-entity",
@@ -9763,9 +9836,9 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-versioned-export-macros"
-version = "23.0.2"
+version = "23.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99c02af2e9dbeb427304d1a08787d70ed0dbfec1af2236616f84c9f1f03e7969"
+checksum = "a2bde986038b819bc43a21fef0610aeb47aabfe3ea09ca3533a7b81023b84ec6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9774,21 +9847,21 @@ dependencies = [
 
 [[package]]
 name = "wasmtime-wit-bindgen"
-version = "23.0.2"
+version = "23.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75f528f8b8a2376a3dacaf497d960216dd466d324425361e1e00e26de0a7705c"
+checksum = "8f88e49a9b81746ec0cede5505e40a4012c92cb5054cd7ef4300dc57c36f26b1"
 dependencies = [
  "anyhow",
  "heck 0.4.1",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "wit-parser",
 ]
 
 [[package]]
 name = "web-sys"
-version = "0.3.70"
+version = "0.3.71"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
+checksum = "44188d185b5bdcae1052d08bcbcf9091a5524038d4572cc4f4f2bb9d5554ddd9"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -10050,7 +10123,7 @@ checksum = "ceeb0424aa8679f3fcf2d6e3cfa381f3d6fa6179976a2c05a6249dd2bb426716"
 dependencies = [
  "anyhow",
  "id-arena",
- "indexmap 2.5.0",
+ "indexmap 2.6.0",
  "log",
  "semver",
  "serde",
@@ -10142,7 +10215,7 @@ dependencies = [
 name = "xtask"
 version = "0.0.0"
 dependencies = [
- "clap 4.5.18",
+ "clap 4.5.20",
  "fuel-core",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index 2aaf0971300..cda1005738f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,6 +8,7 @@ members = [
   "bin/keygen",
   "crates/chain-config",
   "crates/client",
+  "crates/compression",
   "crates/database",
   "crates/fuel-core",
   "crates/fuel-gas-price-algorithm",
@@ -24,7 +25,7 @@ members = [
   "crates/services/producer",
   "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",
@@ -50,42 +51,43 @@ homepage = "https://fuel.network/"
 keywords = ["blockchain", "cryptocurrencies", "fuel-vm", "vm"]
 license = "BUSL-1.1"
 repository = "https://github.com/FuelLabs/fuel-core"
-version = "0.36.0"
+version = "0.38.0"
 
 [workspace.dependencies]
 # Workspace members
-fuel-core = { version = "0.36.0", path = "./crates/fuel-core", default-features = false }
-fuel-core-client-bin = { version = "0.36.0", path = "./bin/fuel-core-client" }
-fuel-core-bin = { version = "0.36.0", path = "./bin/fuel-core" }
-fuel-core-keygen = { version = "0.36.0", path = "./crates/keygen" }
-fuel-core-keygen-bin = { version = "0.36.0", path = "./bin/keygen" }
-fuel-core-chain-config = { version = "0.36.0", path = "./crates/chain-config", default-features = false }
-fuel-core-client = { version = "0.36.0", path = "./crates/client" }
-fuel-core-database = { version = "0.36.0", path = "./crates/database" }
-fuel-core-metrics = { version = "0.36.0", path = "./crates/metrics" }
-fuel-core-services = { version = "0.36.0", path = "./crates/services" }
-fuel-core-consensus-module = { version = "0.36.0", path = "./crates/services/consensus_module" }
-fuel-core-bft = { version = "0.36.0", path = "./crates/services/consensus_module/bft" }
-fuel-core-poa = { version = "0.36.0", path = "./crates/services/consensus_module/poa" }
-fuel-core-executor = { version = "0.36.0", path = "./crates/services/executor", default-features = false }
-fuel-core-importer = { version = "0.36.0", path = "./crates/services/importer" }
-fuel-core-gas-price-service = { version = "0.36.0", path = "crates/services/gas_price_service" }
-fuel-core-p2p = { version = "0.36.0", path = "./crates/services/p2p" }
-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-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 }
+fuel-core = { version = "0.38.0", path = "./crates/fuel-core", default-features = false }
+fuel-core-client-bin = { version = "0.38.0", path = "./bin/fuel-core-client" }
+fuel-core-bin = { version = "0.38.0", path = "./bin/fuel-core" }
+fuel-core-keygen = { version = "0.38.0", path = "./crates/keygen" }
+fuel-core-keygen-bin = { version = "0.38.0", path = "./bin/keygen" }
+fuel-core-chain-config = { version = "0.38.0", path = "./crates/chain-config", default-features = false }
+fuel-core-client = { version = "0.38.0", path = "./crates/client" }
+fuel-core-compression = { version = "0.38.0", path = "./crates/compression" }
+fuel-core-database = { version = "0.38.0", path = "./crates/database" }
+fuel-core-metrics = { version = "0.38.0", path = "./crates/metrics" }
+fuel-core-services = { version = "0.38.0", path = "./crates/services" }
+fuel-core-consensus-module = { version = "0.38.0", path = "./crates/services/consensus_module" }
+fuel-core-bft = { version = "0.38.0", path = "./crates/services/consensus_module/bft" }
+fuel-core-poa = { version = "0.38.0", path = "./crates/services/consensus_module/poa" }
+fuel-core-executor = { version = "0.38.0", path = "./crates/services/executor", default-features = false }
+fuel-core-importer = { version = "0.38.0", path = "./crates/services/importer" }
+fuel-core-gas-price-service = { version = "0.38.0", path = "crates/services/gas_price_service" }
+fuel-core-p2p = { version = "0.38.0", path = "./crates/services/p2p" }
+fuel-core-producer = { version = "0.38.0", path = "./crates/services/producer" }
+fuel-core-relayer = { version = "0.38.0", path = "./crates/services/relayer" }
+fuel-core-sync = { version = "0.38.0", path = "./crates/services/sync" }
+fuel-core-txpool = { version = "0.38.0", path = "./crates/services/txpool_v2" }
+fuel-core-storage = { version = "0.38.0", path = "./crates/storage", default-features = false }
+fuel-core-trace = { version = "0.38.0", path = "./crates/trace" }
+fuel-core-types = { version = "0.38.0", path = "./crates/types", default-features = false }
 fuel-core-tests = { version = "0.0.0", path = "./tests" }
-fuel-core-upgradable-executor = { version = "0.36.0", path = "./crates/services/upgradable-executor" }
-fuel-core-wasm-executor = { version = "0.36.0", path = "./crates/services/upgradable-executor/wasm-executor", default-features = false }
+fuel-core-upgradable-executor = { version = "0.38.0", path = "./crates/services/upgradable-executor" }
+fuel-core-wasm-executor = { version = "0.38.0", path = "./crates/services/upgradable-executor/wasm-executor", default-features = false }
 fuel-core-xtask = { version = "0.0.0", path = "./xtask" }
-fuel-gas-price-algorithm = { version = "0.36.0", path = "crates/fuel-gas-price-algorithm" }
+fuel-gas-price-algorithm = { version = "0.38.0", path = "crates/fuel-gas-price-algorithm" }
 
 # Fuel dependencies
-fuel-vm-private = { version = "0.57.0", package = "fuel-vm", default-features = false }
+fuel-vm-private = { version = "0.58.2", package = "fuel-vm", default-features = false }
 
 # Common dependencies
 anyhow = "1.0"
@@ -112,7 +114,7 @@ postcard = "1.0"
 tracing-attributes = "0.1"
 tracing-subscriber = "0.3"
 serde = "1.0"
-serde_json = { version = "1.0", default-features = false }
+serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
 serde_with = { version = "3.4", default-features = false }
 strum = { version = "0.25" }
 strum_macros = "0.25"
@@ -129,6 +131,7 @@ test-strategy = "0.3"
 parquet = { version = "49.0", default-features = false }
 rayon = "1.10.0"
 bytes = "1.5.0"
+paste = "1.0"
 pretty_assertions = "1.4.0"
 proptest = "1.1"
 pin-project-lite = "0.2"
diff --git a/benches/benches/block_target_gas.rs b/benches/benches/block_target_gas.rs
index 8cb4d1fd9a7..9574720a3df 100644
--- a/benches/benches/block_target_gas.rs
+++ b/benches/benches/block_target_gas.rs
@@ -27,7 +27,6 @@ use fuel_core::{
         Config,
         FuelService,
     },
-    txpool::types::Word,
 };
 use fuel_core_benches::{
     default_gas_costs::default_gas_costs,
@@ -57,6 +56,7 @@ use fuel_core_types::{
         GTFArgs,
         Instruction,
         RegId,
+        Word,
     },
     fuel_crypto::{
         secp256r1,
@@ -83,6 +83,7 @@ use fuel_core_types::{
         checked_transaction::EstimatePredicates,
         consts::WORD_SIZE,
         interpreter::MemoryInstance,
+        predicate::EmptyStorage,
     },
     services::executor::TransactionExecutionResult,
 };
@@ -418,6 +419,7 @@ fn run_with_service_with_extra_inputs(
             tx.estimate_predicates(
                 &chain_config.consensus_parameters.clone().into(),
                 MemoryInstance::new(),
+                &EmptyStorage,
             )
             .unwrap();
             async move {
@@ -426,11 +428,8 @@ fn run_with_service_with_extra_inputs(
                 let mut sub = shared.block_importer.block_importer.subscribe();
                 shared
                     .txpool_shared_state
-                    .insert(vec![std::sync::Arc::new(tx)])
+                    .insert(tx)
                     .await
-                    .into_iter()
-                    .next()
-                    .expect("Should be at least 1 element")
                     .expect("Should include transaction successfully");
                 let res = sub.recv().await.expect("Should produce a block");
                 assert_eq!(res.tx_status.len(), 2, "res.tx_status: {:?}", res.tx_status);
diff --git a/benches/benches/transaction_throughput.rs b/benches/benches/transaction_throughput.rs
index 55a2f11990e..23454dda359 100644
--- a/benches/benches/transaction_throughput.rs
+++ b/benches/benches/transaction_throughput.rs
@@ -39,6 +39,7 @@ use fuel_core_types::{
             EstimatePredicates,
         },
         interpreter::MemoryInstance,
+        predicate::EmptyStorage,
     },
 };
 use rand::{
@@ -103,20 +104,15 @@ where
                     for _ in 0..iters {
                         let mut test_builder = test_builder.clone();
                         let sealed_block = {
-                            let transactions = transactions
-                                .iter()
-                                .map(|tx| Arc::new(tx.clone()))
-                                .collect();
+                            let transactions: Vec<Transaction> =
+                                transactions.iter().cloned().collect();
                             // start the producer node
                             let TestContext { srv, client, .. } =
                                 test_builder.finalize().await;
 
                             // insert all transactions
-                            let results =
-                                srv.shared.txpool_shared_state.insert(transactions).await;
-                            for result in results {
-                                let result = result.expect("Should insert transaction");
-                                assert_eq!(result.removed.len(), 0);
+                            for tx in transactions {
+                                srv.shared.txpool_shared_state.insert(tx).await.unwrap();
                             }
                             let _ = client.produce_blocks(1, None).await;
 
@@ -194,8 +190,12 @@ fn signed_transfers(c: &mut Criterion) {
             .add_output(Output::coin(rng.gen(), 50, AssetId::default()))
             .add_output(Output::change(rng.gen(), 0, AssetId::default()))
             .finalize();
-        tx.estimate_predicates(&checked_parameters(), MemoryInstance::new())
-            .expect("Predicate check failed");
+        tx.estimate_predicates(
+            &checked_parameters(),
+            MemoryInstance::new(),
+            &EmptyStorage,
+        )
+        .expect("Predicate check failed");
         tx
     };
     bench_txs("signed transfers", c, generator);
@@ -220,8 +220,12 @@ fn predicate_transfers(c: &mut Criterion) {
             .add_output(Output::coin(rng.gen(), 50, AssetId::default()))
             .add_output(Output::change(rng.gen(), 0, AssetId::default()))
             .finalize();
-        tx.estimate_predicates(&checked_parameters(), MemoryInstance::new())
-            .expect("Predicate check failed");
+        tx.estimate_predicates(
+            &checked_parameters(),
+            MemoryInstance::new(),
+            &EmptyStorage,
+        )
+        .expect("Predicate check failed");
         tx
     };
     bench_txs("predicate transfers", c, generator);
@@ -288,8 +292,12 @@ fn predicate_transfers_eck1(c: &mut Criterion) {
             .add_output(Output::coin(rng.gen(), 50, AssetId::default()))
             .add_output(Output::change(rng.gen(), 0, AssetId::default()))
             .finalize();
-        tx.estimate_predicates(&checked_parameters(), MemoryInstance::new())
-            .expect("Predicate check failed");
+        tx.estimate_predicates(
+            &checked_parameters(),
+            MemoryInstance::new(),
+            &EmptyStorage,
+        )
+        .expect("Predicate check failed");
         tx
     };
     bench_txs("predicate transfers eck1", c, generator);
@@ -358,8 +366,12 @@ fn predicate_transfers_ed19(c: &mut Criterion) {
             .add_output(Output::coin(rng.gen(), 50, AssetId::default()))
             .add_output(Output::change(rng.gen(), 0, AssetId::default()))
             .finalize();
-        tx.estimate_predicates(&checked_parameters(), MemoryInstance::new())
-            .expect("Predicate check failed");
+        tx.estimate_predicates(
+            &checked_parameters(),
+            MemoryInstance::new(),
+            &EmptyStorage,
+        )
+        .expect("Predicate check failed");
         tx
     };
     bench_txs("predicate transfers ed19", c, generator);
diff --git a/benches/src/default_gas_costs.rs b/benches/src/default_gas_costs.rs
index 4ef866f9a27..ed10c1c3333 100644
--- a/benches/src/default_gas_costs.rs
+++ b/benches/src/default_gas_costs.rs
@@ -57,8 +57,8 @@ pub fn default_gas_costs() -> GasCostsValues {
         ori: 2,
         poph: 2,
         popl: 2,
-        pshh: 3073,
-        pshl: 3016,
+        pshh: 5,
+        pshl: 5,
         move_op: 2,
         ret: 43,
         sb: 2,
diff --git a/benches/src/lib.rs b/benches/src/lib.rs
index 4aa68c51656..c84fb4e6418 100644
--- a/benches/src/lib.rs
+++ b/benches/src/lib.rs
@@ -494,7 +494,7 @@ impl TryFrom<VmBench> for VmBenchPrepared {
         });
 
         // add at least one coin input
-        tx.add_random_fee_input();
+        tx.add_fee_input();
 
         let mut tx = tx
             .script_gas_limit(gas_limit)
@@ -504,6 +504,7 @@ impl TryFrom<VmBench> for VmBenchPrepared {
         tx.estimate_predicates(
             &CheckPredicateParams::from(&params),
             MemoryInstance::new(),
+            db.database_mut(),
         )
         .unwrap();
         let tx = tx.into_checked(height, &params).unwrap();
diff --git a/bin/e2e-test-client/tests/integration_tests.rs b/bin/e2e-test-client/tests/integration_tests.rs
index 794d54d2e95..a6a13f75f2a 100644
--- a/bin/e2e-test-client/tests/integration_tests.rs
+++ b/bin/e2e-test-client/tests/integration_tests.rs
@@ -4,12 +4,12 @@ use fuel_core::service::{
 };
 
 // Add methods on commands
-use fuel_core::txpool::types::ContractId;
 use fuel_core_chain_config::{
     SnapshotMetadata,
     SnapshotReader,
 };
 use fuel_core_e2e_client::config::SuiteConfig;
+use fuel_core_types::fuel_tx::ContractId;
 use std::{
     fs,
     str::FromStr,
diff --git a/bin/fuel-core/Cargo.toml b/bin/fuel-core/Cargo.toml
index a15848bb37e..aa111e7637c 100644
--- a/bin/fuel-core/Cargo.toml
+++ b/bin/fuel-core/Cargo.toml
@@ -27,6 +27,7 @@ dirs = "4.0"
 dotenvy = { version = "0.15", optional = true }
 fuel-core = { workspace = true, features = ["wasm-executor"] }
 fuel-core-chain-config = { workspace = true }
+fuel-core-compression = { workspace = true }
 fuel-core-poa = { workspace = true }
 fuel-core-types = { workspace = true, features = ["std"] }
 hex = { workspace = true }
diff --git a/bin/fuel-core/chainspec/local-testnet/chain_config.json b/bin/fuel-core/chainspec/local-testnet/chain_config.json
index e6325f21e1b..69ac7a14b7f 100644
--- a/bin/fuel-core/chainspec/local-testnet/chain_config.json
+++ b/bin/fuel-core/chainspec/local-testnet/chain_config.json
@@ -93,8 +93,8 @@
           "ori": 2,
           "poph": 2,
           "popl": 2,
-          "pshh": 3073,
-          "pshl": 3016,
+          "pshh": 5,
+          "pshl": 5,
           "ret_contract": 43,
           "rvrt_contract": 39,
           "sb": 2,
@@ -297,7 +297,7 @@
       "privileged_address": "9f0e19d6c2a6283a3222426ab2630d35516b1799b503f37b02105bebe1b8a3e9"
     }
   },
-  "genesis_state_transition_version": 11,
+  "genesis_state_transition_version": 14,
   "consensus": {
     "PoAV2": {
       "genesis_signing_key": "e0a9fcde1b73f545252e01b30b50819eb9547d07531fa3df0385c5695736634d",
diff --git a/bin/fuel-core/src/cli/run.rs b/bin/fuel-core/src/cli/run.rs
index 44be9d57a98..c88e77d1132 100644
--- a/bin/fuel-core/src/cli/run.rs
+++ b/bin/fuel-core/src/cli/run.rs
@@ -20,7 +20,10 @@ use fuel_core::{
         CombinedDatabase,
         CombinedDatabaseConfig,
     },
-    fuel_core_graphql_api::ServiceConfig as GraphQLConfig,
+    fuel_core_graphql_api::{
+        worker_service::DaCompressionConfig,
+        ServiceConfig as GraphQLConfig,
+    },
     producer::Config as ProducerConfig,
     service::{
         config::Trigger,
@@ -30,9 +33,12 @@ use fuel_core::{
         RelayerConsensusConfig,
         VMConfig,
     },
-    txpool::{
-        config::BlackList,
+    txpool::config::{
+        BlackList,
         Config as TxPoolConfig,
+        HeavyWorkConfig,
+        PoolLimits,
+        ServiceChannelLimits,
     },
     types::{
         fuel_tx::ContractId,
@@ -190,6 +196,11 @@ pub struct Command {
     #[cfg(feature = "aws-kms")]
     pub consensus_aws_kms: Option<String>,
 
+    /// If given, the node will produce and store da-compressed blocks
+    /// with the given retention time.
+    #[arg(long = "da-compression", env)]
+    pub da_compression: Option<humantime::Duration>,
+
     /// A new block is produced instantly when transactions are available.
     #[clap(flatten)]
     pub poa_trigger: PoATriggerArgs,
@@ -272,6 +283,7 @@ impl Command {
             consensus_key,
             #[cfg(feature = "aws-kms")]
             consensus_aws_kms,
+            da_compression,
             poa_trigger,
             predefined_blocks_path,
             coinbase_recipient,
@@ -418,30 +430,69 @@ impl Command {
         let block_importer =
             fuel_core::service::config::fuel_core_importer::Config::new();
 
+        let da_compression = match da_compression {
+            Some(retention) => {
+                DaCompressionConfig::Enabled(fuel_core_compression::Config {
+                    temporal_registry_retention: retention.into(),
+                })
+            }
+            None => DaCompressionConfig::Disabled,
+        };
+
         let TxPoolArgs {
             tx_pool_ttl,
+            tx_ttl_check_interval,
             tx_max_number,
-            tx_max_depth,
+            tx_max_total_bytes,
+            tx_max_total_gas,
+            tx_max_chain_count,
             tx_number_active_subscriptions,
             tx_blacklist_addresses,
             tx_blacklist_coins,
             tx_blacklist_messages,
             tx_blacklist_contracts,
+            tx_number_threads_to_verify_transactions,
+            tx_size_of_verification_queue,
+            tx_number_threads_p2p_sync,
+            tx_size_of_p2p_sync_queue,
+            tx_max_pending_read_requests,
+            tx_max_pending_write_requests,
         } = tx_pool;
 
-        let blacklist = BlackList::new(
+        let black_list = BlackList::new(
             tx_blacklist_addresses,
             tx_blacklist_coins,
             tx_blacklist_messages,
             tx_blacklist_contracts,
         );
 
+        let pool_limits = PoolLimits {
+            max_txs: tx_max_number,
+            max_gas: tx_max_total_gas,
+            max_bytes_size: tx_max_total_bytes,
+        };
+
+        let pool_heavy_work_config = HeavyWorkConfig {
+            number_threads_to_verify_transactions:
+                tx_number_threads_to_verify_transactions,
+            size_of_verification_queue: tx_size_of_verification_queue,
+            number_threads_p2p_sync: tx_number_threads_p2p_sync,
+            size_of_p2p_sync_queue: tx_size_of_p2p_sync_queue,
+        };
+
+        let service_channel_limits = ServiceChannelLimits {
+            max_pending_read_pool_requests: tx_max_pending_read_requests,
+            max_pending_write_pool_requests: tx_max_pending_write_requests,
+        };
+
         let config = Config {
             graphql_config: GraphQLConfig {
                 addr,
                 max_queries_depth: graphql.graphql_max_depth,
                 max_queries_complexity: graphql.graphql_max_complexity,
                 max_queries_recursive_depth: graphql.graphql_max_recursive_depth,
+                max_queries_directives: graphql.max_queries_directives,
+                max_concurrent_queries: graphql.graphql_max_concurrent_queries,
                 request_body_bytes_limit: graphql.graphql_request_body_bytes_limit,
                 api_request_timeout: graphql.api_request_timeout.into(),
                 query_log_threshold_time: graphql.query_log_threshold_time.into(),
@@ -457,15 +508,17 @@ impl Command {
             vm: VMConfig {
                 backtrace: vm_backtrace,
             },
-            txpool: TxPoolConfig::new(
-                tx_max_number,
-                tx_max_depth,
+            txpool: TxPoolConfig {
+                max_txs_chain_count: tx_max_chain_count,
+                max_txs_ttl: tx_pool_ttl.into(),
+                ttl_check_interval: tx_ttl_check_interval.into(),
                 utxo_validation,
-                metrics,
-                tx_pool_ttl.into(),
-                tx_number_active_subscriptions,
-                blacklist,
-            ),
+                max_tx_update_subscriptions: tx_number_active_subscriptions,
+                black_list,
+                pool_limits,
+                heavy_work: pool_heavy_work_config,
+                service_channel_limits,
+            },
             block_producer: ProducerConfig {
                 coinbase_recipient,
                 metrics,
@@ -475,6 +528,7 @@ impl Command {
             min_gas_price,
             gas_price_threshold_percent,
             block_importer,
+            da_compression,
             #[cfg(feature = "relayer")]
             relayer: relayer_cfg,
             #[cfg(feature = "p2p")]
diff --git a/bin/fuel-core/src/cli/run/graphql.rs b/bin/fuel-core/src/cli/run/graphql.rs
index 66ab6f06886..fbc84e13cac 100644
--- a/bin/fuel-core/src/cli/run/graphql.rs
+++ b/bin/fuel-core/src/cli/run/graphql.rs
@@ -17,13 +17,21 @@ pub struct GraphQLArgs {
     pub graphql_max_depth: usize,
 
     /// The max complexity of GraphQL queries.
-    #[clap(long = "graphql-max-complexity", default_value = "20000", env)]
+    #[clap(long = "graphql-max-complexity", default_value = "80000", env)]
     pub graphql_max_complexity: usize,
 
     /// The max recursive depth of GraphQL queries.
     #[clap(long = "graphql-max-recursive-depth", default_value = "16", env)]
     pub graphql_max_recursive_depth: usize,
 
+    /// The max number of directives in the query.
+    #[clap(long = "graphql-max-directives", default_value = "10", env)]
+    pub max_queries_directives: usize,
+
+    /// The max number of concurrent queries.
+    #[clap(long = "graphql-max-concurrent-queries", default_value = "1024", env)]
+    pub graphql_max_concurrent_queries: usize,
+
     /// The max body limit of the GraphQL query.
     #[clap(
         long = "graphql-request-body-bytes-limit",
diff --git a/bin/fuel-core/src/cli/run/p2p.rs b/bin/fuel-core/src/cli/run/p2p.rs
index 1e91f80589a..98a9a33759c 100644
--- a/bin/fuel-core/src/cli/run/p2p.rs
+++ b/bin/fuel-core/src/cli/run/p2p.rs
@@ -189,6 +189,14 @@ pub struct P2PArgs {
     /// For peer reputations, the maximum time since last heartbeat before penalty
     #[clap(long = "heartbeat-max-time-since-last", default_value = "40", env)]
     pub heartbeat_max_time_since_last: u64,
+
+    /// Number of threads to read from the database.
+    #[clap(long = "p2p-database-read-threads", default_value = "2", env)]
+    pub database_read_threads: usize,
+
+    /// Number of threads to read from the tx pool.
+    #[clap(long = "p2p-txpool-threads", default_value = "0", env)]
+    pub tx_pool_threads: usize,
 }
 
 #[derive(Debug, Clone, Args)]
@@ -335,6 +343,8 @@ impl P2PArgs {
             info_interval: Some(Duration::from_secs(self.info_interval)),
             identify_interval: Some(Duration::from_secs(self.identify_interval)),
             metrics,
+            database_read_threads: self.database_read_threads,
+            tx_pool_threads: self.tx_pool_threads,
             state: NotInitialized,
         };
         Ok(Some(config))
diff --git a/bin/fuel-core/src/cli/run/relayer.rs b/bin/fuel-core/src/cli/run/relayer.rs
index e1dd7a4ecbb..8494e7cfd7a 100644
--- a/bin/fuel-core/src/cli/run/relayer.rs
+++ b/bin/fuel-core/src/cli/run/relayer.rs
@@ -19,7 +19,7 @@ pub struct RelayerArgs {
 
     /// Uri addresses to ethereum client. It can be in format of `http://localhost:8545/` or `ws://localhost:8545/`.
     /// If not set relayer will not start.
-    #[arg(long = "relayer", env)]
+    #[arg(long = "relayer", value_delimiter = ',', env)]
     #[arg(required_if_eq("enable_relayer", "true"))]
     #[arg(requires_if(IsPresent, "enable_relayer"))]
     pub relayer: Option<Vec<url::Url>>,
@@ -70,3 +70,27 @@ impl RelayerArgs {
         Some(config)
     }
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use clap::Parser;
+    use test_case::test_case;
+
+    #[derive(Debug, Clone, Parser)]
+    pub struct Command {
+        #[clap(flatten)]
+        relayer: RelayerArgs,
+    }
+
+    #[test_case(&[""] => Ok(None); "no args")]
+    #[test_case(&["", "--enable-relayer", "--relayer=https://test.com"] => Ok(Some(vec![url::Url::parse("https://test.com").unwrap()])); "one relayer")]
+    #[test_case(&["", "--enable-relayer", "--relayer=https://test.com", "--relayer=https://test2.com"] => Ok(Some(vec![url::Url::parse("https://test.com").unwrap(), url::Url::parse("https://test2.com").unwrap()])); "two relayers in different args")]
+    #[test_case(&["", "--enable-relayer", "--relayer=https://test.com,https://test2.com"] => Ok(Some(vec![url::Url::parse("https://test.com").unwrap(), url::Url::parse("https://test2.com").unwrap()])); "two relayers in same arg")]
+    fn parse_relayer_urls(args: &[&str]) -> Result<Option<Vec<url::Url>>, String> {
+        let command: Command =
+            Command::try_parse_from(args).map_err(|e| e.to_string())?;
+        let args = command.relayer;
+        Ok(args.relayer)
+    }
+}
diff --git a/bin/fuel-core/src/cli/run/tx_pool.rs b/bin/fuel-core/src/cli/run/tx_pool.rs
index 844b10c333a..34f33df44c1 100644
--- a/bin/fuel-core/src/cli/run/tx_pool.rs
+++ b/bin/fuel-core/src/cli/run/tx_pool.rs
@@ -1,9 +1,9 @@
 //! Clap configuration related to TxPool service.
 
-use fuel_core::txpool::types::ContractId;
 use fuel_core_types::{
     fuel_tx::{
         Address,
+        ContractId,
         UtxoId,
     },
     fuel_types::Nonce,
@@ -15,13 +15,25 @@ pub struct TxPoolArgs {
     #[clap(long = "tx-pool-ttl", default_value = "5m", env)]
     pub tx_pool_ttl: humantime::Duration,
 
+    /// The interval for checking the time to live of transactions.
+    #[clap(long = "tx-ttl-check-interval", default_value = "1m", env)]
+    pub tx_ttl_check_interval: humantime::Duration,
+
     /// The max number of transactions that the `TxPool` can simultaneously store.
     #[clap(long = "tx-max-number", default_value = "4064", env)]
     pub tx_max_number: usize,
 
-    /// The max depth of the dependent transactions that supported by the `TxPool`.
-    #[clap(long = "tx-max-depth", default_value = "10", env)]
-    pub tx_max_depth: usize,
+    /// The max number of gas the `TxPool` can simultaneously store.
+    #[clap(long = "tx-max-total-gas", default_value = "30000000000", env)]
+    pub tx_max_total_gas: u64,
+
+    /// The max number of bytes that the `TxPool` can simultaneously store.
+    #[clap(long = "tx-max-total-bytes", default_value = "131072000", env)]
+    pub tx_max_total_bytes: usize,
+
+    /// The max number of tx in a chain of dependent transactions that supported by the `TxPool`.
+    #[clap(long = "tx-max-depth", default_value = "32", env)]
+    pub tx_max_chain_count: usize,
 
     /// The maximum number of active subscriptions that supported by the `TxPool`.
     #[clap(long = "tx-number-active-subscriptions", default_value = "4064", env)]
@@ -42,6 +54,34 @@ pub struct TxPoolArgs {
     /// The list of banned contracts ignored by the `TxPool`.
     #[clap(long = "tx-blacklist-contracts", value_delimiter = ',', env)]
     pub tx_blacklist_contracts: Vec<ContractId>,
+
+    /// Number of threads for managing verifications/insertions.
+    #[clap(
+        long = "tx-number-threads-to-verify-transactions",
+        default_value = "4",
+        env
+    )]
+    pub tx_number_threads_to_verify_transactions: usize,
+
+    /// Maximum number of tasks in the verifications/insertions queue.
+    #[clap(long = "tx-size-of-verification-queue", default_value = "2000", env)]
+    pub tx_size_of_verification_queue: usize,
+
+    /// Number of threads for managing the p2p synchronisation.
+    #[clap(long = "tx-number-threads-p2p-sync", default_value = "2", env)]
+    pub tx_number_threads_p2p_sync: usize,
+
+    /// Maximum number of tasks in the p2p synchronisation queue.
+    #[clap(long = "tx-size-of-p2p-sync-queue", default_value = "20", env)]
+    pub tx_size_of_p2p_sync_queue: usize,
+
+    /// Maximum number of pending write requests in the service.
+    #[clap(long = "tx-max-pending-write-requests", default_value = "500", env)]
+    pub tx_max_pending_write_requests: usize,
+
+    /// Maximum number of pending read requests in the service.
+    #[clap(long = "tx-max-pending-read-requests", default_value = "1000", env)]
+    pub tx_max_pending_read_requests: usize,
 }
 
 #[cfg(test)]
diff --git a/crates/chain-config/src/config/snapshots/fuel_core_chain_config__config__chain__tests__snapshot_local_testnet_config.snap b/crates/chain-config/src/config/snapshots/fuel_core_chain_config__config__chain__tests__snapshot_local_testnet_config.snap
index 84cb1358876..d4161b84cfd 100644
--- a/crates/chain-config/src/config/snapshots/fuel_core_chain_config__config__chain__tests__snapshot_local_testnet_config.snap
+++ b/crates/chain-config/src/config/snapshots/fuel_core_chain_config__config__chain__tests__snapshot_local_testnet_config.snap
@@ -301,7 +301,7 @@ expression: json
       "privileged_address": "0000000000000000000000000000000000000000000000000000000000000000"
     }
   },
-  "genesis_state_transition_version": 11,
+  "genesis_state_transition_version": 14,
   "consensus": {
     "PoAV2": {
       "genesis_signing_key": "22ec92c3105c942a6640bdc4e4907286ec4728e8cfc0d8ac59aad4d8e1ccaefb",
diff --git a/crates/client/Cargo.toml b/crates/client/Cargo.toml
index 52a45dd62c3..ad8f7d48078 100644
--- a/crates/client/Cargo.toml
+++ b/crates/client/Cargo.toml
@@ -12,9 +12,10 @@ description = "Tx client and schema specification."
 
 [dependencies]
 anyhow = { workspace = true }
+base64 = { version = "0.22.1", optional = true }
 cynic = { workspace = true }
 derive_more = { workspace = true }
-eventsource-client = { version = "0.12.2", optional = true }
+eventsource-client = { version = "0.13.0", optional = true }
 fuel-core-types = { workspace = true, features = ["alloc", "serde"] }
 futures = { workspace = true, optional = true }
 hex = { workspace = true }
@@ -46,4 +47,4 @@ serde_json = { version = "1.0", features = ["raw_value"] }
 std = ["fuel-core-types/std"]
 default = ["subscriptions", "std"]
 test-helpers = []
-subscriptions = ["eventsource-client", "futures", "hyper-rustls"]
+subscriptions = ["base64", "eventsource-client", "futures", "hyper-rustls"]
diff --git a/crates/client/assets/schema.sdl b/crates/client/assets/schema.sdl
index c7692a11adb..67287341c38 100644
--- a/crates/client/assets/schema.sdl
+++ b/crates/client/assets/schema.sdl
@@ -284,6 +284,10 @@ enum ContractParametersVersion {
 	V1
 }
 
+type DaCompressedBlock {
+	bytes: HexString!
+}
+
 union DependentCost = LightOperation | HeavyOperation
 
 type DryRunFailureStatus {
@@ -942,6 +946,12 @@ type Query {
 		"""
 		excludedIds: ExcludeInput
 	): [[CoinType!]!]!
+	daCompressedBlock(
+		"""
+		Height of the block
+		"""
+		height: U32!
+	): DaCompressedBlock
 	contract(
 		"""
 		ID of the Contract
diff --git a/crates/client/src/client.rs b/crates/client/src/client.rs
index 512bac9e5ce..763ceb0ac75 100644
--- a/crates/client/src/client.rs
+++ b/crates/client/src/client.rs
@@ -29,6 +29,11 @@ use crate::client::{
 };
 use anyhow::Context;
 #[cfg(feature = "subscriptions")]
+use base64::prelude::{
+    Engine as _,
+    BASE64_STANDARD,
+};
+#[cfg(feature = "subscriptions")]
 use cynic::StreamingOperation;
 use cynic::{
     http::ReqwestExt,
@@ -76,6 +81,7 @@ use schema::{
     block::BlockByIdArgs,
     coins::CoinByIdArgs,
     contract::ContractByIdArgs,
+    da_compressed::DaCompressedBlockByHeightArgs,
     tx::{
         TxArg,
         TxIdArgs,
@@ -270,6 +276,19 @@ impl FuelClient {
                     format!("Failed to add header to client {e:?}"),
                 )
             })?;
+        if let Some(password) = url.password() {
+            let username = url.username();
+            let credentials = format!("{}:{}", username, password);
+            let authorization = format!("Basic {}", BASE64_STANDARD.encode(credentials));
+            client_builder = client_builder
+                .header("Authorization", &authorization)
+                .map_err(|e| {
+                    io::Error::new(
+                        io::ErrorKind::Other,
+                        format!("Failed to add header to client {e:?}"),
+                    )
+                })?;
+        }
 
         if let Some(value) = self.cookie.deref().cookies(&self.url) {
             let value = value.to_str().map_err(|e| {
@@ -862,6 +881,23 @@ impl FuelClient {
         Ok(block)
     }
 
+    pub async fn da_compressed_block(
+        &self,
+        height: BlockHeight,
+    ) -> io::Result<Option<Vec<u8>>> {
+        let query = schema::da_compressed::DaCompressedBlockByHeightQuery::build(
+            DaCompressedBlockByHeightArgs {
+                height: U32(height.into()),
+            },
+        );
+
+        Ok(self
+            .query(query)
+            .await?
+            .da_compressed_block
+            .map(|b| b.bytes.into()))
+    }
+
     /// Retrieve a blob by its ID
     pub async fn blob(&self, id: BlobId) -> io::Result<Option<types::Blob>> {
         let query = schema::blob::BlobByIdQuery::build(BlobByIdArgs { id: id.into() });
@@ -869,6 +905,12 @@ impl FuelClient {
         Ok(blob)
     }
 
+    /// Check whether a blob with ID exists
+    pub async fn blob_exists(&self, id: BlobId) -> io::Result<bool> {
+        let query = schema::blob::BlobExistsQuery::build(BlobByIdArgs { id: id.into() });
+        Ok(self.query(query).await?.blob.is_some())
+    }
+
     /// Retrieve multiple blocks
     pub async fn blocks(
         &self,
diff --git a/crates/client/src/client/schema.rs b/crates/client/src/client/schema.rs
index 648304425aa..7930d66c1ab 100644
--- a/crates/client/src/client/schema.rs
+++ b/crates/client/src/client/schema.rs
@@ -32,6 +32,7 @@ pub mod block;
 pub mod chain;
 pub mod coins;
 pub mod contract;
+pub mod da_compressed;
 pub mod message;
 pub mod node_info;
 pub mod upgrades;
diff --git a/crates/client/src/client/schema/blob.rs b/crates/client/src/client/schema/blob.rs
index 3ea99f287dc..3a3b9e65b76 100644
--- a/crates/client/src/client/schema/blob.rs
+++ b/crates/client/src/client/schema/blob.rs
@@ -26,3 +26,20 @@ pub struct Blob {
     pub id: BlobId,
     pub bytecode: HexString,
 }
+
+#[derive(cynic::QueryFragment, Clone, Debug)]
+#[cynic(schema_path = "./assets/schema.sdl", graphql_type = "Blob")]
+pub struct BlobIdFragment {
+    pub id: BlobId,
+}
+
+#[derive(cynic::QueryFragment, Clone, Debug)]
+#[cynic(
+    schema_path = "./assets/schema.sdl",
+    graphql_type = "Query",
+    variables = "BlobByIdArgs"
+)]
+pub struct BlobExistsQuery {
+    #[arguments(id: $id)]
+    pub blob: Option<BlobIdFragment>,
+}
diff --git a/crates/client/src/client/schema/da_compressed.rs b/crates/client/src/client/schema/da_compressed.rs
new file mode 100644
index 00000000000..73a131f1d32
--- /dev/null
+++ b/crates/client/src/client/schema/da_compressed.rs
@@ -0,0 +1,44 @@
+use crate::client::schema::{
+    schema,
+    U32,
+};
+
+use super::HexString;
+
+#[derive(cynic::QueryVariables, Debug)]
+pub struct DaCompressedBlockByHeightArgs {
+    pub height: U32,
+}
+
+#[derive(cynic::QueryFragment, Clone, Debug)]
+#[cynic(
+    schema_path = "./assets/schema.sdl",
+    graphql_type = "Query",
+    variables = "DaCompressedBlockByHeightArgs"
+)]
+pub struct DaCompressedBlockByHeightQuery {
+    #[arguments(height: $height)]
+    pub da_compressed_block: Option<DaCompressedBlock>,
+}
+
+/// Block with transaction ids
+#[derive(cynic::QueryFragment, Clone, Debug)]
+#[cynic(schema_path = "./assets/schema.sdl")]
+pub struct DaCompressedBlock {
+    pub bytes: HexString,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn block_by_height_query_gql_output() {
+        use cynic::QueryBuilder;
+        let operation =
+            DaCompressedBlockByHeightQuery::build(DaCompressedBlockByHeightArgs {
+                height: U32(0),
+            });
+        insta::assert_snapshot!(operation.query)
+    }
+}
diff --git a/crates/client/src/client/schema/snapshots/fuel_core_client__client__schema__da_compressed__tests__block_by_height_query_gql_output.snap b/crates/client/src/client/schema/snapshots/fuel_core_client__client__schema__da_compressed__tests__block_by_height_query_gql_output.snap
new file mode 100644
index 00000000000..62f797d34e8
--- /dev/null
+++ b/crates/client/src/client/schema/snapshots/fuel_core_client__client__schema__da_compressed__tests__block_by_height_query_gql_output.snap
@@ -0,0 +1,9 @@
+---
+source: crates/client/src/client/schema/da_compressed.rs
+expression: operation.query
+---
+query($height: U32!) {
+  daCompressedBlock(height: $height) {
+    bytes
+  }
+}
diff --git a/crates/compression/Cargo.toml b/crates/compression/Cargo.toml
new file mode 100644
index 00000000000..40e092d1e00
--- /dev/null
+++ b/crates/compression/Cargo.toml
@@ -0,0 +1,44 @@
+[package]
+name = "fuel-core-compression"
+version = { workspace = true }
+authors = { workspace = true }
+categories = ["cryptography::cryptocurrencies"]
+edition = { workspace = true }
+homepage = { workspace = true }
+keywords = [
+  "blockchain",
+  "cryptocurrencies",
+  "fuel-core",
+  "fuel-client",
+  "fuel-compression",
+]
+license = { workspace = true }
+repository = { workspace = true }
+description = "Compression and decompression of Fuel blocks for DA storage."
+
+[dependencies]
+anyhow = { workspace = true }
+fuel-core-types = { workspace = true, features = [
+  "alloc",
+  "serde",
+  "da-compression",
+] }
+paste = { workspace = true }
+rand = { workspace = true, optional = true }
+serde = { version = "1.0", features = ["derive"] }
+strum = { workspace = true }
+strum_macros = { workspace = true }
+
+[dev-dependencies]
+fuel-core-compression = { path = ".", features = ["test-helpers"] }
+postcard = { version = "1.0", features = ["use-std"] }
+proptest = { workspace = true }
+tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
+
+[features]
+test-helpers = [
+  "dep:rand",
+  "fuel-core-types/test-helpers",
+  "fuel-core-types/random",
+  "fuel-core-types/std",
+]
diff --git a/crates/compression/README.md b/crates/compression/README.md
new file mode 100644
index 00000000000..0768e6a1287
--- /dev/null
+++ b/crates/compression/README.md
@@ -0,0 +1,27 @@
+# Compression and decompression of transactions for the DA layer
+
+## Compressed block header
+
+Each compressed block begins with a version field, so that it's possible to change the format later.
+
+## Temporal registry
+
+This crate provides offchain registries for different types such as `AssetId`, `ContractId`, scripts, and predicates. Each registry is a key-value store with three-byte key. The registries are essentially compression caches. The three byte key allows cache size of 16 million values before reregistering the older values.
+
+The registries allow replacing repeated objects with their respective keys, so if an object
+is used multiple times in a short interval (couple of months, maybe), then the full value
+exists on only a single uncompressed block.
+
+### Fraud proofs
+
+Compressed block will contain a merkle root over all compression smts, followed by newly registered values along with their keys. Using an SMT provides flexibility around the algorithm we use to define keys without knowing how exactly values were chosen to be registered.
+
+Each registry also uses an SMT. Since the keys are three bytes long, the depth of the SMT is capped at 24 levels. 
+
+## Compression of `UtxoIds`
+
+Since each `UtxoId` only appears once, there's no point in registering them. Instead, they are replaced with `TxPointer` and output index, which are still unique.
+
+### Fraud proofs
+
+During fraud proofs we need to use the `prev_root` to prove that the referenced block height is part of the chain.
diff --git a/crates/compression/src/compress.rs b/crates/compression/src/compress.rs
new file mode 100644
index 00000000000..0ad14e39f55
--- /dev/null
+++ b/crates/compression/src/compress.rs
@@ -0,0 +1,247 @@
+use crate::{
+    config::Config,
+    eviction_policy::CacheEvictor,
+    ports::{
+        EvictorDb,
+        TemporalRegistry,
+        UtxoIdToPointer,
+    },
+    registry::{
+        EvictorDbAll,
+        PerRegistryKeyspace,
+        RegistrationsPerTable,
+        TemporalRegistryAll,
+    },
+    CompressedBlockPayloadV0,
+    VersionedCompressedBlock,
+};
+use anyhow::Context;
+use fuel_core_types::{
+    blockchain::block::Block,
+    fuel_compression::{
+        CompressibleBy,
+        ContextError,
+        RegistryKey,
+    },
+    fuel_tx::{
+        input::PredicateCode,
+        CompressedUtxoId,
+        ScriptCode,
+        TxPointer,
+        UtxoId,
+    },
+    fuel_types::{
+        Address,
+        AssetId,
+        ContractId,
+    },
+    tai64::Tai64,
+};
+use std::collections::{
+    HashMap,
+    HashSet,
+};
+
+pub trait CompressDb: TemporalRegistryAll + EvictorDbAll + UtxoIdToPointer {}
+impl<T> CompressDb for T where T: TemporalRegistryAll + EvictorDbAll + UtxoIdToPointer {}
+
+/// This must be called for all new blocks in sequence, otherwise the result will be garbage, since
+/// the registry is valid for only the current block height. On any other height you could be
+/// referring to keys that have already been overwritten, or have not been written to yet.
+pub async fn compress<D>(
+    config: Config,
+    mut db: D,
+    block: &Block,
+) -> anyhow::Result<VersionedCompressedBlock>
+where
+    D: CompressDb,
+{
+    let target = block.transactions_vec();
+
+    let mut prepare_ctx = PrepareCtx {
+        config,
+        timestamp: block.header().time(),
+        db: &mut db,
+        accessed_keys: Default::default(),
+    };
+    let _ = target.compress_with(&mut prepare_ctx).await?;
+
+    let mut ctx = prepare_ctx.into_compression_context()?;
+    let transactions = target.compress_with(&mut ctx).await?;
+    let registrations: RegistrationsPerTable = ctx.finalize()?;
+
+    Ok(VersionedCompressedBlock::V0(CompressedBlockPayloadV0 {
+        registrations,
+        header: block.header().into(),
+        transactions,
+    }))
+}
+
+/// Preparation pass through the block to collect all keys accessed during compression.
+/// Returns dummy values. The resulting "compressed block" should be discarded.
+struct PrepareCtx<D> {
+    config: Config,
+    /// Current timestamp
+    timestamp: Tai64,
+    /// Database handle
+    db: D,
+    /// Keys accessed during the compression.
+    accessed_keys: PerRegistryKeyspace<HashSet<RegistryKey>>,
+}
+
+impl<D> ContextError for PrepareCtx<D> {
+    type Error = anyhow::Error;
+}
+
+impl<D> CompressibleBy<PrepareCtx<D>> for UtxoId
+where
+    D: CompressDb,
+{
+    async fn compress_with(
+        &self,
+        _ctx: &mut PrepareCtx<D>,
+    ) -> anyhow::Result<CompressedUtxoId> {
+        Ok(CompressedUtxoId {
+            tx_pointer: TxPointer::default(),
+            output_index: 0,
+        })
+    }
+}
+
+#[derive(Debug)]
+struct CompressCtxKeyspace<T> {
+    /// Cache evictor state for this keyspace
+    cache_evictor: CacheEvictor<T>,
+    /// Changes to the temporary registry, to be included in the compressed block header
+    changes: HashMap<RegistryKey, T>,
+    /// Reverse lookup into changes
+    changes_lookup: HashMap<T, RegistryKey>,
+}
+
+macro_rules! compression {
+    ($($ident:ty: $type:ty),*) => { paste::paste! {
+        pub struct CompressCtx<D> {
+            config: Config,
+            timestamp: Tai64,
+            db: D,
+            $($ident: CompressCtxKeyspace<$type>,)*
+        }
+
+        impl<D> PrepareCtx<D> where D: CompressDb {
+            /// Converts the preparation context into a [`CompressCtx`]
+            /// keeping accessed keys to avoid its eviction during compression.
+            /// Initializes the cache evictors from the database, which may fail.
+            pub fn into_compression_context(mut self) -> anyhow::Result<CompressCtx<D>> {
+                Ok(CompressCtx {
+                    $(
+                        $ident: CompressCtxKeyspace {
+                            changes: Default::default(),
+                            changes_lookup: Default::default(),
+                            cache_evictor: CacheEvictor::new_from_db(&mut self.db, self.accessed_keys.$ident.into())?,
+                        },
+                    )*
+                    config: self.config,
+                    timestamp: self.timestamp,
+                    db: self.db,
+                })
+            }
+        }
+
+        impl<D> CompressCtx<D> where D: CompressDb {
+            /// Finalizes the compression context, returning the changes to the registry.
+            /// Commits the registrations and cache evictor states to the database.
+            fn finalize(mut self) -> anyhow::Result<RegistrationsPerTable> {
+                let mut registrations = RegistrationsPerTable::default();
+                $(
+                    self.$ident.cache_evictor.commit(&mut self.db)?;
+                    for (key, value) in self.$ident.changes.into_iter() {
+                        registrations.$ident.push((key, value));
+                    }
+                )*
+                registrations.write_to_registry(&mut self.db, self.timestamp)?;
+                Ok(registrations)
+            }
+        }
+
+        $(
+            impl<D> CompressibleBy<PrepareCtx<D>> for $type
+            where
+                D: TemporalRegistry<$type> + EvictorDb<$type>
+            {
+                async fn compress_with(
+                    &self,
+                    ctx: &mut PrepareCtx<D>,
+                ) -> anyhow::Result<RegistryKey> {
+                    if *self == <$type>::default() {
+                        return Ok(RegistryKey::ZERO);
+                    }
+                    if let Some(found) = ctx.db.registry_index_lookup(self)? {
+                        if !ctx.accessed_keys.$ident.contains(&found) {
+                            let key_timestamp = ctx.db.read_timestamp(&found)
+                                .context("Database invariant violated: no timestamp stored but key found")?;
+                            if ctx.config.is_timestamp_accessible(ctx.timestamp, key_timestamp)? {
+                                ctx.accessed_keys.$ident.insert(found);
+                            }
+                        }
+                    }
+                    Ok(RegistryKey::ZERO)
+                }
+            }
+
+            impl<D> CompressibleBy<CompressCtx<D>> for $type
+            where
+                D: TemporalRegistry<$type> + EvictorDb<$type>
+            {
+                async fn compress_with(
+                    &self,
+                    ctx: &mut CompressCtx<D>,
+                ) -> anyhow::Result<RegistryKey> {
+                    if self == &Default::default() {
+                        return Ok(RegistryKey::DEFAULT_VALUE);
+                    }
+                    if let Some(found) = ctx.$ident.changes_lookup.get(self) {
+                        return Ok(*found);
+                    }
+                    if let Some(found) = ctx.db.registry_index_lookup(self)? {
+                        let key_timestamp = ctx.db.read_timestamp(&found)
+                            .context("Database invariant violated: no timestamp stored but key found")?;
+                        if ctx.config.is_timestamp_accessible(ctx.timestamp, key_timestamp)? {
+                            return Ok(found);
+                        }
+                    }
+
+                    let key = ctx.$ident.cache_evictor.next_key();
+                    let old = ctx.$ident.changes.insert(key, self.clone());
+                    let old_rev = ctx.$ident.changes_lookup.insert(self.clone(), key);
+                    debug_assert!(old.is_none(), "Key collision in registry substitution");
+                    debug_assert!(old_rev.is_none(), "Key collision in registry substitution");
+                    Ok(key)
+                }
+            }
+        )*
+    }};
+}
+
+compression!(
+    address: Address,
+    asset_id: AssetId,
+    contract_id: ContractId,
+    script_code: ScriptCode,
+    predicate_code: PredicateCode
+);
+
+impl<D> ContextError for CompressCtx<D> {
+    type Error = anyhow::Error;
+}
+
+impl<D> CompressibleBy<CompressCtx<D>> for UtxoId
+where
+    D: CompressDb,
+{
+    async fn compress_with(
+        &self,
+        ctx: &mut CompressCtx<D>,
+    ) -> anyhow::Result<CompressedUtxoId> {
+        ctx.db.lookup(*self)
+    }
+}
diff --git a/crates/compression/src/config.rs b/crates/compression/src/config.rs
new file mode 100644
index 00000000000..cc111119c59
--- /dev/null
+++ b/crates/compression/src/config.rs
@@ -0,0 +1,33 @@
+use core::time::Duration;
+
+use fuel_core_types::tai64::{
+    Tai64,
+    Tai64N,
+};
+
+#[derive(Debug, Clone, Copy)]
+pub struct Config {
+    /// How long entries in the temporal registry are valid.
+    /// After this time has passed, the entry is considered stale and must not be used.
+    /// If the value is needed again, it must be re-registered.
+    pub temporal_registry_retention: Duration,
+}
+
+impl Config {
+    /// Given timestamp of the current block and a key in an older block,
+    /// is the key is still accessible?
+    /// Returns error if the arguments are not valid block timestamps,
+    /// or if the block is older than the key.
+    pub fn is_timestamp_accessible(
+        &self,
+        block_timestamp: Tai64,
+        key_timestamp: Tai64,
+    ) -> anyhow::Result<bool> {
+        let block = Tai64N(block_timestamp, 0);
+        let key = Tai64N(key_timestamp, 0);
+        let duration = block
+            .duration_since(&key)
+            .map_err(|_| anyhow::anyhow!("Invalid timestamp ordering"))?;
+        Ok(duration <= self.temporal_registry_retention)
+    }
+}
diff --git a/crates/compression/src/decompress.rs b/crates/compression/src/decompress.rs
new file mode 100644
index 00000000000..15565ce8433
--- /dev/null
+++ b/crates/compression/src/decompress.rs
@@ -0,0 +1,336 @@
+use crate::{
+    config::Config,
+    ports::{
+        HistoryLookup,
+        TemporalRegistry,
+    },
+    registry::TemporalRegistryAll,
+    VersionedCompressedBlock,
+};
+use fuel_core_types::{
+    blockchain::block::PartialFuelBlock,
+    fuel_compression::{
+        Compressible,
+        ContextError,
+        Decompress,
+        DecompressibleBy,
+        RegistryKey,
+    },
+    fuel_tx::{
+        input::{
+            coin::{
+                Coin,
+                CoinSpecification,
+            },
+            message::{
+                Message,
+                MessageSpecification,
+            },
+            AsField,
+            PredicateCode,
+        },
+        AssetId,
+        CompressedUtxoId,
+        Mint,
+        ScriptCode,
+        Transaction,
+        UtxoId,
+    },
+    fuel_types::{
+        Address,
+        ContractId,
+    },
+    tai64::Tai64,
+};
+
+pub trait DecompressDb: TemporalRegistryAll + HistoryLookup {}
+impl<T> DecompressDb for T where T: TemporalRegistryAll + HistoryLookup {}
+
+/// This must be called for all decompressed blocks in sequence, otherwise the result will be garbage.
+pub async fn decompress<D>(
+    config: Config,
+    mut db: D,
+    block: VersionedCompressedBlock,
+) -> anyhow::Result<PartialFuelBlock>
+where
+    D: DecompressDb,
+{
+    let VersionedCompressedBlock::V0(compressed) = block;
+
+    // TODO: merkle root verification: https://github.com/FuelLabs/fuel-core/issues/2232
+
+    compressed
+        .registrations
+        .write_to_registry(&mut db, compressed.header.consensus.time)?;
+
+    let ctx = DecompressCtx {
+        config,
+        timestamp: compressed.header.consensus.time,
+        db,
+    };
+
+    let transactions = <Vec<Transaction> as DecompressibleBy<_>>::decompress_with(
+        compressed.transactions,
+        &ctx,
+    )
+    .await?;
+
+    Ok(PartialFuelBlock {
+        header: compressed.header,
+        transactions,
+    })
+}
+
+pub struct DecompressCtx<D> {
+    pub config: Config,
+    /// Timestamp of the block being decompressed
+    pub timestamp: Tai64,
+    pub db: D,
+}
+
+impl<D> ContextError for DecompressCtx<D> {
+    type Error = anyhow::Error;
+}
+
+impl<D> DecompressibleBy<DecompressCtx<D>> for UtxoId
+where
+    D: HistoryLookup,
+{
+    async fn decompress_with(
+        c: CompressedUtxoId,
+        ctx: &DecompressCtx<D>,
+    ) -> anyhow::Result<Self> {
+        ctx.db.utxo_id(c)
+    }
+}
+
+macro_rules! decompress_impl {
+    ($($type:ty),*) => { paste::paste! {
+        $(
+            impl<D> DecompressibleBy<DecompressCtx<D>> for $type
+            where
+                D: TemporalRegistry<$type>
+            {
+                async fn decompress_with(
+                    key: RegistryKey,
+                    ctx: &DecompressCtx<D>,
+                ) -> anyhow::Result<Self> {
+                    if key == RegistryKey::DEFAULT_VALUE {
+                        return Ok(<$type>::default());
+                    }
+                    let key_timestamp = ctx.db.read_timestamp(&key)?;
+                    if !ctx.config.is_timestamp_accessible(ctx.timestamp, key_timestamp)? {
+                        anyhow::bail!("Timestamp not accessible");
+                    }
+                    ctx.db.read_registry(&key)
+                }
+            }
+        )*
+    }};
+}
+
+decompress_impl!(AssetId, ContractId, Address, PredicateCode, ScriptCode);
+
+impl<D, Specification> DecompressibleBy<DecompressCtx<D>> for Coin<Specification>
+where
+    D: DecompressDb,
+    Specification: CoinSpecification,
+    Specification::Predicate: DecompressibleBy<DecompressCtx<D>>,
+    Specification::PredicateData: DecompressibleBy<DecompressCtx<D>>,
+    Specification::PredicateGasUsed: DecompressibleBy<DecompressCtx<D>>,
+    Specification::Witness: DecompressibleBy<DecompressCtx<D>>,
+{
+    async fn decompress_with(
+        c: <Coin<Specification> as Compressible>::Compressed,
+        ctx: &DecompressCtx<D>,
+    ) -> anyhow::Result<Coin<Specification>> {
+        let utxo_id = UtxoId::decompress_with(c.utxo_id, ctx).await?;
+        let coin_info = ctx.db.coin(utxo_id)?;
+        let witness_index = c.witness_index.decompress(ctx).await?;
+        let predicate_gas_used = c.predicate_gas_used.decompress(ctx).await?;
+        let predicate = c.predicate.decompress(ctx).await?;
+        let predicate_data = c.predicate_data.decompress(ctx).await?;
+        Ok(Self {
+            utxo_id,
+            owner: coin_info.owner,
+            amount: coin_info.amount,
+            asset_id: coin_info.asset_id,
+            tx_pointer: Default::default(),
+            witness_index,
+            predicate_gas_used,
+            predicate,
+            predicate_data,
+        })
+    }
+}
+
+impl<D, Specification> DecompressibleBy<DecompressCtx<D>> for Message<Specification>
+where
+    D: DecompressDb,
+    Specification: MessageSpecification,
+    Specification::Data: DecompressibleBy<DecompressCtx<D>> + Default,
+    Specification::Predicate: DecompressibleBy<DecompressCtx<D>>,
+    Specification::PredicateData: DecompressibleBy<DecompressCtx<D>>,
+    Specification::PredicateGasUsed: DecompressibleBy<DecompressCtx<D>>,
+    Specification::Witness: DecompressibleBy<DecompressCtx<D>>,
+{
+    async fn decompress_with(
+        c: <Message<Specification> as Compressible>::Compressed,
+        ctx: &DecompressCtx<D>,
+    ) -> anyhow::Result<Message<Specification>> {
+        let msg = ctx.db.message(c.nonce)?;
+        let witness_index = c.witness_index.decompress(ctx).await?;
+        let predicate_gas_used = c.predicate_gas_used.decompress(ctx).await?;
+        let predicate = c.predicate.decompress(ctx).await?;
+        let predicate_data = c.predicate_data.decompress(ctx).await?;
+        let mut message: Message<Specification> = Message {
+            sender: msg.sender,
+            recipient: msg.recipient,
+            amount: msg.amount,
+            nonce: c.nonce,
+            witness_index,
+            predicate_gas_used,
+            data: Default::default(),
+            predicate,
+            predicate_data,
+        };
+
+        if let Some(data) = message.data.as_mut_field() {
+            data.clone_from(&msg.data)
+        }
+
+        Ok(message)
+    }
+}
+
+impl<D> DecompressibleBy<DecompressCtx<D>> for Mint
+where
+    D: DecompressDb,
+{
+    async fn decompress_with(
+        c: Self::Compressed,
+        ctx: &DecompressCtx<D>,
+    ) -> anyhow::Result<Self> {
+        Ok(Transaction::mint(
+            Default::default(), // TODO: what should this we do with this?
+            c.input_contract.decompress(ctx).await?,
+            c.output_contract.decompress(ctx).await?,
+            c.mint_amount.decompress(ctx).await?,
+            c.mint_asset_id.decompress(ctx).await?,
+            c.gas_price.decompress(ctx).await?,
+        ))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use crate::ports::{
+        EvictorDb,
+        TemporalRegistry,
+    };
+
+    use super::*;
+    use fuel_core_types::{
+        fuel_compression::RegistryKey,
+        fuel_tx::{
+            input::PredicateCode,
+            Address,
+            AssetId,
+            ContractId,
+            ScriptCode,
+        },
+    };
+    use serde::{
+        Deserialize,
+        Serialize,
+    };
+
+    pub struct MockDb;
+    impl HistoryLookup for MockDb {
+        fn utxo_id(&self, _: CompressedUtxoId) -> anyhow::Result<UtxoId> {
+            unimplemented!()
+        }
+
+        fn coin(&self, _: UtxoId) -> anyhow::Result<crate::ports::CoinInfo> {
+            unimplemented!()
+        }
+
+        fn message(
+            &self,
+            _: fuel_core_types::fuel_types::Nonce,
+        ) -> anyhow::Result<crate::ports::MessageInfo> {
+            unimplemented!()
+        }
+    }
+    macro_rules! mock_temporal {
+        ($type:ty) => {
+            impl TemporalRegistry<$type> for MockDb {
+                fn read_registry(&self, _key: &RegistryKey) -> anyhow::Result<$type> {
+                    unimplemented!()
+                }
+
+                fn read_timestamp(&self, _key: &RegistryKey) -> anyhow::Result<Tai64> {
+                    unimplemented!()
+                }
+
+                fn write_registry(
+                    &mut self,
+                    _key: &RegistryKey,
+                    _value: &$type,
+                    _timestamp: Tai64,
+                ) -> anyhow::Result<()> {
+                    unimplemented!()
+                }
+
+                fn registry_index_lookup(
+                    &self,
+                    _value: &$type,
+                ) -> anyhow::Result<Option<RegistryKey>> {
+                    unimplemented!()
+                }
+            }
+
+            impl EvictorDb<$type> for MockDb {
+                fn set_latest_assigned_key(
+                    &mut self,
+                    _key: RegistryKey,
+                ) -> anyhow::Result<()> {
+                    unimplemented!()
+                }
+
+                fn get_latest_assigned_key(&self) -> anyhow::Result<Option<RegistryKey>> {
+                    unimplemented!()
+                }
+            }
+        };
+    }
+    mock_temporal!(Address);
+    mock_temporal!(AssetId);
+    mock_temporal!(ContractId);
+    mock_temporal!(ScriptCode);
+    mock_temporal!(PredicateCode);
+
+    #[tokio::test]
+    async fn decompress_block_with_unknown_version() {
+        #[derive(Clone, Serialize, Deserialize)]
+        enum CompressedBlockWithNewVersions {
+            V0(crate::CompressedBlockPayloadV0),
+            NewVersion(u32),
+            #[serde(untagged)]
+            Unknown,
+        }
+
+        // Given
+        let bad_block =
+            postcard::to_stdvec(&CompressedBlockWithNewVersions::NewVersion(1234))
+                .unwrap();
+
+        // When
+        let result: Result<VersionedCompressedBlock, _> =
+            postcard::from_bytes(&bad_block);
+
+        // Then
+        let _ =
+            result.expect_err("should fail to deserialize because of unknown version");
+    }
+}
diff --git a/crates/compression/src/eviction_policy.rs b/crates/compression/src/eviction_policy.rs
new file mode 100644
index 00000000000..6343de83d8c
--- /dev/null
+++ b/crates/compression/src/eviction_policy.rs
@@ -0,0 +1,63 @@
+use std::collections::HashSet;
+
+use fuel_core_types::fuel_compression::RegistryKey;
+
+use crate::ports::EvictorDb;
+
+/// Evictor for a single keyspace
+#[derive(Debug)]
+#[must_use = "Evictor must be committed to the database to persist state"]
+pub(crate) struct CacheEvictor<T> {
+    /// Set of keys that must not be evicted
+    keep_keys: HashSet<RegistryKey>,
+    /// Next key to be used
+    next_key: RegistryKey,
+    /// Marker for the keyspace type
+    _keyspace_marker: std::marker::PhantomData<T>,
+}
+
+impl<T> CacheEvictor<T> {
+    /// Create new evictor, reading state from the database
+    pub fn new_from_db<D>(
+        db: &mut D,
+        keep_keys: HashSet<RegistryKey>,
+    ) -> anyhow::Result<Self>
+    where
+        D: EvictorDb<T>,
+    {
+        let latest_key = db.get_latest_assigned_key()?;
+        let next_key = if let Some(latest_key) = latest_key {
+            latest_key.next()
+        } else {
+            RegistryKey::ZERO
+        };
+
+        Ok(Self {
+            keep_keys,
+            next_key,
+            _keyspace_marker: std::marker::PhantomData,
+        })
+    }
+
+    pub fn next_key(&mut self) -> RegistryKey {
+        // Pick first key not in the set
+        // TODO: use a proper algo, maybe LRU?
+
+        debug_assert!(self.keep_keys.len() < 2usize.pow(24).saturating_sub(2));
+
+        while self.keep_keys.contains(&self.next_key) {
+            self.next_key = self.next_key.next();
+        }
+
+        self.keep_keys.insert(self.next_key);
+        self.next_key
+    }
+
+    /// Commit the current state of the evictor to the database
+    pub fn commit<D>(self, db: &mut D) -> anyhow::Result<()>
+    where
+        D: EvictorDb<T>,
+    {
+        db.set_latest_assigned_key(self.next_key)
+    }
+}
diff --git a/crates/compression/src/lib.rs b/crates/compression/src/lib.rs
new file mode 100644
index 00000000000..bd4b0fdcbba
--- /dev/null
+++ b/crates/compression/src/lib.rs
@@ -0,0 +1,155 @@
+#![deny(clippy::arithmetic_side_effects)]
+#![deny(clippy::cast_possible_truncation)]
+#![deny(unused_crate_dependencies)]
+#![deny(warnings)]
+
+pub mod compress;
+pub mod config;
+pub mod decompress;
+mod eviction_policy;
+pub mod ports;
+mod registry;
+
+pub use config::Config;
+pub use registry::RegistryKeyspace;
+
+use fuel_core_types::{
+    blockchain::header::PartialBlockHeader,
+    fuel_tx::CompressedTransaction,
+};
+use registry::RegistrationsPerTable;
+
+/// Compressed block, without the preceding version byte.
+#[derive(Debug, Default, Clone, PartialEq, serde::Serialize, serde::Deserialize)]
+pub struct CompressedBlockPayloadV0 {
+    /// Temporal registry insertions
+    pub registrations: RegistrationsPerTable,
+    /// Compressed block header
+    pub header: PartialBlockHeader,
+    /// Compressed transactions
+    pub transactions: Vec<CompressedTransaction>,
+}
+
+/// Versioned compressed block.
+#[derive(Debug, Clone, PartialEq, serde::Serialize, serde::Deserialize)]
+pub enum VersionedCompressedBlock {
+    V0(CompressedBlockPayloadV0),
+}
+
+impl Default for VersionedCompressedBlock {
+    fn default() -> Self {
+        Self::V0(Default::default())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use fuel_core_compression as _;
+    use fuel_core_types::{
+        blockchain::{
+            header::{
+                ApplicationHeader,
+                ConsensusHeader,
+            },
+            primitives::Empty,
+        },
+        fuel_compression::RegistryKey,
+        tai64::Tai64,
+    };
+    use proptest::prelude::*;
+
+    use super::*;
+
+    fn keyspace() -> impl Strategy<Value = RegistryKeyspace> {
+        prop_oneof![
+            Just(RegistryKeyspace::Address),
+            Just(RegistryKeyspace::AssetId),
+            Just(RegistryKeyspace::ContractId),
+            Just(RegistryKeyspace::ScriptCode),
+            Just(RegistryKeyspace::PredicateCode),
+        ]
+    }
+
+    proptest! {
+        /// Serialization for compressed transactions is already tested in fuel-vm,
+        /// but the rest of the block de/serialization is tested here.
+        #[test]
+        fn postcard_roundtrip(
+            da_height in 0..=u64::MAX,
+            prev_root in prop::array::uniform32(0..=u8::MAX),
+            height in 0..=u32::MAX,
+            consensus_parameters_version in 0..=u32::MAX,
+            state_transition_bytecode_version in 0..=u32::MAX,
+            registration_inputs in prop::collection::vec(
+                (keyspace(), prop::num::u16::ANY, prop::array::uniform32(0..=u8::MAX)).prop_map(|(ks, rk, arr)| {
+                    let k = RegistryKey::try_from(rk as u32).unwrap();
+                    (ks, k, arr)
+                }),
+                0..123
+            ),
+        ) {
+            let mut registrations: RegistrationsPerTable = Default::default();
+
+            for (ks, key, arr) in registration_inputs {
+                let value_len_limit = (key.as_u32() % 32) as usize;
+                match ks {
+                    RegistryKeyspace::Address => {
+                        registrations.address.push((key, arr.into()));
+                    }
+                    RegistryKeyspace::AssetId => {
+                        registrations.asset_id.push((key, arr.into()));
+                    }
+                    RegistryKeyspace::ContractId => {
+                        registrations.contract_id.push((key, arr.into()));
+                    }
+                    RegistryKeyspace::ScriptCode => {
+                        registrations.script_code.push((key, arr[..value_len_limit].to_vec().into()));
+                    }
+                    RegistryKeyspace::PredicateCode => {
+                        registrations.predicate_code.push((key, arr[..value_len_limit].to_vec().into()));
+                    }
+                }
+            }
+
+            let header = PartialBlockHeader {
+                application: ApplicationHeader {
+                    da_height: da_height.into(),
+                    consensus_parameters_version,
+                    state_transition_bytecode_version,
+                    generated: Empty,
+                },
+                consensus: ConsensusHeader {
+                    prev_root: prev_root.into(),
+                    height: height.into(),
+                    time: Tai64::UNIX_EPOCH,
+                    generated: Empty
+                }
+            };
+            let original = CompressedBlockPayloadV0 {
+                registrations,
+                header,
+                transactions: vec![],
+            };
+
+            let compressed = postcard::to_allocvec(&original).unwrap();
+            let decompressed: CompressedBlockPayloadV0 =
+                postcard::from_bytes(&compressed).unwrap();
+
+            let CompressedBlockPayloadV0 {
+                registrations,
+                header,
+                transactions,
+            } = decompressed;
+
+            assert_eq!(registrations, original.registrations);
+
+            assert_eq!(header.da_height, da_height.into());
+            assert_eq!(*header.prev_root(), prev_root.into());
+            assert_eq!(*header.height(), height.into());
+            assert_eq!(header.consensus_parameters_version, consensus_parameters_version);
+            assert_eq!(header.state_transition_bytecode_version, state_transition_bytecode_version);
+
+            assert!(transactions.is_empty());
+        }
+    }
+}
diff --git a/crates/compression/src/ports.rs b/crates/compression/src/ports.rs
new file mode 100644
index 00000000000..50b2acd6fe8
--- /dev/null
+++ b/crates/compression/src/ports.rs
@@ -0,0 +1,121 @@
+//! Ports this service requires to function.
+
+use fuel_core_types::{
+    fuel_compression::RegistryKey,
+    fuel_tx::{
+        Address,
+        AssetId,
+        CompressedUtxoId,
+        UtxoId,
+        Word,
+    },
+    fuel_types::Nonce,
+    tai64::Tai64,
+};
+
+/// Rolling cache for compression.
+/// Holds the latest state which can be event sourced from the compressed blocks.
+/// The changes done using this trait in a single call to `compress` or `decompress`
+/// must be committed atomically, after which block height must be incremented.
+pub trait TemporalRegistry<T> {
+    /// Reads a value from the registry at its current height.
+    fn read_registry(&self, key: &RegistryKey) -> anyhow::Result<T>;
+
+    /// Reads timestamp of the value from the registry.
+    fn read_timestamp(&self, key: &RegistryKey) -> anyhow::Result<Tai64>;
+
+    /// Writes a value from to the registry. The timestamp is the time of the block,
+    /// and it is used for key retention.
+    fn write_registry(
+        &mut self,
+        key: &RegistryKey,
+        value: &T,
+        timestamp: Tai64,
+    ) -> anyhow::Result<()>;
+
+    /// Lookup registry key by the value.
+    fn registry_index_lookup(&self, value: &T) -> anyhow::Result<Option<RegistryKey>>;
+}
+
+impl<D, T> TemporalRegistry<T> for &mut D
+where
+    D: TemporalRegistry<T>,
+{
+    fn read_registry(&self, key: &RegistryKey) -> anyhow::Result<T> {
+        <D as TemporalRegistry<T>>::read_registry(self, key)
+    }
+
+    fn read_timestamp(&self, key: &RegistryKey) -> anyhow::Result<Tai64> {
+        <D as TemporalRegistry<T>>::read_timestamp(self, key)
+    }
+
+    fn write_registry(
+        &mut self,
+        key: &RegistryKey,
+        value: &T,
+        timestamp: Tai64,
+    ) -> anyhow::Result<()> {
+        <D as TemporalRegistry<T>>::write_registry(self, key, value, timestamp)
+    }
+
+    fn registry_index_lookup(&self, value: &T) -> anyhow::Result<Option<RegistryKey>> {
+        <D as TemporalRegistry<T>>::registry_index_lookup(self, value)
+    }
+}
+
+/// Lookup for UTXO pointers used for compression.
+pub trait UtxoIdToPointer {
+    fn lookup(&self, utxo_id: UtxoId) -> anyhow::Result<CompressedUtxoId>;
+}
+
+impl<D> UtxoIdToPointer for &mut D
+where
+    D: UtxoIdToPointer,
+{
+    fn lookup(&self, utxo_id: UtxoId) -> anyhow::Result<CompressedUtxoId> {
+        <D as UtxoIdToPointer>::lookup(self, utxo_id)
+    }
+}
+
+/// Lookup for history of UTXOs and messages, used for decompression.
+pub trait HistoryLookup {
+    fn utxo_id(&self, c: CompressedUtxoId) -> anyhow::Result<UtxoId>;
+    fn coin(&self, utxo_id: UtxoId) -> anyhow::Result<CoinInfo>;
+    fn message(&self, nonce: Nonce) -> anyhow::Result<MessageInfo>;
+}
+
+/// Information about a coin.
+#[derive(Debug, Clone)]
+pub struct CoinInfo {
+    pub owner: Address,
+    pub amount: u64,
+    pub asset_id: AssetId,
+}
+
+/// Information about a message.
+#[derive(Debug, Clone)]
+pub struct MessageInfo {
+    pub sender: Address,
+    pub recipient: Address,
+    pub amount: Word,
+    pub data: Vec<u8>,
+}
+
+/// Evictor registry to keep track of the latest used key for the type `T`.
+pub trait EvictorDb<T> {
+    fn get_latest_assigned_key(&self) -> anyhow::Result<Option<RegistryKey>>;
+    fn set_latest_assigned_key(&mut self, key: RegistryKey) -> anyhow::Result<()>;
+}
+
+impl<D, T> EvictorDb<T> for &mut D
+where
+    D: EvictorDb<T>,
+{
+    fn get_latest_assigned_key(&self) -> anyhow::Result<Option<RegistryKey>> {
+        <D as EvictorDb<T>>::get_latest_assigned_key(self)
+    }
+
+    fn set_latest_assigned_key(&mut self, key: RegistryKey) -> anyhow::Result<()> {
+        <D as EvictorDb<T>>::set_latest_assigned_key(self, key)
+    }
+}
diff --git a/crates/compression/src/registry.rs b/crates/compression/src/registry.rs
new file mode 100644
index 00000000000..0bf1e3a5967
--- /dev/null
+++ b/crates/compression/src/registry.rs
@@ -0,0 +1,119 @@
+use crate::ports::{
+    EvictorDb,
+    TemporalRegistry,
+};
+use fuel_core_types::{
+    fuel_compression::RegistryKey,
+    fuel_tx::{
+        input::PredicateCode,
+        Address,
+        AssetId,
+        ContractId,
+        ScriptCode,
+    },
+    tai64::Tai64,
+};
+
+macro_rules! tables {
+    ($($ident:ty: $type:ty),*) => { paste::paste! {
+        #[doc = "RegistryKey namespaces"]
+        #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash, serde::Serialize, serde::Deserialize, strum_macros::EnumCount)]
+        pub enum RegistryKeyspace {
+            $(
+                [<$type>],
+            )*
+        }
+
+        #[doc = "A value for each keyspace"]
+        #[derive(Debug, Clone, PartialEq, Eq, Default)]
+        pub struct PerRegistryKeyspace<T> {
+            $(pub $ident: T,)*
+        }
+        impl<T> core::ops::Index<RegistryKeyspace> for PerRegistryKeyspace<T> {
+            type Output = T;
+
+            fn index(&self, index: RegistryKeyspace) -> &Self::Output {
+                match index {
+                    $(
+                        RegistryKeyspace::[<$type>] => &self.$ident,
+                    )*
+                }
+            }
+        }
+        impl<T> core::ops::IndexMut<RegistryKeyspace> for PerRegistryKeyspace<T> {
+            fn index_mut(&mut self, index: RegistryKeyspace) -> &mut Self::Output {
+                match index {
+                    $(
+                        RegistryKeyspace::[<$type>] => &mut self.$ident,
+                    )*
+                }
+            }
+        }
+
+        #[doc = "The set of registrations for each table, as used in the compressed block header"]
+        #[derive(Debug, Clone, PartialEq, Eq, Default, serde::Serialize, serde::Deserialize)]
+        pub struct RegistrationsPerTable {
+            $(pub $ident: Vec<(RegistryKey, $type)>,)*
+        }
+
+        pub trait TemporalRegistryAll
+        where
+            $(Self: TemporalRegistry<$type>,)*
+        {}
+
+        impl<T> TemporalRegistryAll for T
+        where
+            $(T: TemporalRegistry<$type>,)*
+        {}
+
+        pub trait EvictorDbAll
+        where
+            $(Self: EvictorDb<$type>,)*
+        {}
+
+        impl<T> EvictorDbAll for T
+        where
+            $(T: EvictorDb<$type>,)*
+        {}
+
+
+        impl RegistrationsPerTable {
+            pub(crate) fn write_to_registry<R>(&self, registry: &mut R, timestamp: Tai64) -> anyhow::Result<()>
+            where
+                R: TemporalRegistryAll
+            {
+                $(
+                    for (key, value) in self.$ident.iter() {
+                        registry.write_registry(key, value, timestamp)?;
+                    }
+                )*
+
+                Ok(())
+            }
+        }
+    }};
+}
+
+tables!(
+    address: Address,
+    asset_id: AssetId,
+    contract_id: ContractId,
+    script_code: ScriptCode,
+    predicate_code: PredicateCode
+);
+
+// TODO: move inside the macro when this stabilizes: https://github.com/rust-lang/rust/pull/122808
+#[cfg(any(test, feature = "test-helpers"))]
+impl rand::prelude::Distribution<RegistryKeyspace> for rand::distributions::Standard {
+    fn sample<R: rand::Rng + ?Sized>(&self, rng: &mut R) -> RegistryKeyspace {
+        use strum::EnumCount;
+        match rng.gen_range(0..RegistryKeyspace::COUNT) {
+            0 => RegistryKeyspace::Address,
+            1 => RegistryKeyspace::AssetId,
+            2 => RegistryKeyspace::ContractId,
+            3 => RegistryKeyspace::ScriptCode,
+            4 => RegistryKeyspace::PredicateCode,
+            _ => unreachable!("New keyspace is added but not supported here"),
+        }
+    }
+}
diff --git a/crates/fuel-core/Cargo.toml b/crates/fuel-core/Cargo.toml
index 40749a3814e..29efb372a25 100644
--- a/crates/fuel-core/Cargo.toml
+++ b/crates/fuel-core/Cargo.toml
@@ -12,7 +12,7 @@ version = { workspace = true }
 
 [dependencies]
 anyhow = { workspace = true }
-async-graphql = { version = "7.0.6", features = [
+async-graphql = { version = "7.0.11", features = [
   "playground",
   "tracing",
 ], default-features = false }
@@ -22,6 +22,7 @@ clap = { workspace = true, features = ["derive"] }
 derive_more = { version = "0.99" }
 enum-iterator = { workspace = true }
 fuel-core-chain-config = { workspace = true, features = ["std"] }
+fuel-core-compression = { workspace = true }
 fuel-core-consensus-module = { workspace = true }
 fuel-core-database = { workspace = true }
 fuel-core-executor = { workspace = true, features = ["std"] }
@@ -45,6 +46,7 @@ indicatif = { workspace = true, default-features = true }
 itertools = { workspace = true }
 num_cpus = { version = "1.16.0", optional = true }
 parking_lot = { workspace = true }
+paste = { workspace = true }
 postcard = { workspace = true, optional = true }
 rand = { workspace = true }
 rocksdb = { version = "0.21", default-features = false, features = [
@@ -61,7 +63,8 @@ tokio = { workspace = true, features = ["macros", "rt-multi-thread"] }
 tokio-rayon = { workspace = true }
 tokio-stream = { workspace = true, features = ["sync"] }
 tokio-util = { workspace = true }
-tower-http = { version = "0.3", features = ["set-header", "trace", "timeout"] }
+tower = { version = "0.4", features = ["limit"] }
+tower-http = { version = "0.4", features = ["set-header", "trace", "timeout"] }
 tracing = { workspace = true }
 uuid = { version = "1.1", features = ["v4"] }
 
@@ -96,6 +99,7 @@ test-helpers = [
   "fuel-core-p2p?/test-helpers",
   "fuel-core-storage/test-helpers",
   "fuel-core-chain-config/test-helpers",
+  "fuel-core-compression/test-helpers",
   "fuel-core-txpool/test-helpers",
   "fuel-core-services/test-helpers",
   "fuel-core-importer/test-helpers",
diff --git a/crates/fuel-core/src/combined_database.rs b/crates/fuel-core/src/combined_database.rs
index a5f527969fd..83250fbcf30 100644
--- a/crates/fuel-core/src/combined_database.rs
+++ b/crates/fuel-core/src/combined_database.rs
@@ -312,17 +312,46 @@ impl CombinedDatabase {
         Ok(())
     }
 
+    /// This function is fundamentally different from `rollback_to` in that it
+    /// will rollback the off-chain/gas-price databases if they are ahead of the
+    /// on-chain database. If they don't have a height or are behind the on-chain
+    /// we leave it to the caller to decide how to bring them up to date.
+    /// We don't rollback the on-chain database as it is the source of truth.
+    /// The target height of the rollback is the latest height of the on-chain database.
     pub fn sync_aux_db_heights<S>(&self, shutdown_listener: &mut S) -> anyhow::Result<()>
     where
         S: ShutdownListener,
     {
-        if let Some(on_chain_height) = self.on_chain().latest_height_from_metadata()? {
-            // todo(https://github.com/FuelLabs/fuel-core/issues/2239): This is a temporary fix
-            let res = self.rollback_to(on_chain_height, shutdown_listener);
-            if res.is_err() {
-                tracing::warn!("Failed to rollback auxiliary databases to on-chain database height: {:?}", res);
+        while !shutdown_listener.is_cancelled() {
+            let on_chain_height = match self.on_chain().latest_height_from_metadata()? {
+                Some(height) => height,
+                None => break, // Exit loop if on-chain height is None
+            };
+
+            let off_chain_height = self.off_chain().latest_height_from_metadata()?;
+            let gas_price_height = self.gas_price().latest_height_from_metadata()?;
+
+            // Handle off-chain rollback if necessary
+            if let Some(off_height) = off_chain_height {
+                if off_height > on_chain_height {
+                    self.off_chain().rollback_last_block()?;
+                }
             }
-        };
+
+            // Handle gas price rollback if necessary
+            if let Some(gas_height) = gas_price_height {
+                if gas_height > on_chain_height {
+                    self.gas_price().rollback_last_block()?;
+                }
+            }
+
+            // If both off-chain and gas price heights are synced, break
+            if off_chain_height.map_or(true, |h| h <= on_chain_height)
+                && gas_price_height.map_or(true, |h| h <= on_chain_height)
+            {
+                break;
+            }
+        }
 
         Ok(())
     }
diff --git a/crates/fuel-core/src/database.rs b/crates/fuel-core/src/database.rs
index 851ebd08b2a..ca3607275b6 100644
--- a/crates/fuel-core/src/database.rs
+++ b/crates/fuel-core/src/database.rs
@@ -19,17 +19,18 @@ use crate::{
         },
         generic_database::GenericDatabase,
         in_memory::memory_store::MemoryStore,
-        ChangesIterator,
         ColumnType,
         IterableKeyValueView,
         KeyValueView,
     },
 };
 use fuel_core_chain_config::TableEntry;
+use fuel_core_gas_price_service::common::fuel_core_storage_adapter::storage::GasPriceMetadata;
 use fuel_core_services::SharedMutex;
 use fuel_core_storage::{
     self,
     iter::{
+        changes_iterator::ChangesIterator,
         IterDirection,
         IterableTable,
         IteratorOverTable,
@@ -75,7 +76,6 @@ use crate::state::{
     },
     rocks_db::RocksDb,
 };
-use fuel_core_gas_price_service::common::fuel_core_storage_adapter::storage::GasPriceMetadata;
 #[cfg(feature = "rocksdb")]
 use std::path::Path;
 
@@ -401,7 +401,7 @@ fn commit_changes_with_height_update<Description>(
     database: &mut Database<Description>,
     changes: Changes,
     heights_lookup: impl Fn(
-        &ChangesIterator<Description>,
+        &ChangesIterator<Description::Column>,
     ) -> StorageResult<Vec<Description::Height>>,
 ) -> StorageResult<()>
 where
@@ -411,7 +411,7 @@ where
         StorageMutate<MetadataTable<Description>, Error = StorageError>,
 {
     // Gets the all new heights from the `changes`
-    let iterator = ChangesIterator::<Description>::new(&changes);
+    let iterator = ChangesIterator::<Description::Column>::new(&changes);
     let new_heights = heights_lookup(&iterator)?;
 
     // Changes for each block should be committed separately.
diff --git a/crates/fuel-core/src/database/coin.rs b/crates/fuel-core/src/database/coin.rs
index 4c94d202bd7..488e0a90456 100644
--- a/crates/fuel-core/src/database/coin.rs
+++ b/crates/fuel-core/src/database/coin.rs
@@ -18,11 +18,11 @@ use fuel_core_storage::{
     Result as StorageResult,
     StorageAsRef,
 };
-use fuel_core_txpool::types::TxId;
 use fuel_core_types::{
     entities::coins::coin::CompressedCoin,
     fuel_tx::{
         Address,
+        TxId,
         UtxoId,
     },
 };
diff --git a/crates/fuel-core/src/executor.rs b/crates/fuel-core/src/executor.rs
index 8d1a1fd37f2..412d13c18cf 100644
--- a/crates/fuel-core/src/executor.rs
+++ b/crates/fuel-core/src/executor.rs
@@ -3,9 +3,6 @@
 #[allow(non_snake_case)]
 #[cfg(test)]
 mod tests {
-
-    use std::sync::Mutex;
-
     use crate as fuel_core;
     use fuel_core::database::Database;
     use fuel_core_executor::{
@@ -127,6 +124,7 @@ mod tests {
                 ExecutableTransaction,
                 MemoryInstance,
             },
+            predicate::EmptyStorage,
             script_with_data_offset,
             util::test_helpers::TestBuilder as TxBuilder,
             Call,
@@ -153,6 +151,7 @@ mod tests {
         Rng,
         SeedableRng,
     };
+    use std::sync::Mutex;
 
     #[derive(Clone, Debug, Default)]
     struct Config {
@@ -355,7 +354,7 @@ mod tests {
 
         let tx =
             TransactionBuilder::create(contract_code.into(), salt, Default::default())
-                .add_random_fee_input()
+                .add_fee_input()
                 .add_output(Output::contract_created(contract_id, state_root))
                 .finalize();
         (tx, contract_id)
@@ -1478,7 +1477,7 @@ mod tests {
             header: Default::default(),
             transactions: vec![TransactionBuilder::script(vec![], vec![])
                 .max_fee_limit(100_000_000)
-                .add_random_fee_input()
+                .add_fee_input()
                 .script_gas_limit(0)
                 .tip(123)
                 .finalize_as_transaction()],
@@ -1494,7 +1493,7 @@ mod tests {
         for i in 0..10 {
             let tx = TransactionBuilder::script(vec![], vec![])
                 .max_fee_limit(100_000_000)
-                .add_random_fee_input()
+                .add_fee_input()
                 .script_gas_limit(0)
                 .tip(i * 100)
                 .finalize_as_transaction();
@@ -1502,9 +1501,10 @@ mod tests {
         }
         let mut config: Config = Default::default();
         // Each TX consumes `tx_gas_usage` gas and so set the block gas limit to execute only 9 transactions.
+        let block_gas_limit = tx_gas_usage * 9;
         config
             .consensus_parameters
-            .set_block_gas_limit(tx_gas_usage * 9);
+            .set_block_gas_limit(block_gas_limit);
         let mut executor = create_executor(Default::default(), config);
 
         let block = PartialFuelBlock {
@@ -1520,7 +1520,14 @@ mod tests {
 
         // Then
         assert_eq!(skipped_transactions.len(), 1);
-        assert_eq!(skipped_transactions[0].1, ExecutorError::GasOverflow);
+        assert_eq!(
+            skipped_transactions[0].1,
+            ExecutorError::GasOverflow(
+                "Transaction cannot fit in remaining gas limit: (0).".into(),
+                *tx_gas_usage,
+                0
+            )
+        );
     }
 
     #[test]
@@ -1533,7 +1540,7 @@ mod tests {
         // The test checks that execution for the block with transactions [tx1, tx2, tx3] skips
         // transaction `tx1` and produce a block [tx2, tx3] with the expected order.
         let tx1 = TransactionBuilder::script(vec![], vec![])
-            .add_random_fee_input()
+            .add_fee_input()
             .script_gas_limit(1000000)
             .tip(1000000)
             .finalize_as_transaction();
@@ -2633,7 +2640,7 @@ mod tests {
             .collect(),
             vec![],
         )
-        .add_random_fee_input()
+        .add_fee_input()
         .script_gas_limit(1000000)
         .finalize_as_transaction();
 
@@ -2697,7 +2704,7 @@ mod tests {
             .collect(),
             vec![],
         )
-        .add_random_fee_input()
+        .add_fee_input()
         .script_gas_limit(1000000)
         .finalize_as_transaction();
 
@@ -2886,6 +2893,7 @@ mod tests {
         tx.estimate_predicates(
             &consensus_parameters.clone().into(),
             MemoryInstance::new(),
+            &EmptyStorage,
         )
         .unwrap();
         let db = &mut Database::default();
@@ -2954,6 +2962,7 @@ mod tests {
         tx.estimate_predicates(
             &cheap_consensus_parameters.clone().into(),
             MemoryInstance::new(),
+            &EmptyStorage,
         )
         .unwrap();
 
@@ -3100,16 +3109,17 @@ mod tests {
     #[cfg(feature = "relayer")]
     mod relayer {
         use super::*;
-        use crate::{
-            database::database_description::{
-                on_chain::OnChain,
-                relayer::Relayer,
-            },
-            state::ChangesIterator,
+        use crate::database::database_description::{
+            on_chain::OnChain,
+            relayer::Relayer,
         };
         use fuel_core_relayer::storage::EventsHistory;
         use fuel_core_storage::{
-            iter::IteratorOverTable,
+            column::Column,
+            iter::{
+                changes_iterator::ChangesIterator,
+                IteratorOverTable,
+            },
             tables::FuelBlocks,
             StorageAsMut,
         };
@@ -3254,7 +3264,7 @@ mod tests {
             let (result, changes) = producer.produce_without_commit(block.into())?.into();
 
             // Then
-            let view = ChangesIterator::<OnChain>::new(&changes);
+            let view = ChangesIterator::<Column>::new(&changes);
             assert_eq!(
                 view.iter_all::<Messages>(None).count() as u64,
                 block_da_height - genesis_da_height
@@ -3863,7 +3873,7 @@ mod tests {
                 .into();
 
             // Then
-            let view = ChangesIterator::<OnChain>::new(&changes);
+            let view = ChangesIterator::<Column>::new(&changes);
             assert!(result.skipped_transactions.is_empty());
             assert_eq!(view.iter_all::<Messages>(None).count() as u64, 0);
         }
@@ -3905,7 +3915,7 @@ mod tests {
                 .into();
 
             // Then
-            let view = ChangesIterator::<OnChain>::new(&changes);
+            let view = ChangesIterator::<Column>::new(&changes);
             assert!(result.skipped_transactions.is_empty());
             assert_eq!(view.iter_all::<Messages>(None).count() as u64, 0);
             assert_eq!(result.events.len(), 2);
diff --git a/crates/fuel-core/src/graphql_api.rs b/crates/fuel-core/src/graphql_api.rs
index c3fc9abb991..46e2dc0d676 100644
--- a/crates/fuel-core/src/graphql_api.rs
+++ b/crates/fuel-core/src/graphql_api.rs
@@ -8,6 +8,7 @@ use std::{
 };
 
 pub mod api_service;
+mod da_compression;
 pub mod database;
 pub(crate) mod metrics_extension;
 pub mod ports;
@@ -21,6 +22,8 @@ pub struct ServiceConfig {
     pub max_queries_depth: usize,
     pub max_queries_complexity: usize,
     pub max_queries_recursive_depth: usize,
+    pub max_queries_directives: usize,
+    pub max_concurrent_queries: usize,
     pub request_body_bytes_limit: usize,
     /// Time to wait after submitting a query before debug info will be logged about query.
     pub query_log_threshold_time: Duration,
@@ -36,29 +39,43 @@ pub struct Costs {
     pub submit: usize,
     pub submit_and_await: usize,
     pub status_change: usize,
-    pub raw_payload: usize,
     pub storage_read: usize,
+    pub tx_get: usize,
+    pub tx_status_read: usize,
+    pub tx_raw_payload: usize,
+    pub block_header: usize,
+    pub block_transactions: usize,
+    pub block_transactions_ids: usize,
     pub storage_iterator: usize,
     pub bytecode_read: usize,
+    pub state_transition_bytecode_read: usize,
+    pub da_compressed_block_read: usize,
 }
 
 pub const QUERY_COSTS: Costs = Costs {
     // balance_query: 4000,
-    balance_query: 10001,
-    coins_to_spend: 10001,
+    balance_query: 40001,
+    coins_to_spend: 40001,
     // get_peers: 2000,
-    get_peers: 10001,
+    get_peers: 40001,
     // estimate_predicates: 3000,
-    estimate_predicates: 10001,
-    dry_run: 3000,
+    estimate_predicates: 40001,
+    dry_run: 12000,
     // submit: 5000,
-    submit: 10001,
-    submit_and_await: 10001,
-    status_change: 10001,
-    raw_payload: 10,
-    storage_read: 10,
+    submit: 40001,
+    submit_and_await: 40001,
+    status_change: 40001,
+    storage_read: 40,
+    tx_get: 50,
+    tx_status_read: 50,
+    tx_raw_payload: 150,
+    block_header: 150,
+    block_transactions: 1500,
+    block_transactions_ids: 50,
     storage_iterator: 100,
-    bytecode_read: 2000,
+    bytecode_read: 8000,
+    state_transition_bytecode_read: 76_000,
+    da_compressed_block_read: 4000,
 };
 
 #[derive(Clone, Debug)]
@@ -68,7 +85,7 @@ pub struct Config {
     pub debug: bool,
     pub vm_backtrace: bool,
     pub max_tx: usize,
-    pub max_txpool_depth: usize,
+    pub max_txpool_dependency_chain_length: usize,
     pub chain_name: String,
 }
 
diff --git a/crates/fuel-core/src/graphql_api/api_service.rs b/crates/fuel-core/src/graphql_api/api_service.rs
index 3305c98828a..d1ccbce203e 100644
--- a/crates/fuel-core/src/graphql_api/api_service.rs
+++ b/crates/fuel-core/src/graphql_api/api_service.rs
@@ -75,6 +75,7 @@ use std::{
     pin::Pin,
 };
 use tokio_stream::StreamExt;
+use tower::limit::ConcurrencyLimitLayer;
 use tower_http::{
     set_header::SetResponseHeaderLayer,
     timeout::TimeoutLayer,
@@ -196,12 +197,14 @@ where
     let combined_read_database =
         ReadDatabase::new(genesis_block_height, on_database, off_database);
     let request_timeout = config.config.api_request_timeout;
+    let concurrency_limit = config.config.max_concurrent_queries;
     let body_limit = config.config.request_body_bytes_limit;
 
     let schema = schema
         .limit_complexity(config.config.max_queries_complexity)
         .limit_depth(config.config.max_queries_depth)
         .limit_recursive_depth(config.config.max_queries_recursive_depth)
+        .limit_directives(config.config.max_queries_directives)
         .extension(MetricsExtension::new(
             config.config.query_log_threshold_time,
         ))
@@ -220,7 +223,12 @@ where
 
     let router = Router::new()
         .route("/v1/playground", get(graphql_playground))
-        .route("/v1/graphql", post(graphql_handler).options(ok))
+        .route(
+            "/v1/graphql",
+            post(graphql_handler)
+                .layer(ConcurrencyLimitLayer::new(concurrency_limit))
+                .options(ok),
+        )
         .route(
             "/v1/graphql-sub",
             post(graphql_subscription_handler).options(ok),
diff --git a/crates/fuel-core/src/graphql_api/da_compression.rs b/crates/fuel-core/src/graphql_api/da_compression.rs
new file mode 100644
index 00000000000..e9d11d1c22e
--- /dev/null
+++ b/crates/fuel-core/src/graphql_api/da_compression.rs
@@ -0,0 +1,212 @@
+use crate::fuel_core_graphql_api::{
+    ports::worker::OffChainDatabaseTransaction,
+    storage::da_compression::{
+        evictor_cache::MetadataKey,
+        timestamps::{
+            TimestampKey,
+            TimestampKeyspace,
+        },
+        *,
+    },
+};
+use fuel_core_compression::{
+    compress::compress,
+    config::Config,
+    ports::{
+        EvictorDb,
+        TemporalRegistry,
+        UtxoIdToPointer,
+    },
+};
+use fuel_core_storage::{
+    not_found,
+    StorageAsMut,
+    StorageAsRef,
+};
+use fuel_core_types::{
+    blockchain::block::Block,
+    fuel_tx::{
+        input::PredicateCode,
+        Address,
+        AssetId,
+        ContractId,
+        ScriptCode,
+    },
+    services::executor::Event,
+    tai64::Tai64,
+};
+use futures::FutureExt;
+
+/// Performs DA compression for a block and stores it in the database.
+pub fn da_compress_block<T>(
+    config: Config,
+    block: &Block,
+    block_events: &[Event],
+    db_tx: &mut T,
+) -> anyhow::Result<()>
+where
+    T: OffChainDatabaseTransaction,
+{
+    let compressed = compress(
+        config,
+        CompressTx {
+            db_tx,
+            block_events,
+        },
+        block,
+    )
+    .now_or_never()
+    .expect("The current implementation resolved all futures instantly")?;
+
+    db_tx
+        .storage_as_mut::<DaCompressedBlocks>()
+        .insert(&block.header().consensus().height, &compressed)?;
+
+    Ok(())
+}
+
+struct CompressTx<'a, Tx> {
+    db_tx: &'a mut Tx,
+    block_events: &'a [Event],
+}
+
+macro_rules! impl_temporal_registry {
+    ($type:ty) => { paste::paste! {
+        impl<'a, Tx> TemporalRegistry<$type> for CompressTx<'a, Tx>
+        where
+            Tx: OffChainDatabaseTransaction,
+        {
+            fn read_registry(
+                &self,
+                key: &fuel_core_types::fuel_compression::RegistryKey,
+            ) -> anyhow::Result<$type> {
+                Ok(self
+                    .db_tx
+                    .storage_as_ref::<[< DaCompressionTemporalRegistry $type >]>()
+                    .get(key)?
+                    .ok_or(not_found!([< DaCompressionTemporalRegistry $type>]))?
+                    .into_owned())
+            }
+
+            fn read_timestamp(
+                &self,
+                key: &fuel_core_types::fuel_compression::RegistryKey,
+            ) -> anyhow::Result<Tai64> {
+                Ok(self
+                    .db_tx
+                    .storage_as_ref::<[< DaCompressionTemporalRegistryTimestamps >]>()
+                    .get(&TimestampKey {
+                        keyspace: TimestampKeyspace::$type,
+                        key: *key,
+                    })?
+                    .ok_or(not_found!(DaCompressionTemporalRegistryTimestamps))?
+                    .into_owned())
+            }
+
+            fn write_registry(
+                &mut self,
+                key: &fuel_core_types::fuel_compression::RegistryKey,
+                value: &$type,
+                timestamp: Tai64,
+            ) -> anyhow::Result<()> {
+                // Write the actual value
+                let old_value = self.db_tx
+                    .storage_as_mut::<[< DaCompressionTemporalRegistry $type >]>()
+                    .replace(key, value)?;
+
+                // Remove the overwritten value from index, if any
+                if let Some(old_value) = old_value {
+                    let old_reverse_key = (&old_value).into();
+                    self.db_tx
+                        .storage_as_mut::<DaCompressionTemporalRegistryIndex>()
+                        .remove(&old_reverse_key)?;
+                }
+
+                // Add the new value to the index
+                let reverse_key = value.into();
+                self.db_tx
+                    .storage_as_mut::<DaCompressionTemporalRegistryIndex>()
+                    .insert(&reverse_key, key)?;
+
+                // Update the timestamp
+                self.db_tx
+                    .storage_as_mut::<DaCompressionTemporalRegistryTimestamps>()
+                    .insert(&TimestampKey { keyspace: TimestampKeyspace::$type, key: *key }, &timestamp)?;
+
+                Ok(())
+            }
+
+            fn registry_index_lookup(
+                &self,
+                value: &$type,
+            ) -> anyhow::Result<Option<fuel_core_types::fuel_compression::RegistryKey>>
+            {
+                let reverse_key = value.into();
+                Ok(self
+                    .db_tx
+                    .storage_as_ref::<DaCompressionTemporalRegistryIndex>()
+                    .get(&reverse_key)?
+                    .map(|v| v.into_owned()))
+            }
+        }
+
+        impl<'a, Tx> EvictorDb<$type> for CompressTx<'a, Tx>
+        where
+            Tx: OffChainDatabaseTransaction,
+        {
+            fn set_latest_assigned_key(
+                &mut self,
+                key: fuel_core_types::fuel_compression::RegistryKey,
+            ) -> anyhow::Result<()> {
+                self.db_tx
+                    .storage_as_mut::<DaCompressionTemporalRegistryEvictorCache>()
+                    .insert(&MetadataKey::$type, &key)?;
+                Ok(())
+            }
+
+            fn get_latest_assigned_key(
+                &self,
+            ) -> anyhow::Result<Option<fuel_core_types::fuel_compression::RegistryKey>> {
+                Ok(self
+                    .db_tx
+                    .storage_as_ref::<DaCompressionTemporalRegistryEvictorCache>()
+                    .get(&MetadataKey::$type)?
+                    .map(|v| v.into_owned())
+                )
+            }
+        }
+
+    }};
+}
+
+impl_temporal_registry!(Address);
+impl_temporal_registry!(AssetId);
+impl_temporal_registry!(ContractId);
+impl_temporal_registry!(ScriptCode);
+impl_temporal_registry!(PredicateCode);
+
+impl<'a, Tx> UtxoIdToPointer for CompressTx<'a, Tx>
+where
+    Tx: OffChainDatabaseTransaction,
+{
+    fn lookup(
+        &self,
+        utxo_id: fuel_core_types::fuel_tx::UtxoId,
+    ) -> anyhow::Result<fuel_core_types::fuel_tx::CompressedUtxoId> {
+        for event in self.block_events {
+            match event {
+                Event::CoinCreated(coin) | Event::CoinConsumed(coin)
+                    if coin.utxo_id == utxo_id =>
+                {
+                    let output_index = coin.utxo_id.output_index();
+                    return Ok(fuel_core_types::fuel_tx::CompressedUtxoId {
+                        tx_pointer: coin.tx_pointer,
+                        output_index,
+                    });
+                }
+                _ => {}
+            }
+        }
+        anyhow::bail!("UtxoId not found in the block events");
+    }
+}
diff --git a/crates/fuel-core/src/graphql_api/database.rs b/crates/fuel-core/src/graphql_api/database.rs
index ca1dd6ca972..418e14c1318 100644
--- a/crates/fuel-core/src/graphql_api/database.rs
+++ b/crates/fuel-core/src/graphql_api/database.rs
@@ -23,12 +23,11 @@ use fuel_core_storage::{
     Error as StorageError,
     IsNotFound,
     Mappable,
+    PredicateStorageRequirements,
     Result as StorageResult,
     StorageInspect,
-};
-use fuel_core_txpool::types::{
-    ContractId,
-    TxId,
+    StorageRead,
+    StorageSize,
 };
 use fuel_core_types::{
     blockchain::{
@@ -50,15 +49,19 @@ use fuel_core_types::{
         Address,
         AssetId,
         Bytes32,
+        ContractId,
         Salt,
         Transaction,
+        TxId,
         TxPointer,
         UtxoId,
     },
     fuel_types::{
+        BlobId,
         BlockHeight,
         Nonce,
     },
+    fuel_vm::BlobData,
     services::{
         graphql_api::ContractBalance,
         txpool::TransactionStatus,
@@ -69,6 +72,8 @@ use std::{
     sync::Arc,
 };
 
+use super::ports::DatabaseDaCompressedBlocks;
+
 mod arc_wrapper;
 
 /// The on-chain view of the database used by the [`ReadView`] to fetch on-chain data.
@@ -210,6 +215,16 @@ impl DatabaseBlocks for ReadView {
     }
 }
 
+impl DatabaseDaCompressedBlocks for ReadView {
+    fn da_compressed_block(&self, id: &BlockHeight) -> StorageResult<Vec<u8>> {
+        self.off_chain.da_compressed_block(id)
+    }
+
+    fn latest_height(&self) -> StorageResult<BlockHeight> {
+        self.on_chain.latest_height()
+    }
+}
+
 impl<M> StorageInspect<M> for ReadView
 where
     M: Mappable,
@@ -226,6 +241,28 @@ where
     }
 }
 
+impl StorageSize<BlobData> for ReadView {
+    fn size_of_value(&self, key: &BlobId) -> Result<Option<usize>, Self::Error> {
+        self.on_chain.size_of_value(key)
+    }
+}
+
+impl StorageRead<BlobData> for ReadView {
+    fn read(&self, key: &BlobId, buf: &mut [u8]) -> Result<Option<usize>, Self::Error> {
+        self.on_chain.read(key, buf)
+    }
+
+    fn read_alloc(&self, key: &BlobId) -> Result<Option<Vec<u8>>, Self::Error> {
+        self.on_chain.read_alloc(key)
+    }
+}
+
+impl PredicateStorageRequirements for ReadView {
+    fn storage_error_to_string(error: Self::Error) -> String {
+        error.to_string()
+    }
+}
+
 impl DatabaseMessages for ReadView {
     fn all_messages(
         &self,
@@ -286,6 +323,10 @@ impl OffChainDatabase for ReadView {
         self.off_chain.block_height(block_id)
     }
 
+    fn da_compressed_block(&self, height: &BlockHeight) -> StorageResult<Vec<u8>> {
+        self.off_chain.da_compressed_block(height)
+    }
+
     fn tx_status(&self, tx_id: &TxId) -> StorageResult<TransactionStatus> {
         self.off_chain.tx_status(tx_id)
     }
diff --git a/crates/fuel-core/src/graphql_api/ports.rs b/crates/fuel-core/src/graphql_api/ports.rs
index 2dcd596f2eb..077a48d1637 100644
--- a/crates/fuel-core/src/graphql_api/ports.rs
+++ b/crates/fuel-core/src/graphql_api/ports.rs
@@ -17,8 +17,9 @@ use fuel_core_storage::{
     Error as StorageError,
     Result as StorageResult,
     StorageInspect,
+    StorageRead,
 };
-use fuel_core_txpool::service::TxStatusMessage;
+use fuel_core_txpool::TxStatusMessage;
 use fuel_core_types::{
     blockchain::{
         block::CompressedBlock,
@@ -57,10 +58,7 @@ use fuel_core_types::{
         executor::TransactionExecutionStatus,
         graphql_api::ContractBalance,
         p2p::PeerInfo,
-        txpool::{
-            InsertionResult,
-            TransactionStatus,
-        },
+        txpool::TransactionStatus,
     },
     tai64::Tai64,
 };
@@ -69,6 +67,8 @@ use std::sync::Arc;
 pub trait OffChainDatabase: Send + Sync {
     fn block_height(&self, block_id: &BlockId) -> StorageResult<BlockHeight>;
 
+    fn da_compressed_block(&self, height: &BlockHeight) -> StorageResult<Vec<u8>>;
+
     fn tx_status(&self, tx_id: &TxId) -> StorageResult<TransactionStatus>;
 
     fn owned_coins_ids(
@@ -121,7 +121,7 @@ pub trait OnChainDatabase:
     + DatabaseBlocks
     + DatabaseMessages
     + StorageInspect<Coins, Error = StorageError>
-    + StorageInspect<BlobData, Error = StorageError>
+    + StorageRead<BlobData, Error = StorageError>
     + StorageInspect<StateTransitionBytecodeVersions, Error = StorageError>
     + StorageInspect<UploadedBytecodes, Error = StorageError>
     + DatabaseContracts
@@ -150,6 +150,14 @@ pub trait DatabaseBlocks {
     fn consensus(&self, id: &BlockHeight) -> StorageResult<Consensus>;
 }
 
+/// Trait that specifies all the getters required for DA compressed blocks.
+pub trait DatabaseDaCompressedBlocks {
+    /// Get a DA compressed block by its height.
+    fn da_compressed_block(&self, height: &BlockHeight) -> StorageResult<Vec<u8>>;
+
+    fn latest_height(&self) -> StorageResult<BlockHeight>;
+}
+
 /// Trait that specifies all the getters required for messages.
 pub trait DatabaseMessages: StorageInspect<Messages, Error = StorageError> {
     fn all_messages(
@@ -188,14 +196,11 @@ pub trait DatabaseChain {
 
 #[async_trait]
 pub trait TxPoolPort: Send + Sync {
-    fn transaction(&self, id: TxId) -> Option<Transaction>;
+    async fn transaction(&self, id: TxId) -> anyhow::Result<Option<Transaction>>;
 
-    fn submission_time(&self, id: TxId) -> Option<Tai64>;
+    async fn submission_time(&self, id: TxId) -> anyhow::Result<Option<Tai64>>;
 
-    async fn insert(
-        &self,
-        txs: Vec<Arc<Transaction>>,
-    ) -> Vec<anyhow::Result<InsertionResult>>;
+    async fn insert(&self, txs: Transaction) -> anyhow::Result<()>;
 
     fn tx_update_subscribe(
         &self,
@@ -268,6 +273,7 @@ pub mod worker {
             },
         },
         graphql_api::storage::{
+            da_compression::*,
             old::{
                 OldFuelBlockConsensus,
                 OldFuelBlocks,
@@ -321,6 +327,15 @@ pub mod worker {
         + StorageMutate<OldTransactions, Error = StorageError>
         + StorageMutate<SpentMessages, Error = StorageError>
         + StorageMutate<RelayedTransactionStatuses, Error = StorageError>
+        + StorageMutate<DaCompressedBlocks, Error = StorageError>
+        + StorageMutate<DaCompressionTemporalRegistryAddress, Error = StorageError>
+        + StorageMutate<DaCompressionTemporalRegistryAssetId, Error = StorageError>
+        + StorageMutate<DaCompressionTemporalRegistryContractId, Error = StorageError>
+        + StorageMutate<DaCompressionTemporalRegistryScriptCode, Error = StorageError>
+        + StorageMutate<DaCompressionTemporalRegistryPredicateCode, Error = StorageError>
+        + StorageMutate<DaCompressionTemporalRegistryIndex, Error = StorageError>
+        + StorageMutate<DaCompressionTemporalRegistryTimestamps, Error = StorageError>
+        + StorageMutate<DaCompressionTemporalRegistryEvictorCache, Error = StorageError>
     {
         fn record_tx_id_owner(
             &mut self,
diff --git a/crates/fuel-core/src/graphql_api/storage.rs b/crates/fuel-core/src/graphql_api/storage.rs
index 1b77c07cbdc..8f8cfcd1f19 100644
--- a/crates/fuel-core/src/graphql_api/storage.rs
+++ b/crates/fuel-core/src/graphql_api/storage.rs
@@ -39,6 +39,7 @@ use statistic::StatisticTable;
 pub mod blocks;
 pub mod coins;
 pub mod contracts;
+pub mod da_compression;
 pub mod messages;
 pub mod old;
 pub mod statistic;
@@ -93,6 +94,25 @@ pub enum Column {
     /// Existence of a key in this column means that the message has been spent.
     /// See [`SpentMessages`](messages::SpentMessages)
     SpentMessages = 13,
+    /// DA compression and postcard serialized blocks.
+    /// See [`DaCompressedBlocks`](da_compression::DaCompressedBlocks)
+    DaCompressedBlocks = 14,
+    /// See [`DaCompressionTemporalRegistryIndex`](da_compression::DaCompressionTemporalRegistryIndex)
+    DaCompressionTemporalRegistryIndex = 15,
+    /// See [`DaCompressionTemporalRegistryTimestamps`](da_compression::DaCompressionTemporalRegistryTimestamps)
+    DaCompressionTemporalRegistryTimestamps = 16,
+    /// See [`DaCompressionTemporalRegistryEvictorCache`](da_compression::DaCompressionTemporalRegistryEvictorCache)
+    DaCompressionTemporalRegistryEvictorCache = 17,
+    /// See [`DaCompressionTemporalRegistryAddress`](da_compression::DaCompressionTemporalRegistryAddress)
+    DaCompressionTemporalRegistryAddress = 18,
+    /// See [`DaCompressionTemporalRegistryAssetId`](da_compression::DaCompressionTemporalRegistryAssetId)
+    DaCompressionTemporalRegistryAssetId = 19,
+    /// See [`DaCompressionTemporalRegistryContractId`](da_compression::DaCompressionTemporalRegistryContractId)
+    DaCompressionTemporalRegistryContractId = 20,
+    /// See [`DaCompressionTemporalRegistryScriptCode`](da_compression::DaCompressionTemporalRegistryScriptCode)
+    DaCompressionTemporalRegistryScriptCode = 21,
+    /// See [`DaCompressionTemporalRegistryPredicateCode`](da_compression::DaCompressionTemporalRegistryPredicateCode)
+    DaCompressionTemporalRegistryPredicateCode = 22,
 }
 
 impl Column {
diff --git a/crates/fuel-core/src/graphql_api/storage/coins.rs b/crates/fuel-core/src/graphql_api/storage/coins.rs
index 58c8a23958d..42d22ba94ec 100644
--- a/crates/fuel-core/src/graphql_api/storage/coins.rs
+++ b/crates/fuel-core/src/graphql_api/storage/coins.rs
@@ -8,9 +8,9 @@ use fuel_core_storage::{
     structured_storage::TableWithBlueprint,
     Mappable,
 };
-use fuel_core_txpool::types::TxId;
 use fuel_core_types::fuel_tx::{
     Address,
+    TxId,
     UtxoId,
 };
 
diff --git a/crates/fuel-core/src/graphql_api/storage/contracts.rs b/crates/fuel-core/src/graphql_api/storage/contracts.rs
index 27056502b61..51b4168ba14 100644
--- a/crates/fuel-core/src/graphql_api/storage/contracts.rs
+++ b/crates/fuel-core/src/graphql_api/storage/contracts.rs
@@ -7,8 +7,10 @@ use fuel_core_storage::{
     structured_storage::TableWithBlueprint,
     Mappable,
 };
-use fuel_core_txpool::types::ContractId;
-use fuel_core_types::entities::contract::ContractsInfoType;
+use fuel_core_types::{
+    entities::contract::ContractsInfoType,
+    fuel_tx::ContractId,
+};
 
 /// Contract info
 pub struct ContractsInfo;
diff --git a/crates/fuel-core/src/graphql_api/storage/da_compression.rs b/crates/fuel-core/src/graphql_api/storage/da_compression.rs
new file mode 100644
index 00000000000..54b21073ed6
--- /dev/null
+++ b/crates/fuel-core/src/graphql_api/storage/da_compression.rs
@@ -0,0 +1,200 @@
+use self::{
+    evictor_cache::MetadataKey,
+    predicate_code_codec::PredicateCodeCodec,
+    reverse_key::ReverseKey,
+    script_code_codec::ScriptCodeCodec,
+    timestamps::TimestampKey,
+};
+use fuel_core_compression::VersionedCompressedBlock;
+use fuel_core_storage::{
+    blueprint::plain::Plain,
+    codec::{
+        postcard::Postcard,
+        primitive::Primitive,
+        raw::Raw,
+    },
+    structured_storage::TableWithBlueprint,
+    Mappable,
+};
+use fuel_core_types::{
+    fuel_compression::RegistryKey,
+    fuel_tx::{
+        input::PredicateCode,
+        Address,
+        AssetId,
+        ContractId,
+        ScriptCode,
+    },
+    fuel_types::BlockHeight,
+    tai64::Tai64,
+};
+
+pub mod evictor_cache;
+pub mod predicate_code_codec;
+pub mod reverse_key;
+pub mod script_code_codec;
+pub mod timestamps;
+
+/// The table for the compressed blocks sent to DA.
+pub struct DaCompressedBlocks;
+
+impl Mappable for DaCompressedBlocks {
+    type Key = Self::OwnedKey;
+    type OwnedKey = BlockHeight;
+    type Value = Self::OwnedValue;
+    type OwnedValue = VersionedCompressedBlock;
+}
+
+impl TableWithBlueprint for DaCompressedBlocks {
+    type Blueprint = Plain<Primitive<4>, Postcard>;
+    type Column = super::Column;
+
+    fn column() -> Self::Column {
+        Self::Column::DaCompressedBlocks
+    }
+}
+
+/// Mapping from the type to the registry key in the temporal registry.
+pub struct DaCompressionTemporalRegistryIndex;
+
+impl Mappable for DaCompressionTemporalRegistryIndex {
+    type Key = Self::OwnedKey;
+    type OwnedKey = ReverseKey;
+    type Value = Self::OwnedValue;
+    type OwnedValue = RegistryKey;
+}
+
+impl TableWithBlueprint for DaCompressionTemporalRegistryIndex {
+    // TODO: Use Raw codec for value instead of Postcard
+    type Blueprint = Plain<Postcard, Postcard>;
+    type Column = super::Column;
+
+    fn column() -> Self::Column {
+        Self::Column::DaCompressionTemporalRegistryIndex
+    }
+}
+
+/// This table keeps track of last written timestamp for each key,
+/// so that we can keep track of expiration.
+pub struct DaCompressionTemporalRegistryTimestamps;
+
+impl Mappable for DaCompressionTemporalRegistryTimestamps {
+    type Key = Self::OwnedKey;
+    type OwnedKey = TimestampKey;
+    type Value = Self::OwnedValue;
+    type OwnedValue = Tai64;
+}
+
+impl TableWithBlueprint for DaCompressionTemporalRegistryTimestamps {
+    // TODO: Use Raw codec for value instead of Postcard
+    type Blueprint = Plain<Postcard, Postcard>;
+    type Column = super::Column;
+
+    fn column() -> Self::Column {
+        Self::Column::DaCompressionTemporalRegistryTimestamps
+    }
+}
+
+/// This table is used to hold "next key to evict" for each keyspace.
+/// In the future we'll likely switch to use LRU or something, in which
+/// case this table can be repurposed.
+pub struct DaCompressionTemporalRegistryEvictorCache;
+
+impl Mappable for DaCompressionTemporalRegistryEvictorCache {
+    type Key = Self::OwnedKey;
+    type OwnedKey = MetadataKey;
+    type Value = Self::OwnedValue;
+    type OwnedValue = RegistryKey;
+}
+
+impl TableWithBlueprint for DaCompressionTemporalRegistryEvictorCache {
+    // TODO: Use Raw codec for value instead of Postcard
+    type Blueprint = Plain<Postcard, Postcard>;
+    type Column = super::Column;
+
+    fn column() -> Self::Column {
+        Self::Column::DaCompressionTemporalRegistryEvictorCache
+    }
+}
+
+macro_rules! temporal_registry {
+    ($type:ty, $code:ty) => {
+        paste::paste! {
+            pub struct [< DaCompressionTemporalRegistry $type >];
+
+            impl Mappable for [< DaCompressionTemporalRegistry $type >] {
+                type Key = Self::OwnedKey;
+                type OwnedKey = RegistryKey;
+                type Value = Self::OwnedValue;
+                type OwnedValue = $type;
+            }
+
+            impl TableWithBlueprint for [< DaCompressionTemporalRegistry $type >] {
+                // TODO: Use Raw codec for value instead of Postcard
+                type Blueprint = Plain<Postcard, $code>;
+                type Column = super::Column;
+
+                fn column() -> Self::Column {
+                    Self::Column::[< DaCompressionTemporalRegistry $type >]
+                }
+            }
+
+
+            #[cfg(test)]
+            fuel_core_storage::basic_storage_tests!(
+                [< DaCompressionTemporalRegistry $type >],
+                RegistryKey::ZERO,
+                <[< DaCompressionTemporalRegistry $type >] as Mappable>::Value::default(),
+                <[< DaCompressionTemporalRegistry $type >] as Mappable>::Value::default(),
+                tests::generate_key
+            );
+        }
+    };
+}
+
+temporal_registry!(Address, Raw);
+temporal_registry!(AssetId, Raw);
+temporal_registry!(ContractId, Raw);
+temporal_registry!(ScriptCode, ScriptCodeCodec);
+temporal_registry!(PredicateCode, PredicateCodeCodec);
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[cfg(test)]
+    fuel_core_storage::basic_storage_tests!(
+        DaCompressionTemporalRegistryIndex,
+        ReverseKey::Address(Address::zeroed()),
+        RegistryKey::ZERO
+    );
+
+    #[cfg(test)]
+    fuel_core_storage::basic_storage_tests!(
+        DaCompressionTemporalRegistryTimestamps,
+        TimestampKey {
+            keyspace: timestamps::TimestampKeyspace::Address,
+            key: RegistryKey::ZERO
+        },
+        Tai64::UNIX_EPOCH
+    );
+
+    #[cfg(test)]
+    fuel_core_storage::basic_storage_tests!(
+        DaCompressionTemporalRegistryEvictorCache,
+        MetadataKey::Address,
+        RegistryKey::ZERO
+    );
+
+    fuel_core_storage::basic_storage_tests!(
+        DaCompressedBlocks,
+        <DaCompressedBlocks as Mappable>::Key::default(),
+        <DaCompressedBlocks as Mappable>::Value::default()
+    );
+
+    #[allow(clippy::arithmetic_side_effects)] // Test code, and also safe
+    pub fn generate_key(rng: &mut impl rand::Rng) -> RegistryKey {
+        let raw_key: u32 = rng.gen_range(0..2u32.pow(24) - 2);
+        RegistryKey::try_from(raw_key).unwrap()
+    }
+}
diff --git a/crates/fuel-core/src/graphql_api/storage/da_compression/evictor_cache.rs b/crates/fuel-core/src/graphql_api/storage/da_compression/evictor_cache.rs
new file mode 100644
index 00000000000..870d02722f6
--- /dev/null
+++ b/crates/fuel-core/src/graphql_api/storage/da_compression/evictor_cache.rs
@@ -0,0 +1,34 @@
+/// The metadata key used by `DaCompressionTemporalRegistryEvictorCache` table to
+/// store progress of the evictor.
+#[derive(
+    Debug,
+    Clone,
+    Copy,
+    PartialEq,
+    Eq,
+    serde::Serialize,
+    serde::Deserialize,
+    strum::EnumCount,
+)]
+pub enum MetadataKey {
+    Address,
+    AssetId,
+    ContractId,
+    ScriptCode,
+    PredicateCode,
+}
+
+#[cfg(feature = "test-helpers")]
+impl rand::distributions::Distribution<MetadataKey> for rand::distributions::Standard {
+    fn sample<R: rand::Rng + ?Sized>(&self, rng: &mut R) -> MetadataKey {
+        use strum::EnumCount;
+        match rng.next_u32() as usize % MetadataKey::COUNT {
+            0 => MetadataKey::Address,
+            1 => MetadataKey::AssetId,
+            2 => MetadataKey::ContractId,
+            3 => MetadataKey::ScriptCode,
+            4 => MetadataKey::PredicateCode,
+            _ => unreachable!("New metadata key is added but not supported here"),
+        }
+    }
+}
diff --git a/crates/fuel-core/src/graphql_api/storage/da_compression/predicate_code_codec.rs b/crates/fuel-core/src/graphql_api/storage/da_compression/predicate_code_codec.rs
new file mode 100644
index 00000000000..6c165c09f3a
--- /dev/null
+++ b/crates/fuel-core/src/graphql_api/storage/da_compression/predicate_code_codec.rs
@@ -0,0 +1,28 @@
+use fuel_core_storage::codec::{
+    Decode,
+    Encode,
+};
+use fuel_core_types::fuel_tx::input::PredicateCode;
+use std::{
+    borrow::Cow,
+    ops::Deref,
+};
+
+// TODO: Remove this codec when the `PredicateCode` implements
+//  `AsRef<[u8]>` and `TryFrom<[u8]>` and use `Raw` codec instead.
+
+pub struct PredicateCodeCodec;
+
+impl Encode<PredicateCode> for PredicateCodeCodec {
+    type Encoder<'a> = Cow<'a, [u8]>;
+
+    fn encode(t: &PredicateCode) -> Self::Encoder<'_> {
+        Cow::Borrowed(t.deref())
+    }
+}
+
+impl Decode<PredicateCode> for PredicateCodeCodec {
+    fn decode(bytes: &[u8]) -> anyhow::Result<PredicateCode> {
+        Ok(bytes.to_vec().into())
+    }
+}
diff --git a/crates/fuel-core/src/graphql_api/storage/da_compression/reverse_key.rs b/crates/fuel-core/src/graphql_api/storage/da_compression/reverse_key.rs
new file mode 100644
index 00000000000..3c24d3a817f
--- /dev/null
+++ b/crates/fuel-core/src/graphql_api/storage/da_compression/reverse_key.rs
@@ -0,0 +1,82 @@
+use fuel_core_types::{
+    fuel_tx::{
+        input::PredicateCode,
+        ScriptCode,
+    },
+    fuel_types::{
+        Address,
+        AssetId,
+        Bytes32,
+        ContractId,
+    },
+};
+use std::ops::Deref;
+
+#[derive(
+    Debug,
+    Clone,
+    Copy,
+    PartialEq,
+    Eq,
+    serde::Serialize,
+    serde::Deserialize,
+    strum::EnumCount,
+)]
+/// The reverse key for the temporal registry index.
+/// By this key we can find the registry key from the temporal registry.
+pub enum ReverseKey {
+    Address(Address),
+    AssetId(AssetId),
+    ContractId(ContractId),
+    /// Hash of the script code.
+    ScriptCode(Bytes32),
+    /// Hash of the predicate code.
+    PredicateCode(Bytes32),
+}
+
+impl From<&Address> for ReverseKey {
+    fn from(address: &Address) -> Self {
+        Self::Address(*address)
+    }
+}
+
+impl From<&AssetId> for ReverseKey {
+    fn from(asset_id: &AssetId) -> Self {
+        Self::AssetId(*asset_id)
+    }
+}
+
+impl From<&ContractId> for ReverseKey {
+    fn from(contract_id: &ContractId) -> Self {
+        Self::ContractId(*contract_id)
+    }
+}
+
+impl From<&ScriptCode> for ReverseKey {
+    fn from(script_code: &ScriptCode) -> Self {
+        let hash = fuel_core_types::fuel_crypto::Hasher::hash(script_code.deref());
+        ReverseKey::ScriptCode(hash)
+    }
+}
+
+impl From<&PredicateCode> for ReverseKey {
+    fn from(predicate_code: &PredicateCode) -> Self {
+        let hash = fuel_core_types::fuel_crypto::Hasher::hash(predicate_code.deref());
+        ReverseKey::PredicateCode(hash)
+    }
+}
+
+#[cfg(feature = "test-helpers")]
+impl rand::distributions::Distribution<ReverseKey> for rand::distributions::Standard {
+    fn sample<R: rand::Rng + ?Sized>(&self, rng: &mut R) -> ReverseKey {
+        use strum::EnumCount;
+        match rng.next_u32() as usize % ReverseKey::COUNT {
+            0 => ReverseKey::Address(Address::default()),
+            1 => ReverseKey::AssetId(AssetId::default()),
+            2 => ReverseKey::ContractId(ContractId::default()),
+            3 => ReverseKey::ScriptCode(Bytes32::default()),
+            4 => ReverseKey::PredicateCode(Bytes32::default()),
+            _ => unreachable!("New reverse key is added but not supported here"),
+        }
+    }
+}
diff --git a/crates/fuel-core/src/graphql_api/storage/da_compression/script_code_codec.rs b/crates/fuel-core/src/graphql_api/storage/da_compression/script_code_codec.rs
new file mode 100644
index 00000000000..a4d6c8d1ac3
--- /dev/null
+++ b/crates/fuel-core/src/graphql_api/storage/da_compression/script_code_codec.rs
@@ -0,0 +1,28 @@
+use fuel_core_storage::codec::{
+    Decode,
+    Encode,
+};
+use fuel_core_types::fuel_tx::ScriptCode;
+use std::{
+    borrow::Cow,
+    ops::Deref,
+};
+
+// TODO: Remove this codec when the `ScriptCode` implements
+//  `AsRef<[u8]>` and `TryFrom<[u8]>` and use `Raw` codec instead.
+
+pub struct ScriptCodeCodec;
+
+impl Encode<ScriptCode> for ScriptCodeCodec {
+    type Encoder<'a> = Cow<'a, [u8]>;
+
+    fn encode(t: &ScriptCode) -> Self::Encoder<'_> {
+        Cow::Borrowed(t.deref())
+    }
+}
+
+impl Decode<ScriptCode> for ScriptCodeCodec {
+    fn decode(bytes: &[u8]) -> anyhow::Result<ScriptCode> {
+        Ok(bytes.to_vec().into())
+    }
+}
diff --git a/crates/fuel-core/src/graphql_api/storage/da_compression/timestamps.rs b/crates/fuel-core/src/graphql_api/storage/da_compression/timestamps.rs
new file mode 100644
index 00000000000..dc8f016f50b
--- /dev/null
+++ b/crates/fuel-core/src/graphql_api/storage/da_compression/timestamps.rs
@@ -0,0 +1,57 @@
+use fuel_core_types::fuel_compression::RegistryKey;
+
+/// The metadata key used by `DaCompressionTemporalRegistryTimsetamps` table to
+/// keep track of when each key was last updated.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
+pub struct TimestampKey {
+    /// The column where the key is stored.
+    pub keyspace: TimestampKeyspace,
+    /// The key itself.
+    pub key: RegistryKey,
+}
+
+#[derive(
+    Debug,
+    Clone,
+    Copy,
+    PartialEq,
+    Eq,
+    serde::Serialize,
+    serde::Deserialize,
+    strum::EnumCount,
+)]
+pub enum TimestampKeyspace {
+    Address,
+    AssetId,
+    ContractId,
+    ScriptCode,
+    PredicateCode,
+}
+
+#[cfg(feature = "test-helpers")]
+impl rand::distributions::Distribution<TimestampKey> for rand::distributions::Standard {
+    #![allow(clippy::arithmetic_side_effects)] // Test-only code, and also safe
+    fn sample<R: rand::Rng + ?Sized>(&self, rng: &mut R) -> TimestampKey {
+        TimestampKey {
+            keyspace: rng.gen(),
+            key: RegistryKey::try_from(rng.gen_range(0..2u32.pow(24) - 2)).unwrap(),
+        }
+    }
+}
+
+#[cfg(feature = "test-helpers")]
+impl rand::distributions::Distribution<TimestampKeyspace>
+    for rand::distributions::Standard
+{
+    fn sample<R: rand::Rng + ?Sized>(&self, rng: &mut R) -> TimestampKeyspace {
+        use strum::EnumCount;
+        match rng.next_u32() as usize % TimestampKeyspace::COUNT {
+            0 => TimestampKeyspace::Address,
+            1 => TimestampKeyspace::AssetId,
+            2 => TimestampKeyspace::ContractId,
+            3 => TimestampKeyspace::ScriptCode,
+            4 => TimestampKeyspace::PredicateCode,
+            _ => unreachable!("New metadata key is added but not supported here"),
+        }
+    }
+}
diff --git a/crates/fuel-core/src/graphql_api/storage/old.rs b/crates/fuel-core/src/graphql_api/storage/old.rs
index a083b55c5f3..adb9c3b7f3d 100644
--- a/crates/fuel-core/src/graphql_api/storage/old.rs
+++ b/crates/fuel-core/src/graphql_api/storage/old.rs
@@ -15,13 +15,15 @@ use fuel_core_storage::{
     structured_storage::TableWithBlueprint,
     Mappable,
 };
-use fuel_core_txpool::types::TxId;
 use fuel_core_types::{
     blockchain::{
         block::CompressedBlock,
         consensus::Consensus,
     },
-    fuel_tx::Transaction,
+    fuel_tx::{
+        Transaction,
+        TxId,
+    },
     fuel_types::BlockHeight,
 };
 
diff --git a/crates/fuel-core/src/graphql_api/worker_service.rs b/crates/fuel-core/src/graphql_api/worker_service.rs
index 1c19788d194..959733d4919 100644
--- a/crates/fuel-core/src/graphql_api/worker_service.rs
+++ b/crates/fuel-core/src/graphql_api/worker_service.rs
@@ -1,12 +1,17 @@
-use super::storage::old::{
-    OldFuelBlockConsensus,
-    OldFuelBlocks,
-    OldTransactions,
+use super::{
+    da_compression::da_compress_block,
+    storage::old::{
+        OldFuelBlockConsensus,
+        OldFuelBlocks,
+        OldTransactions,
+    },
 };
 use crate::{
     fuel_core_graphql_api::{
-        ports,
-        ports::worker::OffChainDatabaseTransaction,
+        ports::{
+            self,
+            worker::OffChainDatabaseTransaction,
+        },
         storage::{
             blocks::FuelBlockIdsToHeights,
             coins::{
@@ -37,7 +42,6 @@ use fuel_core_storage::{
     Result as StorageResult,
     StorageAsMut,
 };
-use fuel_core_txpool::types::TxId;
 use fuel_core_types::{
     blockchain::{
         block::{
@@ -62,6 +66,7 @@ use fuel_core_types::{
         Input,
         Output,
         Transaction,
+        TxId,
         UniqueIdentifier,
     },
     fuel_types::{
@@ -93,9 +98,16 @@ use std::{
 #[cfg(test)]
 mod tests;
 
+#[derive(Debug, Clone)]
+pub enum DaCompressionConfig {
+    Disabled,
+    Enabled(fuel_core_compression::config::Config),
+}
+
 /// The initialization task recovers the state of the GraphQL service database on startup.
 pub struct InitializeTask<TxPool, BlockImporter, OnChain, OffChain> {
     chain_id: ChainId,
+    da_compression_config: DaCompressionConfig,
     continue_on_error: bool,
     tx_pool: TxPool,
     blocks_events: BoxStream<SharedImportResult>,
@@ -111,6 +123,7 @@ pub struct Task<TxPool, D> {
     block_importer: BoxStream<SharedImportResult>,
     database: D,
     chain_id: ChainId,
+    da_compression_config: DaCompressionConfig,
     continue_on_error: bool,
 }
 
@@ -134,7 +147,7 @@ where
         let height = block.header().height();
         let block_id = block.id();
         transaction
-            .storage::<FuelBlockIdsToHeights>()
+            .storage_as_mut::<FuelBlockIdsToHeights>()
             .insert(&block_id, height)?;
 
         let total_tx_count = transaction
@@ -146,6 +159,13 @@ where
             &mut transaction,
         )?;
 
+        match self.da_compression_config {
+            DaCompressionConfig::Disabled => {}
+            DaCompressionConfig::Enabled(config) => {
+                da_compress_block(config, block, &result.events, &mut transaction)?;
+            }
+        }
+
         transaction.commit()?;
 
         for status in result.tx_status.iter() {
@@ -455,6 +475,7 @@ where
 
         let InitializeTask {
             chain_id,
+            da_compression_config,
             tx_pool,
             block_importer,
             blocks_events,
@@ -468,6 +489,7 @@ where
             block_importer: blocks_events,
             database: off_chain_database,
             chain_id,
+            da_compression_config,
             continue_on_error,
         };
 
@@ -579,6 +601,7 @@ pub fn new_service<TxPool, BlockImporter, OnChain, OffChain>(
     on_chain_database: OnChain,
     off_chain_database: OffChain,
     chain_id: ChainId,
+    da_compression_config: DaCompressionConfig,
     continue_on_error: bool,
 ) -> ServiceRunner<InitializeTask<TxPool, BlockImporter, OnChain, OffChain>>
 where
@@ -594,6 +617,7 @@ where
         on_chain_database,
         off_chain_database,
         chain_id,
+        da_compression_config,
         continue_on_error,
     })
 }
diff --git a/crates/fuel-core/src/graphql_api/worker_service/tests.rs b/crates/fuel-core/src/graphql_api/worker_service/tests.rs
index b6eef2c7826..8b9ad758975 100644
--- a/crates/fuel-core/src/graphql_api/worker_service/tests.rs
+++ b/crates/fuel-core/src/graphql_api/worker_service/tests.rs
@@ -81,6 +81,7 @@ fn worker_task_with_block_importer_and_db<D: ports::worker::OffChainDatabase>(
         block_importer,
         database,
         chain_id,
+        da_compression_config: DaCompressionConfig::Disabled,
         continue_on_error: false,
     }
 }
diff --git a/crates/fuel-core/src/p2p_test_helpers.rs b/crates/fuel-core/src/p2p_test_helpers.rs
index f72b4c348b0..fbc9f32afb4 100644
--- a/crates/fuel-core/src/p2p_test_helpers.rs
+++ b/crates/fuel-core/src/p2p_test_helpers.rs
@@ -6,8 +6,13 @@ use crate::{
         CoinConfigGenerator,
     },
     combined_database::CombinedDatabase,
-    database::Database,
+    database::{
+        database_description::off_chain::OffChain,
+        Database,
+    },
+    fuel_core_graphql_api::storage::transactions::TransactionStatuses,
     p2p::Multiaddr,
+    schema::tx::types::TransactionStatus,
     service::{
         Config,
         FuelService,
@@ -33,7 +38,6 @@ use fuel_core_poa::{
     Trigger,
 };
 use fuel_core_storage::{
-    tables::Transactions,
     transactional::AtomicView,
     StorageAsRef,
 };
@@ -59,7 +63,6 @@ use fuel_core_types::{
     services::p2p::GossipsubMessageAcceptance,
 };
 use futures::StreamExt;
-use itertools::Itertools;
 use rand::{
     rngs::StdRng,
     SeedableRng,
@@ -70,7 +73,6 @@ use std::{
         Index,
         IndexMut,
     },
-    sync::Arc,
     time::Duration,
 };
 use tokio::sync::broadcast;
@@ -491,24 +493,34 @@ impl Node {
 
     /// Wait for the node to reach consistency with the given transactions.
     pub async fn consistency(&mut self, txs: &HashMap<Bytes32, Transaction>) {
-        let Self { db, .. } = self;
-        let mut blocks = self.node.shared.block_importer.block_stream();
-        while !not_found_txs(db, txs).is_empty() {
-            tokio::select! {
-                result = blocks.next() => {
-                    result.unwrap();
-                }
-                _ = self.node.await_shutdown() => {
-                    panic!("Got a stop signal")
+        let db = self.node.shared.database.off_chain();
+        loop {
+            let not_found = not_found_txs(db, txs);
+
+            if not_found.is_empty() {
+                break;
+            }
+
+            let tx_id = not_found[0];
+            let mut wait_transaction =
+                self.node.transaction_status_change(tx_id).await.unwrap();
+
+            loop {
+                tokio::select! {
+                    result = wait_transaction.next() => {
+                        let status = result.unwrap().unwrap();
+
+                        if matches!(status, TransactionStatus::Failed { .. })
+                            || matches!(status, TransactionStatus::Success { .. }) {
+                            break
+                        }
+                    }
+                    _ = self.node.await_shutdown() => {
+                        panic!("Got a stop signal")
+                    }
                 }
             }
         }
-
-        let count = db
-            .all_transactions(None, None)
-            .filter_ok(|tx| tx.is_script())
-            .count();
-        assert_eq!(count, txs.len());
     }
 
     /// Wait for the node to reach consistency with the given transactions within 10 seconds.
@@ -533,20 +545,15 @@ impl Node {
     pub async fn insert_txs(&self) -> HashMap<Bytes32, Transaction> {
         let mut expected = HashMap::new();
         for tx in &self.test_txs {
-            let tx_result = self
-                .node
+            let tx_id = tx.id(&ChainId::default());
+            self.node
                 .shared
                 .txpool_shared_state
-                .insert(vec![Arc::new(tx.clone())])
+                .insert(tx.clone())
                 .await
-                .pop()
-                .unwrap()
                 .unwrap();
 
-            let tx = Transaction::from(tx_result.inserted.as_ref());
-            expected.insert(tx.id(&ChainId::default()), tx);
-
-            assert!(tx_result.removed.is_empty());
+            expected.insert(tx_id, tx.clone());
         }
         expected
     }
@@ -570,13 +577,17 @@ impl Node {
 }
 
 fn not_found_txs<'iter>(
-    db: &'iter Database,
+    db: &'iter Database<OffChain>,
     txs: &'iter HashMap<Bytes32, Transaction>,
 ) -> Vec<TxId> {
     let mut not_found = vec![];
     txs.iter().for_each(|(id, tx)| {
         assert_eq!(id, &tx.id(&Default::default()));
-        if !db.storage::<Transactions>().contains_key(id).unwrap() {
+        let found = db
+            .storage::<TransactionStatuses>()
+            .contains_key(id)
+            .unwrap();
+        if !found {
             not_found.push(*id);
         }
     });
diff --git a/crates/fuel-core/src/query.rs b/crates/fuel-core/src/query.rs
index c5d3d0f6988..fc2dc79ea9b 100644
--- a/crates/fuel-core/src/query.rs
+++ b/crates/fuel-core/src/query.rs
@@ -9,6 +9,8 @@ mod subscriptions;
 mod tx;
 mod upgrades;
 
+pub mod da_compressed;
+
 // TODO: Remove reexporting of everything
 pub use balance::*;
 pub use blob::*;
diff --git a/crates/fuel-core/src/query/da_compressed.rs b/crates/fuel-core/src/query/da_compressed.rs
new file mode 100644
index 00000000000..669e55d584e
--- /dev/null
+++ b/crates/fuel-core/src/query/da_compressed.rs
@@ -0,0 +1,16 @@
+use crate::graphql_api::ports::DatabaseDaCompressedBlocks;
+use fuel_core_storage::Result as StorageResult;
+use fuel_core_types::fuel_types::BlockHeight;
+
+pub trait DaCompressedBlockData: Send + Sync {
+    fn da_compressed_block(&self, id: &BlockHeight) -> StorageResult<Vec<u8>>;
+}
+
+impl<D> DaCompressedBlockData for D
+where
+    D: DatabaseDaCompressedBlocks + ?Sized + Send + Sync,
+{
+    fn da_compressed_block(&self, height: &BlockHeight) -> StorageResult<Vec<u8>> {
+        self.da_compressed_block(height)
+    }
+}
diff --git a/crates/fuel-core/src/query/message/test.rs b/crates/fuel-core/src/query/message/test.rs
index 258de7fc7be..3078f3a7de9 100644
--- a/crates/fuel-core/src/query/message/test.rs
+++ b/crates/fuel-core/src/query/message/test.rs
@@ -1,6 +1,5 @@
 use std::ops::Deref;
 
-use fuel_core_txpool::types::ContractId;
 use fuel_core_types::{
     blockchain::header::{
         ApplicationHeader,
@@ -10,6 +9,7 @@ use fuel_core_types::{
     entities::relayer::message::MerkleProof,
     fuel_tx::{
         AssetId,
+        ContractId,
         Script,
         Transaction,
     },
diff --git a/crates/fuel-core/src/query/subscriptions.rs b/crates/fuel-core/src/query/subscriptions.rs
index 701632fd16c..120bd73692c 100644
--- a/crates/fuel-core/src/query/subscriptions.rs
+++ b/crates/fuel-core/src/query/subscriptions.rs
@@ -1,6 +1,6 @@
 use crate::schema::tx::types::TransactionStatus as ApiTxStatus;
 use fuel_core_storage::Result as StorageResult;
-use fuel_core_txpool::service::TxStatusMessage;
+use fuel_core_txpool::TxStatusMessage;
 use fuel_core_types::{
     fuel_types::Bytes32,
     services::txpool::TransactionStatus as TxPoolTxStatus,
@@ -17,20 +17,11 @@ mod test;
 #[cfg_attr(test, mockall::automock)]
 pub(crate) trait TxnStatusChangeState {
     /// Return the transaction status from the tx pool and database.
-    fn get_tx_status(&self, id: Bytes32) -> StorageResult<Option<TxPoolTxStatus>>;
-}
-
-impl<F> TxnStatusChangeState for F
-where
-    F: Fn(Bytes32) -> StorageResult<Option<TxPoolTxStatus>> + Send + Sync,
-{
-    fn get_tx_status(&self, id: Bytes32) -> StorageResult<Option<TxPoolTxStatus>> {
-        self(id)
-    }
+    async fn get_tx_status(&self, id: Bytes32) -> StorageResult<Option<TxPoolTxStatus>>;
 }
 
 #[tracing::instrument(skip(state, stream), fields(transaction_id = %transaction_id))]
-pub(crate) fn transaction_status_change<'a, State>(
+pub(crate) async fn transaction_status_change<'a, State>(
     state: State,
     stream: BoxStream<'a, TxStatusMessage>,
     transaction_id: Bytes32,
@@ -42,6 +33,7 @@ where
     // has a status.
     let check_db_first = state
         .get_tx_status(transaction_id)
+        .await
         .transpose()
         .map(TxStatusMessage::from);
 
diff --git a/crates/fuel-core/src/query/subscriptions/test.rs b/crates/fuel-core/src/query/subscriptions/test.rs
index c20b668a459..67e01848b7c 100644
--- a/crates/fuel-core/src/query/subscriptions/test.rs
+++ b/crates/fuel-core/src/query/subscriptions/test.rs
@@ -19,7 +19,10 @@
 //! - `tx_status_message()`: Generates a TxStatusMessage
 //! - `transaction_status()`: Generates a TransactionStatus
 //! - `input_stream()`: Generates a Vec<TxStatusMessage> of length 0 to 5
-use fuel_core_txpool::service::TxStatusMessage;
+use fuel_core_txpool::{
+    error::RemovedReason,
+    TxStatusMessage,
+};
 use fuel_core_types::{
     fuel_types::Bytes32,
     services::txpool::TransactionStatus,
@@ -76,7 +79,7 @@ fn failed() -> TransactionStatus {
 /// Returns a TransactionStatus with SqueezedOut status and an empty error message
 fn squeezed() -> TransactionStatus {
     TransactionStatus::SqueezedOut {
-        reason: fuel_core_txpool::Error::SqueezedOut(String::new()).to_string(),
+        reason: fuel_core_txpool::error::Error::Removed(RemovedReason::Ttl).to_string(),
     }
 }
 
@@ -251,6 +254,7 @@ fn test_tsc_inner(
 
             let stream = futures::stream::iter(stream).boxed();
             super::transaction_status_change(mock_state, stream, txn_id(0))
+                .await
                 .collect::<Vec<_>>()
                 .await
         })
diff --git a/crates/fuel-core/src/query/tx.rs b/crates/fuel-core/src/query/tx.rs
index 956701ccd99..1d2f1531363 100644
--- a/crates/fuel-core/src/query/tx.rs
+++ b/crates/fuel-core/src/query/tx.rs
@@ -14,11 +14,11 @@ use fuel_core_storage::{
     tables::Transactions,
     Result as StorageResult,
 };
-use fuel_core_txpool::types::TxId;
 use fuel_core_types::{
     fuel_tx::{
         Receipt,
         Transaction,
+        TxId,
         TxPointer,
     },
     fuel_types::Address,
diff --git a/crates/fuel-core/src/schema.rs b/crates/fuel-core/src/schema.rs
index 747f2740151..bd9e550d448 100644
--- a/crates/fuel-core/src/schema.rs
+++ b/crates/fuel-core/src/schema.rs
@@ -32,6 +32,7 @@ pub mod block;
 pub mod chain;
 pub mod coins;
 pub mod contract;
+pub mod da_compressed;
 pub mod dap;
 pub mod health;
 pub mod message;
@@ -54,6 +55,7 @@ pub struct Query(
     tx::TxQuery,
     health::HealthQuery,
     coins::CoinQuery,
+    da_compressed::DaCompressedBlockQuery,
     contract::ContractQuery,
     contract::ContractBalanceQuery,
     node_info::NodeQuery,
diff --git a/crates/fuel-core/src/schema/blob.rs b/crates/fuel-core/src/schema/blob.rs
index ae043e81049..938c2a6a1f3 100644
--- a/crates/fuel-core/src/schema/blob.rs
+++ b/crates/fuel-core/src/schema/blob.rs
@@ -49,6 +49,7 @@ pub struct BlobQuery;
 
 #[Object]
 impl BlobQuery {
+    #[graphql(complexity = "QUERY_COSTS.storage_read + child_complexity")]
     async fn blob(
         &self,
         ctx: &Context<'_>,
diff --git a/crates/fuel-core/src/schema/block.rs b/crates/fuel-core/src/schema/block.rs
index ee9c3e78f8c..81a9bf3c0af 100644
--- a/crates/fuel-core/src/schema/block.rs
+++ b/crates/fuel-core/src/schema/block.rs
@@ -125,6 +125,7 @@ impl Block {
         Ok(query.consensus(height)?.try_into()?)
     }
 
+    #[graphql(complexity = "QUERY_COSTS.block_transactions_ids")]
     async fn transaction_ids(&self) -> Vec<TransactionId> {
         self.0
             .transactions()
@@ -134,8 +135,7 @@ impl Block {
     }
 
     // Assume that in average we have 32 transactions per block.
-    #[graphql(complexity = "QUERY_COSTS.storage_iterator\
-        + (QUERY_COSTS.storage_read + child_complexity) * 32")]
+    #[graphql(complexity = "QUERY_COSTS.block_transactions + child_complexity")]
     async fn transactions(
         &self,
         ctx: &Context<'_>,
@@ -246,7 +246,7 @@ pub struct BlockQuery;
 
 #[Object]
 impl BlockQuery {
-    #[graphql(complexity = "2 * QUERY_COSTS.storage_read + child_complexity")]
+    #[graphql(complexity = "QUERY_COSTS.block_header + child_complexity")]
     async fn block(
         &self,
         ctx: &Context<'_>,
@@ -276,9 +276,8 @@ impl BlockQuery {
     }
 
     #[graphql(complexity = "{\
-        QUERY_COSTS.storage_iterator\
-        + (QUERY_COSTS.storage_read + first.unwrap_or_default() as usize) * child_complexity \
-        + (QUERY_COSTS.storage_read + last.unwrap_or_default() as usize) * child_complexity\
+        (QUERY_COSTS.block_header + child_complexity) \
+        * (first.unwrap_or_default() as usize + last.unwrap_or_default() as usize) \
     }")]
     async fn blocks(
         &self,
@@ -305,7 +304,7 @@ pub struct HeaderQuery;
 
 #[Object]
 impl HeaderQuery {
-    #[graphql(complexity = "QUERY_COSTS.storage_read + child_complexity")]
+    #[graphql(complexity = "QUERY_COSTS.block_header + child_complexity")]
     async fn header(
         &self,
         ctx: &Context<'_>,
@@ -319,9 +318,8 @@ impl HeaderQuery {
     }
 
     #[graphql(complexity = "{\
-        QUERY_COSTS.storage_iterator\
-        + (QUERY_COSTS.storage_read + first.unwrap_or_default() as usize) * child_complexity \
-        + (QUERY_COSTS.storage_read + last.unwrap_or_default() as usize) * child_complexity\
+        (QUERY_COSTS.block_header + child_complexity) \
+        * (first.unwrap_or_default() as usize + last.unwrap_or_default() as usize) \
     }")]
     async fn headers(
         &self,
@@ -374,13 +372,14 @@ impl BlockMutation {
         start_timestamp: Option<Tai64Timestamp>,
         blocks_to_produce: U32,
     ) -> async_graphql::Result<U32> {
-        let consensus_module = ctx.data_unchecked::<ConsensusModule>();
         let config = ctx.data_unchecked::<GraphQLConfig>().clone();
 
         if !config.debug {
             return Err(anyhow!("`debug` must be enabled to use this endpoint").into())
         }
 
+        let consensus_module = ctx.data_unchecked::<ConsensusModule>();
+
         let start_time = start_timestamp.map(|timestamp| timestamp.0);
         let blocks_to_produce: u32 = blocks_to_produce.into();
         consensus_module
diff --git a/crates/fuel-core/src/schema/da_compressed.rs b/crates/fuel-core/src/schema/da_compressed.rs
new file mode 100644
index 00000000000..3af336f8ba9
--- /dev/null
+++ b/crates/fuel-core/src/schema/da_compressed.rs
@@ -0,0 +1,51 @@
+use super::{
+    scalars::HexString,
+    ReadViewProvider,
+};
+use crate::{
+    fuel_core_graphql_api::{
+        IntoApiResult,
+        QUERY_COSTS,
+    },
+    query::da_compressed::DaCompressedBlockData,
+    schema::scalars::U32,
+};
+use async_graphql::{
+    Context,
+    Object,
+};
+
+pub struct DaCompressedBlock {
+    bytes: Vec<u8>,
+}
+
+impl From<Vec<u8>> for DaCompressedBlock {
+    fn from(bytes: Vec<u8>) -> Self {
+        Self { bytes }
+    }
+}
+
+#[Object]
+impl DaCompressedBlock {
+    async fn bytes(&self) -> HexString {
+        HexString(self.bytes.clone())
+    }
+}
+
+#[derive(Default)]
+pub struct DaCompressedBlockQuery;
+
+#[Object]
+impl DaCompressedBlockQuery {
+    #[graphql(complexity = "QUERY_COSTS.da_compressed_block_read")]
+    async fn da_compressed_block(
+        &self,
+        ctx: &Context<'_>,
+        #[graphql(desc = "Height of the block")] height: U32,
+    ) -> async_graphql::Result<Option<DaCompressedBlock>> {
+        let query = ctx.read_view()?;
+        query
+            .da_compressed_block(&height.0.into())
+            .into_api_result()
+    }
+}
diff --git a/crates/fuel-core/src/schema/gas_price.rs b/crates/fuel-core/src/schema/gas_price.rs
index 577d68cec9e..f1ded5fc106 100644
--- a/crates/fuel-core/src/schema/gas_price.rs
+++ b/crates/fuel-core/src/schema/gas_price.rs
@@ -46,7 +46,7 @@ pub struct LatestGasPriceQuery {}
 
 #[Object]
 impl LatestGasPriceQuery {
-    #[graphql(complexity = "2 * QUERY_COSTS.storage_read")]
+    #[graphql(complexity = "QUERY_COSTS.block_header")]
     async fn latest_gas_price(
         &self,
         ctx: &Context<'_>,
diff --git a/crates/fuel-core/src/schema/node_info.rs b/crates/fuel-core/src/schema/node_info.rs
index ef4a5965f72..f58e28a1d3b 100644
--- a/crates/fuel-core/src/schema/node_info.rs
+++ b/crates/fuel-core/src/schema/node_info.rs
@@ -76,7 +76,7 @@ impl NodeQuery {
             utxo_validation: config.utxo_validation,
             vm_backtrace: config.vm_backtrace,
             max_tx: (config.max_tx as u64).into(),
-            max_depth: (config.max_txpool_depth as u64).into(),
+            max_depth: (config.max_txpool_dependency_chain_length as u64).into(),
             node_version: VERSION.to_owned(),
         })
     }
diff --git a/crates/fuel-core/src/schema/tx.rs b/crates/fuel-core/src/schema/tx.rs
index db77716d722..d0a1474340a 100644
--- a/crates/fuel-core/src/schema/tx.rs
+++ b/crates/fuel-core/src/schema/tx.rs
@@ -1,3 +1,4 @@
+use super::scalars::U64;
 use crate::{
     fuel_core_graphql_api::{
         api_service::{
@@ -9,11 +10,16 @@ use crate::{
         IntoApiResult,
         QUERY_COSTS,
     },
+    graphql_api::{
+        database::ReadView,
+        ports::MemoryPool,
+    },
     query::{
         transaction_status_change,
         BlockQueryData,
         SimpleTransactionData,
         TransactionQueryData,
+        TxnStatusChangeState,
     },
     schema::{
         scalars::{
@@ -43,12 +49,10 @@ use fuel_core_storage::{
     Error as StorageError,
     Result as StorageResult,
 };
-use fuel_core_txpool::{
-    ports::MemoryPool,
-    service::TxStatusMessage,
-};
+use fuel_core_txpool::TxStatusMessage;
 use fuel_core_types::{
     fuel_tx::{
+        Bytes32,
         Cacheable,
         Transaction as FuelTx,
         UniqueIdentifier,
@@ -69,8 +73,8 @@ use futures::{
 };
 use itertools::Itertools;
 use std::{
+    borrow::Cow,
     iter,
-    sync::Arc,
 };
 use tokio_stream::StreamExt;
 use types::{
@@ -78,8 +82,6 @@ use types::{
     Transaction,
 };
 
-use super::scalars::U64;
-
 pub mod input;
 pub mod output;
 pub mod receipt;
@@ -101,7 +103,7 @@ impl TxQuery {
         let id = id.0;
         let txpool = ctx.data_unchecked::<TxPool>();
 
-        if let Some(transaction) = txpool.transaction(id) {
+        if let Some(transaction) = txpool.transaction(id).await? {
             Ok(Some(Transaction(transaction, id)))
         } else {
             query
@@ -111,10 +113,10 @@ impl TxQuery {
         }
     }
 
+    // We assume that each block has 100 transactions.
     #[graphql(complexity = "{\
-        QUERY_COSTS.storage_iterator\
-        + (QUERY_COSTS.storage_read + first.unwrap_or_default() as usize) * child_complexity \
-        + (QUERY_COSTS.storage_read + last.unwrap_or_default() as usize) * child_complexity\
+        (QUERY_COSTS.tx_get + child_complexity) \
+        * (first.unwrap_or_default() as usize + last.unwrap_or_default() as usize)
     }")]
     async fn transactions(
         &self,
@@ -227,6 +229,8 @@ impl TxQuery {
         ctx: &Context<'_>,
         tx: HexString,
     ) -> async_graphql::Result<Transaction> {
+        let query = ctx.read_view()?.into_owned();
+
         let mut tx = FuelTx::from_bytes(&tx.0)?;
 
         let params = ctx
@@ -238,7 +242,7 @@ impl TxQuery {
 
         let parameters = CheckPredicateParams::from(params.as_ref());
         let tx = tokio_rayon::spawn_fifo(move || {
-            let result = tx.estimate_predicates(&parameters, memory);
+            let result = tx.estimate_predicates(&parameters, memory, &query);
             result.map(|_| tx)
         })
         .await
@@ -328,11 +332,10 @@ impl TxMutation {
             .latest_consensus_params();
         let tx = FuelTx::from_bytes(&tx.0)?;
 
-        let _: Vec<_> = txpool
-            .insert(vec![Arc::new(tx.clone())])
+        txpool
+            .insert(tx.clone())
             .await
-            .into_iter()
-            .try_collect()?;
+            .map_err(|e| anyhow::anyhow!(e))?;
         let id = tx.id(&params.chain_id());
 
         let tx = Transaction(tx, id);
@@ -368,18 +371,12 @@ impl TxStatusSubscription {
         let rx = txpool.tx_update_subscribe(id.into())?;
         let query = ctx.read_view()?;
 
-        Ok(transaction_status_change(
-            move |id| match query.tx_status(&id) {
-                Ok(status) => Ok(Some(status)),
-                Err(StorageError::NotFound(_, _)) => Ok(txpool
-                    .submission_time(id)
-                    .map(|time| txpool::TransactionStatus::Submitted { time })),
-                Err(err) => Err(err),
-            },
-            rx,
-            id.into(),
+        let status_change_state = StatusChangeState { txpool, query };
+        Ok(
+            transaction_status_change(status_change_state, rx, id.into())
+                .await
+                .map_err(async_graphql::Error::from),
         )
-        .map_err(async_graphql::Error::from))
     }
 
     /// Submits transaction to the `TxPool` and await either confirmation or failure.
@@ -427,11 +424,7 @@ async fn submit_and_await_status<'a>(
     let tx_id = tx.id(&params.chain_id());
     let subscription = txpool.tx_update_subscribe(tx_id)?;
 
-    let _: Vec<_> = txpool
-        .insert(vec![Arc::new(tx)])
-        .await
-        .into_iter()
-        .try_collect()?;
+    txpool.insert(tx).await?;
 
     Ok(subscription
         .map(move |event| match event {
@@ -445,3 +438,26 @@ async fn submit_and_await_status<'a>(
         })
         .take(2))
 }
+
+struct StatusChangeState<'a> {
+    query: Cow<'a, ReadView>,
+    txpool: &'a TxPool,
+}
+
+impl<'a> TxnStatusChangeState for StatusChangeState<'a> {
+    async fn get_tx_status(
+        &self,
+        id: Bytes32,
+    ) -> StorageResult<Option<txpool::TransactionStatus>> {
+        match self.query.tx_status(&id) {
+            Ok(status) => Ok(Some(status)),
+            Err(StorageError::NotFound(_, _)) => Ok(self
+                .txpool
+                .submission_time(id)
+                .await
+                .map_err(|e| anyhow::anyhow!(e))?
+                .map(|time| txpool::TransactionStatus::Submitted { time })),
+            Err(err) => Err(err),
+        }
+    }
+}
diff --git a/crates/fuel-core/src/schema/tx/types.rs b/crates/fuel-core/src/schema/tx/types.rs
index 9496a5bda22..820271430e2 100644
--- a/crates/fuel-core/src/schema/tx/types.rs
+++ b/crates/fuel-core/src/schema/tx/types.rs
@@ -182,7 +182,7 @@ impl SuccessStatus {
         self.block_height.into()
     }
 
-    #[graphql(complexity = "QUERY_COSTS.storage_read + child_complexity")]
+    #[graphql(complexity = "QUERY_COSTS.block_header + child_complexity")]
     async fn block(&self, ctx: &Context<'_>) -> async_graphql::Result<Block> {
         let query = ctx.read_view()?;
         let block = query.block(&self.block_height)?;
@@ -238,7 +238,7 @@ impl FailureStatus {
         self.block_height.into()
     }
 
-    #[graphql(complexity = "QUERY_COSTS.storage_read + child_complexity")]
+    #[graphql(complexity = "QUERY_COSTS.block_header + child_complexity")]
     async fn block(&self, ctx: &Context<'_>) -> async_graphql::Result<Block> {
         let query = ctx.read_view()?;
         let block = query.block(&self.block_height)?;
@@ -693,7 +693,7 @@ impl Transaction {
         }
     }
 
-    #[graphql(complexity = "QUERY_COSTS.storage_read + child_complexity")]
+    #[graphql(complexity = "QUERY_COSTS.tx_status_read + child_complexity")]
     async fn status(
         &self,
         ctx: &Context<'_>,
@@ -701,7 +701,9 @@ impl Transaction {
         let id = self.1;
         let query = ctx.read_view()?;
         let txpool = ctx.data_unchecked::<TxPool>();
-        get_tx_status(id, query.as_ref(), txpool).map_err(Into::into)
+        get_tx_status(id, query.as_ref(), txpool)
+            .await
+            .map_err(Into::into)
     }
 
     async fn script(&self) -> Option<HexString> {
@@ -846,7 +848,7 @@ impl Transaction {
         }
     }
 
-    #[graphql(complexity = "QUERY_COSTS.raw_payload")]
+    #[graphql(complexity = "QUERY_COSTS.tx_raw_payload")]
     /// Return the transaction bytes using canonical encoding
     async fn raw_payload(&self) -> HexString {
         HexString(self.0.clone().to_bytes())
@@ -984,7 +986,7 @@ impl DryRunTransactionExecutionStatus {
 }
 
 #[tracing::instrument(level = "debug", skip(query, txpool), ret, err)]
-pub(crate) fn get_tx_status(
+pub(crate) async fn get_tx_status(
     id: fuel_core_types::fuel_types::Bytes32,
     query: &ReadView,
     txpool: &TxPool,
@@ -997,12 +999,18 @@ pub(crate) fn get_tx_status(
             let status = TransactionStatus::new(id, status);
             Ok(Some(status))
         }
-        None => match txpool.submission_time(id) {
-            Some(submitted_time) => Ok(Some(TransactionStatus::Submitted(
-                SubmittedStatus(submitted_time),
-            ))),
-            _ => Ok(None),
-        },
+        None => {
+            let submitted_time = txpool
+                .submission_time(id)
+                .await
+                .map_err(|e| StorageError::Other(anyhow::anyhow!(e)))?;
+            match submitted_time {
+                Some(submitted_time) => Ok(Some(TransactionStatus::Submitted(
+                    SubmittedStatus(submitted_time),
+                ))),
+                _ => Ok(None),
+            }
+        }
     }
 }
 
diff --git a/crates/fuel-core/src/schema/upgrades.rs b/crates/fuel-core/src/schema/upgrades.rs
index bda98240304..d9e62906a1e 100644
--- a/crates/fuel-core/src/schema/upgrades.rs
+++ b/crates/fuel-core/src/schema/upgrades.rs
@@ -74,6 +74,7 @@ impl StateTransitionBytecode {
         HexString(self.root.to_vec())
     }
 
+    #[graphql(complexity = "QUERY_COSTS.state_transition_bytecode_read")]
     async fn bytecode(
         &self,
         ctx: &Context<'_>,
diff --git a/crates/fuel-core/src/service/adapters.rs b/crates/fuel-core/src/service/adapters.rs
index 7c356611967..f55d4572335 100644
--- a/crates/fuel-core/src/service/adapters.rs
+++ b/crates/fuel-core/src/service/adapters.rs
@@ -10,6 +10,7 @@ use fuel_core_poa::{
 };
 use fuel_core_services::stream::BoxStream;
 use fuel_core_storage::transactional::Changes;
+use fuel_core_txpool::BorrowedTxPool;
 #[cfg(feature = "p2p")]
 use fuel_core_types::services::p2p::peer_reputation::AppScore;
 use fuel_core_types::{
@@ -18,7 +19,6 @@ use fuel_core_types::{
         consensus::Consensus,
     },
     fuel_tx::Transaction,
-    fuel_types::BlockHeight,
     services::{
         block_importer::SharedImportResult,
         block_producer::Components,
@@ -101,17 +101,16 @@ impl TxPoolAdapter {
     }
 }
 
-#[derive(Clone)]
 pub struct TransactionsSource {
-    txpool: TxPoolSharedState,
-    _block_height: BlockHeight,
+    tx_pool: BorrowedTxPool,
+    minimum_gas_price: u64,
 }
 
 impl TransactionsSource {
-    pub fn new(txpool: TxPoolSharedState, block_height: BlockHeight) -> Self {
+    pub fn new(minimum_gas_price: u64, tx_pool: BorrowedTxPool) -> Self {
         Self {
-            txpool,
-            _block_height: block_height,
+            tx_pool,
+            minimum_gas_price,
         }
     }
 }
diff --git a/crates/fuel-core/src/service/adapters/consensus_module/poa.rs b/crates/fuel-core/src/service/adapters/consensus_module/poa.rs
index adcd72d2d61..f3ebf270f91 100644
--- a/crates/fuel-core/src/service/adapters/consensus_module/poa.rs
+++ b/crates/fuel-core/src/service/adapters/consensus_module/poa.rs
@@ -26,18 +26,14 @@ use fuel_core_services::stream::BoxStream;
 use fuel_core_storage::transactional::Changes;
 use fuel_core_types::{
     blockchain::block::Block,
-    fuel_tx::TxId,
+    fuel_tx::Bytes32,
     fuel_types::BlockHeight,
     services::{
         block_importer::{
             BlockImportInfo,
             UncommittedResult as UncommittedImporterResult,
         },
-        executor::{
-            Error as ExecutorError,
-            UncommittedResult,
-        },
-        txpool::ArcPoolTx,
+        executor::UncommittedResult,
     },
     tai64::Tai64,
 };
@@ -45,6 +41,7 @@ use std::path::{
     Path,
     PathBuf,
 };
+use tokio::sync::watch;
 use tokio_stream::{
     wrappers::BroadcastStream,
     StreamExt,
@@ -81,27 +78,12 @@ impl ConsensusModulePort for PoAAdapter {
 }
 
 impl TransactionPool for TxPoolAdapter {
-    fn pending_number(&self) -> usize {
-        self.service.pending_number()
-    }
-
-    fn total_consumable_gas(&self) -> u64 {
-        self.service.total_consumable_gas()
-    }
-
-    fn remove_txs(&self, ids: Vec<(TxId, ExecutorError)>) -> Vec<ArcPoolTx> {
-        self.service.remove_txs(
-            ids.into_iter()
-                .map(|(tx_id, err)| (tx_id, err.to_string()))
-                .collect(),
-        )
+    fn new_txs_watcher(&self) -> watch::Receiver<()> {
+        self.service.get_new_txs_notifier()
     }
 
-    fn transaction_status_events(&self) -> BoxStream<TxId> {
-        Box::pin(
-            BroadcastStream::new(self.service.new_tx_notification_subscribe())
-                .filter_map(|result| result.ok()),
-        )
+    fn notify_skipped_txs(&self, tx_ids_and_reasons: Vec<(Bytes32, String)>) {
+        self.service.notify_skipped_txs(tx_ids_and_reasons)
     }
 }
 
diff --git a/crates/fuel-core/src/service/adapters/executor.rs b/crates/fuel-core/src/service/adapters/executor.rs
index 05d4400a1f4..663c219b001 100644
--- a/crates/fuel-core/src/service/adapters/executor.rs
+++ b/crates/fuel-core/src/service/adapters/executor.rs
@@ -3,10 +3,12 @@ use crate::{
     service::adapters::TransactionsSource,
 };
 use fuel_core_executor::ports::MaybeCheckedTransaction;
+use fuel_core_txpool::Constraints;
 use fuel_core_types::{
     blockchain::primitives::DaBlockHeight,
     services::relayer::Event,
 };
+use std::sync::Arc;
 
 impl fuel_core_executor::ports::TransactionsSource for TransactionsSource {
     fn next(
@@ -15,18 +17,19 @@ impl fuel_core_executor::ports::TransactionsSource for TransactionsSource {
         transactions_limit: u16,
         block_transaction_size_limit: u32,
     ) -> Vec<MaybeCheckedTransaction> {
-        self.txpool
-            .select_transactions(
-                gas_limit,
-                transactions_limit,
-                block_transaction_size_limit,
-            )
+        self.tx_pool
+            .exclusive_lock()
+            .extract_transactions_for_block(Constraints {
+                minimal_gas_price: self.minimum_gas_price,
+                max_gas: gas_limit,
+                maximum_txs: transactions_limit,
+                maximum_block_size: block_transaction_size_limit,
+            })
             .into_iter()
             .map(|tx| {
-                MaybeCheckedTransaction::CheckedTransaction(
-                    tx.as_ref().into(),
-                    tx.used_consensus_parameters_version(),
-                )
+                let transaction = Arc::unwrap_or_clone(tx);
+                let version = transaction.used_consensus_parameters_version();
+                MaybeCheckedTransaction::CheckedTransaction(transaction.into(), version)
             })
             .collect()
     }
diff --git a/crates/fuel-core/src/service/adapters/fuel_gas_price_provider.rs b/crates/fuel-core/src/service/adapters/fuel_gas_price_provider.rs
index c1d79e3d1f3..aeb17627ccf 100644
--- a/crates/fuel-core/src/service/adapters/fuel_gas_price_provider.rs
+++ b/crates/fuel-core/src/service/adapters/fuel_gas_price_provider.rs
@@ -5,10 +5,7 @@ use fuel_core_gas_price_service::common::gas_price_algorithm::{
 };
 
 use fuel_core_producer::block_producer::gas_price::GasPriceProvider as ProducerGasPriceProvider;
-use fuel_core_txpool::{
-    ports::GasPriceProvider as TxPoolGasPriceProvider,
-    Result as TxPoolResult,
-};
+use fuel_core_txpool::ports::GasPriceProvider as TxPoolGasPriceProvider;
 use fuel_core_types::fuel_types::BlockHeight;
 
 pub type Result<T, E = Error> = std::result::Result<T, E>;
@@ -54,8 +51,8 @@ impl<A> FuelGasPriceProvider<A>
 where
     A: GasPriceAlgorithm + Send + Sync,
 {
-    async fn next_gas_price(&self) -> u64 {
-        self.algorithm.next_gas_price().await
+    fn next_gas_price(&self) -> u64 {
+        self.algorithm.next_gas_price()
     }
 }
 
@@ -65,17 +62,16 @@ where
     A: GasPriceAlgorithm + Send + Sync,
 {
     async fn next_gas_price(&self) -> anyhow::Result<u64> {
-        Ok(self.next_gas_price().await)
+        Ok(self.next_gas_price())
     }
 }
 
-#[async_trait::async_trait]
 impl<A> TxPoolGasPriceProvider for FuelGasPriceProvider<A>
 where
-    A: GasPriceAlgorithm + Send + Sync,
+    A: GasPriceAlgorithm + Send + Sync + 'static,
 {
-    async fn next_gas_price(&self) -> TxPoolResult<u64> {
-        Ok(self.next_gas_price().await)
+    fn next_gas_price(&self) -> u64 {
+        self.next_gas_price()
     }
 }
 
diff --git a/crates/fuel-core/src/service/adapters/fuel_gas_price_provider/tests/producer_gas_price_tests.rs b/crates/fuel-core/src/service/adapters/fuel_gas_price_provider/tests/producer_gas_price_tests.rs
index 81429785248..d8929cb4fdf 100644
--- a/crates/fuel-core/src/service/adapters/fuel_gas_price_provider/tests/producer_gas_price_tests.rs
+++ b/crates/fuel-core/src/service/adapters/fuel_gas_price_provider/tests/producer_gas_price_tests.rs
@@ -13,7 +13,7 @@ async fn gas_price__if_requested_block_height_is_latest_return_gas_price() {
 
     // when
     let expected_price = algo.next_gas_price();
-    let actual_price = gas_price_provider.next_gas_price().await;
+    let actual_price = gas_price_provider.next_gas_price();
 
     // then
     assert_eq!(expected_price, actual_price);
diff --git a/crates/fuel-core/src/service/adapters/fuel_gas_price_provider/tests/tx_pool_gas_price_tests.rs b/crates/fuel-core/src/service/adapters/fuel_gas_price_provider/tests/tx_pool_gas_price_tests.rs
index 81429785248..d8929cb4fdf 100644
--- a/crates/fuel-core/src/service/adapters/fuel_gas_price_provider/tests/tx_pool_gas_price_tests.rs
+++ b/crates/fuel-core/src/service/adapters/fuel_gas_price_provider/tests/tx_pool_gas_price_tests.rs
@@ -13,7 +13,7 @@ async fn gas_price__if_requested_block_height_is_latest_return_gas_price() {
 
     // when
     let expected_price = algo.next_gas_price();
-    let actual_price = gas_price_provider.next_gas_price().await;
+    let actual_price = gas_price_provider.next_gas_price();
 
     // then
     assert_eq!(expected_price, actual_price);
diff --git a/crates/fuel-core/src/service/adapters/graphql_api.rs b/crates/fuel-core/src/service/adapters/graphql_api.rs
index 5c1ecd9c80b..ff96e484ed9 100644
--- a/crates/fuel-core/src/service/adapters/graphql_api.rs
+++ b/crates/fuel-core/src/service/adapters/graphql_api.rs
@@ -2,6 +2,7 @@ use super::{
     BlockImporterAdapter,
     BlockProducerAdapter,
     ConsensusParametersProvider,
+    SharedMemoryPool,
     StaticGasPrice,
 };
 use crate::{
@@ -15,19 +16,20 @@ use crate::{
         P2pPort,
         TxPoolPort,
     },
-    service::adapters::{
-        import_result_provider::ImportResultProvider,
-        P2PAdapter,
-        TxPoolAdapter,
+    graphql_api::ports::MemoryPool,
+    service::{
+        adapters::{
+            import_result_provider::ImportResultProvider,
+            P2PAdapter,
+            TxPoolAdapter,
+        },
+        vm_pool::MemoryFromPool,
     },
 };
 use async_trait::async_trait;
 use fuel_core_services::stream::BoxStream;
 use fuel_core_storage::Result as StorageResult;
-use fuel_core_txpool::{
-    service::TxStatusMessage,
-    types::TxId,
-};
+use fuel_core_txpool::TxStatusMessage;
 use fuel_core_types::{
     blockchain::header::ConsensusParametersVersion,
     entities::relayer::message::MerkleProof,
@@ -35,16 +37,14 @@ use fuel_core_types::{
         Bytes32,
         ConsensusParameters,
         Transaction,
+        TxId,
     },
     fuel_types::BlockHeight,
     services::{
         block_importer::SharedImportResult,
         executor::TransactionExecutionStatus,
         p2p::PeerInfo,
-        txpool::{
-            InsertionResult,
-            TransactionStatus,
-        },
+        txpool::TransactionStatus,
     },
     tai64::Tai64,
 };
@@ -58,28 +58,36 @@ mod on_chain;
 
 #[async_trait]
 impl TxPoolPort for TxPoolAdapter {
-    fn transaction(&self, id: TxId) -> Option<Transaction> {
-        self.service
+    async fn transaction(&self, id: TxId) -> anyhow::Result<Option<Transaction>> {
+        Ok(self
+            .service
             .find_one(id)
-            .map(|info| info.tx().clone().deref().into())
+            .await
+            .map_err(|e| anyhow::anyhow!(e))?
+            .map(|info| info.tx().clone().deref().into()))
     }
 
-    fn submission_time(&self, id: TxId) -> Option<Tai64> {
-        self.service
+    async fn submission_time(&self, id: TxId) -> anyhow::Result<Option<Tai64>> {
+        Ok(self
+            .service
             .find_one(id)
-            .map(|info| Tai64::from_unix(info.submitted_time().as_secs() as i64))
+            .await
+            .map_err(|e| anyhow::anyhow!(e))?
+            .map(|info| {
+                Tai64::from_unix(
+                    info.creation_instant()
+                        .duration_since(std::time::UNIX_EPOCH)
+                        .expect("Time can't be lower than 0")
+                        .as_secs() as i64,
+                )
+            }))
     }
 
-    async fn insert(
-        &self,
-        txs: Vec<Arc<Transaction>>,
-    ) -> Vec<anyhow::Result<InsertionResult>> {
+    async fn insert(&self, tx: Transaction) -> anyhow::Result<()> {
         self.service
-            .insert(txs)
+            .insert(tx)
             .await
-            .into_iter()
-            .map(|res| res.map_err(|e| anyhow::anyhow!(e)))
-            .collect()
+            .map_err(|e| anyhow::anyhow!(e))
     }
 
     fn tx_update_subscribe(
@@ -161,7 +169,7 @@ impl worker::TxPool for TxPoolAdapter {
         block_height: &BlockHeight,
         status: TransactionStatus,
     ) {
-        self.service.send_complete(id, block_height, status)
+        self.service.notify_complete_tx(id, block_height, status)
     }
 }
 
@@ -215,3 +223,12 @@ impl worker::BlockImporter for GraphQLBlockImporter {
         self.import_result_provider_adapter.result_at_height(height)
     }
 }
+
+#[async_trait::async_trait]
+impl MemoryPool for SharedMemoryPool {
+    type Memory = MemoryFromPool;
+
+    async fn get_memory(&self) -> Self::Memory {
+        self.memory_pool.take_raw().await
+    }
+}
diff --git a/crates/fuel-core/src/service/adapters/graphql_api/off_chain.rs b/crates/fuel-core/src/service/adapters/graphql_api/off_chain.rs
index fdd1d3183bc..d554c7ddc45 100644
--- a/crates/fuel-core/src/service/adapters/graphql_api/off_chain.rs
+++ b/crates/fuel-core/src/service/adapters/graphql_api/off_chain.rs
@@ -11,6 +11,7 @@ use crate::{
         },
         storage::{
             contracts::ContractsInfo,
+            da_compression::DaCompressedBlocks,
             relayed_transactions::RelayedTransactionStatuses,
             transactions::OwnedTransactionIndexCursor,
         },
@@ -22,13 +23,17 @@ use crate::{
     },
 };
 use fuel_core_storage::{
+    blueprint::BlueprintInspect,
+    codec::Encode,
     iter::{
         BoxedIter,
         IntoBoxedIter,
         IterDirection,
         IteratorOverTable,
     },
+    kv_store::KeyValueInspect,
     not_found,
+    structured_storage::TableWithBlueprint,
     transactional::{
         IntoTransaction,
         StorageTransaction,
@@ -37,10 +42,6 @@ use fuel_core_storage::{
     Result as StorageResult,
     StorageAsRef,
 };
-use fuel_core_txpool::types::{
-    ContractId,
-    TxId,
-};
 use fuel_core_types::{
     blockchain::{
         block::CompressedBlock,
@@ -51,8 +52,10 @@ use fuel_core_types::{
     fuel_tx::{
         Address,
         Bytes32,
+        ContractId,
         Salt,
         Transaction,
+        TxId,
         TxPointer,
         UtxoId,
     },
@@ -69,6 +72,19 @@ impl OffChainDatabase for OffChainIterableKeyValueView {
             .and_then(|height| height.ok_or(not_found!("BlockHeight")))
     }
 
+    fn da_compressed_block(&self, height: &BlockHeight) -> StorageResult<Vec<u8>> {
+        let column = <DaCompressedBlocks as TableWithBlueprint>::column();
+        let encoder =
+            <<DaCompressedBlocks as TableWithBlueprint>::Blueprint as BlueprintInspect<
+                DaCompressedBlocks,
+                Self,
+            >>::KeyCodec::encode(height);
+
+        self.get(encoder.as_ref(), column)?
+            .ok_or_else(|| not_found!(DaCompressedBlocks))
+            .map(|value| value.as_ref().clone())
+    }
+
     fn tx_status(&self, tx_id: &TxId) -> StorageResult<TransactionStatus> {
         self.get_tx_status(tx_id)
             .transpose()
diff --git a/crates/fuel-core/src/service/adapters/graphql_api/on_chain.rs b/crates/fuel-core/src/service/adapters/graphql_api/on_chain.rs
index 76532a8d718..b3a6d860e76 100644
--- a/crates/fuel-core/src/service/adapters/graphql_api/on_chain.rs
+++ b/crates/fuel-core/src/service/adapters/graphql_api/on_chain.rs
@@ -30,10 +30,6 @@ use fuel_core_storage::{
     Result as StorageResult,
     StorageAsRef,
 };
-use fuel_core_txpool::types::{
-    ContractId,
-    TxId,
-};
 use fuel_core_types::{
     blockchain::{
         block::CompressedBlock,
@@ -43,7 +39,9 @@ use fuel_core_types::{
     entities::relayer::message::Message,
     fuel_tx::{
         AssetId,
+        ContractId,
         Transaction,
+        TxId,
     },
     fuel_types::{
         BlockHeight,
diff --git a/crates/fuel-core/src/service/adapters/p2p.rs b/crates/fuel-core/src/service/adapters/p2p.rs
index db3545c095b..a01fde29430 100644
--- a/crates/fuel-core/src/service/adapters/p2p.rs
+++ b/crates/fuel-core/src/service/adapters/p2p.rs
@@ -10,12 +10,12 @@ use fuel_core_p2p::ports::{
 };
 use fuel_core_services::stream::BoxStream;
 use fuel_core_storage::Result as StorageResult;
-use fuel_core_txpool::types::TxId;
 use fuel_core_types::{
     blockchain::{
         consensus::Genesis,
         SealedBlockHeader,
     },
+    fuel_tx::TxId,
     fuel_types::BlockHeight,
     services::p2p::{
         NetworkableTransactionPool,
@@ -59,19 +59,28 @@ impl BlockHeightImporter for BlockImporterAdapter {
 }
 
 impl TxPool for TxPoolAdapter {
-    fn get_tx_ids(&self, max_txs: usize) -> Vec<TxId> {
-        self.service.get_tx_ids(max_txs)
+    async fn get_tx_ids(&self, max_txs: usize) -> anyhow::Result<Vec<TxId>> {
+        self.service
+            .get_tx_ids(max_txs)
+            .await
+            .map_err(|e| anyhow::anyhow!(e))
     }
 
-    fn get_full_txs(&self, tx_ids: Vec<TxId>) -> Vec<Option<NetworkableTransactionPool>> {
-        self.service
+    async fn get_full_txs(
+        &self,
+        tx_ids: Vec<TxId>,
+    ) -> anyhow::Result<Vec<Option<NetworkableTransactionPool>>> {
+        Ok(self
+            .service
             .find(tx_ids)
+            .await
+            .map_err(|e| anyhow::anyhow!(e))?
             .into_iter()
             .map(|tx_info| {
                 tx_info.map(|tx| {
                     NetworkableTransactionPool::PoolTransaction(tx.tx().clone())
                 })
             })
-            .collect()
+            .collect())
     }
 }
diff --git a/crates/fuel-core/src/service/adapters/producer.rs b/crates/fuel-core/src/service/adapters/producer.rs
index d7ac7590106..7a977f69228 100644
--- a/crates/fuel-core/src/service/adapters/producer.rs
+++ b/crates/fuel-core/src/service/adapters/producer.rs
@@ -78,12 +78,21 @@ impl BlockProducerAdapter {
     }
 }
 
-#[async_trait::async_trait]
 impl TxPool for TxPoolAdapter {
     type TxSource = TransactionsSource;
 
-    fn get_source(&self, block_height: BlockHeight) -> Self::TxSource {
-        TransactionsSource::new(self.service.clone(), block_height)
+    async fn get_source(
+        &self,
+        gas_price: u64,
+        _: BlockHeight,
+    ) -> anyhow::Result<Self::TxSource> {
+        let tx_pool = self
+            .service
+            .borrow_txpool()
+            .await
+            .map_err(|e| anyhow::anyhow!(e))?;
+
+        Ok(TransactionsSource::new(gas_price, tx_pool))
     }
 }
 
diff --git a/crates/fuel-core/src/service/adapters/txpool.rs b/crates/fuel-core/src/service/adapters/txpool.rs
index 97ff57fb200..f88d5ca44d4 100644
--- a/crates/fuel-core/src/service/adapters/txpool.rs
+++ b/crates/fuel-core/src/service/adapters/txpool.rs
@@ -1,14 +1,10 @@
 use crate::{
     database::OnChainIterableKeyValueView,
-    service::{
-        adapters::{
-            BlockImporterAdapter,
-            ConsensusParametersProvider,
-            P2PAdapter,
-            SharedMemoryPool,
-            StaticGasPrice,
-        },
-        vm_pool::MemoryFromPool,
+    service::adapters::{
+        BlockImporterAdapter,
+        ConsensusParametersProvider,
+        P2PAdapter,
+        StaticGasPrice,
     },
 };
 use fuel_core_services::stream::BoxStream;
@@ -21,15 +17,10 @@ use fuel_core_storage::{
     Result as StorageResult,
     StorageAsRef,
 };
-use fuel_core_txpool::{
-    ports::{
-        BlockImporter,
-        ConsensusParametersProvider as ConsensusParametersProviderTrait,
-        GasPriceProvider,
-        MemoryPool,
-    },
-    types::TxId,
-    Result as TxPoolResult,
+use fuel_core_txpool::ports::{
+    BlockImporter,
+    ConsensusParametersProvider as ConsensusParametersProviderTrait,
+    GasPriceProvider,
 };
 use fuel_core_types::{
     blockchain::header::ConsensusParametersVersion,
@@ -41,6 +32,7 @@ use fuel_core_types::{
         BlobId,
         ConsensusParameters,
         Transaction,
+        TxId,
         UtxoId,
     },
     fuel_types::{
@@ -68,9 +60,7 @@ impl BlockImporter for BlockImporterAdapter {
 
 #[cfg(feature = "p2p")]
 #[async_trait::async_trait]
-impl fuel_core_txpool::ports::PeerToPeer for P2PAdapter {
-    type GossipedTransaction = TransactionGossipData;
-
+impl fuel_core_txpool::ports::NotifyP2P for P2PAdapter {
     fn broadcast_transaction(&self, transaction: Arc<Transaction>) -> anyhow::Result<()> {
         if let Some(service) = &self.service {
             service.broadcast_transaction(transaction)
@@ -79,6 +69,23 @@ impl fuel_core_txpool::ports::PeerToPeer for P2PAdapter {
         }
     }
 
+    fn notify_gossip_transaction_validity(
+        &self,
+        message_info: GossipsubMessageInfo,
+        validity: GossipsubMessageAcceptance,
+    ) -> anyhow::Result<()> {
+        if let Some(service) = &self.service {
+            service.notify_gossip_transaction_validity(message_info, validity)
+        } else {
+            Ok(())
+        }
+    }
+}
+
+#[cfg(feature = "p2p")]
+impl fuel_core_txpool::ports::P2PSubscriptions for P2PAdapter {
+    type GossipedTransaction = TransactionGossipData;
+
     fn gossiped_transaction_events(&self) -> BoxStream<Self::GossipedTransaction> {
         use tokio_stream::{
             wrappers::BroadcastStream,
@@ -108,19 +115,11 @@ impl fuel_core_txpool::ports::PeerToPeer for P2PAdapter {
             Box::pin(fuel_core_services::stream::pending())
         }
     }
+}
 
-    fn notify_gossip_transaction_validity(
-        &self,
-        message_info: GossipsubMessageInfo,
-        validity: GossipsubMessageAcceptance,
-    ) -> anyhow::Result<()> {
-        if let Some(service) = &self.service {
-            service.notify_gossip_transaction_validity(message_info, validity)
-        } else {
-            Ok(())
-        }
-    }
-
+#[cfg(feature = "p2p")]
+#[async_trait::async_trait]
+impl fuel_core_txpool::ports::P2PRequests for P2PAdapter {
     async fn request_tx_ids(&self, peer_id: PeerId) -> anyhow::Result<Vec<TxId>> {
         if let Some(service) = &self.service {
             service.get_all_transactions_ids_from_peer(peer_id).await
@@ -145,47 +144,54 @@ impl fuel_core_txpool::ports::PeerToPeer for P2PAdapter {
 }
 
 #[cfg(not(feature = "p2p"))]
-#[async_trait::async_trait]
-impl fuel_core_txpool::ports::PeerToPeer for P2PAdapter {
-    type GossipedTransaction = TransactionGossipData;
+const _: () = {
+    #[async_trait::async_trait]
+    impl fuel_core_txpool::ports::NotifyP2P for P2PAdapter {
+        fn broadcast_transaction(
+            &self,
+            _transaction: Arc<Transaction>,
+        ) -> anyhow::Result<()> {
+            Ok(())
+        }
 
-    fn broadcast_transaction(
-        &self,
-        _transaction: Arc<Transaction>,
-    ) -> anyhow::Result<()> {
-        Ok(())
+        fn notify_gossip_transaction_validity(
+            &self,
+            _message_info: GossipsubMessageInfo,
+            _validity: GossipsubMessageAcceptance,
+        ) -> anyhow::Result<()> {
+            Ok(())
+        }
     }
 
-    fn gossiped_transaction_events(&self) -> BoxStream<Self::GossipedTransaction> {
-        Box::pin(fuel_core_services::stream::pending())
-    }
+    impl fuel_core_txpool::ports::P2PSubscriptions for P2PAdapter {
+        type GossipedTransaction = TransactionGossipData;
 
-    fn notify_gossip_transaction_validity(
-        &self,
-        _message_info: GossipsubMessageInfo,
-        _validity: GossipsubMessageAcceptance,
-    ) -> anyhow::Result<()> {
-        Ok(())
-    }
+        fn gossiped_transaction_events(&self) -> BoxStream<Self::GossipedTransaction> {
+            Box::pin(fuel_core_services::stream::pending())
+        }
 
-    fn subscribe_new_peers(&self) -> BoxStream<PeerId> {
-        Box::pin(fuel_core_services::stream::pending())
+        fn subscribe_new_peers(&self) -> BoxStream<PeerId> {
+            Box::pin(fuel_core_services::stream::pending())
+        }
     }
 
-    async fn request_tx_ids(&self, _peer_id: PeerId) -> anyhow::Result<Vec<TxId>> {
-        Ok(vec![])
-    }
+    #[async_trait::async_trait]
+    impl fuel_core_txpool::ports::P2PRequests for P2PAdapter {
+        async fn request_tx_ids(&self, _peer_id: PeerId) -> anyhow::Result<Vec<TxId>> {
+            Ok(vec![])
+        }
 
-    async fn request_txs(
-        &self,
-        _peer_id: PeerId,
-        _tx_ids: Vec<TxId>,
-    ) -> anyhow::Result<Vec<Option<Transaction>>> {
-        Ok(vec![])
+        async fn request_txs(
+            &self,
+            _peer_id: PeerId,
+            _tx_ids: Vec<TxId>,
+        ) -> anyhow::Result<Vec<Option<Transaction>>> {
+            Ok(vec![])
+        }
     }
-}
+};
 
-impl fuel_core_txpool::ports::TxPoolDb for OnChainIterableKeyValueView {
+impl fuel_core_txpool::ports::TxPoolPersistentStorage for OnChainIterableKeyValueView {
     fn utxo(&self, utxo_id: &UtxoId) -> StorageResult<Option<CompressedCoin>> {
         self.storage::<Coins>()
             .get(utxo_id)
@@ -209,8 +215,8 @@ impl fuel_core_txpool::ports::TxPoolDb for OnChainIterableKeyValueView {
 
 #[async_trait::async_trait]
 impl GasPriceProvider for StaticGasPrice {
-    async fn next_gas_price(&self) -> TxPoolResult<u64> {
-        Ok(self.gas_price)
+    fn next_gas_price(&self) -> u64 {
+        self.gas_price
     }
 }
 
@@ -221,12 +227,3 @@ impl ConsensusParametersProviderTrait for ConsensusParametersProvider {
         self.shared_state.latest_consensus_parameters_with_version()
     }
 }
-
-#[async_trait::async_trait]
-impl MemoryPool for SharedMemoryPool {
-    type Memory = MemoryFromPool;
-
-    async fn get_memory(&self) -> Self::Memory {
-        self.memory_pool.take_raw().await
-    }
-}
diff --git a/crates/fuel-core/src/service/config.rs b/crates/fuel-core/src/service/config.rs
index 092909929a1..8e17d417e85 100644
--- a/crates/fuel-core/src/service/config.rs
+++ b/crates/fuel-core/src/service/config.rs
@@ -27,11 +27,15 @@ use fuel_core_p2p::config::{
 pub use fuel_core_poa::Trigger;
 #[cfg(feature = "relayer")]
 use fuel_core_relayer::Config as RelayerConfig;
+use fuel_core_txpool::config::Config as TxPoolConfig;
 use fuel_core_types::blockchain::header::StateTransitionBytecodeVersion;
 
 use crate::{
     combined_database::CombinedDatabaseConfig,
-    graphql_api::ServiceConfig as GraphQLConfig,
+    graphql_api::{
+        worker_service::DaCompressionConfig,
+        ServiceConfig as GraphQLConfig,
+    },
 };
 
 #[derive(Clone, Debug)]
@@ -51,12 +55,13 @@ pub struct Config {
     pub block_production: Trigger,
     pub predefined_blocks_path: Option<PathBuf>,
     pub vm: VMConfig,
-    pub txpool: fuel_core_txpool::Config,
+    pub txpool: TxPoolConfig,
     pub block_producer: fuel_core_producer::Config,
     pub starting_gas_price: u64,
     pub gas_price_change_percent: u64,
     pub min_gas_price: u64,
     pub gas_price_threshold_percent: u64,
+    pub da_compression: DaCompressionConfig,
     pub block_importer: fuel_core_importer::Config,
     #[cfg(feature = "relayer")]
     pub relayer: Option<RelayerConfig>,
@@ -134,8 +139,10 @@ impl Config {
                     0,
                 ),
                 max_queries_depth: 16,
-                max_queries_complexity: 20000,
+                max_queries_complexity: 80000,
                 max_queries_recursive_depth: 16,
+                max_queries_directives: 10,
+                max_concurrent_queries: 1024,
                 request_body_bytes_limit: 16 * 1024 * 1024,
                 query_log_threshold_time: Duration::from_secs(2),
                 api_request_timeout: Duration::from_secs(60),
@@ -149,14 +156,15 @@ impl Config {
             block_production: Trigger::Instant,
             predefined_blocks_path: None,
             vm: Default::default(),
-            txpool: fuel_core_txpool::Config {
+            txpool: TxPoolConfig {
                 utxo_validation,
-                transaction_ttl: Duration::from_secs(60 * 100000000),
-                ..fuel_core_txpool::Config::default()
+                max_txs_ttl: Duration::from_secs(60 * 100000000),
+                ..Default::default()
             },
             block_producer: fuel_core_producer::Config {
                 ..Default::default()
             },
+            da_compression: DaCompressionConfig::Disabled,
             starting_gas_price,
             gas_price_change_percent,
             min_gas_price,
diff --git a/crates/fuel-core/src/service/query.rs b/crates/fuel-core/src/service/query.rs
index 9bf0c3823ea..f82f0f9679a 100644
--- a/crates/fuel-core/src/service/query.rs
+++ b/crates/fuel-core/src/service/query.rs
@@ -1,21 +1,25 @@
 //! Queries we can run directly on `FuelService`.
-use std::sync::Arc;
-
+use fuel_core_storage::Result as StorageResult;
 use fuel_core_types::{
     fuel_tx::{
         Transaction,
         UniqueIdentifier,
     },
     fuel_types::Bytes32,
-    services::txpool::InsertionResult,
+    services::txpool::TransactionStatus as TxPoolTxStatus,
 };
 use futures::{
     Stream,
     StreamExt,
 };
+use std::time::SystemTimeError;
 
 use crate::{
-    query::transaction_status_change,
+    database::OffChainIterableKeyValueView,
+    query::{
+        transaction_status_change,
+        TxnStatusChangeState,
+    },
     schema::tx::types::TransactionStatus,
 };
 
@@ -23,26 +27,19 @@ use super::*;
 
 impl FuelService {
     /// Submit a transaction to the txpool.
-    pub async fn submit(&self, tx: Transaction) -> anyhow::Result<InsertionResult> {
-        let results: Vec<_> = self
-            .shared
+    pub async fn submit(&self, tx: Transaction) -> anyhow::Result<()> {
+        self.shared
             .txpool_shared_state
-            .insert(vec![Arc::new(tx)])
+            .insert(tx)
             .await
-            .into_iter()
-            .collect::<Result<_, _>>()
-            .map_err(|e| anyhow::anyhow!(e))?;
-        results
-            .into_iter()
-            .next()
-            .ok_or_else(|| anyhow::anyhow!("Nothing was inserted"))
+            .map_err(|e| anyhow::anyhow!(e))
     }
 
     /// Submit a transaction to the txpool and return a stream of status changes.
     pub async fn submit_and_status_change(
         &self,
         tx: Transaction,
-    ) -> anyhow::Result<impl Stream<Item = anyhow::Result<TransactionStatus>>> {
+    ) -> anyhow::Result<impl Stream<Item = anyhow::Result<TransactionStatus>> + '_> {
         let id = tx.id(&self
             .shared
             .config
@@ -50,7 +47,7 @@ impl FuelService {
             .chain_config()
             .consensus_parameters
             .chain_id());
-        let stream = self.transaction_status_change(id)?;
+        let stream = self.transaction_status_change(id).await?;
         self.submit(tx).await?;
         Ok(stream)
     }
@@ -67,7 +64,7 @@ impl FuelService {
             .chain_config()
             .consensus_parameters
             .chain_id());
-        let stream = self.transaction_status_change(id)?.filter(|status| {
+        let stream = self.transaction_status_change(id).await?.filter(|status| {
             futures::future::ready(!matches!(status, Ok(TransactionStatus::Submitted(_))))
         });
         futures::pin_mut!(stream);
@@ -79,20 +76,39 @@ impl FuelService {
     }
 
     /// Return a stream of status changes for a transaction.
-    pub fn transaction_status_change(
+    pub async fn transaction_status_change(
         &self,
         id: Bytes32,
-    ) -> anyhow::Result<impl Stream<Item = anyhow::Result<TransactionStatus>>> {
-        let txpool = self.shared.txpool_shared_state.clone();
+    ) -> anyhow::Result<impl Stream<Item = anyhow::Result<TransactionStatus>> + '_> {
+        let txpool = &self.shared.txpool_shared_state;
         let db = self.shared.database.off_chain().latest_view()?;
         let rx = txpool.tx_update_subscribe(id)?;
-        Ok(transaction_status_change(
-            move |id| match db.get_tx_status(&id)? {
-                Some(status) => Ok(Some(status)),
-                None => Ok(txpool.find_one(id).map(Into::into)),
-            },
-            rx,
-            id,
-        ))
+        let state = StatusChangeState { db, txpool };
+        Ok(transaction_status_change(state, rx, id).await)
+    }
+}
+
+struct StatusChangeState<'a> {
+    db: OffChainIterableKeyValueView,
+    txpool: &'a TxPoolSharedState,
+}
+
+impl<'a> TxnStatusChangeState for StatusChangeState<'a> {
+    async fn get_tx_status(&self, id: Bytes32) -> StorageResult<Option<TxPoolTxStatus>> {
+        match self.db.get_tx_status(&id)? {
+            Some(status) => Ok(Some(status)),
+            None => {
+                let result = self
+                    .txpool
+                    .find_one(id)
+                    .await
+                    .map_err(|e| anyhow::anyhow!(e))?;
+                let status = result
+                    .map(|status| status.try_into())
+                    .transpose()
+                    .map_err(|e: SystemTimeError| anyhow::anyhow!(e))?;
+                Ok(status)
+            }
+        }
     }
 }
diff --git a/crates/fuel-core/src/service/sub_services.rs b/crates/fuel-core/src/service/sub_services.rs
index 93686950f21..13c9f6a9d01 100644
--- a/crates/fuel-core/src/service/sub_services.rs
+++ b/crates/fuel-core/src/service/sub_services.rs
@@ -65,14 +65,7 @@ pub type PoAService = fuel_core_poa::Service<
 >;
 #[cfg(feature = "p2p")]
 pub type P2PService = fuel_core_p2p::service::Service<Database, TxPoolAdapter>;
-pub type TxPoolSharedState = fuel_core_txpool::service::SharedState<
-    P2PAdapter,
-    Database,
-    ExecutorAdapter,
-    FuelGasPriceProvider<AlgorithmV0>,
-    ConsensusParametersProvider,
-    SharedMemoryPool,
->;
+pub type TxPoolSharedState = fuel_core_txpool::SharedState;
 pub type BlockProducerService = fuel_core_producer::block_producer::Producer<
     Database,
     TxPoolAdapter,
@@ -201,15 +194,15 @@ pub fn init_sub_services(
     let gas_price_provider =
         FuelGasPriceProvider::new(gas_price_service_v0.shared.clone());
     let txpool = fuel_core_txpool::new_service(
+        chain_id,
         config.txpool.clone(),
-        database.on_chain().clone(),
-        importer_adapter.clone(),
         p2p_adapter.clone(),
-        executor.clone(),
+        importer_adapter.clone(),
+        database.on_chain().clone(),
+        consensus_parameters_provider.clone(),
         last_height,
         gas_price_provider.clone(),
-        consensus_parameters_provider.clone(),
-        SharedMemoryPool::new(config.memory_pool_size),
+        executor.clone(),
     );
     let tx_pool_adapter = TxPoolAdapter::new(txpool.shared.clone());
 
@@ -289,6 +282,7 @@ pub fn init_sub_services(
         database.on_chain().clone(),
         database.off_chain().clone(),
         chain_id,
+        config.da_compression.clone(),
         config.continue_on_error,
     );
 
@@ -297,8 +291,8 @@ pub fn init_sub_services(
         utxo_validation: config.utxo_validation,
         debug: config.debug,
         vm_backtrace: config.vm.backtrace,
-        max_tx: config.txpool.max_tx,
-        max_txpool_depth: config.txpool.max_depth,
+        max_tx: config.txpool.pool_limits.max_txs,
+        max_txpool_dependency_chain_length: config.txpool.max_txs_chain_count,
         chain_name,
     };
 
diff --git a/crates/fuel-core/src/state.rs b/crates/fuel-core/src/state.rs
index 5f1626e827d..06ee176c652 100644
--- a/crates/fuel-core/src/state.rs
+++ b/crates/fuel-core/src/state.rs
@@ -8,18 +8,10 @@ use crate::{
 };
 use fuel_core_storage::{
     iter::{
-        BoxedIter,
-        IntoBoxedIter,
         IterDirection,
         IterableStore,
     },
-    kv_store::{
-        KVItem,
-        KeyValueInspect,
-        StorageColumn,
-        Value,
-        WriteOperation,
-    },
+    kv_store::StorageColumn,
     transactional::Changes,
     Result as StorageResult,
 };
@@ -99,88 +91,3 @@ where
         unimplemented!()
     }
 }
-
-/// A type that allows to iterate over the `Changes`.
-pub struct ChangesIterator<'a, Description> {
-    changes: &'a Changes,
-    _marker: core::marker::PhantomData<Description>,
-}
-
-impl<'a, Description> ChangesIterator<'a, Description> {
-    /// Creates a new instance of the `ChangesIterator`.
-    pub fn new(changes: &'a Changes) -> Self {
-        Self {
-            changes,
-            _marker: Default::default(),
-        }
-    }
-}
-
-impl<'a, Description> KeyValueInspect for ChangesIterator<'a, Description>
-where
-    Description: DatabaseDescription,
-{
-    type Column = Description::Column;
-
-    fn get(&self, key: &[u8], column: Self::Column) -> StorageResult<Option<Value>> {
-        Ok(self
-            .changes
-            .get(&column.id())
-            .and_then(|tree| tree.get(key))
-            .and_then(|operation| match operation {
-                WriteOperation::Insert(value) => Some(value.clone()),
-                WriteOperation::Remove => None,
-            }))
-    }
-}
-
-impl<'a, Description> IterableStore for ChangesIterator<'a, Description>
-where
-    Description: DatabaseDescription,
-{
-    fn iter_store(
-        &self,
-        column: Self::Column,
-        prefix: Option<&[u8]>,
-        start: Option<&[u8]>,
-        direction: IterDirection,
-    ) -> BoxedIter<KVItem> {
-        if let Some(tree) = self.changes.get(&column.id()) {
-            fuel_core_storage::iter::iterator(tree, prefix, start, direction)
-                .filter_map(|(key, value)| match value {
-                    WriteOperation::Insert(value) => {
-                        Some((key.clone().into(), value.clone()))
-                    }
-                    WriteOperation::Remove => None,
-                })
-                .map(Ok)
-                .into_boxed()
-        } else {
-            core::iter::empty().into_boxed()
-        }
-    }
-
-    fn iter_store_keys(
-        &self,
-        column: Self::Column,
-        prefix: Option<&[u8]>,
-        start: Option<&[u8]>,
-        direction: IterDirection,
-    ) -> BoxedIter<fuel_core_storage::kv_store::KeyItem> {
-        // We cannot define iter_store_keys appropriately for the `ChangesIterator`,
-        // because we have to filter out the keys that were removed, which are
-        // marked as `WriteOperation::Remove` in the value
-        // copied as-is from the above function, but only to return keys
-        if let Some(tree) = self.changes.get(&column.id()) {
-            fuel_core_storage::iter::iterator(tree, prefix, start, direction)
-                .filter_map(|(key, value)| match value {
-                    WriteOperation::Insert(_) => Some(key.clone().into()),
-                    WriteOperation::Remove => None,
-                })
-                .map(Ok)
-                .into_boxed()
-        } else {
-            core::iter::empty().into_boxed()
-        }
-    }
-}
diff --git a/crates/fuel-core/src/state/generic_database.rs b/crates/fuel-core/src/state/generic_database.rs
index bbf42e40038..8306df1b1fb 100644
--- a/crates/fuel-core/src/state/generic_database.rs
+++ b/crates/fuel-core/src/state/generic_database.rs
@@ -10,17 +10,22 @@ use fuel_core_storage::{
         Value,
     },
     structured_storage::StructuredStorage,
+    tables::BlobData,
     Error as StorageError,
     Mappable,
     MerkleRoot,
     MerkleRootStorage,
+    PredicateStorageRequirements,
     Result as StorageResult,
     StorageAsRef,
     StorageInspect,
     StorageRead,
     StorageSize,
 };
-use std::borrow::Cow;
+use std::{
+    borrow::Cow,
+    fmt::Debug,
+};
 
 #[derive(Debug, Clone)]
 pub struct GenericDatabase<Storage> {
@@ -176,3 +181,13 @@ impl<Storage> core::ops::DerefMut for GenericDatabase<Storage> {
         self.as_mut()
     }
 }
+
+impl<Storage, Error> PredicateStorageRequirements for GenericDatabase<Storage>
+where
+    Self: StorageRead<BlobData, Error = Error>,
+    Error: Debug,
+{
+    fn storage_error_to_string(error: Error) -> String {
+        format!("{:?}", error)
+    }
+}
diff --git a/crates/fuel-gas-price-algorithm/gas-price-analysis/src/charts.rs b/crates/fuel-gas-price-algorithm/gas-price-analysis/src/charts.rs
index 32194a716a2..6b4c82f09ff 100644
--- a/crates/fuel-gas-price-algorithm/gas-price-analysis/src/charts.rs
+++ b/crates/fuel-gas-price-algorithm/gas-price-analysis/src/charts.rs
@@ -307,10 +307,10 @@ pub fn draw_profit(
         .x_label_area_size(40)
         .y_label_area_size(100)
         .right_y_label_area_size(100)
-        .build_cartesian_2d(0..actual_profit_gwei.len(), min..max)
+        .build_cartesian_2d(0..projected_profit.len(), min..max)
         .unwrap()
         .set_secondary_coord(
-            0..actual_profit_gwei.len(),
+            0..projected_profit.len(),
             0..*pessimistic_block_costs_gwei.iter().max().unwrap(),
         );
 
diff --git a/crates/fuel-gas-price-algorithm/gas-price-analysis/src/simulation.rs b/crates/fuel-gas-price-algorithm/gas-price-analysis/src/simulation.rs
index 6ad906cc41f..94d7c06faa3 100644
--- a/crates/fuel-gas-price-algorithm/gas-price-analysis/src/simulation.rs
+++ b/crates/fuel-gas-price-algorithm/gas-price-analysis/src/simulation.rs
@@ -1,10 +1,10 @@
-use fuel_gas_price_algorithm::v1::{
-    AlgorithmUpdaterV1,
-    RecordedBlock,
-};
-use std::num::NonZeroU64;
-
 use super::*;
+use fuel_gas_price_algorithm::v1::AlgorithmUpdaterV1;
+use std::{
+    collections::BTreeMap,
+    num::NonZeroU64,
+    ops::Range,
+};
 
 pub mod da_cost_per_byte;
 
@@ -24,6 +24,13 @@ pub struct Simulator {
     da_cost_per_byte: Vec<u64>,
 }
 
+// (usize, ((u64, u64), &'a Option<(Range<u32>, u128)
+struct BlockData {
+    fullness: u64,
+    bytes: u64,
+    maybe_da_block: Option<(Range<u32>, u128)>,
+}
+
 impl Simulator {
     pub fn new(da_cost_per_byte: Vec<u64>) -> Self {
         Simulator { da_cost_per_byte }
@@ -49,7 +56,14 @@ impl Simulator {
             &fullness_and_bytes,
         );
 
-        let blocks = l2_blocks.zip(da_blocks.iter()).enumerate();
+        let blocks = l2_blocks
+            .zip(da_blocks.iter())
+            .map(|((fullness, bytes), maybe_da_block)| BlockData {
+                fullness,
+                bytes,
+                maybe_da_block: maybe_da_block.clone(),
+            })
+            .enumerate();
 
         let updater = self.build_updater(da_p_component, da_d_component);
 
@@ -90,7 +104,7 @@ impl Simulator {
             latest_da_cost_per_byte: 0,
             projected_total_da_cost: 0,
             latest_known_total_da_cost_excess: 0,
-            unrecorded_blocks: vec![],
+            unrecorded_blocks: BTreeMap::new(),
             da_p_component,
             da_d_component,
             last_profit: 0,
@@ -104,8 +118,7 @@ impl Simulator {
         capacity: u64,
         max_block_bytes: u64,
         fullness_and_bytes: Vec<(u64, u64)>,
-        // blocks: Enumerate<Zip<Iter<(u64, u64)>, Iter<Option<Vec<RecordedBlock>>>>>,
-        blocks: impl Iterator<Item = (usize, ((u64, u64), &'a Option<Vec<RecordedBlock>>))>,
+        blocks: impl Iterator<Item = (usize, BlockData)>,
         mut updater: AlgorithmUpdaterV1,
     ) -> SimulationResults {
         let mut gas_prices = vec![];
@@ -115,13 +128,18 @@ impl Simulator {
         let mut projected_cost_totals = vec![];
         let mut actual_costs = vec![];
         let mut pessimistic_costs = vec![];
-        for (index, ((fullness, bytes), da_block)) in blocks {
+        for (index, block_data) in blocks {
+            let BlockData {
+                fullness,
+                bytes,
+                maybe_da_block: da_block,
+            } = block_data;
             let height = index as u32 + 1;
             exec_gas_prices.push(updater.new_scaled_exec_price);
             da_gas_prices.push(updater.new_scaled_da_gas_price);
             let gas_price = updater.algorithm().calculate();
             gas_prices.push(gas_price);
-            let total_fee = gas_price * fullness;
+            let total_fee = gas_price as u128 * fullness as u128;
             updater
                 .update_l2_block_data(
                     height,
@@ -137,13 +155,13 @@ impl Simulator {
             projected_cost_totals.push(updater.projected_total_da_cost);
 
             // Update DA blocks on the occasion there is one
-            if let Some(da_blocks) = &da_block {
-                let mut total_cost = updater.latest_known_total_da_cost_excess;
-                for block in da_blocks {
-                    total_cost += block.block_cost as u128;
-                    actual_costs.push(total_cost);
+            if let Some((range, cost)) = da_block {
+                for height in range.to_owned() {
+                    updater
+                        .update_da_record_data(height..(height + 1), cost)
+                        .unwrap();
+                    actual_costs.push(updater.latest_known_total_da_cost_excess)
                 }
-                updater.update_da_record_data(&da_blocks).unwrap();
             }
         }
         let (fullness_without_capacity, bytes): (Vec<_>, Vec<_>) =
@@ -155,7 +173,7 @@ impl Simulator {
         let bytes_and_costs: Vec<_> = bytes
             .iter()
             .zip(self.da_cost_per_byte.iter())
-            .map(|(bytes, cost_per_byte)| (*bytes, (*bytes * cost_per_byte) as u64))
+            .map(|(bytes, da_cost_per_byte)| (*bytes, (*bytes * da_cost_per_byte) as u64))
             .collect();
 
         let actual_profit: Vec<i128> = actual_costs
@@ -187,7 +205,7 @@ impl Simulator {
         da_recording_rate: usize,
         da_finalization_rate: usize,
         fullness_and_bytes: &Vec<(u64, u64)>,
-    ) -> Vec<Option<Vec<RecordedBlock>>> {
+    ) -> Vec<Option<(Range<u32>, u128)>> {
         let l2_blocks_with_no_da_blocks =
             std::iter::repeat(None).take(da_finalization_rate);
         let (_, da_blocks) = fullness_and_bytes
@@ -199,12 +217,9 @@ impl Simulator {
                 |(mut delayed, mut recorded),
                  (index, ((_fullness, bytes), cost_per_byte))| {
                     let total_cost = *bytes * cost_per_byte;
+
                     let height = index as u32 + 1;
-                    let converted = RecordedBlock {
-                        height,
-                        block_bytes: *bytes,
-                        block_cost: total_cost as u64,
-                    };
+                    let converted = (height, bytes, total_cost);
                     delayed.push(converted);
                     if delayed.len() == da_recording_rate {
                         recorded.push(Some(delayed));
@@ -215,7 +230,16 @@ impl Simulator {
                     }
                 },
             );
-        l2_blocks_with_no_da_blocks.chain(da_blocks).collect()
+        let da_block_ranges = da_blocks.into_iter().map(|maybe_recorded_blocks| {
+            maybe_recorded_blocks.map(|list| {
+                let heights_iter = list.iter().map(|(height, _, _)| *height);
+                let min = heights_iter.clone().min().unwrap();
+                let max = heights_iter.max().unwrap();
+                let cost: u128 = list.iter().map(|(_, _, cost)| *cost as u128).sum();
+                (min..(max + 1), cost)
+            })
+        });
+        l2_blocks_with_no_da_blocks.chain(da_block_ranges).collect()
     }
 }
 
diff --git a/crates/fuel-gas-price-algorithm/src/v0.rs b/crates/fuel-gas-price-algorithm/src/v0.rs
index 494c9045a88..418e6619c7e 100644
--- a/crates/fuel-gas-price-algorithm/src/v0.rs
+++ b/crates/fuel-gas-price-algorithm/src/v0.rs
@@ -66,12 +66,6 @@ pub struct AlgorithmUpdaterV0 {
     pub l2_block_fullness_threshold_percent: u64,
 }
 
-#[derive(serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq)]
-pub struct BlockBytes {
-    pub height: u32,
-    pub block_bytes: u64,
-}
-
 impl AlgorithmUpdaterV0 {
     pub fn new(
         new_exec_price: u64,
diff --git a/crates/fuel-gas-price-algorithm/src/v1.rs b/crates/fuel-gas-price-algorithm/src/v1.rs
index dad6d64beea..a1a5f7dd536 100644
--- a/crates/fuel-gas-price-algorithm/src/v1.rs
+++ b/crates/fuel-gas-price-algorithm/src/v1.rs
@@ -1,11 +1,14 @@
+use crate::utils::cumulative_percentage_change;
 use std::{
     cmp::max,
+    collections::BTreeMap,
     num::NonZeroU64,
-    ops::Div,
+    ops::{
+        Div,
+        Range,
+    },
 };
 
-use crate::utils::cumulative_percentage_change;
-
 #[cfg(test)]
 mod tests;
 
@@ -16,9 +19,11 @@ pub enum Error {
     #[error("Skipped DA block update: expected {expected:?}, got {got:?}")]
     SkippedDABlock { expected: u32, got: u32 },
     #[error("Could not calculate cost per byte: {bytes:?} bytes, {cost:?} cost")]
-    CouldNotCalculateCostPerByte { bytes: u64, cost: u64 },
+    CouldNotCalculateCostPerByte { bytes: u128, cost: u128 },
     #[error("Failed to include L2 block data: {0}")]
     FailedTooIncludeL2BlockData(String),
+    #[error("L2 block expected but not found in unrecorded blocks: {0}")]
+    L2BlockExpectedNotFound(u32),
 }
 
 #[derive(Debug, Clone, PartialEq)]
@@ -94,6 +99,8 @@ impl AlgorithmV1 {
 /// The DA portion also uses a moving average of the profits over the last `avg_window` blocks
 /// instead of the actual profit. Setting the `avg_window` to 1 will effectively disable the
 /// moving average.
+type Height = u32;
+type Bytes = u64;
 #[derive(serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq)]
 pub struct AlgorithmUpdaterV1 {
     // Execution
@@ -144,8 +151,9 @@ pub struct AlgorithmUpdaterV1 {
     pub second_to_last_profit: i128,
     /// The latest known cost per byte for recording blocks on the DA chain
     pub latest_da_cost_per_byte: u128,
+
     /// The unrecorded blocks that are used to calculate the projected cost of recording blocks
-    pub unrecorded_blocks: Vec<BlockBytes>,
+    pub unrecorded_blocks: BTreeMap<Height, Bytes>,
 }
 
 /// A value that represents a value between 0 and 100. Higher values are clamped to 100
@@ -176,29 +184,16 @@ impl core::ops::Deref for ClampedPercentage {
     }
 }
 
-#[derive(Debug, Clone)]
-pub struct RecordedBlock {
-    pub height: u32,
-    pub block_bytes: u64,
-    pub block_cost: u64,
-}
-
-#[derive(serde::Serialize, serde::Deserialize, Debug, Clone, PartialEq)]
-pub struct BlockBytes {
-    pub height: u32,
-    pub block_bytes: u64,
-}
-
 impl AlgorithmUpdaterV1 {
     pub fn update_da_record_data(
         &mut self,
-        blocks: &[RecordedBlock],
+        height_range: Range<u32>,
+        range_cost: u128,
     ) -> Result<(), Error> {
-        for block in blocks {
-            self.da_block_update(block.height, block.block_bytes, block.block_cost)?;
+        if !height_range.is_empty() {
+            self.da_block_update(height_range, range_cost)?;
+            self.recalculate_projected_cost();
         }
-        self.recalculate_projected_cost();
-        self.normalize_rewards_and_costs();
         Ok(())
     }
 
@@ -208,7 +203,7 @@ impl AlgorithmUpdaterV1 {
         used: u64,
         capacity: NonZeroU64,
         block_bytes: u64,
-        fee_wei: u64,
+        fee_wei: u128,
     ) -> Result<(), Error> {
         let expected = self.l2_block_height.saturating_add(1);
         if height != expected {
@@ -220,12 +215,14 @@ impl AlgorithmUpdaterV1 {
             self.l2_block_height = height;
 
             // rewards
-            self.update_rewards(fee_wei);
+            self.update_da_rewards(fee_wei);
             let rewards = self.clamped_rewards_as_i128();
 
             // costs
-            self.update_projected_cost(block_bytes);
+            self.update_projected_da_cost(block_bytes);
             let projected_total_da_cost = self.clamped_projected_cost_as_i128();
+
+            // profit
             let last_profit = rewards.saturating_sub(projected_total_da_cost);
             self.update_last_profit(last_profit);
 
@@ -234,22 +231,18 @@ impl AlgorithmUpdaterV1 {
             self.update_da_gas_price();
 
             // metadata
-            self.unrecorded_blocks.push(BlockBytes {
-                height,
-                block_bytes,
-            });
+            self.unrecorded_blocks.insert(height, block_bytes);
             Ok(())
         }
     }
 
-    fn update_rewards(&mut self, fee_wei: u64) {
+    fn update_da_rewards(&mut self, fee_wei: u128) {
         let block_da_reward = self.da_portion_of_fee(fee_wei);
-        self.total_da_rewards_excess = self
-            .total_da_rewards_excess
-            .saturating_add(block_da_reward.into());
+        self.total_da_rewards_excess =
+            self.total_da_rewards_excess.saturating_add(block_da_reward);
     }
 
-    fn update_projected_cost(&mut self, block_bytes: u64) {
+    fn update_projected_da_cost(&mut self, block_bytes: u64) {
         let block_projected_da_cost =
             (block_bytes as u128).saturating_mul(self.latest_da_cost_per_byte);
         self.projected_total_da_cost = self
@@ -258,12 +251,11 @@ impl AlgorithmUpdaterV1 {
     }
 
     // Take the `fee_wei` and return the portion of the fee that should be used for paying DA costs
-    fn da_portion_of_fee(&self, fee_wei: u64) -> u64 {
+    fn da_portion_of_fee(&self, fee_wei: u128) -> u128 {
         // fee_wei * (da_price / (exec_price + da_price))
-        let numerator = fee_wei.saturating_mul(self.descaled_da_price());
-        let denominator = self
-            .descaled_exec_price()
-            .saturating_add(self.descaled_da_price());
+        let numerator = fee_wei.saturating_mul(self.descaled_da_price() as u128);
+        let denominator = (self.descaled_exec_price() as u128)
+            .saturating_add(self.descaled_da_price() as u128);
         if denominator == 0 {
             0
         } else {
@@ -374,45 +366,61 @@ impl AlgorithmUpdaterV1 {
 
     fn da_block_update(
         &mut self,
-        height: u32,
-        block_bytes: u64,
-        block_cost: u64,
+        height_range: Range<u32>,
+        range_cost: u128,
     ) -> Result<(), Error> {
         let expected = self.da_recorded_block_height.saturating_add(1);
-        if height != expected {
+        let first = height_range.start;
+        if first != expected {
             Err(Error::SkippedDABlock {
-                expected: self.da_recorded_block_height.saturating_add(1),
-                got: height,
+                expected,
+                got: first,
             })
         } else {
-            let new_cost_per_byte: u128 = (block_cost as u128)
-                .checked_div(block_bytes as u128)
-                .ok_or(Error::CouldNotCalculateCostPerByte {
-                    bytes: block_bytes,
-                    cost: block_cost,
-                })?;
-            self.da_recorded_block_height = height;
-            let new_block_cost = self
+            let last = height_range.end.saturating_sub(1);
+            let range_bytes = self.drain_l2_block_bytes_for_range(height_range)?;
+            let new_cost_per_byte: u128 = range_cost.checked_div(range_bytes).ok_or(
+                Error::CouldNotCalculateCostPerByte {
+                    bytes: range_bytes,
+                    cost: range_cost,
+                },
+            )?;
+            self.da_recorded_block_height = last;
+            let new_da_block_cost = self
                 .latest_known_total_da_cost_excess
-                .saturating_add(block_cost as u128);
-            self.latest_known_total_da_cost_excess = new_block_cost;
+                .saturating_add(range_cost);
+            self.latest_known_total_da_cost_excess = new_da_block_cost;
             self.latest_da_cost_per_byte = new_cost_per_byte;
             Ok(())
         }
     }
 
+    fn drain_l2_block_bytes_for_range(
+        &mut self,
+        height_range: Range<u32>,
+    ) -> Result<u128, Error> {
+        let mut total: u128 = 0;
+        for expected_height in height_range {
+            let (actual_height, bytes) = self
+                .unrecorded_blocks
+                .pop_first()
+                .ok_or(Error::L2BlockExpectedNotFound(expected_height))?;
+            if actual_height != expected_height {
+                return Err(Error::L2BlockExpectedNotFound(expected_height));
+            }
+            total = total.saturating_add(bytes as u128);
+        }
+        Ok(total)
+    }
+
     fn recalculate_projected_cost(&mut self) {
-        // remove all blocks that have been recorded
-        self.unrecorded_blocks
-            .retain(|block| block.height > self.da_recorded_block_height);
         // add the cost of the remaining blocks
         let projection_portion: u128 = self
             .unrecorded_blocks
             .iter()
-            .map(|block| {
-                (block.block_bytes as u128).saturating_mul(self.latest_da_cost_per_byte)
-            })
-            .sum();
+            .map(|(_, &bytes)| (bytes as u128))
+            .fold(0_u128, |acc, n| acc.saturating_add(n))
+            .saturating_mul(self.latest_da_cost_per_byte);
         self.projected_total_da_cost = self
             .latest_known_total_da_cost_excess
             .saturating_add(projection_portion);
@@ -435,34 +443,4 @@ impl AlgorithmUpdaterV1 {
             for_height: self.l2_block_height,
         }
     }
-
-    // We only need to track the difference between the rewards and costs after we have true DA data
-    // Normalize, or zero out the lower value and subtract it from the higher value
-    fn normalize_rewards_and_costs(&mut self) {
-        let (excess, projected_cost_excess) =
-            if self.total_da_rewards_excess > self.latest_known_total_da_cost_excess {
-                (
-                    self.total_da_rewards_excess
-                        .saturating_sub(self.latest_known_total_da_cost_excess),
-                    self.projected_total_da_cost
-                        .saturating_sub(self.latest_known_total_da_cost_excess),
-                )
-            } else {
-                (
-                    self.latest_known_total_da_cost_excess
-                        .saturating_sub(self.total_da_rewards_excess),
-                    self.projected_total_da_cost
-                        .saturating_sub(self.total_da_rewards_excess),
-                )
-            };
-
-        self.projected_total_da_cost = projected_cost_excess;
-        if self.total_da_rewards_excess > self.latest_known_total_da_cost_excess {
-            self.total_da_rewards_excess = excess;
-            self.latest_known_total_da_cost_excess = 0;
-        } else {
-            self.total_da_rewards_excess = 0;
-            self.latest_known_total_da_cost_excess = excess;
-        }
-    }
 }
diff --git a/crates/fuel-gas-price-algorithm/src/v1/tests.rs b/crates/fuel-gas-price-algorithm/src/v1/tests.rs
index 707173baca4..0aca738a3f0 100644
--- a/crates/fuel-gas-price-algorithm/src/v1/tests.rs
+++ b/crates/fuel-gas-price-algorithm/src/v1/tests.rs
@@ -2,10 +2,7 @@
 #![allow(clippy::arithmetic_side_effects)]
 #![allow(clippy::cast_possible_truncation)]
 
-use crate::v1::{
-    AlgorithmUpdaterV1,
-    BlockBytes,
-};
+use crate::v1::AlgorithmUpdaterV1;
 
 #[cfg(test)]
 mod algorithm_v1_tests;
@@ -14,6 +11,12 @@ mod update_da_record_data_tests;
 #[cfg(test)]
 mod update_l2_block_data_tests;
 
+#[derive(Debug, Clone)]
+pub struct BlockBytes {
+    pub height: u32,
+    pub block_bytes: u64,
+}
+
 pub struct UpdaterBuilder {
     min_exec_gas_price: u64,
     min_da_gas_price: u64,
@@ -175,7 +178,11 @@ impl UpdaterBuilder {
             latest_da_cost_per_byte: self.da_cost_per_byte,
             projected_total_da_cost: self.project_total_cost,
             latest_known_total_da_cost_excess: self.latest_known_total_cost,
-            unrecorded_blocks: self.unrecorded_blocks,
+            unrecorded_blocks: self
+                .unrecorded_blocks
+                .iter()
+                .map(|b| (b.height, b.block_bytes))
+                .collect(),
             last_profit: self.last_profit,
             second_to_last_profit: self.second_to_last_profit,
             min_da_gas_price: self.min_da_gas_price,
diff --git a/crates/fuel-gas-price-algorithm/src/v1/tests/update_da_record_data_tests.rs b/crates/fuel-gas-price-algorithm/src/v1/tests/update_da_record_data_tests.rs
index e9d64a63bcc..123520b4e99 100644
--- a/crates/fuel-gas-price-algorithm/src/v1/tests/update_da_record_data_tests.rs
+++ b/crates/fuel-gas-price-algorithm/src/v1/tests/update_da_record_data_tests.rs
@@ -1,74 +1,67 @@
 use crate::v1::{
-    tests::UpdaterBuilder,
-    BlockBytes,
+    tests::{
+        BlockBytes,
+        UpdaterBuilder,
+    },
     Error,
-    RecordedBlock,
 };
-use proptest::{
-    prelude::Rng,
-    prop_compose,
-    proptest,
-};
-use rand::SeedableRng;
 
 #[test]
 fn update_da_record_data__increases_block() {
     // given
     let da_recorded_block_height = 0;
-    let mut updater = UpdaterBuilder::new()
-        .with_da_recorded_block_height(da_recorded_block_height)
-        .build();
-
-    let blocks = vec![
-        RecordedBlock {
+    let recorded_range = 1u32..3;
+    let recorded_cost = 200;
+    let unrecorded_blocks = vec![
+        BlockBytes {
             height: 1,
             block_bytes: 1000,
-            block_cost: 100,
         },
-        RecordedBlock {
+        BlockBytes {
             height: 2,
-            block_bytes: 1000,
-            block_cost: 100,
+            block_bytes: 2000,
         },
     ];
+    let mut updater = UpdaterBuilder::new()
+        .with_da_recorded_block_height(da_recorded_block_height)
+        .with_unrecorded_blocks(unrecorded_blocks)
+        .build();
 
     // when
-    updater.update_da_record_data(&blocks).unwrap();
+    updater
+        .update_da_record_data(recorded_range, recorded_cost)
+        .unwrap();
 
     // then
     let expected = 2;
     let actual = updater.da_recorded_block_height;
-    assert_eq!(actual, expected);
+    assert_eq!(expected, actual);
 }
 
 #[test]
 fn update_da_record_data__throws_error_if_out_of_order() {
     // given
     let da_recorded_block_height = 0;
+    let bad_recorded_range = 2u32..4;
+    let recorded_cost = 200;
+    let unrecorded_blocks = vec![BlockBytes {
+        height: 1,
+        block_bytes: 1000,
+    }];
     let mut updater = UpdaterBuilder::new()
         .with_da_recorded_block_height(da_recorded_block_height)
+        .with_unrecorded_blocks(unrecorded_blocks)
         .build();
 
-    let blocks = vec![
-        RecordedBlock {
-            height: 1,
-            block_bytes: 1000,
-            block_cost: 100,
-        },
-        RecordedBlock {
-            height: 3,
-            block_bytes: 1000,
-            block_cost: 100,
-        },
-    ];
-
     // when
-    let actual_error = updater.update_da_record_data(&blocks).unwrap_err();
+    let actual_error = updater
+        .update_da_record_data(bad_recorded_range, recorded_cost)
+        .unwrap_err();
 
     // then
     let expected_error = Error::SkippedDABlock {
-        expected: 2,
-        got: 3,
+        expected: 1,
+        got: 2,
     };
     assert_eq!(actual_error, expected_error);
 }
@@ -77,20 +70,23 @@ fn update_da_record_data__throws_error_if_out_of_order() {
 fn update_da_record_data__updates_cost_per_byte() {
     // given
     let da_cost_per_byte = 20;
+    let block_bytes = 1000;
+    let unrecorded_blocks = vec![BlockBytes {
+        height: 1,
+        block_bytes,
+    }];
     let mut updater = UpdaterBuilder::new()
         .with_da_cost_per_byte(da_cost_per_byte)
+        .with_unrecorded_blocks(unrecorded_blocks)
         .build();
 
-    let block_bytes = 1000;
     let new_cost_per_byte = 100;
-    let block_cost = block_bytes * new_cost_per_byte;
-    let blocks = vec![RecordedBlock {
-        height: 1,
-        block_bytes,
-        block_cost,
-    }];
+    let recorded_cost = (block_bytes * new_cost_per_byte) as u128;
+    let recorded_range = 1u32..2;
     // when
-    updater.update_da_record_data(&blocks).unwrap();
+    updater
+        .update_da_record_data(recorded_range, recorded_cost)
+        .unwrap();
 
     // then
     let expected = new_cost_per_byte as u128;
@@ -106,39 +102,39 @@ fn update_da_record_data__updates_known_total_cost() {
     let l2_block_height = 15;
     let projected_total_cost = 2000;
     let known_total_cost = 1500;
+    let unrecorded_blocks = vec![
+        BlockBytes {
+            height: 11,
+            block_bytes: 1000,
+        },
+        BlockBytes {
+            height: 12,
+            block_bytes: 2000,
+        },
+        BlockBytes {
+            height: 13,
+            block_bytes: 1500,
+        },
+    ];
     let mut updater = UpdaterBuilder::new()
         .with_da_cost_per_byte(da_cost_per_byte)
         .with_da_recorded_block_height(da_recorded_block_height)
         .with_l2_block_height(l2_block_height)
         .with_projected_total_cost(projected_total_cost)
         .with_known_total_cost(known_total_cost)
+        .with_unrecorded_blocks(unrecorded_blocks)
         .build();
 
-    let block_bytes = 1000;
-    let block_cost = 100;
-    let blocks = vec![
-        RecordedBlock {
-            height: 11,
-            block_bytes,
-            block_cost,
-        },
-        RecordedBlock {
-            height: 12,
-            block_bytes,
-            block_cost,
-        },
-        RecordedBlock {
-            height: 13,
-            block_bytes,
-            block_cost,
-        },
-    ];
+    let recorded_range = 11u32..14;
+    let recorded_cost = 300;
     // when
-    updater.update_da_record_data(&blocks).unwrap();
+    updater
+        .update_da_record_data(recorded_range, recorded_cost)
+        .unwrap();
 
     // then
     let actual = updater.latest_known_total_da_cost_excess;
-    let expected = known_total_cost + (3 * block_cost as u128);
+    let expected = known_total_cost + recorded_cost;
     assert_eq!(actual, expected);
 }
 
@@ -181,25 +177,13 @@ fn update_da_record_data__if_da_height_matches_l2_height_projected_and_known_mat
     let block_bytes = 1000;
     let new_cost_per_byte = 100;
     let block_cost = block_bytes * new_cost_per_byte;
-    let blocks = vec![
-        RecordedBlock {
-            height: 11,
-            block_bytes,
-            block_cost,
-        },
-        RecordedBlock {
-            height: 12,
-            block_bytes,
-            block_cost,
-        },
-        RecordedBlock {
-            height: 13,
-            block_bytes,
-            block_cost,
-        },
-    ];
+
+    let recorded_range = 11u32..14;
+    let recorded_cost = block_cost * 3;
     // when
-    updater.update_da_record_data(&blocks).unwrap();
+    updater
+        .update_da_record_data(recorded_range, recorded_cost)
+        .unwrap();
 
     // then
     assert_eq!(updater.l2_block_height, updater.da_recorded_block_height);
@@ -216,7 +200,8 @@ fn update_da_record_data__da_block_updates_projected_total_cost_with_known_and_g
     let da_cost_per_byte = 20;
     let da_recorded_block_height = 10;
     let l2_block_height = 15;
-    let known_total_cost = 1500;
+    let original_known_total_cost = 1500;
+    let block_bytes = 1000;
     let mut unrecorded_blocks = vec![
         BlockBytes {
             height: 11,
@@ -235,54 +220,49 @@ fn update_da_record_data__da_block_updates_projected_total_cost_with_known_and_g
     let remaining = vec![
         BlockBytes {
             height: 14,
-            block_bytes: 1200,
+            block_bytes,
         },
         BlockBytes {
             height: 15,
-            block_bytes: 3000,
+            block_bytes,
         },
     ];
+    let to_be_removed = unrecorded_blocks.clone();
     unrecorded_blocks.extend(remaining.clone());
     let guessed_cost: u64 = unrecorded_blocks
         .iter()
         .map(|block| block.block_bytes * da_cost_per_byte)
         .sum();
-    let projected_total_cost = known_total_cost + guessed_cost;
+    let projected_total_cost = original_known_total_cost + guessed_cost;
     let mut updater = UpdaterBuilder::new()
         .with_da_cost_per_byte(da_cost_per_byte as u128)
         .with_da_recorded_block_height(da_recorded_block_height)
         .with_l2_block_height(l2_block_height)
         .with_projected_total_cost(projected_total_cost as u128)
-        .with_known_total_cost(known_total_cost as u128)
+        .with_known_total_cost(original_known_total_cost as u128)
         .with_unrecorded_blocks(unrecorded_blocks)
         .build();
 
-    let block_bytes = 1000;
     let new_cost_per_byte = 100;
-    let block_cost = block_bytes * new_cost_per_byte;
-    let blocks = vec![
-        RecordedBlock {
-            height: 11,
-            block_bytes,
-            block_cost,
-        },
-        RecordedBlock {
-            height: 12,
-            block_bytes,
-            block_cost,
-        },
-        RecordedBlock {
-            height: 13,
-            block_bytes,
-            block_cost,
-        },
-    ];
+    let (recorded_heights, recorded_cost) =
+        to_be_removed
+            .iter()
+            .fold((vec![], 0), |(mut range, cost), block| {
+                range.push(block.height);
+                (range, cost + block.block_bytes * new_cost_per_byte)
+            });
+    let min = recorded_heights.iter().min().unwrap();
+    let max = recorded_heights.iter().max().unwrap();
+    let recorded_range = *min..(max + 1);
+
     // when
-    updater.update_da_record_data(&blocks).unwrap();
+    updater
+        .update_da_record_data(recorded_range, recorded_cost as u128)
+        .unwrap();
 
     // then
     let actual = updater.projected_total_da_cost;
-    let new_known_total_cost = known_total_cost + 3 * block_cost;
+    let new_known_total_cost = original_known_total_cost + recorded_cost;
     let guessed_part: u64 = remaining
         .iter()
         .map(|block| block.block_bytes * new_cost_per_byte)
@@ -290,127 +270,3 @@ fn update_da_record_data__da_block_updates_projected_total_cost_with_known_and_g
     let expected = new_known_total_cost + guessed_part;
     assert_eq!(actual, expected as u128);
 }
-
-prop_compose! {
-    fn arb_vec_of_da_blocks()(last_da_block: u32, count in 1..123usize, rng_seed: u64) -> Vec<RecordedBlock> {
-        let rng = &mut rand::rngs::StdRng::seed_from_u64(rng_seed);
-        let mut blocks = Vec::with_capacity(count);
-        for i in 0..count {
-            let block_bytes = rng.gen_range(100..131_072);
-            let cost_per_byte = rng.gen_range(1..1000000);
-            let block_cost = block_bytes * cost_per_byte;
-            blocks.push(RecordedBlock {
-                height: last_da_block + 1 + i as u32,
-                block_bytes,
-                block_cost,
-            });
-        }
-        blocks
-    }
-}
-
-prop_compose! {
-    fn reward_greater_than_cost_with_da_blocks()(cost: u64, extra: u64, blocks in arb_vec_of_da_blocks()) -> (u128, u128, Vec<RecordedBlock>) {
-        let cost_from_blocks = blocks.iter().map(|block| block.block_cost as u128).sum::<u128>();
-        let reward = cost as u128 + cost_from_blocks + extra as u128;
-        (cost as u128, reward, blocks)
-    }
-}
-
-proptest! {
-    #[test]
-    fn update_da_record_data__when_reward_is_greater_than_cost_will_zero_cost_and_subtract_from_reward(
-        (cost, reward, blocks) in reward_greater_than_cost_with_da_blocks()
-    ) {
-        _update_da_record_data__when_reward_is_greater_than_cost_will_zero_cost_and_subtract_from_reward(
-            cost,
-            reward,
-            blocks
-        )
-    }
-}
-
-fn _update_da_record_data__when_reward_is_greater_than_cost_will_zero_cost_and_subtract_from_reward(
-    known_total_cost: u128,
-    total_rewards: u128,
-    blocks: Vec<RecordedBlock>,
-) {
-    // given
-    let da_cost_per_byte = 20;
-    let da_recorded_block_height = blocks.first().unwrap().height - 1;
-    let l2_block_height = 15;
-    let mut updater = UpdaterBuilder::new()
-        .with_da_cost_per_byte(da_cost_per_byte)
-        .with_da_recorded_block_height(da_recorded_block_height)
-        .with_l2_block_height(l2_block_height)
-        .with_known_total_cost(known_total_cost)
-        .with_total_rewards(total_rewards)
-        .build();
-
-    let new_costs = blocks.iter().map(|block| block.block_cost).sum::<u64>();
-
-    // when
-    updater.update_da_record_data(&blocks).unwrap();
-
-    // then
-    let expected = total_rewards - new_costs as u128 - known_total_cost;
-    let actual = updater.total_da_rewards_excess;
-    assert_eq!(actual, expected);
-
-    let expected = 0;
-    let actual = updater.latest_known_total_da_cost_excess;
-    assert_eq!(actual, expected);
-}
-
-prop_compose! {
-    fn cost_greater_than_reward_with_da_blocks()(reward: u64, extra: u64, blocks in arb_vec_of_da_blocks()) -> (u128, u128, Vec<RecordedBlock>) {
-        let cost_from_blocks = blocks.iter().map(|block| block.block_cost as u128).sum::<u128>();
-        let cost = reward as u128 + cost_from_blocks + extra as u128;
-        (cost, reward as u128, blocks)
-    }
-}
-
-proptest! {
-    #[test]
-    fn update_da_record_data__when_cost_is_greater_than_reward_will_zero_reward_and_subtract_from_cost(
-        (cost, reward, blocks) in cost_greater_than_reward_with_da_blocks()
-    ) {
-        _update_da_record_data__when_cost_is_greater_than_reward_will_zero_reward_and_subtract_from_cost(
-            cost,
-            reward,
-            blocks
-        )
-    }
-}
-
-fn _update_da_record_data__when_cost_is_greater_than_reward_will_zero_reward_and_subtract_from_cost(
-    known_total_cost: u128,
-    total_rewards: u128,
-    blocks: Vec<RecordedBlock>,
-) {
-    // given
-    let da_cost_per_byte = 20;
-    let da_recorded_block_height = blocks.first().unwrap().height - 1;
-    let l2_block_height = 15;
-    let mut updater = UpdaterBuilder::new()
-        .with_da_cost_per_byte(da_cost_per_byte)
-        .with_da_recorded_block_height(da_recorded_block_height)
-        .with_l2_block_height(l2_block_height)
-        .with_known_total_cost(known_total_cost)
-        .with_total_rewards(total_rewards)
-        .build();
-
-    let new_costs = blocks.iter().map(|block| block.block_cost).sum::<u64>();
-
-    // when
-    updater.update_da_record_data(&blocks).unwrap();
-
-    // then
-    let expected = 0;
-    let actual = updater.total_da_rewards_excess;
-    assert_eq!(actual, expected);
-
-    let expected = known_total_cost + new_costs as u128 - total_rewards;
-    let actual = updater.latest_known_total_da_cost_excess;
-    assert_eq!(actual, expected);
-}
diff --git a/crates/fuel-gas-price-algorithm/src/v1/tests/update_l2_block_data_tests.rs b/crates/fuel-gas-price-algorithm/src/v1/tests/update_l2_block_data_tests.rs
index 1ad9a1aacad..6d5e4cf2ce7 100644
--- a/crates/fuel-gas-price-algorithm/src/v1/tests/update_l2_block_data_tests.rs
+++ b/crates/fuel-gas-price-algorithm/src/v1/tests/update_l2_block_data_tests.rs
@@ -1,6 +1,8 @@
 use crate::v1::{
-    tests::UpdaterBuilder,
-    BlockBytes,
+    tests::{
+        BlockBytes,
+        UpdaterBuilder,
+    },
     Error,
 };
 
@@ -104,10 +106,10 @@ fn update_l2_block_data__updates_the_total_reward_value() {
         .unwrap();
 
     // then
-    let expected = (fee * starting_da_gas_price)
-        .div_ceil(starting_da_gas_price + starting_exec_gas_price);
+    let expected = (fee * starting_da_gas_price as u128)
+        .div_ceil(starting_da_gas_price as u128 + starting_exec_gas_price as u128);
     let actual = updater.total_da_rewards_excess;
-    assert_eq!(actual, expected as u128);
+    assert_eq!(actual, expected);
 }
 
 #[test]
@@ -480,7 +482,7 @@ fn update_l2_block_data__even_profit_maintains_price() {
             50,
             100.try_into().unwrap(),
             block_bytes,
-            total_fee,
+            total_fee.into(),
         )
         .unwrap();
     let algo = updater.algorithm();
@@ -563,8 +565,9 @@ fn update_l2_block_data__adds_l2_block_to_unrecorded_blocks() {
         height,
         block_bytes,
     };
-    let contains_block_bytes = updater.unrecorded_blocks.contains(&block_bytes);
-    assert!(contains_block_bytes);
+    let expected = block_bytes.block_bytes;
+    let actual = updater.unrecorded_blocks.get(&block_bytes.height).unwrap();
+    assert_eq!(expected, *actual);
 }
 
 #[test]
@@ -598,10 +601,12 @@ fn update_l2_block_data__retains_existing_blocks_and_adds_l2_block_to_unrecorded
         height,
         block_bytes,
     };
-    let contains_block_bytes = updater.unrecorded_blocks.contains(&block_bytes);
+    let contains_block_bytes =
+        updater.unrecorded_blocks.contains_key(&block_bytes.height);
     assert!(contains_block_bytes);
 
-    let contains_preexisting_block_bytes =
-        updater.unrecorded_blocks.contains(&preexisting_block);
+    let contains_preexisting_block_bytes = updater
+        .unrecorded_blocks
+        .contains_key(&preexisting_block.height);
     assert!(contains_preexisting_block_bytes);
 }
diff --git a/crates/services/Cargo.toml b/crates/services/Cargo.toml
index 77140da452d..345bcd64287 100644
--- a/crates/services/Cargo.toml
+++ b/crates/services/Cargo.toml
@@ -15,11 +15,15 @@ async-trait = { workspace = true }
 fuel-core-metrics = { workspace = true }
 futures = { workspace = true }
 parking_lot = { workspace = true }
+rayon = { workspace = true, optional = true }
 tokio = { workspace = true, features = ["full"] }
 tracing = { workspace = true }
 
 [dev-dependencies]
+fuel-core-services = { path = ".", features = ["sync-processor"] }
+futures = { workspace = true }
 mockall = { workspace = true }
 
 [features]
 test-helpers = []
+sync-processor = ["dep:rayon"]
diff --git a/crates/services/consensus_module/poa/Cargo.toml b/crates/services/consensus_module/poa/Cargo.toml
index eb97756e4eb..5d71379853d 100644
--- a/crates/services/consensus_module/poa/Cargo.toml
+++ b/crates/services/consensus_module/poa/Cargo.toml
@@ -29,6 +29,7 @@ aws-config = { version = "1.1.7", features = ["behavior-version-latest"] }
 fuel-core-poa = { path = ".", features = ["test-helpers"] }
 fuel-core-services = { workspace = true, features = ["test-helpers"] }
 fuel-core-storage = { path = "./../../../storage", features = ["test-helpers"] }
+fuel-core-trace = { path = "./../../../trace" }
 fuel-core-types = { path = "./../../../types", features = ["test-helpers"] }
 mockall = { workspace = true }
 rand = { workspace = true }
diff --git a/crates/services/consensus_module/poa/src/lib.rs b/crates/services/consensus_module/poa/src/lib.rs
index 272c569ed61..19dfeb826cf 100644
--- a/crates/services/consensus_module/poa/src/lib.rs
+++ b/crates/services/consensus_module/poa/src/lib.rs
@@ -24,3 +24,6 @@ pub use service::{
     new_service,
     Service,
 };
+
+#[cfg(test)]
+fuel_core_trace::enable_tracing!();
diff --git a/crates/services/consensus_module/poa/src/ports.rs b/crates/services/consensus_module/poa/src/ports.rs
index 2148bcfb44b..af3e889eff9 100644
--- a/crates/services/consensus_module/poa/src/ports.rs
+++ b/crates/services/consensus_module/poa/src/ports.rs
@@ -10,10 +10,7 @@ use fuel_core_types::{
         header::BlockHeader,
         primitives::DaBlockHeight,
     },
-    fuel_tx::{
-        Transaction,
-        TxId,
-    },
+    fuel_tx::Transaction,
     fuel_types::{
         BlockHeight,
         Bytes32,
@@ -23,11 +20,7 @@ use fuel_core_types::{
             BlockImportInfo,
             UncommittedResult as UncommittedImportResult,
         },
-        executor::{
-            Error as ExecutorError,
-            UncommittedResult as UncommittedExecutionResult,
-        },
-        txpool::ArcPoolTx,
+        executor::UncommittedResult as UncommittedExecutionResult,
     },
     tai64::Tai64,
 };
@@ -35,14 +28,9 @@ use std::collections::HashMap;
 
 #[cfg_attr(test, mockall::automock)]
 pub trait TransactionPool: Send + Sync {
-    /// Returns the number of pending transactions in the `TxPool`.
-    fn pending_number(&self) -> usize;
-
-    fn total_consumable_gas(&self) -> u64;
-
-    fn remove_txs(&self, tx_ids: Vec<(TxId, ExecutorError)>) -> Vec<ArcPoolTx>;
+    fn new_txs_watcher(&self) -> tokio::sync::watch::Receiver<()>;
 
-    fn transaction_status_events(&self) -> BoxStream<TxId>;
+    fn notify_skipped_txs(&self, tx_ids_and_reasons: Vec<(Bytes32, String)>);
 }
 
 /// The source of transactions for the block.
diff --git a/crates/services/consensus_module/poa/src/service.rs b/crates/services/consensus_module/poa/src/service.rs
index 2d2f07a21d7..04255ac108a 100644
--- a/crates/services/consensus_module/poa/src/service.rs
+++ b/crates/services/consensus_module/poa/src/service.rs
@@ -16,7 +16,6 @@ use tokio::{
         Instant,
     },
 };
-use tokio_stream::StreamExt;
 
 use crate::{
     ports::{
@@ -37,10 +36,7 @@ use crate::{
     Trigger,
 };
 use fuel_core_services::{
-    stream::{
-        BoxFuture,
-        BoxStream,
-    },
+    stream::BoxFuture,
     RunnableService,
     RunnableTask,
     Service as OtherService,
@@ -132,7 +128,7 @@ pub struct MainTask<T, B, I, S, PB, C> {
     block_producer: B,
     block_importer: I,
     txpool: T,
-    tx_status_update_stream: BoxStream<TxId>,
+    new_txs_watcher: tokio::sync::watch::Receiver<()>,
     request_receiver: mpsc::Receiver<Request>,
     shared_state: SharedState,
     last_height: BlockHeight,
@@ -164,7 +160,7 @@ where
         predefined_blocks: PB,
         clock: C,
     ) -> Self {
-        let tx_status_update_stream = txpool.transaction_status_events();
+        let new_txs_watcher = txpool.new_txs_watcher();
         let (request_sender, request_receiver) = mpsc::channel(1024);
         let (last_height, last_timestamp, last_block_created) =
             Self::extract_block_info(clock.now(), last_block);
@@ -194,7 +190,7 @@ where
             txpool,
             block_producer,
             block_importer,
-            tx_status_update_stream,
+            new_txs_watcher,
             request_receiver,
             shared_state: SharedState { request_sender },
             last_height,
@@ -343,16 +339,18 @@ where
             .await?
             .into();
 
-        let mut tx_ids_to_remove = Vec::with_capacity(skipped_transactions.len());
-        for (tx_id, err) in skipped_transactions {
-            tracing::error!(
+        if !skipped_transactions.is_empty() {
+            let mut tx_ids_to_remove = Vec::with_capacity(skipped_transactions.len());
+            for (tx_id, err) in skipped_transactions {
+                tracing::error!(
                 "During block production got invalid transaction {:?} with error {:?}",
                 tx_id,
                 err
             );
-            tx_ids_to_remove.push((tx_id, err));
+                tx_ids_to_remove.push((tx_id, err.to_string()));
+            }
+            self.txpool.notify_skipped_txs(tx_ids_to_remove);
         }
-        self.txpool.remove_txs(tx_ids_to_remove);
 
         // Sign the block and seal it
         let seal = self.signer.seal_block(&block).await?;
@@ -438,16 +436,9 @@ where
         Ok(())
     }
 
-    pub(crate) async fn on_txpool_event(&mut self) -> anyhow::Result<()> {
+    async fn on_txpool_event(&mut self) -> anyhow::Result<()> {
         match self.trigger {
-            Trigger::Instant => {
-                let pending_number = self.txpool.pending_number();
-                // skip production if there are no pending transactions
-                if pending_number > 0 {
-                    self.produce_next_block().await?;
-                }
-                Ok(())
-            }
+            Trigger::Instant => self.produce_next_block().await,
             Trigger::Never | Trigger::Interval { .. } => Ok(()),
         }
     }
@@ -531,19 +522,14 @@ where
         let should_continue;
         let mut sync_state = self.sync_task_handle.shared.clone();
         // make sure we're synced first
-        while *sync_state.borrow_and_update() == SyncState::NotSynced {
+        if *sync_state.borrow_and_update() == SyncState::NotSynced {
             tokio::select! {
                 biased;
                 result = watcher.while_started() => {
                     should_continue = result?.started();
                     return Ok(should_continue);
                 }
-                _ = sync_state.changed() => {
-                    break;
-                }
-                _ = self.tx_status_update_stream.next() => {
-                    // ignore txpool events while syncing
-                }
+                _ = sync_state.changed() => {}
             }
         }
 
@@ -587,19 +573,9 @@ where
                     should_continue = false;
                 }
             }
-            // TODO: This should likely be refactored to use something like tokio::sync::Notify.
-            //       Otherwise, if a bunch of txs are submitted at once and all the txs are included
-            //       into the first block production trigger, we'll still call the event handler
-            //       for each tx after they've already been included into a block.
-            //       The poa service also doesn't care about events unrelated to new tx submissions,
-            //       and shouldn't be awoken when txs are completed or squeezed out of the pool.
-            txpool_event = self.tx_status_update_stream.next() => {
-                if txpool_event.is_some()  {
-                    self.on_txpool_event().await.context("While processing txpool event")?;
-                    should_continue = true;
-                } else {
-                    should_continue = false;
-                }
+            _ = self.new_txs_watcher.changed() => {
+                self.on_txpool_event().await.context("While processing txpool event")?;
+                should_continue = true;
             }
             _ = next_block_production => {
                 match self.on_timer().await.context("While processing timer event") {
diff --git a/crates/services/consensus_module/poa/src/service_test.rs b/crates/services/consensus_module/poa/src/service_test.rs
index 6b04e339a2b..5230e03f42b 100644
--- a/crates/services/consensus_module/poa/src/service_test.rs
+++ b/crates/services/consensus_module/poa/src/service_test.rs
@@ -23,7 +23,6 @@ use crate::{
 use async_trait::async_trait;
 use fuel_core_chain_config::default_consensus_dev_key;
 use fuel_core_services::{
-    stream::pending,
     Service as StorageTrait,
     ServiceRunner,
     State,
@@ -41,10 +40,7 @@ use fuel_core_types::{
         SealedBlock,
     },
     fuel_crypto::SecretKey,
-    fuel_tx::{
-        field::ScriptGasLimit,
-        *,
-    },
+    fuel_tx::*,
     fuel_types::{
         BlockHeight,
         ChainId,
@@ -140,7 +136,7 @@ impl TestContextBuilder {
         self
     }
 
-    fn build(self) -> TestContext {
+    async fn build(self) -> TestContext {
         let config = self.config.unwrap_or_default();
         let producer = self.producer.unwrap_or_else(|| {
             let mut producer = MockBlockProducer::default();
@@ -192,7 +188,7 @@ impl TestContextBuilder {
             predefined_blocks,
             watch,
         );
-        service.start().unwrap();
+        service.start_and_await().await.unwrap();
         TestContext { service, time }
     }
 }
@@ -239,74 +235,35 @@ impl TestContext {
 pub struct TxPoolContext {
     pub txpool: MockTransactionPool,
     pub txs: Arc<Mutex<Vec<Script>>>,
-    pub status_sender: Arc<watch::Sender<Option<TxId>>>,
+    pub new_txs_notifier: watch::Sender<()>,
 }
 
 impl MockTransactionPool {
     fn no_tx_updates() -> Self {
         let mut txpool = MockTransactionPool::default();
-        txpool
-            .expect_transaction_status_events()
-            .returning(|| Box::pin(pending()));
+        txpool.expect_new_txs_watcher().returning({
+            let (sender, _) = watch::channel(());
+            move || sender.subscribe()
+        });
+        txpool.expect_notify_skipped_txs().returning(|_| {});
         txpool
     }
 
     pub fn new_with_txs(txs: Vec<Script>) -> TxPoolContext {
         let mut txpool = MockTransactionPool::default();
         let txs = Arc::new(StdMutex::new(txs));
-        let (status_sender, status_receiver) = watch::channel(None);
-        let status_sender = Arc::new(status_sender);
-        let status_sender_clone = status_sender.clone();
-
-        txpool
-            .expect_transaction_status_events()
-            .returning(move || {
-                let status_channel =
-                    (status_sender_clone.clone(), status_receiver.clone());
-                let stream = fuel_core_services::stream::unfold(
-                    status_channel,
-                    |(sender, mut receiver)| async {
-                        loop {
-                            let status = *receiver.borrow_and_update();
-                            if let Some(status) = status {
-                                sender.send_replace(None);
-                                return Some((status, (sender, receiver)))
-                            }
-                            receiver.changed().await.unwrap();
-                        }
-                    },
-                );
-                Box::pin(stream)
-            });
+        let (new_txs_notifier, _) = watch::channel(());
 
-        let pending = txs.clone();
-        txpool
-            .expect_pending_number()
-            .returning(move || pending.lock().unwrap().len());
-        let consumable = txs.clone();
-        txpool.expect_total_consumable_gas().returning(move || {
-            consumable
-                .lock()
-                .unwrap()
-                .iter()
-                .map(|tx| *tx.script_gas_limit())
-                .sum()
+        txpool.expect_new_txs_watcher().returning({
+            let sender = new_txs_notifier.clone();
+            move || sender.subscribe()
         });
-        let removed = txs.clone();
-        txpool.expect_remove_txs().returning(
-            move |tx_ids: Vec<(TxId, ExecutorError)>| {
-                let mut guard = removed.lock().unwrap();
-                for (id, _) in tx_ids {
-                    guard.retain(|tx| tx.id(&ChainId::default()) == id);
-                }
-                vec![]
-            },
-        );
+        txpool.expect_notify_skipped_txs().returning(|_| {});
 
         TxPoolContext {
             txpool,
             txs,
-            status_sender,
+            new_txs_notifier,
         }
     }
 }
@@ -368,25 +325,26 @@ async fn remove_skipped_transactions() {
 
     let mut txpool = MockTransactionPool::no_tx_updates();
     // Test created for only for this check.
-    txpool.expect_remove_txs().returning(move |skipped_ids| {
-        let skipped_ids: Vec<_> = skipped_ids.into_iter().map(|(id, _)| id).collect();
-        // Transform transactions into ids.
-        let skipped_transactions: Vec<_> = skipped_transactions
-            .iter()
-            .map(|tx| tx.id(&ChainId::default()))
-            .collect();
-
-        // Check that all transactions are unique.
-        let expected_skipped_ids_set: HashSet<_> =
-            skipped_transactions.clone().into_iter().collect();
-        assert_eq!(expected_skipped_ids_set.len(), TX_NUM);
-
-        // Check that `TxPool::remove_txs` was called with the same ids in the same order.
-        assert_eq!(skipped_ids.len(), TX_NUM);
-        assert_eq!(skipped_transactions.len(), TX_NUM);
-        assert_eq!(skipped_transactions, skipped_ids);
-        vec![]
-    });
+    txpool
+        .expect_notify_skipped_txs()
+        .returning(move |skipped_ids| {
+            let skipped_ids: Vec<_> = skipped_ids.into_iter().map(|(id, _)| id).collect();
+            // Transform transactions into ids.
+            let skipped_transactions: Vec<_> = skipped_transactions
+                .iter()
+                .map(|tx| tx.id(&ChainId::default()))
+                .collect();
+
+            // Check that all transactions are unique.
+            let expected_skipped_ids_set: HashSet<_> =
+                skipped_transactions.clone().into_iter().collect();
+            assert_eq!(expected_skipped_ids_set.len(), TX_NUM);
+
+            // Check that `TxPool::remove_txs` was called with the same ids in the same order.
+            assert_eq!(skipped_ids.len(), TX_NUM);
+            assert_eq!(skipped_transactions.len(), TX_NUM);
+            assert_eq!(skipped_transactions, skipped_ids);
+        });
 
     let signer = SignMode::Key(Secret::new(secret_key.into()));
 
@@ -418,63 +376,6 @@ async fn remove_skipped_transactions() {
     assert!(task.produce_next_block().await.is_ok());
 }
 
-#[tokio::test]
-async fn does_not_produce_when_txpool_empty_in_instant_mode() {
-    // verify the PoA service doesn't trigger empty blocks to be produced when there are
-    // irrelevant updates from the txpool
-    let mut rng = StdRng::seed_from_u64(2322);
-    let secret_key = SecretKey::random(&mut rng);
-
-    let mut block_producer = MockBlockProducer::default();
-
-    block_producer
-        .expect_produce_and_execute_block()
-        .returning(|_, _, _| panic!("Block production should not be called"));
-
-    let mut block_importer = MockBlockImporter::default();
-
-    block_importer
-        .expect_commit_result()
-        .returning(|_| panic!("Block importer should not be called"));
-    block_importer
-        .expect_block_stream()
-        .returning(|| Box::pin(tokio_stream::pending()));
-
-    let mut txpool = MockTransactionPool::no_tx_updates();
-    txpool.expect_total_consumable_gas().returning(|| 0);
-    txpool.expect_pending_number().returning(|| 0);
-
-    let signer = SignMode::Key(Secret::new(secret_key.into()));
-
-    let config = Config {
-        trigger: Trigger::Instant,
-        signer: signer.clone(),
-        metrics: false,
-        ..Default::default()
-    };
-
-    let p2p_port = generate_p2p_port();
-
-    let predefined_blocks: InMemoryPredefinedBlocks = HashMap::new().into();
-
-    let time = TestTime::at_unix_epoch();
-
-    let mut task = MainTask::new(
-        &BlockHeader::new_block(BlockHeight::from(1u32), Tai64::now()),
-        config,
-        txpool,
-        block_producer,
-        block_importer,
-        p2p_port,
-        FakeBlockSigner { succeeds: true },
-        predefined_blocks,
-        time.watch(),
-    );
-
-    // simulate some txpool event to see if any block production is erroneously triggered
-    task.on_txpool_event().await.unwrap();
-}
-
 fn test_signing_key() -> Secret<SecretKeyWrapper> {
     let mut rng = StdRng::seed_from_u64(0);
     let secret_key = SecretKey::random(&mut rng);
diff --git a/crates/services/consensus_module/poa/src/service_test/manually_produce_tests.rs b/crates/services/consensus_module/poa/src/service_test/manually_produce_tests.rs
index 1f6a59f1052..e57f28da8b4 100644
--- a/crates/services/consensus_module/poa/src/service_test/manually_produce_tests.rs
+++ b/crates/services/consensus_module/poa/src/service_test/manually_produce_tests.rs
@@ -61,7 +61,7 @@ async fn can_manually_produce_block(
     let txs = (0..num_txns).map(|_| make_tx(&mut rng)).collect::<Vec<_>>();
     let TxPoolContext {
         txpool,
-        status_sender,
+        new_txs_notifier,
         ..
     } = MockTransactionPool::new_with_txs(txs.clone());
     ctx_builder.with_txpool(txpool);
@@ -96,16 +96,14 @@ async fn can_manually_produce_block(
         });
     ctx_builder.with_importer(importer);
     ctx_builder.with_producer(producer);
-    let ctx = ctx_builder.build();
+    let ctx = ctx_builder.build().await;
 
     ctx.service
         .shared
         .manually_produce_block(Some(start_time), Mode::Blocks { number_of_blocks })
         .await
         .unwrap();
-    for tx in txs {
-        status_sender.send_replace(Some(tx.id(&ChainId::default())));
-    }
+    new_txs_notifier.send_replace(());
 
     for t in times.into_iter() {
         let block_time = rx.recv().await.unwrap();
diff --git a/crates/services/consensus_module/poa/src/service_test/trigger_tests.rs b/crates/services/consensus_module/poa/src/service_test/trigger_tests.rs
index ae881fa2de2..21cc4a22a3f 100644
--- a/crates/services/consensus_module/poa/src/service_test/trigger_tests.rs
+++ b/crates/services/consensus_module/poa/src/service_test/trigger_tests.rs
@@ -22,7 +22,7 @@ async fn clean_startup_shutdown_each_trigger() -> anyhow::Result<()> {
             metrics: false,
             ..Default::default()
         });
-        let ctx = ctx_builder.build();
+        let ctx = ctx_builder.build().await;
 
         assert_eq!(ctx.stop().await, State::Stopped);
     }
@@ -46,7 +46,7 @@ async fn never_trigger_never_produces_blocks() {
     let txs = (0..TX_COUNT).map(|_| make_tx(&mut rng)).collect::<Vec<_>>();
     let TxPoolContext {
         txpool,
-        status_sender,
+        new_txs_notifier,
         ..
     } = MockTransactionPool::new_with_txs(txs.clone());
     ctx_builder.with_txpool(txpool);
@@ -59,10 +59,8 @@ async fn never_trigger_never_produces_blocks() {
         .expect_block_stream()
         .returning(|| Box::pin(tokio_stream::pending()));
     ctx_builder.with_importer(importer);
-    let ctx = ctx_builder.build();
-    for tx in txs {
-        status_sender.send_replace(Some(tx.id(&ChainId::default())));
-    }
+    let ctx = ctx_builder.build().await;
+    new_txs_notifier.send_replace(());
 
     // Make sure enough time passes for the block to be produced
     time::sleep(Duration::new(10, 0)).await;
@@ -75,12 +73,12 @@ struct DefaultContext {
     rng: StdRng,
     test_ctx: TestContext,
     block_import: broadcast::Receiver<SealedBlock>,
-    status_sender: Arc<watch::Sender<Option<TxId>>>,
+    new_txs_notifier: watch::Sender<()>,
     txs: Arc<StdMutex<Vec<Script>>>,
 }
 
 impl DefaultContext {
-    fn new(config: Config) -> Self {
+    async fn new(config: Config) -> Self {
         let mut rng = StdRng::seed_from_u64(1234u64);
         let mut ctx_builder = TestContextBuilder::new();
         ctx_builder.with_config(config);
@@ -88,7 +86,7 @@ impl DefaultContext {
         let tx1 = make_tx(&mut rng);
         let TxPoolContext {
             txpool,
-            status_sender,
+            new_txs_notifier,
             txs,
         } = MockTransactionPool::new_with_txs(vec![tx1]);
         ctx_builder.with_txpool(txpool);
@@ -124,13 +122,13 @@ impl DefaultContext {
         ctx_builder.with_importer(importer);
         ctx_builder.with_producer(block_producer);
 
-        let test_ctx = ctx_builder.build();
+        let test_ctx = ctx_builder.build().await;
 
         Self {
             rng,
             test_ctx,
             block_import: block_import_receiver,
-            status_sender,
+            new_txs_notifier,
             txs,
         }
     }
@@ -159,8 +157,10 @@ async fn instant_trigger_produces_block_instantly() {
         signer: SignMode::Key(test_signing_key()),
         metrics: false,
         ..Default::default()
-    });
-    ctx.status_sender.send_replace(Some(TxId::zeroed()));
+    })
+    .await;
+
+    ctx.new_txs_notifier.send_replace(());
 
     // Make sure it's produced
     assert!(ctx.block_import.recv().await.is_ok());
@@ -178,8 +178,9 @@ async fn interval_trigger_produces_blocks_periodically() -> anyhow::Result<()> {
         signer: SignMode::Key(test_signing_key()),
         metrics: false,
         ..Default::default()
-    });
-    ctx.status_sender.send_replace(Some(TxId::zeroed()));
+    })
+    .await;
+    ctx.new_txs_notifier.send_replace(());
 
     // Make sure no blocks are produced yet
     assert!(matches!(
@@ -193,7 +194,7 @@ async fn interval_trigger_produces_blocks_periodically() -> anyhow::Result<()> {
     // Make sure the empty block is actually produced
     assert!(ctx.block_import.try_recv().is_ok());
     // Emulate tx status update to trigger the execution
-    ctx.status_sender.send_replace(Some(TxId::zeroed()));
+    ctx.new_txs_notifier.send_replace(());
 
     // Make sure no blocks are produced before next interval
     assert!(matches!(
@@ -208,7 +209,7 @@ async fn interval_trigger_produces_blocks_periodically() -> anyhow::Result<()> {
     assert!(ctx.block_import.try_recv().is_ok());
 
     // Emulate tx status update to trigger the execution
-    ctx.status_sender.send_replace(Some(TxId::zeroed()));
+    ctx.new_txs_notifier.send_replace(());
 
     time::sleep(Duration::from_millis(1)).await;
 
@@ -251,8 +252,7 @@ async fn service__if_commit_result_fails_then_retry_commit_result_after_one_seco
 
     let mut ctx_builder = TestContextBuilder::new();
     ctx_builder.with_config(config);
-    let mut mock_tx_pool = MockTransactionPool::no_tx_updates();
-    mock_tx_pool.expect_remove_txs().returning(|_| vec![]);
+    let mock_tx_pool = MockTransactionPool::no_tx_updates();
     ctx_builder.with_txpool(mock_tx_pool);
 
     let mut importer = MockBlockImporter::default();
@@ -276,7 +276,7 @@ async fn service__if_commit_result_fails_then_retry_commit_result_after_one_seco
         .expect_block_stream()
         .returning(|| Box::pin(tokio_stream::pending()));
     ctx_builder.with_importer(importer);
-    let test_ctx = ctx_builder.build();
+    let test_ctx = ctx_builder.build().await;
 
     let before_retry = Instant::now();
 
@@ -299,7 +299,8 @@ async fn interval_trigger_doesnt_react_to_full_txpool() -> anyhow::Result<()> {
         signer: SignMode::Key(test_signing_key()),
         metrics: false,
         ..Default::default()
-    });
+    })
+    .await;
 
     // Brackets to release the lock.
     {
@@ -308,7 +309,7 @@ async fn interval_trigger_doesnt_react_to_full_txpool() -> anyhow::Result<()> {
         for _ in 0..1_000 {
             guard.push(make_tx(&mut ctx.rng));
         }
-        ctx.status_sender.send_replace(Some(TxId::zeroed()));
+        ctx.new_txs_notifier.send_replace(());
     }
 
     // Make sure blocks are not produced before the block time has elapsed
@@ -345,8 +346,9 @@ async fn interval_trigger_produces_blocks_in_the_future_when_time_is_lagging() {
         signer: SignMode::Key(test_signing_key()),
         metrics: false,
         ..Default::default()
-    });
-    ctx.status_sender.send_replace(Some(TxId::zeroed()));
+    })
+    .await;
+    ctx.new_txs_notifier.send_replace(());
     let start_time = ctx.now();
 
     // When
@@ -386,8 +388,9 @@ async fn interval_trigger_produces_blocks_with_current_time_when_block_productio
         signer: SignMode::Key(test_signing_key()),
         metrics: false,
         ..Default::default()
-    });
-    ctx.status_sender.send_replace(Some(TxId::zeroed()));
+    })
+    .await;
+    ctx.new_txs_notifier.send_replace(());
     let start_time = ctx.now();
 
     // When
@@ -443,8 +446,9 @@ async fn interval_trigger_produces_blocks_in_the_future_when_time_rewinds() {
         signer: SignMode::Key(test_signing_key()),
         metrics: false,
         ..Default::default()
-    });
-    ctx.status_sender.send_replace(Some(TxId::zeroed()));
+    })
+    .await;
+    ctx.new_txs_notifier.send_replace(());
     let start_time = ctx.now();
 
     // When
diff --git a/crates/services/executor/src/executor.rs b/crates/services/executor/src/executor.rs
index 23017477481..2e9b6ac6e0d 100644
--- a/crates/services/executor/src/executor.rs
+++ b/crates/services/executor/src/executor.rs
@@ -607,9 +607,16 @@ where
         while regular_tx_iter.peek().is_some() {
             for transaction in regular_tx_iter {
                 let tx_id = transaction.id(&self.consensus_params.chain_id());
-                if transaction.max_gas(&self.consensus_params)? > remaining_gas_limit {
-                    data.skipped_transactions
-                        .push((tx_id, ExecutorError::GasOverflow));
+                let tx_max_gas = transaction.max_gas(&self.consensus_params)?;
+                if tx_max_gas > remaining_gas_limit {
+                    data.skipped_transactions.push((
+                        tx_id,
+                        ExecutorError::GasOverflow(
+                            format!("Transaction cannot fit in remaining gas limit: ({remaining_gas_limit})."),
+                            tx_max_gas,
+                            remaining_gas_limit,
+                        ),
+                    ));
                     continue;
                 }
                 match self.execute_transaction_and_commit(
@@ -923,6 +930,7 @@ where
                             block_height,
                             &self.consensus_params,
                             memory,
+                            block_storage_tx,
                         );
                         match checked_tx_res {
                             Ok(checked_tx) => {
@@ -949,12 +957,16 @@ where
     }
 
     /// Parse forced transaction payloads and perform basic checks
-    fn validate_forced_tx(
+    fn validate_forced_tx<D>(
         relayed_tx: RelayedTransaction,
         block_height: BlockHeight,
         consensus_params: &ConsensusParameters,
         memory: &mut MemoryInstance,
-    ) -> Result<CheckedTransaction, ForcedTransactionFailure> {
+        block_storage_tx: &BlockStorageTransaction<D>,
+    ) -> Result<CheckedTransaction, ForcedTransactionFailure>
+    where
+        D: KeyValueInspect<Column = Column>,
+    {
         let parsed_tx = Self::parse_tx_bytes(&relayed_tx)?;
         Self::tx_is_valid_variant(&parsed_tx)?;
         Self::relayed_tx_claimed_enough_max_gas(
@@ -962,8 +974,13 @@ where
             &relayed_tx,
             consensus_params,
         )?;
-        let checked_tx =
-            Self::get_checked_tx(parsed_tx, block_height, consensus_params, memory)?;
+        let checked_tx = Self::get_checked_tx(
+            parsed_tx,
+            block_height,
+            consensus_params,
+            memory,
+            block_storage_tx,
+        )?;
         Ok(CheckedTransaction::from(checked_tx))
     }
 
@@ -976,14 +993,23 @@ where
         Ok(tx)
     }
 
-    fn get_checked_tx(
+    fn get_checked_tx<D>(
         tx: Transaction,
         height: BlockHeight,
         consensus_params: &ConsensusParameters,
         memory: &mut MemoryInstance,
-    ) -> Result<Checked<Transaction>, ForcedTransactionFailure> {
+        block_storage_tx: &BlockStorageTransaction<D>,
+    ) -> Result<Checked<Transaction>, ForcedTransactionFailure>
+    where
+        D: KeyValueInspect<Column = Column>,
+    {
         let checked_tx = tx
-            .into_checked_reusable_memory(height, consensus_params, memory)
+            .into_checked_reusable_memory(
+                height,
+                consensus_params,
+                memory,
+                block_storage_tx,
+            )
             .map_err(ForcedTransactionFailure::CheckError)?;
         Ok(checked_tx)
     }
@@ -1438,10 +1464,13 @@ where
             .coinbase
             .checked_add(tx_fee)
             .ok_or(ExecutorError::FeeOverflow)?;
-        execution_data.used_gas = execution_data
-            .used_gas
-            .checked_add(used_gas)
-            .ok_or(ExecutorError::GasOverflow)?;
+        execution_data.used_gas = execution_data.used_gas.checked_add(used_gas).ok_or(
+            ExecutorError::GasOverflow(
+                "Execution used gas overflowed.".into(),
+                execution_data.used_gas,
+                used_gas,
+            ),
+        )?;
         execution_data.used_size = execution_data
             .used_size
             .checked_add(used_size)
@@ -1521,7 +1550,7 @@ where
         &self,
         mut checked_tx: Checked<Tx>,
         header: &PartialBlockHeader,
-        storage_tx: &mut TxStorageTransaction<T>,
+        storage_tx: &TxStorageTransaction<T>,
         memory: &mut MemoryInstance,
     ) -> ExecutorResult<Checked<Tx>>
     where
@@ -1530,7 +1559,11 @@ where
         T: KeyValueInspect<Column = Column>,
     {
         checked_tx = checked_tx
-            .check_predicates(&CheckPredicateParams::from(&self.consensus_params), memory)
+            .check_predicates(
+                &CheckPredicateParams::from(&self.consensus_params),
+                memory,
+                storage_tx,
+            )
             .map_err(|e| {
                 ExecutorError::TransactionValidity(TransactionValidityError::Validation(
                     e,
@@ -1790,9 +1823,14 @@ where
                 gas_price,
             )
             .ok_or(ExecutorError::FeeOverflow)?;
-        let total_used_gas = min_gas
-            .checked_add(used_gas)
-            .ok_or(ExecutorError::GasOverflow)?;
+        let total_used_gas =
+            min_gas
+                .checked_add(used_gas)
+                .ok_or(ExecutorError::GasOverflow(
+                    "Total used gas overflowed.".into(),
+                    min_gas,
+                    used_gas,
+                ))?;
         // if there's no script result (i.e. create) then fee == base amount
         Ok((
             total_used_gas,
diff --git a/crates/services/gas_price_service/Cargo.toml b/crates/services/gas_price_service/Cargo.toml
index 05296b1e70b..9903bba7d03 100644
--- a/crates/services/gas_price_service/Cargo.toml
+++ b/crates/services/gas_price_service/Cargo.toml
@@ -18,6 +18,7 @@ fuel-core-types = { workspace = true, features = ["std"] }
 fuel-gas-price-algorithm = { workspace = true }
 futures = { workspace = true }
 num_enum = { workspace = true }
+parking_lot = { workspace = true }
 reqwest = { workspace = true, features = ["json"] }
 serde = { workspace = true }
 strum = { workspace = true, features = ["derive"] }
diff --git a/crates/services/gas_price_service/src/common/gas_price_algorithm.rs b/crates/services/gas_price_service/src/common/gas_price_algorithm.rs
index 9373f62095e..1520a09740b 100644
--- a/crates/services/gas_price_service/src/common/gas_price_algorithm.rs
+++ b/crates/services/gas_price_service/src/common/gas_price_algorithm.rs
@@ -1,6 +1,5 @@
 use fuel_core_types::fuel_types::BlockHeight;
 use std::sync::Arc;
-use tokio::sync::RwLock;
 
 pub trait GasPriceAlgorithm {
     fn next_gas_price(&self) -> u64;
@@ -8,7 +7,7 @@ pub trait GasPriceAlgorithm {
 }
 
 #[derive(Debug, Default)]
-pub struct SharedGasPriceAlgo<A>(Arc<RwLock<A>>);
+pub struct SharedGasPriceAlgo<A>(Arc<parking_lot::RwLock<A>>);
 
 impl<A> Clone for SharedGasPriceAlgo<A> {
     fn clone(&self) -> Self {
@@ -21,11 +20,11 @@ where
     A: Send + Sync,
 {
     pub fn new_with_algorithm(algorithm: A) -> Self {
-        Self(Arc::new(RwLock::new(algorithm)))
+        Self(Arc::new(parking_lot::RwLock::new(algorithm)))
     }
 
     pub async fn update(&mut self, new_algo: A) {
-        let mut write_lock = self.0.write().await;
+        let mut write_lock = self.0.write();
         *write_lock = new_algo;
     }
 }
@@ -34,11 +33,11 @@ impl<A> SharedGasPriceAlgo<A>
 where
     A: GasPriceAlgorithm + Send + Sync,
 {
-    pub async fn next_gas_price(&self) -> u64 {
-        self.0.read().await.next_gas_price()
+    pub fn next_gas_price(&self) -> u64 {
+        self.0.read().next_gas_price()
     }
 
     pub async fn worst_case_gas_price(&self, block_height: BlockHeight) -> u64 {
-        self.0.read().await.worst_case_gas_price(block_height)
+        self.0.read().worst_case_gas_price(block_height)
     }
 }
diff --git a/crates/services/gas_price_service/src/v0/service.rs b/crates/services/gas_price_service/src/v0/service.rs
index ed73b03063d..00df5bb8a68 100644
--- a/crates/services/gas_price_service/src/v0/service.rs
+++ b/crates/services/gas_price_service/src/v0/service.rs
@@ -276,7 +276,7 @@ mod tests {
         );
         let read_algo = service.next_block_algorithm();
         let service = ServiceRunner::new(service);
-        let prev = read_algo.next_gas_price().await;
+        let prev = read_algo.next_gas_price();
 
         // when
         service.start_and_await().await.unwrap();
@@ -284,7 +284,7 @@ mod tests {
         tokio::time::sleep(tokio::time::Duration::from_millis(10)).await;
 
         // then
-        let actual_price = read_algo.next_gas_price().await;
+        let actual_price = read_algo.next_gas_price();
         assert_ne!(prev, actual_price);
         service.stop_and_await().await.unwrap();
     }
diff --git a/crates/services/gas_price_service/src/v0/tests.rs b/crates/services/gas_price_service/src/v0/tests.rs
index 7385ead94bc..9c5128371fd 100644
--- a/crates/services/gas_price_service/src/v0/tests.rs
+++ b/crates/services/gas_price_service/src/v0/tests.rs
@@ -140,7 +140,7 @@ async fn next_gas_price__affected_by_new_l2_block() {
     );
     let service = ServiceRunner::new(service);
     let shared = service.shared.clone();
-    let initial = shared.next_gas_price().await;
+    let initial = shared.next_gas_price();
 
     // when
     service.start_and_await().await.unwrap();
@@ -148,7 +148,7 @@ async fn next_gas_price__affected_by_new_l2_block() {
     tokio::time::sleep(Duration::from_millis(10)).await;
 
     // then
-    let new = shared.next_gas_price().await;
+    let new = shared.next_gas_price();
     assert_ne!(initial, new);
     service.stop_and_await().await.unwrap();
 }
@@ -184,14 +184,14 @@ async fn next__new_l2_block_saves_old_metadata() {
     // when
     let service = ServiceRunner::new(service);
     let shared = service.shared.clone();
-    let start = shared.next_gas_price().await;
+    let start = shared.next_gas_price();
 
     service.start_and_await().await.unwrap();
     l2_block_sender.send(l2_block).await.unwrap();
     tokio::time::sleep(Duration::from_millis(10)).await;
 
     // then
-    let new = shared.next_gas_price().await;
+    let new = shared.next_gas_price();
     assert_ne!(start, new);
 }
 
diff --git a/crates/services/gas_price_service/src/v1.rs b/crates/services/gas_price_service/src/v1.rs
index 534a31b6167..c0f23f5100a 100644
--- a/crates/services/gas_price_service/src/v1.rs
+++ b/crates/services/gas_price_service/src/v1.rs
@@ -1,2 +1,2 @@
 pub mod algorithm;
-pub mod da_source_adapter;
+pub mod da_source_service;
diff --git a/crates/services/gas_price_service/src/v1/da_source_adapter.rs b/crates/services/gas_price_service/src/v1/da_source_adapter.rs
deleted file mode 100644
index d984cdeed91..00000000000
--- a/crates/services/gas_price_service/src/v1/da_source_adapter.rs
+++ /dev/null
@@ -1,163 +0,0 @@
-use crate::{
-    common::utils::Result as GasPriceResult,
-    v1::da_source_adapter::service::{
-        new_service,
-        DaBlockCostsService,
-        DaBlockCostsSource,
-    },
-};
-use fuel_core_services::ServiceRunner;
-use std::{
-    sync::Arc,
-    time::Duration,
-};
-use tokio::sync::{
-    mpsc,
-    Mutex,
-};
-
-pub mod block_committer_costs;
-pub mod dummy_costs;
-pub mod service;
-
-pub const POLLING_INTERVAL_MS: u64 = 10_000;
-
-#[derive(Debug, Default, Clone, Eq, Hash, PartialEq)]
-pub struct DaBlockCosts {
-    pub l2_block_range: core::ops::Range<u32>,
-    pub blob_size_bytes: u32,
-    pub blob_cost_wei: u128,
-}
-
-pub trait GetDaBlockCosts: Send + Sync {
-    fn get(&self) -> GasPriceResult<Option<DaBlockCosts>>;
-}
-
-#[derive(Clone)]
-pub struct DaBlockCostsSharedState {
-    inner: Arc<Mutex<mpsc::Receiver<DaBlockCosts>>>,
-}
-
-impl DaBlockCostsSharedState {
-    fn new(receiver: mpsc::Receiver<DaBlockCosts>) -> Self {
-        Self {
-            inner: Arc::new(Mutex::new(receiver)),
-        }
-    }
-}
-
-pub struct DaBlockCostsProvider<T: DaBlockCostsSource + 'static> {
-    pub service: ServiceRunner<DaBlockCostsService<T>>,
-    pub shared_state: DaBlockCostsSharedState,
-}
-
-const CHANNEL_BUFFER_SIZE: usize = 10;
-
-impl<T> DaBlockCostsProvider<T>
-where
-    T: DaBlockCostsSource,
-{
-    pub fn new(source: T, polling_interval: Option<Duration>) -> Self {
-        let (sender, receiver) = mpsc::channel(CHANNEL_BUFFER_SIZE);
-        let service = new_service(source, sender, polling_interval);
-        Self {
-            shared_state: DaBlockCostsSharedState::new(receiver),
-            service,
-        }
-    }
-}
-
-impl GetDaBlockCosts for DaBlockCostsSharedState {
-    fn get(&self) -> GasPriceResult<Option<DaBlockCosts>> {
-        if let Ok(mut guard) = self.inner.try_lock() {
-            if let Ok(da_block_costs) = guard.try_recv() {
-                return Ok(Some(da_block_costs));
-            }
-        }
-        Ok(None)
-    }
-}
-
-#[allow(non_snake_case)]
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::v1::da_source_adapter::dummy_costs::DummyDaBlockCosts;
-    use fuel_core_services::Service;
-    use std::time::Duration;
-    use tokio::time::sleep;
-
-    #[tokio::test]
-    async fn run__when_da_block_cost_source_gives_value_shared_value_is_updated() {
-        // given
-        let expected_da_cost = DaBlockCosts {
-            l2_block_range: 0..10,
-            blob_size_bytes: 1024 * 128,
-            blob_cost_wei: 2,
-        };
-        let da_block_costs_source = DummyDaBlockCosts::new(Ok(expected_da_cost.clone()));
-        let provider = DaBlockCostsProvider::new(
-            da_block_costs_source,
-            Some(Duration::from_millis(1)),
-        );
-        let shared_state = provider.shared_state.clone();
-
-        // when
-        provider.service.start_and_await().await.unwrap();
-        sleep(Duration::from_millis(10)).await;
-        provider.service.stop_and_await().await.unwrap();
-
-        // then
-        let da_block_costs_opt = shared_state.get().unwrap();
-        assert!(da_block_costs_opt.is_some());
-        assert_eq!(da_block_costs_opt.unwrap(), expected_da_cost);
-    }
-
-    #[tokio::test]
-    async fn run__when_da_block_cost_source_gives_value_shared_value_is_marked_stale() {
-        // given
-        let expected_da_cost = DaBlockCosts {
-            l2_block_range: 0..10,
-            blob_size_bytes: 1024 * 128,
-            blob_cost_wei: 1,
-        };
-        let da_block_costs_source = DummyDaBlockCosts::new(Ok(expected_da_cost.clone()));
-        let provider = DaBlockCostsProvider::new(
-            da_block_costs_source,
-            Some(Duration::from_millis(1)),
-        );
-        let shared_state = provider.shared_state.clone();
-
-        // when
-        provider.service.start_and_await().await.unwrap();
-        sleep(Duration::from_millis(10)).await;
-        provider.service.stop_and_await().await.unwrap();
-        let da_block_costs_opt = shared_state.get().unwrap();
-        assert!(da_block_costs_opt.is_some());
-        assert_eq!(da_block_costs_opt.unwrap(), expected_da_cost);
-
-        // then
-        let da_block_costs_opt = shared_state.get().unwrap();
-        assert!(da_block_costs_opt.is_none());
-    }
-
-    #[tokio::test]
-    async fn run__when_da_block_cost_source_errors_shared_value_is_not_updated() {
-        // given
-        let da_block_costs_source = DummyDaBlockCosts::new(Err(anyhow::anyhow!("boo!")));
-        let provider = DaBlockCostsProvider::new(
-            da_block_costs_source,
-            Some(Duration::from_millis(1)),
-        );
-        let shared_state = provider.shared_state.clone();
-
-        // when
-        provider.service.start_and_await().await.unwrap();
-        sleep(Duration::from_millis(10)).await;
-        provider.service.stop_and_await().await.unwrap();
-
-        // then
-        let da_block_costs_opt = shared_state.get().unwrap();
-        assert!(da_block_costs_opt.is_none());
-    }
-}
diff --git a/crates/services/gas_price_service/src/v1/da_source_adapter/block_committer_costs.rs b/crates/services/gas_price_service/src/v1/da_source_adapter/block_committer_costs.rs
deleted file mode 100644
index 7c0beaaffbf..00000000000
--- a/crates/services/gas_price_service/src/v1/da_source_adapter/block_committer_costs.rs
+++ /dev/null
@@ -1,62 +0,0 @@
-use crate::v1::da_source_adapter::{
-    service::{
-        DaBlockCostsSource,
-        Result as DaBlockCostsResult,
-    },
-    DaBlockCosts,
-};
-use anyhow::anyhow;
-use reqwest::Url;
-use serde::{
-    Deserialize,
-    Serialize,
-};
-
-/// This struct is used to denote the block committer da gas price source,,
-/// which receives data from the block committer (only http api for now)
-pub struct BlockCommitterDaBlockCosts {
-    client: reqwest::Client,
-    url: Url,
-}
-
-#[derive(Debug, Deserialize, Serialize, Clone, Default, PartialEq)]
-struct RawDaBlockCosts {
-    pub l2_block_range: core::ops::Range<u32>,
-    pub blob_size_bytes: u32,
-    pub blob_cost: u128,
-}
-
-impl From<RawDaBlockCosts> for DaBlockCosts {
-    fn from(raw: RawDaBlockCosts) -> Self {
-        DaBlockCosts {
-            l2_block_range: raw.l2_block_range,
-            blob_size_bytes: raw.blob_size_bytes,
-            blob_cost_wei: raw.blob_cost,
-        }
-    }
-}
-
-impl BlockCommitterDaBlockCosts {
-    /// Create a new instance of the block committer da gas price source
-    pub fn new(url: String) -> Self {
-        Self {
-            client: reqwest::Client::new(),
-            url: Url::parse(&url).unwrap(),
-        }
-    }
-}
-
-#[async_trait::async_trait]
-impl DaBlockCostsSource for BlockCommitterDaBlockCosts {
-    async fn request_da_block_cost(&mut self) -> DaBlockCostsResult<DaBlockCosts> {
-        let response = self.client.get(self.url.clone()).send().await?;
-        if !response.status().is_success() {
-            return Err(anyhow!("failed with response: {}", response.status()));
-        }
-        let response = response
-            .json::<RawDaBlockCosts>()
-            .await
-            .map_err(|err| anyhow!(err))?;
-        Ok(response.into())
-    }
-}
diff --git a/crates/services/gas_price_service/src/v1/da_source_adapter/dummy_costs.rs b/crates/services/gas_price_service/src/v1/da_source_adapter/dummy_costs.rs
deleted file mode 100644
index d962db83f56..00000000000
--- a/crates/services/gas_price_service/src/v1/da_source_adapter/dummy_costs.rs
+++ /dev/null
@@ -1,27 +0,0 @@
-use crate::v1::da_source_adapter::{
-    service::{
-        DaBlockCostsSource,
-        Result as DaBlockCostsResult,
-    },
-    DaBlockCosts,
-};
-
-pub struct DummyDaBlockCosts {
-    value: DaBlockCostsResult<DaBlockCosts>,
-}
-
-impl DummyDaBlockCosts {
-    pub fn new(value: DaBlockCostsResult<DaBlockCosts>) -> Self {
-        Self { value }
-    }
-}
-
-#[async_trait::async_trait]
-impl DaBlockCostsSource for DummyDaBlockCosts {
-    async fn request_da_block_cost(&mut self) -> DaBlockCostsResult<DaBlockCosts> {
-        match &self.value {
-            Ok(da_block_costs) => Ok(da_block_costs.clone()),
-            Err(err) => Err(anyhow::anyhow!(err.to_string())),
-        }
-    }
-}
diff --git a/crates/services/gas_price_service/src/v1/da_source_service.rs b/crates/services/gas_price_service/src/v1/da_source_service.rs
new file mode 100644
index 00000000000..eb699233455
--- /dev/null
+++ b/crates/services/gas_price_service/src/v1/da_source_service.rs
@@ -0,0 +1,71 @@
+use crate::v1::da_source_service::service::DaBlockCostsSource;
+use std::time::Duration;
+
+pub mod block_committer_costs;
+pub mod dummy_costs;
+pub mod service;
+
+#[derive(Debug, Default, Clone, Eq, Hash, PartialEq)]
+pub struct DaBlockCosts {
+    pub l2_block_range: core::ops::Range<u64>,
+    pub blob_size_bytes: u32,
+    pub blob_cost_wei: u128,
+}
+
+#[allow(non_snake_case)]
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::v1::da_source_service::{
+        dummy_costs::DummyDaBlockCosts,
+        service::new_service,
+    };
+    use fuel_core_services::Service;
+    use std::{
+        sync::Arc,
+        time::Duration,
+    };
+
+    #[tokio::test]
+    async fn run__when_da_block_cost_source_gives_value_shared_state_is_updated() {
+        // given
+        let expected_da_cost = DaBlockCosts {
+            l2_block_range: 0..10,
+            blob_size_bytes: 1024 * 128,
+            blob_cost_wei: 2,
+        };
+        let notifier = Arc::new(tokio::sync::Notify::new());
+        let da_block_costs_source =
+            DummyDaBlockCosts::new(Ok(expected_da_cost.clone()), notifier.clone());
+        let service = new_service(da_block_costs_source, Some(Duration::from_millis(1)));
+        let mut shared_state = &mut service.shared.subscribe();
+
+        // when
+        service.start_and_await().await.unwrap();
+        notifier.notified().await;
+
+        // then
+        let actual_da_cost = shared_state.try_recv().unwrap();
+        assert_eq!(actual_da_cost, expected_da_cost);
+        service.stop_and_await().await.unwrap();
+    }
+
+    #[tokio::test]
+    async fn run__when_da_block_cost_source_errors_shared_state_is_not_updated() {
+        // given
+        let notifier = Arc::new(tokio::sync::Notify::new());
+        let da_block_costs_source =
+            DummyDaBlockCosts::new(Err(anyhow::anyhow!("boo!")), notifier.clone());
+        let service = new_service(da_block_costs_source, Some(Duration::from_millis(1)));
+        let mut shared_state = &mut service.shared.subscribe();
+
+        // when
+        service.start_and_await().await.unwrap();
+        notifier.notified().await;
+
+        // then
+        let da_block_costs_res = shared_state.try_recv();
+        assert!(da_block_costs_res.is_err());
+        service.stop_and_await().await.unwrap();
+    }
+}
diff --git a/crates/services/gas_price_service/src/v1/da_source_service/block_committer_costs.rs b/crates/services/gas_price_service/src/v1/da_source_service/block_committer_costs.rs
new file mode 100644
index 00000000000..7016fe0da08
--- /dev/null
+++ b/crates/services/gas_price_service/src/v1/da_source_service/block_committer_costs.rs
@@ -0,0 +1,324 @@
+#![allow(clippy::arithmetic_side_effects)]
+
+use crate::v1::da_source_service::{
+    service::{
+        DaBlockCostsSource,
+        Result as DaBlockCostsResult,
+    },
+    DaBlockCosts,
+};
+use anyhow::anyhow;
+use fuel_core_types::blockchain::primitives::DaBlockHeight;
+use serde::{
+    Deserialize,
+    Serialize,
+};
+
+#[async_trait::async_trait]
+trait BlockCommitterApi: Send + Sync {
+    /// Used on first run to get the latest costs and seqno
+    async fn get_latest_costs(&self) -> DaBlockCostsResult<Option<RawDaBlockCosts>>;
+    /// Used to get the costs for a specific seqno
+    async fn get_costs_by_seqno(
+        &self,
+        number: u64,
+    ) -> DaBlockCostsResult<Option<RawDaBlockCosts>>;
+    /// Used to get the costs for a range of blocks (inclusive)
+    async fn get_cost_bundles_by_range(
+        &self,
+        range: core::ops::Range<u64>,
+    ) -> DaBlockCostsResult<Vec<Option<RawDaBlockCosts>>>;
+}
+
+/// This struct is used to denote the block committer da block costs source
+/// which receives data from the block committer (only http api for now)
+pub struct BlockCommitterDaBlockCosts<BlockCommitter> {
+    client: BlockCommitter,
+    last_raw_da_block_costs: Option<RawDaBlockCosts>,
+}
+
+#[derive(Debug, Deserialize, Serialize, Clone, Default, PartialEq)]
+pub struct RawDaBlockCosts {
+    /// Sequence number (Monotonically increasing nonce)
+    pub sequence_number: u64,
+    /// The range of blocks that the costs apply to
+    pub blocks_range: core::ops::Range<u64>,
+    /// The DA block height of the last transaction for the range of blocks
+    pub da_block_height: DaBlockHeight,
+    /// Rolling sum cost of posting blobs (wei)
+    pub total_cost: u128,
+    /// Rolling sum size of blobs (bytes)
+    pub total_size_bytes: u32,
+}
+
+impl From<&RawDaBlockCosts> for DaBlockCosts {
+    fn from(raw_da_block_costs: &RawDaBlockCosts) -> Self {
+        DaBlockCosts {
+            l2_block_range: raw_da_block_costs.blocks_range.clone(),
+            blob_size_bytes: raw_da_block_costs.total_size_bytes,
+            blob_cost_wei: raw_da_block_costs.total_cost,
+        }
+    }
+}
+
+impl<BlockCommitter> BlockCommitterDaBlockCosts<BlockCommitter> {
+    /// Create a new instance of the block committer da block costs source
+    pub fn new(client: BlockCommitter, last_value: Option<RawDaBlockCosts>) -> Self {
+        Self {
+            client,
+            last_raw_da_block_costs: last_value,
+        }
+    }
+}
+
+#[async_trait::async_trait]
+impl<BlockCommitter> DaBlockCostsSource for BlockCommitterDaBlockCosts<BlockCommitter>
+where
+    BlockCommitter: BlockCommitterApi,
+{
+    async fn request_da_block_cost(&mut self) -> DaBlockCostsResult<DaBlockCosts> {
+        let raw_da_block_costs = match self.last_raw_da_block_costs {
+            Some(ref last_value) => self
+                .client
+                .get_costs_by_seqno(last_value.sequence_number + 1),
+            _ => self.client.get_latest_costs(),
+        }
+        .await?;
+
+        let Some(ref raw_da_block_costs) = raw_da_block_costs else {
+            return Err(anyhow!("No response from block committer"))
+        };
+
+        let da_block_costs = self.last_raw_da_block_costs.iter().fold(
+            Ok(raw_da_block_costs.into()),
+            |costs: DaBlockCostsResult<DaBlockCosts>, last_value| {
+                let costs = costs.expect("Defined to be OK");
+                let blob_size_bytes = costs
+                    .blob_size_bytes
+                    .checked_sub(last_value.total_size_bytes)
+                    .ok_or(anyhow!("Blob size bytes underflow"))?;
+                let blob_cost_wei = raw_da_block_costs
+                    .total_cost
+                    .checked_sub(last_value.total_cost)
+                    .ok_or(anyhow!("Blob cost wei underflow"))?;
+                Ok(DaBlockCosts {
+                    blob_size_bytes,
+                    blob_cost_wei,
+                    ..costs
+                })
+            },
+        )?;
+
+        self.last_raw_da_block_costs = Some(raw_da_block_costs.clone());
+        Ok(da_block_costs)
+    }
+}
+
+pub struct BlockCommitterHttpApi {
+    client: reqwest::Client,
+    url: String,
+}
+
+impl BlockCommitterHttpApi {
+    pub fn new(url: String) -> Self {
+        Self {
+            client: reqwest::Client::new(),
+            url,
+        }
+    }
+}
+
+#[async_trait::async_trait]
+impl BlockCommitterApi for BlockCommitterHttpApi {
+    async fn get_latest_costs(&self) -> DaBlockCostsResult<Option<RawDaBlockCosts>> {
+        let response = self
+            .client
+            .get(&self.url)
+            .send()
+            .await?
+            .json::<RawDaBlockCosts>()
+            .await?;
+        Ok(Some(response))
+    }
+
+    async fn get_costs_by_seqno(
+        &self,
+        number: u64,
+    ) -> DaBlockCostsResult<Option<RawDaBlockCosts>> {
+        let response = self
+            .client
+            .get(&format!("{}/{}", self.url, number))
+            .send()
+            .await?
+            .json::<RawDaBlockCosts>()
+            .await?;
+        Ok(Some(response))
+    }
+
+    async fn get_cost_bundles_by_range(
+        &self,
+        range: core::ops::Range<u64>,
+    ) -> DaBlockCostsResult<Vec<Option<RawDaBlockCosts>>> {
+        let response = self
+            .client
+            .get(&format!("{}/{}-{}", self.url, range.start, range.end))
+            .send()
+            .await?
+            .json::<Vec<RawDaBlockCosts>>()
+            .await?;
+        Ok(response.into_iter().map(Some).collect())
+    }
+}
+
+#[cfg(test)]
+#[allow(non_snake_case)]
+mod tests {
+    use super::*;
+
+    struct MockBlockCommitterApi {
+        value: Option<RawDaBlockCosts>,
+    }
+
+    impl MockBlockCommitterApi {
+        fn new(value: Option<RawDaBlockCosts>) -> Self {
+            Self { value }
+        }
+    }
+
+    #[async_trait::async_trait]
+    impl BlockCommitterApi for MockBlockCommitterApi {
+        async fn get_latest_costs(&self) -> DaBlockCostsResult<Option<RawDaBlockCosts>> {
+            Ok(self.value.clone())
+        }
+        async fn get_costs_by_seqno(
+            &self,
+            seq_no: u64,
+        ) -> DaBlockCostsResult<Option<RawDaBlockCosts>> {
+            // arbitrary logic to generate a new value
+            let mut value = self.value.clone();
+            if let Some(value) = &mut value {
+                value.sequence_number = seq_no;
+                value.blocks_range =
+                    value.blocks_range.end * seq_no..value.blocks_range.end * seq_no + 10;
+                value.da_block_height = value.da_block_height + (seq_no + 1).into();
+                value.total_cost += 1;
+                value.total_size_bytes += 1;
+            }
+            Ok(value)
+        }
+        async fn get_cost_bundles_by_range(
+            &self,
+            _: core::ops::Range<u64>,
+        ) -> DaBlockCostsResult<Vec<Option<RawDaBlockCosts>>> {
+            Ok(vec![self.value.clone()])
+        }
+    }
+
+    fn test_da_block_costs() -> RawDaBlockCosts {
+        RawDaBlockCosts {
+            sequence_number: 1,
+            blocks_range: 0..10,
+            da_block_height: 1u64.into(),
+            total_cost: 1,
+            total_size_bytes: 1,
+        }
+    }
+
+    #[tokio::test]
+    async fn request_da_block_cost__when_last_value_is_none__then_get_latest_costs_is_called(
+    ) {
+        // given
+        let da_block_costs = test_da_block_costs();
+        let expected = (&da_block_costs).into();
+        let mock_api = MockBlockCommitterApi::new(Some(da_block_costs));
+        let mut block_committer = BlockCommitterDaBlockCosts::new(mock_api, None);
+
+        // when
+        let actual = block_committer.request_da_block_cost().await.unwrap();
+
+        // then
+        assert_eq!(actual, expected);
+    }
+
+    #[tokio::test]
+    async fn request_da_block_cost__when_last_value_is_some__then_get_costs_by_seqno_is_called(
+    ) {
+        // given
+        let mut da_block_costs = test_da_block_costs();
+        let mock_api = MockBlockCommitterApi::new(Some(da_block_costs.clone()));
+        let mut block_committer =
+            BlockCommitterDaBlockCosts::new(mock_api, Some(da_block_costs.clone()));
+
+        // when
+        let actual = block_committer.request_da_block_cost().await.unwrap();
+
+        // then
+        assert_ne!(da_block_costs.blocks_range, actual.l2_block_range);
+    }
+
+    #[tokio::test]
+    async fn request_da_block_cost__when_response_is_none__then_error() {
+        // given
+        let mock_api = MockBlockCommitterApi::new(None);
+        let mut block_committer = BlockCommitterDaBlockCosts::new(mock_api, None);
+
+        // when
+        let result = block_committer.request_da_block_cost().await;
+
+        // then
+        assert!(result.is_err());
+    }
+
+    struct UnderflowingMockBlockCommitterApi {
+        value: Option<RawDaBlockCosts>,
+    }
+
+    impl UnderflowingMockBlockCommitterApi {
+        fn new(value: Option<RawDaBlockCosts>) -> Self {
+            Self { value }
+        }
+    }
+
+    #[async_trait::async_trait]
+    impl BlockCommitterApi for UnderflowingMockBlockCommitterApi {
+        async fn get_latest_costs(&self) -> DaBlockCostsResult<Option<RawDaBlockCosts>> {
+            Ok(self.value.clone())
+        }
+        async fn get_costs_by_seqno(
+            &self,
+            seq_no: u64,
+        ) -> DaBlockCostsResult<Option<RawDaBlockCosts>> {
+            // arbitrary logic to generate a new value
+            let mut value = self.value.clone();
+            if let Some(value) = &mut value {
+                value.sequence_number = seq_no;
+                value.blocks_range = value.blocks_range.end..value.blocks_range.end + 10;
+                value.da_block_height = value.da_block_height + 1u64.into();
+                value.total_cost -= 1;
+                value.total_size_bytes -= 1;
+            }
+            Ok(value)
+        }
+        async fn get_cost_bundles_by_range(
+            &self,
+            _: core::ops::Range<u64>,
+        ) -> DaBlockCostsResult<Vec<Option<RawDaBlockCosts>>> {
+            Ok(vec![self.value.clone()])
+        }
+    }
+
+    #[tokio::test]
+    async fn request_da_block_cost__when_underflow__then_error() {
+        // given
+        let da_block_costs = test_da_block_costs();
+        let mock_api = UnderflowingMockBlockCommitterApi::new(Some(da_block_costs));
+        let mut block_committer = BlockCommitterDaBlockCosts::new(mock_api, None);
+        let _ = block_committer.request_da_block_cost().await.unwrap();
+
+        // when
+        let result = block_committer.request_da_block_cost().await;
+
+        // then
+        assert!(result.is_err());
+    }
+}
diff --git a/crates/services/gas_price_service/src/v1/da_source_service/dummy_costs.rs b/crates/services/gas_price_service/src/v1/da_source_service/dummy_costs.rs
new file mode 100644
index 00000000000..8fe22a89e0b
--- /dev/null
+++ b/crates/services/gas_price_service/src/v1/da_source_service/dummy_costs.rs
@@ -0,0 +1,37 @@
+use crate::v1::da_source_service::{
+    service::{
+        DaBlockCostsSource,
+        Result as DaBlockCostsResult,
+    },
+    DaBlockCosts,
+};
+use std::sync::Arc;
+use tokio::sync::Notify;
+
+pub struct DummyDaBlockCosts {
+    value: DaBlockCostsResult<DaBlockCosts>,
+    // This is a workaround to notify the test when the value is ready/errored.
+    notifier: Arc<Notify>,
+}
+
+impl DummyDaBlockCosts {
+    pub fn new(value: DaBlockCostsResult<DaBlockCosts>, notifier: Arc<Notify>) -> Self {
+        Self { value, notifier }
+    }
+}
+
+#[async_trait::async_trait]
+impl DaBlockCostsSource for DummyDaBlockCosts {
+    async fn request_da_block_cost(&mut self) -> DaBlockCostsResult<DaBlockCosts> {
+        match &self.value {
+            Ok(da_block_costs) => {
+                self.notifier.notify_waiters();
+                Ok(da_block_costs.clone())
+            }
+            Err(err) => {
+                self.notifier.notify_waiters();
+                Err(anyhow::anyhow!(err.to_string()))
+            }
+        }
+    }
+}
diff --git a/crates/services/gas_price_service/src/v1/da_source_adapter/service.rs b/crates/services/gas_price_service/src/v1/da_source_service/service.rs
similarity index 64%
rename from crates/services/gas_price_service/src/v1/da_source_adapter/service.rs
rename to crates/services/gas_price_service/src/v1/da_source_service/service.rs
index c87defa52f5..1f9cadf02dd 100644
--- a/crates/services/gas_price_service/src/v1/da_source_adapter/service.rs
+++ b/crates/services/gas_price_service/src/v1/da_source_service/service.rs
@@ -4,53 +4,57 @@ use fuel_core_services::{
     ServiceRunner,
     StateWatcher,
 };
-use std::{
-    collections::HashSet,
-    time::Duration,
-};
+use std::time::Duration;
 use tokio::{
-    sync::mpsc::Sender,
+    sync::broadcast::Sender,
     time::{
         interval,
         Interval,
     },
 };
 
-use crate::v1::da_source_adapter::{
-    DaBlockCosts,
-    POLLING_INTERVAL_MS,
-};
+use crate::v1::da_source_service::DaBlockCosts;
 pub use anyhow::Result;
 
+#[derive(Clone)]
+pub struct SharedState(Sender<DaBlockCosts>);
+
+impl SharedState {
+    fn new(sender: Sender<DaBlockCosts>) -> Self {
+        Self(sender)
+    }
+    pub fn subscribe(&self) -> tokio::sync::broadcast::Receiver<DaBlockCosts> {
+        self.0.subscribe()
+    }
+}
+
 /// This struct houses the shared_state, polling interval
 /// and a source, which does the actual fetching of the data
-pub struct DaBlockCostsService<Source>
+pub struct DaSourceService<Source>
 where
     Source: DaBlockCostsSource,
 {
     poll_interval: Interval,
     source: Source,
-    sender: Sender<DaBlockCosts>,
-    cache: HashSet<DaBlockCosts>,
+    shared_state: SharedState,
 }
 
-impl<Source> DaBlockCostsService<Source>
+const DA_BLOCK_COSTS_CHANNEL_SIZE: usize = 10;
+const POLLING_INTERVAL_MS: u64 = 10_000;
+
+impl<Source> DaSourceService<Source>
 where
     Source: DaBlockCostsSource,
 {
-    pub fn new(
-        source: Source,
-        sender: Sender<DaBlockCosts>,
-        poll_interval: Option<Duration>,
-    ) -> Self {
+    pub fn new(source: Source, poll_interval: Option<Duration>) -> Self {
+        let (sender, _) = tokio::sync::broadcast::channel(DA_BLOCK_COSTS_CHANNEL_SIZE);
         #[allow(clippy::arithmetic_side_effects)]
         Self {
-            sender,
+            shared_state: SharedState::new(sender),
             poll_interval: interval(
                 poll_interval.unwrap_or(Duration::from_millis(POLLING_INTERVAL_MS)),
             ),
             source,
-            cache: Default::default(),
         }
     }
 }
@@ -63,19 +67,21 @@ pub trait DaBlockCostsSource: Send + Sync {
 }
 
 #[async_trait::async_trait]
-impl<Source> RunnableService for DaBlockCostsService<Source>
+impl<Source> RunnableService for DaSourceService<Source>
 where
     Source: DaBlockCostsSource,
 {
-    const NAME: &'static str = "DaBlockCostsService";
+    const NAME: &'static str = "DaSourceService";
 
-    type SharedData = ();
+    type SharedData = SharedState;
 
     type Task = Self;
 
     type TaskParams = ();
 
-    fn shared_data(&self) -> Self::SharedData {}
+    fn shared_data(&self) -> Self::SharedData {
+        self.shared_state.clone()
+    }
 
     async fn into_task(
         mut self,
@@ -88,7 +94,7 @@ where
 }
 
 #[async_trait::async_trait]
-impl<Source> RunnableTask for DaBlockCostsService<Source>
+impl<Source> RunnableTask for DaSourceService<Source>
 where
     Source: DaBlockCostsSource,
 {
@@ -104,10 +110,7 @@ where
             }
             _ = self.poll_interval.tick() => {
                 let da_block_costs = self.source.request_da_block_cost().await?;
-                if !self.cache.contains(&da_block_costs) {
-                    self.cache.insert(da_block_costs.clone());
-                    self.sender.send(da_block_costs).await?;
-                }
+                self.shared_state.0.send(da_block_costs)?;
                 continue_running = true;
             }
         }
@@ -123,8 +126,7 @@ where
 
 pub fn new_service<S: DaBlockCostsSource>(
     da_source: S,
-    sender: Sender<DaBlockCosts>,
     poll_interval: Option<Duration>,
-) -> ServiceRunner<DaBlockCostsService<S>> {
-    ServiceRunner::new(DaBlockCostsService::new(da_source, sender, poll_interval))
+) -> ServiceRunner<DaSourceService<S>> {
+    ServiceRunner::new(DaSourceService::new(da_source, poll_interval))
 }
diff --git a/crates/services/p2p/Cargo.toml b/crates/services/p2p/Cargo.toml
index e7a27877ee0..718e3bbf0d7 100644
--- a/crates/services/p2p/Cargo.toml
+++ b/crates/services/p2p/Cargo.toml
@@ -15,7 +15,7 @@ anyhow = { workspace = true }
 async-trait = { workspace = true }
 fuel-core-chain-config = { workspace = true }
 fuel-core-metrics = { workspace = true } # TODO make this a feature
-fuel-core-services = { workspace = true }
+fuel-core-services = { workspace = true, features = ["sync-processor"] }
 fuel-core-storage = { workspace = true, features = ["std"] }
 fuel-core-types = { workspace = true, features = ["std", "serde"] }
 futures = { workspace = true }
diff --git a/crates/services/p2p/src/config.rs b/crates/services/p2p/src/config.rs
index 3119d8eb2e9..0cfad8c3647 100644
--- a/crates/services/p2p/src/config.rs
+++ b/crates/services/p2p/src/config.rs
@@ -130,6 +130,12 @@ pub struct Config<State = Initialized> {
     /// Enables prometheus metrics for this fuel-service
     pub metrics: bool,
 
+    /// Number of threads to read from the database.
+    pub database_read_threads: usize,
+
+    /// Number of threads to read from the TxPool.
+    pub tx_pool_threads: usize,
+
     /// It is the state of the config initialization. Everyone can create an instance of the `Self`
     /// with the `NotInitialized` state. But it can be set into the `Initialized` state only with
     /// the `init` method.
@@ -178,6 +184,8 @@ impl Config<NotInitialized> {
             heartbeat_max_avg_interval: self.heartbeat_max_time_since_last,
             heartbeat_max_time_since_last: self.heartbeat_max_time_since_last,
             metrics: self.metrics,
+            database_read_threads: self.database_read_threads,
+            tx_pool_threads: self.tx_pool_threads,
             state: Initialized(()),
         })
     }
@@ -228,6 +236,8 @@ impl Config<NotInitialized> {
             info_interval: Some(Duration::from_secs(3)),
             identify_interval: Some(Duration::from_secs(5)),
             metrics: false,
+            database_read_threads: 0,
+            tx_pool_threads: 0,
             state: NotInitialized,
         }
     }
diff --git a/crates/services/p2p/src/discovery/discovery_config.rs b/crates/services/p2p/src/discovery/discovery_config.rs
index 88589c9655f..3500938f4d1 100644
--- a/crates/services/p2p/src/discovery/discovery_config.rs
+++ b/crates/services/p2p/src/discovery/discovery_config.rs
@@ -3,6 +3,7 @@ use crate::{
         mdns_wrapper::MdnsWrapper,
         Behaviour,
     },
+    utils::is_dialable,
     TryPeerId,
 };
 use libp2p::{
@@ -78,7 +79,9 @@ impl Config {
     where
         I: IntoIterator<Item = Multiaddr>,
     {
-        self.reserved_nodes.extend(reserved_nodes);
+        // skip undialable multiaddresses
+        let dialable_reserved_nodes = reserved_nodes.into_iter().filter(is_dialable);
+        self.reserved_nodes.extend(dialable_reserved_nodes);
         self
     }
 
diff --git a/crates/services/p2p/src/gossipsub/config.rs b/crates/services/p2p/src/gossipsub/config.rs
index 00b36b386ce..d045c4b95d9 100644
--- a/crates/services/p2p/src/gossipsub/config.rs
+++ b/crates/services/p2p/src/gossipsub/config.rs
@@ -1,8 +1,13 @@
+use super::topics::{
+    GossipTopic,
+    NEW_TX_GOSSIP_TOPIC,
+};
 use crate::{
     config::{
         Config,
         MAX_RESPONSE_SIZE,
     },
+    utils::is_dialable,
     TryPeerId,
 };
 use fuel_core_metrics::global_registry;
@@ -25,11 +30,6 @@ use std::{
     time::Duration,
 };
 
-use super::topics::{
-    GossipTopic,
-    NEW_TX_GOSSIP_TOPIC,
-};
-
 // The number of slots in each epoch.
 const SLOTS_PER_EPOCH: u64 = 32;
 
@@ -206,6 +206,8 @@ pub(crate) fn build_gossipsub_behaviour(p2p_config: &Config) -> gossipsub::Behav
     let reserved_nodes = p2p_config.reserved_nodes.clone();
     let explicit_peers = reserved_nodes
         .iter()
+        // skip undialable multiaddresses
+        .filter(|multiaddr| is_dialable(multiaddr))
         .filter_map(|address| address.try_to_peer_id());
     for peer_id in explicit_peers {
         gossipsub.add_explicit_peer(&peer_id);
diff --git a/crates/services/p2p/src/lib.rs b/crates/services/p2p/src/lib.rs
index f14599612bc..fbd82c25453 100644
--- a/crates/services/p2p/src/lib.rs
+++ b/crates/services/p2p/src/lib.rs
@@ -8,13 +8,13 @@ pub mod discovery;
 mod dnsaddr_resolution;
 pub mod gossipsub;
 pub mod heartbeat;
-pub mod heavy_task_processor;
 pub mod p2p_service;
 pub mod peer_manager;
 pub mod peer_report;
 pub mod ports;
 pub mod request_response;
 pub mod service;
+mod utils;
 
 pub use gossipsub::config as gossipsub_config;
 pub use heartbeat::Config;
diff --git a/crates/services/p2p/src/peer_report.rs b/crates/services/p2p/src/peer_report.rs
index 193395d9f2c..00442db3151 100644
--- a/crates/services/p2p/src/peer_report.rs
+++ b/crates/services/p2p/src/peer_report.rs
@@ -1,4 +1,7 @@
-use crate::TryPeerId;
+use crate::{
+    utils::is_dialable,
+    TryPeerId,
+};
 use libp2p::{
     self,
     core::Endpoint,
@@ -77,6 +80,11 @@ impl Behaviour {
         let mut reserved_nodes_multiaddr_map = BTreeMap::<PeerId, Vec<Multiaddr>>::new();
 
         for multiaddr in reserved_nodes_multiaddrs {
+            // skip undialable multiaddresses
+            if !is_dialable(multiaddr) {
+                break;
+            }
+
             let peer_id = multiaddr
                 .try_to_peer_id()
                 .expect("Multiaddr MUST have a PeerId");
diff --git a/crates/services/p2p/src/ports.rs b/crates/services/p2p/src/ports.rs
index 9bf68d3ed09..a15de0081d6 100644
--- a/crates/services/p2p/src/ports.rs
+++ b/crates/services/p2p/src/ports.rs
@@ -35,8 +35,16 @@ pub trait BlockHeightImporter: Send + Sync {
 
 pub trait TxPool: Send + Sync + Clone {
     /// Get all tx ids in the pool
-    fn get_tx_ids(&self, max_ids: usize) -> Vec<TxId>;
+    fn get_tx_ids(
+        &self,
+        max_ids: usize,
+    ) -> impl std::future::Future<Output = anyhow::Result<Vec<TxId>>> + Send;
 
     /// Get full txs from the pool
-    fn get_full_txs(&self, tx_ids: Vec<TxId>) -> Vec<Option<NetworkableTransactionPool>>;
+    fn get_full_txs(
+        &self,
+        tx_ids: Vec<TxId>,
+    ) -> impl std::future::Future<
+        Output = anyhow::Result<Vec<Option<NetworkableTransactionPool>>>,
+    > + Send;
 }
diff --git a/crates/services/p2p/src/service.rs b/crates/services/p2p/src/service.rs
index b6e6187173d..cc2d0770d66 100644
--- a/crates/services/p2p/src/service.rs
+++ b/crates/services/p2p/src/service.rs
@@ -9,7 +9,6 @@ use crate::{
         GossipsubBroadcastRequest,
         GossipsubMessage,
     },
-    heavy_task_processor::HeavyTaskProcessor,
     p2p_service::{
         FuelP2PEvent,
         FuelP2PService,
@@ -31,10 +30,12 @@ use anyhow::anyhow;
 use fuel_core_metrics::p2p_metrics::set_blocks_requested;
 use fuel_core_services::{
     stream::BoxStream,
+    AsyncProcessor,
     RunnableService,
     RunnableTask,
     ServiceRunner,
     StateWatcher,
+    SyncProcessor,
     TraceErr,
 };
 use fuel_core_storage::transactional::AtomicView;
@@ -69,12 +70,16 @@ use futures::{
     StreamExt,
 };
 use libp2p::{
-    gossipsub::MessageAcceptance,
+    gossipsub::{
+        MessageAcceptance,
+        PublishError,
+    },
     request_response::InboundRequestId,
     PeerId,
 };
 use std::{
     fmt::Debug,
+    future::Future,
     ops::Range,
     sync::Arc,
 };
@@ -265,8 +270,18 @@ impl TaskP2PService for FuelP2PService {
         &mut self,
         message: GossipsubBroadcastRequest,
     ) -> anyhow::Result<()> {
-        self.publish_message(message)?;
-        Ok(())
+        let result = self.publish_message(message);
+
+        match result {
+            Ok(_) => Ok(()),
+            Err(e) => {
+                if matches!(&e, PublishError::InsufficientPeers) {
+                    Ok(())
+                } else {
+                    Err(anyhow!(e))
+                }
+            }
+        }
     }
 
     fn send_request_msg(
@@ -383,7 +398,8 @@ pub struct Task<P, V, B, T> {
     /// Receive internal Task Requests
     request_receiver: mpsc::Receiver<TaskRequest>,
     request_sender: mpsc::Sender<TaskRequest>,
-    heavy_task_processor: HeavyTaskProcessor,
+    db_heavy_task_processor: SyncProcessor,
+    tx_pool_heavy_task_processor: AsyncProcessor,
     broadcast: B,
     tx_pool: T,
     max_headers_per_request: usize,
@@ -542,7 +558,7 @@ where
         }
 
         let view = self.view_provider.latest_view()?;
-        let result = self.heavy_task_processor.spawn(move || {
+        let result = self.db_heavy_task_processor.try_spawn(move || {
             if instant.elapsed() > timeout {
                 tracing::warn!("Request timed out");
                 return;
@@ -600,29 +616,31 @@ where
         )
     }
 
-    fn handle_txpool_request<TxPoolFn, ResponseSenderFn, TaskRequestFn, R>(
+    fn handle_txpool_request<F, ResponseSenderFn, TaskRequestFn, R>(
         &mut self,
         request_id: InboundRequestId,
-        txpool_function: TxPoolFn,
+        txpool_function: F,
         response_sender: ResponseSenderFn,
         task_request: TaskRequestFn,
     ) -> anyhow::Result<()>
     where
         ResponseSenderFn: Fn(Option<R>) -> ResponseMessage + Send + 'static,
         TaskRequestFn: Fn(Option<R>, InboundRequestId) -> TaskRequest + Send + 'static,
-        TxPoolFn: FnOnce() -> R + Send + 'static,
-        R: Send + 'static,
+        F: Future<Output = anyhow::Result<R>> + Send + 'static,
     {
         let instant = Instant::now();
         let timeout = self.response_timeout;
         let response_channel = self.request_sender.clone();
-        let result = self.heavy_task_processor.spawn(move || {
+        let result = self.tx_pool_heavy_task_processor.try_spawn(async move {
             if instant.elapsed() > timeout {
                 tracing::warn!("Request timed out");
                 return;
             }
 
-            let response = txpool_function();
+            let Ok(response) = txpool_function.await else {
+                warn!("Failed to get txpool data");
+                return;
+            };
 
             // TODO: Return helpful error message to requester. https://github.com/FuelLabs/fuel-core/issues/1311
             let _ = response_channel
@@ -643,11 +661,11 @@ where
         &mut self,
         request_id: InboundRequestId,
     ) -> anyhow::Result<()> {
-        let tx_pool = self.tx_pool.clone();
         let max_txs = self.max_txs_per_request;
+        let tx_pool = self.tx_pool.clone();
         self.handle_txpool_request(
             request_id,
-            move || tx_pool.get_tx_ids(max_txs),
+            async move { tx_pool.get_tx_ids(max_txs).await },
             ResponseMessage::TxPoolAllTransactionsIds,
             |response, request_id| TaskRequest::TxPoolAllTransactionsIds {
                 response,
@@ -672,7 +690,7 @@ where
         let tx_pool = self.tx_pool.clone();
         self.handle_txpool_request(
             request_id,
-            move || tx_pool.get_full_txs(tx_ids),
+            async move { tx_pool.get_full_txs(tx_ids).await },
             ResponseMessage::TxPoolFullTransactions,
             |response, request_id| TaskRequest::TxPoolFullTransactions {
                 response,
@@ -729,6 +747,8 @@ where
             heartbeat_check_interval,
             heartbeat_max_avg_interval,
             heartbeat_max_time_since_last,
+            database_read_threads,
+            tx_pool_threads,
             ..
         } = config;
 
@@ -752,8 +772,9 @@ where
             Instant::now().checked_add(heartbeat_check_interval).expect(
                 "The heartbeat check interval should be small enough to do frequently",
             );
-        let number_of_threads = 2;
-        let heavy_task_processor = HeavyTaskProcessor::new(number_of_threads, 1024 * 10)?;
+        let db_heavy_task_processor =
+            SyncProcessor::new(database_read_threads, 1024 * 10)?;
+        let tx_pool_heavy_task_processor = AsyncProcessor::new(tx_pool_threads, 32)?;
         let request_sender = broadcast.request_sender.clone();
 
         let task = Task {
@@ -766,7 +787,8 @@ where
             next_block_height,
             broadcast,
             tx_pool,
-            heavy_task_processor,
+            db_heavy_task_processor,
+            tx_pool_heavy_task_processor,
             max_headers_per_request,
             max_txs_per_request,
             heartbeat_check_interval,
@@ -1309,15 +1331,18 @@ pub mod tests {
     struct FakeTxPool;
 
     impl TxPool for FakeTxPool {
-        fn get_tx_ids(&self, _max_txs: usize) -> Vec<fuel_core_types::fuel_tx::TxId> {
-            vec![]
+        async fn get_tx_ids(
+            &self,
+            _max_txs: usize,
+        ) -> anyhow::Result<Vec<fuel_core_types::fuel_tx::TxId>> {
+            Ok(vec![])
         }
 
-        fn get_full_txs(
+        async fn get_full_txs(
             &self,
             tx_ids: Vec<TxId>,
-        ) -> Vec<Option<NetworkableTransactionPool>> {
-            tx_ids.iter().map(|_| None).collect()
+        ) -> anyhow::Result<Vec<Option<NetworkableTransactionPool>>> {
+            Ok(tx_ids.iter().map(|_| None).collect())
         }
     }
 
@@ -1538,7 +1563,8 @@ pub mod tests {
             tx_pool: FakeTxPool,
             request_receiver,
             request_sender,
-            heavy_task_processor: HeavyTaskProcessor::new(1, 1).unwrap(),
+            db_heavy_task_processor: SyncProcessor::new(1, 1).unwrap(),
+            tx_pool_heavy_task_processor: AsyncProcessor::new(1, 1).unwrap(),
             broadcast,
             max_headers_per_request: 0,
             max_txs_per_request: 100,
@@ -1627,7 +1653,8 @@ pub mod tests {
             next_block_height: FakeBlockImporter.next_block_height(),
             request_receiver,
             request_sender,
-            heavy_task_processor: HeavyTaskProcessor::new(1, 1).unwrap(),
+            db_heavy_task_processor: SyncProcessor::new(1, 1).unwrap(),
+            tx_pool_heavy_task_processor: AsyncProcessor::new(1, 1).unwrap(),
             broadcast,
             max_headers_per_request: 0,
             max_txs_per_request: 100,
@@ -1688,7 +1715,8 @@ pub mod tests {
             next_block_height,
             request_receiver,
             request_sender,
-            heavy_task_processor: HeavyTaskProcessor::new(1, 1).unwrap(),
+            db_heavy_task_processor: SyncProcessor::new(1, 1).unwrap(),
+            tx_pool_heavy_task_processor: AsyncProcessor::new(1, 1).unwrap(),
             broadcast,
             max_headers_per_request: 0,
             max_txs_per_request: 100,
diff --git a/crates/services/p2p/src/utils.rs b/crates/services/p2p/src/utils.rs
new file mode 100644
index 00000000000..2e2ccdac0fe
--- /dev/null
+++ b/crates/services/p2p/src/utils.rs
@@ -0,0 +1,58 @@
+use crate::Multiaddr;
+
+pub fn is_dialable(multiaddr: &Multiaddr) -> bool {
+    // Check if the multiaddr is dialable
+    match multiaddr.protocol_stack().next() {
+        None => false,
+        Some(protocol) => protocol != "p2p",
+    }
+}
+
+#[cfg(test)]
+#[allow(non_snake_case)]
+mod tests {
+    use super::*;
+    use std::str::FromStr;
+
+    #[test]
+    fn is_dialable__returns_false_for_empty_multiaddress() {
+        // given
+        let multiaddr = Multiaddr::empty();
+
+        // when
+        let dialable = is_dialable(&multiaddr);
+
+        // then
+        assert!(!dialable);
+    }
+
+    #[test]
+    fn is_dialable__kats_returns_false_for_multiaddress_without_location_multiaddress() {
+        // given
+        let multiaddr = Multiaddr::from_str(
+            "/p2p/16Uiu2HAmUjL2n1rS3gxvr45G3BvNZTPLEYZc97H1kXX5G4u1XNEe",
+        )
+        .unwrap();
+
+        // when
+        let dialable = is_dialable(&multiaddr);
+
+        // then
+        assert!(!dialable);
+    }
+
+    #[test]
+    fn is_dialable__returns_true_for_multiaddress_with_location_multiaddress() {
+        // given
+        let multiaddr = Multiaddr::from_str(
+            "/ip4/0.0.0.0/p2p/16Uiu2HAmUjL2n1rS3gxvr45G3BvNZTPLEYZc97H1kXX5G4u1XNEe",
+        )
+        .unwrap();
+
+        // when
+        let dialable = is_dialable(&multiaddr);
+
+        // then
+        assert!(dialable);
+    }
+}
diff --git a/crates/services/producer/src/block_producer.rs b/crates/services/producer/src/block_producer.rs
index 253f845d422..0f63d2637d9 100644
--- a/crates/services/producer/src/block_producer.rs
+++ b/crates/services/producer/src/block_producer.rs
@@ -48,7 +48,10 @@ use fuel_core_types::{
     },
     tai64::Tai64,
 };
-use std::sync::Arc;
+use std::{
+    future::Future,
+    sync::Arc,
+};
 use tokio::sync::Mutex;
 use tracing::debug;
 
@@ -164,14 +167,15 @@ where
     ConsensusProvider: ConsensusParametersProvider,
 {
     /// Produces and execute block for the specified height.
-    async fn produce_and_execute<TxSource>(
+    async fn produce_and_execute<TxSource, F>(
         &self,
         height: BlockHeight,
         block_time: Tai64,
-        tx_source: impl FnOnce(BlockHeight) -> TxSource,
+        tx_source: impl FnOnce(u64, BlockHeight) -> F,
     ) -> anyhow::Result<UncommittedResult<Changes>>
     where
         Executor: ports::BlockProducer<TxSource> + 'static,
+        F: Future<Output = anyhow::Result<TxSource>>,
     {
         //  - get previous block info (hash, root, etc)
         //  - select best da_height from relayer
@@ -184,14 +188,14 @@ where
         // prevent simultaneous block production calls, the guard will drop at the end of this fn.
         let _production_guard = self.lock.lock().await;
 
-        let source = tx_source(height);
+        let gas_price = self.calculate_gas_price().await?;
+
+        let source = tx_source(gas_price, height).await?;
 
         let header = self
             .new_header_with_new_da_height(height, block_time)
             .await?;
 
-        let gas_price = self.calculate_gas_price().await?;
-
         let component = Components {
             header_to_produce: header,
             transactions_source: source,
@@ -236,9 +240,11 @@ where
         height: BlockHeight,
         block_time: Tai64,
     ) -> anyhow::Result<UncommittedResult<Changes>> {
-        self.produce_and_execute(height, block_time, |height| {
-            self.txpool.get_source(height)
-        })
+        self.produce_and_execute::<TxSource, _>(
+            height,
+            block_time,
+            |gas_price, height| self.txpool.get_source(gas_price, height),
+        )
         .await
     }
 }
@@ -259,7 +265,7 @@ where
         block_time: Tai64,
         transactions: Vec<Transaction>,
     ) -> anyhow::Result<UncommittedResult<Changes>> {
-        self.produce_and_execute(height, block_time, |_| transactions)
+        self.produce_and_execute(height, block_time, |_, _| async { Ok(transactions) })
             .await
     }
 }
diff --git a/crates/services/producer/src/mocks.rs b/crates/services/producer/src/mocks.rs
index b2c21f0971e..f261fd675bd 100644
--- a/crates/services/producer/src/mocks.rs
+++ b/crates/services/producer/src/mocks.rs
@@ -90,12 +90,11 @@ impl Relayer for MockRelayer {
 #[derive(Default)]
 pub struct MockTxPool(pub Vec<ArcPoolTx>);
 
-#[async_trait::async_trait]
 impl TxPool for MockTxPool {
     type TxSource = Vec<ArcPoolTx>;
 
-    fn get_source(&self, _: BlockHeight) -> Self::TxSource {
-        self.0.clone()
+    async fn get_source(&self, _: u64, _: BlockHeight) -> anyhow::Result<Self::TxSource> {
+        Ok(self.0.clone())
     }
 }
 
diff --git a/crates/services/producer/src/ports.rs b/crates/services/producer/src/ports.rs
index af11d1648e9..6875099951a 100644
--- a/crates/services/producer/src/ports.rs
+++ b/crates/services/producer/src/ports.rs
@@ -1,4 +1,3 @@
-use async_trait::async_trait;
 use fuel_core_storage::{
     transactional::Changes,
     Result as StorageResult,
@@ -49,17 +48,18 @@ pub trait BlockProducerDatabase: Send + Sync {
     ) -> StorageResult<StateTransitionBytecodeVersion>;
 }
 
-#[async_trait]
 pub trait TxPool: Send + Sync {
     /// The source of the transactions used by the executor.
     type TxSource;
 
     /// Returns the source of includable transactions.
-    fn get_source(
+    #[allow(async_fn_in_trait)]
+    async fn get_source(
         &self,
+        gas_price: u64,
         // could be used by the txpool to filter txs based on maturity
         block_height: BlockHeight,
-    ) -> Self::TxSource;
+    ) -> anyhow::Result<Self::TxSource>;
 }
 
 pub struct RelayerBlockInfo {
diff --git a/crates/services/src/async_processor.rs b/crates/services/src/async_processor.rs
new file mode 100644
index 00000000000..3b364ad96ac
--- /dev/null
+++ b/crates/services/src/async_processor.rs
@@ -0,0 +1,277 @@
+use std::{
+    future::Future,
+    sync::Arc,
+};
+use tokio::{
+    runtime,
+    sync::{
+        OwnedSemaphorePermit,
+        Semaphore,
+    },
+};
+
+/// A processor that can execute async tasks with a limit on the number of tasks that can be
+/// executed concurrently.
+pub struct AsyncProcessor {
+    semaphore: Arc<Semaphore>,
+    thread_pool: Option<runtime::Runtime>,
+}
+
+impl Drop for AsyncProcessor {
+    fn drop(&mut self) {
+        if let Some(runtime) = self.thread_pool.take() {
+            runtime.shutdown_background();
+        }
+    }
+}
+
+/// A reservation for a task to be executed by the `AsyncProcessor`.
+pub struct AsyncReservation(OwnedSemaphorePermit);
+
+/// Out of capacity error.
+#[derive(Debug, PartialEq, Eq)]
+pub struct OutOfCapacity;
+
+impl AsyncProcessor {
+    /// Create a new `AsyncProcessor` with the given number of threads and the number of pending
+    /// tasks.
+    pub fn new(
+        number_of_threads: usize,
+        number_of_pending_tasks: usize,
+    ) -> anyhow::Result<Self> {
+        let thread_pool = if number_of_threads != 0 {
+            let runtime = runtime::Builder::new_multi_thread()
+                .worker_threads(number_of_threads)
+                .enable_all()
+                .build()
+                .map_err(|e| anyhow::anyhow!("Failed to create a tokio pool: {}", e))?;
+
+            Some(runtime)
+        } else {
+            None
+        };
+        let semaphore = Arc::new(Semaphore::new(number_of_pending_tasks));
+        Ok(Self {
+            thread_pool,
+            semaphore,
+        })
+    }
+
+    /// Reserve a slot for a task to be executed.
+    pub fn reserve(&self) -> Result<AsyncReservation, OutOfCapacity> {
+        let permit = self.semaphore.clone().try_acquire_owned();
+        if let Ok(permit) = permit {
+            Ok(AsyncReservation(permit))
+        } else {
+            Err(OutOfCapacity)
+        }
+    }
+
+    /// Spawn a task with a reservation.
+    pub fn spawn_reserved<F>(&self, reservation: AsyncReservation, future: F)
+    where
+        F: Future<Output = ()> + Send + 'static,
+    {
+        let permit = reservation.0;
+        let future = async move {
+            let _drop = permit;
+            future.await
+        };
+        if let Some(runtime) = &self.thread_pool {
+            runtime.spawn(future);
+        } else {
+            tokio::spawn(future);
+        }
+    }
+
+    /// Tries to spawn a task. If the task cannot be spawned, returns an error.
+    pub fn try_spawn<F>(&self, future: F) -> Result<(), OutOfCapacity>
+    where
+        F: Future<Output = ()> + Send + 'static,
+    {
+        let reservation = self.reserve()?;
+        self.spawn_reserved(reservation, future);
+        Ok(())
+    }
+}
+
+#[cfg(test)]
+#[allow(clippy::bool_assert_comparison)]
+mod tests {
+    use super::*;
+    use std::{
+        thread::sleep,
+        time::Duration,
+    };
+    use tokio::time::Instant;
+
+    #[test]
+    fn one_spawn_single_tasks_works() {
+        // Given
+        let number_of_pending_tasks = 1;
+        let heavy_task_processor =
+            AsyncProcessor::new(1, number_of_pending_tasks).unwrap();
+
+        // When
+        let (sender, mut receiver) = tokio::sync::oneshot::channel();
+        let result = heavy_task_processor.try_spawn(async move {
+            sender.send(()).unwrap();
+        });
+
+        // Then
+        assert_eq!(result, Ok(()));
+        sleep(Duration::from_secs(1));
+        receiver.try_recv().unwrap();
+    }
+
+    #[test]
+    fn second_spawn_fails_when_limit_is_one_and_first_in_progress() {
+        // Given
+        let number_of_pending_tasks = 1;
+        let heavy_task_processor =
+            AsyncProcessor::new(1, number_of_pending_tasks).unwrap();
+        let first_spawn_result = heavy_task_processor.try_spawn(async move {
+            sleep(Duration::from_secs(1));
+        });
+        assert_eq!(first_spawn_result, Ok(()));
+
+        // When
+        let second_spawn_result = heavy_task_processor.try_spawn(async move {
+            sleep(Duration::from_secs(1));
+        });
+
+        // Then
+        assert_eq!(second_spawn_result, Err(OutOfCapacity));
+    }
+
+    #[test]
+    fn second_spawn_works_when_first_is_finished() {
+        let number_of_pending_tasks = 1;
+        let heavy_task_processor =
+            AsyncProcessor::new(1, number_of_pending_tasks).unwrap();
+
+        // Given
+        let (sender, receiver) = tokio::sync::oneshot::channel();
+        let first_spawn = heavy_task_processor.try_spawn(async move {
+            sleep(Duration::from_secs(1));
+            sender.send(()).unwrap();
+        });
+        assert_eq!(first_spawn, Ok(()));
+        futures::executor::block_on(async move {
+            receiver.await.unwrap();
+        });
+
+        // When
+        let second_spawn = heavy_task_processor.try_spawn(async move {
+            sleep(Duration::from_secs(1));
+        });
+
+        // Then
+        assert_eq!(second_spawn, Ok(()));
+    }
+
+    #[test]
+    fn can_spawn_10_tasks_when_limit_is_10() {
+        // Given
+        let number_of_pending_tasks = 10;
+        let heavy_task_processor =
+            AsyncProcessor::new(1, number_of_pending_tasks).unwrap();
+
+        for _ in 0..number_of_pending_tasks {
+            // When
+            let result = heavy_task_processor.try_spawn(async move {
+                tokio::time::sleep(Duration::from_secs(1)).await;
+            });
+
+            // Then
+            assert_eq!(result, Ok(()));
+        }
+    }
+
+    #[test]
+    fn executes_10_tasks_for_10_seconds_with_one_thread() {
+        // Given
+        let number_of_pending_tasks = 10;
+        let number_of_threads = 1;
+        let heavy_task_processor =
+            AsyncProcessor::new(number_of_threads, number_of_pending_tasks).unwrap();
+
+        // When
+        let (broadcast_sender, mut broadcast_receiver) =
+            tokio::sync::broadcast::channel(1024);
+        let instant = Instant::now();
+        for _ in 0..number_of_pending_tasks {
+            let broadcast_sender = broadcast_sender.clone();
+            let result = heavy_task_processor.try_spawn(async move {
+                sleep(Duration::from_secs(1));
+                broadcast_sender.send(()).unwrap();
+            });
+            assert_eq!(result, Ok(()));
+        }
+        drop(broadcast_sender);
+
+        // Then
+        futures::executor::block_on(async move {
+            while broadcast_receiver.recv().await.is_ok() {}
+            assert!(instant.elapsed() >= Duration::from_secs(10));
+        });
+    }
+
+    #[test]
+    fn executes_10_tasks_for_2_seconds_with_10_thread() {
+        // Given
+        let number_of_pending_tasks = 10;
+        let number_of_threads = 10;
+        let heavy_task_processor =
+            AsyncProcessor::new(number_of_threads, number_of_pending_tasks).unwrap();
+
+        // When
+        let (broadcast_sender, mut broadcast_receiver) =
+            tokio::sync::broadcast::channel(1024);
+        let instant = Instant::now();
+        for _ in 0..number_of_pending_tasks {
+            let broadcast_sender = broadcast_sender.clone();
+            let result = heavy_task_processor.try_spawn(async move {
+                sleep(Duration::from_secs(1));
+                broadcast_sender.send(()).unwrap();
+            });
+            assert_eq!(result, Ok(()));
+        }
+        drop(broadcast_sender);
+
+        // Then
+        futures::executor::block_on(async move {
+            while broadcast_receiver.recv().await.is_ok() {}
+            assert!(instant.elapsed() <= Duration::from_secs(2));
+        });
+    }
+
+    #[test]
+    fn executes_10_tasks_for_2_seconds_with_1_thread() {
+        // Given
+        let number_of_pending_tasks = 10;
+        let number_of_threads = 10;
+        let heavy_task_processor =
+            AsyncProcessor::new(number_of_threads, number_of_pending_tasks).unwrap();
+
+        // When
+        let (broadcast_sender, mut broadcast_receiver) =
+            tokio::sync::broadcast::channel(1024);
+        let instant = Instant::now();
+        for _ in 0..number_of_pending_tasks {
+            let broadcast_sender = broadcast_sender.clone();
+            let result = heavy_task_processor.try_spawn(async move {
+                tokio::time::sleep(Duration::from_secs(1)).await;
+                broadcast_sender.send(()).unwrap();
+            });
+            assert_eq!(result, Ok(()));
+        }
+        drop(broadcast_sender);
+
+        // Then
+        futures::executor::block_on(async move {
+            while broadcast_receiver.recv().await.is_ok() {}
+            assert!(instant.elapsed() <= Duration::from_secs(2));
+        });
+    }
+}
diff --git a/crates/services/src/lib.rs b/crates/services/src/lib.rs
index 410508d6d71..7162389e082 100644
--- a/crates/services/src/lib.rs
+++ b/crates/services/src/lib.rs
@@ -5,9 +5,12 @@
 #![deny(missing_docs)]
 #![deny(warnings)]
 
+mod async_processor;
 mod service;
 mod state;
 mod sync;
+#[cfg(feature = "sync-processor")]
+mod sync_processor;
 
 /// Re-exports for streaming utilities
 pub mod stream {
@@ -58,6 +61,7 @@ where
     }
 }
 
+pub use async_processor::AsyncProcessor;
 pub use service::{
     EmptyShared,
     RunnableService,
@@ -74,3 +78,10 @@ pub use sync::{
     Shared,
     SharedMutex,
 };
+#[cfg(feature = "sync-processor")]
+pub use sync_processor::SyncProcessor;
+
+// For tests
+use crate as fuel_core_services;
+#[allow(unused_imports)]
+use fuel_core_services as _;
diff --git a/crates/services/p2p/src/heavy_task_processor.rs b/crates/services/src/sync_processor.rs
similarity index 52%
rename from crates/services/p2p/src/heavy_task_processor.rs
rename to crates/services/src/sync_processor.rs
index d2c9b0d150f..5510ca50f43 100644
--- a/crates/services/p2p/src/heavy_task_processor.rs
+++ b/crates/services/src/sync_processor.rs
@@ -1,23 +1,39 @@
 use std::sync::Arc;
-use tokio::sync::Semaphore;
+use tokio::sync::{
+    OwnedSemaphorePermit,
+    Semaphore,
+};
 
-pub struct HeavyTaskProcessor {
-    rayon_thread_pool: rayon::ThreadPool,
+/// A processor that can execute sync tasks with a limit on the number of tasks that can
+/// wait in the queue. The number of threads defines how many tasks can be executed in parallel.
+pub struct SyncProcessor {
+    rayon_thread_pool: Option<rayon::ThreadPool>,
     semaphore: Arc<Semaphore>,
 }
 
+/// A reservation for a task to be executed by the `SyncProcessor`.
+pub struct SyncReservation(OwnedSemaphorePermit);
+
+/// Out of capacity error.
 #[derive(Debug, PartialEq, Eq)]
 pub struct OutOfCapacity;
 
-impl HeavyTaskProcessor {
+impl SyncProcessor {
+    /// Create a new `SyncProcessor` with the given number of threads and the number of pending
+    /// tasks.
     pub fn new(
         number_of_threads: usize,
         number_of_pending_tasks: usize,
     ) -> anyhow::Result<Self> {
-        let rayon_thread_pool = rayon::ThreadPoolBuilder::new()
-            .num_threads(number_of_threads)
-            .build()
-            .map_err(|e| anyhow::anyhow!("Failed to create a rayon pool: {}", e))?;
+        let rayon_thread_pool = if number_of_threads != 0 {
+            let pool = rayon::ThreadPoolBuilder::new()
+                .num_threads(number_of_threads)
+                .build()
+                .map_err(|e| anyhow::anyhow!("Failed to create a rayon pool: {}", e))?;
+            Some(pool)
+        } else {
+            None
+        };
         let semaphore = Arc::new(Semaphore::new(number_of_pending_tasks));
         Ok(Self {
             rayon_thread_pool,
@@ -25,22 +41,42 @@ impl HeavyTaskProcessor {
         })
     }
 
-    pub fn spawn<OP>(&self, op: OP) -> Result<(), OutOfCapacity>
-    where
-        OP: FnOnce() + Send + 'static,
-    {
+    /// Reserve a slot for a task to be executed.
+    pub fn reserve(&self) -> Result<SyncReservation, OutOfCapacity> {
         let permit = self.semaphore.clone().try_acquire_owned();
-
         if let Ok(permit) = permit {
-            self.rayon_thread_pool.spawn_fifo(move || {
-                let _drop = permit;
-                op();
-            });
-            Ok(())
+            Ok(SyncReservation(permit))
         } else {
             Err(OutOfCapacity)
         }
     }
+
+    /// Spawn a task with a reservation.
+    pub fn spawn_reserved<F>(&self, reservation: SyncReservation, op: F)
+    where
+        F: FnOnce() + Send + 'static,
+    {
+        let permit = reservation.0;
+        if let Some(rayon_thread_pool) = &self.rayon_thread_pool {
+            rayon_thread_pool.spawn_fifo(move || {
+                // When task started its works we can free the space.
+                drop(permit);
+                op()
+            });
+        } else {
+            op()
+        }
+    }
+
+    /// Try to spawn a task.
+    pub fn try_spawn<F>(&self, future: F) -> Result<(), OutOfCapacity>
+    where
+        F: FnOnce() + Send + 'static,
+    {
+        let reservation = self.reserve()?;
+        self.spawn_reserved(reservation, future);
+        Ok(())
+    }
 }
 
 #[cfg(test)]
@@ -58,11 +94,11 @@ mod tests {
         // Given
         let number_of_pending_tasks = 1;
         let heavy_task_processor =
-            HeavyTaskProcessor::new(1, number_of_pending_tasks).unwrap();
+            SyncProcessor::new(1, number_of_pending_tasks).unwrap();
 
         // When
         let (sender, receiver) = tokio::sync::oneshot::channel();
-        let result = heavy_task_processor.spawn(|| {
+        let result = heavy_task_processor.try_spawn(move || {
             sender.send(()).unwrap();
         });
 
@@ -79,14 +115,14 @@ mod tests {
         // Given
         let number_of_pending_tasks = 1;
         let heavy_task_processor =
-            HeavyTaskProcessor::new(1, number_of_pending_tasks).unwrap();
-        let first_spawn_result = heavy_task_processor.spawn(|| {
+            SyncProcessor::new(1, number_of_pending_tasks).unwrap();
+        let first_spawn_result = heavy_task_processor.try_spawn(move || {
             sleep(Duration::from_secs(1));
         });
         assert_eq!(first_spawn_result, Ok(()));
 
         // When
-        let second_spawn_result = heavy_task_processor.spawn(|| {
+        let second_spawn_result = heavy_task_processor.try_spawn(move || {
             sleep(Duration::from_secs(1));
         });
 
@@ -98,11 +134,11 @@ mod tests {
     async fn second_spawn_works_when_first_is_finished() {
         let number_of_pending_tasks = 1;
         let heavy_task_processor =
-            HeavyTaskProcessor::new(1, number_of_pending_tasks).unwrap();
+            SyncProcessor::new(1, number_of_pending_tasks).unwrap();
 
         // Given
         let (sender, receiver) = tokio::sync::oneshot::channel();
-        let first_spawn = heavy_task_processor.spawn(|| {
+        let first_spawn = heavy_task_processor.try_spawn(move || {
             sleep(Duration::from_secs(1));
             sender.send(()).unwrap();
         });
@@ -110,7 +146,7 @@ mod tests {
         receiver.await.unwrap();
 
         // When
-        let second_spawn = heavy_task_processor.spawn(|| {
+        let second_spawn = heavy_task_processor.try_spawn(move || {
             sleep(Duration::from_secs(1));
         });
 
@@ -123,11 +159,11 @@ mod tests {
         // Given
         let number_of_pending_tasks = 10;
         let heavy_task_processor =
-            HeavyTaskProcessor::new(1, number_of_pending_tasks).unwrap();
+            SyncProcessor::new(1, number_of_pending_tasks).unwrap();
 
         for _ in 0..number_of_pending_tasks {
             // When
-            let result = heavy_task_processor.spawn(|| {
+            let result = heavy_task_processor.try_spawn(move || {
                 sleep(Duration::from_secs(1));
             });
 
@@ -142,7 +178,7 @@ mod tests {
         let number_of_pending_tasks = 10;
         let number_of_threads = 1;
         let heavy_task_processor =
-            HeavyTaskProcessor::new(number_of_threads, number_of_pending_tasks).unwrap();
+            SyncProcessor::new(number_of_threads, number_of_pending_tasks).unwrap();
 
         // When
         let (broadcast_sender, mut broadcast_receiver) =
@@ -150,7 +186,7 @@ mod tests {
         let instant = Instant::now();
         for _ in 0..number_of_pending_tasks {
             let broadcast_sender = broadcast_sender.clone();
-            let result = heavy_task_processor.spawn(move || {
+            let result = heavy_task_processor.try_spawn(move || {
                 sleep(Duration::from_secs(1));
                 broadcast_sender.send(()).unwrap();
             });
@@ -163,13 +199,48 @@ mod tests {
         assert!(instant.elapsed() >= Duration::from_secs(10));
     }
 
+    #[tokio::test]
+    async fn executes_10_tasks_for_10_seconds_with_one_thread_check_ordering() {
+        // Given
+        let number_of_pending_tasks = 10;
+        let number_of_threads = 1;
+        let heavy_task_processor =
+            SyncProcessor::new(number_of_threads, number_of_pending_tasks).unwrap();
+
+        // When
+        let (broadcast_sender, mut broadcast_receiver) =
+            tokio::sync::broadcast::channel(1024);
+        let instant = Instant::now();
+        for i in 0..number_of_pending_tasks {
+            let broadcast_sender = broadcast_sender.clone();
+            let result = heavy_task_processor.try_spawn(move || {
+                sleep(Duration::from_secs(1));
+                broadcast_sender.send(i).unwrap();
+            });
+            assert_eq!(result, Ok(()));
+        }
+        drop(broadcast_sender);
+
+        // Then
+        let mut i = 0;
+        loop {
+            let Ok(result) = broadcast_receiver.recv().await else {
+                break;
+            };
+            assert_eq!(result, i);
+            i += 1;
+        }
+        assert_eq!(i, number_of_pending_tasks);
+        assert!(instant.elapsed() >= Duration::from_secs(10));
+    }
+
     #[tokio::test]
     async fn executes_10_tasks_for_2_seconds_with_10_thread() {
         // Given
         let number_of_pending_tasks = 10;
         let number_of_threads = 10;
         let heavy_task_processor =
-            HeavyTaskProcessor::new(number_of_threads, number_of_pending_tasks).unwrap();
+            SyncProcessor::new(number_of_threads, number_of_pending_tasks).unwrap();
 
         // When
         let (broadcast_sender, mut broadcast_receiver) =
@@ -177,7 +248,7 @@ mod tests {
         let instant = Instant::now();
         for _ in 0..number_of_pending_tasks {
             let broadcast_sender = broadcast_sender.clone();
-            let result = heavy_task_processor.spawn(move || {
+            let result = heavy_task_processor.try_spawn(move || {
                 sleep(Duration::from_secs(1));
                 broadcast_sender.send(()).unwrap();
             });
diff --git a/crates/services/txpool/README.md b/crates/services/txpool/README.md
deleted file mode 100644
index 87d225f8c20..00000000000
--- a/crates/services/txpool/README.md
+++ /dev/null
@@ -1,78 +0,0 @@
-# TxPool
-
-It contain list of transaction sorted by GasPrice, prepared to be included into new block. So when talking about gas it is important to make distinction between:
-
-* GasPrice or just Price: represents amount that transaction is going to pay for unit of GasSpend
-* GasSpend or just Gas: is amount of how much vm worked to execute this transaction.
-* Tx GasLimit: how much transaction is willing to pay for execution. (GasLimit > GasPrice*GasSpend)
-* Block GasLimit: How full can we get our block.  
-
-Fuel as UTXO system depends on output and input of transaction and proving that child is *valid* and depends on some parent in transaction can be challenging. All transactions in pool are expected to be in some sense *valid* or better said has potential to be includable. This plays a big role on protection against spamming and on design of fuel txpool. We are building dependency structures that would describe those parent->child relationships.
-
-From miro diagram we can see that txpool is used by:
-
-* p2p subsystem: receive/broadcast new tx
-* Block importer: clean included tx
-* Block producer: take N number of transactions
-
-All Tx should be wrapped inside Arc so that we can easily move them if there is need and so that they can be referenced in multiple places.
-
-TxPool should be periodically flush to disk so that we can recover transactions is case of client restart. Omitted for first version.
-
-TxPoolDb trait is interface that TxPool is going to implement and can be found [here](src/ports.rs)
-
-## Design
-
-We will need to have at least three structures that do sorting of tx.
-
-* by hash: Ordinary HashMap, maps hash to Tx. For fast lookup.
-* by PriceSort: sorted structure that sort all transaction by GasPrice. Most optimal structure can be `BinaryHeap` for fast sorting/inserting but it does have some downsides when we want to remove one item. For use case when a lot of tx are going to be removed we can just recreate structure from scratch. For first interaction we can use simple `BTreeMap` that sorts all inputs.
-* by Dependency: With every fuel transaction, inputs and outputs change state and we need to be aware of it. Graph is the main defensive structure against DDoS attack, and every transaction that we include in pool should have potential to be included in next block. The graph represents connections between parent and child txs, where child depends on execution output of parent that is found inside database or transaction pool.
-
-### Dependency graph
-
-Few reasonings on decision and restrains made by txpool
-
-Visualization of dependencies between three transactions:
-![UTXO dependency diagram](../../../docs/diagrams/fuel_v2_client_design_UTXO_dependency.jpg)
-
-Problem 1: T2 arriving before T1.
-
-Solution: Have restriction that broadcast of hashes need to contain ancestor hashes and they all need to be sorted by gasPrice
-
-Problem 2: if T2 gas price is higher then T1. This can be problematic on txpool with different sizes. One big enough pull could contains T1 but other one would prune it and we could not prove that T2 can be included without T1.
-
-Solution: Have restriction on linked transaction within same block so that GasPrice is strictly going down. This will effect newly create contract (created in same block) but not old one.
-
-Usage: Insertion of new T4
-
-* Usage: inserting T4 that replaces T1. It is done if GasPrice(T4) > GasPrice(T1) and if there is some overlapping inputs between them AnyInput(T4) == AnyInput(T1).
-* Usage: inserting T4 that use State6 and GasPrice(T4) > GasPrice(T3).
-    Result: Remove T3 from txpool check every T3 child for removal. Check if any T that has lover gas is reusing T4 outputs so they should be connected to T4.
-
-### Implementation
-
-Graph will be needed for relationship between dependable transactions so that if one of them get included/removed/replaced we need to know what to do with their dependent children.
-We will need map of all outputs in same structure so that we can fast search them. That would be something like `HashMap<UtxoId, CoinState>` and `HashMap<ContractId,ContractState>` for both Coin and Contract state.
-
-### Block inclusion algorithm
-
-It is most straightforward one: take PriceSort and iterate over transactions. DependencyGraph inclusion guarantees us that every transaction in the sorted array can be included, but only after executing those transactions we can be sure that is can be included in the block.
-
-## Future work
-
-Some things and ideas what we can add in future:
-
-* Checks for `gas_limit*gas_price` for transactions with depth one (Tx where all inputs can be found in db).
-* Add global max size of transaction in bytes. So that we can limit how big transaction can be found inside txpool.
-* Allow transactions added from reverted block to have priority against other transactions.
-* New economy model including multidimensional variables that decide on priority of transaction inclusion. For example, first variable can be byte_price (in rollup mode it has even more effect). Inspired by Vitalik's Multidimensional EIP-1559 post (<https://ethresear.ch/t/multidimensional-eip-1559/11651>)
-* eip1559
-* Have transaction that does not have contract input executed inside txpool.
-* Have bucket of unconnected transaction that on every new transaction inclusion will add new outputs and check a bucket to see if there is some connected transactions that would become valid.
-
-## refs
-
-* Some information on OpenEthereum and restrictions on tx inclusion: <https://openethereum.github.io/Transactions-Queue>
-* Possible out of scope, but it is relatively easy to add ethereum's eip1559 that adds Fee market change with basefee. More on eip1559: <https://hackmd.io/@timbeiko/1559-resources>
-Erigon did good docs on impl of eip1559 txpool: <https://github.com/ledgerwatch/erigon/wiki/Transaction-Pool-Design>
diff --git a/crates/services/txpool/src/config.rs b/crates/services/txpool/src/config.rs
deleted file mode 100644
index c74cde4aca4..00000000000
--- a/crates/services/txpool/src/config.rs
+++ /dev/null
@@ -1,121 +0,0 @@
-use crate::types::ContractId;
-use fuel_core_types::{
-    fuel_tx::{
-        Address,
-        UtxoId,
-    },
-    fuel_types::Nonce,
-};
-use std::{
-    collections::HashSet,
-    time::Duration,
-};
-
-#[derive(Default, Debug, Clone, PartialEq, Eq)]
-pub struct BlackList {
-    /// Blacklisted addresses.
-    pub(crate) owners: HashSet<Address>,
-    /// Blacklisted UTXO ids.
-    pub(crate) coins: HashSet<UtxoId>,
-    /// Blacklisted messages by `Nonce`.
-    pub(crate) messages: HashSet<Nonce>,
-    /// Blacklisted contracts.
-    pub(crate) contracts: HashSet<ContractId>,
-}
-
-impl BlackList {
-    pub fn new(
-        owners: Vec<Address>,
-        utxo_ids: Vec<UtxoId>,
-        messages: Vec<Nonce>,
-        contracts: Vec<ContractId>,
-    ) -> Self {
-        Self {
-            owners: owners.into_iter().collect(),
-            coins: utxo_ids.into_iter().collect(),
-            messages: messages.into_iter().collect(),
-            contracts: contracts.into_iter().collect(),
-        }
-    }
-
-    pub fn contains_address(&self, address: &Address) -> bool {
-        self.owners.contains(address)
-    }
-
-    pub fn contains_coin(&self, utxo_id: &UtxoId) -> bool {
-        self.coins.contains(utxo_id)
-    }
-
-    pub fn contains_message(&self, nonce: &Nonce) -> bool {
-        self.messages.contains(nonce)
-    }
-
-    pub fn contains_contract(&self, contract_id: &ContractId) -> bool {
-        self.contracts.contains(contract_id)
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct Config {
-    /// Maximum number of transactions inside the pool
-    pub max_tx: usize,
-    /// max depth of connected UTXO excluding contracts
-    pub max_depth: usize,
-    /// Flag to disable utxo existence and signature checks
-    pub utxo_validation: bool,
-    /// Enables prometheus metrics for this fuel-service
-    pub metrics: bool,
-    /// Transaction TTL
-    pub transaction_ttl: Duration,
-    /// The number of allowed active transaction status subscriptions.
-    pub number_of_active_subscription: usize,
-    /// The blacklist used to validate transaction.
-    pub blacklist: BlackList,
-}
-
-#[cfg(feature = "test-helpers")]
-impl Default for Config {
-    fn default() -> Self {
-        let max_tx = 4064;
-        let max_depth = 10;
-        let utxo_validation = true;
-        let metrics = false;
-        // 5 minute TTL
-        let transaction_ttl = Duration::from_secs(60 * 5);
-        let number_of_active_subscription = max_tx;
-        Self::new(
-            max_tx,
-            max_depth,
-            utxo_validation,
-            metrics,
-            transaction_ttl,
-            number_of_active_subscription,
-            Default::default(),
-        )
-    }
-}
-
-impl Config {
-    #[allow(clippy::too_many_arguments)]
-    pub fn new(
-        max_tx: usize,
-        max_depth: usize,
-        utxo_validation: bool,
-        metrics: bool,
-        transaction_ttl: Duration,
-        number_of_active_subscription: usize,
-        blacklist: BlackList,
-    ) -> Self {
-        // # Dev-note: If you add a new field, be sure that this field is propagated correctly
-        //  in all places where `new` is used.
-        Self {
-            max_tx,
-            max_depth,
-            utxo_validation,
-            metrics,
-            transaction_ttl,
-            number_of_active_subscription,
-            blacklist,
-        }
-    }
-}
diff --git a/crates/services/txpool/src/containers.rs b/crates/services/txpool/src/containers.rs
deleted file mode 100644
index 93d4f1cac9d..00000000000
--- a/crates/services/txpool/src/containers.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-pub mod dependency;
-pub mod sort;
-pub mod time_sort;
-pub mod tip_per_gas_sort;
diff --git a/crates/services/txpool/src/containers/dependency.rs b/crates/services/txpool/src/containers/dependency.rs
deleted file mode 100644
index 01644cd67c5..00000000000
--- a/crates/services/txpool/src/containers/dependency.rs
+++ /dev/null
@@ -1,789 +0,0 @@
-use crate::{
-    ports::TxPoolDb,
-    types::*,
-    Error,
-    TxInfo,
-};
-use fuel_core_types::{
-    fuel_tx::{
-        field::BlobId as BlobIdField,
-        input::{
-            coin::{
-                CoinPredicate,
-                CoinSigned,
-            },
-            contract::Contract,
-            message::{
-                MessageCoinPredicate,
-                MessageCoinSigned,
-                MessageDataPredicate,
-                MessageDataSigned,
-            },
-        },
-        Input,
-        Output,
-        UtxoId,
-    },
-    fuel_types::{
-        BlobId,
-        Nonce,
-    },
-    services::txpool::ArcPoolTx,
-};
-use std::collections::{
-    HashMap,
-    HashSet,
-};
-use tracing::warn;
-
-/// Check and hold dependency between inputs and outputs. Be mindful
-/// about depth of connection
-#[derive(Debug, Clone)]
-pub struct Dependency {
-    /// mapping of all UtxoId relationships in txpool
-    coins: HashMap<UtxoId, CoinState>,
-    /// Contract-> Tx mapping.
-    contracts: HashMap<ContractId, ContractState>,
-    /// Blob-> Tx mapping.
-    blobs: HashMap<BlobId, BlobState>,
-    /// messageId -> tx mapping
-    messages: HashMap<Nonce, MessageState>,
-    /// max depth of dependency.
-    max_depth: usize,
-    /// utxo-validation feature flag
-    utxo_validation: bool,
-}
-
-#[derive(Debug, Clone)]
-pub struct CoinState {
-    /// is Utxo spend as other Tx input
-    is_spend_by: Option<TxId>,
-    /// how deep are we inside UTXO dependency
-    depth: usize,
-}
-
-impl CoinState {
-    /// Indicates whether coin exists in the database
-    pub fn is_in_database(&self) -> bool {
-        self.depth == 0
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct ContractState {
-    /// is Utxo spend as other Tx input
-    used_by: HashSet<TxId>,
-    /// how deep are we inside UTXO dependency
-    depth: usize,
-    /// origin is needed for child to parent rel, in case when contract is in dependency this is how we make a chain.
-    origin: Option<UtxoId>,
-    /// gas_price. We can probably derive this from Tx
-    tip: Word,
-}
-
-impl ContractState {
-    /// Indicates whether the contract exists in the database
-    pub fn is_in_database(&self) -> bool {
-        self.depth == 0
-    }
-}
-
-/// Always in database. No need for optional spenders, as this state would just be removed from
-/// the hashmap if the message id isn't being spent.
-#[derive(Debug, Clone)]
-pub struct MessageState {
-    spent_by: TxId,
-    tip: Word,
-}
-
-#[derive(Debug, Clone)]
-pub struct BlobState {
-    origin_tx_id: TxId,
-    tip: Word,
-}
-
-impl Dependency {
-    pub fn new(max_depth: usize, utxo_validation: bool) -> Self {
-        Self {
-            coins: HashMap::new(),
-            contracts: HashMap::new(),
-            blobs: HashMap::new(),
-            messages: HashMap::new(),
-            max_depth,
-            utxo_validation,
-        }
-    }
-
-    fn check_if_coin_input_can_spend_output(
-        output: &Output,
-        input: &Input,
-        is_output_filled: bool,
-    ) -> Result<(), Error> {
-        if let Input::CoinSigned(CoinSigned {
-            owner,
-            amount,
-            asset_id,
-            ..
-        })
-        | Input::CoinPredicate(CoinPredicate {
-            owner,
-            amount,
-            asset_id,
-            ..
-        }) = input
-        {
-            let i_owner = owner;
-            let i_amount = amount;
-            let i_asset_id = asset_id;
-            match output {
-                Output::Coin {
-                    to,
-                    amount,
-                    asset_id,
-                } => {
-                    if to != i_owner {
-                        return Err(Error::NotInsertedIoWrongOwner)
-                    }
-                    if amount != i_amount {
-                        return Err(Error::NotInsertedIoWrongAmount)
-                    }
-                    if asset_id != i_asset_id {
-                        return Err(Error::NotInsertedIoWrongAssetId)
-                    }
-                }
-                Output::Contract(_) => return Err(Error::NotInsertedIoContractOutput),
-                Output::Change {
-                    to,
-                    asset_id,
-                    amount,
-                } => {
-                    if to != i_owner {
-                        return Err(Error::NotInsertedIoWrongOwner)
-                    }
-                    if asset_id != i_asset_id {
-                        return Err(Error::NotInsertedIoWrongAssetId)
-                    }
-                    if is_output_filled && amount != i_amount {
-                        return Err(Error::NotInsertedIoWrongAmount)
-                    }
-                }
-                Output::Variable {
-                    to,
-                    amount,
-                    asset_id,
-                } => {
-                    if is_output_filled {
-                        if to != i_owner {
-                            return Err(Error::NotInsertedIoWrongOwner)
-                        }
-                        if amount != i_amount {
-                            return Err(Error::NotInsertedIoWrongAmount)
-                        }
-                        if asset_id != i_asset_id {
-                            return Err(Error::NotInsertedIoWrongAssetId)
-                        }
-                    }
-                    // else do nothing, everything is variable and can be only check on execution
-                }
-                Output::ContractCreated { .. } => {
-                    return Err(Error::NotInsertedIoContractOutput)
-                }
-            };
-        } else {
-            return Err(Error::Other(
-                "Use it only for coin output check".to_string(),
-            ))
-        }
-        Ok(())
-    }
-
-    /// Check for collision. Used only inside insert function.
-    /// Id doesn't change any dependency it just checks if it has possibility to be included.
-    /// Returns: (max_depth, db_coins, db_contracts, collided_transactions);
-    #[allow(clippy::type_complexity)]
-    fn check_for_collision<'a>(
-        &'a self,
-        txs: &'a HashMap<TxId, TxInfo>,
-        db: &dyn TxPoolDb,
-        tx: &'a ArcPoolTx,
-    ) -> Result<
-        (
-            usize,
-            HashMap<UtxoId, CoinState>,
-            HashMap<ContractId, ContractState>,
-            HashMap<BlobId, BlobState>,
-            HashMap<Nonce, MessageState>,
-            Vec<TxId>,
-        ),
-        Error,
-    > {
-        let mut collided: Vec<TxId> = Vec::new();
-        // iterate over all inputs and check for collision
-        let mut max_depth = 0;
-        let mut db_coins: HashMap<UtxoId, CoinState> = HashMap::new();
-        let mut db_contracts: HashMap<ContractId, ContractState> = HashMap::new();
-        let mut db_blobs: HashMap<BlobId, BlobState> = HashMap::new();
-        let mut db_messages: HashMap<Nonce, MessageState> = HashMap::new();
-
-        if let PoolTransaction::Blob(checked_tx, _) = tx.as_ref() {
-            let blob_id = checked_tx.transaction().blob_id();
-            if db
-                .blob_exist(blob_id)
-                .map_err(|e| Error::Database(format!("{:?}", e)))?
-            {
-                return Err(Error::NotInsertedBlobIdAlreadyTaken(*blob_id))
-            }
-
-            if let Some(state) = self.blobs.get(blob_id) {
-                if state.tip >= tx.tip() {
-                    return Err(Error::NotInsertedCollisionBlobId(*blob_id))
-                } else {
-                    collided.push(state.origin_tx_id);
-                }
-            }
-            db_blobs.insert(
-                *blob_id,
-                BlobState {
-                    origin_tx_id: tx.id(),
-                    tip: tx.tip(),
-                },
-            );
-        }
-
-        for input in tx.inputs() {
-            // check if all required inputs are here.
-            match input {
-                Input::CoinSigned(CoinSigned { utxo_id, .. })
-                | Input::CoinPredicate(CoinPredicate { utxo_id, .. }) => {
-                    // is it dependent output?
-                    if let Some(state) = self.coins.get(utxo_id) {
-                        // check depth
-                        max_depth =
-                            core::cmp::max(state.depth.saturating_add(1), max_depth);
-                        if max_depth > self.max_depth {
-                            return Err(Error::NotInsertedMaxDepth)
-                        }
-                        // output is present but is it spend by other tx?
-                        if let Some(ref spend_by) = state.is_spend_by {
-                            // get tx that is spending this output
-                            let txpool_tx = txs
-                                .get(spend_by)
-                                .expect("Tx should be always present in txpool");
-                            // compare if tx has better price
-                            if txpool_tx.tip() > tx.tip() {
-                                return Err(Error::NotInsertedCollision(
-                                    *spend_by, *utxo_id,
-                                ))
-                            } else if state.is_in_database() {
-                                // this means it is loaded from db. Get tx to compare output.
-                                if self.utxo_validation {
-                                    let coin = db
-                                        .utxo(utxo_id)
-                                        .map_err(|e| Error::Database(format!("{:?}", e)))?
-                                        .ok_or(
-                                            Error::NotInsertedInputUtxoIdNotDoesNotExist(
-                                                *utxo_id,
-                                            ),
-                                        )?;
-                                    if !coin
-                                        .matches_input(input)
-                                        .expect("The input is coin above")
-                                    {
-                                        return Err(Error::NotInsertedIoCoinMismatch)
-                                    }
-                                }
-                            } 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,
-                                )?;
-                            }
-
-                            collided.push(*spend_by);
-                        }
-                        // if coin is not spend, it will be spend later down the line
-                    } else {
-                        if self.utxo_validation {
-                            // fetch from db and check if tx exist.
-                            let coin = db
-                                .utxo(utxo_id)
-                                .map_err(|e| Error::Database(format!("{:?}", e)))?
-                                .ok_or(Error::NotInsertedInputUtxoIdNotDoesNotExist(
-                                    *utxo_id,
-                                ))?;
-
-                            if !coin
-                                .matches_input(input)
-                                .expect("The input is coin above")
-                            {
-                                return Err(Error::NotInsertedIoCoinMismatch)
-                            }
-                        }
-                        max_depth = core::cmp::max(1, max_depth);
-                    }
-                    // mark this coin as spent by the current tx
-                    db_coins.insert(
-                        *utxo_id,
-                        CoinState {
-                            is_spend_by: Some(tx.id() as TxId),
-                            depth: max_depth
-                                .checked_sub(1)
-                                .expect("The `max_depth` is always more than zero above"),
-                        },
-                    );
-                    // yey we got our coin
-                }
-                Input::MessageCoinSigned(MessageCoinSigned { nonce, .. })
-                | Input::MessageCoinPredicate(MessageCoinPredicate { nonce, .. })
-                | Input::MessageDataSigned(MessageDataSigned { nonce, .. })
-                | Input::MessageDataPredicate(MessageDataPredicate { nonce, .. }) => {
-                    // since message id is derived, we don't need to double check all the fields
-                    if self.utxo_validation {
-                        if let Some(db_message) = db
-                            .message(nonce)
-                            .map_err(|e| Error::Database(format!("{:?}", e)))?
-                        {
-                            // verify message id integrity
-                            if !db_message
-                                .matches_input(input)
-                                .expect("Input is a message above")
-                            {
-                                return Err(Error::NotInsertedIoMessageMismatch)
-                            }
-                        } else {
-                            return Err(Error::NotInsertedInputMessageUnknown(*nonce))
-                        }
-                    }
-
-                    if let Some(state) = self.messages.get(nonce) {
-                        if state.tip >= tx.tip() {
-                            return Err(Error::NotInsertedCollisionMessageId(
-                                state.spent_by,
-                                *nonce,
-                            ))
-                        } else {
-                            collided.push(state.spent_by);
-                        }
-                    }
-                    db_messages.insert(
-                        *nonce,
-                        MessageState {
-                            spent_by: tx.id(),
-                            tip: tx.tip(),
-                        },
-                    );
-                }
-                Input::Contract(Contract { contract_id, .. }) => {
-                    // Does contract exist. We don't need to do any check here other then if contract_id exist or not.
-                    if let Some(state) = self.contracts.get(contract_id) {
-                        // check if contract is created after this transaction.
-                        if tx.tip() > state.tip {
-                            return Err(Error::NotInsertedContractPricedLower(
-                                *contract_id,
-                            ))
-                        }
-                        // check depth.
-                        max_depth = core::cmp::max(state.depth, max_depth);
-                        if max_depth > self.max_depth {
-                            return Err(Error::NotInsertedMaxDepth)
-                        }
-                    } else {
-                        if !db
-                            .contract_exist(contract_id)
-                            .map_err(|e| Error::Database(format!("{:?}", e)))?
-                        {
-                            return Err(Error::NotInsertedInputContractDoesNotExist(
-                                *contract_id,
-                            ))
-                        }
-                        // add depth
-                        max_depth = core::cmp::max(1, max_depth);
-                        // insert into contract
-                        db_contracts
-                            .entry(*contract_id)
-                            .or_insert(ContractState {
-                                used_by: HashSet::new(),
-                                depth: 0,
-                                origin: None, // there is no owner if contract is in db
-                                tip: Word::MAX,
-                            })
-                            .used_by
-                            .insert(tx.id());
-                    }
-
-                    // yey we got our contract
-                }
-            }
-        }
-
-        // nice, our inputs don't collide. Now check if our newly created contracts collide on ContractId
-        for output in tx.outputs() {
-            if let Output::ContractCreated { contract_id, .. } = output {
-                if let Some(contract) = self.contracts.get(contract_id) {
-                    // we have a collision :(
-                    if contract.is_in_database() {
-                        return Err(Error::NotInsertedContractIdAlreadyTaken(*contract_id))
-                    }
-                    // check who is priced more
-                    if contract.tip > tx.tip() {
-                        // new tx is priced less then current tx
-                        return Err(Error::NotInsertedCollisionContractId(*contract_id))
-                    }
-                    // if we are prices more, mark current contract origin for removal.
-                    let origin = contract.origin.expect(
-                        "Only contract without origin are the ones that are inside DB. And we check depth for that, so we are okay to just unwrap"
-                        );
-                    collided.push(*origin.tx_id());
-                }
-            }
-            // collision of other outputs is not possible.
-        }
-
-        Ok((
-            max_depth,
-            db_coins,
-            db_contracts,
-            db_blobs,
-            db_messages,
-            collided,
-        ))
-    }
-
-    /// insert tx inside dependency
-    /// return list of transactions that are removed from txpool
-    pub(crate) fn insert<'a, DB>(
-        &'a mut self,
-        txs: &'a HashMap<TxId, TxInfo>,
-        db: &DB,
-        tx: &'a ArcPoolTx,
-    ) -> Result<Vec<ArcPoolTx>, Error>
-    where
-        DB: TxPoolDb,
-    {
-        let (max_depth, db_coins, db_contracts, db_blobs, db_messages, collided) =
-            self.check_for_collision(txs, db, tx)?;
-
-        // now we are sure that transaction can be included. remove all collided transactions
-        let mut removed_tx = Vec::new();
-        for collided in collided.into_iter() {
-            let collided = txs
-                .get(&collided)
-                .expect("Collided should be present in txpool");
-            removed_tx.extend(
-                self.recursively_remove_all_dependencies(txs, collided.tx().clone()),
-            );
-        }
-
-        // iterate over all inputs and spend parent coins/contracts
-        for input in tx.inputs() {
-            match input {
-                Input::CoinSigned(CoinSigned { utxo_id, .. })
-                | Input::CoinPredicate(CoinPredicate { utxo_id, .. }) => {
-                    // spend coin
-                    if let Some(state) = self.coins.get_mut(utxo_id) {
-                        state.is_spend_by = Some(tx.id());
-                    }
-                }
-                Input::Contract(Contract { contract_id, .. }) => {
-                    // Contract that we want to use can be already inside dependency (this case)
-                    // or it will be added when db_contracts extends self.contracts (and it
-                    // already contains changed used_by)
-                    if let Some(state) = self.contracts.get_mut(contract_id) {
-                        state.used_by.insert(tx.id());
-                    }
-                }
-                Input::MessageCoinSigned(_)
-                | Input::MessageCoinPredicate(_)
-                | Input::MessageDataSigned(_)
-                | Input::MessageDataPredicate(_) => {}
-            }
-        }
-
-        // insert all coins/contracts that we got from db;
-        self.coins.extend(db_coins);
-        // for contracts from db that are not found in dependency, we already inserted used_by
-        // and are okay to just extend current list
-        self.contracts.extend(db_contracts);
-        self.blobs.extend(db_blobs);
-        // insert / overwrite all applicable message id spending relations
-        self.messages.extend(db_messages);
-
-        // iterate over all outputs and insert them, marking them as available.
-        for (index, output) in tx.outputs().iter().enumerate() {
-            let index = u16::try_from(index).map_err(|_| {
-                Error::Other(format!(
-                    "The number of outputs in `{}` is more than `u8::max`",
-                    tx.id()
-                ))
-            })?;
-            let utxo_id = UtxoId::new(tx.id(), index);
-            match output {
-                Output::Coin { .. } | Output::Change { .. } | Output::Variable { .. } => {
-                    // insert output coin inside by_coin
-                    self.coins.insert(
-                        utxo_id,
-                        CoinState {
-                            is_spend_by: None,
-                            depth: max_depth,
-                        },
-                    );
-                }
-                Output::ContractCreated { contract_id, .. } => {
-                    // insert contract
-                    self.contracts.insert(
-                        *contract_id,
-                        ContractState {
-                            depth: max_depth,
-                            used_by: HashSet::new(),
-                            origin: Some(utxo_id),
-                            tip: tx.tip(),
-                        },
-                    );
-                }
-                Output::Contract(_) => {
-                    // do nothing, this contract is already found in dependencies.
-                    // as it is tied with input and used_by is already inserted.
-                }
-            };
-        }
-
-        Ok(removed_tx)
-    }
-
-    /// Remove all pending txs that depend on the outputs of the provided tx
-    pub(crate) fn recursively_remove_all_dependencies<'a>(
-        &'a mut self,
-        txs: &'a HashMap<TxId, TxInfo>,
-        tx: ArcPoolTx,
-    ) -> Vec<ArcPoolTx> {
-        let mut removed_transactions = vec![tx.clone()];
-
-        // recursively remove all transactions that depend on the outputs of the current tx
-        for (index, output) in tx.outputs().iter().enumerate() {
-            match output {
-                Output::Contract(_) => {
-                    // no other transactions can depend on these types of outputs
-                }
-                Output::Coin { .. } | Output::Change { .. } | Output::Variable { .. } => {
-                    let index = u16::try_from(index)
-                        .expect("The number of outputs is more than `u8::max`. \
-                        But it should be impossible because we don't include transactions with so many outputs.");
-                    // remove transactions that depend on this coin output
-                    let utxo = UtxoId::new(tx.id(), index);
-                    if let Some(state) = self.coins.remove(&utxo).map(|c| c.is_spend_by) {
-                        // there may or may not be any dependents for this coin output
-                        if let Some(spend_by) = state {
-                            let rem_tx =
-                                txs.get(&spend_by).expect("Tx should be present in txs");
-                            removed_transactions.extend(
-                                self.recursively_remove_all_dependencies(
-                                    txs,
-                                    rem_tx.tx().clone(),
-                                ),
-                            );
-                        }
-                    } else {
-                        // this shouldn't happen since the output belongs to this unique transaction,
-                        // no other resources should remove this coin state except this transaction.
-                        warn!("expected a coin state to be associated with {:?}", &utxo);
-                    }
-                }
-                Output::ContractCreated { contract_id, .. } => {
-                    // remove any other pending txs that depend on our yet to be created contract
-                    if let Some(contract) = self.contracts.remove(contract_id) {
-                        for spend_by in contract.used_by {
-                            let rem_tx =
-                                txs.get(&spend_by).expect("Tx should be present in txs");
-                            removed_transactions.extend(
-                                self.recursively_remove_all_dependencies(
-                                    txs,
-                                    rem_tx.tx().clone(),
-                                ),
-                            );
-                        }
-                    }
-                }
-            };
-        }
-
-        // remove this transaction as a dependency of its' inputs.
-        for input in tx.inputs() {
-            match input {
-                Input::CoinSigned(CoinSigned { utxo_id, .. })
-                | Input::CoinPredicate(CoinPredicate { utxo_id, .. }) => {
-                    // Input coin cases
-                    // 1. coin state was already removed if parent tx was also removed, no cleanup required.
-                    // 2. coin state spent_by needs to be freed from this tx if parent tx isn't being removed
-                    // 3. coin state can be removed if this is a database coin, as no other txs are involved.
-                    if let Some(state) = self.coins.get_mut(utxo_id) {
-                        if !state.is_in_database() {
-                            // case 2
-                            state.is_spend_by = None;
-                        } else {
-                            // case 3
-                            self.coins.remove(utxo_id);
-                        }
-                    }
-                }
-                Input::Contract(Contract { contract_id, .. }) => {
-                    // Input contract cases
-                    // 1. contract state no longer exists because the parent tx that created the
-                    //    contract was already removed from the graph
-                    // 2. contract state exists and this tx needs to be removed as a user of it.
-                    // 2.a. contract state can be removed if it's from the database and this is the
-                    //      last tx to use it, since no other txs are involved.
-                    if let Some(state) = self.contracts.get_mut(contract_id) {
-                        state.used_by.remove(&tx.id());
-                        // if contract list is empty and is in db, flag contract state for removal.
-                        if state.used_by.is_empty() && state.is_in_database() {
-                            self.contracts.remove(contract_id);
-                        }
-                    }
-                }
-                Input::MessageCoinSigned(MessageCoinSigned { nonce, .. })
-                | Input::MessageCoinPredicate(MessageCoinPredicate { nonce, .. })
-                | Input::MessageDataSigned(MessageDataSigned { nonce, .. })
-                | Input::MessageDataPredicate(MessageDataPredicate { nonce, .. }) => {
-                    self.messages.remove(nonce);
-                }
-            }
-        }
-
-        if let PoolTransaction::Blob(checked_tx, _) = tx.as_ref() {
-            // remove blob state
-            self.blobs.remove(checked_tx.transaction().blob_id());
-        }
-
-        removed_transactions
-    }
-}
-
-#[cfg(test)]
-mod tests {
-
-    use std::str::FromStr;
-
-    use fuel_core_types::{
-        fuel_tx::UtxoId,
-        fuel_types::{
-            Address,
-            AssetId,
-            Bytes32,
-        },
-    };
-
-    use super::*;
-
-    #[test]
-    fn test_check_between_input_output() {
-        use fuel_core_txpool as _;
-
-        let output = Output::Coin {
-            to: Address::default(),
-            amount: 10,
-            asset_id: AssetId::default(),
-        };
-        let input = Input::coin_signed(
-            UtxoId::default(),
-            Address::default(),
-            10,
-            Default::default(),
-            Default::default(),
-            Default::default(),
-        );
-        let out =
-            Dependency::check_if_coin_input_can_spend_output(&output, &input, false);
-        assert!(out.is_ok(), "test1. It should be Ok");
-
-        let output = Output::Coin {
-            to: Address::default(),
-            amount: 12,
-            asset_id: AssetId::default(),
-        };
-
-        let out =
-            Dependency::check_if_coin_input_can_spend_output(&output, &input, false);
-        assert!(out.is_err(), "test2 There should be error");
-        assert!(
-            matches!(out.err().unwrap(), Error::NotInsertedIoWrongAmount),
-            "test2"
-        );
-
-        let output = Output::Coin {
-            to: Address::from_str(
-                "0x0000000000000000000000000000000000000000000000000000000000000001",
-            )
-            .unwrap(),
-            amount: 10,
-            asset_id: AssetId::default(),
-        };
-
-        let out =
-            Dependency::check_if_coin_input_can_spend_output(&output, &input, false);
-        assert!(out.is_err(), "test3 There should be error");
-        assert!(
-            matches!(out.err().unwrap(), Error::NotInsertedIoWrongOwner),
-            "test3"
-        );
-
-        let output = Output::Coin {
-            to: Address::default(),
-            amount: 10,
-            asset_id: AssetId::from_str(
-                "0x0000000000000000000000000000000000000000000000000000000000000001",
-            )
-            .unwrap(),
-        };
-
-        let out =
-            Dependency::check_if_coin_input_can_spend_output(&output, &input, false);
-        assert!(out.is_err(), "test4 There should be error");
-        assert!(
-            matches!(out.err().unwrap(), Error::NotInsertedIoWrongAssetId),
-            "test4"
-        );
-
-        let output = Output::Coin {
-            to: Address::default(),
-            amount: 10,
-            asset_id: AssetId::from_str(
-                "0x0000000000000000000000000000000000000000000000000000000000000001",
-            )
-            .unwrap(),
-        };
-
-        let out =
-            Dependency::check_if_coin_input_can_spend_output(&output, &input, false);
-        assert!(out.is_err(), "test5 There should be error");
-        assert!(
-            matches!(out.err().unwrap(), Error::NotInsertedIoWrongAssetId),
-            "test5"
-        );
-
-        let output = Output::contract(0, Default::default(), Default::default());
-
-        let out =
-            Dependency::check_if_coin_input_can_spend_output(&output, &input, false);
-        assert!(out.is_err(), "test6 There should be error");
-        assert!(
-            matches!(out.err().unwrap(), Error::NotInsertedIoContractOutput),
-            "test6"
-        );
-
-        let output = Output::ContractCreated {
-            contract_id: ContractId::default(),
-            state_root: Bytes32::default(),
-        };
-
-        let out =
-            Dependency::check_if_coin_input_can_spend_output(&output, &input, false);
-        assert!(out.is_err(), "test8 There should be error");
-        assert!(
-            matches!(out.err().unwrap(), Error::NotInsertedIoContractOutput),
-            "test7"
-        );
-    }
-}
diff --git a/crates/services/txpool/src/containers/sort.rs b/crates/services/txpool/src/containers/sort.rs
deleted file mode 100644
index beff2691071..00000000000
--- a/crates/services/txpool/src/containers/sort.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use crate::TxInfo;
-use fuel_core_types::services::txpool::ArcPoolTx;
-use std::collections::BTreeMap;
-
-#[derive(Debug, Clone)]
-pub struct Sort<Key> {
-    /// all transactions sorted by min/max value
-    pub sort: BTreeMap<Key, ArcPoolTx>,
-}
-
-impl<Key> Default for Sort<Key> {
-    fn default() -> Self {
-        Self {
-            sort: Default::default(),
-        }
-    }
-}
-
-impl<Key> Sort<Key>
-where
-    Key: SortableKey,
-{
-    pub fn remove(&mut self, info: &TxInfo) {
-        self.sort.remove(&Key::new(info));
-    }
-
-    pub fn lowest_tx(&self) -> Option<ArcPoolTx> {
-        self.sort.iter().next().map(|(_, tx)| tx.clone())
-    }
-
-    pub fn lowest_value(&self) -> Option<Key::Value> {
-        self.sort.iter().next().map(|(key, _)| key.value().clone())
-    }
-
-    pub fn lowest(&self) -> Option<(&Key, &ArcPoolTx)> {
-        self.sort.iter().next()
-    }
-
-    pub fn insert(&mut self, info: &TxInfo) {
-        let tx = info.tx().clone();
-        self.sort.insert(Key::new(info), tx);
-    }
-}
-
-pub trait SortableKey: Ord {
-    type Value: Clone;
-
-    fn new(info: &TxInfo) -> Self;
-
-    fn value(&self) -> &Self::Value;
-}
diff --git a/crates/services/txpool/src/containers/time_sort.rs b/crates/services/txpool/src/containers/time_sort.rs
deleted file mode 100644
index 8f8679b7d80..00000000000
--- a/crates/services/txpool/src/containers/time_sort.rs
+++ /dev/null
@@ -1,68 +0,0 @@
-use crate::{
-    containers::sort::{
-        Sort,
-        SortableKey,
-    },
-    types::*,
-    TxInfo,
-};
-use core::{
-    cmp,
-    time::Duration,
-};
-
-/// all transactions sorted by min/max time
-pub type TimeSort = Sort<TimeSortKey>;
-
-#[derive(Clone, Debug)]
-pub struct TimeSortKey {
-    time: Duration,
-    created: tokio::time::Instant,
-    tx_id: TxId,
-}
-
-impl TimeSortKey {
-    pub fn created(&self) -> &tokio::time::Instant {
-        &self.created
-    }
-}
-
-impl SortableKey for TimeSortKey {
-    type Value = Duration;
-
-    fn new(info: &TxInfo) -> Self {
-        Self {
-            time: info.submitted_time(),
-            created: info.created(),
-            tx_id: info.tx().id(),
-        }
-    }
-
-    fn value(&self) -> &Self::Value {
-        &self.time
-    }
-}
-
-impl PartialEq for TimeSortKey {
-    fn eq(&self, other: &Self) -> bool {
-        self.tx_id == other.tx_id
-    }
-}
-
-impl Eq for TimeSortKey {}
-
-impl PartialOrd for TimeSortKey {
-    fn partial_cmp(&self, other: &Self) -> Option<cmp::Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl Ord for TimeSortKey {
-    fn cmp(&self, other: &Self) -> cmp::Ordering {
-        let cmp = self.time.cmp(&other.time);
-        if cmp == cmp::Ordering::Equal {
-            return self.tx_id.cmp(&other.tx_id)
-        }
-        cmp
-    }
-}
diff --git a/crates/services/txpool/src/containers/tip_per_gas_sort.rs b/crates/services/txpool/src/containers/tip_per_gas_sort.rs
deleted file mode 100644
index 6627681ec85..00000000000
--- a/crates/services/txpool/src/containers/tip_per_gas_sort.rs
+++ /dev/null
@@ -1,71 +0,0 @@
-use num_rational::Ratio;
-use tokio::time::Instant;
-
-use crate::{
-    containers::sort::{
-        Sort,
-        SortableKey,
-    },
-    types::*,
-    TxInfo,
-};
-use std::cmp;
-
-/// all transactions sorted by min/max price
-pub type RatioGasTipSort = Sort<RatioGasTipSortKey>;
-
-/// A ratio between gas and tip
-pub type RatioGasTip = Ratio<Word>;
-
-#[derive(Clone, Debug)]
-pub struct RatioGasTipSortKey {
-    tip_per_gas: RatioGasTip,
-    creation_instant: Instant,
-    tx_id: TxId,
-}
-
-impl SortableKey for RatioGasTipSortKey {
-    type Value = RatioGasTip;
-
-    fn new(info: &TxInfo) -> Self {
-        Self {
-            tip_per_gas: Ratio::new(info.tx().tip(), info.tx().max_gas()),
-            creation_instant: info.created(),
-            tx_id: info.tx().id(),
-        }
-    }
-
-    fn value(&self) -> &Self::Value {
-        &self.tip_per_gas
-    }
-}
-
-impl PartialEq for RatioGasTipSortKey {
-    fn eq(&self, other: &Self) -> bool {
-        self.tx_id == other.tx_id
-    }
-}
-
-impl Eq for RatioGasTipSortKey {}
-
-impl PartialOrd for RatioGasTipSortKey {
-    fn partial_cmp(&self, other: &Self) -> Option<cmp::Ordering> {
-        Some(self.cmp(other))
-    }
-}
-
-impl Ord for RatioGasTipSortKey {
-    fn cmp(&self, other: &Self) -> cmp::Ordering {
-        let cmp = self.tip_per_gas.cmp(&other.tip_per_gas);
-        if cmp == cmp::Ordering::Equal {
-            let instant_cmp = other.creation_instant.cmp(&self.creation_instant);
-            if instant_cmp == cmp::Ordering::Equal {
-                self.tx_id.cmp(&other.tx_id)
-            } else {
-                instant_cmp
-            }
-        } else {
-            cmp
-        }
-    }
-}
diff --git a/crates/services/txpool/src/error.rs b/crates/services/txpool/src/error.rs
deleted file mode 100644
index 79b9883ac00..00000000000
--- a/crates/services/txpool/src/error.rs
+++ /dev/null
@@ -1,162 +0,0 @@
-use fuel_core_types::{
-    fuel_tx::{
-        Address,
-        BlobId,
-        ContractId,
-        TxId,
-        UtxoId,
-    },
-    fuel_types::Nonce,
-    fuel_vm::checked_transaction::CheckError,
-};
-
-use crate::ports::WasmValidityError;
-
-pub type Result<T> = core::result::Result<T, Error>;
-
-#[allow(missing_docs)]
-#[derive(Debug, Clone, derive_more::Display)]
-#[non_exhaustive]
-pub enum Error {
-    #[display(fmt = "Gas price not found for block height {_0}")]
-    GasPriceNotFound(String),
-    #[display(fmt = "Failed to calculate max block bytes: {_0}")]
-    MaxBlockBytes(String),
-    #[display(fmt = "TxPool requires that the transaction contains metadata")]
-    NoMetadata,
-    #[display(fmt = "TxPool doesn't support this type of transaction.")]
-    NotSupportedTransactionType,
-    #[display(fmt = "Transaction is not inserted. Hash is already known")]
-    NotInsertedTxKnown,
-    #[display(
-        fmt = "Transaction is not inserted. Pool limit is hit, try to increase gas_price"
-    )]
-    NotInsertedLimitHit,
-    #[display(
-        fmt = "Transaction is not inserted. Attempting to upgrade WASM bytecode when WASM support is not enabled."
-    )]
-    NotInsertedWasmNotEnabled,
-    #[display(
-        fmt = "Transaction is not inserted. WASM bytecode matching the given root was not found."
-    )]
-    NotInsertedWasmNotFound,
-    #[display(
-        fmt = "Transaction is not inserted. WASM bytecode contents are not valid."
-    )]
-    NotInsertedInvalidWasm,
-    #[display(fmt = "Transaction is not inserted. The gas price is too low.")]
-    NotInsertedGasPriceTooLow,
-    #[display(
-        fmt = "Transaction is not inserted. Higher priced tx {_0:#x} has already spent this UTXO output: {_1:#x}"
-    )]
-    NotInsertedCollision(TxId, UtxoId),
-    #[display(
-        fmt = "Transaction is not inserted. Higher priced tx has created contract with ContractId {_0:#x}"
-    )]
-    NotInsertedCollisionContractId(ContractId),
-    #[display(
-        fmt = "Transaction is not inserted. Higher priced tx has uploaded the blob with BlobId {_0:#x}"
-    )]
-    NotInsertedCollisionBlobId(BlobId),
-    #[display(
-        fmt = "Transaction is not inserted. A higher priced tx {_0:#x} is already spending this message: {_1:#x}"
-    )]
-    NotInsertedCollisionMessageId(TxId, Nonce),
-    #[display(fmt = "Transaction is not inserted. UTXO input does not exist: {_0:#x}")]
-    NotInsertedInputContractDoesNotExist(ContractId),
-    #[display(fmt = "Transaction is not inserted. ContractId is already taken {_0:#x}")]
-    NotInsertedContractIdAlreadyTaken(ContractId),
-    #[display(fmt = "Transaction is not inserted. BlobId is already taken {_0:#x}")]
-    NotInsertedBlobIdAlreadyTaken(BlobId),
-    #[display(fmt = "Transaction is not inserted. UTXO does not exist: {_0:#x}")]
-    NotInsertedInputUtxoIdNotDoesNotExist(UtxoId),
-    #[display(fmt = "Transaction is not inserted. UTXO is spent: {_0:#x}")]
-    NotInsertedInputUtxoIdSpent(UtxoId),
-    #[display(
-        fmt = "Transaction is not inserted. Message id {_0:#x} does not match any received message from the DA layer."
-    )]
-    NotInsertedInputMessageUnknown(Nonce),
-    #[display(
-        fmt = "Transaction is not inserted. UTXO requires Contract input {_0:#x} that is priced lower"
-    )]
-    NotInsertedContractPricedLower(ContractId),
-    #[display(
-        fmt = "Transaction is not inserted. Input coin does not match the values from database"
-    )]
-    NotInsertedIoCoinMismatch,
-    #[display(
-        fmt = "Transaction is not inserted. Input output mismatch. Coin owner is different from expected input"
-    )]
-    NotInsertedIoWrongOwner,
-    #[display(
-        fmt = "Transaction is not inserted. Input output mismatch. Coin output does not match expected input"
-    )]
-    NotInsertedIoWrongAmount,
-    #[display(
-        fmt = "Transaction is not inserted. Input output mismatch. Coin output asset_id does not match expected inputs"
-    )]
-    NotInsertedIoWrongAssetId,
-    #[display(
-        fmt = "Transaction is not inserted. Input message does not match the values from database"
-    )]
-    NotInsertedIoMessageMismatch,
-    #[display(
-        fmt = "Transaction is not inserted. Input output mismatch. Expected coin but output is contract"
-    )]
-    NotInsertedIoContractOutput,
-    #[display(
-        fmt = "Transaction is not inserted. Maximum depth of dependent transaction chain reached"
-    )]
-    NotInsertedMaxDepth,
-    // small todo for now it can pass but in future we should include better messages
-    #[display(fmt = "Transaction removed.")]
-    Removed,
-    #[display(
-        fmt = "Transaction expired because it exceeded the configured time to live `tx-pool-ttl`."
-    )]
-    TTLReason,
-    #[display(fmt = "Transaction squeezed out because {_0}")]
-    SqueezedOut(String),
-    #[display(fmt = "Invalid transaction data: {_0:?}")]
-    ConsensusValidity(CheckError),
-    #[display(fmt = "Mint transactions are disallowed from the txpool")]
-    MintIsDisallowed,
-    #[display(fmt = "The UTXO `{_0}` is blacklisted")]
-    BlacklistedUTXO(UtxoId),
-    #[display(fmt = "The owner `{_0}` is blacklisted")]
-    BlacklistedOwner(Address),
-    #[display(fmt = "The contract `{_0}` is blacklisted")]
-    BlacklistedContract(ContractId),
-    #[display(fmt = "The message `{_0}` is blacklisted")]
-    BlacklistedMessage(Nonce),
-    #[display(fmt = "Database error: {_0}")]
-    Database(String),
-    // TODO: We need it for now until channels are removed from TxPool.
-    #[display(fmt = "Got some unexpected error: {_0}")]
-    Other(String),
-}
-
-impl std::error::Error for Error {}
-
-#[cfg(feature = "test-helpers")]
-impl PartialEq for Error {
-    fn eq(&self, other: &Self) -> bool {
-        self.to_string().eq(&other.to_string())
-    }
-}
-
-impl From<CheckError> for Error {
-    fn from(e: CheckError) -> Self {
-        Error::ConsensusValidity(e)
-    }
-}
-
-impl From<WasmValidityError> for Error {
-    fn from(err: WasmValidityError) -> Self {
-        match err {
-            WasmValidityError::NotEnabled => Error::NotInsertedWasmNotEnabled,
-            WasmValidityError::NotFound => Error::NotInsertedWasmNotFound,
-            WasmValidityError::NotValid => Error::NotInsertedInvalidWasm,
-        }
-    }
-}
diff --git a/crates/services/txpool/src/heavy_async_processing.rs b/crates/services/txpool/src/heavy_async_processing.rs
deleted file mode 100644
index 94fabad1fc7..00000000000
--- a/crates/services/txpool/src/heavy_async_processing.rs
+++ /dev/null
@@ -1,195 +0,0 @@
-use std::{
-    future::Future,
-    sync::Arc,
-};
-use tokio::sync::Semaphore;
-
-pub struct HeavyAsyncProcessor {
-    rayon_thread_pool: rayon::ThreadPool,
-    semaphore: Arc<Semaphore>,
-}
-
-#[derive(Debug, PartialEq, Eq)]
-pub struct OutOfCapacity;
-
-impl HeavyAsyncProcessor {
-    pub fn new(
-        number_of_threads: usize,
-        number_of_pending_tasks: usize,
-    ) -> anyhow::Result<Self> {
-        let rayon_thread_pool = rayon::ThreadPoolBuilder::new()
-            .num_threads(number_of_threads)
-            .build()
-            .map_err(|e| anyhow::anyhow!("Failed to create a rayon pool: {}", e))?;
-        let semaphore = Arc::new(Semaphore::new(number_of_pending_tasks));
-        Ok(Self {
-            rayon_thread_pool,
-            semaphore,
-        })
-    }
-
-    pub fn spawn<F>(&self, future: F) -> Result<(), OutOfCapacity>
-    where
-        F: Future<Output = ()> + Send + 'static,
-    {
-        let permit = self.semaphore.clone().try_acquire_owned();
-
-        if let Ok(permit) = permit {
-            self.rayon_thread_pool.spawn_fifo(move || {
-                let _drop = permit;
-                futures::executor::block_on(future);
-            });
-            Ok(())
-        } else {
-            Err(OutOfCapacity)
-        }
-    }
-}
-
-#[cfg(test)]
-#[allow(clippy::bool_assert_comparison)]
-mod tests {
-    use super::*;
-    use std::{
-        thread::sleep,
-        time::Duration,
-    };
-    use tokio::time::Instant;
-
-    #[tokio::test]
-    async fn one_spawn_single_tasks_works() {
-        // Given
-        let number_of_pending_tasks = 1;
-        let heavy_task_processor =
-            HeavyAsyncProcessor::new(1, number_of_pending_tasks).unwrap();
-
-        // When
-        let (sender, receiver) = tokio::sync::oneshot::channel();
-        let result = heavy_task_processor.spawn(async move {
-            sender.send(()).unwrap();
-        });
-
-        // Then
-        assert_eq!(result, Ok(()));
-        let timeout = tokio::time::timeout(Duration::from_secs(1), receiver).await;
-        timeout
-            .expect("Shouldn't timeout")
-            .expect("Should receive a message");
-    }
-
-    #[tokio::test]
-    async fn second_spawn_fails_when_limit_is_one_and_first_in_progress() {
-        // Given
-        let number_of_pending_tasks = 1;
-        let heavy_task_processor =
-            HeavyAsyncProcessor::new(1, number_of_pending_tasks).unwrap();
-        let first_spawn_result = heavy_task_processor.spawn(async move {
-            sleep(Duration::from_secs(1));
-        });
-        assert_eq!(first_spawn_result, Ok(()));
-
-        // When
-        let second_spawn_result = heavy_task_processor.spawn(async move {
-            sleep(Duration::from_secs(1));
-        });
-
-        // Then
-        assert_eq!(second_spawn_result, Err(OutOfCapacity));
-    }
-
-    #[tokio::test]
-    async fn second_spawn_works_when_first_is_finished() {
-        let number_of_pending_tasks = 1;
-        let heavy_task_processor =
-            HeavyAsyncProcessor::new(1, number_of_pending_tasks).unwrap();
-
-        // Given
-        let (sender, receiver) = tokio::sync::oneshot::channel();
-        let first_spawn = heavy_task_processor.spawn(async move {
-            sleep(Duration::from_secs(1));
-            sender.send(()).unwrap();
-        });
-        assert_eq!(first_spawn, Ok(()));
-        receiver.await.unwrap();
-
-        // When
-        let second_spawn = heavy_task_processor.spawn(async move {
-            sleep(Duration::from_secs(1));
-        });
-
-        // Then
-        assert_eq!(second_spawn, Ok(()));
-    }
-
-    #[tokio::test]
-    async fn can_spawn_10_tasks_when_limit_is_10() {
-        // Given
-        let number_of_pending_tasks = 10;
-        let heavy_task_processor =
-            HeavyAsyncProcessor::new(1, number_of_pending_tasks).unwrap();
-
-        for _ in 0..number_of_pending_tasks {
-            // When
-            let result = heavy_task_processor.spawn(async move {
-                sleep(Duration::from_secs(1));
-            });
-
-            // Then
-            assert_eq!(result, Ok(()));
-        }
-    }
-
-    #[tokio::test]
-    async fn executes_10_tasks_for_10_seconds_with_one_thread() {
-        // Given
-        let number_of_pending_tasks = 10;
-        let number_of_threads = 1;
-        let heavy_task_processor =
-            HeavyAsyncProcessor::new(number_of_threads, number_of_pending_tasks).unwrap();
-
-        // When
-        let (broadcast_sender, mut broadcast_receiver) =
-            tokio::sync::broadcast::channel(1024);
-        let instant = Instant::now();
-        for _ in 0..number_of_pending_tasks {
-            let broadcast_sender = broadcast_sender.clone();
-            let result = heavy_task_processor.spawn(async move {
-                sleep(Duration::from_secs(1));
-                broadcast_sender.send(()).unwrap();
-            });
-            assert_eq!(result, Ok(()));
-        }
-        drop(broadcast_sender);
-
-        // Then
-        while broadcast_receiver.recv().await.is_ok() {}
-        assert!(instant.elapsed() >= Duration::from_secs(10));
-    }
-
-    #[tokio::test]
-    async fn executes_10_tasks_for_2_seconds_with_10_thread() {
-        // Given
-        let number_of_pending_tasks = 10;
-        let number_of_threads = 10;
-        let heavy_task_processor =
-            HeavyAsyncProcessor::new(number_of_threads, number_of_pending_tasks).unwrap();
-
-        // When
-        let (broadcast_sender, mut broadcast_receiver) =
-            tokio::sync::broadcast::channel(1024);
-        let instant = Instant::now();
-        for _ in 0..number_of_pending_tasks {
-            let broadcast_sender = broadcast_sender.clone();
-            let result = heavy_task_processor.spawn(async move {
-                sleep(Duration::from_secs(1));
-                broadcast_sender.send(()).unwrap();
-            });
-            assert_eq!(result, Ok(()));
-        }
-        drop(broadcast_sender);
-
-        // Then
-        while broadcast_receiver.recv().await.is_ok() {}
-        assert!(instant.elapsed() <= Duration::from_secs(2));
-    }
-}
diff --git a/crates/services/txpool/src/lib.rs b/crates/services/txpool/src/lib.rs
deleted file mode 100644
index b2521f1caa4..00000000000
--- a/crates/services/txpool/src/lib.rs
+++ /dev/null
@@ -1,98 +0,0 @@
-#![deny(clippy::arithmetic_side_effects)]
-#![deny(clippy::cast_possible_truncation)]
-#![deny(unused_crate_dependencies)]
-#![deny(warnings)]
-
-use fuel_core_types::{
-    services::txpool::{
-        ArcPoolTx,
-        TransactionStatus,
-    },
-    tai64::Tai64,
-};
-use std::{
-    ops::Deref,
-    time::Duration,
-};
-
-pub mod config;
-mod containers;
-pub mod error;
-pub mod heavy_async_processing;
-pub mod ports;
-pub mod service;
-mod transaction_selector;
-pub mod txpool;
-pub mod types;
-
-#[cfg(any(test, feature = "test-helpers"))]
-pub mod mock_db;
-#[cfg(any(test, feature = "test-helpers"))]
-pub use mock_db::MockDb;
-
-pub use config::Config;
-pub use error::{
-    Error,
-    Result,
-};
-pub use service::{
-    new_service,
-    Service,
-};
-pub use txpool::TxPool;
-
-#[cfg(any(test, feature = "test-helpers"))]
-pub(crate) mod test_helpers;
-
-#[cfg(test)]
-fuel_core_trace::enable_tracing!();
-
-/// Information of a transaction fetched from the txpool.
-#[derive(Debug, Clone)]
-pub struct TxInfo {
-    tx: ArcPoolTx,
-    submitted_time: Duration,
-    creation_instant: tokio::time::Instant,
-}
-
-#[allow(missing_docs)]
-impl TxInfo {
-    pub fn new(tx: ArcPoolTx) -> Self {
-        let since_epoch = std::time::SystemTime::now()
-            .duration_since(std::time::UNIX_EPOCH)
-            .expect("Now is bellow of the `UNIX_EPOCH`");
-
-        Self {
-            tx,
-            submitted_time: since_epoch,
-            creation_instant: tokio::time::Instant::now(),
-        }
-    }
-
-    pub fn tx(&self) -> &ArcPoolTx {
-        &self.tx
-    }
-
-    pub fn submitted_time(&self) -> Duration {
-        self.submitted_time
-    }
-
-    pub fn created(&self) -> tokio::time::Instant {
-        self.creation_instant
-    }
-}
-
-impl Deref for TxInfo {
-    type Target = ArcPoolTx;
-    fn deref(&self) -> &Self::Target {
-        &self.tx
-    }
-}
-
-impl From<TxInfo> for TransactionStatus {
-    fn from(tx_info: TxInfo) -> Self {
-        Self::Submitted {
-            time: Tai64::from_unix(tx_info.submitted_time.as_secs() as i64),
-        }
-    }
-}
diff --git a/crates/services/txpool/src/mock_db.rs b/crates/services/txpool/src/mock_db.rs
deleted file mode 100644
index 371d214f0c2..00000000000
--- a/crates/services/txpool/src/mock_db.rs
+++ /dev/null
@@ -1,109 +0,0 @@
-use crate::ports::TxPoolDb;
-use fuel_core_storage::{
-    transactional::AtomicView,
-    Result as StorageResult,
-};
-use fuel_core_types::{
-    entities::{
-        coins::coin::{
-            Coin,
-            CompressedCoin,
-        },
-        relayer::message::Message,
-    },
-    fuel_tx::{
-        BlobId,
-        Contract,
-        ContractId,
-        UtxoId,
-    },
-    fuel_types::Nonce,
-    fuel_vm::BlobBytes,
-};
-use std::{
-    collections::{
-        HashMap,
-        HashSet,
-    },
-    sync::{
-        Arc,
-        Mutex,
-    },
-};
-
-#[derive(Default)]
-pub struct Data {
-    pub coins: HashMap<UtxoId, CompressedCoin>,
-    pub contracts: HashMap<ContractId, Contract>,
-    pub blobs: HashMap<BlobId, BlobBytes>,
-    pub messages: HashMap<Nonce, Message>,
-    pub spent_messages: HashSet<Nonce>,
-}
-
-#[derive(Clone, Default)]
-pub struct MockDb {
-    pub data: Arc<Mutex<Data>>,
-}
-
-impl MockDb {
-    pub fn insert_coin(&self, coin: Coin) {
-        self.data
-            .lock()
-            .unwrap()
-            .coins
-            .insert(coin.utxo_id, coin.compress());
-    }
-
-    pub fn insert_dummy_blob(&self, blob_id: BlobId) {
-        self.data
-            .lock()
-            .unwrap()
-            .blobs
-            .insert(blob_id, vec![123; 123].into());
-    }
-
-    pub fn insert_message(&self, message: Message) {
-        self.data
-            .lock()
-            .unwrap()
-            .messages
-            .insert(*message.id(), message);
-    }
-
-    pub fn spend_message(&self, id: Nonce) {
-        self.data.lock().unwrap().spent_messages.insert(id);
-    }
-}
-
-impl TxPoolDb for MockDb {
-    fn utxo(&self, utxo_id: &UtxoId) -> StorageResult<Option<CompressedCoin>> {
-        Ok(self.data.lock().unwrap().coins.get(utxo_id).cloned())
-    }
-
-    fn contract_exist(&self, contract_id: &ContractId) -> StorageResult<bool> {
-        Ok(self
-            .data
-            .lock()
-            .unwrap()
-            .contracts
-            .contains_key(contract_id))
-    }
-
-    fn blob_exist(&self, blob_id: &BlobId) -> StorageResult<bool> {
-        Ok(self.data.lock().unwrap().blobs.contains_key(blob_id))
-    }
-
-    fn message(&self, id: &Nonce) -> StorageResult<Option<Message>> {
-        Ok(self.data.lock().unwrap().messages.get(id).cloned())
-    }
-}
-
-pub struct MockDBProvider(pub MockDb);
-
-impl AtomicView for MockDBProvider {
-    type LatestView = MockDb;
-
-    fn latest_view(&self) -> StorageResult<Self::LatestView> {
-        Ok(self.0.clone())
-    }
-}
diff --git a/crates/services/txpool/src/service.rs b/crates/services/txpool/src/service.rs
deleted file mode 100644
index 6bef4b021bc..00000000000
--- a/crates/services/txpool/src/service.rs
+++ /dev/null
@@ -1,682 +0,0 @@
-use std::{
-    sync::Arc,
-    time::Duration,
-};
-
-use anyhow::anyhow;
-use parking_lot::Mutex as ParkingMutex;
-use tokio::{
-    sync::broadcast,
-    time::MissedTickBehavior,
-};
-use tokio_stream::StreamExt;
-
-use fuel_core_services::{
-    stream::BoxStream,
-    RunnableService,
-    RunnableTask,
-    ServiceRunner,
-    StateWatcher,
-};
-use fuel_core_storage::transactional::AtomicView;
-use fuel_core_types::{
-    fuel_tx::{
-        Transaction,
-        TxId,
-        UniqueIdentifier,
-    },
-    fuel_types::{
-        BlockHeight,
-        Bytes32,
-    },
-    services::{
-        block_importer::SharedImportResult,
-        p2p::{
-            GossipData,
-            GossipsubMessageAcceptance,
-            GossipsubMessageInfo,
-            PeerId,
-            TransactionGossipData,
-        },
-        txpool::{
-            ArcPoolTx,
-            InsertionResult,
-            TransactionStatus,
-        },
-    },
-    tai64::Tai64,
-};
-use update_sender::UpdateSender;
-
-use crate::{
-    heavy_async_processing::HeavyAsyncProcessor,
-    ports::{
-        BlockImporter,
-        ConsensusParametersProvider,
-        GasPriceProvider as GasPriceProviderConstraint,
-        MemoryPool,
-        PeerToPeer,
-        TxPoolDb,
-        WasmChecker as WasmCheckerConstraint,
-    },
-    transaction_selector::select_transactions,
-    txpool::{
-        check_single_tx,
-        check_transactions,
-    },
-    Config,
-    Error as TxPoolError,
-    TxInfo,
-    TxPool,
-};
-
-use self::update_sender::{
-    MpscChannel,
-    TxStatusStream,
-};
-
-mod update_sender;
-
-pub type Service<P2P, DB, WC, GP, CP, MP> = ServiceRunner<Task<P2P, DB, WC, GP, CP, MP>>;
-
-#[derive(Clone)]
-pub struct TxStatusChange {
-    new_tx_notification_sender: broadcast::Sender<TxId>,
-    update_sender: UpdateSender,
-}
-
-impl TxStatusChange {
-    pub fn new(capacity: usize, ttl: Duration) -> Self {
-        let (new_tx_notification_sender, _) = broadcast::channel(capacity);
-        let update_sender = UpdateSender::new(capacity, ttl);
-        Self {
-            new_tx_notification_sender,
-            update_sender,
-        }
-    }
-
-    pub fn send_complete(
-        &self,
-        id: Bytes32,
-        block_height: &BlockHeight,
-        message: TxStatusMessage,
-    ) {
-        tracing::info!("Transaction {id} successfully included in block {block_height}");
-        self.update_sender.send(TxUpdate::new(id, message));
-    }
-
-    pub fn send_submitted(&self, id: Bytes32, time: Tai64) {
-        tracing::info!("Transaction {id} successfully submitted to the tx pool");
-        let _ = self.new_tx_notification_sender.send(id);
-        self.update_sender.send(TxUpdate::new(
-            id,
-            TxStatusMessage::Status(TransactionStatus::Submitted { time }),
-        ));
-    }
-
-    pub fn send_squeezed_out(&self, id: Bytes32, reason: TxPoolError) {
-        tracing::info!("Transaction {id} squeezed out because {reason}");
-        self.update_sender.send(TxUpdate::new(
-            id,
-            TxStatusMessage::Status(TransactionStatus::SqueezedOut {
-                reason: reason.to_string(),
-            }),
-        ));
-    }
-}
-
-pub struct SharedState<
-    P2P,
-    ViewProvider,
-    WasmChecker,
-    GasPriceProvider,
-    ConsensusProvider,
-    MP,
-> {
-    tx_status_sender: TxStatusChange,
-    txpool: Arc<ParkingMutex<TxPool<ViewProvider, WasmChecker>>>,
-    p2p: Arc<P2P>,
-    utxo_validation: bool,
-    current_height: Arc<ParkingMutex<BlockHeight>>,
-    consensus_parameters_provider: Arc<ConsensusProvider>,
-    gas_price_provider: Arc<GasPriceProvider>,
-    memory_pool: Arc<MP>,
-}
-
-impl<P2P, ViewProvider, GasPriceProvider, WasmChecker, ConsensusProvider, MP> Clone
-    for SharedState<
-        P2P,
-        ViewProvider,
-        WasmChecker,
-        GasPriceProvider,
-        ConsensusProvider,
-        MP,
-    >
-{
-    fn clone(&self) -> Self {
-        Self {
-            tx_status_sender: self.tx_status_sender.clone(),
-            txpool: self.txpool.clone(),
-            p2p: self.p2p.clone(),
-            utxo_validation: self.utxo_validation,
-            current_height: self.current_height.clone(),
-            consensus_parameters_provider: self.consensus_parameters_provider.clone(),
-            gas_price_provider: self.gas_price_provider.clone(),
-            memory_pool: self.memory_pool.clone(),
-        }
-    }
-}
-
-pub struct Task<P2P, ViewProvider, WasmChecker, GasPriceProvider, ConsensusProvider, MP> {
-    gossiped_tx_stream: BoxStream<TransactionGossipData>,
-    new_tx_gossip_subscription: BoxStream<PeerId>,
-    committed_block_stream: BoxStream<SharedImportResult>,
-    tx_pool_shared_state: SharedState<
-        P2P,
-        ViewProvider,
-        WasmChecker,
-        GasPriceProvider,
-        ConsensusProvider,
-        MP,
-    >,
-    heavy_async_processor: HeavyAsyncProcessor,
-    ttl_timer: tokio::time::Interval,
-}
-
-#[async_trait::async_trait]
-impl<P2P, ViewProvider, View, WasmChecker, GasPriceProvider, ConsensusProvider, MP>
-    RunnableService
-    for Task<P2P, ViewProvider, WasmChecker, GasPriceProvider, ConsensusProvider, MP>
-where
-    P2P: PeerToPeer<GossipedTransaction = TransactionGossipData> + 'static,
-    ViewProvider: AtomicView<LatestView = View> + 'static,
-    View: TxPoolDb,
-    WasmChecker: WasmCheckerConstraint + Send + Sync + 'static,
-    GasPriceProvider: GasPriceProviderConstraint + Send + Sync + 'static,
-    ConsensusProvider: ConsensusParametersProvider + Send + Sync + 'static,
-    MP: MemoryPool + Send + Sync + 'static,
-{
-    const NAME: &'static str = "TxPool";
-
-    type SharedData = SharedState<
-        P2P,
-        ViewProvider,
-        WasmChecker,
-        GasPriceProvider,
-        ConsensusProvider,
-        MP,
-    >;
-    type Task =
-        Task<P2P, ViewProvider, WasmChecker, GasPriceProvider, ConsensusProvider, MP>;
-    type TaskParams = ();
-
-    fn shared_data(&self) -> Self::SharedData {
-        self.tx_pool_shared_state.clone()
-    }
-
-    async fn into_task(
-        mut self,
-        _: &StateWatcher,
-        _: Self::TaskParams,
-    ) -> anyhow::Result<Self::Task> {
-        self.ttl_timer.reset();
-        Ok(self)
-    }
-}
-
-#[async_trait::async_trait]
-impl<P2P, ViewProvider, View, WasmChecker, GasPriceProvider, ConsensusProvider, MP>
-    RunnableTask
-    for Task<P2P, ViewProvider, WasmChecker, GasPriceProvider, ConsensusProvider, MP>
-where
-    P2P: PeerToPeer<GossipedTransaction = TransactionGossipData> + 'static,
-    ViewProvider: AtomicView<LatestView = View> + 'static,
-    View: TxPoolDb,
-    WasmChecker: WasmCheckerConstraint + Send + Sync + 'static,
-    GasPriceProvider: GasPriceProviderConstraint + Send + Sync + 'static,
-    ConsensusProvider: ConsensusParametersProvider + Send + Sync + 'static,
-    MP: MemoryPool + Send + Sync + 'static,
-{
-    async fn run(&mut self, watcher: &mut StateWatcher) -> anyhow::Result<bool> {
-        let should_continue;
-
-        tokio::select! {
-            biased;
-
-            _ = watcher.while_started() => {
-                should_continue = false;
-            }
-
-            _ = self.ttl_timer.tick() => {
-                let removed = self.tx_pool_shared_state.txpool.lock().prune_old_txs();
-                for tx in removed {
-                    self.tx_pool_shared_state.tx_status_sender.send_squeezed_out(tx.id(), TxPoolError::TTLReason);
-                }
-
-                should_continue = true
-            }
-
-            result = self.committed_block_stream.next() => {
-                if let Some(result) = result {
-                    let new_height = *result
-                        .sealed_block
-                        .entity.header().height();
-
-                    {
-                        let mut lock = self.tx_pool_shared_state.txpool.lock();
-                        lock.block_update(
-                            &result.tx_status,
-                        );
-                        *self.tx_pool_shared_state.current_height.lock() = new_height;
-                    }
-                    should_continue = true;
-                } else {
-                    should_continue = false;
-                }
-            }
-
-            new_peer_subscribed = self.new_tx_gossip_subscription.next() => {
-                // If we are out of capacity, we will skip this event.
-                if let Some(peer_id) = new_peer_subscribed {
-                    let _ = self.heavy_async_processor.spawn({
-                        let shared_state = self.tx_pool_shared_state.clone();
-                        async move {
-                            shared_state.new_peer_subscribed(peer_id).await;
-                        }
-                    });
-                }
-                should_continue = true;
-            }
-
-            new_transaction = self.gossiped_tx_stream.next() => {
-                if let Some(GossipData { data: Some(tx), message_id, peer_id }) = new_transaction {
-                    let current_height = *self.tx_pool_shared_state.current_height.lock();
-                    let (version, params) = self
-                        .tx_pool_shared_state
-                        .consensus_parameters_provider
-                        .latest_consensus_parameters();
-
-                    // verify tx
-                    let checked_tx = check_single_tx(
-                        tx,
-                        current_height,
-                        self.tx_pool_shared_state.utxo_validation,
-                        params.as_ref(),
-                        &self.tx_pool_shared_state.gas_price_provider,
-                        self.tx_pool_shared_state.memory_pool.get_memory().await,
-                    ).await;
-
-                    let acceptance = match checked_tx {
-                        Ok(tx) => {
-                            let id = tx.transaction().cached_id().expect("`Checked` tx should have cached id");
-                            let txs = vec![tx];
-
-                            // insert tx
-                            let mut result = tracing::info_span!("Received tx via gossip", %id)
-                                .in_scope(|| {
-                                    self.tx_pool_shared_state.txpool.lock().insert(
-                                        &self.tx_pool_shared_state.tx_status_sender,
-                                        version,
-                                        txs
-                                    )
-                                });
-
-                            match result.pop() {
-                                Some(Ok(_)) => {
-                                    GossipsubMessageAcceptance::Accept
-                                },
-                                // Use similar p2p punishment rules as bitcoin
-                                // https://github.com/bitcoin/bitcoin/blob/6ff0aa089c01ff3e610ecb47814ed739d685a14c/src/net_processing.cpp#L1856
-                                Some(Err(TxPoolError::ConsensusValidity(_))) | Some(Err(TxPoolError::MintIsDisallowed)) => {
-                                    GossipsubMessageAcceptance::Reject
-                                },
-                                _ => GossipsubMessageAcceptance::Ignore
-                            }
-                        }
-                        Err(_) => {
-                            GossipsubMessageAcceptance::Reject
-                        }
-                    };
-
-                    // notify p2p layer about whether this tx was accepted
-                    let message_info = GossipsubMessageInfo {
-                        message_id,
-                        peer_id,
-                    };
-
-                    let _ = self.tx_pool_shared_state.p2p.notify_gossip_transaction_validity(message_info, acceptance);
-
-                    should_continue = true;
-                } else {
-                    should_continue = false;
-                }
-            }
-        }
-        Ok(should_continue)
-    }
-
-    async fn shutdown(self) -> anyhow::Result<()> {
-        // Nothing to shut down because we don't have any temporary state that should be dumped,
-        // and we don't spawn any sub-tasks that we need to finish or await.
-        // Maybe we will save and load the previous list of transactions in the future to
-        // avoid losing them.
-        Ok(())
-    }
-}
-
-// TODO: Remove `find` and `find_one` methods from `txpool`. It is used only by GraphQL.
-//  Instead, `fuel-core` can create a `DatabaseWithTxPool` that aggregates `TxPool` and
-//  storage `Database` together. GraphQL will retrieve data from this `DatabaseWithTxPool` via
-//  `StorageInspect` trait.
-impl<P2P, ViewProvider, WasmChecker, GasPriceProvider, ConsensusProvider, MP>
-    SharedState<P2P, ViewProvider, WasmChecker, GasPriceProvider, ConsensusProvider, MP>
-{
-    pub fn pending_number(&self) -> usize {
-        self.txpool.lock().pending_number()
-    }
-
-    pub fn total_consumable_gas(&self) -> u64 {
-        self.txpool.lock().consumable_gas()
-    }
-
-    pub fn remove_txs(&self, ids: Vec<(TxId, String)>) -> Vec<ArcPoolTx> {
-        self.txpool.lock().remove(&self.tx_status_sender, ids)
-    }
-
-    pub fn find(&self, ids: Vec<TxId>) -> Vec<Option<TxInfo>> {
-        self.txpool.lock().find(&ids)
-    }
-
-    pub fn find_one(&self, id: TxId) -> Option<TxInfo> {
-        self.txpool.lock().find_one(&id)
-    }
-
-    pub fn select_transactions(
-        &self,
-        max_gas: u64,
-        transactions_limit: u16,
-        block_transaction_size_limit: u32,
-    ) -> Vec<ArcPoolTx> {
-        let mut guard = self.txpool.lock();
-        let txs = guard.includable();
-        let sorted_txs: Vec<_> =
-            select_transactions(txs, max_gas, block_transaction_size_limit)
-                .take(transactions_limit as usize)
-                .collect();
-
-        for tx in sorted_txs.iter() {
-            guard.remove_committed_tx(&tx.id());
-        }
-        sorted_txs
-    }
-
-    pub fn remove(&self, ids: Vec<(TxId, String)>) -> Vec<ArcPoolTx> {
-        self.txpool.lock().remove(&self.tx_status_sender, ids)
-    }
-
-    pub fn new_tx_notification_subscribe(&self) -> broadcast::Receiver<TxId> {
-        self.tx_status_sender.new_tx_notification_sender.subscribe()
-    }
-
-    pub fn tx_update_subscribe(&self, tx_id: Bytes32) -> anyhow::Result<TxStatusStream> {
-        self.tx_status_sender
-            .update_sender
-            .try_subscribe::<MpscChannel>(tx_id)
-            .ok_or(anyhow!("Maximum number of subscriptions reached"))
-    }
-
-    pub fn send_complete(
-        &self,
-        id: Bytes32,
-        block_height: &BlockHeight,
-        status: TransactionStatus,
-    ) {
-        self.tx_status_sender.send_complete(
-            id,
-            block_height,
-            TxStatusMessage::Status(status),
-        )
-    }
-
-    pub fn get_tx_ids(&self, max_txs: usize) -> Vec<TxId> {
-        self.txpool
-            .lock()
-            .txs()
-            .iter()
-            .take(max_txs)
-            .map(|tx| TxId::new(**tx.0))
-            .collect()
-    }
-}
-
-impl<P2P, ViewProvider, WasmChecker, GasPriceProvider, ConsensusProvider, View, MP>
-    SharedState<P2P, ViewProvider, WasmChecker, GasPriceProvider, ConsensusProvider, MP>
-where
-    P2P: PeerToPeer<GossipedTransaction = TransactionGossipData>,
-    ViewProvider: AtomicView<LatestView = View>,
-    View: TxPoolDb,
-    WasmChecker: WasmCheckerConstraint + Send + Sync,
-    GasPriceProvider: GasPriceProviderConstraint + Send + Sync,
-    ConsensusProvider: ConsensusParametersProvider,
-    MP: MemoryPool + Send + Sync,
-{
-    async fn new_peer_subscribed(&self, peer_id: PeerId) {
-        // Gathering txs
-        let peer_tx_ids = self
-            .p2p
-            .request_tx_ids(peer_id.clone())
-            .await
-            .inspect_err(|e| {
-                tracing::error!("Failed to gather tx ids from peer {}: {}", &peer_id, e);
-            })
-            .unwrap_or_default();
-        if peer_tx_ids.is_empty() {
-            return;
-        }
-        let tx_ids_to_ask = self.txpool.lock().filter_existing_tx_ids(peer_tx_ids);
-        if tx_ids_to_ask.is_empty() {
-            return;
-        }
-        let txs: Vec<Arc<Transaction>> = self
-            .p2p
-            .request_txs(peer_id.clone(), tx_ids_to_ask)
-            .await
-            .inspect_err(|e| {
-                tracing::error!("Failed to gather tx ids from peer {}: {}", &peer_id, e);
-            })
-            .unwrap_or_default()
-            .into_iter()
-            .flatten()
-            .map(Arc::new)
-            .collect();
-        if txs.is_empty() {
-            return;
-        }
-        // Verifying them
-        self.insert(txs).await;
-    }
-
-    #[tracing::instrument(name = "insert_submitted_txn", skip_all)]
-    pub async fn insert(
-        &self,
-        txs: Vec<Arc<Transaction>>,
-    ) -> Vec<Result<InsertionResult, TxPoolError>> {
-        // verify txs
-        let current_height = *self.current_height.lock();
-        let (version, params) = self
-            .consensus_parameters_provider
-            .latest_consensus_parameters();
-
-        let checked_txs = check_transactions(
-            &txs,
-            current_height,
-            self.utxo_validation,
-            params.as_ref(),
-            &self.gas_price_provider,
-            self.memory_pool.clone(),
-        )
-        .await;
-
-        let mut valid_txs = vec![];
-
-        let checked_txs: Vec<_> = checked_txs
-            .into_iter()
-            .map(|tx_check| match tx_check {
-                Ok(tx) => {
-                    valid_txs.push(tx);
-                    None
-                }
-                Err(err) => Some(err),
-            })
-            .collect();
-
-        // insert txs
-        let insertion = {
-            self.txpool
-                .lock()
-                .insert(&self.tx_status_sender, version, valid_txs)
-        };
-
-        for (ret, tx) in insertion.iter().zip(txs.into_iter()) {
-            match ret {
-                Ok(_) => {
-                    let result = self.p2p.broadcast_transaction(tx.clone());
-                    if let Err(e) = result {
-                        // It can be only in the case of p2p being down or requests overloading it.
-                        tracing::error!(
-                            "Unable to broadcast transaction, got an {} error",
-                            e
-                        );
-                    }
-                }
-                Err(_) => {}
-            }
-        }
-
-        let mut insertion = insertion.into_iter();
-
-        checked_txs
-            .into_iter()
-            .map(|check_result| match check_result {
-                None => insertion.next().unwrap_or_else(|| {
-                    Err(TxPoolError::Other(
-                        anyhow::anyhow!("Insertion result is missing").to_string(),
-                    ))
-                }),
-                Some(err) => Err(err),
-            })
-            .collect()
-    }
-}
-
-#[derive(Debug, Clone)]
-pub struct TxUpdate {
-    tx_id: Bytes32,
-    message: TxStatusMessage,
-}
-
-impl TxUpdate {
-    pub fn new(tx_id: Bytes32, message: TxStatusMessage) -> Self {
-        Self { tx_id, message }
-    }
-
-    pub fn tx_id(&self) -> &Bytes32 {
-        &self.tx_id
-    }
-
-    pub fn into_msg(self) -> TxStatusMessage {
-        self.message
-    }
-}
-
-#[derive(Debug, Clone, PartialEq, Eq)]
-pub enum TxStatusMessage {
-    Status(TransactionStatus),
-    FailedStatus,
-}
-
-#[allow(clippy::too_many_arguments)]
-pub fn new_service<
-    P2P,
-    Importer,
-    ViewProvider,
-    WasmChecker,
-    GasPriceProvider,
-    ConsensusProvider,
-    MP,
->(
-    config: Config,
-    provider: ViewProvider,
-    importer: Importer,
-    p2p: P2P,
-    wasm_checker: WasmChecker,
-    current_height: BlockHeight,
-    gas_price_provider: GasPriceProvider,
-    consensus_parameters_provider: ConsensusProvider,
-    memory_pool: MP,
-) -> Service<P2P, ViewProvider, WasmChecker, GasPriceProvider, ConsensusProvider, MP>
-where
-    Importer: BlockImporter,
-    P2P: PeerToPeer<GossipedTransaction = TransactionGossipData> + 'static,
-    ViewProvider: AtomicView,
-    ViewProvider::LatestView: TxPoolDb,
-    WasmChecker: WasmCheckerConstraint + Send + Sync,
-    GasPriceProvider: GasPriceProviderConstraint + Send + Sync,
-    ConsensusProvider: ConsensusParametersProvider + Send + Sync,
-    MP: MemoryPool + Send + Sync,
-{
-    let p2p = Arc::new(p2p);
-    let gossiped_tx_stream = p2p.gossiped_transaction_events();
-    let new_tx_gossip_subscription = p2p.subscribe_new_peers();
-    let committed_block_stream = importer.block_events();
-    let mut ttl_timer = tokio::time::interval(config.transaction_ttl);
-    ttl_timer.set_missed_tick_behavior(MissedTickBehavior::Skip);
-    let number_of_active_subscription = config.number_of_active_subscription;
-    let txpool = Arc::new(ParkingMutex::new(TxPool::new(
-        config.clone(),
-        provider,
-        wasm_checker,
-    )));
-    let task = Task {
-        gossiped_tx_stream,
-        new_tx_gossip_subscription,
-        committed_block_stream,
-        tx_pool_shared_state: SharedState {
-            tx_status_sender: TxStatusChange::new(
-                number_of_active_subscription,
-                // The connection should be closed automatically after the `SqueezedOut` event.
-                // But because of slow/malicious consumers, the subscriber can still be occupied.
-                // We allow the subscriber to receive the event produced by TxPool's TTL.
-                // But we still want to drop subscribers after `2 * TxPool_TTL`.
-                config.transaction_ttl.saturating_mul(2),
-            ),
-            txpool,
-            p2p,
-            utxo_validation: config.utxo_validation,
-            current_height: Arc::new(ParkingMutex::new(current_height)),
-            consensus_parameters_provider: Arc::new(consensus_parameters_provider),
-            gas_price_provider: Arc::new(gas_price_provider),
-            memory_pool: Arc::new(memory_pool),
-        },
-        heavy_async_processor: HeavyAsyncProcessor::new(2, 10).unwrap(),
-        ttl_timer,
-    };
-
-    Service::new(task)
-}
-
-impl<E> From<Result<TransactionStatus, E>> for TxStatusMessage {
-    fn from(result: Result<TransactionStatus, E>) -> Self {
-        match result {
-            Ok(status) => TxStatusMessage::Status(status),
-            _ => TxStatusMessage::FailedStatus,
-        }
-    }
-}
-
-#[cfg(test)]
-pub mod test_helpers;
-#[cfg(test)]
-pub mod tests;
-#[cfg(test)]
-pub mod tests_p2p;
diff --git a/crates/services/txpool/src/service/test_helpers.rs b/crates/services/txpool/src/service/test_helpers.rs
deleted file mode 100644
index a7b24aa847c..00000000000
--- a/crates/services/txpool/src/service/test_helpers.rs
+++ /dev/null
@@ -1,310 +0,0 @@
-use super::*;
-use crate::{
-    mock_db::MockDBProvider,
-    ports::{
-        BlockImporter,
-        MockConsensusParametersProvider,
-    },
-    test_helpers::MockWasmChecker,
-    types::GasPrice,
-    MockDb,
-    Result as TxPoolResult,
-};
-use fuel_core_services::{
-    stream::BoxStream,
-    Service as ServiceTrait,
-};
-use fuel_core_types::{
-    blockchain::SealedBlock,
-    entities::coins::coin::Coin,
-    fuel_crypto::rand::{
-        rngs::StdRng,
-        SeedableRng,
-    },
-    fuel_tx::{
-        Cacheable,
-        Input,
-        Transaction,
-        TransactionBuilder,
-        Word,
-    },
-    fuel_vm::interpreter::MemoryInstance,
-    services::{
-        block_importer::ImportResult,
-        p2p::GossipsubMessageAcceptance,
-    },
-};
-use std::cell::RefCell;
-
-type GossipedTransaction = GossipData<Transaction>;
-
-pub struct DummyPool;
-
-#[async_trait::async_trait]
-impl MemoryPool for DummyPool {
-    type Memory = MemoryInstance;
-
-    async fn get_memory(&self) -> Self::Memory {
-        MemoryInstance::new()
-    }
-}
-
-pub struct TestContext {
-    pub(crate) service: Service<
-        MockP2P,
-        MockDBProvider,
-        MockWasmChecker,
-        MockTxPoolGasPrice,
-        MockConsensusParametersProvider,
-        DummyPool,
-    >,
-    mock_db: MockDb,
-    rng: RefCell<StdRng>,
-}
-
-#[derive(Debug, Clone)]
-pub struct MockTxPoolGasPrice {
-    pub gas_price: Option<GasPrice>,
-}
-
-impl MockTxPoolGasPrice {
-    pub fn new(gas_price: GasPrice) -> Self {
-        Self {
-            gas_price: Some(gas_price),
-        }
-    }
-
-    pub fn new_none() -> Self {
-        Self { gas_price: None }
-    }
-}
-
-#[async_trait::async_trait]
-impl GasPriceProviderConstraint for MockTxPoolGasPrice {
-    async fn next_gas_price(&self) -> TxPoolResult<GasPrice> {
-        self.gas_price.ok_or(TxPoolError::GasPriceNotFound(
-            "Gas price not found".to_string(),
-        ))
-    }
-}
-
-impl TestContext {
-    pub async fn new() -> Self {
-        TestContextBuilder::new().build_and_start().await
-    }
-
-    pub fn service(
-        &self,
-    ) -> &Service<
-        MockP2P,
-        MockDBProvider,
-        MockWasmChecker,
-        MockTxPoolGasPrice,
-        MockConsensusParametersProvider,
-        DummyPool,
-    > {
-        &self.service
-    }
-
-    pub fn setup_script_tx(&self, tip: Word) -> Transaction {
-        let (_, gas_coin) = self.setup_coin();
-        let mut tx = TransactionBuilder::script(vec![], vec![])
-            .max_fee_limit(tip)
-            .tip(tip)
-            .script_gas_limit(1000)
-            .add_input(gas_coin)
-            .finalize_as_transaction();
-
-        tx.precompute(&Default::default())
-            .expect("Should be able to cache");
-        tx
-    }
-
-    pub fn setup_coin(&self) -> (Coin, Input) {
-        crate::test_helpers::setup_coin(&mut self.rng.borrow_mut(), Some(&self.mock_db))
-    }
-}
-
-mockall::mock! {
-    pub P2P {}
-
-    #[async_trait::async_trait]
-    impl PeerToPeer for P2P {
-        type GossipedTransaction = GossipedTransaction;
-
-        fn broadcast_transaction(&self, transaction: Arc<Transaction>) -> anyhow::Result<()>;
-
-        fn gossiped_transaction_events(&self) -> BoxStream<GossipedTransaction>;
-
-        fn notify_gossip_transaction_validity(
-            &self,
-            message_info: GossipsubMessageInfo,
-            validity: GossipsubMessageAcceptance,
-        ) -> anyhow::Result<()>;
-
-        fn subscribe_new_peers(&self) -> BoxStream<PeerId>;
-
-        async fn request_tx_ids(&self, peer_id: PeerId) -> anyhow::Result<Vec<TxId>>;
-
-        async fn request_txs(
-            &self,
-            peer_id: PeerId,
-            tx_ids: Vec<TxId>,
-        ) -> anyhow::Result<Vec<Option<Transaction>>>;
-    }
-}
-
-impl MockP2P {
-    pub fn new_with_txs(txs: Vec<Transaction>) -> Self {
-        let mut p2p = MockP2P::default();
-        p2p.expect_gossiped_transaction_events().returning(move || {
-            let txs_clone = txs.clone();
-            let stream = fuel_core_services::stream::unfold(txs_clone, |mut txs| async {
-                let tx = txs.pop();
-                if let Some(tx) = tx {
-                    Some((GossipData::new(tx, vec![], vec![]), txs))
-                } else {
-                    core::future::pending().await
-                }
-            });
-            Box::pin(stream)
-        });
-
-        p2p
-    }
-}
-
-mockall::mock! {
-    pub Importer {}
-
-    impl BlockImporter for Importer {
-        fn block_events(&self) -> BoxStream<SharedImportResult>;
-    }
-}
-
-impl MockImporter {
-    fn with_blocks(blocks: Vec<SealedBlock>) -> Self {
-        let mut importer = MockImporter::default();
-        importer.expect_block_events().returning(move || {
-            let blocks = blocks.clone();
-            let stream = fuel_core_services::stream::unfold(blocks, |mut blocks| async {
-                let block = blocks.pop();
-                if let Some(sealed_block) = block {
-                    let result: SharedImportResult = Arc::new(
-                        ImportResult::new_from_local(sealed_block, vec![], vec![]),
-                    );
-
-                    Some((result, blocks))
-                } else {
-                    core::future::pending().await
-                }
-            });
-            Box::pin(stream)
-        });
-        importer
-    }
-}
-
-pub struct TestContextBuilder {
-    config: Option<Config>,
-    mock_db: MockDb,
-    rng: StdRng,
-    p2p: Option<MockP2P>,
-    importer: Option<MockImporter>,
-}
-
-impl Default for TestContextBuilder {
-    fn default() -> Self {
-        Self::new()
-    }
-}
-
-impl TestContextBuilder {
-    pub fn new() -> Self {
-        Self {
-            config: None,
-            mock_db: MockDb::default(),
-            rng: StdRng::seed_from_u64(10),
-            p2p: None,
-            importer: None,
-        }
-    }
-
-    pub fn with_config(mut self, config: Config) -> Self {
-        self.config = Some(config);
-        self
-    }
-
-    pub fn with_importer(&mut self, importer: MockImporter) {
-        self.importer = Some(importer)
-    }
-
-    pub fn with_p2p(&mut self, p2p: MockP2P) {
-        self.p2p = Some(p2p)
-    }
-
-    pub fn setup_script_tx(&mut self, tip: Word) -> Transaction {
-        let (_, gas_coin) = self.setup_coin();
-        TransactionBuilder::script(vec![], vec![])
-            .tip(tip)
-            .max_fee_limit(tip)
-            .script_gas_limit(1000)
-            .add_input(gas_coin)
-            .finalize_as_transaction()
-    }
-
-    pub fn setup_coin(&mut self) -> (Coin, Input) {
-        crate::test_helpers::setup_coin(&mut self.rng, Some(&self.mock_db))
-    }
-
-    pub fn build(self) -> TestContext {
-        let rng = RefCell::new(self.rng);
-        let gas_price = 0;
-        let config = self.config.unwrap_or_default();
-        let mock_db = self.mock_db;
-
-        let mut p2p = self.p2p.unwrap_or_else(|| MockP2P::new_with_txs(vec![]));
-        // set default handlers for p2p methods after test is set up, so they will be last on the FIFO
-        // ordering of methods handlers: https://docs.rs/mockall/0.12.1/mockall/index.html#matching-multiple-calls
-        p2p.expect_notify_gossip_transaction_validity()
-            .returning(move |_, _| Ok(()));
-        p2p.expect_broadcast_transaction()
-            .returning(move |_| Ok(()));
-        p2p.expect_subscribe_new_peers()
-            .returning(|| Box::pin(fuel_core_services::stream::pending()));
-
-        let importer = self
-            .importer
-            .unwrap_or_else(|| MockImporter::with_blocks(vec![]));
-        let gas_price_provider = MockTxPoolGasPrice::new(gas_price);
-        let mut consensus_parameters_provider =
-            MockConsensusParametersProvider::default();
-        consensus_parameters_provider
-            .expect_latest_consensus_parameters()
-            .returning(|| (0, Arc::new(Default::default())));
-
-        let service = new_service(
-            config,
-            MockDBProvider(mock_db.clone()),
-            importer,
-            p2p,
-            MockWasmChecker { result: Ok(()) },
-            Default::default(),
-            gas_price_provider,
-            consensus_parameters_provider,
-            DummyPool,
-        );
-
-        TestContext {
-            service,
-            mock_db,
-            rng,
-        }
-    }
-
-    pub async fn build_and_start(self) -> TestContext {
-        let context = self.build();
-        context.service.start_and_await().await.unwrap();
-        context
-    }
-}
diff --git a/crates/services/txpool/src/service/tests.rs b/crates/services/txpool/src/service/tests.rs
deleted file mode 100644
index c772b168164..00000000000
--- a/crates/services/txpool/src/service/tests.rs
+++ /dev/null
@@ -1,281 +0,0 @@
-use super::*;
-use crate::service::test_helpers::{
-    TestContext,
-    TestContextBuilder,
-};
-use fuel_core_services::Service as ServiceTrait;
-use fuel_core_types::{
-    fuel_tx::UniqueIdentifier,
-    fuel_types::ChainId,
-};
-use std::time::Duration;
-
-#[tokio::test]
-async fn test_start_stop() {
-    let ctx = TestContext::new().await;
-
-    let service = ctx.service();
-
-    // Double start will return false.
-    assert!(service.start().is_err(), "double start should fail");
-
-    let state = service.stop_and_await().await.unwrap();
-    assert!(state.stopped());
-}
-
-#[tokio::test]
-async fn test_find() {
-    let ctx = TestContext::new().await;
-
-    let tx1 = Arc::new(ctx.setup_script_tx(10));
-    let tx2 = Arc::new(ctx.setup_script_tx(20));
-    let tx3 = Arc::new(ctx.setup_script_tx(30));
-
-    let service = ctx.service();
-
-    let out = service.shared.insert(vec![tx1.clone(), tx2.clone()]).await;
-
-    assert_eq!(out.len(), 2, "Should be len 2:{out:?}");
-    assert!(out[0].is_ok(), "Tx1 should be OK, got err:{out:?}");
-    assert!(out[1].is_ok(), "Tx2 should be OK, got err:{out:?}");
-    let out = service.shared.find(vec![
-        tx1.id(&Default::default()),
-        tx3.id(&Default::default()),
-    ]);
-    assert_eq!(out.len(), 2, "Should be len 2:{out:?}");
-    assert!(out[0].is_some(), "Tx1 should be some:{out:?}");
-    let id = out[0].as_ref().unwrap().id();
-    assert_eq!(id, tx1.id(&Default::default()), "Found tx id match{out:?}");
-    assert!(out[1].is_none(), "Tx3 should not be found:{out:?}");
-    service.stop_and_await().await.unwrap();
-}
-
-#[tokio::test(start_paused = true)]
-async fn test_prune_transactions() {
-    const TIMEOUT: u64 = 10;
-
-    let config = Config {
-        transaction_ttl: Duration::from_secs(TIMEOUT),
-        ..Default::default()
-    };
-    let ctx = TestContextBuilder::new()
-        .with_config(config)
-        .build_and_start()
-        .await;
-
-    let tx1 = Arc::new(ctx.setup_script_tx(10));
-    let tx2 = Arc::new(ctx.setup_script_tx(20));
-    let tx3 = Arc::new(ctx.setup_script_tx(30));
-
-    let service = ctx.service();
-
-    let out = service
-        .shared
-        .insert(vec![tx1.clone(), tx2.clone(), tx3.clone()])
-        .await;
-
-    // Check that we have all transactions after insertion.
-    assert_eq!(out.len(), 3, "Should be len 3:{out:?}");
-    assert!(out[0].is_ok(), "Tx1 should be OK, got err:{out:?}");
-    assert!(out[1].is_ok(), "Tx2 should be OK, got err:{out:?}");
-    assert!(out[2].is_ok(), "Tx3 should be OK, got err:{out:?}");
-
-    tokio::time::sleep(Duration::from_secs(TIMEOUT)).await;
-    let out = service.shared.find(vec![
-        tx1.id(&Default::default()),
-        tx2.id(&Default::default()),
-        tx3.id(&Default::default()),
-    ]);
-    assert_eq!(out.len(), 3, "Should be len 3:{out:?}");
-    assert!(out[0].is_some(), "Tx1 should exist");
-    assert!(out[1].is_some(), "Tx2 should exist");
-    assert!(out[2].is_some(), "Tx3 should exist");
-
-    tokio::time::sleep(Duration::from_secs(TIMEOUT)).await;
-    let out = service.shared.find(vec![
-        tx1.id(&Default::default()),
-        tx2.id(&Default::default()),
-        tx3.id(&Default::default()),
-    ]);
-    assert_eq!(out.len(), 3, "Should be len 3:{out:?}");
-    assert!(out[0].is_none(), "Tx1 should be pruned");
-    assert!(out[1].is_none(), "Tx2 should be pruned");
-    assert!(out[2].is_none(), "Tx3 should be pruned");
-
-    service.stop_and_await().await.unwrap();
-}
-
-#[tokio::test]
-async fn test_prune_transactions_the_oldest() {
-    const TIMEOUT: u64 = 5;
-
-    let config = Config {
-        transaction_ttl: Duration::from_secs(TIMEOUT),
-        ..Default::default()
-    };
-    let ctx = TestContextBuilder::new()
-        .with_config(config)
-        .build_and_start()
-        .await;
-
-    let tx1 = Arc::new(ctx.setup_script_tx(10));
-    let tx2 = Arc::new(ctx.setup_script_tx(20));
-    let tx3 = Arc::new(ctx.setup_script_tx(30));
-    let tx4 = Arc::new(ctx.setup_script_tx(40));
-
-    let service = ctx.service();
-
-    // insert tx1 at time `0`
-    let out = service.shared.insert(vec![tx1.clone()]).await;
-    assert!(out[0].is_ok(), "Tx1 should be OK, got err:{out:?}");
-
-    // sleep for `4` seconds
-    tokio::time::sleep(Duration::from_secs(4)).await;
-    // insert tx2 at time `4`
-    let out = service.shared.insert(vec![tx2.clone()]).await;
-    assert!(out[0].is_ok(), "Tx2 should be OK, got err:{out:?}");
-
-    // check that tx1 and tx2 are still there at time `4`
-    let out = service.shared.find(vec![
-        tx1.id(&Default::default()),
-        tx2.id(&Default::default()),
-    ]);
-    assert!(out[0].is_some(), "Tx1 should exist");
-    assert!(out[1].is_some(), "Tx2 should exist");
-
-    // sleep for another `4` seconds
-    tokio::time::sleep(Duration::from_secs(4)).await;
-    // insert tx3 at time `8`
-    let out = service.shared.insert(vec![tx3.clone()]).await;
-    assert!(out[0].is_ok(), "Tx3 should be OK, got err:{out:?}");
-
-    // sleep for `3` seconds
-    tokio::time::sleep(Duration::from_secs(3)).await;
-
-    // insert tx4 at time `11`
-    let out = service.shared.insert(vec![tx4.clone()]).await;
-    assert!(out[0].is_ok(), "Tx4 should be OK, got err:{out:?}");
-
-    // time is now `11`, tx1 and tx2 should be pruned
-    let out = service.shared.find(vec![
-        tx1.id(&Default::default()),
-        tx2.id(&Default::default()),
-        tx3.id(&Default::default()),
-        tx4.id(&ChainId::default()),
-    ]);
-    assert!(out[0].is_none(), "Tx1 should be pruned");
-    assert!(out[1].is_none(), "Tx2 should be pruned");
-    assert!(out[2].is_some(), "Tx3 should exist");
-    assert!(out[3].is_some(), "Tx4 should exist");
-
-    // sleep for `5` seconds
-    tokio::time::sleep(Duration::from_secs(TIMEOUT)).await;
-
-    // time is now `16`, tx3 should be pruned
-    let out = service.shared.find(vec![
-        tx1.id(&Default::default()),
-        tx2.id(&Default::default()),
-        tx3.id(&Default::default()),
-        tx4.id(&ChainId::default()),
-    ]);
-    assert!(out[0].is_none(), "Tx1 should be pruned");
-    assert!(out[1].is_none(), "Tx2 should be pruned");
-    assert!(out[2].is_none(), "Tx3 should be pruned");
-    assert!(out[3].is_some(), "Tx4 should exist");
-
-    service.stop_and_await().await.unwrap();
-}
-
-#[tokio::test]
-async fn simple_insert_removal_subscription() {
-    let ctx = TestContextBuilder::new().build_and_start().await;
-
-    let tx1 = Arc::new(ctx.setup_script_tx(10));
-    let tx2 = Arc::new(ctx.setup_script_tx(20));
-    let service = ctx.service();
-
-    let mut new_tx_notification = service.shared.new_tx_notification_subscribe();
-    let mut tx1_subscribe_updates = service
-        .shared
-        .tx_update_subscribe(tx1.cached_id().unwrap())
-        .unwrap();
-    let mut tx2_subscribe_updates = service
-        .shared
-        .tx_update_subscribe(tx2.cached_id().unwrap())
-        .unwrap();
-
-    let out = service.shared.insert(vec![tx1.clone(), tx2.clone()]).await;
-
-    match &out[0] {
-        Ok(_) => {
-            assert_eq!(
-                new_tx_notification.try_recv(),
-                Ok(tx1.cached_id().unwrap()),
-                "First added should be tx1"
-            );
-            let update = tx1_subscribe_updates.next().await.unwrap();
-            assert!(
-                matches!(
-                    update,
-                    TxStatusMessage::Status(TransactionStatus::Submitted { .. })
-                ),
-                "First message in tx1 stream should be Submitted"
-            );
-        }
-        Err(err) => {
-            panic!("Tx1 should be OK, got err, {:?}", err)
-        }
-    }
-
-    if out[1].is_ok() {
-        assert_eq!(
-            new_tx_notification.try_recv(),
-            Ok(tx2.cached_id().unwrap()),
-            "Second added should be tx2"
-        );
-        let update = tx2_subscribe_updates.next().await.unwrap();
-        assert!(
-            matches!(
-                update,
-                TxStatusMessage::Status(TransactionStatus::Submitted { .. })
-            ),
-            "First message in tx2 stream should be Submitted"
-        );
-    } else {
-        panic!("Tx2 should be OK, got err");
-    }
-
-    // remove them
-    service.shared.remove(vec![
-        (
-            tx1.cached_id().unwrap(),
-            "Because of the test purposes".to_string(),
-        ),
-        (
-            tx2.cached_id().unwrap(),
-            "Because of the test purposes".to_string(),
-        ),
-    ]);
-
-    let update = tx1_subscribe_updates.next().await.unwrap();
-    assert_eq!(
-        update,
-        TxStatusMessage::Status(TransactionStatus::SqueezedOut {
-            reason: "Transaction squeezed out because Because of the test purposes"
-                .to_string()
-        }),
-        "Second message in tx1 stream should be squeezed out"
-    );
-
-    let update = tx2_subscribe_updates.next().await.unwrap();
-    assert_eq!(
-        update,
-        TxStatusMessage::Status(TransactionStatus::SqueezedOut {
-            reason: "Transaction squeezed out because Because of the test purposes"
-                .to_string()
-        }),
-        "Second message in tx2 stream should be squeezed out"
-    );
-
-    service.stop_and_await().await.unwrap();
-}
diff --git a/crates/services/txpool/src/test_helpers.rs b/crates/services/txpool/src/test_helpers.rs
deleted file mode 100644
index 193f397a934..00000000000
--- a/crates/services/txpool/src/test_helpers.rs
+++ /dev/null
@@ -1,239 +0,0 @@
-// Rust isn't smart enough to detect cross module test deps
-#![allow(dead_code)]
-
-use crate::{
-    mock_db::MockDBProvider,
-    ports::{
-        WasmChecker,
-        WasmValidityError,
-    },
-    Config,
-    MockDb,
-    TxPool,
-};
-use fuel_core_types::{
-    entities::coins::coin::{
-        Coin,
-        CompressedCoin,
-    },
-    fuel_asm::op,
-    fuel_crypto::rand::{
-        rngs::StdRng,
-        Rng,
-        SeedableRng,
-    },
-    fuel_tx::{
-        field::Inputs,
-        input::{
-            coin::{
-                CoinPredicate,
-                CoinSigned,
-            },
-            contract::Contract,
-        },
-        Bytes32,
-        ConsensusParameters,
-        Finalizable,
-        Input,
-        Output,
-        TransactionBuilder,
-        UtxoId,
-    },
-    fuel_types::{
-        AssetId,
-        Word,
-    },
-    fuel_vm::{
-        checked_transaction::EstimatePredicates,
-        interpreter::MemoryInstance,
-    },
-};
-
-// use some arbitrary large amount, this shouldn't affect the txpool logic except for covering
-// the byte and gas price fees.
-pub const TEST_COIN_AMOUNT: u64 = 100_000_000u64;
-
-pub(crate) struct TextContext {
-    mock_db: MockDb,
-    rng: StdRng,
-    wasm_checker: MockWasmChecker,
-    config: Option<Config>,
-}
-
-impl Default for TextContext {
-    fn default() -> Self {
-        Self {
-            mock_db: MockDb::default(),
-            rng: StdRng::seed_from_u64(0),
-            wasm_checker: MockWasmChecker { result: Ok(()) },
-            config: None,
-        }
-    }
-}
-
-impl TextContext {
-    pub(crate) fn database_mut(&mut self) -> &mut MockDb {
-        &mut self.mock_db
-    }
-
-    pub(crate) fn config(self, config: Config) -> Self {
-        Self {
-            config: Some(config),
-            ..self
-        }
-    }
-
-    pub(crate) fn wasm_checker(self, wasm_checker: MockWasmChecker) -> Self {
-        Self {
-            wasm_checker,
-            ..self
-        }
-    }
-
-    pub(crate) fn build(self) -> TxPool<MockDBProvider, MockWasmChecker> {
-        TxPool::new(
-            self.config.unwrap_or_default(),
-            MockDBProvider(self.mock_db),
-            self.wasm_checker,
-        )
-    }
-
-    pub(crate) fn setup_coin(&mut self) -> (Coin, Input) {
-        setup_coin(&mut self.rng, Some(&self.mock_db))
-    }
-
-    pub(crate) fn create_output_and_input(
-        &mut self,
-        amount: Word,
-    ) -> (Output, UnsetInput) {
-        let input = self.random_predicate(AssetId::BASE, amount, None);
-        let output = Output::coin(*input.input_owner().unwrap(), amount, AssetId::BASE);
-        (output, UnsetInput(input))
-    }
-
-    pub(crate) fn random_predicate(
-        &mut self,
-        asset_id: AssetId,
-        amount: Word,
-        utxo_id: Option<UtxoId>,
-    ) -> Input {
-        random_predicate(&mut self.rng, asset_id, amount, utxo_id)
-    }
-
-    pub(crate) fn custom_predicate(
-        &mut self,
-        asset_id: AssetId,
-        amount: Word,
-        code: Vec<u8>,
-        utxo_id: Option<UtxoId>,
-    ) -> Input {
-        let owner = Input::predicate_owner(&code);
-        Input::coin_predicate(
-            utxo_id.unwrap_or_else(|| self.rng.gen()),
-            owner,
-            amount,
-            asset_id,
-            Default::default(),
-            Default::default(),
-            code,
-            vec![],
-        )
-    }
-}
-
-pub(crate) fn setup_coin(rng: &mut StdRng, mock_db: Option<&MockDb>) -> (Coin, Input) {
-    let input = random_predicate(rng, AssetId::BASE, TEST_COIN_AMOUNT, None);
-    add_coin_to_state(input, mock_db)
-}
-
-pub(crate) fn add_coin_to_state(input: Input, mock_db: Option<&MockDb>) -> (Coin, Input) {
-    let mut coin = CompressedCoin::default();
-    coin.set_owner(*input.input_owner().unwrap());
-    coin.set_amount(TEST_COIN_AMOUNT);
-    coin.set_asset_id(*input.asset_id(&AssetId::BASE).unwrap());
-    let utxo_id = *input.utxo_id().unwrap();
-    if let Some(mock_db) = mock_db {
-        mock_db
-            .data
-            .lock()
-            .unwrap()
-            .coins
-            .insert(utxo_id, coin.clone());
-    }
-    (coin.uncompress(utxo_id), input)
-}
-
-pub(crate) fn random_predicate(
-    rng: &mut StdRng,
-    asset_id: AssetId,
-    amount: Word,
-    utxo_id: Option<UtxoId>,
-) -> Input {
-    // use predicate inputs to avoid expensive cryptography for signatures
-    let mut predicate_code: Vec<u8> = vec![op::ret(1)].into_iter().collect();
-    // append some randomizing bytes after the predicate has already returned.
-    predicate_code.push(rng.gen());
-    let owner = Input::predicate_owner(&predicate_code);
-    Input::coin_predicate(
-        utxo_id.unwrap_or_else(|| rng.gen()),
-        owner,
-        amount,
-        asset_id,
-        Default::default(),
-        Default::default(),
-        predicate_code,
-        vec![],
-    )
-    .into_default_estimated()
-}
-
-pub struct MockWasmChecker {
-    pub result: Result<(), WasmValidityError>,
-}
-
-impl WasmChecker for MockWasmChecker {
-    fn validate_uploaded_wasm(
-        &self,
-        _wasm_root: &Bytes32,
-    ) -> Result<(), WasmValidityError> {
-        self.result
-    }
-}
-
-pub struct UnsetInput(Input);
-
-impl UnsetInput {
-    pub fn into_input(self, new_utxo_id: UtxoId) -> Input {
-        let mut input = self.0;
-        match &mut input {
-            Input::CoinSigned(CoinSigned { utxo_id, .. })
-            | Input::CoinPredicate(CoinPredicate { utxo_id, .. })
-            | Input::Contract(Contract { utxo_id, .. }) => {
-                *utxo_id = new_utxo_id;
-            }
-            _ => {}
-        }
-        input
-    }
-}
-
-pub trait IntoEstimated {
-    #[cfg(feature = "test-helpers")]
-    fn into_default_estimated(self) -> Self;
-    fn into_estimated(self, params: &ConsensusParameters) -> Self;
-}
-
-impl IntoEstimated for Input {
-    #[cfg(feature = "test-helpers")]
-    fn into_default_estimated(self) -> Self {
-        self.into_estimated(&Default::default())
-    }
-
-    fn into_estimated(self, params: &ConsensusParameters) -> Self {
-        let mut tx = TransactionBuilder::script(vec![], vec![])
-            .add_input(self)
-            .finalize();
-        let _ = tx.estimate_predicates(&params.into(), MemoryInstance::new());
-        tx.inputs()[0].clone()
-    }
-}
diff --git a/crates/services/txpool/src/transaction_selector.rs b/crates/services/txpool/src/transaction_selector.rs
deleted file mode 100644
index 6b3bec6f6aa..00000000000
--- a/crates/services/txpool/src/transaction_selector.rs
+++ /dev/null
@@ -1,331 +0,0 @@
-use fuel_core_types::{
-    fuel_types::Word,
-    services::txpool::ArcPoolTx,
-};
-
-// transaction selection could use a plugin based approach in the
-// future for block producers to customize block building (e.g. alternative priorities besides gas fees)
-
-// Expects sorted by tip, highest first
-pub fn select_transactions(
-    includable_txs: impl Iterator<Item = ArcPoolTx>,
-    max_gas: u64,
-    block_transaction_size_limit: u32,
-) -> impl Iterator<Item = ArcPoolTx> {
-    // Future improvements to this algorithm may take into account the parallel nature of
-    // transactions to maximize throughput.
-
-    let mut used_block_gas_space: Word = 0;
-    let mut used_block_size_space: u32 = 0;
-
-    // The type of the index for the transaction is `u16`, so we need to
-    // limit it to `MAX` value minus 1(because of the `Mint` transaction).
-    let takes_txs = u16::MAX - 1;
-
-    // Pick as many transactions as we can fit into the block (greedy),
-    // respecting both gas and size limit
-    includable_txs
-        .filter(move |tx| {
-            let tx_block_gas_space = tx.max_gas();
-            let tx_block_size_space =
-                tx.metered_bytes_size().try_into().unwrap_or(u32::MAX);
-
-            let new_used_block_gas_space =
-                used_block_gas_space.saturating_add(tx_block_gas_space);
-            let new_used_block_size_space =
-                used_block_size_space.saturating_add(tx_block_size_space);
-
-            if new_used_block_gas_space <= max_gas
-                && new_used_block_size_space <= block_transaction_size_limit
-            {
-                used_block_gas_space = new_used_block_gas_space;
-                used_block_size_space = new_used_block_size_space;
-                true
-            } else {
-                false
-            }
-        })
-        .take(takes_txs as usize)
-}
-
-#[cfg(test)]
-mod tests {
-    use fuel_core_txpool as _;
-    use fuel_core_types::{
-        blockchain::header::ConsensusParametersVersion,
-        fuel_asm::{
-            op,
-            RegId,
-        },
-        fuel_crypto::rand::{
-            rngs::ThreadRng,
-            thread_rng,
-            Rng,
-        },
-        fuel_tx::{
-            FeeParameters,
-            GasCosts,
-            Output,
-            TransactionBuilder,
-        },
-        fuel_vm::{
-            checked_transaction::builder::TransactionBuilderExt,
-            SecretKey,
-        },
-        services::txpool::PoolTransaction,
-    };
-    use itertools::Itertools;
-    use std::sync::Arc;
-
-    use super::*;
-
-    const UNLIMITED_SIZE: u32 = u32::MAX;
-    const UNLIMITED_GAS: u64 = u64::MAX;
-
-    #[derive(Debug, Clone, Copy, PartialEq)]
-    struct TxGas {
-        pub tip: u64,
-        pub limit: u64,
-    }
-
-    /// A test helper that generates set of txs with given gas prices and limits and runs
-    /// `select_transactions` against that, returning the list of selected gas price, limit pairs
-    fn make_txs_and_select(
-        txs: &[TxGas],
-        block_gas_limit: Word,
-        block_transaction_size_limit: u32,
-    ) -> Vec<TxGas> {
-        let mut rng = thread_rng();
-        let txs = make_txs(txs, &mut rng);
-
-        select_transactions(
-            txs.into_iter(),
-            block_gas_limit,
-            block_transaction_size_limit,
-        )
-        .map(|tx| TxGas {
-            limit: tx.script_gas_limit().unwrap_or_default(),
-            tip: tx.tip(),
-        })
-        .collect()
-    }
-
-    /// A test helper that generates set of txs with given gas prices and limits.
-    fn make_txs(txs: &[TxGas], rng: &mut ThreadRng) -> Vec<Arc<PoolTransaction>> {
-        let fee_params = FeeParameters::default()
-            .with_gas_per_byte(0)
-            .with_gas_price_factor(1);
-
-        let mut txs = txs
-            .iter()
-            .map(|tx_gas| {
-                let mut script_builder = TransactionBuilder::script(
-                    vec![op::ret(RegId::ONE)].into_iter().collect(),
-                    vec![],
-                );
-
-                let script = script_builder
-                    .tip(tx_gas.tip)
-                    .script_gas_limit(tx_gas.limit)
-                    .add_unsigned_coin_input(
-                        SecretKey::random(rng),
-                        rng.gen(),
-                        1_000_000,
-                        Default::default(),
-                        Default::default(),
-                    )
-                    .add_output(Output::Change {
-                        to: Default::default(),
-                        amount: 0,
-                        asset_id: Default::default(),
-                    })
-                    .with_fee_params(fee_params)
-                    .with_gas_costs(GasCosts::free());
-
-                // Ensure there is some randomness in the transaction size
-                let witnesses_count = rng.gen_range(0..=50);
-                for _ in 0..=witnesses_count {
-                    script.add_witness(
-                        std::iter::repeat(0)
-                            .take(rng.gen_range(0..=100))
-                            .collect_vec()
-                            .into(),
-                    );
-                }
-
-                // The block producer assumes transactions are already checked
-                // so it doesn't need to compute valid sigs for tests
-                PoolTransaction::Script(
-                    script.finalize_checked_basic(Default::default()),
-                    ConsensusParametersVersion::MIN,
-                )
-            })
-            .map(Arc::new)
-            .collect::<Vec<ArcPoolTx>>();
-        txs.sort_by_key(|a| core::cmp::Reverse(a.tip()));
-        txs
-    }
-
-    #[test]
-    fn selector_works_with_empty_input() {
-        let selected = make_txs_and_select(&[], 1_000_000, 1_000_000);
-        assert!(selected.is_empty());
-    }
-
-    #[rstest::rstest]
-    #[test]
-    #[case(999, UNLIMITED_SIZE, vec![])]
-    #[case(1000, UNLIMITED_SIZE, vec![TxGas { tip: 5, limit: 1000 }])]
-    #[case(2500, UNLIMITED_SIZE, vec![TxGas { tip: 5, limit: 1000 }, TxGas { tip: 2, limit: 1000 }])]
-    #[case(4000, UNLIMITED_SIZE, vec![
-        TxGas { tip: 5, limit: 1000 },
-        TxGas { tip: 4, limit: 3000 }
-    ])]
-    #[case(5000, UNLIMITED_SIZE, vec![
-        TxGas { tip: 5, limit: 1000 },
-        TxGas { tip: 4, limit: 3000 },
-        TxGas { tip: 2, limit: 1000 }])
-    ]
-    #[case(6_000, UNLIMITED_SIZE, vec![
-        TxGas { tip: 5, limit: 1000 },
-        TxGas { tip: 4, limit: 3000 },
-        TxGas { tip: 3, limit: 2000 }
-    ])]
-    #[case(7_000, UNLIMITED_SIZE, vec![
-        TxGas { tip: 5, limit: 1000 },
-        TxGas { tip: 4, limit: 3000 },
-        TxGas { tip: 3, limit: 2000 },
-        TxGas { tip: 2, limit: 1000 }
-    ])]
-    #[case(8_000, UNLIMITED_SIZE, vec![
-        TxGas { tip: 5, limit: 1000 },
-        TxGas { tip: 4, limit: 3000 },
-        TxGas { tip: 3, limit: 2000 },
-        TxGas { tip: 2, limit: 1000 },
-        TxGas { tip: 1, limit: 1000 }
-    ])]
-
-    // TODO[RC]: Does it actually prefer highest gas?
-    fn selector_prefers_highest_gas_txs(
-        #[case] selection_gas_limit: u64,
-        #[case] selection_size_limit: u32,
-        #[case] expected_txs: Vec<TxGas>,
-    ) {
-        #[rustfmt::skip]
-        let original = [
-            TxGas { tip: 3, limit: 2000 },
-            TxGas { tip: 1, limit: 1000 },
-            TxGas { tip: 4, limit: 3000 },
-            TxGas { tip: 5, limit: 1000 },
-            TxGas { tip: 2, limit: 1000 },
-        ];
-
-        let selected =
-            make_txs_and_select(&original, selection_gas_limit, selection_size_limit);
-        assert_eq!(
-            expected_txs, selected,
-            "Wrong txs selected for max_gas: {selection_gas_limit}"
-        );
-    }
-
-    #[test]
-    fn selector_does_not_exceed_max_gas_per_block() {
-        #[rustfmt::skip]
-        let original = [
-            TxGas { tip: 3, limit: 2000 },
-            TxGas { tip: 1, limit: 1000 },
-            TxGas { tip: 4, limit: 3000 },
-            TxGas { tip: 5, limit: 1000 },
-            TxGas { tip: 2, limit: 1000 },
-        ];
-
-        for k in 0..original.len() {
-            for perm in original.into_iter().permutations(k) {
-                for gas_limit in [999, 1000, 2000, 2500, 3000, 5000, 6000, 10_000] {
-                    let selected =
-                        make_txs_and_select(perm.as_slice(), gas_limit, UNLIMITED_SIZE);
-                    let total_gas: Word = selected.iter().map(|g| g.limit).sum();
-                    assert!(total_gas <= gas_limit);
-                }
-            }
-        }
-    }
-
-    #[rstest::fixture]
-    pub fn block_transaction_size_limit_fixture() -> (Vec<Arc<PoolTransaction>>, u32) {
-        const TOTAL_TXN_COUNT: usize = 1000;
-
-        let mut rng = thread_rng();
-
-        // Create `TOTAL_TXN_COUNT` transactions with random tip.
-        let txs = make_txs(
-            std::iter::repeat_with(|| TxGas {
-                tip: rng.gen(),
-                limit: 1,
-            })
-            .take(TOTAL_TXN_COUNT)
-            .collect::<Vec<_>>()
-            .as_slice(),
-            &mut rng,
-        );
-        let total_txs_size = txs
-            .iter()
-            .map(|tx| tx.metered_bytes_size().try_into().unwrap_or(u32::MAX))
-            .sum();
-
-        (txs, total_txs_size)
-    }
-
-    #[rstest::rstest]
-    fn unlimited_size_request_returns_all_transactions(
-        block_transaction_size_limit_fixture: (Vec<Arc<PoolTransaction>>, u32),
-    ) {
-        let (txs, total_size) = block_transaction_size_limit_fixture;
-
-        let selected =
-            select_transactions(txs.into_iter(), UNLIMITED_GAS, UNLIMITED_SIZE);
-        let selected_size: u32 = selected
-            .map(|tx| tx.metered_bytes_size().try_into().unwrap_or(u32::MAX))
-            .sum();
-        assert_eq!(selected_size, total_size);
-    }
-
-    #[rstest::rstest]
-    fn selection_respects_specified_size(
-        block_transaction_size_limit_fixture: (Vec<Arc<PoolTransaction>>, u32),
-    ) {
-        let (txs, total_size) = block_transaction_size_limit_fixture;
-
-        let mut rng = thread_rng();
-        for selection_size_limit in
-            std::iter::repeat_with(|| rng.gen_range(1..=total_size)).take(100)
-        {
-            let selected = select_transactions(
-                txs.clone().into_iter(),
-                UNLIMITED_GAS,
-                selection_size_limit,
-            );
-            let selected_size: u32 = selected
-                .map(|tx| tx.metered_bytes_size().try_into().unwrap_or(u32::MAX))
-                .sum();
-            assert!(selected_size <= selection_size_limit);
-        }
-    }
-
-    #[rstest::rstest]
-    fn selection_can_exactly_fit_the_requested_size(
-        block_transaction_size_limit_fixture: (Vec<Arc<PoolTransaction>>, u32),
-    ) {
-        let (txs, _) = block_transaction_size_limit_fixture;
-
-        let smallest_txn_size = txs
-            .iter()
-            .map(|tx| tx.metered_bytes_size().try_into().unwrap_or(u32::MAX))
-            .sorted()
-            .next()
-            .expect("txs should not be empty");
-        let selected =
-            select_transactions(txs.into_iter(), UNLIMITED_GAS, smallest_txn_size);
-        assert_eq!(selected.collect::<Vec<_>>().len(), 1);
-    }
-}
diff --git a/crates/services/txpool/src/txpool.rs b/crates/services/txpool/src/txpool.rs
deleted file mode 100644
index f0cb2000dd4..00000000000
--- a/crates/services/txpool/src/txpool.rs
+++ /dev/null
@@ -1,591 +0,0 @@
-use crate::{
-    containers::{
-        dependency::Dependency,
-        time_sort::TimeSort,
-        tip_per_gas_sort::RatioGasTipSort,
-    },
-    ports::{
-        TxPoolDb,
-        WasmChecker as WasmCheckerConstraint,
-    },
-    service::TxStatusChange,
-    types::*,
-    Config,
-    Error,
-    TxInfo,
-};
-use fuel_core_types::{
-    fuel_tx::{
-        field::UpgradePurpose as _,
-        Transaction,
-        UpgradePurpose,
-    },
-    fuel_types::BlockHeight,
-    fuel_vm::checked_transaction::{
-        CheckPredicates,
-        Checked,
-        CheckedTransaction,
-        Checks,
-        IntoChecked,
-    },
-    services::txpool::{
-        ArcPoolTx,
-        InsertionResult,
-    },
-    tai64::Tai64,
-};
-use num_rational::Ratio;
-
-use crate::ports::{
-    GasPriceProvider,
-    MemoryPool,
-};
-use fuel_core_metrics::txpool_metrics::txpool_metrics;
-use fuel_core_storage::transactional::AtomicView;
-use fuel_core_types::{
-    blockchain::header::ConsensusParametersVersion,
-    fuel_tx::{
-        input::{
-            coin::{
-                CoinPredicate,
-                CoinSigned,
-            },
-            message::{
-                MessageCoinPredicate,
-                MessageCoinSigned,
-                MessageDataPredicate,
-                MessageDataSigned,
-            },
-        },
-        ConsensusParameters,
-        Input,
-    },
-    fuel_vm::{
-        checked_transaction::CheckPredicateParams,
-        interpreter::Memory,
-    },
-    services::executor::TransactionExecutionStatus,
-};
-use std::{
-    collections::HashMap,
-    ops::Deref,
-    sync::Arc,
-};
-
-#[cfg(test)]
-mod test_helpers;
-#[cfg(test)]
-mod tests;
-
-#[derive(Debug, Clone)]
-pub struct TxPool<ViewProvider, WasmChecker> {
-    by_hash: HashMap<TxId, TxInfo>,
-    by_ratio_gas_tip: RatioGasTipSort,
-    by_time: TimeSort,
-    by_dependency: Dependency,
-    config: Config,
-    database: ViewProvider,
-    wasm_checker: WasmChecker,
-}
-
-impl<ViewProvider, WasmChecker> TxPool<ViewProvider, WasmChecker> {
-    pub fn new(
-        config: Config,
-        database: ViewProvider,
-        wasm_checker: WasmChecker,
-    ) -> Self {
-        let max_depth = config.max_depth;
-
-        Self {
-            by_hash: HashMap::new(),
-            by_ratio_gas_tip: RatioGasTipSort::default(),
-            by_time: TimeSort::default(),
-            by_dependency: Dependency::new(max_depth, config.utxo_validation),
-            config,
-            database,
-            wasm_checker,
-        }
-    }
-
-    #[cfg(test)]
-    pub fn config(&self) -> &Config {
-        &self.config
-    }
-
-    #[cfg(test)]
-    pub fn config_mut(&mut self) -> &mut Config {
-        &mut self.config
-    }
-
-    pub fn txs(&self) -> &HashMap<TxId, TxInfo> {
-        &self.by_hash
-    }
-
-    pub fn dependency(&self) -> &Dependency {
-        &self.by_dependency
-    }
-
-    /// Return all sorted transactions that are includable in next block.
-    pub fn sorted_includable(&self) -> impl Iterator<Item = ArcPoolTx> + '_ {
-        self.by_ratio_gas_tip
-            .sort
-            .iter()
-            .rev()
-            .map(|(_, tx)| tx.clone())
-    }
-
-    pub fn remove_inner(&mut self, tx: &ArcPoolTx) -> Vec<ArcPoolTx> {
-        self.remove_by_tx_id(&tx.id())
-    }
-
-    /// remove transaction from pool needed on user demand. Low priority
-    // TODO: Seems this function should be recursive
-    pub fn remove_by_tx_id(&mut self, tx_id: &TxId) -> Vec<ArcPoolTx> {
-        if let Some(tx) = self.remove_tx(tx_id) {
-            let removed = self
-                .by_dependency
-                .recursively_remove_all_dependencies(&self.by_hash, tx.tx().clone());
-            for remove in removed.iter() {
-                self.remove_tx(&remove.id());
-            }
-            return removed
-        }
-        Vec::new()
-    }
-
-    fn remove_tx(&mut self, tx_id: &TxId) -> Option<TxInfo> {
-        let info = self.by_hash.remove(tx_id);
-        if let Some(info) = &info {
-            self.by_time.remove(info);
-            self.by_ratio_gas_tip.remove(info);
-        }
-
-        info
-    }
-
-    /// Removes transaction from `TxPool` with assumption that it is committed into the blockchain.
-    // TODO: Don't remove recursively dependent transactions on block commit.
-    //  The same logic should be fixed in the `select_transactions`.
-    //  This method is used during `select_transactions`, so we need to handle the case
-    //  when transaction was skipped during block execution(`ExecutionResult.skipped_transaction`).
-    pub fn remove_committed_tx(&mut self, tx_id: &TxId) -> Vec<ArcPoolTx> {
-        self.remove_by_tx_id(tx_id)
-    }
-
-    /// find all tx by its hash
-    pub fn find(&self, hashes: &[TxId]) -> Vec<Option<TxInfo>> {
-        let mut res = Vec::with_capacity(hashes.len());
-        for hash in hashes {
-            res.push(self.txs().get(hash).cloned());
-        }
-        res
-    }
-
-    pub fn find_one(&self, hash: &TxId) -> Option<TxInfo> {
-        self.txs().get(hash).cloned()
-    }
-
-    /// The number of pending transaction in the pool.
-    pub fn pending_number(&self) -> usize {
-        self.by_hash.len()
-    }
-
-    /// The amount of gas in all includable transactions combined
-    pub fn consumable_gas(&self) -> u64 {
-        self.by_hash.values().map(|tx| tx.max_gas()).sum()
-    }
-
-    /// Return all sorted transactions that are includable in next block.
-    /// This is going to be heavy operation, use it only when needed.
-    pub fn includable(&mut self) -> impl Iterator<Item = ArcPoolTx> + '_ {
-        self.sorted_includable()
-    }
-
-    /// When block is updated we need to receive all spend outputs and remove them from txpool.
-    pub fn block_update(
-        &mut self,
-        tx_status: &[TransactionExecutionStatus],
-        // spend_outputs: [Input], added_outputs: [AddedOutputs]
-    ) {
-        for status in tx_status {
-            let tx_id = status.id;
-            self.remove_committed_tx(&tx_id);
-        }
-    }
-
-    /// remove transaction from pool needed on user demand. Low priority
-    pub fn remove(
-        &mut self,
-        tx_status_sender: &TxStatusChange,
-        tx_ids: Vec<(TxId, String)>,
-    ) -> Vec<ArcPoolTx> {
-        let mut removed = Vec::new();
-        for (tx_id, reason) in tx_ids.into_iter() {
-            let rem = self.remove_by_tx_id(&tx_id);
-            tx_status_sender.send_squeezed_out(tx_id, Error::SqueezedOut(reason.clone()));
-            for dependent_tx in rem.iter() {
-                if tx_id != dependent_tx.id() {
-                    tx_status_sender.send_squeezed_out(
-                        dependent_tx.id(),
-                        Error::SqueezedOut(
-                            format!("Parent transaction with {tx_id}, was removed because of the {reason}")
-                        )
-                    );
-                }
-            }
-            removed.extend(rem.into_iter());
-        }
-        removed
-    }
-
-    /// Remove all old transactions from the pool.
-    pub fn prune_old_txs(&mut self) -> Vec<ArcPoolTx> {
-        let Some(deadline) =
-            tokio::time::Instant::now().checked_sub(self.config.transaction_ttl)
-        else {
-            // TTL is so big that we don't need to prune any transactions
-            return vec![]
-        };
-
-        let mut result = vec![];
-
-        while let Some((oldest_time, oldest_tx)) = self.by_time.lowest() {
-            let oldest_tx = oldest_tx.clone();
-            if oldest_time.created() <= &deadline {
-                let removed = self.remove_inner(&oldest_tx);
-                result.extend(removed.into_iter());
-            } else {
-                break
-            }
-        }
-
-        result
-    }
-
-    fn check_blacklisting(&self, tx: &PoolTransaction) -> Result<(), Error> {
-        for input in tx.inputs() {
-            match input {
-                Input::CoinSigned(CoinSigned { utxo_id, owner, .. })
-                | Input::CoinPredicate(CoinPredicate { utxo_id, owner, .. }) => {
-                    if self.config.blacklist.contains_coin(utxo_id) {
-                        return Err(Error::BlacklistedUTXO(*utxo_id))
-                    }
-                    if self.config.blacklist.contains_address(owner) {
-                        return Err(Error::BlacklistedOwner(*owner))
-                    }
-                }
-                Input::Contract(contract) => {
-                    if self
-                        .config
-                        .blacklist
-                        .contains_contract(&contract.contract_id)
-                    {
-                        return Err(Error::BlacklistedContract(contract.contract_id))
-                    }
-                }
-                Input::MessageCoinSigned(MessageCoinSigned {
-                    nonce,
-                    sender,
-                    recipient,
-                    ..
-                })
-                | Input::MessageCoinPredicate(MessageCoinPredicate {
-                    nonce,
-                    sender,
-                    recipient,
-                    ..
-                })
-                | Input::MessageDataSigned(MessageDataSigned {
-                    nonce,
-                    sender,
-                    recipient,
-                    ..
-                })
-                | Input::MessageDataPredicate(MessageDataPredicate {
-                    nonce,
-                    sender,
-                    recipient,
-                    ..
-                }) => {
-                    if self.config.blacklist.contains_message(nonce) {
-                        return Err(Error::BlacklistedMessage(*nonce))
-                    }
-                    if self.config.blacklist.contains_address(sender) {
-                        return Err(Error::BlacklistedOwner(*sender))
-                    }
-                    if self.config.blacklist.contains_address(recipient) {
-                        return Err(Error::BlacklistedOwner(*recipient))
-                    }
-                }
-            }
-        }
-
-        Ok(())
-    }
-
-    pub fn filter_existing_tx_ids(&self, tx_ids: Vec<TxId>) -> Vec<TxId> {
-        tx_ids
-            .into_iter()
-            .filter(|tx_id| !self.by_hash.contains_key(tx_id))
-            .collect()
-    }
-}
-
-impl<ViewProvider, View, WasmChecker> TxPool<ViewProvider, WasmChecker>
-where
-    ViewProvider: AtomicView<LatestView = View>,
-    View: TxPoolDb,
-    WasmChecker: WasmCheckerConstraint + Send + Sync,
-{
-    #[cfg(test)]
-    fn insert_single(
-        &mut self,
-        tx: Checked<Transaction>,
-    ) -> Result<InsertionResult, Error> {
-        let view = self.database.latest_view().unwrap();
-        self.insert_inner(tx, 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,
-        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::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),
-        });
-
-        self.check_blacklisting(tx.as_ref())?;
-
-        if !tx.is_computed() {
-            return Err(Error::NoMetadata)
-        }
-
-        if self.by_hash.contains_key(&tx.id()) {
-            return Err(Error::NotInsertedTxKnown)
-        }
-
-        // If upgrading transition function, at least check that it is valid wasm
-        if let PoolTransaction::Upgrade(upgrade, _) = tx.as_ref() {
-            if let UpgradePurpose::StateTransition { root } =
-                upgrade.transaction().upgrade_purpose()
-            {
-                self.wasm_checker.validate_uploaded_wasm(root)?;
-            }
-        }
-
-        let mut max_limit_hit = false;
-        // check if we are hitting limit of pool
-        if self.by_hash.len() >= self.config.max_tx {
-            max_limit_hit = true;
-            // limit is hit, check if we can push out lowest priced tx
-            let lowest_ratio = self.by_ratio_gas_tip.lowest_value().unwrap_or_default();
-            if lowest_ratio >= Ratio::new(tx.tip(), tx.max_gas()) {
-                return Err(Error::NotInsertedLimitHit)
-            }
-        }
-        if self.config.metrics {
-            txpool_metrics()
-                .tx_size_histogram
-                .observe(tx.metered_bytes_size() as f64);
-        }
-        // check and insert dependency
-        let rem = self.by_dependency.insert(&self.by_hash, view, &tx)?;
-        let info = TxInfo::new(tx.clone());
-        let submitted_time = info.submitted_time();
-        self.by_ratio_gas_tip.insert(&info);
-        self.by_time.insert(&info);
-        self.by_hash.insert(tx.id(), info);
-
-        // if some transaction were removed so we don't need to check limit
-        let removed = if rem.is_empty() {
-            if max_limit_hit {
-                // remove last tx from sort
-                let rem_tx = self.by_ratio_gas_tip.lowest_tx().unwrap(); // safe to unwrap limit is hit
-                self.remove_inner(&rem_tx);
-                vec![rem_tx]
-            } else {
-                Vec::new()
-            }
-        } else {
-            // remove ret from by_hash and from by_price
-            for rem in rem.iter() {
-                self.remove_tx(&rem.id());
-            }
-
-            rem
-        };
-
-        Ok(InsertionResult {
-            inserted: tx,
-            submitted_time,
-            removed,
-        })
-    }
-
-    #[tracing::instrument(level = "info", skip_all)]
-    /// Import a set of transactions from network gossip or GraphQL endpoints.
-    pub fn insert(
-        &mut self,
-        tx_status_sender: &TxStatusChange,
-        version: ConsensusParametersVersion,
-        txs: Vec<Checked<Transaction>>,
-    ) -> Vec<Result<InsertionResult, Error>> {
-        // Check if that data is okay (witness match input/output, and if recovered signatures ara valid).
-        // should be done before transaction comes to txpool, or before it enters RwLocked region.
-        let mut res = Vec::new();
-        let view = match self.database.latest_view() {
-            Ok(view) => view,
-            Err(e) => return vec![Err(Error::Other(e.to_string()))],
-        };
-
-        for tx in txs.into_iter() {
-            res.push(self.insert_inner(tx, version, &view));
-        }
-
-        // announce to subscribers
-        for ret in res.iter() {
-            match ret {
-                Ok(InsertionResult {
-                    removed,
-                    inserted,
-                    submitted_time,
-                }) => {
-                    for removed in removed {
-                        // small todo there is possibility to have removal reason (ReplacedByHigherGas, DependencyRemoved)
-                        // but for now it is okay to just use Error::Removed.
-                        tx_status_sender.send_squeezed_out(removed.id(), Error::Removed);
-                    }
-                    tx_status_sender.send_submitted(
-                        inserted.id(),
-                        Tai64::from_unix(submitted_time.as_secs() as i64),
-                    );
-                }
-                Err(_) => {
-                    // @dev should not broadcast tx if error occurred
-                }
-            }
-        }
-        res
-    }
-}
-
-pub async fn check_transactions<Provider, MP>(
-    txs: &[Arc<Transaction>],
-    current_height: BlockHeight,
-    utxp_validation: bool,
-    consensus_params: &ConsensusParameters,
-    gas_price_provider: &Provider,
-    memory_pool: Arc<MP>,
-) -> Vec<Result<Checked<Transaction>, Error>>
-where
-    Provider: GasPriceProvider,
-    MP: MemoryPool,
-{
-    let mut checked_txs = Vec::with_capacity(txs.len());
-
-    for tx in txs.iter() {
-        checked_txs.push(
-            check_single_tx(
-                tx.deref().clone(),
-                current_height,
-                utxp_validation,
-                consensus_params,
-                gas_price_provider,
-                memory_pool.get_memory().await,
-            )
-            .await,
-        );
-    }
-
-    checked_txs
-}
-
-pub async fn check_single_tx<GasPrice, M>(
-    tx: Transaction,
-    current_height: BlockHeight,
-    utxo_validation: bool,
-    consensus_params: &ConsensusParameters,
-    gas_price_provider: &GasPrice,
-    memory: M,
-) -> Result<Checked<Transaction>, Error>
-where
-    GasPrice: GasPriceProvider,
-    M: Memory + Send + Sync + 'static,
-{
-    if tx.is_mint() {
-        return Err(Error::NotSupportedTransactionType)
-    }
-
-    let tx: Checked<Transaction> = if utxo_validation {
-        let tx = tx
-            .into_checked_basic(current_height, consensus_params)?
-            .check_signatures(&consensus_params.chain_id())?;
-
-        let parameters = CheckPredicateParams::from(consensus_params);
-        let tx =
-            tokio_rayon::spawn_fifo(move || tx.check_predicates(&parameters, memory))
-                .await?;
-
-        debug_assert!(tx.checks().contains(Checks::all()));
-
-        tx
-    } else {
-        tx.into_checked_basic(current_height, consensus_params)?
-    };
-
-    let gas_price = gas_price_provider.next_gas_price().await?;
-
-    let tx = verify_tx_min_gas_price(tx, consensus_params, gas_price)?;
-
-    Ok(tx)
-}
-
-fn verify_tx_min_gas_price(
-    tx: Checked<Transaction>,
-    consensus_params: &ConsensusParameters,
-    gas_price: GasPrice,
-) -> Result<Checked<Transaction>, Error> {
-    let tx: CheckedTransaction = tx.into();
-    let gas_costs = consensus_params.gas_costs();
-    let fee_parameters = consensus_params.fee_params();
-    let read = match tx {
-        CheckedTransaction::Script(script) => {
-            let ready = script.into_ready(gas_price, gas_costs, fee_parameters)?;
-            let (_, checked) = ready.decompose();
-            CheckedTransaction::Script(checked)
-        }
-        CheckedTransaction::Create(create) => {
-            let ready = create.into_ready(gas_price, gas_costs, fee_parameters)?;
-            let (_, checked) = ready.decompose();
-            CheckedTransaction::Create(checked)
-        }
-        CheckedTransaction::Upgrade(tx) => {
-            let ready = tx.into_ready(gas_price, gas_costs, fee_parameters)?;
-            let (_, checked) = ready.decompose();
-            CheckedTransaction::Upgrade(checked)
-        }
-        CheckedTransaction::Upload(tx) => {
-            let ready = tx.into_ready(gas_price, gas_costs, fee_parameters)?;
-            let (_, checked) = ready.decompose();
-            CheckedTransaction::Upload(checked)
-        }
-        CheckedTransaction::Blob(tx) => {
-            let ready = tx.into_ready(gas_price, gas_costs, fee_parameters)?;
-            let (_, checked) = ready.decompose();
-            CheckedTransaction::Blob(checked)
-        }
-        CheckedTransaction::Mint(_) => return Err(Error::MintIsDisallowed),
-    };
-    Ok(read.into())
-}
diff --git a/crates/services/txpool/src/txpool/test_helpers.rs b/crates/services/txpool/src/txpool/test_helpers.rs
deleted file mode 100644
index 0b2e0d9ea8a..00000000000
--- a/crates/services/txpool/src/txpool/test_helpers.rs
+++ /dev/null
@@ -1,68 +0,0 @@
-use crate::test_helpers::IntoEstimated;
-use fuel_core_types::{
-    entities::relayer::message::{
-        Message,
-        MessageV1,
-    },
-    fuel_asm::op,
-    fuel_tx::{
-        Contract,
-        ContractId,
-        Input,
-        Output,
-        TxId,
-        UtxoId,
-    },
-    fuel_types::Word,
-};
-
-pub(crate) fn create_message_predicate_from_message(
-    amount: Word,
-    nonce: u64,
-) -> (Message, Input) {
-    let predicate = vec![op::ret(1)].into_iter().collect::<Vec<u8>>();
-    let message = MessageV1 {
-        sender: Default::default(),
-        recipient: Input::predicate_owner(&predicate),
-        nonce: nonce.into(),
-        amount,
-        data: vec![],
-        da_height: Default::default(),
-    };
-
-    (
-        message.clone().into(),
-        Input::message_coin_predicate(
-            message.sender,
-            Input::predicate_owner(&predicate),
-            message.amount,
-            message.nonce,
-            Default::default(),
-            predicate,
-            Default::default(),
-        )
-        .into_default_estimated(),
-    )
-}
-
-pub(crate) fn create_coin_output() -> Output {
-    Output::coin(Default::default(), Default::default(), Default::default())
-}
-
-pub(crate) fn create_contract_input(
-    tx_id: TxId,
-    output_index: u16,
-    contract_id: ContractId,
-) -> Input {
-    Input::contract(
-        UtxoId::new(tx_id, output_index),
-        Default::default(),
-        Default::default(),
-        Default::default(),
-        contract_id,
-    )
-}
-
-pub(crate) fn create_contract_output(contract_id: ContractId) -> Output {
-    Output::contract_created(contract_id, Contract::default_state_root())
-}
diff --git a/crates/services/txpool/src/txpool/tests.rs b/crates/services/txpool/src/txpool/tests.rs
deleted file mode 100644
index 64d94349bd3..00000000000
--- a/crates/services/txpool/src/txpool/tests.rs
+++ /dev/null
@@ -1,1553 +0,0 @@
-#![allow(non_snake_case)]
-
-use crate::{
-    ports::WasmValidityError,
-    service::test_helpers::MockTxPoolGasPrice,
-    test_helpers::{
-        IntoEstimated,
-        MockWasmChecker,
-        TextContext,
-        TEST_COIN_AMOUNT,
-    },
-    txpool::test_helpers::{
-        create_coin_output,
-        create_contract_input,
-        create_contract_output,
-        create_message_predicate_from_message,
-    },
-    types::GasPrice,
-    Config,
-    Error,
-};
-use fuel_core_types::{
-    fuel_asm::{
-        op,
-        RegId,
-        Word,
-    },
-    fuel_tx::{
-        input::coin::CoinPredicate,
-        Address,
-        AssetId,
-        BlobBody,
-        BlobId,
-        BlobIdExt,
-        Bytes32,
-        ConsensusParameters,
-        Contract,
-        Finalizable,
-        Input,
-        Output,
-        PredicateParameters,
-        Transaction,
-        TransactionBuilder,
-        TxParameters,
-        UniqueIdentifier,
-        UpgradePurpose,
-        UtxoId,
-    },
-    fuel_types::ChainId,
-    fuel_vm::{
-        checked_transaction::{
-            CheckError,
-            Checked,
-        },
-        interpreter::MemoryInstance,
-    },
-};
-use std::vec;
-
-use super::check_single_tx;
-
-const GAS_LIMIT: Word = 100000;
-
-async fn check_unwrap_tx(tx: Transaction, config: &Config) -> Checked<Transaction> {
-    let gas_price = 0;
-    check_unwrap_tx_with_gas_price(tx, config, gas_price).await
-}
-
-async fn check_unwrap_tx_with_gas_price(
-    tx: Transaction,
-    config: &Config,
-    gas_price: GasPrice,
-) -> Checked<Transaction> {
-    let gas_price_provider = MockTxPoolGasPrice::new(gas_price);
-    check_single_tx(
-        tx,
-        Default::default(),
-        config.utxo_validation,
-        &ConsensusParameters::default(),
-        &gas_price_provider,
-        MemoryInstance::new(),
-    )
-    .await
-    .expect("Transaction should be checked")
-}
-
-async fn check_tx(
-    tx: Transaction,
-    config: &Config,
-) -> Result<Checked<Transaction>, Error> {
-    let gas_price = 0;
-    check_tx_with_gas_price(tx, config, gas_price).await
-}
-
-async fn check_tx_with_gas_price(
-    tx: Transaction,
-    config: &Config,
-    gas_price: GasPrice,
-) -> Result<Checked<Transaction>, Error> {
-    let gas_price_provider = MockTxPoolGasPrice::new(gas_price);
-    check_single_tx(
-        tx,
-        Default::default(),
-        config.utxo_validation,
-        &ConsensusParameters::default(),
-        &gas_price_provider,
-        MemoryInstance::new(),
-    )
-    .await
-}
-
-#[tokio::test]
-async fn insert_simple_tx_succeeds() {
-    let mut context = TextContext::default();
-
-    let (_, gas_coin) = context.setup_coin();
-    let tx = TransactionBuilder::script(vec![], vec![])
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(gas_coin)
-        .finalize_as_transaction();
-
-    let mut txpool = context.build();
-    let tx = check_unwrap_tx(tx, &txpool.config).await;
-
-    txpool
-        .insert_single(tx)
-        .expect("Transaction should be OK, got Err");
-}
-
-#[tokio::test]
-async fn insert_simple_tx_with_blacklisted_utxo_id_fails() {
-    let mut context = TextContext::default();
-
-    let (_, gas_coin) = context.setup_coin();
-    let tx = TransactionBuilder::script(vec![], vec![])
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(gas_coin.clone())
-        .finalize_as_transaction();
-    let mut txpool = context.build();
-    let tx = check_unwrap_tx(tx, &txpool.config).await;
-    let utxo_id = *gas_coin.utxo_id().unwrap();
-
-    // Given
-    txpool.config_mut().blacklist.coins.insert(utxo_id);
-
-    // When
-    let result = txpool.insert_single(tx);
-
-    // Then
-    assert!(result.is_err());
-    assert!(result
-        .unwrap_err()
-        .to_string()
-        .contains(format!("The UTXO `{}` is blacklisted", utxo_id).as_str()));
-}
-
-#[tokio::test]
-async fn insert_simple_tx_with_blacklisted_owner_fails() {
-    let mut context = TextContext::default();
-
-    let (_, gas_coin) = context.setup_coin();
-    let tx = TransactionBuilder::script(vec![], vec![])
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(gas_coin.clone())
-        .finalize_as_transaction();
-    let mut txpool = context.build();
-    let tx = check_unwrap_tx(tx, &txpool.config).await;
-    let owner = *gas_coin.input_owner().unwrap();
-
-    // Given
-    txpool.config_mut().blacklist.owners.insert(owner);
-
-    // When
-    let result = txpool.insert_single(tx);
-
-    // Then
-    assert!(result.is_err());
-    assert!(result
-        .unwrap_err()
-        .to_string()
-        .contains(format!("The owner `{}` is blacklisted", owner).as_str()));
-}
-
-#[tokio::test]
-async fn insert_simple_tx_with_blacklisted_contract_fails() {
-    let mut context = TextContext::default();
-    let contract_id = Contract::EMPTY_CONTRACT_ID;
-
-    let (_, gas_coin) = context.setup_coin();
-    let tx = TransactionBuilder::script(vec![], vec![])
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(gas_coin.clone())
-        .add_input(create_contract_input(
-            Default::default(),
-            Default::default(),
-            contract_id,
-        ))
-        .add_output(Output::contract(1, Default::default(), Default::default()))
-        .finalize_as_transaction();
-    let mut txpool = context.build();
-    let tx = check_unwrap_tx(tx, &txpool.config).await;
-
-    // Given
-    txpool.config_mut().blacklist.contracts.insert(contract_id);
-
-    // When
-    let result = txpool.insert_single(tx);
-
-    // Then
-    assert!(result.is_err());
-    assert!(result
-        .unwrap_err()
-        .to_string()
-        .contains(format!("The contract `{}` is blacklisted", contract_id).as_str()));
-}
-
-#[tokio::test]
-async fn insert_simple_tx_with_blacklisted_message_fails() {
-    let (message, input) = create_message_predicate_from_message(5000, 0);
-
-    let tx = TransactionBuilder::script(vec![], vec![])
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(input)
-        .finalize_as_transaction();
-
-    let nonce = *message.nonce();
-    let mut context = TextContext::default();
-    context.database_mut().insert_message(message);
-    let mut txpool = context.build();
-
-    let tx = check_unwrap_tx(tx, &txpool.config).await;
-
-    // Given
-    txpool.config_mut().blacklist.messages.insert(nonce);
-
-    // When
-    let result = txpool.insert_single(tx);
-
-    // Then
-    assert!(result.is_err());
-    assert!(result
-        .unwrap_err()
-        .to_string()
-        .contains(format!("The message `{}` is blacklisted", nonce).as_str()));
-}
-
-#[tokio::test]
-async fn insert_simple_tx_dependency_chain_succeeds() {
-    let mut context = TextContext::default();
-
-    let (_, gas_coin) = context.setup_coin();
-    let (output, unset_input) = context.create_output_and_input(1);
-    let tx1 = TransactionBuilder::script(vec![], vec![])
-        .tip(1)
-        .max_fee_limit(1)
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(gas_coin)
-        .add_output(output)
-        .finalize_as_transaction();
-
-    let (_, gas_coin) = context.setup_coin();
-    let input = unset_input.into_input(UtxoId::new(tx1.id(&Default::default()), 0));
-    let tx2 = TransactionBuilder::script(vec![], vec![])
-        .tip(1)
-        .max_fee_limit(1)
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(input)
-        .add_input(gas_coin)
-        .finalize_as_transaction();
-
-    let mut txpool = context.build();
-    let tx1 = check_unwrap_tx(tx1, &txpool.config).await;
-    let tx2 = check_unwrap_tx(tx2, &txpool.config).await;
-
-    txpool
-        .insert_single(tx1)
-        .expect("Tx1 should be OK, got Err");
-    txpool
-        .insert_single(tx2)
-        .expect("Tx2 dependent should be OK, got Err");
-}
-
-#[tokio::test]
-async fn faulty_t2_collided_on_contract_id_from_tx1() {
-    let mut context = TextContext::default();
-
-    let contract_id = Contract::EMPTY_CONTRACT_ID;
-
-    // contract creation tx
-    let (_, gas_coin) = context.setup_coin();
-    let (output, unset_input) = context.create_output_and_input(10);
-    let tx = TransactionBuilder::create(
-        Default::default(),
-        Default::default(),
-        Default::default(),
-    )
-    .tip(10)
-    .max_fee_limit(10)
-    .add_input(gas_coin)
-    .add_output(create_contract_output(contract_id))
-    .add_output(output)
-    .finalize_as_transaction();
-
-    let (_, gas_coin) = context.setup_coin();
-    let input = unset_input.into_input(UtxoId::new(tx.id(&Default::default()), 1));
-
-    // attempt to insert a different creation tx with a valid dependency on the first tx,
-    // but with a conflicting output contract id
-    let tx_faulty = TransactionBuilder::create(
-        Default::default(),
-        Default::default(),
-        Default::default(),
-    )
-    .tip(9)
-    .max_fee_limit(9)
-    .add_input(gas_coin)
-    .add_input(input)
-    .add_output(create_contract_output(contract_id))
-    .add_output(output)
-    .finalize_as_transaction();
-
-    let mut txpool = context.build();
-    let tx = check_unwrap_tx(tx, &txpool.config).await;
-    txpool.insert_single(tx).expect("Tx1 should be Ok, got Err");
-
-    let tx_faulty = check_unwrap_tx(tx_faulty, &txpool.config).await;
-
-    let err = txpool
-        .insert_single(tx_faulty)
-        .expect_err("Tx2 should be Err, got Ok");
-    assert!(matches!(
-        err,
-        Error::NotInsertedCollisionContractId(id) if id == contract_id
-    ));
-}
-
-#[tokio::test]
-async fn fail_to_insert_tx_with_dependency_on_invalid_utxo_type() {
-    let mut context = TextContext::default();
-
-    let contract_id = Contract::EMPTY_CONTRACT_ID;
-    let (_, gas_coin) = context.setup_coin();
-    let tx_faulty = TransactionBuilder::create(
-        Default::default(),
-        Default::default(),
-        Default::default(),
-    )
-    .add_input(gas_coin)
-    .add_output(create_contract_output(contract_id))
-    .finalize_as_transaction();
-
-    // create a second transaction with utxo id referring to
-    // the wrong type of utxo (contract instead of coin)
-    let tx = TransactionBuilder::script(vec![], vec![])
-        .tip(1)
-        .max_fee_limit(1)
-        .max_fee_limit(1)
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(context.random_predicate(
-            AssetId::BASE,
-            TEST_COIN_AMOUNT,
-            Some(UtxoId::new(tx_faulty.id(&Default::default()), 0)),
-        ))
-        .finalize_as_transaction();
-
-    let mut txpool = context.build();
-    let tx_faulty_id = tx_faulty.id(&ChainId::default());
-    let tx_faulty = check_unwrap_tx(tx_faulty, &txpool.config).await;
-
-    txpool
-        .insert_single(tx_faulty.clone())
-        .expect("Tx1 should be Ok, got Err");
-
-    let tx = check_unwrap_tx(tx, &txpool.config).await;
-
-    let err = txpool
-        .insert_single(tx)
-        .expect_err("Tx2 should be Err, got Ok");
-    assert!(matches!(
-        err,
-        Error::NotInsertedInputUtxoIdNotDoesNotExist(id) if id == UtxoId::new(tx_faulty_id, 0)
-    ));
-}
-
-#[tokio::test]
-async fn not_inserted_known_tx() {
-    let config = Config {
-        utxo_validation: false,
-        ..Default::default()
-    };
-    let context = TextContext::default().config(config);
-    let mut txpool = context.build();
-
-    let tx = TransactionBuilder::script(vec![], vec![])
-        .add_random_fee_input()
-        .finalize()
-        .into();
-    let tx = check_unwrap_tx(tx, &txpool.config).await;
-
-    txpool
-        .insert_single(tx.clone())
-        .expect("Tx1 should be Ok, got Err");
-
-    let err = txpool
-        .insert_single(tx)
-        .expect_err("Second insertion of Tx1 should be Err, got Ok");
-    assert!(matches!(err, Error::NotInsertedTxKnown));
-}
-
-#[tokio::test]
-async fn try_to_insert_tx2_missing_utxo() {
-    let mut context = TextContext::default();
-
-    let input = context.random_predicate(AssetId::BASE, TEST_COIN_AMOUNT, None);
-    let tx = TransactionBuilder::script(vec![], vec![])
-        .tip(10)
-        .max_fee_limit(10)
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(input)
-        .finalize_as_transaction();
-
-    let mut txpool = context.build();
-    let tx = check_unwrap_tx(tx, &txpool.config).await;
-
-    let err = txpool
-        .insert_single(tx)
-        .expect_err("Tx should be Err, got Ok");
-    assert!(matches!(
-        err,
-        Error::NotInsertedInputUtxoIdNotDoesNotExist(_)
-    ));
-}
-
-#[tokio::test]
-async fn higher_priced_tx_removes_lower_priced_tx() {
-    let mut context = TextContext::default();
-
-    let (_, coin_input) = context.setup_coin();
-
-    let tx1 = TransactionBuilder::script(vec![], vec![])
-        .tip(10)
-        .max_fee_limit(10)
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(coin_input.clone())
-        .finalize_as_transaction();
-
-    let tx2 = TransactionBuilder::script(vec![], vec![])
-        .tip(20)
-        .max_fee_limit(20)
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(coin_input)
-        .finalize_as_transaction();
-
-    let tx1_id = tx1.id(&ChainId::default());
-    let mut txpool = context.build();
-    let tx1 = check_unwrap_tx(tx1, &txpool.config).await;
-
-    txpool
-        .insert_single(tx1.clone())
-        .expect("Tx1 should be Ok, got Err");
-
-    let tx2 = check_unwrap_tx(tx2, &txpool.config).await;
-
-    let vec = txpool
-        .insert_single(tx2)
-        .expect("Tx2 should be Ok, got Err");
-    assert_eq!(vec.removed[0].id(), tx1_id, "Tx1 id should be removed");
-}
-
-#[tokio::test]
-async fn underpriced_tx1_not_included_coin_collision() {
-    let mut context = TextContext::default();
-
-    let (_, gas_coin) = context.setup_coin();
-    let (output, unset_input) = context.create_output_and_input(20);
-    let tx1 = TransactionBuilder::script(vec![], vec![])
-        .tip(20)
-        .max_fee_limit(20)
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(gas_coin)
-        .add_output(output)
-        .finalize_as_transaction();
-
-    let input = unset_input.into_input(UtxoId::new(tx1.id(&Default::default()), 0));
-
-    let tx2 = TransactionBuilder::script(vec![], vec![])
-        .tip(20)
-        .max_fee_limit(20)
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(input.clone())
-        .finalize_as_transaction();
-
-    let tx3 = TransactionBuilder::script(vec![], vec![])
-        .tip(10)
-        .max_fee_limit(10)
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(input)
-        .finalize_as_transaction();
-
-    let mut txpool = context.build();
-    let tx1_checked = check_unwrap_tx(tx1.clone(), txpool.config()).await;
-    txpool
-        .insert_single(tx1_checked)
-        .expect("Tx1 should be Ok, got Err");
-
-    let tx2_checked = check_unwrap_tx(tx2.clone(), txpool.config()).await;
-    txpool
-        .insert_single(tx2_checked)
-        .expect("Tx2 should be Ok, got Err");
-
-    let tx3_checked = check_unwrap_tx(tx3, txpool.config()).await;
-    let err = txpool
-        .insert_single(tx3_checked)
-        .expect_err("Tx3 should be Err, got Ok");
-    assert!(matches!(
-        err,
-        Error::NotInsertedCollision(id, utxo_id) if id == tx2.id(&Default::default()) && utxo_id == UtxoId::new(tx1.id(&Default::default()), 0)
-    ));
-}
-
-#[tokio::test]
-async fn overpriced_tx_contract_input_not_inserted() {
-    let mut context = TextContext::default();
-
-    let contract_id = Contract::EMPTY_CONTRACT_ID;
-    let (_, gas_funds) = context.setup_coin();
-    let tx1 = TransactionBuilder::create(
-        Default::default(),
-        Default::default(),
-        Default::default(),
-    )
-    .tip(10)
-    .max_fee_limit(10)
-    .add_input(gas_funds)
-    .add_output(create_contract_output(contract_id))
-    .finalize_as_transaction();
-
-    let (_, gas_funds) = context.setup_coin();
-    let tx2 = TransactionBuilder::script(vec![], vec![])
-        .tip(11)
-        .max_fee_limit(11)
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(gas_funds)
-        .add_input(create_contract_input(
-            Default::default(),
-            Default::default(),
-            contract_id,
-        ))
-        .add_output(Output::contract(1, Default::default(), Default::default()))
-        .finalize_as_transaction();
-
-    let mut txpool = context.build();
-    let tx1 = check_unwrap_tx(tx1, &txpool.config).await;
-    txpool
-        .insert_single(tx1)
-        .expect("Tx1 should be Ok, got err");
-
-    let tx2 = check_unwrap_tx(tx2, &txpool.config).await;
-    let err = txpool
-        .insert_single(tx2)
-        .expect_err("Tx2 should be Err, got Ok");
-    assert!(
-        matches!(
-            err,
-            Error::NotInsertedContractPricedLower(id) if id == contract_id
-        ),
-        "wrong err {err:?}"
-    );
-}
-
-#[tokio::test]
-async fn dependent_contract_input_inserted() {
-    let mut context = TextContext::default();
-
-    let contract_id = Contract::EMPTY_CONTRACT_ID;
-    let (_, gas_funds) = context.setup_coin();
-    let tx1 = TransactionBuilder::create(
-        Default::default(),
-        Default::default(),
-        Default::default(),
-    )
-    .tip(10)
-    .max_fee_limit(10)
-    .add_input(gas_funds)
-    .add_output(create_contract_output(contract_id))
-    .finalize_as_transaction();
-
-    let (_, gas_funds) = context.setup_coin();
-    let tx2 = TransactionBuilder::script(vec![], vec![])
-        .tip(10)
-        .max_fee_limit(10)
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(gas_funds)
-        .add_input(create_contract_input(
-            Default::default(),
-            Default::default(),
-            contract_id,
-        ))
-        .add_output(Output::contract(1, Default::default(), Default::default()))
-        .finalize_as_transaction();
-
-    let mut txpool = context.build();
-    let tx1 = check_unwrap_tx(tx1, &txpool.config).await;
-    let tx2 = check_unwrap_tx(tx2, &txpool.config).await;
-    txpool
-        .insert_single(tx1)
-        .expect("Tx1 should be Ok, got Err");
-    txpool
-        .insert_single(tx2)
-        .expect("Tx2 should be Ok, got Err");
-}
-
-#[tokio::test]
-async fn more_priced_tx3_removes_tx1_and_dependent_tx2() {
-    let mut context = TextContext::default();
-
-    let (_, gas_coin) = context.setup_coin();
-
-    let (output, unset_input) = context.create_output_and_input(10);
-    let tx1 = TransactionBuilder::script(vec![], vec![])
-        .tip(10)
-        .max_fee_limit(10)
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(gas_coin.clone())
-        .add_output(output)
-        .finalize_as_transaction();
-
-    let input = unset_input.into_input(UtxoId::new(tx1.id(&Default::default()), 0));
-
-    let tx2 = TransactionBuilder::script(vec![], vec![])
-        .tip(9)
-        .max_fee_limit(9)
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(input)
-        .finalize_as_transaction();
-
-    let tx3 = TransactionBuilder::script(vec![], vec![])
-        .tip(20)
-        .max_fee_limit(20)
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(gas_coin)
-        .finalize_as_transaction();
-
-    let tx1_id = tx1.id(&ChainId::default());
-    let tx2_id = tx2.id(&ChainId::default());
-    let mut txpool = context.build();
-    let tx1 = check_unwrap_tx(tx1, &txpool.config).await;
-    let tx2 = check_unwrap_tx(tx2, &txpool.config).await;
-    let tx3 = check_unwrap_tx(tx3, &txpool.config).await;
-
-    txpool
-        .insert_single(tx1.clone())
-        .expect("Tx1 should be OK, got Err");
-    txpool
-        .insert_single(tx2.clone())
-        .expect("Tx2 should be OK, got Err");
-    let vec = txpool
-        .insert_single(tx3)
-        .expect("Tx3 should be OK, got Err");
-    assert_eq!(
-        vec.removed.len(),
-        2,
-        "Tx1 and Tx2 should be removed:{vec:?}",
-    );
-    assert_eq!(vec.removed[0].id(), tx1_id, "Tx1 id should be removed");
-    assert_eq!(vec.removed[1].id(), tx2_id, "Tx2 id should be removed");
-}
-
-#[tokio::test]
-async fn more_priced_tx2_removes_tx1_and_more_priced_tx3_removes_tx2() {
-    let mut context = TextContext::default();
-
-    let (_, gas_coin) = context.setup_coin();
-
-    let tx1 = TransactionBuilder::script(vec![], vec![])
-        .tip(10)
-        .max_fee_limit(10)
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(gas_coin.clone())
-        .finalize_as_transaction();
-
-    let tx2 = TransactionBuilder::script(vec![], vec![])
-        .tip(11)
-        .max_fee_limit(11)
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(gas_coin.clone())
-        .finalize_as_transaction();
-
-    let tx3 = TransactionBuilder::script(vec![], vec![])
-        .tip(12)
-        .max_fee_limit(12)
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(gas_coin)
-        .finalize_as_transaction();
-
-    let mut txpool = context.build();
-    let tx1 = check_unwrap_tx(tx1, &txpool.config).await;
-    let tx2 = check_unwrap_tx(tx2, &txpool.config).await;
-    let tx3 = check_unwrap_tx(tx3, &txpool.config).await;
-
-    txpool
-        .insert_single(tx1)
-        .expect("Tx1 should be OK, got Err");
-    let squeezed = txpool
-        .insert_single(tx2)
-        .expect("Tx2 should be OK, got Err");
-    assert_eq!(squeezed.removed.len(), 1);
-    let squeezed = txpool
-        .insert_single(tx3)
-        .expect("Tx3 should be OK, got Err");
-    assert_eq!(
-        squeezed.removed.len(),
-        1,
-        "Tx2 should be removed:{squeezed:?}"
-    );
-}
-
-#[tokio::test]
-async fn tx_limit_hit() {
-    let mut context = TextContext::default().config(Config {
-        max_tx: 1,
-        ..Default::default()
-    });
-
-    let (_, gas_coin) = context.setup_coin();
-    let tx1 = TransactionBuilder::script(vec![], vec![])
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(gas_coin)
-        .add_output(create_coin_output())
-        .finalize_as_transaction();
-
-    let (_, gas_coin) = context.setup_coin();
-    let tx2 = TransactionBuilder::script(vec![], vec![])
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(gas_coin)
-        .finalize_as_transaction();
-
-    let mut txpool = context.build();
-    let tx1 = check_unwrap_tx(tx1, &txpool.config).await;
-    let tx2 = check_unwrap_tx(tx2, &txpool.config).await;
-    txpool
-        .insert_single(tx1)
-        .expect("Tx1 should be Ok, got Err");
-
-    let err = txpool
-        .insert_single(tx2)
-        .expect_err("Tx2 should be Err, got Ok");
-    assert!(matches!(err, Error::NotInsertedLimitHit));
-}
-
-#[tokio::test]
-async fn tx_depth_hit() {
-    let mut context = TextContext::default().config(Config {
-        max_depth: 2,
-        ..Default::default()
-    });
-
-    let (_, gas_coin) = context.setup_coin();
-    let (output, unset_input) = context.create_output_and_input(10_000);
-    let tx1 = TransactionBuilder::script(vec![], vec![])
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(gas_coin)
-        .add_output(output)
-        .finalize_as_transaction();
-
-    let input = unset_input.into_input(UtxoId::new(tx1.id(&Default::default()), 0));
-    let (output, unset_input) = context.create_output_and_input(5_000);
-    let tx2 = TransactionBuilder::script(vec![], vec![])
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(input)
-        .add_output(output)
-        .finalize_as_transaction();
-
-    let input = unset_input.into_input(UtxoId::new(tx2.id(&Default::default()), 0));
-    let tx3 = TransactionBuilder::script(vec![], vec![])
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(input)
-        .finalize_as_transaction();
-
-    let mut txpool = context.build();
-    let tx1 = check_unwrap_tx(tx1, &txpool.config).await;
-    let tx2 = check_unwrap_tx(tx2, &txpool.config).await;
-    let tx3 = check_unwrap_tx(tx3, &txpool.config).await;
-
-    txpool
-        .insert_single(tx1)
-        .expect("Tx1 should be OK, got Err");
-    txpool
-        .insert_single(tx2)
-        .expect("Tx2 should be OK, got Err");
-
-    let err = txpool
-        .insert_single(tx3)
-        .expect_err("Tx3 should be Err, got Ok");
-    assert!(matches!(err, Error::NotInsertedMaxDepth));
-}
-
-#[tokio::test]
-async fn sorted_out_tx1_2_3() {
-    let mut context = TextContext::default();
-
-    let (_, gas_coin) = context.setup_coin();
-    let tx1 = TransactionBuilder::script(vec![], vec![])
-        .tip(10)
-        .max_fee_limit(10)
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(gas_coin)
-        .finalize_as_transaction();
-
-    let (_, gas_coin) = context.setup_coin();
-    let tx2 = TransactionBuilder::script(vec![], vec![])
-        .tip(9)
-        .max_fee_limit(9)
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(gas_coin)
-        .finalize_as_transaction();
-
-    let (_, gas_coin) = context.setup_coin();
-    let tx3 = TransactionBuilder::script(vec![], vec![])
-        .tip(20)
-        .max_fee_limit(20)
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(gas_coin)
-        .finalize_as_transaction();
-
-    let tx1_id = tx1.id(&ChainId::default());
-    let tx2_id = tx2.id(&ChainId::default());
-    let tx3_id = tx3.id(&ChainId::default());
-
-    let mut txpool = context.build();
-    let tx1 = check_unwrap_tx(tx1, &txpool.config).await;
-    let tx2 = check_unwrap_tx(tx2, &txpool.config).await;
-    let tx3 = check_unwrap_tx(tx3, &txpool.config).await;
-
-    txpool
-        .insert_single(tx1)
-        .expect("Tx1 should be Ok, got Err");
-    txpool
-        .insert_single(tx2)
-        .expect("Tx2 should be Ok, got Err");
-    txpool
-        .insert_single(tx3)
-        .expect("Tx3 should be Ok, got Err");
-
-    let txs = txpool.sorted_includable().collect::<Vec<_>>();
-
-    assert_eq!(txs.len(), 3, "Should have 3 txs");
-    assert_eq!(txs[0].id(), tx3_id, "First should be tx3");
-    assert_eq!(txs[1].id(), tx1_id, "Second should be tx1");
-    assert_eq!(txs[2].id(), tx2_id, "Third should be tx2");
-}
-
-#[tokio::test]
-async fn sorted_out_tx_same_tips() {
-    let mut context = TextContext::default();
-
-    let (_, gas_coin) = context.setup_coin();
-    let tx1 = TransactionBuilder::script(vec![], vec![])
-        .tip(10)
-        .max_fee_limit(10)
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(gas_coin)
-        .finalize_as_transaction();
-
-    let (_, gas_coin) = context.setup_coin();
-    let tx2 = TransactionBuilder::script(vec![], vec![])
-        .tip(10)
-        .max_fee_limit(10)
-        .script_gas_limit(GAS_LIMIT / 2)
-        .add_input(gas_coin)
-        .finalize_as_transaction();
-
-    let (_, gas_coin) = context.setup_coin();
-    let tx3 = TransactionBuilder::script(vec![], vec![])
-        .tip(10)
-        .max_fee_limit(10)
-        .script_gas_limit(GAS_LIMIT / 4)
-        .add_input(gas_coin)
-        .finalize_as_transaction();
-
-    let tx1_id = tx1.id(&ChainId::default());
-    let tx2_id = tx2.id(&ChainId::default());
-    let tx3_id = tx3.id(&ChainId::default());
-
-    let mut txpool = context.build();
-    let tx1 = check_unwrap_tx(tx1, &txpool.config).await;
-    let tx2 = check_unwrap_tx(tx2, &txpool.config).await;
-    let tx3 = check_unwrap_tx(tx3, &txpool.config).await;
-
-    txpool
-        .insert_single(tx1)
-        .expect("Tx1 should be Ok, got Err");
-    txpool
-        .insert_single(tx2)
-        .expect("Tx2 should be Ok, got Err");
-    txpool
-        .insert_single(tx3)
-        .expect("Tx4 should be Ok, got Err");
-
-    let txs = txpool.sorted_includable().collect::<Vec<_>>();
-
-    assert_eq!(txs.len(), 3, "Should have 3 txs");
-    assert_eq!(txs[0].id(), tx3_id, "First should be tx3");
-    assert_eq!(txs[1].id(), tx2_id, "Second should be tx2");
-    assert_eq!(txs[2].id(), tx1_id, "Third should be tx1");
-}
-
-#[tokio::test]
-async fn sorted_out_tx_profitable_ratios() {
-    let mut context = TextContext::default();
-
-    let (_, gas_coin) = context.setup_coin();
-    let tx1 = TransactionBuilder::script(vec![], vec![])
-        .tip(4)
-        .max_fee_limit(4)
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(gas_coin)
-        .finalize_as_transaction();
-
-    let (_, gas_coin) = context.setup_coin();
-    let tx2 = TransactionBuilder::script(vec![], vec![])
-        .tip(2)
-        .max_fee_limit(2)
-        .script_gas_limit(GAS_LIMIT / 10)
-        .add_input(gas_coin)
-        .finalize_as_transaction();
-
-    let (_, gas_coin) = context.setup_coin();
-    let tx3 = TransactionBuilder::script(vec![], vec![])
-        .tip(1)
-        .max_fee_limit(1)
-        .script_gas_limit(GAS_LIMIT / 100)
-        .add_input(gas_coin)
-        .finalize_as_transaction();
-
-    let tx1_id = tx1.id(&ChainId::default());
-    let tx2_id = tx2.id(&ChainId::default());
-    let tx3_id = tx3.id(&ChainId::default());
-
-    let mut txpool = context.build();
-    let tx1 = check_unwrap_tx(tx1, &txpool.config).await;
-    let tx2 = check_unwrap_tx(tx2, &txpool.config).await;
-    let tx3 = check_unwrap_tx(tx3, &txpool.config).await;
-
-    txpool
-        .insert_single(tx1)
-        .expect("Tx1 should be Ok, got Err");
-    txpool
-        .insert_single(tx2)
-        .expect("Tx2 should be Ok, got Err");
-    txpool
-        .insert_single(tx3)
-        .expect("Tx4 should be Ok, got Err");
-
-    let txs = txpool.sorted_includable().collect::<Vec<_>>();
-
-    assert_eq!(txs.len(), 3, "Should have 3 txs");
-    assert_eq!(txs[0].id(), tx3_id, "First should be tx3");
-    assert_eq!(txs[1].id(), tx2_id, "Second should be tx2");
-    assert_eq!(txs[2].id(), tx1_id, "Third should be tx1");
-}
-
-#[tokio::test]
-async fn sorted_out_tx_by_creation_instant() {
-    let mut context = TextContext::default();
-
-    let (_, gas_coin) = context.setup_coin();
-    let tx1 = TransactionBuilder::script(vec![], vec![])
-        .tip(4)
-        .max_fee_limit(4)
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(gas_coin)
-        .finalize_as_transaction();
-
-    let (_, gas_coin) = context.setup_coin();
-    let tx2 = TransactionBuilder::script(vec![], vec![])
-        .tip(4)
-        .max_fee_limit(4)
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(gas_coin)
-        .finalize_as_transaction();
-
-    let (_, gas_coin) = context.setup_coin();
-    let tx3 = TransactionBuilder::script(vec![], vec![])
-        .tip(4)
-        .max_fee_limit(4)
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(gas_coin)
-        .finalize_as_transaction();
-
-    let (_, gas_coin) = context.setup_coin();
-    let tx4 = TransactionBuilder::script(vec![], vec![])
-        .tip(4)
-        .max_fee_limit(4)
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(gas_coin)
-        .finalize_as_transaction();
-
-    let tx1_id = tx1.id(&ChainId::default());
-    let tx2_id = tx2.id(&ChainId::default());
-    let tx3_id = tx3.id(&ChainId::default());
-    let tx4_id = tx4.id(&ChainId::default());
-
-    let mut txpool = context.build();
-    let tx1 = check_unwrap_tx(tx1, &txpool.config).await;
-    let tx2 = check_unwrap_tx(tx2, &txpool.config).await;
-    let tx3 = check_unwrap_tx(tx3, &txpool.config).await;
-    let tx4 = check_unwrap_tx(tx4, &txpool.config).await;
-
-    txpool
-        .insert_single(tx1)
-        .expect("Tx1 should be Ok, got Err");
-    txpool
-        .insert_single(tx2)
-        .expect("Tx2 should be Ok, got Err");
-    txpool
-        .insert_single(tx3)
-        .expect("Tx4 should be Ok, got Err");
-    txpool
-        .insert_single(tx4)
-        .expect("Tx4 should be Ok, got Err");
-
-    let txs = txpool.sorted_includable().collect::<Vec<_>>();
-
-    // This order doesn't match the lexicographical order of the tx ids
-    // and so it verifies that the txs are sorted by creation instant
-    // The newest tx should be first
-    assert_eq!(txs.len(), 4, "Should have 4 txs");
-    assert_eq!(txs[0].id(), tx1_id, "First should be tx1");
-    assert_eq!(txs[1].id(), tx2_id, "Second should be tx2");
-    assert_eq!(txs[2].id(), tx3_id, "Third should be tx3");
-    assert_eq!(txs[3].id(), tx4_id, "Fourth should be tx4");
-}
-
-#[tokio::test]
-async fn tx_at_least_min_gas_price_is_insertable() {
-    let gas_price = 10;
-    let mut context = TextContext::default().config(Config {
-        ..Default::default()
-    });
-
-    let (_, gas_coin) = context.setup_coin();
-    let tx = TransactionBuilder::script(vec![], vec![])
-        .tip(10)
-        .max_fee_limit(1000)
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(gas_coin)
-        .finalize_as_transaction();
-
-    let mut txpool = context.build();
-    let tx = check_unwrap_tx_with_gas_price(tx, &txpool.config, gas_price).await;
-    txpool.insert_single(tx).expect("Tx should be Ok, got Err");
-}
-
-#[tokio::test]
-async fn tx_below_min_gas_price_is_not_insertable() {
-    let mut context = TextContext::default();
-
-    let gas_coin = context.random_predicate(AssetId::BASE, TEST_COIN_AMOUNT, None);
-    let tx = TransactionBuilder::script(vec![], vec![])
-        .tip(10)
-        .max_fee_limit(10)
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(gas_coin)
-        .finalize_as_transaction();
-    let gas_price = 11;
-
-    let err = check_tx_with_gas_price(
-        tx,
-        &Config {
-            ..Default::default()
-        },
-        gas_price,
-    )
-    .await
-    .expect_err("expected insertion failure");
-
-    assert!(matches!(
-        err,
-        Error::ConsensusValidity(CheckError::InsufficientMaxFee { .. })
-    ));
-}
-
-#[tokio::test]
-async fn tx_inserted_into_pool_when_input_message_id_exists_in_db() {
-    let mut context = TextContext::default();
-    let (message, input) = create_message_predicate_from_message(5000, 0);
-
-    let tx = TransactionBuilder::script(vec![], vec![])
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(input)
-        .finalize_as_transaction();
-
-    context.database_mut().insert_message(message);
-
-    let tx1_id = tx.id(&ChainId::default());
-    let mut txpool = context.build();
-
-    let tx = check_unwrap_tx(tx, &txpool.config).await;
-    txpool.insert_single(tx).expect("should succeed");
-
-    let tx_info = txpool.find_one(&tx1_id).unwrap();
-    assert_eq!(tx_info.tx().id(), tx1_id);
-}
-
-#[tokio::test]
-async fn tx_rejected_from_pool_when_input_message_id_does_not_exist_in_db() {
-    let context = TextContext::default();
-    let (message, input) = create_message_predicate_from_message(5000, 0);
-    let tx = TransactionBuilder::script(vec![], vec![])
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(input)
-        .finalize_as_transaction();
-
-    // Do not insert any messages into the DB to ensure there is no matching message for the
-    // tx.
-    let mut txpool = context.build();
-    let tx = check_unwrap_tx(tx, &txpool.config).await;
-    let err = txpool.insert_single(tx).expect_err("should fail");
-
-    // check error
-    assert!(matches!(
-        err,
-        Error::NotInsertedInputMessageUnknown(msg_id) if msg_id == *message.id()
-    ));
-}
-
-#[tokio::test]
-async fn tx_rejected_from_pool_when_gas_price_is_lower_than_another_tx_with_same_message_id(
-) {
-    let mut context = TextContext::default();
-    let message_amount = 10_000;
-    let max_fee_limit = 10u64;
-    let gas_price_high = 2u64;
-    let gas_price_low = 1u64;
-    let (message, conflicting_message_input) =
-        create_message_predicate_from_message(message_amount, 0);
-
-    let tx_high = TransactionBuilder::script(vec![], vec![])
-        .tip(gas_price_high)
-        .max_fee_limit(max_fee_limit)
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(conflicting_message_input.clone())
-        .finalize_as_transaction();
-
-    let tx_low = TransactionBuilder::script(vec![], vec![])
-        .tip(gas_price_low)
-        .max_fee_limit(max_fee_limit)
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(conflicting_message_input)
-        .finalize_as_transaction();
-
-    context.database_mut().insert_message(message.clone());
-
-    let mut txpool = context.build();
-
-    let tx_high_id = tx_high.id(&ChainId::default());
-    let tx_high =
-        check_unwrap_tx_with_gas_price(tx_high, &txpool.config, gas_price_high).await;
-
-    // Insert a tx for the message id with a high gas amount
-    txpool
-        .insert_single(tx_high)
-        .expect("expected successful insertion");
-
-    let tx_low =
-        check_unwrap_tx_with_gas_price(tx_low, &txpool.config, gas_price_low).await;
-    // Insert a tx for the message id with a low gas amount
-    // Because the new transaction's id matches an existing transaction, we compare the gas
-    // prices of both the new and existing transactions. Since the existing transaction's gas
-    // price is higher, we must now reject the new transaction.
-    let err = txpool.insert_single(tx_low).expect_err("expected failure");
-
-    // check error
-    assert!(matches!(
-        err,
-        Error::NotInsertedCollisionMessageId(tx_id, msg_id) if tx_id == tx_high_id && msg_id == *message.id()
-    ));
-}
-
-#[tokio::test]
-async fn higher_priced_tx_squeezes_out_lower_priced_tx_with_same_message_id() {
-    let mut context = TextContext::default();
-    let message_amount = 10_000;
-    let gas_price_high = 2u64;
-    let max_fee_limit = 10u64;
-    let gas_price_low = 1u64;
-    let (message, conflicting_message_input) =
-        create_message_predicate_from_message(message_amount, 0);
-
-    // Insert a tx for the message id with a low gas amount
-    let tx_low = TransactionBuilder::script(vec![], vec![])
-        .tip(gas_price_low)
-        .max_fee_limit(max_fee_limit)
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(conflicting_message_input.clone())
-        .finalize_as_transaction();
-
-    context.database_mut().insert_message(message);
-
-    let mut txpool = context.build();
-    let tx_low_id = tx_low.id(&ChainId::default());
-    let tx_low =
-        check_unwrap_tx_with_gas_price(tx_low, &txpool.config, gas_price_low).await;
-    txpool.insert_single(tx_low).expect("should succeed");
-
-    // Insert a tx for the message id with a high gas amount
-    // Because the new transaction's id matches an existing transaction, we compare the gas
-    // prices of both the new and existing transactions. Since the existing transaction's gas
-    // price is lower, we accept the new transaction and squeeze out the old transaction.
-    let tx_high = TransactionBuilder::script(vec![], vec![])
-        .tip(gas_price_high)
-        .max_fee_limit(max_fee_limit)
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(conflicting_message_input)
-        .finalize_as_transaction();
-    let tx_high =
-        check_unwrap_tx_with_gas_price(tx_high, &txpool.config, gas_price_high).await;
-    let squeezed_out_txs = txpool.insert_single(tx_high).expect("should succeed");
-
-    assert_eq!(squeezed_out_txs.removed.len(), 1);
-    assert_eq!(squeezed_out_txs.removed[0].id(), tx_low_id,);
-}
-
-#[tokio::test]
-async fn message_of_squeezed_out_tx_can_be_resubmitted_at_lower_gas_price() {
-    // tx1 (message 1, message 2) gas_price 2
-    // tx2 (message 1) gas_price 3
-    //   squeezes tx1 with higher gas price
-    // tx3 (message 2) gas_price 1
-    //   works since tx1 is no longer part of txpool state even though gas price is less
-
-    let mut context = TextContext::default();
-    let (message_1, message_input_1) = create_message_predicate_from_message(10_000, 0);
-    let (message_2, message_input_2) = create_message_predicate_from_message(20_000, 1);
-
-    // Insert a tx for the message id with a low gas amount
-    let tx1 = TransactionBuilder::script(vec![], vec![])
-        .tip(2)
-        .max_fee_limit(2)
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(message_input_1.clone())
-        .add_input(message_input_2.clone())
-        .finalize_as_transaction();
-
-    let tx2 = TransactionBuilder::script(vec![], vec![])
-        .tip(3)
-        .max_fee_limit(3)
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(message_input_1)
-        .finalize_as_transaction();
-
-    let tx3 = TransactionBuilder::script(vec![], vec![])
-        .tip(1)
-        .max_fee_limit(1)
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(message_input_2)
-        .finalize_as_transaction();
-
-    context.database_mut().insert_message(message_1);
-    context.database_mut().insert_message(message_2);
-    let mut txpool = context.build();
-
-    let tx1 = check_unwrap_tx(tx1, &txpool.config).await;
-    let tx2 = check_unwrap_tx(tx2, &txpool.config).await;
-    let tx3 = check_unwrap_tx(tx3, &txpool.config).await;
-
-    txpool.insert_single(tx1).expect("should succeed");
-
-    txpool.insert_single(tx2).expect("should succeed");
-
-    txpool.insert_single(tx3).expect("should succeed");
-}
-
-#[tokio::test]
-async fn predicates_with_incorrect_owner_fails() {
-    let mut context = TextContext::default();
-    let mut coin = context.random_predicate(AssetId::BASE, TEST_COIN_AMOUNT, None);
-    if let Input::CoinPredicate(CoinPredicate { owner, .. }) = &mut coin {
-        *owner = Address::zeroed();
-    }
-
-    let tx = TransactionBuilder::script(vec![], vec![])
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(coin)
-        .finalize_as_transaction();
-
-    let err = check_tx(tx, &Default::default())
-        .await
-        .expect_err("Transaction should be err, got ok");
-
-    assert!(
-        format!("{err:?}").contains("InputPredicateOwner"),
-        "unexpected error: {err:?}",
-    )
-}
-
-#[tokio::test]
-async fn predicate_without_enough_gas_returns_out_of_gas() {
-    let mut context = TextContext::default();
-
-    let gas_limit = 10000;
-
-    let mut consensus_parameters = ConsensusParameters::default();
-    consensus_parameters
-        .set_tx_params(TxParameters::default().with_max_gas_per_tx(gas_limit));
-    consensus_parameters.set_predicate_params(
-        PredicateParameters::default().with_max_gas_per_predicate(gas_limit),
-    );
-
-    let coin = context
-        .custom_predicate(
-            AssetId::BASE,
-            TEST_COIN_AMOUNT,
-            // forever loop
-            vec![op::jmp(RegId::ZERO)].into_iter().collect(),
-            None,
-        )
-        .into_estimated(&consensus_parameters);
-
-    let tx = TransactionBuilder::script(vec![], vec![])
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(coin)
-        .finalize_as_transaction();
-
-    let err = check_tx(tx, &Default::default())
-        .await
-        .expect_err("Transaction should be err, got ok");
-
-    assert!(
-        err.to_string()
-            .contains("PredicateVerificationFailed(OutOfGas)"),
-        "unexpected error: {err}",
-    )
-}
-
-#[tokio::test]
-async fn predicate_that_returns_false_is_invalid() {
-    let mut context = TextContext::default();
-    let coin = context
-        .custom_predicate(
-            AssetId::BASE,
-            TEST_COIN_AMOUNT,
-            // forever loop
-            vec![op::ret(RegId::ZERO)].into_iter().collect(),
-            None,
-        )
-        .into_default_estimated();
-
-    let tx = TransactionBuilder::script(vec![], vec![])
-        .script_gas_limit(GAS_LIMIT)
-        .add_input(coin)
-        .finalize_as_transaction();
-
-    let err = check_tx(tx, &Default::default())
-        .await
-        .expect_err("Transaction should be err, got ok");
-
-    assert!(
-        err.to_string().contains("PredicateVerificationFailed"),
-        "unexpected error: {err}",
-    )
-}
-
-#[tokio::test]
-async fn insert_single__blob_tx_works() {
-    let program = vec![123; 123];
-    let tx = TransactionBuilder::blob(BlobBody {
-        id: BlobId::compute(program.as_slice()),
-        witness_index: 0,
-    })
-    .add_witness(program.into())
-    .add_random_fee_input()
-    .finalize_as_transaction();
-
-    let config = Config {
-        utxo_validation: false,
-        ..Default::default()
-    };
-    let context = TextContext::default().config(config);
-    let mut txpool = context.build();
-
-    // Given
-    let tx = check_unwrap_tx(tx, &txpool.config).await;
-    let id = tx.id();
-
-    // When
-    let result = txpool.insert_single(tx);
-
-    // Then
-    let _ = result.expect("Should insert blob");
-    assert!(txpool.by_hash.contains_key(&id));
-}
-
-#[tokio::test]
-async fn insert_single__blob_tx_fails_if_blob_already_inserted_and_lower_tip() {
-    let program = vec![123; 123];
-    let blob_id = BlobId::compute(program.as_slice());
-    let tx = TransactionBuilder::blob(BlobBody {
-        id: blob_id,
-        witness_index: 0,
-    })
-    .add_witness(program.clone().into())
-    .add_random_fee_input()
-    .finalize_as_transaction();
-
-    let config = Config {
-        utxo_validation: false,
-        ..Default::default()
-    };
-    let context = TextContext::default().config(config);
-    let mut txpool = context.build();
-    let tx = check_unwrap_tx(tx, &txpool.config).await;
-
-    // Given
-    txpool.insert_single(tx).unwrap();
-    let same_blob_tx = TransactionBuilder::blob(BlobBody {
-        id: blob_id,
-        witness_index: 1,
-    })
-    .add_random_fee_input()
-    .add_witness(program.into())
-    .finalize_as_transaction();
-    let same_blob_tx = check_unwrap_tx(same_blob_tx, &txpool.config).await;
-
-    // When
-    let result = txpool.insert_single(same_blob_tx);
-
-    // Then
-    assert_eq!(result, Err(Error::NotInsertedCollisionBlobId(blob_id)));
-}
-
-#[tokio::test]
-async fn insert_single__blob_tx_succeeds_if_blob_already_inserted_but_higher_tip() {
-    let program = vec![123; 123];
-    let blob_id = BlobId::compute(program.as_slice());
-    let tx = TransactionBuilder::blob(BlobBody {
-        id: blob_id,
-        witness_index: 0,
-    })
-    .add_witness(program.clone().into())
-    .add_random_fee_input()
-    .finalize_as_transaction();
-
-    let config = Config {
-        utxo_validation: false,
-        ..Default::default()
-    };
-    let context = TextContext::default().config(config);
-    let mut txpool = context.build();
-    let tx = check_unwrap_tx(tx, &txpool.config).await;
-
-    // Given
-    txpool.insert_single(tx).unwrap();
-    let same_blob_tx = TransactionBuilder::blob(BlobBody {
-        id: blob_id,
-        witness_index: 1,
-    })
-    .add_random_fee_input()
-    .add_witness(program.into())
-    .tip(100)
-    .max_fee_limit(100)
-    .finalize_as_transaction();
-    let same_blob_tx = check_unwrap_tx(same_blob_tx, &txpool.config).await;
-
-    // When
-    let result = txpool.insert_single(same_blob_tx);
-
-    // Then
-    let _ = result.expect("Should insert transaction with the same blob but higher tip");
-}
-
-#[tokio::test]
-async fn insert_single__blob_tx_fails_if_blob_already_exists_in_database() {
-    let program = vec![123; 123];
-    let blob_id = BlobId::compute(program.as_slice());
-    let tx = TransactionBuilder::blob(BlobBody {
-        id: blob_id,
-        witness_index: 0,
-    })
-    .add_witness(program.clone().into())
-    .add_random_fee_input()
-    .finalize_as_transaction();
-
-    let config = Config {
-        utxo_validation: false,
-        ..Default::default()
-    };
-    let context = TextContext::default().config(config);
-    let mut txpool = context.build();
-    let tx = check_unwrap_tx(tx, &txpool.config).await;
-
-    // Given
-    txpool.database.0.insert_dummy_blob(blob_id);
-
-    // When
-    let result = txpool.insert_single(tx);
-
-    // Then
-    assert_eq!(result, Err(Error::NotInsertedBlobIdAlreadyTaken(blob_id)));
-}
-
-#[tokio::test]
-async fn insert_inner__rejects_upgrade_tx_with_invalid_wasm() {
-    let predicate = vec![op::ret(1)].into_iter().collect::<Vec<u8>>();
-    let privileged_address = Input::predicate_owner(predicate.clone());
-
-    let config = Config {
-        utxo_validation: false,
-        ..Default::default()
-    };
-    let context = TextContext::default()
-        .config(config)
-        .wasm_checker(MockWasmChecker {
-            result: Err(WasmValidityError::NotValid),
-        });
-    let mut txpool = context.build();
-    let gas_price_provider = MockTxPoolGasPrice::new(0);
-
-    // Given
-    let tx = TransactionBuilder::upgrade(UpgradePurpose::StateTransition {
-        root: Bytes32::new([1; 32]),
-    })
-    .add_input(Input::coin_predicate(
-        UtxoId::new(Bytes32::new([1; 32]), 0),
-        privileged_address,
-        1_000_000_000,
-        AssetId::BASE,
-        Default::default(),
-        Default::default(),
-        predicate,
-        vec![],
-    ))
-    .finalize_as_transaction();
-    let mut params = ConsensusParameters::default();
-    params.set_privileged_address(privileged_address);
-    let tx = check_single_tx(
-        tx,
-        Default::default(),
-        false,
-        &params,
-        &gas_price_provider,
-        MemoryInstance::new(),
-    )
-    .await
-    .expect("Transaction should be checked");
-
-    // When
-    let result = txpool.insert_single(tx);
-
-    // Then
-    assert_eq!(result, Err(Error::NotInsertedInvalidWasm));
-}
diff --git a/crates/services/txpool/src/types.rs b/crates/services/txpool/src/types.rs
deleted file mode 100644
index 2dc15afaae2..00000000000
--- a/crates/services/txpool/src/types.rs
+++ /dev/null
@@ -1,10 +0,0 @@
-pub use fuel_core_types::{
-    fuel_tx::{
-        ContractId,
-        TxId,
-    },
-    fuel_types::Word,
-    services::txpool::PoolTransaction,
-};
-
-pub type GasPrice = Word;
diff --git a/crates/services/txpool/Cargo.toml b/crates/services/txpool_v2/Cargo.toml
similarity index 65%
rename from crates/services/txpool/Cargo.toml
rename to crates/services/txpool_v2/Cargo.toml
index 073611afd07..32ad3d2a4a3 100644
--- a/crates/services/txpool/Cargo.toml
+++ b/crates/services/txpool_v2/Cargo.toml
@@ -8,39 +8,36 @@ homepage = { workspace = true }
 keywords = ["blockchain", "cryptocurrencies", "fuel-vm", "vm"]
 license = { workspace = true }
 repository = { workspace = true }
-description = "Transaction pool"
+description = "Transaction pool that manages transactions and their dependencies."
 
 [dependencies]
 anyhow = { workspace = true }
 async-trait = { workspace = true }
 derive_more = { workspace = true }
-fuel-core-metrics = { workspace = true }
-fuel-core-services = { workspace = true }
+fuel-core-services = { workspace = true, features = ["sync-processor"] }
 fuel-core-storage = { workspace = true, features = ["std"] }
-fuel-core-types = { 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 }
-rayon = { workspace = true }
+petgraph = "0.6.5"
 tokio = { workspace = true, default-features = false, features = ["sync"] }
-tokio-rayon = { workspace = true }
 tokio-stream = { workspace = true }
 tracing = { workspace = true }
 
 [dev-dependencies]
-fuel-core-trace = { path = "./../../trace" }
-fuel-core-txpool = { path = "", features = ["test-helpers"] }
-fuel-core-types = { path = "../../types", features = ["test-helpers"] }
-itertools = { workspace = true }
+fuel-core-storage = { workspace = true, features = ["std", "test-helpers"] }
+fuel-core-trace = { path = "../../trace" }
+fuel-core-txpool = { path = ".", features = ["test-helpers"] }
+mockall = { workspace = true }
 proptest = { workspace = true }
-rstest = "0.15"
+rand = { workspace = true }
 test-strategy = { workspace = true }
 tokio = { workspace = true, features = ["sync", "test-util"] }
+tracing = { workspace = true }
 
 [features]
 test-helpers = [
-  "dep:mockall",
   "fuel-core-types/test-helpers",
   "fuel-core-storage/test-helpers",
 ]
diff --git a/crates/services/txpool_v2/src/collision_manager/basic.rs b/crates/services/txpool_v2/src/collision_manager/basic.rs
new file mode 100644
index 00000000000..0143c6687f2
--- /dev/null
+++ b/crates/services/txpool_v2/src/collision_manager/basic.rs
@@ -0,0 +1,239 @@
+use std::{
+    collections::{
+        BTreeMap,
+        HashMap,
+    },
+    fmt::Debug,
+    hash::Hash,
+};
+
+use fuel_core_types::{
+    fuel_tx::{
+        field::BlobId as _,
+        input::{
+            coin::{
+                CoinPredicate,
+                CoinSigned,
+            },
+            message::{
+                MessageCoinPredicate,
+                MessageCoinSigned,
+                MessageDataPredicate,
+                MessageDataSigned,
+            },
+        },
+        BlobId,
+        ContractId,
+        Input,
+        Output,
+        TxId,
+        UtxoId,
+    },
+    fuel_types::Nonce,
+    services::txpool::PoolTransaction,
+};
+
+use crate::{
+    error::{
+        CollisionReason,
+        Error,
+        InputValidationError,
+    },
+    storage::StorageData,
+};
+
+use super::{
+    CollisionManager,
+    Collisions,
+};
+
+pub struct BasicCollisionManager<StorageIndex> {
+    /// Message -> Transaction that currently use the Message
+    messages_spenders: HashMap<Nonce, StorageIndex>,
+    /// Coins -> Transaction that currently use the UTXO
+    coins_spenders: BTreeMap<UtxoId, StorageIndex>,
+    /// Contract -> Transaction that currently create the contract
+    contracts_creators: HashMap<ContractId, StorageIndex>,
+    /// Blob -> Transaction that currently create the blob
+    blobs_users: HashMap<BlobId, StorageIndex>,
+}
+
+impl<StorageIndex> BasicCollisionManager<StorageIndex> {
+    pub fn new() -> Self {
+        Self {
+            messages_spenders: HashMap::new(),
+            coins_spenders: BTreeMap::new(),
+            contracts_creators: HashMap::new(),
+            blobs_users: HashMap::new(),
+        }
+    }
+
+    #[cfg(test)]
+    pub fn is_empty(&self) -> bool {
+        self.messages_spenders.is_empty()
+            && self.coins_spenders.is_empty()
+            && self.contracts_creators.is_empty()
+            && self.blobs_users.is_empty()
+    }
+}
+
+impl<StorageIndex> Default for BasicCollisionManager<StorageIndex> {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl<StorageIndex> CollisionManager for BasicCollisionManager<StorageIndex>
+where
+    StorageIndex: Copy + Debug + Hash + PartialEq + Eq,
+{
+    type StorageIndex = StorageIndex;
+
+    fn get_coins_spenders(&self, tx_creator_id: &TxId) -> Vec<Self::StorageIndex> {
+        self.coins_spenders
+            .range(UtxoId::new(*tx_creator_id, 0)..UtxoId::new(*tx_creator_id, u16::MAX))
+            .map(|(_, storage_id)| *storage_id)
+            .collect()
+    }
+
+    fn find_collisions(
+        &self,
+        transaction: &PoolTransaction,
+    ) -> Result<Collisions<Self::StorageIndex>, Error> {
+        let mut collisions = HashMap::new();
+        if let PoolTransaction::Blob(checked_tx, _) = &transaction {
+            let blob_id = checked_tx.transaction().blob_id();
+            if let Some(state) = self.blobs_users.get(blob_id) {
+                collisions.insert(*state, vec![CollisionReason::Blob(*blob_id)]);
+            }
+        }
+        for input in transaction.inputs() {
+            match input {
+                Input::CoinSigned(CoinSigned { utxo_id, .. })
+                | Input::CoinPredicate(CoinPredicate { utxo_id, .. }) => {
+                    // Check if the utxo is already spent by another transaction in the pool
+                    if let Some(storage_id) = self.coins_spenders.get(utxo_id) {
+                        let entry = collisions.entry(*storage_id).or_default();
+                        entry.push(CollisionReason::Utxo(*utxo_id));
+                    }
+                }
+                Input::MessageCoinSigned(MessageCoinSigned { nonce, .. })
+                | Input::MessageCoinPredicate(MessageCoinPredicate { nonce, .. })
+                | Input::MessageDataSigned(MessageDataSigned { nonce, .. })
+                | Input::MessageDataPredicate(MessageDataPredicate { nonce, .. }) => {
+                    // Check if the message is already spent by another transaction in the pool
+                    if let Some(storage_id) = self.messages_spenders.get(nonce) {
+                        let entry = collisions.entry(*storage_id).or_default();
+                        entry.push(CollisionReason::Message(*nonce));
+                    }
+                }
+                // No collision for contract inputs
+                _ => {}
+            }
+        }
+
+        for (i, output) in transaction.outputs().iter().enumerate() {
+            match output {
+                Output::ContractCreated { contract_id, .. } => {
+                    // Check if the contract is already created by another transaction in the pool
+                    if let Some(storage_id) = self.contracts_creators.get(contract_id) {
+                        let entry = collisions.entry(*storage_id).or_default();
+                        entry.push(CollisionReason::ContractCreation(*contract_id));
+                    }
+                }
+                Output::Coin { .. } | Output::Change { .. } | Output::Variable { .. } => {
+                    let utxo_id = UtxoId::new(
+                        transaction.id(),
+                        u16::try_from(i)
+                            .expect("`Checked` transaction has less than 2^16 outputs"),
+                    );
+
+                    if self.coins_spenders.contains_key(&utxo_id) {
+                        return Err(Error::InputValidation(
+                            InputValidationError::DuplicateTxId(transaction.id()),
+                        ));
+                    }
+                }
+                Output::Contract(_) => {}
+            }
+        }
+
+        Ok(collisions)
+    }
+
+    fn on_stored_transaction(
+        &mut self,
+        storage_id: StorageIndex,
+        store_entry: &StorageData,
+    ) {
+        if let PoolTransaction::Blob(checked_tx, _) = store_entry.transaction.as_ref() {
+            let blob_id = checked_tx.transaction().blob_id();
+            self.blobs_users.insert(*blob_id, storage_id);
+        }
+        for input in store_entry.transaction.inputs() {
+            match input {
+                Input::CoinSigned(CoinSigned { utxo_id, .. })
+                | Input::CoinPredicate(CoinPredicate { utxo_id, .. }) => {
+                    // insert coin
+                    self.coins_spenders.insert(*utxo_id, storage_id);
+                }
+                Input::MessageCoinSigned(MessageCoinSigned { nonce, .. })
+                | Input::MessageCoinPredicate(MessageCoinPredicate { nonce, .. })
+                | Input::MessageDataSigned(MessageDataSigned { nonce, .. })
+                | Input::MessageDataPredicate(MessageDataPredicate { nonce, .. }) => {
+                    // insert message
+                    self.messages_spenders.insert(*nonce, storage_id);
+                }
+                _ => {}
+            }
+        }
+        for output in store_entry.transaction.outputs().iter() {
+            match output {
+                Output::Coin { .. }
+                | Output::Change { .. }
+                | Output::Variable { .. }
+                | Output::Contract(_) => {}
+                Output::ContractCreated { contract_id, .. } => {
+                    // insert contract
+                    self.contracts_creators.insert(*contract_id, storage_id);
+                }
+            };
+        }
+    }
+
+    fn on_removed_transaction(&mut self, transaction: &PoolTransaction) {
+        if let PoolTransaction::Blob(checked_tx, _) = transaction {
+            let blob_id = checked_tx.transaction().blob_id();
+            self.blobs_users.remove(blob_id);
+        }
+        for input in transaction.inputs() {
+            match input {
+                Input::CoinSigned(CoinSigned { utxo_id, .. })
+                | Input::CoinPredicate(CoinPredicate { utxo_id, .. }) => {
+                    // remove coin
+                    self.coins_spenders.remove(utxo_id);
+                }
+                Input::MessageCoinSigned(MessageCoinSigned { nonce, .. })
+                | Input::MessageCoinPredicate(MessageCoinPredicate { nonce, .. })
+                | Input::MessageDataSigned(MessageDataSigned { nonce, .. })
+                | Input::MessageDataPredicate(MessageDataPredicate { nonce, .. }) => {
+                    // remove message
+                    self.messages_spenders.remove(nonce);
+                }
+                _ => {}
+            }
+        }
+        for output in transaction.outputs().iter() {
+            match output {
+                Output::Coin { .. }
+                | Output::Change { .. }
+                | Output::Variable { .. }
+                | Output::Contract(_) => {}
+                Output::ContractCreated { contract_id, .. } => {
+                    // remove contract
+                    self.contracts_creators.remove(contract_id);
+                }
+            };
+        }
+    }
+}
diff --git a/crates/services/txpool_v2/src/collision_manager/mod.rs b/crates/services/txpool_v2/src/collision_manager/mod.rs
new file mode 100644
index 00000000000..c6e75a45167
--- /dev/null
+++ b/crates/services/txpool_v2/src/collision_manager/mod.rs
@@ -0,0 +1,39 @@
+use crate::error::{
+    CollisionReason,
+    Error,
+};
+use fuel_core_types::{
+    fuel_tx::TxId,
+    services::txpool::PoolTransaction,
+};
+use std::collections::HashMap;
+
+use crate::storage::StorageData;
+
+pub mod basic;
+
+pub type Collisions<StorageIndex> = HashMap<StorageIndex, Vec<CollisionReason>>;
+
+pub trait CollisionManager {
+    /// Index that identifies a transaction in the storage.
+    type StorageIndex;
+
+    /// Finds collisions for the transaction.
+    fn find_collisions(
+        &self,
+        transaction: &PoolTransaction,
+    ) -> Result<Collisions<Self::StorageIndex>, Error>;
+
+    /// Get spenders of coins UTXO created by a transaction ID.
+    fn get_coins_spenders(&self, tx_creator_id: &TxId) -> Vec<Self::StorageIndex>;
+
+    /// Inform the collision manager that a transaction was stored.
+    fn on_stored_transaction(
+        &mut self,
+        transaction_id: Self::StorageIndex,
+        store_entry: &StorageData,
+    );
+
+    /// Inform the collision manager that a transaction was removed.
+    fn on_removed_transaction(&mut self, transaction: &PoolTransaction);
+}
diff --git a/crates/services/txpool_v2/src/config.rs b/crates/services/txpool_v2/src/config.rs
new file mode 100644
index 00000000000..266e95539c0
--- /dev/null
+++ b/crates/services/txpool_v2/src/config.rs
@@ -0,0 +1,204 @@
+use std::{
+    collections::HashSet,
+    time::Duration,
+};
+
+use fuel_core_types::{
+    fuel_tx::{
+        input::{
+            coin::{
+                CoinPredicate,
+                CoinSigned,
+            },
+            message::{
+                MessageCoinPredicate,
+                MessageCoinSigned,
+                MessageDataPredicate,
+                MessageDataSigned,
+            },
+        },
+        Address,
+        ContractId,
+        Input,
+        UtxoId,
+    },
+    fuel_types::Nonce,
+    services::txpool::PoolTransaction,
+};
+
+use crate::error::BlacklistedError;
+
+#[derive(Default, Debug, Clone, PartialEq, Eq)]
+pub struct BlackList {
+    /// Blacklisted addresses.
+    pub owners: HashSet<Address>,
+    /// Blacklisted UTXO ids.
+    pub coins: HashSet<UtxoId>,
+    /// Blacklisted messages by `Nonce`.
+    pub messages: HashSet<Nonce>,
+    /// Blacklisted contracts.
+    pub contracts: HashSet<ContractId>,
+}
+
+impl BlackList {
+    /// Create a new blacklist.
+    pub fn new(
+        owners: Vec<Address>,
+        utxo_ids: Vec<UtxoId>,
+        messages: Vec<Nonce>,
+        contracts: Vec<ContractId>,
+    ) -> Self {
+        Self {
+            owners: owners.into_iter().collect(),
+            coins: utxo_ids.into_iter().collect(),
+            messages: messages.into_iter().collect(),
+            contracts: contracts.into_iter().collect(),
+        }
+    }
+
+    /// Check if the transaction has blacklisted inputs.
+    pub fn check_blacklisting(
+        &self,
+        tx: &PoolTransaction,
+    ) -> Result<(), BlacklistedError> {
+        for input in tx.inputs() {
+            match input {
+                Input::CoinSigned(CoinSigned { utxo_id, owner, .. })
+                | Input::CoinPredicate(CoinPredicate { utxo_id, owner, .. }) => {
+                    if self.coins.contains(utxo_id) {
+                        return Err(BlacklistedError::BlacklistedUTXO(*utxo_id));
+                    }
+                    if self.owners.contains(owner) {
+                        return Err(BlacklistedError::BlacklistedOwner(*owner));
+                    }
+                }
+                Input::Contract(contract) => {
+                    if self.contracts.contains(&contract.contract_id) {
+                        return Err(BlacklistedError::BlacklistedContract(
+                            contract.contract_id,
+                        ));
+                    }
+                }
+                Input::MessageCoinSigned(MessageCoinSigned {
+                    nonce,
+                    sender,
+                    recipient,
+                    ..
+                })
+                | Input::MessageCoinPredicate(MessageCoinPredicate {
+                    nonce,
+                    sender,
+                    recipient,
+                    ..
+                })
+                | Input::MessageDataSigned(MessageDataSigned {
+                    nonce,
+                    sender,
+                    recipient,
+                    ..
+                })
+                | Input::MessageDataPredicate(MessageDataPredicate {
+                    nonce,
+                    sender,
+                    recipient,
+                    ..
+                }) => {
+                    if self.messages.contains(nonce) {
+                        return Err(BlacklistedError::BlacklistedMessage(*nonce));
+                    }
+                    if self.owners.contains(sender) {
+                        return Err(BlacklistedError::BlacklistedOwner(*sender));
+                    }
+                    if self.owners.contains(recipient) {
+                        return Err(BlacklistedError::BlacklistedOwner(*recipient));
+                    }
+                }
+            }
+        }
+
+        Ok(())
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct Config {
+    /// Enable UTXO validation (will check if UTXO exists in the database and has correct data).
+    pub utxo_validation: bool,
+    /// Maximum of subscriptions to listen to updates of a transaction.
+    pub max_tx_update_subscriptions: usize,
+    /// Maximum transactions per dependencies chain.
+    pub max_txs_chain_count: usize,
+    /// Pool limits
+    pub pool_limits: PoolLimits,
+    /// Service channel limits
+    pub service_channel_limits: ServiceChannelLimits,
+    /// Interval for checking the time to live of transactions.
+    pub ttl_check_interval: Duration,
+    /// Maximum transaction time to live.
+    pub max_txs_ttl: Duration,
+    /// Heavy async processing configuration.
+    pub heavy_work: HeavyWorkConfig,
+    /// Blacklist. Transactions with blacklisted inputs will not be accepted.
+    pub black_list: BlackList,
+}
+
+#[derive(Clone, Debug)]
+pub struct PoolLimits {
+    /// Maximum number of transactions in the pool.
+    pub max_txs: usize,
+    /// Maximum number of gas in the pool.
+    pub max_gas: u64,
+    /// Maximum number of bytes in the pool.
+    pub max_bytes_size: usize,
+}
+
+#[derive(Clone, Debug)]
+pub struct ServiceChannelLimits {
+    /// Maximum number of pending requests waiting in the write pool channel.
+    pub max_pending_write_pool_requests: usize,
+    /// Maximum number of pending requests waiting in the read pool channel.
+    pub max_pending_read_pool_requests: usize,
+}
+
+#[derive(Clone, Debug)]
+pub struct HeavyWorkConfig {
+    /// Maximum of threads for managing verifications/insertions.
+    pub number_threads_to_verify_transactions: usize,
+    /// Maximum of tasks in the heavy async processing queue.
+    pub size_of_verification_queue: usize,
+    /// Maximum number of threads for managing the p2p synchronisation
+    pub number_threads_p2p_sync: usize,
+    /// Maximum number of tasks in the p2p sync queue
+    pub size_of_p2p_sync_queue: usize,
+}
+
+#[cfg(feature = "test-helpers")]
+impl Default for Config {
+    fn default() -> Self {
+        Self {
+            utxo_validation: true,
+            max_tx_update_subscriptions: 1000,
+            max_txs_chain_count: 50,
+            ttl_check_interval: Duration::from_secs(60),
+            max_txs_ttl: Duration::from_secs(60 * 10),
+            black_list: BlackList::default(),
+            pool_limits: PoolLimits {
+                max_txs: 10000,
+                max_gas: 100_000_000_000,
+                max_bytes_size: 1_000_000_000,
+            },
+            heavy_work: HeavyWorkConfig {
+                // It is important for tests to have only one thread for verification
+                // because some of them rely on the ordering of insertion.
+                number_threads_to_verify_transactions: 0,
+                size_of_verification_queue: 100,
+                number_threads_p2p_sync: 0,
+                size_of_p2p_sync_queue: 100,
+            },
+            service_channel_limits: ServiceChannelLimits {
+                max_pending_write_pool_requests: 1000,
+                max_pending_read_pool_requests: 1000,
+            },
+        }
+    }
+}
diff --git a/crates/services/txpool_v2/src/error.rs b/crates/services/txpool_v2/src/error.rs
new file mode 100644
index 00000000000..7f9a22ffc93
--- /dev/null
+++ b/crates/services/txpool_v2/src/error.rs
@@ -0,0 +1,164 @@
+use fuel_core_types::{
+    fuel_tx::{
+        Address,
+        BlobId,
+        ContractId,
+        TxId,
+        UtxoId,
+        Word,
+    },
+    fuel_types::Nonce,
+    fuel_vm::checked_transaction::CheckError,
+};
+
+use crate::ports::WasmValidityError;
+
+#[derive(Clone, Debug, derive_more::Display)]
+pub enum Error {
+    #[display(fmt = "Gas price not found for block height {_0}")]
+    GasPriceNotFound(String),
+    #[display(fmt = "Database error: {_0}")]
+    Database(String),
+    #[display(fmt = "Storage error: {_0}")]
+    Storage(String),
+    #[display(fmt = "Blacklisted error: {_0}")]
+    Blacklisted(BlacklistedError),
+    #[display(fmt = "Transaction collided: {_0}")]
+    Collided(CollisionReason),
+    #[display(fmt = "Transaction input validation failed: {_0}")]
+    InputValidation(InputValidationError),
+    #[display(fmt = "Transaction dependency error: {_0}")]
+    Dependency(DependencyError),
+    #[display(fmt = "Invalid transaction data: {_0:?}")]
+    ConsensusValidity(CheckError),
+    #[display(fmt = "Error with Wasm validity: {:?}", _0)]
+    WasmValidity(WasmValidityError),
+    #[display(fmt = "Mint transaction is not allowed")]
+    MintIsDisallowed,
+    #[display(fmt = "Pool limit is hit, try to increase gas_price")]
+    NotInsertedLimitHit,
+    #[display(fmt = "Transaction is removed: {_0}")]
+    Removed(RemovedReason),
+    #[display(fmt = "Transaction has been skipped during block insertion: {_0}")]
+    SkippedTransaction(String),
+    #[display(fmt = "Too much transactions are in queue to be inserted. Can't add more")]
+    TooManyQueuedTransactions,
+    #[display(fmt = "Unable send a request because service is closed")]
+    ServiceCommunicationFailed,
+    #[display(fmt = "Request failed to be sent because service queue is full")]
+    ServiceQueueFull,
+    #[display(fmt = "The provided max fee can't cover the transaction cost. \
+        The minimal gas price should be {minimal_gas_price:?}, \
+        while it is {max_gas_price_from_fee:?}")]
+    InsufficientMaxFee {
+        /// The max gas price from the fee.
+        max_gas_price_from_fee: Word,
+        /// The minimum gas price required by TxPool.
+        minimal_gas_price: Word,
+    },
+}
+
+#[derive(Clone, Debug, derive_more::Display)]
+pub enum RemovedReason {
+    #[display(
+        fmt = "Transaction was removed because it was less worth than a new one (id: {_0}) that has been inserted"
+    )]
+    LessWorth(TxId),
+    #[display(
+        fmt = "Transaction expired because it exceeded the configured time to live `tx-pool-ttl`."
+    )]
+    Ttl,
+}
+
+#[derive(Clone, Debug, derive_more::Display)]
+pub enum BlacklistedError {
+    #[display(fmt = "The UTXO `{_0}` is blacklisted")]
+    BlacklistedUTXO(UtxoId),
+    #[display(fmt = "The owner `{_0}` is blacklisted")]
+    BlacklistedOwner(Address),
+    #[display(fmt = "The contract `{_0}` is blacklisted")]
+    BlacklistedContract(ContractId),
+    #[display(fmt = "The message `{_0}` is blacklisted")]
+    BlacklistedMessage(Nonce),
+}
+
+#[derive(Clone, Debug, derive_more::Display)]
+pub enum DependencyError {
+    #[display(fmt = "Collision is also a dependency")]
+    NotInsertedCollisionIsDependency,
+    #[display(fmt = "Transaction chain dependency is already too big")]
+    NotInsertedChainDependencyTooBig,
+    #[display(fmt = "The dependent transaction creates a diamond problem, \
+    causing cycles in the dependency graph.")]
+    DependentTransactionIsADiamondDeath,
+}
+
+#[derive(Clone, Debug, derive_more::Display)]
+pub enum InputValidationError {
+    #[display(
+        fmt = "Input output mismatch. Coin owner is different from expected input"
+    )]
+    NotInsertedIoWrongOwner,
+    #[display(fmt = "Input output mismatch. Coin output does not match expected input")]
+    NotInsertedIoWrongAmount,
+    #[display(
+        fmt = "Input output mismatch. Coin output asset_id does not match expected inputs"
+    )]
+    NotInsertedIoWrongAssetId,
+    #[display(fmt = "Input message does not match the values from database")]
+    NotInsertedIoMessageMismatch,
+    #[display(fmt = "Input output mismatch. Expected coin but output is contract")]
+    NotInsertedIoContractOutput,
+    #[display(
+        fmt = "Message id {_0:#x} does not match any received message from the DA layer."
+    )]
+    NotInsertedInputMessageUnknown(Nonce),
+    #[display(fmt = "Input dependent on a Change or Variable output")]
+    NotInsertedInputDependentOnChangeOrVariable,
+    #[display(fmt = "UTXO input does not exist: {_0:#x}")]
+    NotInsertedInputContractDoesNotExist(ContractId),
+    #[display(fmt = "BlobId is already taken {_0:#x}")]
+    NotInsertedBlobIdAlreadyTaken(BlobId),
+    #[display(fmt = "Input coin does not match the values from database")]
+    NotInsertedIoCoinMismatch,
+    #[display(fmt = "Wrong number of outputs: {_0}")]
+    WrongOutputNumber(String),
+    #[display(fmt = "UTXO (id: {_0}) does not exist")]
+    UtxoNotFound(UtxoId),
+    #[display(fmt = "Max gas can't be 0")]
+    MaxGasZero,
+    #[display(fmt = "Transaction id already exists (id: {_0})")]
+    DuplicateTxId(TxId),
+}
+
+#[derive(Debug, Clone, derive_more::Display)]
+pub enum CollisionReason {
+    #[display(
+        fmt = "Transaction with the same UTXO (id: {_0}) already exists and is more worth it"
+    )]
+    Utxo(UtxoId),
+    #[display(
+        fmt = "Transaction that create the same contract (id: {_0}) already exists and is more worth it"
+    )]
+    ContractCreation(ContractId),
+    #[display(
+        fmt = "Transaction that use the same blob (id: {_0}) already exists and is more worth it"
+    )]
+    Blob(BlobId),
+    #[display(
+        fmt = "Transaction that use the same message (id: {_0}) already exists and is more worth it"
+    )]
+    Message(Nonce),
+    #[display(fmt = "This transaction have an unknown collision")]
+    Unknown,
+    #[display(
+        fmt = "This transaction have dependencies and is colliding with multiple transactions"
+    )]
+    MultipleCollisions,
+}
+
+impl From<CheckError> for Error {
+    fn from(e: CheckError) -> Self {
+        Error::ConsensusValidity(e)
+    }
+}
diff --git a/crates/services/txpool_v2/src/lib.rs b/crates/services/txpool_v2/src/lib.rs
new file mode 100644
index 00000000000..d2530e00038
--- /dev/null
+++ b/crates/services/txpool_v2/src/lib.rs
@@ -0,0 +1,37 @@
+#![deny(clippy::arithmetic_side_effects)]
+#![deny(clippy::cast_possible_truncation)]
+#![deny(unused_crate_dependencies)]
+#![deny(warnings)]
+
+// TODO: Rename the folder from `txpool_v2` to `txpool` after the migration is complete.
+
+mod collision_manager;
+pub mod config;
+pub mod error;
+mod pool;
+pub mod ports;
+mod selection_algorithms;
+mod service;
+mod shared_state;
+mod storage;
+mod tx_status_stream;
+mod update_sender;
+
+type GasPrice = Word;
+
+#[cfg(test)]
+mod tests;
+#[cfg(test)]
+fuel_core_trace::enable_tracing!();
+
+use fuel_core_types::fuel_asm::Word;
+pub use selection_algorithms::Constraints;
+pub use service::{
+    new_service,
+    Service,
+};
+pub use shared_state::{
+    BorrowedTxPool,
+    SharedState,
+};
+pub use tx_status_stream::TxStatusMessage;
diff --git a/crates/services/txpool_v2/src/pool.rs b/crates/services/txpool_v2/src/pool.rs
new file mode 100644
index 00000000000..e4a44afd7d1
--- /dev/null
+++ b/crates/services/txpool_v2/src/pool.rs
@@ -0,0 +1,531 @@
+mod collisions;
+
+use std::{
+    collections::HashMap,
+    iter,
+    time::SystemTime,
+};
+
+use collisions::CollisionsExt;
+use fuel_core_types::{
+    fuel_tx::{
+        field::BlobId,
+        TxId,
+    },
+    services::txpool::{
+        ArcPoolTx,
+        PoolTransaction,
+    },
+};
+use num_rational::Ratio;
+
+use crate::{
+    collision_manager::{
+        CollisionManager,
+        Collisions,
+    },
+    config::Config,
+    error::{
+        DependencyError,
+        Error,
+        InputValidationError,
+    },
+    ports::TxPoolPersistentStorage,
+    selection_algorithms::{
+        Constraints,
+        SelectionAlgorithm,
+    },
+    storage::{
+        CheckedTransaction,
+        Storage,
+        StorageData,
+    },
+};
+
+/// The pool is the main component of the txpool service. It is responsible for storing transactions
+/// and allowing the selection of transactions for inclusion in a block.
+pub struct Pool<S, SI, CM, SA> {
+    /// Configuration of the pool.
+    pub(crate) config: Config,
+    /// The storage of the pool.
+    pub(crate) storage: S,
+    /// The collision manager of the pool.
+    pub(crate) collision_manager: CM,
+    /// The selection algorithm of the pool.
+    pub(crate) selection_algorithm: SA,
+    /// Mapping from tx_id to storage_id.
+    pub(crate) tx_id_to_storage_id: HashMap<TxId, SI>,
+    /// Current pool gas stored.
+    pub(crate) current_gas: u64,
+    /// Current pool size in bytes.
+    pub(crate) current_bytes_size: usize,
+}
+
+impl<S, SI, CM, SA> Pool<S, SI, CM, SA> {
+    /// Create a new pool.
+    pub fn new(
+        storage: S,
+        collision_manager: CM,
+        selection_algorithm: SA,
+        config: Config,
+    ) -> Self {
+        Pool {
+            storage,
+            collision_manager,
+            selection_algorithm,
+            config,
+            tx_id_to_storage_id: HashMap::new(),
+            current_gas: 0,
+            current_bytes_size: 0,
+        }
+    }
+
+    /// Returns `true` if the pool is empty.
+    pub fn is_empty(&self) -> bool {
+        self.tx_id_to_storage_id.is_empty()
+            && self.current_gas == 0
+            && self.current_bytes_size == 0
+    }
+}
+
+impl<S: Storage, CM, SA> Pool<S, S::StorageIndex, CM, SA>
+where
+    S: Storage,
+    CM: CollisionManager<StorageIndex = S::StorageIndex>,
+    SA: SelectionAlgorithm<Storage = S, StorageIndex = S::StorageIndex>,
+{
+    /// Insert transactions into the pool.
+    /// Returns a list of results for each transaction.
+    /// Each result is a list of transactions that were removed from the pool
+    /// because of the insertion of the new transaction.
+    pub fn insert(
+        &mut self,
+        tx: ArcPoolTx,
+        persistent_storage: &impl TxPoolPersistentStorage,
+    ) -> Result<Vec<ArcPoolTx>, Error> {
+        let CanStoreTransaction {
+            checked_transaction,
+            transactions_to_remove,
+            collisions,
+            _guard,
+        } = self.can_insert_transaction(tx, persistent_storage)?;
+
+        let has_dependencies = !checked_transaction.all_dependencies().is_empty();
+
+        let mut removed_transactions = vec![];
+        for tx in transactions_to_remove {
+            let removed = self.storage.remove_transaction_and_dependents_subtree(tx);
+            self.update_components_and_caches_on_removal(removed.iter());
+            removed_transactions.extend(removed);
+        }
+
+        for collided_tx in collisions.keys() {
+            let removed = self
+                .storage
+                .remove_transaction_and_dependents_subtree(*collided_tx);
+            self.update_components_and_caches_on_removal(removed.iter());
+
+            removed_transactions.extend(removed);
+        }
+
+        let tx = checked_transaction.tx();
+        let tx_id = tx.id();
+        let gas = tx.max_gas();
+        let creation_instant = SystemTime::now();
+        let bytes_size = tx.metered_bytes_size();
+
+        let storage_id = self
+            .storage
+            .store_transaction(checked_transaction, creation_instant);
+
+        self.current_gas = self.current_gas.saturating_add(gas);
+        self.current_bytes_size = self.current_bytes_size.saturating_add(bytes_size);
+        debug_assert!(!self.tx_id_to_storage_id.contains_key(&tx_id));
+        self.tx_id_to_storage_id.insert(tx_id, storage_id);
+
+        let tx =
+            Storage::get(&self.storage, &storage_id).expect("Transaction is set above");
+        self.collision_manager.on_stored_transaction(storage_id, tx);
+
+        // No dependencies directly in the graph and the sorted transactions
+        if !has_dependencies {
+            self.selection_algorithm
+                .new_executable_transaction(storage_id, tx);
+        }
+
+        let removed_transactions = removed_transactions
+            .into_iter()
+            .map(|data| data.transaction)
+            .collect::<Vec<_>>();
+
+        Ok(removed_transactions)
+    }
+
+    /// Check if a transaction can be inserted into the pool.
+    pub fn can_insert_transaction(
+        &self,
+        tx: ArcPoolTx,
+        persistent_storage: &impl TxPoolPersistentStorage,
+    ) -> Result<CanStoreTransaction<S>, Error> {
+        if tx.max_gas() == 0 {
+            return Err(Error::InputValidation(InputValidationError::MaxGasZero))
+        }
+
+        let tx_id = tx.id();
+        if self.tx_id_to_storage_id.contains_key(&tx_id) {
+            return Err(Error::InputValidation(InputValidationError::DuplicateTxId(
+                tx_id,
+            )))
+        }
+
+        self.config
+            .black_list
+            .check_blacklisting(&tx)
+            .map_err(Error::Blacklisted)?;
+
+        Self::check_blob_does_not_exist(&tx, persistent_storage)?;
+        self.storage.validate_inputs(
+            &tx,
+            persistent_storage,
+            self.config.utxo_validation,
+        )?;
+
+        let collisions = self.collision_manager.find_collisions(&tx)?;
+        let checked_transaction = self.storage.can_store_transaction(tx)?;
+
+        for collision in collisions.keys() {
+            if checked_transaction.all_dependencies().contains(collision) {
+                return Err(Error::Dependency(
+                    DependencyError::NotInsertedCollisionIsDependency,
+                ));
+            }
+        }
+
+        let has_dependencies = !checked_transaction.all_dependencies().is_empty();
+
+        collisions
+            .check_collision_requirements(
+                checked_transaction.tx(),
+                has_dependencies,
+                &self.storage,
+            )
+            .map_err(Error::Collided)?;
+
+        let can_fit_into_pool = self.can_fit_into_pool(&checked_transaction)?;
+
+        let mut transactions_to_remove = vec![];
+        if let SpaceCheckResult::NotEnoughSpace(left) = can_fit_into_pool {
+            transactions_to_remove = self.find_free_space(left, &checked_transaction)?;
+        }
+
+        let can_store_transaction = CanStoreTransaction {
+            checked_transaction,
+            transactions_to_remove,
+            collisions,
+            _guard: &self.storage,
+        };
+
+        Ok(can_store_transaction)
+    }
+
+    // TODO: Use block space also (https://github.com/FuelLabs/fuel-core/issues/2133)
+    /// Extract transactions for a block.
+    /// Returns a list of transactions that were selected for the block
+    /// based on the constraints given in the configuration and the selection algorithm used.
+    pub fn extract_transactions_for_block(
+        &mut self,
+        constraints: Constraints,
+    ) -> Vec<ArcPoolTx> {
+        self.selection_algorithm
+            .gather_best_txs(constraints, &mut self.storage)
+            .into_iter()
+            .map(|storage_entry| {
+                self.update_components_and_caches_on_removal(iter::once(&storage_entry));
+
+                storage_entry.transaction
+            })
+            .collect::<Vec<_>>()
+    }
+
+    pub fn find_one(&self, tx_id: &TxId) -> Option<&StorageData> {
+        Storage::get(&self.storage, self.tx_id_to_storage_id.get(tx_id)?)
+    }
+
+    pub fn contains(&self, tx_id: &TxId) -> bool {
+        self.tx_id_to_storage_id.contains_key(tx_id)
+    }
+
+    pub fn iter_tx_ids(&self) -> impl Iterator<Item = &TxId> {
+        self.tx_id_to_storage_id.keys()
+    }
+
+    /// Remove transaction but keep its dependents.
+    /// The dependents become executables.
+    pub fn remove_transaction(&mut self, tx_ids: Vec<TxId>) {
+        for tx_id in tx_ids {
+            if let Some(storage_id) = self.tx_id_to_storage_id.remove(&tx_id) {
+                let dependents: Vec<S::StorageIndex> =
+                    self.storage.get_direct_dependents(storage_id).collect();
+                let Some(transaction) = self.storage.remove_transaction(storage_id)
+                else {
+                    debug_assert!(false, "Storage data not found for the transaction");
+                    tracing::warn!(
+                        "Storage data not found for the transaction during `remove_transaction`."
+                    );
+                    continue
+                };
+                for dependent in dependents {
+                    let Some(storage_data) = self.storage.get(&dependent) else {
+                        debug_assert!(
+                            false,
+                            "Dependent storage data not found for the transaction"
+                        );
+                        tracing::warn!(
+                            "Dependent storage data not found for \
+                            the transaction during `remove_transaction`."
+                        );
+                        continue
+                    };
+                    self.selection_algorithm
+                        .new_executable_transaction(dependent, storage_data);
+                }
+                self.update_components_and_caches_on_removal(iter::once(&transaction));
+            }
+        }
+    }
+
+    /// Check if the pool has enough space to store a transaction.
+    ///
+    /// It returns `true` if:
+    /// - Pool is not full
+    /// - Removing colliding subtree is enough to make space
+    ///
+    /// It returns an error if the pool is full and transactions has dependencies.
+    ///
+    /// If none of the above is not true, return `false`.
+    fn can_fit_into_pool(
+        &self,
+        checked_transaction: &S::CheckedTransaction,
+    ) -> Result<SpaceCheckResult, Error> {
+        let tx = checked_transaction.tx();
+        let tx_gas = tx.max_gas();
+        let bytes_size = tx.metered_bytes_size();
+        let gas_left = self.current_gas.saturating_add(tx_gas);
+        let bytes_left = self.current_bytes_size.saturating_add(bytes_size);
+        let txs_left = self.tx_id_to_storage_id.len().saturating_add(1);
+        if gas_left <= self.config.pool_limits.max_gas
+            && bytes_left <= self.config.pool_limits.max_bytes_size
+            && txs_left <= self.config.pool_limits.max_txs
+        {
+            return Ok(SpaceCheckResult::EnoughSpace);
+        }
+
+        let has_dependencies = !checked_transaction.all_dependencies().is_empty();
+
+        // If the transaction has a dependency and the pool is full, we refuse it
+        if has_dependencies {
+            return Err(Error::NotInsertedLimitHit);
+        }
+
+        let left = NotEnoughSpace {
+            gas_left,
+            bytes_left,
+            txs_left,
+        };
+
+        Ok(SpaceCheckResult::NotEnoughSpace(left))
+    }
+
+    /// Find free space in the pool by marking less profitable transactions for removal.
+    ///
+    /// Return the list of transactions that must be removed from the pool along all of
+    /// their dependent subtree.
+    ///
+    /// Returns an error impossible to find enough space.
+    fn find_free_space(
+        &self,
+        left: NotEnoughSpace,
+        checked_transaction: &S::CheckedTransaction,
+    ) -> Result<Vec<S::StorageIndex>, Error> {
+        let tx = checked_transaction.tx();
+        let NotEnoughSpace {
+            mut gas_left,
+            mut bytes_left,
+            mut txs_left,
+        } = left;
+
+        // Here the transaction has no dependencies which means that it's an executable transaction
+        // and we want to make space for it
+        let new_tx_ratio = Ratio::new(tx.tip(), tx.max_gas());
+
+        // We want to go over executable transactions and remove the less profitable ones.
+        // It is imported to go over executable transactions, not dependent ones, because we
+        // can include the same subtree several times in the calculation if we use dependent txs.
+        let mut sorted_txs = self.selection_algorithm.get_less_worth_txs();
+
+        let mut transactions_to_remove = vec![];
+
+        while gas_left > self.config.pool_limits.max_gas
+            || bytes_left > self.config.pool_limits.max_bytes_size
+            || txs_left > self.config.pool_limits.max_txs
+        {
+            let storage_id = sorted_txs.next().ok_or(Error::NotInsertedLimitHit)?;
+
+            if checked_transaction.all_dependencies().contains(storage_id) {
+                continue
+            }
+
+            debug_assert!(!self.storage.has_dependencies(storage_id));
+
+            let Some(storage_data) = self.storage.get(storage_id) else {
+                debug_assert!(
+                    false,
+                    "Storage data not found for one of the less worth transactions"
+                );
+                tracing::warn!(
+                    "Storage data not found for one of the less \
+                    worth transactions during `find_free_space`."
+                );
+                continue
+            };
+            let ratio = Ratio::new(
+                storage_data.dependents_cumulative_tip,
+                storage_data.dependents_cumulative_gas,
+            );
+
+            if ratio > new_tx_ratio {
+                return Err(Error::NotInsertedLimitHit);
+            }
+
+            // It is not a correct way of deciding how many gas and bytes we will free
+            // by removing this transaction, but the fastest way.
+            // It will return incorrect values if several transactions have the same
+            // dependents. An example:
+            //
+            // E - Executable transaction
+            // D - Dependent transaction
+            //
+            //   E   E
+            //    \ /
+            //     D
+            //    / \
+            //   D   D
+            //
+            // Removing both E frees (E + E + 3D), while this loop assumes 2 * (E + 3D).
+            // But it is okay since the limits for the TxPool are not strict.
+            let gas = storage_data.dependents_cumulative_gas;
+            let bytes = storage_data.dependents_cumulative_bytes_size;
+            let txs = storage_data.number_dependents_in_chain;
+
+            gas_left = gas_left.saturating_sub(gas);
+            bytes_left = bytes_left.saturating_sub(bytes);
+            txs_left = txs_left.saturating_sub(txs);
+
+            transactions_to_remove.push(*storage_id);
+        }
+
+        Ok(transactions_to_remove)
+    }
+
+    /// Remove transaction and its dependents.
+    pub fn remove_transaction_and_dependents(
+        &mut self,
+        tx_ids: Vec<TxId>,
+    ) -> Vec<ArcPoolTx> {
+        let mut removed_transactions = vec![];
+        for tx_id in tx_ids {
+            if let Some(storage_id) = self.tx_id_to_storage_id.remove(&tx_id) {
+                let removed = self
+                    .storage
+                    .remove_transaction_and_dependents_subtree(storage_id);
+                self.update_components_and_caches_on_removal(removed.iter());
+                removed_transactions
+                    .extend(removed.into_iter().map(|data| data.transaction));
+            }
+        }
+        removed_transactions
+    }
+
+    pub fn remove_coin_dependents(&mut self, tx_id: TxId) -> Vec<ArcPoolTx> {
+        let mut txs_removed = vec![];
+        let coin_dependents = self.collision_manager.get_coins_spenders(&tx_id);
+        for dependent in coin_dependents {
+            let removed = self
+                .storage
+                .remove_transaction_and_dependents_subtree(dependent);
+            self.update_components_and_caches_on_removal(removed.iter());
+            txs_removed.extend(removed.into_iter().map(|data| data.transaction));
+        }
+        txs_removed
+    }
+
+    fn check_blob_does_not_exist(
+        tx: &PoolTransaction,
+        persistent_storage: &impl TxPoolPersistentStorage,
+    ) -> Result<(), Error> {
+        if let PoolTransaction::Blob(checked_tx, _) = &tx {
+            let blob_id = checked_tx.transaction().blob_id();
+            if persistent_storage
+                .blob_exist(blob_id)
+                .map_err(|e| Error::Database(format!("{:?}", e)))?
+            {
+                return Err(Error::InputValidation(
+                    InputValidationError::NotInsertedBlobIdAlreadyTaken(*blob_id),
+                ));
+            }
+        }
+        Ok(())
+    }
+
+    fn update_components_and_caches_on_removal<'a>(
+        &mut self,
+        removed_transactions: impl Iterator<Item = &'a StorageData>,
+    ) {
+        for storage_entry in removed_transactions {
+            let tx = &storage_entry.transaction;
+            self.current_gas = self.current_gas.saturating_sub(tx.max_gas());
+            self.current_bytes_size = self
+                .current_bytes_size
+                .saturating_sub(tx.metered_bytes_size());
+            self.tx_id_to_storage_id.remove(&tx.id());
+            self.collision_manager.on_removed_transaction(tx);
+            self.selection_algorithm
+                .on_removed_transaction(storage_entry);
+        }
+    }
+}
+
+pub struct NotEnoughSpace {
+    gas_left: u64,
+    bytes_left: usize,
+    txs_left: usize,
+}
+
+/// The result of the `can_fit_into_pool` check.
+pub enum SpaceCheckResult {
+    EnoughSpace,
+    NotEnoughSpace(NotEnoughSpace),
+}
+
+pub struct CanStoreTransaction<'a, S>
+where
+    S: Storage,
+{
+    /// The checked transaction by the storage.
+    checked_transaction: S::CheckedTransaction,
+    /// List of transactions to remove to fit the new transaction into the pool.
+    transactions_to_remove: Vec<S::StorageIndex>,
+    /// List of collided transactions that we need to remove to insert transaction.
+    collisions: Collisions<S::StorageIndex>,
+    /// Protects the pool from modifications while this type is active.
+    _guard: &'a S,
+}
+
+impl<'a, S> CanStoreTransaction<'a, S>
+where
+    S: Storage,
+{
+    pub fn into_transaction(self) -> ArcPoolTx {
+        self.checked_transaction.into_tx()
+    }
+}
diff --git a/crates/services/txpool_v2/src/pool/collisions.rs b/crates/services/txpool_v2/src/pool/collisions.rs
new file mode 100644
index 00000000000..786f6946e79
--- /dev/null
+++ b/crates/services/txpool_v2/src/pool/collisions.rs
@@ -0,0 +1,74 @@
+use crate::{
+    collision_manager::Collisions,
+    error::CollisionReason,
+    storage::Storage,
+};
+use fuel_core_types::services::txpool::PoolTransaction;
+use num_rational::Ratio;
+
+/// Trait that extends the `Collision` type functionality used by the pool.
+pub trait CollisionsExt<S> {
+    /// Determine if the collisions allow the transaction to be stored.
+    /// Returns the reason of the collision if the transaction cannot be stored.
+    fn check_collision_requirements(
+        &self,
+        tx: &PoolTransaction,
+        has_dependencies: bool,
+        storage: &S,
+    ) -> Result<(), CollisionReason>;
+}
+
+impl<S> CollisionsExt<S> for Collisions<S::StorageIndex>
+where
+    S: Storage,
+{
+    /// Rules:
+    /// - A transaction has dependencies:
+    ///     - Can collide only with one other transaction. So, the user can submit
+    ///         the same transaction with a higher tip but not merge one or more
+    ///         transactions into one.
+    ///     - A new transaction can be accepted if its profitability is higher than
+    ///         the collided subtree's.
+    /// - A transaction doesn't have dependencies:
+    ///     - A new transaction can be accepted if its profitability is higher
+    ///         than the collided subtrees'.
+    fn check_collision_requirements(
+        &self,
+        tx: &PoolTransaction,
+        has_dependencies: bool,
+        storage: &S,
+    ) -> Result<(), CollisionReason> {
+        if has_dependencies && self.len() > 1 {
+            return Err(CollisionReason::MultipleCollisions);
+        }
+
+        for (collision, reason) in self.iter() {
+            if !is_better_than_collision(tx, collision, storage)? {
+                if let Some(reason) = reason.first() {
+                    return Err(reason.clone());
+                } else {
+                    return Err(CollisionReason::Unknown);
+                }
+            }
+        }
+
+        Ok(())
+    }
+}
+
+fn is_better_than_collision<S>(
+    tx: &PoolTransaction,
+    collision: &S::StorageIndex,
+    storage: &S,
+) -> Result<bool, CollisionReason>
+where
+    S: Storage,
+{
+    let new_tx_ratio = Ratio::new(tx.tip(), tx.max_gas());
+    let colliding_tx = storage.get(collision).ok_or(CollisionReason::Unknown)?;
+    let colliding_tx_ratio = Ratio::new(
+        colliding_tx.dependents_cumulative_tip,
+        colliding_tx.dependents_cumulative_gas,
+    );
+    Ok(new_tx_ratio > colliding_tx_ratio)
+}
diff --git a/crates/services/txpool/src/ports.rs b/crates/services/txpool_v2/src/ports.rs
similarity index 65%
rename from crates/services/txpool/src/ports.rs
rename to crates/services/txpool_v2/src/ports.rs
index 4a247ff21db..9ece6e3bdf8 100644
--- a/crates/services/txpool/src/ports.rs
+++ b/crates/services/txpool_v2/src/ports.rs
@@ -1,9 +1,10 @@
-use crate::{
-    types::GasPrice,
-    Result as TxPoolResult,
-};
+use std::sync::Arc;
+
 use fuel_core_services::stream::BoxStream;
-use fuel_core_storage::Result as StorageResult;
+use fuel_core_storage::{
+    PredicateStorageRequirements,
+    Result as StorageResult,
+};
 use fuel_core_types::{
     blockchain::header::ConsensusParametersVersion,
     entities::{
@@ -11,18 +12,15 @@ use fuel_core_types::{
         relayer::message::Message,
     },
     fuel_tx::{
+        BlobId,
         Bytes32,
         ConsensusParameters,
+        ContractId,
         Transaction,
         TxId,
         UtxoId,
     },
-    fuel_types::{
-        BlobId,
-        ContractId,
-        Nonce,
-    },
-    fuel_vm::interpreter::Memory,
+    fuel_types::Nonce,
     services::{
         block_importer::SharedImportResult,
         p2p::{
@@ -33,58 +31,46 @@ use fuel_core_types::{
         },
     },
 };
-use std::{
-    ops::Deref,
-    sync::Arc,
-};
 
-#[async_trait::async_trait]
-pub trait PeerToPeer: Send + Sync {
-    type GossipedTransaction: NetworkData<Transaction>;
-
-    // Gossip broadcast a transaction inserted via API.
-    fn broadcast_transaction(&self, transaction: Arc<Transaction>) -> anyhow::Result<()>;
+use crate::GasPrice;
 
-    /// Creates a stream that is filled with the peer_id when they subscribe to
-    /// our transactions gossip.
-    fn subscribe_new_peers(&self) -> BoxStream<PeerId>;
-
-    /// Creates a stream of next transactions gossiped from the network.
-    fn gossiped_transaction_events(&self) -> BoxStream<Self::GossipedTransaction>;
+pub use fuel_core_storage::transactional::AtomicView;
 
-    // Report the validity of a transaction received from the network.
-    fn notify_gossip_transaction_validity(
-        &self,
-        message_info: GossipsubMessageInfo,
-        validity: GossipsubMessageAcceptance,
-    ) -> anyhow::Result<()>;
-
-    // Asks the network to gather all tx ids of a specific peer
-    async fn request_tx_ids(&self, peer_id: PeerId) -> anyhow::Result<Vec<TxId>>;
-
-    // Asks the network to gather specific transactions from a specific peer
-    async fn request_txs(
-        &self,
-        peer_id: PeerId,
-        tx_ids: Vec<TxId>,
-    ) -> anyhow::Result<Vec<Option<Transaction>>>;
-}
-
-pub trait BlockImporter: Send + Sync {
+pub trait BlockImporter {
     /// Wait until the next block is available
     fn block_events(&self) -> BoxStream<SharedImportResult>;
 }
 
-pub trait TxPoolDb: Send + Sync {
+/// Trait for getting the latest consensus parameters.
+pub trait ConsensusParametersProvider: Send + Sync + 'static {
+    /// Get latest consensus parameters.
+    fn latest_consensus_parameters(
+        &self,
+    ) -> (ConsensusParametersVersion, Arc<ConsensusParameters>);
+}
+
+pub trait TxPoolPersistentStorage:
+    Clone + PredicateStorageRequirements + Send + Sync + 'static
+{
+    /// Get the UTXO by its ID.
     fn utxo(&self, utxo_id: &UtxoId) -> StorageResult<Option<CompressedCoin>>;
 
+    /// Check if the contract with the given ID exists.
     fn contract_exist(&self, contract_id: &ContractId) -> StorageResult<bool>;
 
+    /// Check if the blob with the given ID exists.
     fn blob_exist(&self, blob_id: &BlobId) -> StorageResult<bool>;
 
+    /// Get the message by its ID.
     fn message(&self, message_id: &Nonce) -> StorageResult<Option<Message>>;
 }
 
+/// Trait for getting gas price for the Tx Pool code to look up the gas price for a given block height
+pub trait GasPriceProvider: Send + Sync + 'static {
+    /// Calculate gas price for the next block.
+    fn next_gas_price(&self) -> GasPrice;
+}
+
 #[derive(Debug, Clone, Copy, PartialEq)]
 pub enum WasmValidityError {
     /// Wasm support is not enabled.
@@ -95,44 +81,45 @@ pub enum WasmValidityError {
     NotValid,
 }
 
-pub trait WasmChecker {
+pub trait WasmChecker: Send + Sync + 'static {
     fn validate_uploaded_wasm(
         &self,
         wasm_root: &Bytes32,
     ) -> Result<(), WasmValidityError>;
 }
 
-#[async_trait::async_trait]
-/// Trait for getting gas price for the Tx Pool code to look up the gas price for a given block height
-pub trait GasPriceProvider {
-    /// Calculate gas price for the next block with a given size `block_bytes`.
-    async fn next_gas_price(&self) -> TxPoolResult<GasPrice>;
-}
+pub trait P2PSubscriptions {
+    type GossipedTransaction: NetworkData<Transaction>;
 
-/// Trait for getting VM memory.
-#[async_trait::async_trait]
-pub trait MemoryPool {
-    type Memory: Memory + Send + Sync + 'static;
+    /// Creates a stream that is filled with the peer_id when they subscribe to
+    /// our transactions gossip.
+    fn subscribe_new_peers(&self) -> BoxStream<PeerId>;
 
-    /// Get the memory instance.
-    async fn get_memory(&self) -> Self::Memory;
+    /// Creates a stream of next transactions gossiped from the network.
+    fn gossiped_transaction_events(&self) -> BoxStream<Self::GossipedTransaction>;
 }
 
-/// Trait for getting the latest consensus parameters.
-#[cfg_attr(feature = "test-helpers", mockall::automock)]
-pub trait ConsensusParametersProvider {
-    /// Get latest consensus parameters.
-    fn latest_consensus_parameters(
+pub trait NotifyP2P {
+    /// Gossip broadcast a transaction inserted via API.
+    fn broadcast_transaction(&self, transaction: Arc<Transaction>) -> anyhow::Result<()>;
+
+    /// Report the validity of a transaction received from the network.
+    fn notify_gossip_transaction_validity(
         &self,
-    ) -> (ConsensusParametersVersion, Arc<ConsensusParameters>);
+        message_info: GossipsubMessageInfo,
+        validity: GossipsubMessageAcceptance,
+    ) -> anyhow::Result<()>;
 }
 
 #[async_trait::async_trait]
-impl<T> GasPriceProvider for Arc<T>
-where
-    T: GasPriceProvider + Send + Sync,
-{
-    async fn next_gas_price(&self) -> TxPoolResult<GasPrice> {
-        self.deref().next_gas_price().await
-    }
+pub trait P2PRequests: NotifyP2P + Send + Sync + 'static {
+    /// Asks the network to gather all tx ids of a specific peer
+    async fn request_tx_ids(&self, peer_id: PeerId) -> anyhow::Result<Vec<TxId>>;
+
+    /// Asks the network to gather specific transactions from a specific peer
+    async fn request_txs(
+        &self,
+        peer_id: PeerId,
+        tx_ids: Vec<TxId>,
+    ) -> anyhow::Result<Vec<Option<Transaction>>>;
 }
diff --git a/crates/services/txpool_v2/src/selection_algorithms/mod.rs b/crates/services/txpool_v2/src/selection_algorithms/mod.rs
new file mode 100644
index 00000000000..d9db6574bf3
--- /dev/null
+++ b/crates/services/txpool_v2/src/selection_algorithms/mod.rs
@@ -0,0 +1,45 @@
+use crate::storage::{
+    RemovedTransactions,
+    StorageData,
+};
+
+pub mod ratio_tip_gas;
+
+/// Constraints that the selection algorithm has to respect.
+pub struct Constraints {
+    /// Minimum gas price that all transaction must support.
+    pub minimal_gas_price: u64,
+    /// Maximum limit of gas that all selected transaction shouldn't exceed.
+    pub max_gas: u64,
+    /// Maximum number of transactions that can be selected.
+    pub maximum_txs: u16,
+    /// Maximum size of the block.
+    pub maximum_block_size: u32,
+}
+
+/// The selection algorithm is responsible for selecting the best transactions to include in a block.
+pub trait SelectionAlgorithm {
+    /// The storage type of the selection algorithm.
+    type Storage;
+    /// The index that identifies a transaction in the storage.
+    type StorageIndex;
+    /// Given the constraints, the selection algorithm has to return the best list of transactions to include in a block.
+    fn gather_best_txs(
+        &mut self,
+        constraints: Constraints,
+        storage: &mut Self::Storage,
+    ) -> RemovedTransactions;
+
+    /// Update the selection algorithm with the new transaction that are executable.
+    fn new_executable_transaction(
+        &mut self,
+        storage_id: Self::StorageIndex,
+        store_entry: &StorageData,
+    );
+
+    /// Get less worth transactions iterator
+    fn get_less_worth_txs(&self) -> impl Iterator<Item = &Self::StorageIndex>;
+
+    /// Inform the selection algorithm that a transaction was removed from the pool.
+    fn on_removed_transaction(&mut self, storage_entry: &StorageData);
+}
diff --git a/crates/services/txpool_v2/src/selection_algorithms/ratio_tip_gas.rs b/crates/services/txpool_v2/src/selection_algorithms/ratio_tip_gas.rs
new file mode 100644
index 00000000000..5fb6047685f
--- /dev/null
+++ b/crates/services/txpool_v2/src/selection_algorithms/ratio_tip_gas.rs
@@ -0,0 +1,255 @@
+use std::{
+    cmp::{
+        Ordering,
+        Reverse,
+    },
+    collections::BTreeMap,
+    fmt::Debug,
+    time::SystemTime,
+};
+
+use fuel_core_types::fuel_tx::TxId;
+use num_rational::Ratio;
+
+use crate::storage::{
+    RemovedTransactions,
+    StorageData,
+};
+
+use super::{
+    Constraints,
+    SelectionAlgorithm,
+};
+
+pub trait RatioTipGasSelectionAlgorithmStorage {
+    type StorageIndex: Debug;
+
+    fn get(&self, index: &Self::StorageIndex) -> Option<&StorageData>;
+
+    fn get_dependents(
+        &self,
+        index: &Self::StorageIndex,
+    ) -> impl Iterator<Item = Self::StorageIndex>;
+
+    fn has_dependencies(&self, index: &Self::StorageIndex) -> bool;
+
+    fn remove(&mut self, index: &Self::StorageIndex) -> Option<StorageData>;
+}
+
+pub type RatioTipGas = Ratio<u64>;
+
+/// Key used to sort transactions by tip/gas ratio.
+/// It first compares the tip/gas ratio, then the creation instant and finally the transaction id.
+#[derive(Eq, PartialEq, Clone, Copy, Debug)]
+pub struct Key {
+    ratio: RatioTipGas,
+    creation_instant: SystemTime,
+    tx_id: TxId,
+}
+
+impl Ord for Key {
+    fn cmp(&self, other: &Self) -> Ordering {
+        let cmp = self.ratio.cmp(&other.ratio);
+        if cmp == Ordering::Equal {
+            let instant_cmp = other.creation_instant.cmp(&self.creation_instant);
+            if instant_cmp == Ordering::Equal {
+                self.tx_id.cmp(&other.tx_id)
+            } else {
+                instant_cmp
+            }
+        } else {
+            cmp
+        }
+    }
+}
+
+impl PartialOrd for Key {
+    fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
+        Some(self.cmp(other))
+    }
+}
+
+/// The selection algorithm that selects transactions based on the tip/gas ratio.
+pub struct RatioTipGasSelection<S>
+where
+    S: RatioTipGasSelectionAlgorithmStorage,
+{
+    executable_transactions_sorted_tip_gas_ratio: BTreeMap<Reverse<Key>, S::StorageIndex>,
+}
+
+impl<S> Default for RatioTipGasSelection<S>
+where
+    S: RatioTipGasSelectionAlgorithmStorage,
+{
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+impl<S> RatioTipGasSelection<S>
+where
+    S: RatioTipGasSelectionAlgorithmStorage,
+{
+    pub fn new() -> Self {
+        Self {
+            executable_transactions_sorted_tip_gas_ratio: BTreeMap::new(),
+        }
+    }
+
+    #[cfg(test)]
+    pub fn is_empty(&self) -> bool {
+        self.executable_transactions_sorted_tip_gas_ratio.is_empty()
+    }
+
+    fn key(store_entry: &StorageData) -> Key {
+        let transaction = &store_entry.transaction;
+        let tip_gas_ratio = RatioTipGas::new(transaction.tip(), transaction.max_gas());
+
+        Key {
+            ratio: tip_gas_ratio,
+            creation_instant: store_entry.creation_instant,
+            tx_id: transaction.id(),
+        }
+    }
+
+    fn on_removed_transaction_inner(&mut self, key: Key) {
+        self.executable_transactions_sorted_tip_gas_ratio
+            .remove(&Reverse(key));
+    }
+}
+
+impl<S> SelectionAlgorithm for RatioTipGasSelection<S>
+where
+    S: RatioTipGasSelectionAlgorithmStorage,
+{
+    type Storage = S;
+    type StorageIndex = S::StorageIndex;
+
+    fn gather_best_txs(
+        &mut self,
+        constraints: Constraints,
+        storage: &mut S,
+    ) -> RemovedTransactions {
+        let mut gas_left = constraints.max_gas;
+        let mut space_left = constraints.maximum_block_size as usize;
+        let mut nb_left = constraints.maximum_txs;
+        let mut result = Vec::new();
+
+        // Take iterate over all transactions with the highest tip/gas ratio. If transaction
+        // fits in the gas limit select it and mark all its dependents to be promoted.
+        // Do that until end of the list or gas limit is reached. If gas limit is not
+        // reached, but we have promoted transactions we can start again from the beginning.
+        // Otherwise, we can break the loop.
+        // It is done in this way to minimize number of iteration of the list of executable
+        // transactions.
+        while gas_left > 0
+            && nb_left > 0
+            && space_left > 0
+            && !self.executable_transactions_sorted_tip_gas_ratio.is_empty()
+        {
+            let mut clean_up_list = Vec::new();
+            let mut transactions_to_remove = Vec::new();
+            let mut transactions_to_promote = Vec::new();
+
+            for (key, storage_id) in &self.executable_transactions_sorted_tip_gas_ratio {
+                if nb_left == 0 || gas_left == 0 || space_left == 0 {
+                    break;
+                }
+
+                let Some(stored_transaction) = storage.get(storage_id) else {
+                    debug_assert!(
+                        false,
+                        "Transaction not found in the storage during `gather_best_txs`."
+                    );
+                    tracing::warn!(
+                        "Transaction not found in the storage during `gather_best_txs`."
+                    );
+                    transactions_to_remove.push(*key);
+                    continue
+                };
+
+                let less_price = stored_transaction.transaction.max_gas_price()
+                    < constraints.minimal_gas_price;
+
+                if less_price {
+                    continue;
+                }
+
+                let not_enough_gas = stored_transaction.transaction.max_gas() > gas_left;
+                let too_big_tx =
+                    stored_transaction.transaction.metered_bytes_size() > space_left;
+
+                if not_enough_gas || too_big_tx {
+                    continue;
+                }
+
+                gas_left =
+                    gas_left.saturating_sub(stored_transaction.transaction.max_gas());
+                space_left = space_left
+                    .saturating_sub(stored_transaction.transaction.metered_bytes_size());
+                nb_left = nb_left.saturating_sub(1);
+
+                let dependents = storage.get_dependents(storage_id).collect::<Vec<_>>();
+                debug_assert!(!storage.has_dependencies(storage_id));
+                let removed = storage.remove(storage_id).expect(
+                    "We just get the transaction from the storage above, it should exist.",
+                );
+                clean_up_list.push(*key);
+                result.push(removed);
+
+                for dependent in dependents {
+                    if !storage.has_dependencies(&dependent) {
+                        transactions_to_promote.push(dependent);
+                    }
+                }
+            }
+
+            for remove in transactions_to_remove {
+                let key = remove.0;
+                self.on_removed_transaction_inner(key);
+            }
+
+            // If no transaction fits in the gas limit and no one to promote, we can break the loop
+            if clean_up_list.is_empty() && transactions_to_promote.is_empty() {
+                break;
+            }
+
+            for key in clean_up_list {
+                let key = key.0;
+                // Remove selected transactions from the sorted list
+                self.on_removed_transaction_inner(key);
+            }
+
+            for promote in transactions_to_promote {
+                let storage = storage.get(&promote).expect(
+                    "We just get the dependent from the storage, it should exist.",
+                );
+
+                self.new_executable_transaction(promote, storage);
+            }
+        }
+
+        result
+    }
+
+    fn new_executable_transaction(
+        &mut self,
+        storage_id: Self::StorageIndex,
+        store_entry: &StorageData,
+    ) {
+        let key = Self::key(store_entry);
+        self.executable_transactions_sorted_tip_gas_ratio
+            .insert(Reverse(key), storage_id);
+    }
+
+    fn get_less_worth_txs(&self) -> impl Iterator<Item = &Self::StorageIndex> {
+        self.executable_transactions_sorted_tip_gas_ratio
+            .values()
+            .rev()
+    }
+
+    fn on_removed_transaction(&mut self, storage_entry: &StorageData) {
+        let key = Self::key(storage_entry);
+        self.on_removed_transaction_inner(key)
+    }
+}
diff --git a/crates/services/txpool_v2/src/service.rs b/crates/services/txpool_v2/src/service.rs
new file mode 100644
index 00000000000..b59f3360049
--- /dev/null
+++ b/crates/services/txpool_v2/src/service.rs
@@ -0,0 +1,754 @@
+use crate as fuel_core_txpool;
+
+use fuel_core_services::{
+    AsyncProcessor,
+    RunnableService,
+    RunnableTask,
+    ServiceRunner,
+    StateWatcher,
+    SyncProcessor,
+};
+use fuel_core_txpool::{
+    collision_manager::basic::BasicCollisionManager,
+    config::Config,
+    error::{
+        Error,
+        RemovedReason,
+    },
+    pool::Pool,
+    ports::{
+        AtomicView,
+        BlockImporter as BlockImporterTrait,
+        ConsensusParametersProvider,
+        GasPriceProvider as GasPriceProviderTrait,
+        P2PRequests,
+        P2PSubscriptions,
+        TxPoolPersistentStorage,
+        WasmChecker as WasmCheckerTrait,
+    },
+    selection_algorithms::ratio_tip_gas::RatioTipGasSelection,
+    service::{
+        memory::MemoryPool,
+        p2p::P2PExt,
+        pruner::TransactionPruner,
+        subscriptions::Subscriptions,
+        verifications::Verification,
+    },
+    shared_state::{
+        BorrowedTxPool,
+        SharedState,
+    },
+    storage::{
+        graph::{
+            GraphConfig,
+            GraphStorage,
+        },
+        Storage,
+    },
+    update_sender::TxStatusChange,
+};
+use fuel_core_types::{
+    fuel_tx::{
+        Transaction,
+        TxId,
+        UniqueIdentifier,
+    },
+    fuel_types::{
+        BlockHeight,
+        ChainId,
+    },
+    services::{
+        block_importer::SharedImportResult,
+        p2p::{
+            GossipData,
+            GossipsubMessageInfo,
+            PeerId,
+            TransactionGossipData,
+        },
+        txpool::{
+            ArcPoolTx,
+            TransactionStatus,
+        },
+    },
+    tai64::Tai64,
+};
+use futures::StreamExt;
+use parking_lot::RwLock;
+use std::{
+    collections::VecDeque,
+    sync::Arc,
+    time::{
+        SystemTime,
+        SystemTimeError,
+    },
+};
+use tokio::{
+    sync::{
+        mpsc,
+        oneshot,
+        watch,
+    },
+    time::MissedTickBehavior,
+};
+
+pub(crate) mod memory;
+mod p2p;
+mod pruner;
+mod subscriptions;
+pub(crate) mod verifications;
+
+pub type TxPool = Pool<
+    GraphStorage,
+    <GraphStorage as Storage>::StorageIndex,
+    BasicCollisionManager<<GraphStorage as Storage>::StorageIndex>,
+    RatioTipGasSelection<GraphStorage>,
+>;
+
+pub(crate) type Shared<T> = Arc<RwLock<T>>;
+
+pub type Service<View> = ServiceRunner<Task<View>>;
+
+/// Structure returned to others modules containing the transaction and
+/// some useful infos
+#[derive(Debug)]
+pub struct TxInfo {
+    /// The transaction
+    tx: ArcPoolTx,
+    /// The creation instant of the transaction
+    creation_instant: SystemTime,
+}
+
+impl TxInfo {
+    pub fn tx(&self) -> &ArcPoolTx {
+        &self.tx
+    }
+
+    pub fn creation_instant(&self) -> &SystemTime {
+        &self.creation_instant
+    }
+}
+
+impl TryFrom<TxInfo> for TransactionStatus {
+    type Error = SystemTimeError;
+
+    fn try_from(value: TxInfo) -> Result<Self, Self::Error> {
+        let unit_time = value
+            .creation_instant
+            .duration_since(SystemTime::UNIX_EPOCH)?
+            .as_secs() as i64;
+
+        Ok(TransactionStatus::Submitted {
+            time: Tai64::from_unix(unit_time),
+        })
+    }
+}
+
+pub struct BorrowTxPoolRequest {
+    pub response_channel: oneshot::Sender<BorrowedTxPool>,
+}
+
+pub enum WritePoolRequest {
+    InsertTxs {
+        transactions: Vec<Arc<Transaction>>,
+    },
+    InsertTx {
+        transaction: Arc<Transaction>,
+        response_channel: oneshot::Sender<Result<(), Error>>,
+    },
+    RemoveCoinDependents {
+        transactions: Vec<(TxId, String)>,
+    },
+}
+
+pub enum ReadPoolRequest {
+    GetTxIds {
+        max_txs: usize,
+        response_channel: oneshot::Sender<Vec<TxId>>,
+    },
+    GetTxs {
+        tx_ids: Vec<TxId>,
+        response_channel: oneshot::Sender<Vec<Option<TxInfo>>>,
+    },
+}
+
+pub struct Task<View> {
+    chain_id: ChainId,
+    utxo_validation: bool,
+    subscriptions: Subscriptions,
+    verification: Verification<View>,
+    p2p: Arc<dyn P2PRequests>,
+    transaction_verifier_process: SyncProcessor,
+    p2p_sync_process: AsyncProcessor,
+    pruner: TransactionPruner,
+    pool: Shared<TxPool>,
+    current_height: Arc<RwLock<BlockHeight>>,
+    shared_state: SharedState,
+}
+
+#[async_trait::async_trait]
+impl<View> RunnableService for Task<View>
+where
+    View: TxPoolPersistentStorage,
+{
+    const NAME: &'static str = "TxPoolv2";
+
+    type SharedData = SharedState;
+
+    type Task = Task<View>;
+
+    type TaskParams = ();
+
+    fn shared_data(&self) -> Self::SharedData {
+        self.shared_state.clone()
+    }
+
+    async fn into_task(
+        mut self,
+        _: &StateWatcher,
+        _: Self::TaskParams,
+    ) -> anyhow::Result<Self::Task> {
+        Ok(self)
+    }
+}
+
+#[async_trait::async_trait]
+impl<View> RunnableTask for Task<View>
+where
+    View: TxPoolPersistentStorage,
+{
+    async fn run(&mut self, watcher: &mut StateWatcher) -> anyhow::Result<bool> {
+        tokio::select! {
+            biased;
+
+            _ = watcher.while_started() => {
+                return Ok(false)
+            }
+
+            block_result = self.subscriptions.imported_blocks.next() => {
+                if let Some(result) = block_result {
+                    self.import_block(result);
+                    return Ok(true)
+                } else {
+                    return Ok(false)
+                }
+            }
+
+            select_transaction_request = self.subscriptions.borrow_txpool.recv() => {
+                if let Some(select_transaction_request) = select_transaction_request {
+                    self.borrow_txpool(select_transaction_request);
+                    return Ok(true)
+                } else {
+                    return Ok(false)
+                }
+            }
+
+            _ = self.pruner.ttl_timer.tick() => {
+                self.try_prune_transactions();
+                return Ok(true)
+            }
+
+            write_pool_request = self.subscriptions.write_pool.recv() => {
+                if let Some(write_pool_request) = write_pool_request {
+                    self.process_write(write_pool_request);
+                    return Ok(true)
+                } else {
+                    return Ok(false)
+                }
+            }
+
+            tx_from_p2p = self.subscriptions.new_tx.next() => {
+                if let Some(GossipData { data, message_id, peer_id }) = tx_from_p2p {
+                    if let Some(tx) = data {
+                        self.manage_tx_from_p2p(tx, message_id, peer_id);
+                    }
+                    return Ok(true)
+                } else {
+                    return Ok(false)
+                }
+            }
+
+            new_peer_subscribed = self.subscriptions.new_tx_source.next() => {
+                if let Some(peer_id) = new_peer_subscribed {
+                    self.manage_new_peer_subscribed(peer_id);
+                    return Ok(true)
+                } else {
+                    return Ok(false)
+                }
+            }
+
+            read_pool_request = self.subscriptions.read_pool.recv() => {
+                if let Some(read_pool_request) = read_pool_request {
+                    self.process_read(read_pool_request);
+                    return Ok(true)
+                } else {
+                    return Ok(false)
+                }
+            }
+        }
+    }
+
+    async fn shutdown(self) -> anyhow::Result<()> {
+        Ok(())
+    }
+}
+
+impl<View> Task<View>
+where
+    View: TxPoolPersistentStorage,
+{
+    fn import_block(&mut self, result: SharedImportResult) {
+        let new_height = *result.sealed_block.entity.header().height();
+        let executed_transaction = result.tx_status.iter().map(|s| s.id).collect();
+        // We don't want block importer way for us to process the result.
+        drop(result);
+
+        {
+            let mut tx_pool = self.pool.write();
+            tx_pool.remove_transaction(executed_transaction);
+            if !tx_pool.is_empty() {
+                self.shared_state.new_txs_notifier.send_replace(());
+            }
+        }
+
+        {
+            let mut block_height = self.current_height.write();
+            *block_height = new_height;
+        }
+    }
+
+    fn borrow_txpool(&self, request: BorrowTxPoolRequest) {
+        let BorrowTxPoolRequest { response_channel } = request;
+
+        let _ = response_channel.send(BorrowedTxPool(self.pool.clone()));
+    }
+
+    fn process_write(&self, write_pool_request: WritePoolRequest) {
+        match write_pool_request {
+            WritePoolRequest::InsertTxs { transactions } => {
+                self.insert_transactions(transactions);
+            }
+            WritePoolRequest::InsertTx {
+                transaction,
+                response_channel,
+            } => {
+                if let Ok(reservation) = self.transaction_verifier_process.reserve() {
+                    let op = self.insert_transaction(
+                        transaction,
+                        None,
+                        Some(response_channel),
+                    );
+
+                    self.transaction_verifier_process
+                        .spawn_reserved(reservation, op);
+                } else {
+                    tracing::error!("Failed to insert transaction: Out of capacity");
+                    let _ = response_channel.send(Err(Error::ServiceQueueFull));
+                }
+            }
+            WritePoolRequest::RemoveCoinDependents { transactions } => {
+                self.manage_remove_coin_dependents(transactions);
+            }
+        }
+    }
+
+    fn insert_transactions(&self, transactions: Vec<Arc<Transaction>>) {
+        for transaction in transactions {
+            let Ok(reservation) = self.transaction_verifier_process.reserve() else {
+                tracing::error!("Failed to insert transactions: Out of capacity");
+                continue
+            };
+            let op = self.insert_transaction(transaction, None, None);
+
+            self.transaction_verifier_process
+                .spawn_reserved(reservation, op);
+        }
+    }
+
+    fn insert_transaction(
+        &self,
+        transaction: Arc<Transaction>,
+        from_peer_info: Option<GossipsubMessageInfo>,
+        response_channel: Option<oneshot::Sender<Result<(), Error>>>,
+    ) -> impl FnOnce() + Send + 'static {
+        let verification = self.verification.clone();
+        let pool = self.pool.clone();
+        let p2p = self.p2p.clone();
+        let shared_state = self.shared_state.clone();
+        let current_height = self.current_height.clone();
+        let time_txs_submitted = self.pruner.time_txs_submitted.clone();
+        let tx_id = transaction.id(&self.chain_id);
+        let utxo_validation = self.utxo_validation;
+
+        move || {
+            let current_height = *current_height.read();
+
+            // TODO: This should be removed if the checked transactions
+            //  can work with Arc in it
+            //  (see https://github.com/FuelLabs/fuel-vm/issues/831)
+            let transaction = Arc::unwrap_or_clone(transaction);
+
+            let result = verification.perform_all_verifications(
+                transaction,
+                &pool,
+                current_height,
+                utxo_validation,
+            );
+
+            p2p.process_insertion_result(from_peer_info, &result);
+
+            let checked_tx = match result {
+                Ok(checked_tx) => checked_tx,
+                Err(err) => {
+                    if let Some(channel) = response_channel {
+                        let _ = channel.send(Err(err.clone()));
+                    }
+
+                    shared_state.tx_status_sender.send_squeezed_out(tx_id, err);
+                    return
+                }
+            };
+
+            let tx = Arc::new(checked_tx);
+
+            let result = {
+                let mut pool = pool.write();
+                let result = verification.persistent_storage_provider.latest_view();
+
+                match result {
+                    Ok(view) => pool.insert(tx, &view),
+                    Err(err) => Err(Error::Database(format!("{:?}", err))),
+                }
+            };
+
+            let removed_txs = match result {
+                Ok(removed_txs) => {
+                    let submitted_time = SystemTime::now();
+                    time_txs_submitted
+                        .write()
+                        .push_front((submitted_time, tx_id));
+
+                    let duration = submitted_time
+                        .duration_since(SystemTime::UNIX_EPOCH)
+                        .expect("Time can't be less than UNIX EPOCH");
+
+                    shared_state.tx_status_sender.send_submitted(
+                        tx_id,
+                        Tai64::from_unix(duration.as_secs() as i64),
+                    );
+
+                    if let Some(channel) = response_channel {
+                        let _ = channel.send(Ok(()));
+                    }
+                    shared_state.new_txs_notifier.send_replace(());
+
+                    removed_txs
+                }
+                Err(err) => {
+                    if let Some(channel) = response_channel {
+                        let _ = channel.send(Err(err.clone()));
+                    }
+
+                    shared_state.tx_status_sender.send_squeezed_out(tx_id, err);
+                    return
+                }
+            };
+
+            for tx in removed_txs {
+                shared_state.tx_status_sender.send_squeezed_out(
+                    tx.id(),
+                    Error::Removed(RemovedReason::LessWorth(tx.id())),
+                );
+            }
+        }
+    }
+
+    fn manage_remove_coin_dependents(&self, transactions: Vec<(TxId, String)>) {
+        for (tx_id, reason) in transactions {
+            let dependents = self.pool.write().remove_coin_dependents(tx_id);
+
+            for removed_tx in dependents {
+                self.shared_state.tx_status_sender.send_squeezed_out(
+                    removed_tx.id(),
+                    Error::SkippedTransaction(
+                        format!("Parent transaction with {tx_id}, was removed because of the {reason}")
+                    )
+                );
+            }
+        }
+    }
+
+    fn manage_tx_from_p2p(
+        &mut self,
+        tx: Transaction,
+        message_id: Vec<u8>,
+        peer_id: PeerId,
+    ) {
+        let Ok(reservation) = self.transaction_verifier_process.reserve() else {
+            tracing::error!("Failed to insert transaction from P2P: Out of capacity");
+            return;
+        };
+
+        let info = Some(GossipsubMessageInfo {
+            message_id,
+            peer_id,
+        });
+        let op = self.insert_transaction(Arc::new(tx), info, None);
+        self.transaction_verifier_process
+            .spawn_reserved(reservation, op);
+    }
+
+    fn manage_new_peer_subscribed(&mut self, peer_id: PeerId) {
+        // We are not affected if there is too many queued job and we don't manage this peer.
+        let _ = self.p2p_sync_process.try_spawn({
+            let p2p = self.p2p.clone();
+            let pool = self.pool.clone();
+            let txs_insert_sender = self.shared_state.write_pool_requests_sender.clone();
+            async move {
+                let peer_tx_ids = p2p
+                    .request_tx_ids(peer_id.clone())
+                    .await
+                    .inspect_err(|e| {
+                        tracing::error!(
+                            "Failed to gather tx ids from peer {}: {}",
+                            &peer_id,
+                            e
+                        );
+                    })
+                    .unwrap_or_default();
+                if peer_tx_ids.is_empty() {
+                    return;
+                }
+                let tx_ids_to_ask: Vec<TxId> = {
+                    let pool = pool.read();
+                    peer_tx_ids
+                        .into_iter()
+                        .filter(|tx_id| !pool.contains(tx_id))
+                        .collect()
+                };
+
+                if tx_ids_to_ask.is_empty() {
+                    return;
+                }
+
+                let txs: Vec<Arc<Transaction>> = p2p
+                    .request_txs(peer_id.clone(), tx_ids_to_ask)
+                    .await
+                    .inspect_err(|e| {
+                        tracing::error!(
+                            "Failed to gather tx ids from peer {}: {}",
+                            &peer_id,
+                            e
+                        );
+                    })
+                    .unwrap_or_default()
+                    .into_iter()
+                    .flatten()
+                    .map(Arc::new)
+                    .collect();
+
+                if txs.is_empty() {
+                    return;
+                }
+
+                // Verifying and insert them, not a big deal if we fail to insert them
+                let _ = txs_insert_sender
+                    .try_send(WritePoolRequest::InsertTxs { transactions: txs });
+            }
+        });
+    }
+
+    fn try_prune_transactions(&mut self) {
+        let mut txs_to_remove = vec![];
+        {
+            let mut time_txs_submitted = self.pruner.time_txs_submitted.write();
+            let now = SystemTime::now();
+            while let Some((time, _)) = time_txs_submitted.back() {
+                let Ok(duration) = now.duration_since(*time) else {
+                    tracing::error!("Failed to calculate the duration since the transaction was submitted");
+                    return;
+                };
+                if duration < self.pruner.txs_ttl {
+                    break;
+                }
+                // SAFETY: We are removing the last element that we just checked
+                txs_to_remove.push(time_txs_submitted.pop_back().expect("qed").1);
+            }
+        }
+
+        let removed;
+        {
+            let mut pool = self.pool.write();
+            removed = pool.remove_transaction_and_dependents(txs_to_remove);
+        }
+
+        for tx in removed {
+            self.shared_state
+                .tx_status_sender
+                .send_squeezed_out(tx.id(), Error::Removed(RemovedReason::Ttl));
+        }
+    }
+
+    fn process_read(&self, request: ReadPoolRequest) {
+        match request {
+            ReadPoolRequest::GetTxIds {
+                max_txs,
+                response_channel,
+            } => {
+                let tx_ids = {
+                    let pool = self.pool.read();
+                    pool.iter_tx_ids().take(max_txs).copied().collect()
+                };
+                if response_channel.send(tx_ids).is_err() {
+                    tracing::error!(
+                        "Failed to send the result back for `GetTxIds` request"
+                    );
+                }
+            }
+            ReadPoolRequest::GetTxs {
+                tx_ids,
+                response_channel,
+            } => {
+                let txs = {
+                    let pool = self.pool.read();
+                    tx_ids
+                        .into_iter()
+                        .map(|tx_id| {
+                            pool.find_one(&tx_id).map(|stored_data| TxInfo {
+                                tx: stored_data.transaction.clone(),
+                                creation_instant: stored_data.creation_instant,
+                            })
+                        })
+                        .collect()
+                };
+                if response_channel.send(txs).is_err() {
+                    tracing::error!(
+                        "Failed to send the result back for `GetTxs` request"
+                    );
+                }
+            }
+        }
+    }
+}
+
+#[allow(clippy::too_many_arguments)]
+pub fn new_service<
+    P2P,
+    BlockImporter,
+    PSProvider,
+    PSView,
+    ConsensusParamsProvider,
+    GasPriceProvider,
+    WasmChecker,
+>(
+    chain_id: ChainId,
+    config: Config,
+    p2p: P2P,
+    block_importer: BlockImporter,
+    ps_provider: PSProvider,
+    consensus_parameters_provider: ConsensusParamsProvider,
+    current_height: BlockHeight,
+    gas_price_provider: GasPriceProvider,
+    wasm_checker: WasmChecker,
+) -> Service<PSView>
+where
+    P2P: P2PSubscriptions<GossipedTransaction = TransactionGossipData>,
+    P2P: P2PRequests,
+    PSProvider: AtomicView<LatestView = PSView> + 'static,
+    PSView: TxPoolPersistentStorage,
+    ConsensusParamsProvider: ConsensusParametersProvider,
+    GasPriceProvider: GasPriceProviderTrait,
+    WasmChecker: WasmCheckerTrait,
+    BlockImporter: BlockImporterTrait,
+{
+    let mut ttl_timer = tokio::time::interval(config.ttl_check_interval);
+    ttl_timer.set_missed_tick_behavior(MissedTickBehavior::Skip);
+
+    let tx_from_p2p_stream = p2p.gossiped_transaction_events();
+    let new_peers_subscribed_stream = p2p.subscribe_new_peers();
+
+    let (write_pool_requests_sender, write_pool_requests_receiver) = mpsc::channel(
+        config
+            .service_channel_limits
+            .max_pending_write_pool_requests,
+    );
+    let (select_transactions_requests_sender, select_transactions_requests_receiver) =
+        mpsc::channel(1);
+    let (read_pool_requests_sender, read_pool_requests_receiver) =
+        mpsc::channel(config.service_channel_limits.max_pending_read_pool_requests);
+    let tx_status_sender = TxStatusChange::new(
+        config.max_tx_update_subscriptions,
+        // The connection should be closed automatically after the `SqueezedOut` event.
+        // But because of slow/malicious consumers, the subscriber can still be occupied.
+        // We allow the subscriber to receive the event produced by TxPool's TTL.
+        // But we still want to drop subscribers after `2 * TxPool_TTL`.
+        config.max_txs_ttl.saturating_mul(2),
+    );
+    let (new_txs_notifier, _) = watch::channel(());
+
+    let shared_state = SharedState {
+        write_pool_requests_sender,
+        tx_status_sender,
+        select_transactions_requests_sender,
+        read_pool_requests_sender,
+        new_txs_notifier,
+    };
+
+    let subscriptions = Subscriptions {
+        new_tx_source: new_peers_subscribed_stream,
+        new_tx: tx_from_p2p_stream,
+        imported_blocks: block_importer.block_events(),
+        write_pool: write_pool_requests_receiver,
+        borrow_txpool: select_transactions_requests_receiver,
+        read_pool: read_pool_requests_receiver,
+    };
+
+    let verification = Verification {
+        persistent_storage_provider: Arc::new(ps_provider),
+        consensus_parameters_provider: Arc::new(consensus_parameters_provider),
+        gas_price_provider: Arc::new(gas_price_provider),
+        wasm_checker: Arc::new(wasm_checker),
+        memory_pool: MemoryPool::new(),
+    };
+
+    let pruner = TransactionPruner {
+        txs_ttl: config.max_txs_ttl,
+        time_txs_submitted: Arc::new(RwLock::new(VecDeque::new())),
+        ttl_timer,
+    };
+
+    let transaction_verifier_process = SyncProcessor::new(
+        config.heavy_work.number_threads_to_verify_transactions,
+        config.heavy_work.size_of_verification_queue,
+    )
+    .unwrap();
+
+    let p2p_sync_process = AsyncProcessor::new(
+        config.heavy_work.number_threads_p2p_sync,
+        config.heavy_work.size_of_p2p_sync_queue,
+    )
+    .unwrap();
+
+    let utxo_validation = config.utxo_validation;
+    let txpool = Pool::new(
+        GraphStorage::new(GraphConfig {
+            max_txs_chain_count: config.max_txs_chain_count,
+        }),
+        BasicCollisionManager::new(),
+        RatioTipGasSelection::new(),
+        config,
+    );
+
+    Service::new(Task {
+        chain_id,
+        utxo_validation,
+        subscriptions,
+        verification,
+        transaction_verifier_process,
+        p2p_sync_process,
+        pruner,
+        p2p: Arc::new(p2p),
+        current_height: Arc::new(RwLock::new(current_height)),
+        pool: Arc::new(RwLock::new(txpool)),
+        shared_state,
+    })
+}
diff --git a/crates/services/txpool_v2/src/service/memory.rs b/crates/services/txpool_v2/src/service/memory.rs
new file mode 100644
index 00000000000..3df72e0d106
--- /dev/null
+++ b/crates/services/txpool_v2/src/service/memory.rs
@@ -0,0 +1,69 @@
+use core::fmt;
+use fuel_core_types::fuel_vm::interpreter::MemoryInstance;
+use parking_lot::Mutex;
+use std::{
+    mem,
+    sync::Arc,
+};
+
+pub struct MemoryFromPool {
+    pool: MemoryPool,
+    memory: MemoryInstance,
+}
+
+impl Drop for MemoryFromPool {
+    fn drop(&mut self) {
+        self.pool.recycle_raw(mem::take(&mut self.memory));
+    }
+}
+
+impl fmt::Debug for MemoryFromPool {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("MemoryFromPool")
+            .field("memory", &self.memory)
+            .finish()
+    }
+}
+
+impl AsRef<MemoryInstance> for MemoryFromPool {
+    fn as_ref(&self) -> &MemoryInstance {
+        self.memory.as_ref()
+    }
+}
+
+impl AsMut<MemoryInstance> for MemoryFromPool {
+    fn as_mut(&mut self) -> &mut MemoryInstance {
+        self.memory.as_mut()
+    }
+}
+
+#[derive(Clone)]
+pub struct MemoryPool {
+    pool: Arc<Mutex<Vec<MemoryInstance>>>,
+}
+
+impl MemoryPool {
+    pub fn new() -> Self {
+        Self {
+            pool: Arc::new(Mutex::new(Vec::new())),
+        }
+    }
+
+    /// Gets a new raw VM memory instance from the pool.
+    pub fn take_raw(&self) -> MemoryFromPool {
+        let mut pool = self.pool.lock();
+        let memory = pool.pop().unwrap_or_default();
+
+        MemoryFromPool {
+            pool: self.clone(),
+            memory,
+        }
+    }
+
+    /// Adds a new memory instance to the pool.
+    fn recycle_raw(&self, mut mem: MemoryInstance) {
+        mem.reset();
+        let mut pool = self.pool.lock();
+        pool.push(mem);
+    }
+}
diff --git a/crates/services/txpool_v2/src/service/p2p.rs b/crates/services/txpool_v2/src/service/p2p.rs
new file mode 100644
index 00000000000..22e38083e2f
--- /dev/null
+++ b/crates/services/txpool_v2/src/service/p2p.rs
@@ -0,0 +1,56 @@
+use crate::{
+    error::Error,
+    ports::P2PRequests,
+};
+use fuel_core_types::services::{
+    p2p::{
+        GossipsubMessageAcceptance,
+        GossipsubMessageInfo,
+    },
+    txpool::PoolTransaction,
+};
+use std::sync::Arc;
+
+pub trait P2PExt {
+    fn process_insertion_result(
+        &self,
+        from_peer_info: Option<GossipsubMessageInfo>,
+        result: &Result<PoolTransaction, Error>,
+    );
+}
+
+impl P2PExt for Arc<dyn P2PRequests> {
+    fn process_insertion_result(
+        &self,
+        from_peer_info: Option<GossipsubMessageInfo>,
+        result: &Result<PoolTransaction, Error>,
+    ) {
+        if let Some(from_peer_info) = from_peer_info {
+            match &result {
+                Ok(_) => {
+                    let _ = self.notify_gossip_transaction_validity(
+                        from_peer_info,
+                        GossipsubMessageAcceptance::Accept,
+                    );
+                }
+                Err(Error::ConsensusValidity(_)) | Err(Error::MintIsDisallowed) => {
+                    let _ = self.notify_gossip_transaction_validity(
+                        from_peer_info,
+                        GossipsubMessageAcceptance::Reject,
+                    );
+                }
+                Err(_) => {
+                    let _ = self.notify_gossip_transaction_validity(
+                        from_peer_info,
+                        GossipsubMessageAcceptance::Ignore,
+                    );
+                }
+            };
+        } else if let Ok(transaction) = &result {
+            let tx_clone = Arc::new(transaction.into());
+            if let Err(e) = self.broadcast_transaction(tx_clone) {
+                tracing::error!("Failed to broadcast transaction: {}", e);
+            }
+        }
+    }
+}
diff --git a/crates/services/txpool_v2/src/service/pruner.rs b/crates/services/txpool_v2/src/service/pruner.rs
new file mode 100644
index 00000000000..f36aa1b6531
--- /dev/null
+++ b/crates/services/txpool_v2/src/service/pruner.rs
@@ -0,0 +1,12 @@
+use crate::service::Shared;
+use fuel_core_types::fuel_tx::TxId;
+use std::{
+    collections::VecDeque,
+    time::SystemTime,
+};
+
+pub(super) struct TransactionPruner {
+    pub time_txs_submitted: Shared<VecDeque<(SystemTime, TxId)>>,
+    pub ttl_timer: tokio::time::Interval,
+    pub txs_ttl: tokio::time::Duration,
+}
diff --git a/crates/services/txpool_v2/src/service/subscriptions.rs b/crates/services/txpool_v2/src/service/subscriptions.rs
new file mode 100644
index 00000000000..1aff5f6d384
--- /dev/null
+++ b/crates/services/txpool_v2/src/service/subscriptions.rs
@@ -0,0 +1,24 @@
+use crate::service::{
+    BorrowTxPoolRequest,
+    ReadPoolRequest,
+    WritePoolRequest,
+};
+use fuel_core_services::stream::BoxStream;
+use fuel_core_types::services::{
+    block_importer::SharedImportResult,
+    p2p::{
+        PeerId,
+        TransactionGossipData,
+    },
+};
+use tokio::sync::mpsc;
+
+/// Stores all subscriptions for the `TxPool` service.
+pub(super) struct Subscriptions {
+    pub new_tx: BoxStream<TransactionGossipData>,
+    pub new_tx_source: BoxStream<PeerId>,
+    pub imported_blocks: BoxStream<SharedImportResult>,
+    pub borrow_txpool: mpsc::Receiver<BorrowTxPoolRequest>,
+    pub write_pool: mpsc::Receiver<WritePoolRequest>,
+    pub read_pool: mpsc::Receiver<ReadPoolRequest>,
+}
diff --git a/crates/services/txpool_v2/src/service/verifications.rs b/crates/services/txpool_v2/src/service/verifications.rs
new file mode 100644
index 00000000000..f6ece5f0873
--- /dev/null
+++ b/crates/services/txpool_v2/src/service/verifications.rs
@@ -0,0 +1,310 @@
+use crate::{
+    error::Error,
+    ports::{
+        ConsensusParametersProvider,
+        GasPriceProvider,
+        TxPoolPersistentStorage,
+        WasmChecker,
+    },
+    service::{
+        memory::MemoryPool,
+        Shared,
+        TxPool,
+    },
+};
+use fuel_core_storage::transactional::AtomicView;
+use fuel_core_types::{
+    blockchain::header::ConsensusParametersVersion,
+    fuel_asm::Word,
+    fuel_tx::{
+        field::{
+            MaxFeeLimit,
+            UpgradePurpose as _,
+        },
+        ConsensusParameters,
+        Transaction,
+        UpgradePurpose,
+    },
+    fuel_types::BlockHeight,
+    fuel_vm::{
+        checked_transaction::{
+            CheckPredicateParams,
+            CheckPredicates,
+            Checked,
+            CheckedTransaction,
+            Checks,
+            IntoChecked,
+        },
+        interpreter::{
+            ExecutableTransaction,
+            Memory,
+        },
+    },
+    services::txpool::{
+        Metadata,
+        PoolTransaction,
+    },
+};
+use std::sync::Arc;
+
+pub(crate) struct Verification<View> {
+    pub persistent_storage_provider: Arc<dyn AtomicView<LatestView = View>>,
+    pub consensus_parameters_provider: Arc<dyn ConsensusParametersProvider>,
+    pub gas_price_provider: Arc<dyn GasPriceProvider>,
+    pub wasm_checker: Arc<dyn WasmChecker>,
+    pub memory_pool: MemoryPool,
+}
+
+impl<V> Clone for Verification<V> {
+    fn clone(&self) -> Self {
+        Self {
+            persistent_storage_provider: self.persistent_storage_provider.clone(),
+            consensus_parameters_provider: self.consensus_parameters_provider.clone(),
+            gas_price_provider: self.gas_price_provider.clone(),
+            wasm_checker: self.wasm_checker.clone(),
+            memory_pool: self.memory_pool.clone(),
+        }
+    }
+}
+
+impl<View> Verification<View>
+where
+    View: TxPoolPersistentStorage,
+{
+    pub fn perform_all_verifications(
+        &self,
+        tx: Transaction,
+        pool: &Shared<TxPool>,
+        current_height: BlockHeight,
+        utxo_validation: bool,
+    ) -> Result<PoolTransaction, Error> {
+        let (version, consensus_params) = self
+            .consensus_parameters_provider
+            .latest_consensus_parameters();
+
+        let unverified = UnverifiedTx(tx);
+
+        let basically_verified_tx =
+            unverified.perform_basic_verifications(current_height, &consensus_params)?;
+
+        let metadata =
+            calculate_metadata(&basically_verified_tx.0, &consensus_params, version)?;
+
+        let gas_price_verified_tx = basically_verified_tx
+            .perform_gas_price_verifications(
+                metadata,
+                self.gas_price_provider.as_ref(),
+            )?;
+
+        let view = self
+            .persistent_storage_provider
+            .latest_view()
+            .map_err(|e| Error::Database(format!("{:?}", e)))?;
+
+        let inputs_verified_tx =
+            gas_price_verified_tx.perform_inputs_verifications(pool, &view, metadata)?;
+
+        let fully_verified_tx = inputs_verified_tx
+            .perform_input_computation_verifications(
+                &consensus_params,
+                self.wasm_checker.as_ref(),
+                self.memory_pool.take_raw(),
+                &view,
+                utxo_validation,
+            )?;
+
+        fully_verified_tx.into_pool_transaction(metadata)
+    }
+}
+
+#[derive(Debug, Clone, Eq, PartialEq, Hash)]
+pub(super) struct UnverifiedTx(Transaction);
+
+#[derive(Debug, Clone, Eq, PartialEq, Hash)]
+pub(super) struct BasicVerifiedTx(CheckedTransaction);
+
+#[derive(Debug, Clone, Eq, PartialEq, Hash)]
+pub(super) struct GasPriceVerifiedTx(CheckedTransaction);
+
+#[derive(Debug, Clone, Eq, PartialEq, Hash)]
+pub(super) struct InputDependenciesVerifiedTx(Checked<Transaction>);
+
+#[derive(Debug, Clone, Eq, PartialEq, Hash)]
+pub(super) struct FullyVerifiedTx(Checked<Transaction>);
+
+impl UnverifiedTx {
+    pub fn perform_basic_verifications(
+        self,
+        current_height: BlockHeight,
+        consensus_params: &ConsensusParameters,
+    ) -> Result<BasicVerifiedTx, Error> {
+        if self.0.is_mint() {
+            return Err(Error::MintIsDisallowed);
+        }
+
+        let tx = self
+            .0
+            .into_checked_basic(current_height, consensus_params)?;
+
+        Ok(BasicVerifiedTx(tx.into()))
+    }
+}
+
+impl BasicVerifiedTx {
+    pub fn perform_gas_price_verifications(
+        self,
+        metadata: Metadata,
+        gas_price_provider: &dyn GasPriceProvider,
+    ) -> Result<GasPriceVerifiedTx, Error> {
+        let minimal_gas_price = gas_price_provider.next_gas_price();
+        let max_gas_price = metadata.max_gas_price();
+
+        if max_gas_price < minimal_gas_price {
+            return Err(Error::InsufficientMaxFee {
+                max_gas_price_from_fee: max_gas_price,
+                minimal_gas_price,
+            });
+        }
+        Ok(GasPriceVerifiedTx(self.0))
+    }
+}
+
+impl GasPriceVerifiedTx {
+    pub fn perform_inputs_verifications<View>(
+        self,
+        pool: &Shared<TxPool>,
+        view: &View,
+        metadata: Metadata,
+    ) -> Result<InputDependenciesVerifiedTx, Error>
+    where
+        View: TxPoolPersistentStorage,
+    {
+        let pool_tx = checked_tx_into_pool(self.0, metadata)?;
+
+        let transaction = pool
+            .read()
+            .can_insert_transaction(Arc::new(pool_tx), view)?
+            .into_transaction();
+        // SAFETY: We created the arc just above and it's not shared.
+        let transaction =
+            Arc::try_unwrap(transaction).expect("We only the owner of the `Arc`; qed");
+        let checked_transaction: CheckedTransaction = transaction.into();
+        Ok(InputDependenciesVerifiedTx(checked_transaction.into()))
+    }
+}
+
+impl InputDependenciesVerifiedTx {
+    pub fn perform_input_computation_verifications<View>(
+        self,
+        consensus_params: &ConsensusParameters,
+        wasm_checker: &dyn WasmChecker,
+        memory: impl Memory,
+        view: &View,
+        utxo_validation: bool,
+    ) -> Result<FullyVerifiedTx, Error>
+    where
+        View: TxPoolPersistentStorage,
+    {
+        let mut tx = self.0;
+
+        if utxo_validation {
+            tx = tx.check_signatures(&consensus_params.chain_id())?;
+
+            let parameters = CheckPredicateParams::from(consensus_params);
+            tx = tx.check_predicates(&parameters, memory, view)?;
+
+            debug_assert!(tx.checks().contains(Checks::all()));
+        }
+
+        if let Transaction::Upgrade(upgrade) = tx.transaction() {
+            if let UpgradePurpose::StateTransition { root } = upgrade.upgrade_purpose() {
+                wasm_checker
+                    .validate_uploaded_wasm(root)
+                    .map_err(Error::WasmValidity)?;
+            }
+        }
+
+        Ok(FullyVerifiedTx(tx))
+    }
+}
+
+impl FullyVerifiedTx {
+    pub fn into_pool_transaction(
+        self,
+        metadata: Metadata,
+    ) -> Result<PoolTransaction, Error> {
+        checked_tx_into_pool(self.0.into(), metadata)
+    }
+}
+
+fn calculate_metadata(
+    tx: &CheckedTransaction,
+    consensus_params: &ConsensusParameters,
+    version: ConsensusParametersVersion,
+) -> Result<Metadata, Error> {
+    let metadata = match tx {
+        CheckedTransaction::Script(tx) => metadata_for_tx(tx, consensus_params, version),
+        CheckedTransaction::Create(tx) => metadata_for_tx(tx, consensus_params, version),
+        CheckedTransaction::Mint(_) => {
+            return Err(Error::MintIsDisallowed);
+        }
+        CheckedTransaction::Upgrade(tx) => metadata_for_tx(tx, consensus_params, version),
+        CheckedTransaction::Upload(tx) => metadata_for_tx(tx, consensus_params, version),
+        CheckedTransaction::Blob(tx) => metadata_for_tx(tx, consensus_params, version),
+    };
+
+    Ok(metadata)
+}
+
+fn metadata_for_tx<Tx>(
+    tx: &Checked<Tx>,
+    consensus_params: &ConsensusParameters,
+    version: ConsensusParametersVersion,
+) -> Metadata
+where
+    Tx: ExecutableTransaction,
+{
+    // `max_fee_limit` is always set for `Checked<Tx>`
+    //
+    // gas * gas_price / gas_price_factor = fee
+    // gas_price = fee * gas_price_factor / gas
+    // max_gas_price = max_fee * gas_price_factor / max_gas
+    let gas_costs = consensus_params.gas_costs();
+    let fee_parameters = consensus_params.fee_params();
+    let max_gas = tx.transaction().max_gas(gas_costs, fee_parameters) as u128;
+    let gas_price_factor = fee_parameters.gas_price_factor() as u128;
+
+    #[cfg(debug_assertions)]
+    {
+        use fuel_core_types::fuel_tx::policies::PolicyType;
+        let policy = tx.transaction().policies().get(PolicyType::MaxFee);
+        assert!(policy.is_some(), "MaxFee policy is not set");
+    }
+
+    let max_fee = tx.transaction().max_fee_limit() as u128;
+
+    let max_gas_price = max_fee
+        .saturating_mul(gas_price_factor)
+        .div_ceil(max_gas.max(1));
+    let metered_bytes_size = tx.transaction().metered_bytes_size();
+
+    Metadata::new(
+        version,
+        metered_bytes_size,
+        Word::try_from(max_gas_price).unwrap_or(Word::MAX),
+    )
+}
+
+pub fn checked_tx_into_pool(
+    tx: CheckedTransaction,
+    metadata: Metadata,
+) -> Result<PoolTransaction, Error> {
+    match tx {
+        CheckedTransaction::Script(tx) => Ok(PoolTransaction::Script(tx, metadata)),
+        CheckedTransaction::Create(tx) => Ok(PoolTransaction::Create(tx, metadata)),
+        CheckedTransaction::Mint(_) => Err(Error::MintIsDisallowed),
+        CheckedTransaction::Upgrade(tx) => Ok(PoolTransaction::Upgrade(tx, metadata)),
+        CheckedTransaction::Upload(tx) => Ok(PoolTransaction::Upload(tx, metadata)),
+        CheckedTransaction::Blob(tx) => Ok(PoolTransaction::Blob(tx, metadata)),
+    }
+}
diff --git a/crates/services/txpool_v2/src/shared_state.rs b/crates/services/txpool_v2/src/shared_state.rs
new file mode 100644
index 00000000000..a7dbaaf0df1
--- /dev/null
+++ b/crates/services/txpool_v2/src/shared_state.rs
@@ -0,0 +1,181 @@
+use std::sync::Arc;
+
+use anyhow::anyhow;
+use fuel_core_types::{
+    fuel_tx::{
+        Bytes32,
+        Transaction,
+        TxId,
+    },
+    fuel_types::BlockHeight,
+    services::txpool::TransactionStatus,
+};
+use parking_lot::RwLockWriteGuard;
+use tokio::sync::{
+    broadcast,
+    mpsc,
+    oneshot,
+    watch,
+};
+
+use crate::{
+    error::Error,
+    service::{
+        BorrowTxPoolRequest,
+        ReadPoolRequest,
+        Shared,
+        TxInfo,
+        TxPool,
+        WritePoolRequest,
+    },
+    tx_status_stream::{
+        TxStatusMessage,
+        TxStatusStream,
+    },
+    update_sender::{
+        MpscChannel,
+        TxStatusChange,
+    },
+};
+
+pub struct BorrowedTxPool(pub(crate) Shared<TxPool>);
+
+impl BorrowedTxPool {
+    /// Get a write lock on the TxPool.
+    pub fn exclusive_lock(&self) -> RwLockWriteGuard<TxPool> {
+        self.0.write()
+    }
+}
+
+#[derive(Clone)]
+pub struct SharedState {
+    pub(crate) write_pool_requests_sender: mpsc::Sender<WritePoolRequest>,
+    pub(crate) select_transactions_requests_sender: mpsc::Sender<BorrowTxPoolRequest>,
+    pub(crate) read_pool_requests_sender: mpsc::Sender<ReadPoolRequest>,
+    pub(crate) tx_status_sender: TxStatusChange,
+    pub(crate) new_txs_notifier: tokio::sync::watch::Sender<()>,
+}
+
+impl SharedState {
+    pub fn try_insert(&self, transactions: Vec<Transaction>) -> Result<(), Error> {
+        let transactions = transactions.into_iter().map(Arc::new).collect();
+        self.write_pool_requests_sender
+            .try_send(WritePoolRequest::InsertTxs { transactions })
+            .map_err(|_| Error::ServiceQueueFull)?;
+
+        Ok(())
+    }
+
+    pub async fn insert(&self, transaction: Transaction) -> Result<(), Error> {
+        let transaction = Arc::new(transaction);
+        let (sender, receiver) = oneshot::channel();
+
+        self.write_pool_requests_sender
+            .send(WritePoolRequest::InsertTx {
+                transaction,
+                response_channel: sender,
+            })
+            .await
+            .map_err(|_| Error::ServiceCommunicationFailed)?;
+
+        receiver
+            .await
+            .map_err(|_| Error::ServiceCommunicationFailed)?
+    }
+
+    pub async fn borrow_txpool(&self) -> Result<BorrowedTxPool, Error> {
+        let (select_transactions_sender, select_transactions_receiver) =
+            oneshot::channel();
+        self.select_transactions_requests_sender
+            .send(BorrowTxPoolRequest {
+                response_channel: select_transactions_sender,
+            })
+            .await
+            .map_err(|_| Error::ServiceCommunicationFailed)?;
+
+        select_transactions_receiver
+            .await
+            .map_err(|_| Error::ServiceCommunicationFailed)
+    }
+
+    pub async fn get_tx_ids(&self, max_txs: usize) -> Result<Vec<TxId>, Error> {
+        let (result_sender, result_receiver) = oneshot::channel();
+        self.read_pool_requests_sender
+            .send(ReadPoolRequest::GetTxIds {
+                max_txs,
+                response_channel: result_sender,
+            })
+            .await
+            .map_err(|_| Error::ServiceCommunicationFailed)?;
+        result_receiver
+            .await
+            .map_err(|_| Error::ServiceCommunicationFailed)
+    }
+
+    pub async fn find_one(&self, tx_id: TxId) -> Result<Option<TxInfo>, Error> {
+        Ok(self.find(vec![tx_id]).await?.pop().flatten())
+    }
+
+    pub async fn find(&self, tx_ids: Vec<TxId>) -> Result<Vec<Option<TxInfo>>, Error> {
+        let (result_sender, result_receiver) = oneshot::channel();
+        self.read_pool_requests_sender
+            .send(ReadPoolRequest::GetTxs {
+                tx_ids,
+                response_channel: result_sender,
+            })
+            .await
+            .map_err(|_| Error::ServiceCommunicationFailed)?;
+        result_receiver
+            .await
+            .map_err(|_| Error::ServiceCommunicationFailed)
+    }
+
+    /// Get a notifier that is notified when new transactions are added to the pool.
+    pub fn get_new_txs_notifier(&self) -> watch::Receiver<()> {
+        self.new_txs_notifier.subscribe()
+    }
+
+    /// Subscribe to new transaction notifications.
+    pub fn new_tx_notification_subscribe(&self) -> broadcast::Receiver<TxId> {
+        self.tx_status_sender.new_tx_notification_sender.subscribe()
+    }
+
+    /// Subscribe to status updates for a transaction.
+    pub fn tx_update_subscribe(&self, tx_id: Bytes32) -> anyhow::Result<TxStatusStream> {
+        self.tx_status_sender
+            .update_sender
+            .try_subscribe::<MpscChannel>(tx_id)
+            .ok_or(anyhow!("Maximum number of subscriptions reached"))
+    }
+
+    /// Notify the txpool that a transaction was executed and committed to a block.
+    pub fn notify_complete_tx(
+        &self,
+        id: Bytes32,
+        block_height: &BlockHeight,
+        status: TransactionStatus,
+    ) {
+        self.tx_status_sender.send_complete(
+            id,
+            block_height,
+            TxStatusMessage::Status(status),
+        )
+    }
+
+    /// Notify the txpool that some transactions were skipped during block production.
+    /// This is used to update the status of the skipped transactions internally and in subscriptions
+    pub fn notify_skipped_txs(&self, tx_ids_and_reason: Vec<(Bytes32, String)>) {
+        let transactions = tx_ids_and_reason
+            .into_iter()
+            .map(|(tx_id, reason)| {
+                self.tx_status_sender
+                    .send_squeezed_out(tx_id, Error::SkippedTransaction(reason.clone()));
+                (tx_id, reason)
+            })
+            .collect();
+
+        let _ = self
+            .write_pool_requests_sender
+            .try_send(WritePoolRequest::RemoveCoinDependents { transactions });
+    }
+}
diff --git a/crates/services/txpool_v2/src/storage/checked_collision.rs b/crates/services/txpool_v2/src/storage/checked_collision.rs
new file mode 100644
index 00000000000..9c8158d9359
--- /dev/null
+++ b/crates/services/txpool_v2/src/storage/checked_collision.rs
@@ -0,0 +1,45 @@
+use fuel_core_types::services::txpool::ArcPoolTx;
+use std::collections::HashSet;
+
+pub struct CheckedTransaction<StorageIndex> {
+    tx: ArcPoolTx,
+    direct_dependencies: HashSet<StorageIndex>,
+    all_dependencies: HashSet<StorageIndex>,
+}
+
+impl<StorageIndex> CheckedTransaction<StorageIndex> {
+    /// Creates a new checked transactions.
+    ///
+    /// It is a private method called by the `GraphStorage`.
+    pub(super) fn new(
+        tx: ArcPoolTx,
+        direct_dependencies: HashSet<StorageIndex>,
+        all_dependencies: HashSet<StorageIndex>,
+    ) -> Self {
+        Self {
+            tx,
+            direct_dependencies,
+            all_dependencies,
+        }
+    }
+
+    pub fn unpack(self) -> (ArcPoolTx, HashSet<StorageIndex>, HashSet<StorageIndex>) {
+        (self.tx, self.direct_dependencies, self.all_dependencies)
+    }
+}
+
+impl<StorageIndex> super::CheckedTransaction<StorageIndex>
+    for CheckedTransaction<StorageIndex>
+{
+    fn tx(&self) -> &ArcPoolTx {
+        &self.tx
+    }
+
+    fn into_tx(self) -> ArcPoolTx {
+        self.tx
+    }
+
+    fn all_dependencies(&self) -> &HashSet<StorageIndex> {
+        &self.all_dependencies
+    }
+}
diff --git a/crates/services/txpool_v2/src/storage/graph.rs b/crates/services/txpool_v2/src/storage/graph.rs
new file mode 100644
index 00000000000..b3b40575331
--- /dev/null
+++ b/crates/services/txpool_v2/src/storage/graph.rs
@@ -0,0 +1,748 @@
+use std::{
+    collections::{
+        HashMap,
+        HashSet,
+        VecDeque,
+    },
+    time::SystemTime,
+};
+
+use fuel_core_types::{
+    fuel_tx::{
+        input::{
+            coin::{
+                CoinPredicate,
+                CoinSigned,
+            },
+            contract::Contract,
+            message::{
+                MessageCoinPredicate,
+                MessageCoinSigned,
+                MessageDataPredicate,
+                MessageDataSigned,
+            },
+        },
+        ContractId,
+        Input,
+        Output,
+        TxId,
+        UtxoId,
+    },
+    services::txpool::{
+        ArcPoolTx,
+        PoolTransaction,
+    },
+};
+use petgraph::{
+    graph::NodeIndex,
+    prelude::StableDiGraph,
+};
+
+use crate::{
+    error::{
+        DependencyError,
+        Error,
+        InputValidationError,
+    },
+    ports::TxPoolPersistentStorage,
+    selection_algorithms::ratio_tip_gas::RatioTipGasSelectionAlgorithmStorage,
+    storage::checked_collision::CheckedTransaction,
+};
+
+use super::{
+    RemovedTransactions,
+    Storage,
+    StorageData,
+};
+
+pub struct GraphStorage {
+    /// The configuration of the graph
+    config: GraphConfig,
+    /// The graph of transactions
+    graph: StableDiGraph<StorageData, ()>,
+    /// Coins -> Transaction that currently create the UTXO
+    coins_creators: HashMap<UtxoId, NodeIndex>,
+    /// Contract -> Transaction that currently create the contract
+    contracts_creators: HashMap<ContractId, NodeIndex>,
+}
+
+pub struct GraphConfig {
+    /// The maximum number of transactions per dependency chain
+    pub max_txs_chain_count: usize,
+}
+
+impl GraphStorage {
+    /// Create a new graph storage
+    pub fn new(config: GraphConfig) -> Self {
+        Self {
+            config,
+            graph: StableDiGraph::new(),
+            coins_creators: HashMap::new(),
+            contracts_creators: HashMap::new(),
+        }
+    }
+
+    #[cfg(test)]
+    pub fn is_empty(&self) -> bool {
+        self.graph.node_count() == 0
+            && self.coins_creators.is_empty()
+            && self.contracts_creators.is_empty()
+    }
+}
+
+impl GraphStorage {
+    fn reduce_dependencies_cumulative_gas_tip_and_chain_count(
+        &mut self,
+        root_id: NodeIndex,
+        removed_node: &StorageData,
+    ) {
+        let Some(root) = self.graph.node_weight_mut(root_id) else {
+            debug_assert!(false, "Node with id {:?} not found", root_id);
+            return;
+        };
+        root.dependents_cumulative_gas = root
+            .dependents_cumulative_gas
+            .saturating_sub(removed_node.dependents_cumulative_gas);
+        root.dependents_cumulative_tip = root
+            .dependents_cumulative_tip
+            .saturating_sub(removed_node.dependents_cumulative_tip);
+        root.number_dependents_in_chain = root
+            .number_dependents_in_chain
+            .saturating_sub(removed_node.number_dependents_in_chain);
+        root.dependents_cumulative_bytes_size = root
+            .dependents_cumulative_bytes_size
+            .saturating_sub(removed_node.dependents_cumulative_bytes_size);
+
+        debug_assert!(root.dependents_cumulative_gas != 0);
+        debug_assert!(root.number_dependents_in_chain != 0);
+        debug_assert!(root.dependents_cumulative_bytes_size != 0);
+
+        let dependencies: Vec<_> = self.get_direct_dependencies(root_id).collect();
+        for dependency in dependencies {
+            self.reduce_dependencies_cumulative_gas_tip_and_chain_count(
+                dependency,
+                removed_node,
+            );
+        }
+    }
+
+    /// Remove a node and all its dependent sub-graph.
+    /// Edit the data of dependencies transactions accordingly.
+    /// Returns the removed transactions.
+    fn remove_node_and_dependent_sub_graph(
+        &mut self,
+        root_id: NodeIndex,
+    ) -> Vec<StorageData> {
+        self.bfs(root_id)
+    }
+
+    fn bfs(&mut self, root: NodeIndex) -> Vec<StorageData> {
+        // The algorithm heavily rely on the property of not having
+        // diamond dependencies. The `DependentTransactionIsADiamondDeath` error
+        // helps to achieve this property.
+
+        if !self.graph.contains_node(root) {
+            return vec![];
+        }
+
+        let mut queue = VecDeque::new();
+        #[cfg(test)]
+        let mut nodes_in_queue = HashSet::new();
+        let mut result = Vec::new();
+
+        queue.push_back(root);
+        #[cfg(test)]
+        nodes_in_queue.insert(root);
+
+        while let Some(remove) = queue.pop_front() {
+            let dependents: Vec<_> = self.get_direct_dependents(remove).collect();
+            let dependencies: Vec<_> = self.get_direct_dependencies(remove).collect();
+
+            let removed_storage_entry = self.graph.remove_node(remove).expect(
+                "The node should be present in the graph \
+                    since we iterate over it using bfs",
+            );
+            self.clear_cache(&removed_storage_entry);
+
+            for dependent in dependents {
+                queue.push_back(dependent);
+
+                #[cfg(test)]
+                if !nodes_in_queue.insert(dependent) {
+                    panic!("The node is already in the queue for removal. The graph has a cycle.");
+                }
+            }
+
+            for dependency in dependencies {
+                self.reduce_dependencies_cumulative_gas_tip_and_chain_count(
+                    dependency,
+                    &removed_storage_entry,
+                );
+            }
+            result.push(removed_storage_entry);
+        }
+
+        result
+    }
+
+    /// Check if the input has the right data to spend the output present in pool.
+    fn check_if_coin_input_can_spend_output(
+        output: &Output,
+        input: &Input,
+    ) -> Result<(), Error> {
+        if let Input::CoinSigned(CoinSigned {
+            owner,
+            amount,
+            asset_id,
+            ..
+        })
+        | Input::CoinPredicate(CoinPredicate {
+            owner,
+            amount,
+            asset_id,
+            ..
+        }) = input
+        {
+            let i_owner = owner;
+            let i_amount = amount;
+            let i_asset_id = asset_id;
+            match output {
+                Output::Coin {
+                    to,
+                    amount,
+                    asset_id,
+                } => {
+                    if to != i_owner {
+                        return Err(Error::InputValidation(
+                            InputValidationError::NotInsertedIoWrongOwner,
+                        ));
+                    }
+                    if amount != i_amount {
+                        return Err(Error::InputValidation(
+                            InputValidationError::NotInsertedIoWrongAmount,
+                        ));
+                    }
+                    if asset_id != i_asset_id {
+                        return Err(Error::InputValidation(
+                            InputValidationError::NotInsertedIoWrongAssetId,
+                        ));
+                    }
+                }
+                Output::Contract(_) => {
+                    return Err(Error::InputValidation(
+                        InputValidationError::NotInsertedIoContractOutput,
+                    ))
+                }
+                Output::Change { .. } => {
+                    return Err(Error::InputValidation(
+                        InputValidationError::NotInsertedInputDependentOnChangeOrVariable,
+                    ))
+                }
+                Output::Variable { .. } => {
+                    return Err(Error::InputValidation(
+                        InputValidationError::NotInsertedInputDependentOnChangeOrVariable,
+                    ))
+                }
+                Output::ContractCreated { .. } => {
+                    return Err(Error::InputValidation(
+                        InputValidationError::NotInsertedIoContractOutput,
+                    ))
+                }
+            };
+        }
+        Ok(())
+    }
+
+    /// Cache the transaction information in the storage caches.
+    /// This is used to speed up the verification/dependencies searches of the transactions.
+    fn cache_tx_infos(&mut self, tx_id: &TxId, node_id: NodeIndex) {
+        let outputs = self
+            .graph
+            .node_weight(node_id)
+            .expect(
+                "The node should be present in the graph since we added it just before",
+            )
+            .transaction
+            .outputs();
+
+        for (index, output) in outputs.iter().enumerate() {
+            // SAFETY: We deal with CheckedTransaction there which should already check this
+            let index = u16::try_from(index).expect(
+                "The number of outputs in a transaction should be less than `u16::max`",
+            );
+            let utxo_id = UtxoId::new(*tx_id, index);
+            match output {
+                Output::Coin { .. } => {
+                    self.coins_creators.insert(utxo_id, node_id);
+                }
+                Output::ContractCreated { contract_id, .. } => {
+                    self.contracts_creators.insert(*contract_id, node_id);
+                }
+                _ => {}
+            }
+        }
+    }
+
+    /// Clear the caches of the storage when a transaction is removed.
+    fn clear_cache(&mut self, storage_entry: &StorageData) {
+        let outputs = storage_entry.transaction.outputs();
+        let tx_id = storage_entry.transaction.id();
+
+        for (index, output) in outputs.iter().enumerate() {
+            // SAFETY: We deal with CheckedTransaction there which should already check this
+            let index = u16::try_from(index).expect(
+                "The number of outputs in a transaction should be less than `u16::max`",
+            );
+            let utxo_id = UtxoId::new(tx_id, index);
+            match output {
+                Output::Coin { .. } => {
+                    self.coins_creators.remove(&utxo_id);
+                }
+                Output::ContractCreated { contract_id, .. } => {
+                    self.contracts_creators.remove(contract_id);
+                }
+                _ => {}
+            }
+        }
+    }
+
+    fn get_inner(&self, index: &NodeIndex) -> Option<&StorageData> {
+        self.graph.node_weight(*index)
+    }
+
+    fn get_direct_dependents(
+        &self,
+        index: NodeIndex,
+    ) -> impl Iterator<Item = NodeIndex> + '_ {
+        self.graph
+            .neighbors_directed(index, petgraph::Direction::Outgoing)
+    }
+
+    fn get_direct_dependencies(
+        &self,
+        index: NodeIndex,
+    ) -> impl Iterator<Item = NodeIndex> + '_ {
+        self.graph
+            .neighbors_directed(index, petgraph::Direction::Incoming)
+    }
+
+    fn collect_transaction_direct_dependencies(
+        &self,
+        transaction: &PoolTransaction,
+    ) -> Result<HashSet<NodeIndex>, Error> {
+        let mut direct_dependencies = HashSet::new();
+        for input in transaction.inputs() {
+            match input {
+                Input::CoinSigned(CoinSigned { utxo_id, .. })
+                | Input::CoinPredicate(CoinPredicate { utxo_id, .. }) => {
+                    if let Some(node_id) = self.coins_creators.get(utxo_id) {
+                        direct_dependencies.insert(*node_id);
+
+                        if direct_dependencies.len() >= self.config.max_txs_chain_count {
+                            return Err(Error::Dependency(
+                                DependencyError::NotInsertedChainDependencyTooBig,
+                            ));
+                        }
+                    }
+                }
+                Input::MessageCoinSigned(MessageCoinSigned { .. })
+                | Input::MessageCoinPredicate(MessageCoinPredicate { .. })
+                | Input::MessageDataSigned(MessageDataSigned { .. })
+                | Input::MessageDataPredicate(MessageDataPredicate { .. }) => {}
+                Input::Contract(Contract { contract_id, .. }) => {
+                    if let Some(node_id) = self.contracts_creators.get(contract_id) {
+                        direct_dependencies.insert(*node_id);
+
+                        if direct_dependencies.len() >= self.config.max_txs_chain_count {
+                            return Err(Error::Dependency(
+                                DependencyError::NotInsertedChainDependencyTooBig,
+                            ));
+                        }
+                    }
+                }
+            }
+        }
+        Ok(direct_dependencies)
+    }
+
+    fn has_dependent(&self, index: NodeIndex) -> bool {
+        self.get_direct_dependents(index).next().is_some()
+    }
+}
+
+impl Storage for GraphStorage {
+    type StorageIndex = NodeIndex;
+    type CheckedTransaction = CheckedTransaction<Self::StorageIndex>;
+
+    fn store_transaction(
+        &mut self,
+        checked_transaction: Self::CheckedTransaction,
+        creation_instant: SystemTime,
+    ) -> Self::StorageIndex {
+        let (transaction, direct_dependencies, all_dependencies) =
+            checked_transaction.unpack();
+        let tx_id = transaction.id();
+
+        // Add the new transaction to the graph and update the others in consequence
+        let tip = transaction.tip();
+        let gas = transaction.max_gas();
+        let size = transaction.metered_bytes_size();
+
+        // Update the cumulative tip and gas of the dependencies transactions and recursively their dependencies, etc.
+        for node_id in all_dependencies {
+            let Some(node) = self.graph.node_weight_mut(node_id) else {
+                // We got all dependencies from the graph it shouldn't be possible
+                debug_assert!(false, "Node with id {:?} not found", node_id);
+                tracing::warn!("Node with id {:?} not found", node_id);
+                continue
+            };
+
+            node.number_dependents_in_chain =
+                node.number_dependents_in_chain.saturating_add(1);
+            node.dependents_cumulative_tip =
+                node.dependents_cumulative_tip.saturating_add(tip);
+            node.dependents_cumulative_gas =
+                node.dependents_cumulative_gas.saturating_add(gas);
+            node.dependents_cumulative_bytes_size =
+                node.dependents_cumulative_bytes_size.saturating_add(size);
+
+            debug_assert!(node.dependents_cumulative_gas != 0);
+            debug_assert!(node.number_dependents_in_chain != 0);
+            debug_assert!(node.dependents_cumulative_bytes_size != 0);
+        }
+
+        let node = StorageData {
+            dependents_cumulative_tip: tip,
+            dependents_cumulative_gas: gas,
+            dependents_cumulative_bytes_size: size,
+            transaction,
+            creation_instant,
+            number_dependents_in_chain: 1,
+        };
+
+        // Add the transaction to the graph
+        let node_id = self.graph.add_node(node);
+        for dependency in direct_dependencies {
+            debug_assert!(
+                !self.graph.contains_edge(dependency, node_id),
+                "Edge already exists"
+            );
+            self.graph.add_edge(dependency, node_id, ());
+        }
+        debug_assert!(!self.has_dependent(node_id));
+
+        self.cache_tx_infos(&tx_id, node_id);
+
+        node_id
+    }
+
+    fn can_store_transaction(
+        &self,
+        transaction: ArcPoolTx,
+    ) -> Result<Self::CheckedTransaction, Error> {
+        let direct_dependencies =
+            self.collect_transaction_direct_dependencies(&transaction)?;
+
+        let mut all_dependencies = HashSet::new();
+        let mut to_check = direct_dependencies.iter().cloned().collect::<Vec<_>>();
+
+        while let Some(node_id) = to_check.pop() {
+            if all_dependencies.contains(&node_id) {
+                // The graph heavy rely on the property of not having
+                // diamond dependencies. An example of the diamond dependency:
+                //
+                // E - Executable transaction
+                // D - Old dependent transaction
+                // N - New dependent transaction
+                //
+                //      E
+                //     / \
+                //    D   D
+                //     \ /
+                //      N   <- Forbidden to insert
+                //
+                //
+                // The non-diamond dependency example:
+                //
+                //   E   E       E       E
+                //    \ /      / | \     |
+                //     D      D  D  D    |
+                //    / \    / \        / \
+                //   D   D  D   D      D   D
+                return Err(Error::Dependency(
+                    DependencyError::DependentTransactionIsADiamondDeath,
+                ));
+            }
+
+            all_dependencies.insert(node_id);
+
+            if all_dependencies.len() >= self.config.max_txs_chain_count {
+                return Err(Error::Dependency(
+                    DependencyError::NotInsertedChainDependencyTooBig,
+                ));
+            }
+
+            let Some(dependency_node) = self.graph.node_weight(node_id) else {
+                // We got all dependencies from the graph it shouldn't be possible
+                debug_assert!(false, "Node with id {:?} not found", node_id);
+                tracing::warn!("Node with id {:?} not found", node_id);
+                continue
+            };
+
+            if dependency_node.number_dependents_in_chain
+                >= self.config.max_txs_chain_count
+            {
+                return Err(Error::Dependency(
+                    DependencyError::NotInsertedChainDependencyTooBig,
+                ));
+            }
+
+            to_check.extend(self.get_direct_dependencies(node_id));
+        }
+
+        Ok(CheckedTransaction::new(
+            transaction,
+            direct_dependencies,
+            all_dependencies,
+        ))
+    }
+
+    fn get(&self, index: &Self::StorageIndex) -> Option<&StorageData> {
+        self.get_inner(index)
+    }
+
+    fn get_direct_dependents(
+        &self,
+        index: Self::StorageIndex,
+    ) -> impl Iterator<Item = Self::StorageIndex> {
+        self.get_direct_dependents(index)
+    }
+
+    fn has_dependencies(&self, index: &Self::StorageIndex) -> bool {
+        self.get_direct_dependencies(*index).next().is_some()
+    }
+
+    fn validate_inputs(
+        &self,
+        transaction: &PoolTransaction,
+        persistent_storage: &impl TxPoolPersistentStorage,
+        utxo_validation: bool,
+    ) -> Result<(), Error> {
+        for input in transaction.inputs() {
+            match input {
+                // If the utxo is created in the pool, need to check if we don't spend too much (utxo can still be unresolved)
+                // If the utxo_validation is active, we need to check if the utxo exists in the database and is valid
+                Input::CoinSigned(CoinSigned { utxo_id, .. })
+                | Input::CoinPredicate(CoinPredicate { utxo_id, .. }) => {
+                    if let Some(node_id) = self.coins_creators.get(utxo_id) {
+                        let Some(node) = self.graph.node_weight(*node_id) else {
+                            return Err(Error::Storage(format!(
+                                "Node with id {:?} not found",
+                                node_id
+                            )));
+                        };
+                        let output =
+                            &node.transaction.outputs()[utxo_id.output_index() as usize];
+                        Self::check_if_coin_input_can_spend_output(output, input)?;
+                    } else if utxo_validation {
+                        let Some(coin) = persistent_storage
+                            .utxo(utxo_id)
+                            .map_err(|e| Error::Database(format!("{:?}", e)))?
+                        else {
+                            return Err(Error::InputValidation(
+                                InputValidationError::UtxoNotFound(*utxo_id),
+                            ));
+                        };
+                        if !coin.matches_input(input).expect("The input is coin above") {
+                            return Err(Error::InputValidation(
+                                InputValidationError::NotInsertedIoCoinMismatch,
+                            ));
+                        }
+                    }
+                }
+                Input::MessageCoinSigned(MessageCoinSigned { nonce, .. })
+                | Input::MessageCoinPredicate(MessageCoinPredicate { nonce, .. })
+                | Input::MessageDataSigned(MessageDataSigned { nonce, .. })
+                | Input::MessageDataPredicate(MessageDataPredicate { nonce, .. }) => {
+                    // since message id is derived, we don't need to double check all the fields
+                    // Maybe this should be on an other function as it's not a dependency finder but just a test
+                    if utxo_validation {
+                        if let Some(db_message) = persistent_storage
+                            .message(nonce)
+                            .map_err(|e| Error::Database(format!("{:?}", e)))?
+                        {
+                            // verify message id integrity
+                            if !db_message
+                                .matches_input(input)
+                                .expect("Input is a message above")
+                            {
+                                return Err(Error::InputValidation(
+                                    InputValidationError::NotInsertedIoMessageMismatch,
+                                ));
+                            }
+                        } else {
+                            return Err(Error::InputValidation(
+                                InputValidationError::NotInsertedInputMessageUnknown(
+                                    *nonce,
+                                ),
+                            ));
+                        }
+                    }
+                }
+                Input::Contract(Contract { contract_id, .. }) => {
+                    if !self.contracts_creators.contains_key(contract_id)
+                        && !persistent_storage
+                            .contract_exist(contract_id)
+                            .map_err(|e| Error::Database(format!("{:?}", e)))?
+                    {
+                        return Err(Error::InputValidation(
+                            InputValidationError::NotInsertedInputContractDoesNotExist(
+                                *contract_id,
+                            ),
+                        ));
+                    }
+                }
+            }
+        }
+        Ok(())
+    }
+
+    fn remove_transaction_and_dependents_subtree(
+        &mut self,
+        index: Self::StorageIndex,
+    ) -> RemovedTransactions {
+        self.remove_node_and_dependent_sub_graph(index)
+    }
+
+    fn remove_transaction(&mut self, index: Self::StorageIndex) -> Option<StorageData> {
+        self.graph.remove_node(index).inspect(|storage_entry| {
+            self.clear_cache(storage_entry);
+        })
+    }
+}
+
+impl RatioTipGasSelectionAlgorithmStorage for GraphStorage {
+    type StorageIndex = NodeIndex;
+
+    fn get(&self, index: &Self::StorageIndex) -> Option<&StorageData> {
+        self.get_inner(index)
+    }
+
+    fn get_dependents(
+        &self,
+        index: &Self::StorageIndex,
+    ) -> impl Iterator<Item = Self::StorageIndex> {
+        self.get_direct_dependents(*index)
+    }
+
+    fn has_dependencies(&self, index: &Self::StorageIndex) -> bool {
+        self.get_direct_dependencies(*index).next().is_some()
+    }
+
+    fn remove(&mut self, index: &Self::StorageIndex) -> Option<StorageData> {
+        self.graph.remove_node(*index).inspect(|storage_entry| {
+            self.clear_cache(storage_entry);
+        })
+    }
+}
+
+#[allow(clippy::arithmetic_side_effects)]
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::storage::{
+        graph::GraphStorage,
+        StorageData,
+    };
+    use std::ops::Add;
+
+    #[derive(Debug, Clone, PartialEq, Eq, Hash, Default)]
+    struct Resources {
+        gas: u64,
+        tip: u64,
+        bytes: usize,
+        number: usize,
+    }
+
+    impl From<&StorageData> for Resources {
+        fn from(storage_data: &StorageData) -> Self {
+            Self {
+                gas: storage_data.dependents_cumulative_gas,
+                tip: storage_data.dependents_cumulative_tip,
+                bytes: storage_data.dependents_cumulative_bytes_size,
+                number: storage_data.number_dependents_in_chain,
+            }
+        }
+    }
+
+    impl Add for Resources {
+        type Output = Self;
+
+        fn add(self, other: Self) -> Self {
+            Self {
+                gas: self.gas + other.gas,
+                tip: self.tip + other.tip,
+                bytes: self.bytes + other.bytes,
+                number: self.number + other.number,
+            }
+        }
+    }
+
+    impl GraphStorage {
+        pub fn check_integrity(&self) {
+            let source_nodes = self
+                .graph
+                .externals(petgraph::Direction::Incoming)
+                .collect::<Vec<_>>();
+            let mut visited = HashMap::new();
+
+            for source_node in source_nodes {
+                self.integrity_recursions(source_node, &mut visited);
+            }
+        }
+
+        fn integrity_recursions(
+            &self,
+            root: NodeIndex,
+            visited: &mut HashMap<NodeIndex, HashSet<NodeIndex>>,
+        ) -> HashSet<NodeIndex> {
+            if let Some(sub_set) = visited.get(&root) {
+                return sub_set.clone()
+            }
+
+            let root_data = self.graph.node_weight(root).unwrap();
+            let actual_resources = Resources::from(root_data);
+            let mut expected_resources = Resources::default();
+
+            let mut subset = HashSet::new();
+            subset.insert(root);
+
+            for dependent in self.get_direct_dependents(root) {
+                let dependent_subset = self.integrity_recursions(dependent, visited);
+                subset.extend(dependent_subset);
+            }
+
+            for dependent in &subset {
+                let dependent_data = self.graph.node_weight(*dependent).unwrap();
+                let dependent_resources = Resources {
+                    gas: dependent_data.transaction.max_gas(),
+                    tip: dependent_data.transaction.tip(),
+                    bytes: dependent_data.transaction.metered_bytes_size(),
+                    number: 1,
+                };
+                expected_resources = expected_resources + dependent_resources;
+            }
+
+            visited.insert(root, subset.clone());
+
+            if expected_resources != actual_resources {
+                panic!(
+                    "Expected: {:?}, Actual: {:?}, Graph: {:?}",
+                    expected_resources, actual_resources, self.graph
+                );
+            }
+
+            subset
+        }
+    }
+}
diff --git a/crates/services/txpool_v2/src/storage/mod.rs b/crates/services/txpool_v2/src/storage/mod.rs
new file mode 100644
index 00000000000..38686eb6b9b
--- /dev/null
+++ b/crates/services/txpool_v2/src/storage/mod.rs
@@ -0,0 +1,105 @@
+use std::{
+    collections::HashSet,
+    fmt::Debug,
+    hash::Hash,
+    time::SystemTime,
+};
+
+use crate::{
+    error::Error,
+    ports::TxPoolPersistentStorage,
+};
+use fuel_core_types::services::txpool::{
+    ArcPoolTx,
+    PoolTransaction,
+};
+
+pub mod checked_collision;
+pub mod graph;
+
+#[derive(Debug, Clone)]
+pub struct StorageData {
+    /// The transaction.
+    /// We are forced to take an arc here as we need to be able to send a transaction that still exists here to p2p and API.
+    pub transaction: ArcPoolTx,
+    /// The cumulative tip of a transaction and all of its children.
+    pub dependents_cumulative_tip: u64,
+    /// The cumulative gas of a transaction and all of its children.
+    pub dependents_cumulative_gas: u64,
+    /// The cumulative of space used by a transaction and all of its children.
+    pub dependents_cumulative_bytes_size: usize,
+    /// Number of dependents
+    pub number_dependents_in_chain: usize,
+    /// The instant when the transaction was added to the pool.
+    pub creation_instant: SystemTime,
+}
+
+pub type RemovedTransactions = Vec<StorageData>;
+
+pub trait CheckedTransaction<StorageIndex> {
+    /// Returns the underlying transaction.
+    fn tx(&self) -> &ArcPoolTx;
+
+    /// Unwraps the transaction.
+    fn into_tx(self) -> ArcPoolTx;
+
+    /// Returns the list of all dependencies of the transaction.
+    fn all_dependencies(&self) -> &HashSet<StorageIndex>;
+}
+
+/// The storage trait is responsible for storing transactions.
+/// It has to manage somehow the dependencies between transactions.
+pub trait Storage {
+    /// The index type used in the storage and allow other components to reference transactions.
+    type StorageIndex: Copy + Debug + Eq + Hash;
+
+    /// The checked type wraps the transaction inside to show that it was verified by the
+    /// [`store_transaction`] method. Later checked transaction can be passed
+    /// to the [`store_transaction`] method.
+    type CheckedTransaction: CheckedTransaction<Self::StorageIndex>;
+
+    /// Store a transaction in the storage according to the dependencies.
+    /// Returns the index of the stored transaction.
+    fn store_transaction(
+        &mut self,
+        checked_transaction: Self::CheckedTransaction,
+        creation_instant: SystemTime,
+    ) -> Self::StorageIndex;
+
+    /// The function performs checks on the transaction and returns a checked transaction.
+    ///
+    /// [`Self::CheckedTransaction`] is required to call [`Self::store_transaction`].
+    fn can_store_transaction(
+        &self,
+        transaction: ArcPoolTx,
+    ) -> Result<Self::CheckedTransaction, Error>;
+
+    /// Get the storage data by its index.
+    fn get(&self, index: &Self::StorageIndex) -> Option<&StorageData>;
+
+    /// Get direct dependents of a transaction.
+    fn get_direct_dependents(
+        &self,
+        index: Self::StorageIndex,
+    ) -> impl Iterator<Item = Self::StorageIndex>;
+
+    /// Returns `true` if the transaction has dependencies.
+    fn has_dependencies(&self, index: &Self::StorageIndex) -> bool;
+
+    /// Validate inputs of a transaction.
+    fn validate_inputs(
+        &self,
+        transaction: &PoolTransaction,
+        persistent_storage: &impl TxPoolPersistentStorage,
+        utxo_validation: bool,
+    ) -> Result<(), Error>;
+
+    /// Remove a transaction along with its dependents subtree.
+    fn remove_transaction_and_dependents_subtree(
+        &mut self,
+        index: Self::StorageIndex,
+    ) -> RemovedTransactions;
+
+    /// Remove a transaction from the storage.
+    fn remove_transaction(&mut self, index: Self::StorageIndex) -> Option<StorageData>;
+}
diff --git a/crates/services/txpool_v2/src/tests/context.rs b/crates/services/txpool_v2/src/tests/context.rs
new file mode 100644
index 00000000000..0e2bc1711f2
--- /dev/null
+++ b/crates/services/txpool_v2/src/tests/context.rs
@@ -0,0 +1,380 @@
+use std::sync::Arc;
+
+use fuel_core_types::{
+    entities::{
+        coins::coin::{
+            Coin,
+            CompressedCoin,
+        },
+        relayer::message::{
+            Message,
+            MessageV1,
+        },
+    },
+    fuel_asm::op,
+    fuel_crypto::rand::{
+        rngs::StdRng,
+        Rng,
+        SeedableRng,
+    },
+    fuel_tx::{
+        field::Inputs,
+        input::{
+            coin::{
+                CoinPredicate,
+                CoinSigned,
+            },
+            contract::Contract as ContractInput,
+            Input,
+        },
+        ConsensusParameters,
+        Contract,
+        ContractId,
+        Finalizable,
+        Output,
+        Transaction,
+        TransactionBuilder,
+        TxId,
+        UtxoId,
+    },
+    fuel_types::{
+        AssetId,
+        Word,
+    },
+    fuel_vm::{
+        checked_transaction::EstimatePredicates,
+        interpreter::MemoryInstance,
+        predicate::EmptyStorage,
+    },
+};
+use parking_lot::RwLock;
+
+use crate::{
+    collision_manager::basic::BasicCollisionManager,
+    config::Config,
+    error::Error,
+    pool::Pool,
+    selection_algorithms::ratio_tip_gas::RatioTipGasSelection,
+    service::{
+        RemovedTransactions,
+        TxPool,
+    },
+    storage::graph::{
+        GraphConfig,
+        GraphStorage,
+    },
+    tests::mocks::{
+        MockDBProvider,
+        MockDb,
+    },
+    verifications::perform_all_verifications,
+    GasPrice,
+};
+
+use super::mocks::{
+    MockTxPoolGasPrice,
+    MockWasmChecker,
+};
+
+// use some arbitrary large amount, this shouldn't affect the txpool logic except for covering
+// the byte and gas price fees.
+pub const TEST_COIN_AMOUNT: u64 = 100_000_000u64;
+pub const GAS_LIMIT: Word = 100000;
+
+pub struct TestPoolUniverse {
+    mock_db: MockDb,
+    rng: StdRng,
+    pub config: Config,
+    pool: Option<TxPool<MockDBProvider>>,
+}
+
+impl Default for TestPoolUniverse {
+    fn default() -> Self {
+        Self {
+            mock_db: MockDb::default(),
+            rng: StdRng::seed_from_u64(0),
+            config: Default::default(),
+            pool: None,
+        }
+    }
+}
+
+impl TestPoolUniverse {
+    pub fn database_mut(&mut self) -> &mut MockDb {
+        &mut self.mock_db
+    }
+
+    pub fn config(self, config: Config) -> Self {
+        if self.pool.is_some() {
+            panic!("Pool already built");
+        }
+        Self { config, ..self }
+    }
+
+    pub fn build_pool(&mut self) -> TxPool<MockDBProvider> {
+        let pool = Arc::new(RwLock::new(Pool::new(
+            MockDBProvider(self.mock_db.clone()),
+            GraphStorage::new(GraphConfig {
+                max_txs_chain_count: self.config.max_txs_chain_count,
+            }),
+            BasicCollisionManager::new(),
+            RatioTipGasSelection::new(),
+            self.config.clone(),
+        )));
+        self.pool = Some(pool.clone());
+        pool
+    }
+
+    pub fn build_script_transaction(
+        &mut self,
+        inputs: Option<Vec<Input>>,
+        outputs: Option<Vec<Output>>,
+        tip: u64,
+    ) -> Transaction {
+        let mut inputs = inputs.unwrap_or_default();
+        let (_, gas_coin) = self.setup_coin();
+        inputs.push(gas_coin);
+        let outputs = outputs.unwrap_or_default();
+        let mut tx_builder = TransactionBuilder::script(vec![], vec![]);
+        tx_builder.script_gas_limit(GAS_LIMIT);
+        for input in inputs {
+            tx_builder.add_input(input);
+        }
+        for output in outputs {
+            tx_builder.add_output(output);
+        }
+        tx_builder.tip(tip);
+        tx_builder.max_fee_limit(10000);
+        tx_builder.finalize().into()
+    }
+
+    pub async fn verify_and_insert(
+        &mut self,
+        tx: Transaction,
+    ) -> Result<RemovedTransactions, Error> {
+        if let Some(pool) = &self.pool {
+            let tx = perform_all_verifications(
+                tx,
+                pool.clone(),
+                Default::default(),
+                &ConsensusParameters::default(),
+                0,
+                &MockTxPoolGasPrice::new(0),
+                &MockWasmChecker::new(Ok(())),
+                MemoryInstance::new(),
+                MockDb::default(),
+            )
+            .await?;
+            pool.write().insert(tx)
+        } else {
+            panic!("Pool needs to be built first");
+        }
+    }
+
+    pub async fn verify_and_insert_with_gas_price(
+        &mut self,
+        tx: Transaction,
+        gas_price: GasPrice,
+    ) -> Result<RemovedTransactions, Error> {
+        if let Some(pool) = &self.pool {
+            let tx = perform_all_verifications(
+                tx,
+                pool.clone(),
+                Default::default(),
+                &ConsensusParameters::default(),
+                0,
+                &MockTxPoolGasPrice::new(gas_price),
+                &MockWasmChecker::new(Ok(())),
+                MemoryInstance::new(),
+                MockDb::default(),
+            )
+            .await?;
+            pool.write().insert(tx)
+        } else {
+            panic!("Pool needs to be built first");
+        }
+    }
+
+    pub async fn verify_and_insert_with_consensus_params_wasm_checker(
+        &mut self,
+        tx: Transaction,
+        consensus_params: ConsensusParameters,
+        wasm_checker: MockWasmChecker,
+    ) -> Result<RemovedTransactions, Error> {
+        if let Some(pool) = &self.pool {
+            let tx = perform_all_verifications(
+                tx,
+                pool.clone(),
+                Default::default(),
+                &consensus_params,
+                0,
+                &MockTxPoolGasPrice::new(0),
+                &wasm_checker,
+                MemoryInstance::new(),
+                MockDb::default(),
+            )
+            .await?;
+            pool.write().insert(tx)
+        } else {
+            panic!("Pool needs to be built first");
+        }
+    }
+
+    pub fn get_pool(&self) -> TxPool<MockDBProvider> {
+        self.pool.clone().unwrap()
+    }
+
+    pub fn setup_coin(&mut self) -> (Coin, Input) {
+        let input = self.random_predicate(AssetId::BASE, TEST_COIN_AMOUNT, None);
+
+        // add coin to the state
+        let mut coin = CompressedCoin::default();
+        coin.set_owner(*input.input_owner().unwrap());
+        coin.set_amount(TEST_COIN_AMOUNT);
+        coin.set_asset_id(*input.asset_id(&AssetId::BASE).unwrap());
+        let utxo_id = *input.utxo_id().unwrap();
+        self.mock_db
+            .data
+            .lock()
+            .unwrap()
+            .coins
+            .insert(utxo_id, coin.clone());
+        (coin.uncompress(utxo_id), input)
+    }
+
+    pub fn create_output_and_input(&mut self) -> (Output, UnsetInput) {
+        let input = self.random_predicate(AssetId::BASE, 1, None);
+        let output = Output::coin(*input.input_owner().unwrap(), 1, AssetId::BASE);
+        (output, UnsetInput(input))
+    }
+
+    pub fn random_predicate(
+        &mut self,
+        asset_id: AssetId,
+        amount: Word,
+        utxo_id: Option<UtxoId>,
+    ) -> Input {
+        // use predicate inputs to avoid expensive cryptography for signatures
+        let mut predicate_code: Vec<u8> = vec![op::ret(1)].into_iter().collect();
+        // append some randomizing bytes after the predicate has already returned.
+        predicate_code.push(self.rng.gen());
+        let owner = Input::predicate_owner(&predicate_code);
+        Input::coin_predicate(
+            utxo_id.unwrap_or_else(|| self.rng.gen()),
+            owner,
+            amount,
+            asset_id,
+            Default::default(),
+            Default::default(),
+            predicate_code,
+            vec![],
+        )
+        .into_default_estimated()
+    }
+
+    pub fn custom_predicate(
+        &mut self,
+        asset_id: AssetId,
+        amount: Word,
+        code: Vec<u8>,
+        utxo_id: Option<UtxoId>,
+    ) -> Input {
+        let owner = Input::predicate_owner(&code);
+        Input::coin_predicate(
+            utxo_id.unwrap_or_else(|| self.rng.gen()),
+            owner,
+            amount,
+            asset_id,
+            Default::default(),
+            Default::default(),
+            code,
+            vec![],
+        )
+    }
+}
+
+pub fn create_message_predicate_from_message(
+    amount: Word,
+    nonce: u64,
+) -> (Message, Input) {
+    let predicate = vec![op::ret(1)].into_iter().collect::<Vec<u8>>();
+    let message = MessageV1 {
+        sender: Default::default(),
+        recipient: Input::predicate_owner(&predicate),
+        nonce: nonce.into(),
+        amount,
+        data: vec![],
+        da_height: Default::default(),
+    };
+
+    (
+        message.clone().into(),
+        Input::message_coin_predicate(
+            message.sender,
+            Input::predicate_owner(&predicate),
+            message.amount,
+            message.nonce,
+            Default::default(),
+            predicate,
+            Default::default(),
+        )
+        .into_default_estimated(),
+    )
+}
+
+pub fn create_contract_input(
+    tx_id: TxId,
+    output_index: u16,
+    contract_id: ContractId,
+) -> Input {
+    Input::contract(
+        UtxoId::new(tx_id, output_index),
+        Default::default(),
+        Default::default(),
+        Default::default(),
+        contract_id,
+    )
+}
+
+pub fn create_contract_output(contract_id: ContractId) -> Output {
+    Output::contract_created(contract_id, Contract::default_state_root())
+}
+
+pub struct UnsetInput(Input);
+
+impl UnsetInput {
+    pub fn into_input(self, new_utxo_id: UtxoId) -> Input {
+        let mut input = self.0;
+        match &mut input {
+            Input::CoinSigned(CoinSigned { utxo_id, .. })
+            | Input::CoinPredicate(CoinPredicate { utxo_id, .. })
+            | Input::Contract(ContractInput { utxo_id, .. }) => {
+                *utxo_id = new_utxo_id;
+            }
+            _ => {}
+        }
+        input
+    }
+}
+
+pub trait IntoEstimated {
+    #[cfg(test)]
+    fn into_default_estimated(self) -> Self;
+    fn into_estimated(self, params: &ConsensusParameters) -> Self;
+}
+
+impl IntoEstimated for Input {
+    #[cfg(test)]
+    fn into_default_estimated(self) -> Self {
+        self.into_estimated(&Default::default())
+    }
+
+    fn into_estimated(self, params: &ConsensusParameters) -> Self {
+        let mut tx = TransactionBuilder::script(vec![], vec![])
+            .add_input(self)
+            .finalize();
+        let _ =
+            tx.estimate_predicates(&params.into(), MemoryInstance::new(), &EmptyStorage);
+        tx.inputs()[0].clone()
+    }
+}
diff --git a/crates/services/txpool_v2/src/tests/mocks.rs b/crates/services/txpool_v2/src/tests/mocks.rs
new file mode 100644
index 00000000000..1dca65bc9d3
--- /dev/null
+++ b/crates/services/txpool_v2/src/tests/mocks.rs
@@ -0,0 +1,332 @@
+use crate::{
+    ports::{
+        AtomicView,
+        BlockImporter as BlockImporterTrait,
+        ConsensusParametersProvider,
+        GasPriceProvider,
+        NotifyP2P,
+        P2PRequests,
+        P2PSubscriptions,
+        TxPoolPersistentStorage,
+        WasmChecker,
+        WasmValidityError,
+    },
+    GasPrice,
+};
+use fuel_core_services::stream::BoxStream;
+use fuel_core_storage::{
+    Mappable,
+    PredicateStorageRequirements,
+    Result as StorageResult,
+    StorageInspect,
+    StorageRead,
+    StorageSize,
+};
+use fuel_core_types::{
+    blockchain::{
+        header::ConsensusParametersVersion,
+        SealedBlock,
+    },
+    entities::{
+        coins::coin::CompressedCoin,
+        relayer::message::Message,
+    },
+    fuel_tx::{
+        BlobId,
+        Bytes32,
+        ConsensusParameters,
+        Contract,
+        ContractId,
+        Transaction,
+        TxId,
+        UtxoId,
+    },
+    fuel_types::Nonce,
+    fuel_vm::{
+        BlobBytes,
+        BlobData,
+    },
+    services::{
+        block_importer::{
+            ImportResult,
+            SharedImportResult,
+        },
+        p2p::{
+            GossipData,
+            GossipsubMessageAcceptance,
+            GossipsubMessageInfo,
+            PeerId,
+        },
+    },
+};
+use std::{
+    borrow::Cow,
+    collections::HashMap,
+    sync::{
+        Arc,
+        Mutex,
+    },
+};
+
+#[derive(Default)]
+pub struct Data {
+    pub coins: HashMap<UtxoId, CompressedCoin>,
+    pub contracts: HashMap<ContractId, Contract>,
+    pub blobs: HashMap<BlobId, BlobBytes>,
+    pub messages: HashMap<Nonce, Message>,
+}
+
+#[derive(Clone, Default)]
+pub struct MockDb {
+    pub data: Arc<Mutex<Data>>,
+}
+
+impl MockDb {
+    pub fn insert_dummy_blob(&self, blob_id: BlobId) {
+        self.data
+            .lock()
+            .unwrap()
+            .blobs
+            .insert(blob_id, vec![123; 123].into());
+    }
+
+    pub fn insert_message(&self, message: Message) {
+        self.data
+            .lock()
+            .unwrap()
+            .messages
+            .insert(*message.id(), message);
+    }
+}
+
+impl TxPoolPersistentStorage for MockDb {
+    fn utxo(&self, utxo_id: &UtxoId) -> StorageResult<Option<CompressedCoin>> {
+        Ok(self.data.lock().unwrap().coins.get(utxo_id).cloned())
+    }
+
+    fn contract_exist(&self, contract_id: &ContractId) -> StorageResult<bool> {
+        Ok(self
+            .data
+            .lock()
+            .unwrap()
+            .contracts
+            .contains_key(contract_id))
+    }
+
+    fn blob_exist(&self, blob_id: &BlobId) -> StorageResult<bool> {
+        Ok(self.data.lock().unwrap().blobs.contains_key(blob_id))
+    }
+
+    fn message(&self, id: &Nonce) -> StorageResult<Option<Message>> {
+        Ok(self.data.lock().unwrap().messages.get(id).cloned())
+    }
+}
+
+impl StorageRead<BlobData> for MockDb {
+    fn read(
+        &self,
+        key: &<BlobData as Mappable>::Key,
+        buf: &mut [u8],
+    ) -> Result<Option<usize>, Self::Error> {
+        let table = self.data.lock().unwrap();
+        let bytes = table.blobs.get(key);
+
+        let len = bytes.map(|bytes| {
+            buf.copy_from_slice(bytes.0.as_slice());
+            bytes.0.len()
+        });
+        Ok(len)
+    }
+
+    fn read_alloc(
+        &self,
+        key: &<BlobData as Mappable>::Key,
+    ) -> Result<Option<Vec<u8>>, Self::Error> {
+        let table = self.data.lock().unwrap();
+        let bytes = table.blobs.get(key);
+        let bytes = bytes.map(|bytes| bytes.clone().0);
+        Ok(bytes)
+    }
+}
+
+impl StorageInspect<BlobData> for MockDb {
+    type Error = ();
+
+    fn get(
+        &self,
+        key: &<BlobData as Mappable>::Key,
+    ) -> Result<Option<Cow<<BlobData as Mappable>::OwnedValue>>, Self::Error> {
+        let table = self.data.lock().unwrap();
+        let bytes = table.blobs.get(key);
+        Ok(bytes.map(|b| Cow::Owned(b.clone())))
+    }
+
+    fn contains_key(
+        &self,
+        key: &<BlobData as Mappable>::Key,
+    ) -> Result<bool, Self::Error> {
+        Ok(self.data.lock().unwrap().blobs.contains_key(key))
+    }
+}
+
+impl StorageSize<BlobData> for MockDb {
+    fn size_of_value(
+        &self,
+        key: &<BlobData as Mappable>::Key,
+    ) -> Result<Option<usize>, Self::Error> {
+        Ok(self
+            .data
+            .lock()
+            .unwrap()
+            .blobs
+            .get(key)
+            .map(|blob| blob.0.len()))
+    }
+}
+
+impl PredicateStorageRequirements for MockDb {
+    fn storage_error_to_string(error: Self::Error) -> String {
+        format!("{:?}", error)
+    }
+}
+
+#[derive(Clone)]
+pub struct MockDBProvider(pub MockDb);
+
+impl AtomicView for MockDBProvider {
+    type LatestView = MockDb;
+
+    fn latest_view(&self) -> StorageResult<Self::LatestView> {
+        Ok(self.0.clone())
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct MockTxPoolGasPrice {
+    pub gas_price: GasPrice,
+}
+
+impl MockTxPoolGasPrice {
+    pub fn new(gas_price: GasPrice) -> Self {
+        Self { gas_price }
+    }
+}
+
+impl GasPriceProvider for MockTxPoolGasPrice {
+    fn next_gas_price(&self) -> GasPrice {
+        self.gas_price
+    }
+}
+
+pub struct MockWasmChecker {
+    pub result: Result<(), WasmValidityError>,
+}
+
+impl MockWasmChecker {
+    pub fn new(result: Result<(), WasmValidityError>) -> Self {
+        Self { result }
+    }
+}
+
+impl WasmChecker for MockWasmChecker {
+    fn validate_uploaded_wasm(
+        &self,
+        _wasm_root: &Bytes32,
+    ) -> Result<(), WasmValidityError> {
+        self.result
+    }
+}
+
+mockall::mock! {
+    pub ConsensusParametersProvider {}
+
+    impl ConsensusParametersProvider for ConsensusParametersProvider {
+        fn latest_consensus_parameters(&self) -> (ConsensusParametersVersion, Arc<ConsensusParameters>);
+    }
+}
+
+type GossipedTransaction = GossipData<Transaction>;
+
+mockall::mock! {
+    pub P2P {}
+
+    impl P2PSubscriptions for P2P {
+        type GossipedTransaction = GossipedTransaction;
+
+        fn gossiped_transaction_events(&self) -> BoxStream<GossipedTransaction>;
+
+        fn subscribe_new_peers(&self) -> BoxStream<PeerId>;
+    }
+
+    impl NotifyP2P for P2P {
+        fn notify_gossip_transaction_validity(
+            &self,
+            message_info: GossipsubMessageInfo,
+            validity: GossipsubMessageAcceptance,
+        ) -> anyhow::Result<()>;
+
+        fn broadcast_transaction(&self, transaction: Arc<Transaction>) -> anyhow::Result<()>;
+    }
+
+    #[async_trait::async_trait]
+    impl P2PRequests for P2P {
+        async fn request_tx_ids(&self, peer_id: PeerId) -> anyhow::Result<Vec<TxId>>;
+
+        async fn request_txs(
+            &self,
+            peer_id: PeerId,
+            tx_ids: Vec<TxId>,
+        ) -> anyhow::Result<Vec<Option<Transaction>>>;
+    }
+}
+
+impl MockP2P {
+    pub fn new_with_txs(txs: Vec<Transaction>) -> Self {
+        let mut p2p = MockP2P::default();
+        p2p.expect_gossiped_transaction_events().returning(move || {
+            let txs_clone = txs.clone();
+            let stream = fuel_core_services::stream::unfold(txs_clone, |mut txs| async {
+                let tx = txs.pop();
+                if let Some(tx) = tx {
+                    Some((GossipData::new(tx, vec![], vec![]), txs))
+                } else {
+                    core::future::pending().await
+                }
+            });
+            Box::pin(stream)
+        });
+
+        p2p
+    }
+}
+
+mockall::mock! {
+    pub Importer {}
+
+    impl BlockImporterTrait for Importer {
+        fn block_events(&self) -> BoxStream<SharedImportResult>;
+    }
+}
+
+impl MockImporter {
+    pub fn with_blocks(blocks: Vec<SealedBlock>) -> Self {
+        let mut importer = MockImporter::default();
+        importer.expect_block_events().returning(move || {
+            let blocks = blocks.clone();
+            let stream = fuel_core_services::stream::unfold(blocks, |mut blocks| async {
+                let block = blocks.pop();
+                if let Some(sealed_block) = block {
+                    let result: SharedImportResult = Arc::new(
+                        ImportResult::new_from_local(sealed_block, vec![], vec![]),
+                    );
+
+                    Some((result, blocks))
+                } else {
+                    core::future::pending().await
+                }
+            });
+            Box::pin(stream)
+        });
+        importer
+    }
+}
diff --git a/crates/services/txpool_v2/src/tests/mod.rs b/crates/services/txpool_v2/src/tests/mod.rs
new file mode 100644
index 00000000000..982a9034dbb
--- /dev/null
+++ b/crates/services/txpool_v2/src/tests/mod.rs
@@ -0,0 +1,12 @@
+mod mocks;
+mod stability_test;
+mod tests_e2e;
+mod tests_p2p;
+mod tests_permits;
+mod tests_pool;
+mod tests_sending;
+mod tests_service;
+mod tests_subscribe;
+mod tests_update_stream_state;
+mod universe;
+mod utils;
diff --git a/crates/services/txpool_v2/src/tests/stability_test.rs b/crates/services/txpool_v2/src/tests/stability_test.rs
new file mode 100644
index 00000000000..ea7dccdcec3
--- /dev/null
+++ b/crates/services/txpool_v2/src/tests/stability_test.rs
@@ -0,0 +1,382 @@
+//! This module is basically a fuzzer that throws random dependent transactions into the pool.
+//! It checks that TxPool can't panic and that its graph and state are
+//! correct(not in the unexpected state).
+//! It relies on the `debug_assert` which are present in the code.
+
+#![allow(non_snake_case)]
+#![allow(clippy::cast_possible_truncation)]
+#![allow(clippy::arithmetic_side_effects)]
+
+use std::sync::Arc;
+
+use crate::{
+    config::{
+        Config,
+        PoolLimits,
+    },
+    selection_algorithms::Constraints,
+    tests::universe::TestPoolUniverse,
+};
+use fuel_core_types::{
+    fuel_tx::{
+        field::Tip,
+        ConsensusParameters,
+        Finalizable,
+        GasCosts,
+        Input,
+        Output,
+        Script,
+        TransactionBuilder,
+        TxId,
+        UtxoId,
+    },
+    fuel_types::AssetId,
+    fuel_vm::checked_transaction::{
+        Checked,
+        IntoChecked,
+    },
+    services::txpool::{
+        Metadata,
+        PoolTransaction,
+    },
+};
+use rand::{
+    prelude::SliceRandom,
+    rngs::StdRng,
+    Rng,
+    SeedableRng,
+};
+
+#[derive(Debug, Clone, Copy)]
+struct Limits {
+    max_inputs: usize,
+    min_outputs: u16,
+    max_outputs: u16,
+    utxo_id_range: u8,
+    gas_limit_range: u64,
+    max_block_gas: u64,
+}
+
+fn transaction_with_random_inputs_and_outputs(
+    limits: Limits,
+    tip: u64,
+    rng: &mut StdRng,
+) -> (Checked<Script>, Metadata) {
+    const AMOUNT: u64 = 10000;
+
+    let mut consensus_parameters = ConsensusParameters::standard();
+    consensus_parameters.set_gas_costs(GasCosts::free());
+
+    let mut builder = TransactionBuilder::script(vec![], vec![]);
+    builder.with_params(consensus_parameters.clone());
+
+    let mut owner = [0u8; 32];
+    owner[0] = 123;
+    owner[1] = 222;
+    let owner = owner.into();
+
+    let mut random_ids;
+
+    loop {
+        let mut random_ids_unsorted = (0..limits.utxo_id_range)
+            .map(|_| rng.gen_range(0..limits.utxo_id_range))
+            .collect::<Vec<_>>();
+        random_ids_unsorted.sort();
+        random_ids_unsorted.dedup();
+
+        if random_ids_unsorted.len() > 1 {
+            random_ids_unsorted.shuffle(rng);
+            random_ids = random_ids_unsorted;
+            break;
+        }
+    }
+
+    let tx_id_byte = random_ids.pop().expect("No random ids");
+    let tx_id: TxId = [tx_id_byte; 32].into();
+    let max_gas = rng.gen_range(0..limits.gas_limit_range);
+
+    let inputs_count = limits.max_inputs.min(random_ids.len());
+    let inputs_count = if inputs_count == 1 {
+        1
+    } else {
+        rng.gen_range(1..inputs_count)
+    };
+
+    let inputs = random_ids.into_iter().take(inputs_count);
+
+    for input_utxo_id in inputs {
+        let output_index = rng.gen_range(0..limits.max_outputs);
+        let utxo_id = UtxoId::new([input_utxo_id; 32].into(), output_index);
+
+        builder.add_input(Input::coin_signed(
+            utxo_id,
+            owner,
+            AMOUNT,
+            AssetId::BASE,
+            Default::default(),
+            Default::default(),
+        ));
+    }
+
+    // We can't have more outputs than inputs.
+    let outputs = rng
+        .gen_range(limits.min_outputs..limits.max_outputs)
+        .min(inputs_count as u16);
+
+    for _ in 0..outputs {
+        let output = Output::coin(owner, AMOUNT, AssetId::BASE);
+        builder.add_output(output);
+    }
+
+    builder.add_witness(Default::default());
+
+    let mut tx = builder.finalize();
+    tx.set_tip(tip);
+
+    let checked = tx
+        .into_checked_basic(0u32.into(), &consensus_parameters)
+        .unwrap();
+    let metadata = Metadata::new_test(0, Some(max_gas), Some(tx_id));
+
+    (checked, metadata)
+}
+
+fn stability_test(limits: Limits, config: Config) {
+    use rand::RngCore;
+    let seed = rand::thread_rng().next_u64();
+
+    let result = std::panic::catch_unwind(|| {
+        stability_test_with_seed(seed, limits, config);
+    });
+
+    if let Err(err) = result {
+        tracing::error!("Stability test failed with seed: {}; err: {:?}", seed, err);
+        panic!("Stability test failed with seed: {}; err: {:?}", seed, err);
+    }
+}
+
+fn stability_test_with_seed(seed: u64, limits: Limits, config: Config) {
+    let mut rng = StdRng::seed_from_u64(seed);
+
+    let mut errors = 0;
+
+    let mut universe = TestPoolUniverse::default().config(config);
+    universe.build_pool();
+    let txpool = universe.get_pool();
+
+    for tip in 0..ROUNDS_PER_TXPOOL {
+        let (checked, metadata) =
+            transaction_with_random_inputs_and_outputs(limits, tip as u64, &mut rng);
+        let pool_tx = PoolTransaction::Script(checked, metadata);
+
+        let result = txpool
+            .write()
+            .insert(Arc::new(pool_tx), universe.database());
+        errors += result.is_err() as usize;
+
+        if tip % 10 == 0 {
+            txpool.read().storage.check_integrity();
+        }
+    }
+
+    assert_ne!(ROUNDS_PER_TXPOOL, errors);
+
+    loop {
+        let result = txpool.write().extract_transactions_for_block(Constraints {
+            max_gas: limits.max_block_gas,
+            maximum_txs: u16::MAX,
+            maximum_block_size: u32::MAX,
+            minimal_gas_price: 0,
+        });
+
+        if result.is_empty() {
+            break
+        }
+
+        txpool.read().storage.check_integrity();
+    }
+
+    {
+        let txpool = txpool.read();
+        assert_eq!(txpool.current_gas, 0);
+        assert_eq!(txpool.current_bytes_size, 0);
+        assert!(txpool.tx_id_to_storage_id.is_empty());
+        assert!(txpool.selection_algorithm.is_empty());
+        assert!(txpool.storage.is_empty());
+        assert!(txpool.collision_manager.is_empty());
+    }
+}
+
+const ROUNDS_PER_TEST: usize = 10;
+const ROUNDS_PER_TXPOOL: usize = 1500;
+
+#[test]
+fn stability_test__average_transactions() {
+    let config = Config {
+        utxo_validation: false,
+        ..Default::default()
+    };
+
+    let limit = Limits {
+        max_inputs: 4,
+        min_outputs: 1,
+        max_outputs: 4,
+        utxo_id_range: 12,
+        gas_limit_range: 1000,
+        max_block_gas: 10_000,
+    };
+
+    for _ in 0..ROUNDS_PER_TEST {
+        stability_test(limit, config.clone());
+    }
+}
+
+#[test]
+fn stability_test__many_non_conflicting_dependencies() {
+    let config = Config {
+        utxo_validation: false,
+        max_txs_chain_count: 32,
+        ..Default::default()
+    };
+
+    let limit = Limits {
+        max_inputs: 3,
+        min_outputs: 2,
+        max_outputs: 3,
+        utxo_id_range: 128,
+        gas_limit_range: 10_000,
+        max_block_gas: 100_000,
+    };
+
+    for _ in 0..ROUNDS_PER_TEST {
+        stability_test(limit, config.clone());
+    }
+}
+
+#[test]
+fn stability_test__many_dependencies() {
+    let config = Config {
+        utxo_validation: false,
+        ..Default::default()
+    };
+
+    let limit = Limits {
+        max_inputs: 200,
+        min_outputs: 1,
+        max_outputs: 10,
+        utxo_id_range: 255,
+        gas_limit_range: 1_000,
+        max_block_gas: 10_000,
+    };
+
+    for _ in 0..ROUNDS_PER_TEST {
+        stability_test(limit, config.clone());
+    }
+}
+
+#[test]
+fn stability_test__many_conflicting_transactions_with_different_priority() {
+    let config = Config {
+        utxo_validation: false,
+        pool_limits: PoolLimits {
+            max_txs: 32,
+            max_gas: 80_000,
+            max_bytes_size: 1_000_000,
+        },
+        ..Default::default()
+    };
+
+    let limit = Limits {
+        max_inputs: 200,
+        min_outputs: 1,
+        max_outputs: 10,
+        utxo_id_range: 255,
+        gas_limit_range: 10_000,
+        max_block_gas: 10_000,
+    };
+
+    for _ in 0..ROUNDS_PER_TEST {
+        stability_test(limit, config.clone());
+    }
+}
+
+#[test]
+fn stability_test__long_chain_of_transactions() {
+    let config = Config {
+        utxo_validation: false,
+        max_txs_chain_count: 128,
+        pool_limits: PoolLimits {
+            max_txs: 1_000,
+            max_gas: 80_000,
+            max_bytes_size: 1_000_000_000,
+        },
+        ..Default::default()
+    };
+
+    let limit = Limits {
+        max_inputs: 2,
+        min_outputs: 1,
+        max_outputs: 2,
+        utxo_id_range: 255,
+        gas_limit_range: 100,
+        max_block_gas: 10_000,
+    };
+
+    for _ in 0..ROUNDS_PER_TEST {
+        stability_test(limit, config.clone());
+    }
+}
+
+#[test]
+fn stability_test__long_chain_of_transactions_with_conflicts() {
+    let config = Config {
+        utxo_validation: false,
+        max_txs_chain_count: 32,
+        pool_limits: PoolLimits {
+            max_txs: 1_000,
+            max_gas: 80_000,
+            max_bytes_size: 1_000_000_000,
+        },
+        ..Default::default()
+    };
+
+    let limit = Limits {
+        max_inputs: 2,
+        min_outputs: 1,
+        max_outputs: 2,
+        utxo_id_range: 255,
+        gas_limit_range: 10_000,
+        max_block_gas: 10_000,
+    };
+
+    for _ in 0..ROUNDS_PER_TEST {
+        stability_test(limit, config.clone());
+    }
+}
+
+#[test]
+fn stability_test__wide_chain_of_transactions_with_conflicts() {
+    let config = Config {
+        utxo_validation: false,
+        max_txs_chain_count: 32,
+        pool_limits: PoolLimits {
+            max_txs: 1_000,
+            max_gas: 80_000,
+            max_bytes_size: 1_000_000_000,
+        },
+        ..Default::default()
+    };
+
+    let limit = Limits {
+        max_inputs: 5,
+        min_outputs: 1,
+        max_outputs: 5,
+        utxo_id_range: 255,
+        gas_limit_range: 10_000,
+        max_block_gas: 10_000,
+    };
+
+    for _ in 0..ROUNDS_PER_TEST {
+        stability_test(limit, config.clone());
+    }
+}
diff --git a/crates/services/txpool/src/service/update_sender/tests/test_e2e.rs b/crates/services/txpool_v2/src/tests/tests_e2e.rs
similarity index 93%
rename from crates/services/txpool/src/service/update_sender/tests/test_e2e.rs
rename to crates/services/txpool_v2/src/tests/tests_e2e.rs
index 8b07ec3fa74..7f803eec4f2 100644
--- a/crates/services/txpool/src/service/update_sender/tests/test_e2e.rs
+++ b/crates/services/txpool_v2/src/tests/tests_e2e.rs
@@ -4,9 +4,37 @@
 //! The test functions use arbitrary operations to perform
 //! actions such as send, receive, subscribe and drop.
 
+use fuel_core_types::{
+    fuel_tx::Bytes32,
+    services::txpool::TransactionStatus,
+    tai64::Tai64,
+};
+use proptest::prelude::*;
+use test_strategy::{
+    proptest,
+    Arbitrary,
+};
+use tests_sending::validate_send;
+use tokio_stream::StreamExt;
+
 use super::*;
-use crate::service::update_sender::tests::test_sending::validate_send;
-use std::time::Duration;
+use crate::{
+    tx_status_stream::{
+        State,
+        TxStatusMessage,
+        TxStatusStream,
+        TxUpdate,
+    },
+    update_sender::{
+        MpscChannel,
+        SendError,
+        UpdateSender,
+    },
+};
+use std::{
+    collections::HashMap,
+    time::Duration,
+};
 
 const MAX_CHANNELS: usize = 2;
 const MAX_IDS: u8 = 2;
@@ -186,7 +214,7 @@ fn model_subscribe(
         // Add a new receiver to the model.
         model_receivers.push((id, *sender_id, [None, None]));
         // Increment the sender id.
-        *sender_id += 1;
+        *sender_id = sender_id.saturating_add(1);
     }
 }
 
diff --git a/crates/services/txpool/src/service/tests_p2p.rs b/crates/services/txpool_v2/src/tests/tests_p2p.rs
similarity index 73%
rename from crates/services/txpool/src/service/tests_p2p.rs
rename to crates/services/txpool_v2/src/tests/tests_p2p.rs
index 3cfbb1b663c..d8be0a29f30 100644
--- a/crates/services/txpool/src/service/tests_p2p.rs
+++ b/crates/services/txpool_v2/src/tests/tests_p2p.rs
@@ -1,16 +1,4 @@
-use super::*;
-use crate::{
-    service::test_helpers::{
-        MockP2P,
-        TestContextBuilder,
-    },
-    test_helpers::TEST_COIN_AMOUNT,
-};
 use fuel_core_services::Service;
-use fuel_core_storage::rand::{
-    prelude::StdRng,
-    SeedableRng,
-};
 use fuel_core_types::{
     fuel_tx::{
         field::Inputs,
@@ -20,18 +8,42 @@ use fuel_core_types::{
         UniqueIdentifier,
     },
     fuel_types::ChainId,
+    services::{
+        p2p::{
+            GossipsubMessageAcceptance,
+            PeerId,
+        },
+        txpool::TransactionStatus,
+    },
 };
 use std::{
+    future::pending,
     ops::Deref,
+    sync::Arc,
     time::Duration,
 };
-use tokio::sync::Notify;
+use tokio::sync::{
+    broadcast,
+    Notify,
+};
+use tokio_stream::StreamExt;
+
+use crate::{
+    tests::{
+        mocks::MockP2P,
+        universe::{
+            TestPoolUniverse,
+            TEST_COIN_AMOUNT,
+        },
+    },
+    tx_status_stream::TxStatusMessage,
+};
 
 #[tokio::test]
 async fn test_new_subscription_p2p() {
-    let mut ctx_builder = TestContextBuilder::new();
-    let tx1 = ctx_builder.setup_script_tx(10);
-    let tx2 = ctx_builder.setup_script_tx(100);
+    let mut universe = TestPoolUniverse::default();
+    let tx1 = universe.build_script_transaction(None, None, 10);
+    let tx2 = universe.build_script_transaction(None, None, 100);
 
     // Given
     let wait_notification = Arc::new(Notify::new());
@@ -45,7 +57,7 @@ async fn test_new_subscription_p2p() {
             if state == 0 {
                 Some((PeerId::from(vec![1, 2]), state + 1))
             } else {
-                None
+                pending().await
             }
         }))
     });
@@ -73,27 +85,29 @@ async fn test_new_subscription_p2p() {
             notifier.notify_one();
             Ok(vec![Some(tx1_clone), Some(tx2_clone)])
         });
-    ctx_builder.with_p2p(p2p);
-    let ctx = ctx_builder.build();
-    let service = ctx.service();
 
+    let service = universe.build_service(Some(p2p), None);
     service.start_and_await().await.unwrap();
 
     wait_notification.notified().await;
     tokio::time::sleep(Duration::from_millis(1000)).await;
 
     // When
-    let out = service.shared.find(vec![
-        tx1.id(&Default::default()),
-        tx2.id(&Default::default()),
-    ]);
+    let out = service
+        .shared
+        .find(vec![
+            tx1.id(&Default::default()),
+            tx2.id(&Default::default()),
+        ])
+        .await
+        .unwrap();
 
     // Then
     assert_eq!(out.len(), 2, "Should be len 2:{out:?}");
     for (tx_pool, tx_expected) in out.into_iter().zip(&[tx1, tx2]) {
         assert!(tx_pool.is_some(), "Tx should be some:{tx_pool:?}");
         assert_eq!(
-            tx_pool.unwrap().id(),
+            tx_pool.unwrap().tx().id(),
             tx_expected.id(&Default::default()),
             "Found tx id didn't match"
         );
@@ -102,9 +116,9 @@ async fn test_new_subscription_p2p() {
 
 #[tokio::test]
 async fn test_new_subscription_p2p_ask_subset_of_transactions() {
-    let mut ctx_builder = TestContextBuilder::new();
-    let tx1 = ctx_builder.setup_script_tx(10);
-    let tx2 = ctx_builder.setup_script_tx(100);
+    let mut universe = TestPoolUniverse::default();
+    let tx1 = universe.build_script_transaction(None, None, 10);
+    let tx2 = universe.build_script_transaction(None, None, 100);
 
     // Given
     let wait_notification = Arc::new(Notify::new());
@@ -119,7 +133,7 @@ async fn test_new_subscription_p2p_ask_subset_of_transactions() {
             if state == 0 {
                 Some((PeerId::from(vec![1, 2]), state + 1))
             } else {
-                None
+                pending().await
             }
         }))
     });
@@ -140,24 +154,34 @@ async fn test_new_subscription_p2p_ask_subset_of_transactions() {
             notifier.notify_one();
             Ok(vec![Some(tx2_clone)])
         });
-    ctx_builder.with_p2p(p2p);
-    let ctx = ctx_builder.build();
-    let service = ctx.service();
+
+    let service = universe.build_service(Some(p2p), None);
 
     service.start_and_await().await.unwrap();
-    service.shared.insert(vec![Arc::new(tx1.clone())]).await;
+    service.shared.try_insert(vec![tx1.clone()]).unwrap();
+
+    universe
+        .waiting_txs_insertion(
+            service.shared.new_tx_notification_subscribe(),
+            vec![tx1.id(&Default::default())],
+        )
+        .await;
 
     wait_notification.notified().await;
     tokio::time::sleep(Duration::from_millis(1000)).await;
-    let out = service.shared.find(vec![
-        tx1.id(&Default::default()),
-        tx2.id(&Default::default()),
-    ]);
+    let out = service
+        .shared
+        .find(vec![
+            tx1.id(&Default::default()),
+            tx2.id(&Default::default()),
+        ])
+        .await
+        .unwrap();
     assert_eq!(out.len(), 2, "Should be len 2:{out:?}");
     for (tx_pool, tx_expected) in out.into_iter().zip(&[tx1, tx2]) {
         assert!(tx_pool.is_some(), "Tx should be some:{tx_pool:?}");
         assert_eq!(
-            tx_pool.unwrap().id(),
+            tx_pool.unwrap().tx().id(),
             tx_expected.id(&Default::default()),
             "Found tx id didn't match"
         );
@@ -166,14 +190,12 @@ async fn test_new_subscription_p2p_ask_subset_of_transactions() {
 
 #[tokio::test]
 async fn can_insert_from_p2p() {
-    let mut ctx_builder = TestContextBuilder::new();
-    let tx1 = ctx_builder.setup_script_tx(10);
+    let mut universe = TestPoolUniverse::default();
+    let tx1 = universe.build_script_transaction(None, None, 10);
 
     let p2p = MockP2P::new_with_txs(vec![tx1.clone()]);
-    ctx_builder.with_p2p(p2p);
+    let service = universe.build_service(Some(p2p), None);
 
-    let ctx = ctx_builder.build();
-    let service = ctx.service();
     let mut receiver = service
         .shared
         .tx_update_subscribe(tx1.id(&Default::default()))
@@ -188,7 +210,11 @@ async fn can_insert_from_p2p() {
     ));
 
     // fetch tx from pool
-    let out = service.shared.find(vec![tx1.id(&Default::default())]);
+    let out = service
+        .shared
+        .find(vec![tx1.id(&Default::default())])
+        .await
+        .unwrap();
 
     let got_tx: Transaction = out[0].as_ref().unwrap().tx().clone().deref().into();
     assert_eq!(tx1, got_tx);
@@ -197,9 +223,8 @@ async fn can_insert_from_p2p() {
 #[tokio::test]
 async fn insert_from_local_broadcasts_to_p2p() {
     // setup initial state
-    let mut ctx_builder = TestContextBuilder::new();
-    // add coin to builder db and generate a valid tx
-    let tx1 = ctx_builder.setup_script_tx(10);
+    let mut universe = TestPoolUniverse::default();
+    let tx1 = universe.build_script_transaction(None, None, 10);
 
     let mut p2p = MockP2P::new_with_txs(vec![]);
     let mock_tx1 = tx1.clone();
@@ -208,47 +233,40 @@ async fn insert_from_local_broadcasts_to_p2p() {
         .times(1)
         .returning(|_| Ok(()));
 
-    ctx_builder.with_p2p(p2p);
     // build and start the txpool service
-    let ctx = ctx_builder.build_and_start().await;
+    let service = universe.build_service(Some(p2p), None);
+    service.start_and_await().await.unwrap();
 
-    let service = ctx.service();
     let mut new_tx_notification = service.shared.new_tx_notification_subscribe();
     let mut subscribe_update = service
         .shared
         .tx_update_subscribe(tx1.cached_id().unwrap())
         .unwrap();
 
-    let out = service.shared.insert(vec![Arc::new(tx1.clone())]).await;
-
-    if out[0].is_ok() {
-        // we are sure that included tx are already broadcasted.
+    service.shared.insert(tx1.clone()).await.unwrap();
 
-        // verify status updates
-        assert_eq!(
-            new_tx_notification.try_recv(),
-            Ok(tx1.cached_id().unwrap()),
-            "First added should be tx1"
-        );
-        let update = subscribe_update.next().await;
-        assert!(
-            matches!(
-                update,
-                Some(TxStatusMessage::Status(TransactionStatus::Submitted { .. }))
-            ),
-            "Got {:?}",
-            update
-        );
-    } else {
-        panic!("Tx1 should be OK, got err");
-    }
+    // verify status updates
+    assert_eq!(
+        new_tx_notification.recv().await,
+        Ok(tx1.cached_id().unwrap()),
+        "First added should be tx1"
+    );
+    let update = subscribe_update.next().await;
+    assert!(
+        matches!(
+            update,
+            Some(TxStatusMessage::Status(TransactionStatus::Submitted { .. }))
+        ),
+        "Got {:?}",
+        update
+    );
 }
 
 #[tokio::test]
 async fn test_insert_from_p2p_does_not_broadcast_to_p2p() {
-    let mut ctx_builder = TestContextBuilder::new();
-    // add coin to builder db and generate a valid tx
-    let tx1 = ctx_builder.setup_script_tx(10);
+    let mut universe = TestPoolUniverse::default();
+    let tx1 = universe.build_script_transaction(None, None, 10);
+
     // setup p2p mock - with tx incoming from p2p
     let txs = vec![tx1.clone()];
     let mut p2p = MockP2P::new_with_txs(txs);
@@ -257,17 +275,17 @@ async fn test_insert_from_p2p_does_not_broadcast_to_p2p() {
         send.send(()).unwrap();
         Ok(())
     });
-    ctx_builder.with_p2p(p2p);
 
-    // build and start the txpool service
-    let ctx = ctx_builder.build();
-    let service = ctx.service();
+    // build txpool service
+    let service = universe.build_service(Some(p2p), None);
+
     // verify tx status update from p2p injected tx is successful
     let mut receiver = service
         .shared
         .tx_update_subscribe(tx1.id(&Default::default()))
         .unwrap();
 
+    // start the service
     service.start_and_await().await.unwrap();
 
     let res = receiver.next().await;
@@ -288,10 +306,9 @@ async fn test_insert_from_p2p_does_not_broadcast_to_p2p() {
 #[tokio::test]
 async fn test_gossipped_transaction_with_check_error_rejected() {
     // verify that gossipped transactions which fail basic sanity checks are rejected (punished)
+    let mut universe = TestPoolUniverse::default();
+    let mut tx1 = universe.build_script_transaction(None, None, 10);
 
-    let mut ctx_builder = TestContextBuilder::new();
-    // add coin to builder db and generate a valid tx
-    let mut tx1 = ctx_builder.setup_script_tx(10);
     // now intentionally muck up the tx such that it will return a CheckError,
     // by duplicating an input
     let script = tx1.as_script_mut().unwrap();
@@ -309,11 +326,9 @@ async fn test_gossipped_transaction_with_check_error_rejected() {
             send.send(()).unwrap();
             Ok(())
         });
-    ctx_builder.with_p2p(p2p);
 
     // build and start the txpool service
-    let ctx = ctx_builder.build();
-    let service = ctx.service();
+    let service = universe.build_service(Some(p2p), None);
     service.start_and_await().await.unwrap();
     // verify p2p was notified about the transaction validity
     let gossip_validity_notified =
@@ -326,6 +341,7 @@ async fn test_gossipped_transaction_with_check_error_rejected() {
 
 #[tokio::test]
 async fn test_gossipped_mint_rejected() {
+    let universe = TestPoolUniverse::default();
     // verify that gossipped mint transactions are rejected (punished)
     let tx1 = TransactionBuilder::mint(
         0u32.into(),
@@ -349,13 +365,9 @@ async fn test_gossipped_mint_rejected() {
             send.send(()).unwrap();
             Ok(())
         });
-    // setup test context
-    let mut ctx_builder = TestContextBuilder::new();
-    ctx_builder.with_p2p(p2p);
 
     // build and start the txpool service
-    let ctx = ctx_builder.build();
-    let service = ctx.service();
+    let service = universe.build_service(Some(p2p), None);
     service.start_and_await().await.unwrap();
     // verify p2p was notified about the transaction validity
     let gossip_validity_notified =
@@ -369,19 +381,13 @@ async fn test_gossipped_mint_rejected() {
 #[tokio::test]
 async fn test_gossipped_transaction_with_transient_error_ignored() {
     // verify that gossipped transactions that fails stateful checks are ignored (but not punished)
-    let mut rng = StdRng::seed_from_u64(100);
-    let mut ctx_builder = TestContextBuilder::new();
+    let mut universe = TestPoolUniverse::default();
     // add coin to builder db and generate a valid tx
-    let mut tx1 = ctx_builder.setup_script_tx(10);
-    // now intentionally muck up the tx such that it will return a coin not found error
-    // by replacing the default coin with one that is not in the database
-    let script = tx1.as_script_mut().unwrap();
-    script.inputs_mut()[0] = crate::test_helpers::random_predicate(
-        &mut rng,
-        AssetId::BASE,
-        TEST_COIN_AMOUNT,
-        None,
-    );
+    // intentionally muck up the tx such that it will return a coin not found error
+    // by adding an input that doesn't exist in the builder db
+    let bad_input = universe.random_predicate(AssetId::BASE, TEST_COIN_AMOUNT, None);
+    let tx1 = universe.build_script_transaction(Some(vec![bad_input]), None, 10);
+
     // setup p2p mock - with tx incoming from p2p
     let txs = vec![tx1.clone()];
     let mut p2p = MockP2P::new_with_txs(txs);
@@ -394,11 +400,9 @@ async fn test_gossipped_transaction_with_transient_error_ignored() {
             send.send(()).unwrap();
             Ok(())
         });
-    ctx_builder.with_p2p(p2p);
 
     // build and start the txpool service
-    let ctx = ctx_builder.build();
-    let service = ctx.service();
+    let service = universe.build_service(Some(p2p), None);
     service.start_and_await().await.unwrap();
     // verify p2p was notified about the transaction validity
     let gossip_validity_notified =
@@ -406,5 +410,6 @@ async fn test_gossipped_transaction_with_transient_error_ignored() {
     assert!(
         gossip_validity_notified.is_ok(),
         "expected to receive gossip validity notification"
-    )
+    );
+    service.stop_and_await().await.unwrap();
 }
diff --git a/crates/services/txpool/src/service/update_sender/tests/test_permits.rs b/crates/services/txpool_v2/src/tests/tests_permits.rs
similarity index 87%
rename from crates/services/txpool/src/service/update_sender/tests/test_permits.rs
rename to crates/services/txpool_v2/src/tests/tests_permits.rs
index 2b418818d92..b2feb9f5e01 100644
--- a/crates/services/txpool/src/service/update_sender/tests/test_permits.rs
+++ b/crates/services/txpool_v2/src/tests/tests_permits.rs
@@ -1,15 +1,31 @@
-use crate::service::update_sender::tests::utils::{
-    box_senders,
-    MockCreateChannel,
+use std::{
+    collections::HashMap,
+    sync::Arc,
+    time::Duration,
 };
 
-use super::{
-    utils::{
+use fuel_core_types::fuel_tx::Bytes32;
+use parking_lot::lock_api::Mutex;
+use test_strategy::proptest;
+use tokio::time::Instant;
+
+use crate::{
+    tests::utils::{
+        box_senders,
         construct_senders,
         senders_strategy_all_ok,
+        MockCreateChannel,
         SenderData,
     },
-    *,
+    update_sender::{
+        MockSendStatus,
+        Permit,
+        PermitTrait,
+        Permits,
+        SendStatus,
+        Sender,
+        UpdateSender,
+    },
 };
 
 impl PermitTrait for Arc<usize> {}
diff --git a/crates/services/txpool_v2/src/tests/tests_pool.rs b/crates/services/txpool_v2/src/tests/tests_pool.rs
new file mode 100644
index 00000000000..358143cf09a
--- /dev/null
+++ b/crates/services/txpool_v2/src/tests/tests_pool.rs
@@ -0,0 +1,1269 @@
+#![allow(non_snake_case)]
+
+use crate::{
+    config::{
+        Config,
+        PoolLimits,
+    },
+    error::{
+        BlacklistedError,
+        CollisionReason,
+        DependencyError,
+        Error,
+        InputValidationError,
+    },
+    ports::WasmValidityError,
+    selection_algorithms::Constraints,
+    tests::{
+        mocks::MockWasmChecker,
+        universe::{
+            create_contract_input,
+            create_contract_output,
+            create_message_predicate_from_message,
+            IntoEstimated,
+            TestPoolUniverse,
+            GAS_LIMIT,
+            TEST_COIN_AMOUNT,
+        },
+    },
+};
+use fuel_core_types::{
+    fuel_asm::{
+        op,
+        RegId,
+    },
+    fuel_tx::{
+        input::coin::CoinPredicate,
+        Address,
+        AssetId,
+        BlobBody,
+        BlobId,
+        BlobIdExt,
+        Bytes32,
+        Chargeable,
+        ConsensusParameters,
+        Contract,
+        Input,
+        Output,
+        PanicReason,
+        PredicateParameters,
+        TransactionBuilder,
+        TxParameters,
+        UniqueIdentifier,
+        UpgradePurpose,
+        UtxoId,
+        ValidityError,
+    },
+    fuel_types::ChainId,
+    fuel_vm::{
+        checked_transaction::{
+            CheckError,
+            CheckedTransaction,
+            IntoChecked,
+        },
+        PredicateVerificationFailed,
+    },
+};
+
+#[test]
+fn insert_one_tx_succeeds() {
+    let mut universe = TestPoolUniverse::default();
+    universe.build_pool();
+
+    // Given
+    let tx = universe.build_script_transaction(None, None, 0);
+
+    // When
+    let result = universe.verify_and_insert(tx);
+
+    // Then
+    assert!(result.is_ok());
+}
+
+#[test]
+fn insert__tx_with_blacklisted_utxo_id() {
+    let mut universe = TestPoolUniverse::default();
+
+    // Given
+    let coin = universe.setup_coin().1;
+    let utxo_id = *coin.utxo_id().unwrap();
+    universe.config.black_list.coins.insert(utxo_id);
+    universe.build_pool();
+    let tx = universe.build_script_transaction(Some(vec![coin]), None, 0);
+
+    // When
+    let err = universe.verify_and_insert(tx).unwrap_err();
+
+    // Then
+    assert!(
+        matches!(err, Error::Blacklisted(BlacklistedError::BlacklistedUTXO(id)) if id == utxo_id)
+    );
+}
+
+#[test]
+fn insert__tx_with_blacklisted_owner() {
+    let mut universe = TestPoolUniverse::default();
+
+    // Given
+    let coin = universe.setup_coin().1;
+    let owner_addr = *coin.input_owner().unwrap();
+    universe.config.black_list.owners.insert(owner_addr);
+    universe.build_pool();
+    let tx = universe.build_script_transaction(Some(vec![coin]), None, 0);
+
+    // When
+    let err = universe.verify_and_insert(tx).unwrap_err();
+
+    // Then
+    assert!(
+        matches!(err, Error::Blacklisted(BlacklistedError::BlacklistedOwner(id)) if id == owner_addr)
+    );
+}
+
+#[test]
+fn insert__tx_with_blacklisted_contract() {
+    let mut universe = TestPoolUniverse::default();
+    let contract_id = Contract::EMPTY_CONTRACT_ID;
+
+    // Given
+    universe.config.black_list.contracts.insert(contract_id);
+    universe.build_pool();
+    let tx = universe.build_script_transaction(
+        Some(vec![create_contract_input(
+            Default::default(),
+            Default::default(),
+            contract_id,
+        )]),
+        Some(vec![Output::contract(
+            0,
+            Default::default(),
+            Default::default(),
+        )]),
+        0,
+    );
+
+    // When
+    let err = universe.verify_and_insert(tx).unwrap_err();
+
+    // Then
+    assert!(
+        matches!(err, Error::Blacklisted(BlacklistedError::BlacklistedContract(id)) if id == contract_id)
+    );
+}
+
+#[test]
+fn insert__tx_with_blacklisted_message() {
+    let mut universe = TestPoolUniverse::default();
+
+    // Given
+    let (message, input) = create_message_predicate_from_message(5000, 0);
+    let nonce = *message.nonce();
+    universe.config.black_list.messages.insert(nonce);
+    universe.build_pool();
+    let tx = universe.build_script_transaction(Some(vec![input]), None, 0);
+
+    // When
+    let err = universe.verify_and_insert(tx).unwrap_err();
+
+    // Then
+    assert!(
+        matches!(err, Error::Blacklisted(BlacklistedError::BlacklistedMessage(id)) if id == nonce)
+    );
+}
+
+#[test]
+fn insert__tx2_succeeds_after_dependent_tx1() {
+    let mut universe = TestPoolUniverse::default();
+    universe.build_pool();
+
+    // Given
+    let (output, unset_input) = universe.create_output_and_input();
+    let tx1 = universe.build_script_transaction(None, Some(vec![output]), 0);
+
+    let input = unset_input.into_input(UtxoId::new(tx1.id(&ChainId::default()), 0));
+    let tx2 = universe.build_script_transaction(Some(vec![input]), None, 0);
+
+    // When
+    let result1 = universe.verify_and_insert(tx1);
+    let result2 = universe.verify_and_insert(tx2);
+
+    // Then
+    assert!(result1.is_ok());
+    assert!(result2.is_ok());
+}
+
+#[test]
+fn insert__tx2_collided_on_contract_id() {
+    let mut universe = TestPoolUniverse::default();
+    universe.build_pool();
+
+    let contract_id = Contract::EMPTY_CONTRACT_ID;
+
+    // contract creation tx
+    let (_, gas_coin) = universe.setup_coin();
+    let tx = TransactionBuilder::create(
+        Default::default(),
+        Default::default(),
+        Default::default(),
+    )
+    .tip(10)
+    .max_fee_limit(10)
+    .add_input(gas_coin)
+    .add_output(create_contract_output(contract_id))
+    .finalize_as_transaction();
+
+    let (_, gas_coin) = universe.setup_coin();
+
+    // Given
+    // attempt to insert a different creation tx with a valid dependency on the first tx,
+    // but with a conflicting output contract id
+    let tx_faulty = TransactionBuilder::create(
+        Default::default(),
+        Default::default(),
+        Default::default(),
+    )
+    .tip(9)
+    .max_fee_limit(9)
+    .add_input(gas_coin)
+    .add_output(create_contract_output(contract_id))
+    .finalize_as_transaction();
+    universe.verify_and_insert(tx).unwrap();
+
+    // When
+    let result2 = universe.verify_and_insert(tx_faulty);
+
+    // Then
+    let err = result2.unwrap_err();
+    assert!(
+        matches!(err, Error::Collided(CollisionReason::ContractCreation(id)) if id == contract_id)
+    );
+}
+
+#[test]
+fn insert__tx_with_dependency_on_invalid_utxo_type() {
+    let mut universe = TestPoolUniverse::default();
+    universe.build_pool();
+    let contract_id = Contract::EMPTY_CONTRACT_ID;
+
+    let gas_coin = universe.setup_coin().1;
+    let tx = TransactionBuilder::create(
+        Default::default(),
+        Default::default(),
+        Default::default(),
+    )
+    .add_input(gas_coin)
+    .add_output(create_contract_output(contract_id))
+    .finalize_as_transaction();
+    let utxo_id = UtxoId::new(tx.id(&Default::default()), 0);
+
+    // Given
+    // create a second transaction with utxo id referring to
+    // the wrong type of utxo (contract instead of coin)
+    let random_predicate =
+        universe.random_predicate(AssetId::BASE, TEST_COIN_AMOUNT, Some(utxo_id));
+    let tx_faulty =
+        universe.build_script_transaction(Some(vec![random_predicate]), None, 0);
+    universe.verify_and_insert(tx).unwrap();
+
+    // When
+    let result2 = universe.verify_and_insert(tx_faulty);
+
+    // Then
+    let err = result2.unwrap_err();
+
+    assert!(
+        matches!(err, Error::InputValidation(InputValidationError::UtxoNotFound(id)) if id == utxo_id)
+    );
+}
+
+#[test]
+fn insert__already_known_tx_returns_error() {
+    let mut universe = TestPoolUniverse::default().config(Config {
+        utxo_validation: false,
+        ..Default::default()
+    });
+    universe.build_pool();
+
+    // Given
+    let tx = universe.build_script_transaction(None, None, 0);
+    universe.verify_and_insert(tx.clone()).unwrap();
+
+    // When
+    let result2 = universe.verify_and_insert(tx.clone());
+
+    // Then
+    let err = result2.unwrap_err();
+    assert!(
+        matches!(err, Error::InputValidation(InputValidationError::DuplicateTxId(id)) if id == tx.id(&ChainId::default()))
+    );
+}
+
+#[test]
+fn insert__unknown_utxo_returns_error() {
+    let mut universe = TestPoolUniverse::default();
+    universe.build_pool();
+
+    // Given
+    let input = universe.random_predicate(AssetId::BASE, TEST_COIN_AMOUNT, None);
+    let utxo_id = input.utxo_id().cloned().unwrap();
+    let tx = universe.build_script_transaction(Some(vec![input]), None, 0);
+
+    // When
+    let result = universe.verify_and_insert(tx);
+
+    // Then
+    let err = result.unwrap_err();
+    assert!(
+        matches!(err, Error::InputValidation(InputValidationError::UtxoNotFound(id)) if id == utxo_id)
+    );
+}
+
+#[test]
+fn insert__higher_priced_tx_removes_lower_priced_tx() {
+    let mut universe = TestPoolUniverse::default();
+    universe.build_pool();
+
+    // Given
+    let common_coin = universe.setup_coin().1;
+    let tx1 =
+        universe.build_script_transaction(Some(vec![common_coin.clone()]), None, 10);
+    let tx_id = tx1.id(&ChainId::default());
+    let tx2 = universe.build_script_transaction(Some(vec![common_coin]), None, 20);
+
+    // When
+    universe.verify_and_insert(tx1).unwrap();
+    let result = universe.verify_and_insert(tx2).unwrap();
+
+    // Then
+    assert_eq!(result[0].id(), tx_id);
+}
+
+#[test]
+fn insert__colliding_dependent_and_underpriced_returns_error() {
+    let mut universe = TestPoolUniverse::default();
+    universe.build_pool();
+
+    let (output, unset_input) = universe.create_output_and_input();
+    let tx1 = universe.build_script_transaction(None, Some(vec![output]), 20);
+    let utxo_id = UtxoId::new(tx1.id(&ChainId::default()), 0);
+    let input = unset_input.into_input(utxo_id);
+
+    // Given
+    let tx2 = universe.build_script_transaction(Some(vec![input.clone()]), None, 20);
+    let tx3 = universe.build_script_transaction(Some(vec![input]), None, 10);
+    universe.verify_and_insert(tx1).unwrap();
+    universe.verify_and_insert(tx2).unwrap();
+
+    // When
+    let result3 = universe.verify_and_insert(tx3);
+
+    // Then
+    let err = result3.unwrap_err();
+    assert!(matches!(err, Error::Collided(CollisionReason::Utxo(id)) if id == utxo_id));
+}
+
+#[test]
+fn insert_dependent_contract_creation() {
+    let mut universe = TestPoolUniverse::default();
+    universe.build_pool();
+    let contract_id = Contract::EMPTY_CONTRACT_ID;
+
+    // Given
+    let (_, gas_funds) = universe.setup_coin();
+    let tx1 = TransactionBuilder::create(
+        Default::default(),
+        Default::default(),
+        Default::default(),
+    )
+    .tip(10)
+    .max_fee_limit(10)
+    .add_input(gas_funds)
+    .add_output(create_contract_output(contract_id))
+    .finalize_as_transaction();
+
+    let tx2 = universe.build_script_transaction(
+        Some(vec![create_contract_input(
+            Default::default(),
+            Default::default(),
+            contract_id,
+        )]),
+        Some(vec![Output::contract(
+            0,
+            Default::default(),
+            Default::default(),
+        )]),
+        10,
+    );
+
+    // When
+    let result1 = universe.verify_and_insert(tx1);
+    let result2 = universe.verify_and_insert(tx2);
+
+    // Then
+    assert!(result1.is_ok());
+    assert!(result2.is_ok());
+}
+
+#[test]
+fn insert_more_priced_tx3_removes_tx1_and_dependent_tx2() {
+    let mut universe = TestPoolUniverse::default();
+    universe.build_pool();
+
+    // Given
+    let common_coin = universe.setup_coin().1;
+    let (output, unset_input) = universe.create_output_and_input();
+
+    let tx1 = universe.build_script_transaction(
+        Some(vec![common_coin.clone()]),
+        Some(vec![output]),
+        10,
+    );
+    let tx1_id = tx1.id(&ChainId::default());
+    let input = unset_input.into_input(UtxoId::new(tx1_id, 0));
+
+    let tx2 = universe.build_script_transaction(Some(vec![input.clone()]), None, 10);
+    let tx2_id = tx2.id(&ChainId::default());
+    universe.verify_and_insert(tx1).unwrap();
+    universe.verify_and_insert(tx2).unwrap();
+
+    let tx3 = universe.build_script_transaction(Some(vec![common_coin]), None, 20);
+
+    // When
+    let result3 = universe.verify_and_insert(tx3);
+
+    // Then
+    let removed_txs = result3.unwrap();
+    assert_eq!(removed_txs.len(), 2);
+    assert_eq!(removed_txs[0].id(), tx1_id);
+    assert_eq!(removed_txs[1].id(), tx2_id);
+}
+
+#[test]
+fn insert_more_priced_tx2_removes_tx1_and_more_priced_tx3_removes_tx2() {
+    let mut universe = TestPoolUniverse::default();
+    universe.build_pool();
+
+    // Given
+    let common_coin = universe.setup_coin().1;
+
+    let tx1 =
+        universe.build_script_transaction(Some(vec![common_coin.clone()]), None, 10);
+    let tx1_id = tx1.id(&ChainId::default());
+
+    universe.verify_and_insert(tx1).unwrap();
+
+    let tx2 =
+        universe.build_script_transaction(Some(vec![common_coin.clone()]), None, 11);
+    let tx2_id = tx2.id(&ChainId::default());
+
+    let tx3 = universe.build_script_transaction(Some(vec![common_coin]), None, 12);
+
+    // When
+    let result2 = universe.verify_and_insert(tx2);
+    let result3 = universe.verify_and_insert(tx3);
+
+    // Then
+    assert!(result2.is_ok());
+    let removed_txs = result2.unwrap();
+    assert_eq!(removed_txs.len(), 1);
+    assert_eq!(removed_txs[0].id(), tx1_id);
+    assert!(result3.is_ok());
+    let removed_txs = result3.unwrap();
+    assert_eq!(removed_txs.len(), 1);
+    assert_eq!(removed_txs[0].id(), tx2_id);
+}
+
+#[test]
+fn insert__tx_limit_hit() {
+    let mut universe = TestPoolUniverse::default().config(Config {
+        pool_limits: PoolLimits {
+            max_txs: 1,
+            max_bytes_size: 1000000000,
+            max_gas: 100_000_000_000,
+        },
+        ..Default::default()
+    });
+    universe.build_pool();
+
+    // Given
+    let tx1 = universe.build_script_transaction(None, None, 10);
+    let tx2 = universe.build_script_transaction(None, None, 0);
+    universe.verify_and_insert(tx1).unwrap();
+
+    // When
+    let result2 = universe.verify_and_insert(tx2);
+
+    // Then
+    let err = result2.unwrap_err();
+    assert!(matches!(err, Error::NotInsertedLimitHit));
+}
+
+#[test]
+fn insert__tx_gas_limit() {
+    // Given
+    let mut universe = TestPoolUniverse::default();
+    let tx1 = universe.build_script_transaction(None, None, 10);
+    let checked_tx: CheckedTransaction = tx1
+        .clone()
+        .into_checked_basic(Default::default(), &ConsensusParameters::default())
+        .unwrap()
+        .into();
+    let max_gas = match checked_tx {
+        CheckedTransaction::Script(tx) => tx.metadata().max_gas,
+        _ => panic!("Expected script transaction"),
+    };
+    let tx2 = universe.build_script_transaction(None, None, 0);
+    universe = universe.config(Config {
+        pool_limits: PoolLimits {
+            max_txs: 10000,
+            max_bytes_size: 1000000000,
+            max_gas: max_gas + 10,
+        },
+        ..Default::default()
+    });
+    universe.build_pool();
+    universe.verify_and_insert(tx1).unwrap();
+
+    // When
+    let result2 = universe.verify_and_insert(tx2);
+
+    // Then
+    let err = result2.unwrap_err();
+    assert!(matches!(err, Error::NotInsertedLimitHit));
+}
+
+#[test]
+fn insert__tx_bytes_limit() {
+    // Given
+    let mut universe = TestPoolUniverse::default();
+    let tx1 = universe.build_script_transaction(None, None, 10);
+    let checked_tx: CheckedTransaction = tx1
+        .clone()
+        .into_checked_basic(Default::default(), &ConsensusParameters::default())
+        .unwrap()
+        .into();
+    let max_bytes = match checked_tx {
+        CheckedTransaction::Script(tx) => tx.transaction().metered_bytes_size(),
+        _ => panic!("Expected script transaction"),
+    };
+    let tx2 = universe.build_script_transaction(None, None, 0);
+    universe = universe.config(Config {
+        pool_limits: PoolLimits {
+            max_txs: 10000,
+            max_bytes_size: max_bytes + 10,
+            max_gas: 100_000_000_000,
+        },
+        ..Default::default()
+    });
+    universe.build_pool();
+    universe.verify_and_insert(tx1).unwrap();
+
+    // When
+    let result2 = universe.verify_and_insert(tx2);
+
+    // Then
+    let err = result2.unwrap_err();
+    assert!(matches!(err, Error::NotInsertedLimitHit));
+}
+
+#[test]
+fn insert__dependency_chain_length_hit() {
+    let mut universe = TestPoolUniverse::default().config(Config {
+        max_txs_chain_count: 2,
+        ..Default::default()
+    });
+    universe.build_pool();
+
+    // Given
+    let (output, unset_input) = universe.create_output_and_input();
+    let tx1 = universe.build_script_transaction(None, Some(vec![output]), 0);
+    let input = unset_input.into_input(UtxoId::new(tx1.id(&Default::default()), 0));
+
+    let (output, unset_input) = universe.create_output_and_input();
+    let tx2 = universe.build_script_transaction(Some(vec![input]), Some(vec![output]), 0);
+    let input = unset_input.into_input(UtxoId::new(tx2.id(&Default::default()), 0));
+
+    let tx3 = universe.build_script_transaction(Some(vec![input]), None, 0);
+    universe.verify_and_insert(tx1).unwrap();
+    universe.verify_and_insert(tx2).unwrap();
+
+    // When
+    let result3 = universe.verify_and_insert(tx3);
+
+    // Then
+    let err = result3.unwrap_err();
+    assert!(matches!(
+        err,
+        Error::Dependency(DependencyError::NotInsertedChainDependencyTooBig)
+    ));
+}
+
+#[test]
+fn get_sorted_out_tx1_2_3() {
+    let mut universe = TestPoolUniverse::default();
+    universe.build_pool();
+
+    // Given
+    let tx1 = universe.build_script_transaction(None, None, 10);
+    let tx2 = universe.build_script_transaction(None, None, 9);
+    let tx3 = universe.build_script_transaction(None, None, 20);
+
+    let tx1_id = tx1.id(&ChainId::default());
+    let tx2_id = tx2.id(&ChainId::default());
+    let tx3_id = tx3.id(&ChainId::default());
+
+    universe.verify_and_insert(tx1).unwrap();
+    universe.verify_and_insert(tx2).unwrap();
+    universe.verify_and_insert(tx3).unwrap();
+
+    // When
+    let txs = universe
+        .get_pool()
+        .write()
+        .extract_transactions_for_block(Constraints {
+            minimal_gas_price: 0,
+            max_gas: u64::MAX,
+            maximum_txs: u16::MAX,
+            maximum_block_size: u32::MAX,
+        });
+
+    // Then
+    assert_eq!(txs.len(), 3, "Should have 3 txs");
+    assert_eq!(txs[0].id(), tx3_id, "First should be tx3");
+    assert_eq!(txs[1].id(), tx1_id, "Second should be tx1");
+    assert_eq!(txs[2].id(), tx2_id, "Third should be tx2");
+}
+
+#[test]
+fn get_sorted_out_tx_same_tips() {
+    let mut universe = TestPoolUniverse::default();
+    universe.build_pool();
+
+    // Given
+    let gas_coin = universe.setup_coin().1;
+    let tx1 = TransactionBuilder::script(vec![], vec![])
+        .tip(10)
+        .max_fee_limit(10)
+        .script_gas_limit(GAS_LIMIT)
+        .add_input(gas_coin)
+        .finalize_as_transaction();
+
+    let (_, gas_coin) = universe.setup_coin();
+    let tx2 = TransactionBuilder::script(vec![], vec![])
+        .tip(10)
+        .max_fee_limit(10)
+        .script_gas_limit(GAS_LIMIT / 2)
+        .add_input(gas_coin)
+        .finalize_as_transaction();
+
+    let (_, gas_coin) = universe.setup_coin();
+    let tx3 = TransactionBuilder::script(vec![], vec![])
+        .tip(10)
+        .max_fee_limit(10)
+        .script_gas_limit(GAS_LIMIT / 4)
+        .add_input(gas_coin)
+        .finalize_as_transaction();
+
+    let tx1_id = tx1.id(&ChainId::default());
+    let tx2_id = tx2.id(&ChainId::default());
+    let tx3_id = tx3.id(&ChainId::default());
+
+    universe.verify_and_insert(tx1).unwrap();
+    universe.verify_and_insert(tx2).unwrap();
+    universe.verify_and_insert(tx3).unwrap();
+
+    // When
+    let txs = universe
+        .get_pool()
+        .write()
+        .extract_transactions_for_block(Constraints {
+            minimal_gas_price: 0,
+            max_gas: u64::MAX,
+            maximum_txs: u16::MAX,
+            maximum_block_size: u32::MAX,
+        });
+
+    // Then
+    assert_eq!(txs.len(), 3, "Should have 3 txs");
+    assert_eq!(txs[0].id(), tx3_id, "First should be tx3");
+    assert_eq!(txs[1].id(), tx2_id, "Second should be tx2");
+    assert_eq!(txs[2].id(), tx1_id, "Third should be tx1");
+}
+
+#[test]
+fn get_sorted_out_tx_profitable_ratios() {
+    let mut universe = TestPoolUniverse::default();
+    universe.build_pool();
+
+    // Given
+    let gas_coin = universe.setup_coin().1;
+    let tx1 = TransactionBuilder::script(vec![], vec![])
+        .tip(4)
+        .max_fee_limit(4)
+        .script_gas_limit(GAS_LIMIT)
+        .add_input(gas_coin)
+        .finalize_as_transaction();
+
+    let (_, gas_coin) = universe.setup_coin();
+    let tx2 = TransactionBuilder::script(vec![], vec![])
+        .tip(2)
+        .max_fee_limit(2)
+        .script_gas_limit(GAS_LIMIT / 10)
+        .add_input(gas_coin)
+        .finalize_as_transaction();
+
+    let (_, gas_coin) = universe.setup_coin();
+    let tx3 = TransactionBuilder::script(vec![], vec![])
+        .tip(1)
+        .max_fee_limit(1)
+        .script_gas_limit(GAS_LIMIT / 100)
+        .add_input(gas_coin)
+        .finalize_as_transaction();
+
+    let tx1_id = tx1.id(&ChainId::default());
+    let tx2_id = tx2.id(&ChainId::default());
+    let tx3_id = tx3.id(&ChainId::default());
+
+    universe.verify_and_insert(tx1).unwrap();
+    universe.verify_and_insert(tx2).unwrap();
+    universe.verify_and_insert(tx3).unwrap();
+
+    // When
+    let txs = universe
+        .get_pool()
+        .write()
+        .extract_transactions_for_block(Constraints {
+            minimal_gas_price: 0,
+            max_gas: u64::MAX,
+            maximum_txs: u16::MAX,
+            maximum_block_size: u32::MAX,
+        });
+
+    // Then
+    assert_eq!(txs.len(), 3, "Should have 3 txs");
+    assert_eq!(txs[0].id(), tx3_id, "First should be tx3");
+    assert_eq!(txs[1].id(), tx2_id, "Second should be tx2");
+    assert_eq!(txs[2].id(), tx1_id, "Third should be tx1");
+}
+
+#[test]
+fn get_sorted_out_tx_by_creation_instant() {
+    let mut universe = TestPoolUniverse::default();
+    universe.build_pool();
+
+    // Given
+    let tx1 = universe.build_script_transaction(None, None, 0);
+    let tx2 = universe.build_script_transaction(None, None, 0);
+    let tx3 = universe.build_script_transaction(None, None, 0);
+    let tx4 = universe.build_script_transaction(None, None, 0);
+    let tx1_id = tx1.id(&ChainId::default());
+    let tx2_id = tx2.id(&ChainId::default());
+    let tx3_id = tx3.id(&ChainId::default());
+    let tx4_id = tx4.id(&ChainId::default());
+
+    universe.verify_and_insert(tx1).unwrap();
+    universe.verify_and_insert(tx2).unwrap();
+    universe.verify_and_insert(tx3).unwrap();
+    universe.verify_and_insert(tx4).unwrap();
+
+    // When
+    let txs = universe
+        .get_pool()
+        .write()
+        .extract_transactions_for_block(Constraints {
+            minimal_gas_price: 0,
+            max_gas: u64::MAX,
+            maximum_txs: u16::MAX,
+            maximum_block_size: u32::MAX,
+        });
+
+    // Then
+    // This order doesn't match the lexicographical order of the tx ids
+    // and so it verifies that the txs are sorted by creation instant
+    // The newest tx should be first
+    assert_eq!(txs.len(), 4, "Should have 4 txs");
+    assert_eq!(txs[0].id(), tx1_id, "First should be tx1");
+    assert_eq!(txs[1].id(), tx2_id, "Second should be tx2");
+    assert_eq!(txs[2].id(), tx3_id, "Third should be tx3");
+    assert_eq!(txs[3].id(), tx4_id, "Fourth should be tx4");
+}
+
+#[test]
+fn insert_tx_at_least_min_gas_price() {
+    // Given
+    let gas_price = 10;
+    let mut universe = TestPoolUniverse::default().config(Config {
+        ..Default::default()
+    });
+    universe.build_pool();
+
+    let tx = universe.build_script_transaction(None, None, gas_price);
+    // When
+    universe.verify_and_insert_with_gas_price(tx, gas_price)
+    // Then
+    .unwrap();
+}
+
+#[test]
+fn insert__tx_below_min_gas_price() {
+    // Given
+    let gas_price = 1_000_000_000;
+    let mut universe = TestPoolUniverse::default();
+    universe.build_pool();
+
+    let gas_coin = universe.setup_coin().1;
+    let tx = TransactionBuilder::script(vec![], vec![])
+        .tip(10)
+        .max_fee_limit(10)
+        .script_gas_limit(GAS_LIMIT)
+        .add_input(gas_coin)
+        .finalize_as_transaction();
+
+    // When
+    let err = universe
+        .verify_and_insert_with_gas_price(tx, gas_price)
+        .unwrap_err();
+
+    // Then
+    assert!(matches!(err, Error::InsufficientMaxFee { .. }));
+}
+
+#[test]
+fn insert_tx_when_input_message_id_exists_in_db() {
+    let mut universe = TestPoolUniverse::default();
+    universe.build_pool();
+
+    // Given
+    let (message, input) = create_message_predicate_from_message(5000, 0);
+    universe.database_mut().insert_message(message);
+    let tx = universe.build_script_transaction(Some(vec![input]), None, 0);
+
+    // When
+    universe.verify_and_insert(tx)
+    // Then
+    .unwrap();
+}
+
+#[test]
+fn insert__tx_when_input_message_id_do_not_exists_in_db() {
+    let mut universe = TestPoolUniverse::default();
+    universe.build_pool();
+
+    // Given
+    let (message, input) = create_message_predicate_from_message(5000, 0);
+    let tx = universe.build_script_transaction(Some(vec![input]), None, 0);
+
+    // When
+    let err = universe.verify_and_insert(tx).unwrap_err();
+
+    // Then
+    assert!(matches!(
+        err,
+        Error::InputValidation(InputValidationError::NotInsertedInputMessageUnknown(msg_id)) if msg_id == *message.id()
+    ));
+}
+
+#[test]
+fn insert__tx_tip_lower_than_another_tx_with_same_message_id() {
+    let mut universe = TestPoolUniverse::default();
+    universe.build_pool();
+
+    let tip_high = 2u64;
+    let tip_low = 1u64;
+    let (message, conflicting_message_input) =
+        create_message_predicate_from_message(10_000, 0);
+    universe.database_mut().insert_message(message.clone());
+
+    // Given
+    let tx_high = universe.build_script_transaction(
+        Some(vec![conflicting_message_input.clone()]),
+        None,
+        tip_high,
+    );
+    let tx_low = universe.build_script_transaction(
+        Some(vec![conflicting_message_input]),
+        None,
+        tip_low,
+    );
+
+    // When
+    universe.verify_and_insert(tx_high).unwrap();
+    let err = universe.verify_and_insert(tx_low).unwrap_err();
+
+    // Then
+    assert!(
+        matches!(err, Error::Collided(CollisionReason::Message(msg_id)) if msg_id == *message.id())
+    );
+}
+
+#[test]
+fn insert_tx_tip_higher_than_another_tx_with_same_message_id() {
+    let mut universe = TestPoolUniverse::default();
+    universe.build_pool();
+
+    let tip_low = 1u64;
+    let tip_high = 2u64;
+    let (message, conflicting_message_input) =
+        create_message_predicate_from_message(10_000, 0);
+    universe.database_mut().insert_message(message.clone());
+
+    // Given
+    let tx_high = universe.build_script_transaction(
+        Some(vec![conflicting_message_input.clone()]),
+        None,
+        tip_low,
+    );
+    let tx_high_id = tx_high.id(&ChainId::default());
+    let tx_low = universe.build_script_transaction(
+        Some(vec![conflicting_message_input]),
+        None,
+        tip_high,
+    );
+
+    // When
+    let result1 = universe.verify_and_insert(tx_high);
+    let result2 = universe.verify_and_insert(tx_low);
+
+    // Then
+    assert!(result1.is_ok());
+    assert!(result2.is_ok());
+    let removed_txs = result2.unwrap();
+    assert_eq!(removed_txs.len(), 1);
+    assert_eq!(removed_txs[0].id(), tx_high_id);
+}
+
+#[test]
+fn insert_again_message_after_squeeze_with_even_lower_tip() {
+    // tx1 (message 1, message 2) tip 2
+    // tx2 (message 1) tip 3
+    //   squeezes tx1 with higher tip
+    // tx3 (message 2) tip 1
+    //   works since tx1 is no longer part of txpool state even though tip is less
+
+    let mut universe = TestPoolUniverse::default();
+    universe.build_pool();
+    let (message_1, message_input_1) = create_message_predicate_from_message(10_000, 0);
+    let (message_2, message_input_2) = create_message_predicate_from_message(20_000, 1);
+    universe.database_mut().insert_message(message_1.clone());
+    universe.database_mut().insert_message(message_2.clone());
+
+    // Given
+    let tx1 = universe.build_script_transaction(
+        Some(vec![message_input_1.clone(), message_input_2.clone()]),
+        None,
+        2,
+    );
+    let tx2 = universe.build_script_transaction(Some(vec![message_input_1]), None, 3);
+    let tx3 = universe.build_script_transaction(Some(vec![message_input_2]), None, 1);
+
+    // When
+    let result1 = universe.verify_and_insert(tx1);
+    let result2 = universe.verify_and_insert(tx2);
+    let result3 = universe.verify_and_insert(tx3);
+
+    // Then
+    assert!(result1.is_ok());
+    assert!(result2.is_ok());
+    assert!(result3.is_ok());
+}
+
+#[test]
+fn insert__tx_with_predicates_incorrect_owner() {
+    let mut universe = TestPoolUniverse::default().config(Config {
+        utxo_validation: false,
+        ..Default::default()
+    });
+    universe.build_pool();
+
+    // Given
+    let mut coin = universe.random_predicate(AssetId::BASE, TEST_COIN_AMOUNT, None);
+    if let Input::CoinPredicate(CoinPredicate { owner, .. }) = &mut coin {
+        *owner = Address::zeroed();
+    }
+
+    let tx = universe.build_script_transaction(Some(vec![coin]), None, 0);
+
+    // When
+    let err = universe.verify_and_insert(tx).unwrap_err();
+
+    // Then
+    assert!(matches!(
+        err,
+        Error::ConsensusValidity(CheckError::Validity(
+            ValidityError::InputPredicateOwner { index: 0 }
+        ))
+    ));
+}
+
+#[test]
+fn insert__tx_with_predicate_without_enough_gas() {
+    let mut universe = TestPoolUniverse::default().config(Config {
+        utxo_validation: false,
+        ..Default::default()
+    });
+    universe.build_pool();
+
+    let gas_limit = 10000;
+
+    // Given
+    let mut consensus_parameters = ConsensusParameters::default();
+    consensus_parameters
+        .set_tx_params(TxParameters::default().with_max_gas_per_tx(gas_limit));
+    consensus_parameters.set_predicate_params(
+        PredicateParameters::default().with_max_gas_per_predicate(gas_limit),
+    );
+
+    let coin = universe
+        .custom_predicate(
+            AssetId::BASE,
+            TEST_COIN_AMOUNT,
+            // forever loop
+            vec![op::jmp(RegId::ZERO)].into_iter().collect(),
+            None,
+        )
+        .into_estimated(&consensus_parameters);
+
+    let tx = universe.build_script_transaction(Some(vec![coin]), None, 0);
+
+    // When
+    let err = universe.verify_and_insert(tx).unwrap_err();
+
+    // Then
+    assert!(matches!(
+        err,
+        Error::ConsensusValidity(CheckError::PredicateVerificationFailed(
+            PredicateVerificationFailed::OutOfGas
+        ))
+    ));
+}
+
+#[test]
+fn insert__tx_with_predicate_that_returns_false() {
+    let mut universe = TestPoolUniverse::default().config(Config {
+        utxo_validation: false,
+        ..Default::default()
+    });
+    universe.build_pool();
+
+    // Given
+    let coin = universe
+        .custom_predicate(
+            AssetId::BASE,
+            TEST_COIN_AMOUNT,
+            // ret false
+            vec![op::ret(RegId::ZERO)].into_iter().collect(),
+            None,
+        )
+        .into_default_estimated();
+
+    let tx = universe.build_script_transaction(Some(vec![coin]), None, 0);
+
+    // When
+    let err = universe.verify_and_insert(tx).unwrap_err();
+
+    // Then
+    assert!(matches!(
+        err,
+        Error::ConsensusValidity(CheckError::PredicateVerificationFailed(
+            PredicateVerificationFailed::Panic(PanicReason::PredicateReturnedNonOne)
+        ))
+    ));
+}
+
+#[test]
+fn insert_tx_with_blob() {
+    let mut universe = TestPoolUniverse::default().config(Config {
+        utxo_validation: false,
+        ..Default::default()
+    });
+    universe.build_pool();
+
+    // Given
+    let program = vec![123; 123];
+    let tx = TransactionBuilder::blob(BlobBody {
+        id: BlobId::compute(program.as_slice()),
+        witness_index: 0,
+    })
+    .add_witness(program.into())
+    .add_fee_input()
+    .finalize_as_transaction();
+
+    // When
+    universe.verify_and_insert(tx)
+    // Then
+    .unwrap();
+}
+
+#[test]
+fn insert__tx_with_blob_already_inserted_at_higher_tip() {
+    let mut universe = TestPoolUniverse::default().config(Config {
+        utxo_validation: false,
+        ..Default::default()
+    });
+    universe.build_pool();
+
+    // Given
+    let program = vec![123; 123];
+    let blob_id = BlobId::compute(program.as_slice());
+    let tx = TransactionBuilder::blob(BlobBody {
+        id: blob_id,
+        witness_index: 0,
+    })
+    .add_witness(program.clone().into())
+    .add_fee_input()
+    .finalize_as_transaction();
+
+    universe.verify_and_insert(tx).unwrap();
+
+    let same_blob_tx = TransactionBuilder::blob(BlobBody {
+        id: blob_id,
+        witness_index: 1,
+    })
+    .add_fee_input()
+    .add_witness(program.into())
+    .finalize_as_transaction();
+
+    // When
+    let err = universe.verify_and_insert(same_blob_tx).unwrap_err();
+
+    // Then
+    assert!(matches!(err, Error::Collided(CollisionReason::Blob(b)) if b == blob_id));
+}
+
+#[test]
+fn insert_tx_with_blob_already_insert_at_lower_tip() {
+    let mut universe = TestPoolUniverse::default().config(Config {
+        utxo_validation: false,
+        ..Default::default()
+    });
+    universe.build_pool();
+
+    // Given
+    let program = vec![123; 123];
+    let blob_id = BlobId::compute(program.as_slice());
+    let tx = TransactionBuilder::blob(BlobBody {
+        id: blob_id,
+        witness_index: 0,
+    })
+    .add_witness(program.clone().into())
+    .add_fee_input()
+    .finalize_as_transaction();
+
+    universe.verify_and_insert(tx).unwrap();
+
+    let same_blob_tx = TransactionBuilder::blob(BlobBody {
+        id: blob_id,
+        witness_index: 1,
+    })
+    .add_fee_input()
+    .add_witness(program.into())
+    .tip(100)
+    .max_fee_limit(100)
+    .finalize_as_transaction();
+
+    // When
+    let result = universe.verify_and_insert(same_blob_tx);
+
+    // Then
+    assert!(result.is_ok());
+}
+
+#[test]
+fn insert__tx_blob_already_in_db() {
+    let mut universe = TestPoolUniverse::default().config(Config {
+        utxo_validation: false,
+        ..Default::default()
+    });
+    universe.build_pool();
+    let program = vec![123; 123];
+    let blob_id = BlobId::compute(program.as_slice());
+    let tx = TransactionBuilder::blob(BlobBody {
+        id: blob_id,
+        witness_index: 0,
+    })
+    .add_witness(program.clone().into())
+    .add_fee_input()
+    .finalize_as_transaction();
+
+    // Given
+    universe.database_mut().insert_dummy_blob(blob_id);
+
+    // When
+    let err = universe.verify_and_insert(tx).unwrap_err();
+
+    // Then
+    assert!(matches!(
+        err,
+        Error::InputValidation(InputValidationError::NotInsertedBlobIdAlreadyTaken(b)) if b == blob_id
+    ));
+}
+
+#[test]
+fn insert__if_tx3_depends_and_collides_with_tx2() {
+    let mut universe = TestPoolUniverse::default();
+    universe.build_pool();
+
+    // tx1 {inputs: {}, outputs: {coinA}, tip: 1}
+    let (output_a, unset_input) = universe.create_output_and_input();
+    let tx1 = universe.build_script_transaction(None, Some(vec![output_a]), 1);
+    // tx2 {inputs: {coinA}, outputs: {coinB}, tip: 1}
+    let input_a = unset_input.into_input(UtxoId::new(tx1.id(&Default::default()), 0));
+    let (output_b, unset_input) = universe.create_output_and_input();
+    let tx2 = universe.build_script_transaction(
+        Some(vec![input_a.clone()]),
+        Some(vec![output_b]),
+        1,
+    );
+    // Given
+    // tx3 {inputs: {coinA, coinB}, outputs:{}, tip: 20}
+    let input_b = unset_input.into_input(UtxoId::new(tx2.id(&Default::default()), 0));
+    universe.verify_and_insert(tx1).unwrap();
+    universe.verify_and_insert(tx2).unwrap();
+
+    let tx3 = universe.build_script_transaction(Some(vec![input_a, input_b]), None, 20);
+
+    // When
+    let err = universe.verify_and_insert(tx3).unwrap_err();
+
+    // Then
+    assert!(matches!(
+        err,
+        Error::Dependency(DependencyError::DependentTransactionIsADiamondDeath)
+    ));
+}
+
+#[test]
+fn insert__tx_upgrade_with_invalid_wasm() {
+    let mut universe = TestPoolUniverse::default().config(Config {
+        utxo_validation: false,
+        ..Default::default()
+    });
+    universe.build_pool();
+
+    // Given
+    let random_predicate =
+        universe.random_predicate(AssetId::BASE, TEST_COIN_AMOUNT, None);
+    let privileged_address = *random_predicate.input_owner().unwrap();
+    let tx = TransactionBuilder::upgrade(UpgradePurpose::StateTransition {
+        root: Bytes32::new([1; 32]),
+    })
+    .add_input(random_predicate)
+    .finalize_as_transaction();
+    let mut params = ConsensusParameters::default();
+    params.set_privileged_address(privileged_address);
+
+    // When
+    let result = universe
+        .verify_and_insert_with_consensus_params_wasm_checker(
+            tx,
+            params,
+            MockWasmChecker::new(Err(WasmValidityError::NotEnabled)),
+        )
+        .unwrap_err();
+
+    // Then
+    assert!(matches!(
+        result,
+        Error::WasmValidity(WasmValidityError::NotEnabled)
+    ));
+}
diff --git a/crates/services/txpool/src/service/update_sender/tests/test_sending.rs b/crates/services/txpool_v2/src/tests/tests_sending.rs
similarity index 86%
rename from crates/services/txpool/src/service/update_sender/tests/test_sending.rs
rename to crates/services/txpool_v2/src/tests/tests_sending.rs
index 6455ade5a18..fde2b98708a 100644
--- a/crates/services/txpool/src/service/update_sender/tests/test_sending.rs
+++ b/crates/services/txpool_v2/src/tests/tests_sending.rs
@@ -1,17 +1,42 @@
-use std::sync::Arc;
+use std::{
+    collections::HashMap,
+    sync::Arc,
+    time::Duration,
+};
 
-use crate::service::update_sender::tests::utils::{
-    construct_senders,
-    SenderData,
+use fuel_core_types::{
+    fuel_tx::Bytes32,
+    services::txpool::TransactionStatus,
+    tai64::Tai64,
 };
+use parking_lot::lock_api::Mutex;
+use test_strategy::proptest;
 
-use super::{
-    utils::{
+use crate::{
+    tests::utils::{
         box_senders,
+        construct_senders,
         senders_strategy_any,
         tx_update_strategy,
+        SenderData,
+    },
+    tx_status_stream::{
+        State,
+        TxStatusMessage,
+        TxUpdate,
+    },
+    update_sender::{
+        MockSendStatus,
+        SendError,
+        SendStatus,
+        Sender,
+        UpdateSender,
     },
-    *,
+};
+
+use super::tests_update_stream_state::{
+    validate_tx_update_stream_state,
+    StateTransitions,
 };
 
 /// Model the function that sends a message to the receiver.
@@ -138,7 +163,7 @@ fn test_send_inner(
 
                 // Verify the new state of the sender
                 assert_eq!(*senders[i].stream.state(), new_state);
-                i += 1;
+                i = i.saturating_add(1);
             }
         }
     }
diff --git a/crates/services/txpool_v2/src/tests/tests_service.rs b/crates/services/txpool_v2/src/tests/tests_service.rs
new file mode 100644
index 00000000000..b492872e78a
--- /dev/null
+++ b/crates/services/txpool_v2/src/tests/tests_service.rs
@@ -0,0 +1,321 @@
+use fuel_core_services::Service as ServiceTrait;
+use fuel_core_types::{
+    fuel_tx::UniqueIdentifier,
+    fuel_types::ChainId,
+    services::txpool::TransactionStatus,
+};
+use std::time::Duration;
+use tokio_stream::StreamExt;
+
+use crate::{
+    config::Config,
+    tests::universe::TestPoolUniverse,
+    tx_status_stream::TxStatusMessage,
+};
+
+#[tokio::test]
+async fn test_start_stop() {
+    let service = TestPoolUniverse::default().build_service(None, None);
+    service.start_and_await().await.unwrap();
+
+    // Double start will return false.
+    assert!(service.start().is_err(), "double start should fail");
+
+    let state = service.stop_and_await().await.unwrap();
+    assert!(state.stopped());
+}
+
+#[tokio::test]
+async fn test_find() {
+    let mut universe = TestPoolUniverse::default();
+
+    let tx1 = universe.build_script_transaction(None, None, 10);
+    let tx2 = universe.build_script_transaction(None, None, 20);
+    let tx3 = universe.build_script_transaction(None, None, 30);
+
+    let service = universe.build_service(None, None);
+    service.start_and_await().await.unwrap();
+
+    // Given
+    let ids = vec![tx1.id(&Default::default()), tx2.id(&Default::default())];
+    service
+        .shared
+        .try_insert(vec![tx1.clone(), tx2.clone()])
+        .unwrap();
+
+    universe
+        .waiting_txs_insertion(service.shared.new_tx_notification_subscribe(), ids)
+        .await;
+
+    // When
+    let out = service
+        .shared
+        .find(vec![
+            tx1.id(&Default::default()),
+            tx3.id(&Default::default()),
+        ])
+        .await
+        .unwrap();
+
+    // Then
+    assert_eq!(out.len(), 2, "Should be len 2:{out:?}");
+    assert!(out[0].is_some(), "Tx1 should be some:{out:?}");
+    let id = out[0].as_ref().unwrap().tx().id();
+    assert_eq!(id, tx1.id(&Default::default()), "Found tx id match{out:?}");
+    assert!(out[1].is_none(), "Tx3 should not be found:{out:?}");
+    service.stop_and_await().await.unwrap();
+}
+
+#[tokio::test]
+async fn test_prune_transactions() {
+    const TIMEOUT: u64 = 3;
+    let mut universe = TestPoolUniverse::default().config(Config {
+        ttl_check_interval: Duration::from_secs(1),
+        max_txs_ttl: Duration::from_secs(TIMEOUT),
+        ..Default::default()
+    });
+
+    // Given
+    let tx1 = universe.build_script_transaction(None, None, 10);
+    let tx2 = universe.build_script_transaction(None, None, 20);
+    let tx3 = universe.build_script_transaction(None, None, 30);
+    let ids = vec![
+        tx1.id(&Default::default()),
+        tx2.id(&Default::default()),
+        tx3.id(&Default::default()),
+    ];
+
+    let service = universe.build_service(None, None);
+    service.start_and_await().await.unwrap();
+
+    service
+        .shared
+        .try_insert(vec![tx1.clone(), tx2.clone(), tx3.clone()])
+        .unwrap();
+
+    universe
+        .waiting_txs_insertion(service.shared.new_tx_notification_subscribe(), ids)
+        .await;
+
+    let out = service
+        .shared
+        .find(vec![
+            tx1.id(&Default::default()),
+            tx2.id(&Default::default()),
+            tx3.id(&Default::default()),
+        ])
+        .await
+        .unwrap();
+
+    assert_eq!(out.len(), 3, "Should be len 3:{out:?}");
+    assert!(out[0].is_some(), "Tx1 should exist");
+    assert!(out[1].is_some(), "Tx2 should exist");
+    assert!(out[2].is_some(), "Tx3 should exist");
+
+    // When
+    tokio::time::sleep(Duration::from_secs(TIMEOUT)).await;
+    tokio::time::sleep(Duration::from_secs(TIMEOUT)).await;
+    let out = service
+        .shared
+        .find(vec![
+            tx1.id(&Default::default()),
+            tx2.id(&Default::default()),
+            tx3.id(&Default::default()),
+        ])
+        .await
+        .unwrap();
+
+    // Then
+    assert_eq!(out.len(), 3, "Should be len 3:{out:?}");
+    assert!(out[0].is_none(), "Tx1 should be pruned");
+    assert!(out[1].is_none(), "Tx2 should be pruned");
+    assert!(out[2].is_none(), "Tx3 should be pruned");
+
+    service.stop_and_await().await.unwrap();
+}
+
+#[tokio::test]
+async fn test_prune_transactions_the_oldest() {
+    const TIMEOUT: u64 = 5;
+    let mut universe = TestPoolUniverse::default().config(Config {
+        ttl_check_interval: Duration::from_secs(TIMEOUT),
+        max_txs_ttl: Duration::from_secs(TIMEOUT),
+        ..Default::default()
+    });
+
+    let tx1 = universe.build_script_transaction(None, None, 10);
+    let tx2 = universe.build_script_transaction(None, None, 20);
+    let tx3 = universe.build_script_transaction(None, None, 30);
+    let tx4 = universe.build_script_transaction(None, None, 40);
+
+    let service = universe.build_service(None, None);
+    service.start_and_await().await.unwrap();
+
+    // Given
+    // insert tx1 at time `0`
+    service.shared.try_insert(vec![tx1.clone()]).unwrap();
+
+    // sleep for `4` seconds
+    tokio::time::sleep(Duration::from_secs(4)).await;
+    // insert tx2 at time `4`
+    service.shared.try_insert(vec![tx2.clone()]).unwrap();
+
+    universe
+        .waiting_txs_insertion(
+            service.shared.new_tx_notification_subscribe(),
+            vec![tx2.id(&Default::default())],
+        )
+        .await;
+    // check that tx1 and tx2 are still there at time `4`
+    let out = service
+        .shared
+        .find(vec![
+            tx1.id(&Default::default()),
+            tx2.id(&Default::default()),
+        ])
+        .await
+        .unwrap();
+
+    assert!(out[0].is_some(), "Tx1 should exist");
+    assert!(out[1].is_some(), "Tx2 should exist");
+
+    // sleep for another `4` seconds
+    tokio::time::sleep(Duration::from_secs(4)).await;
+    // insert tx3 at time `8`
+    service.shared.try_insert(vec![tx3.clone()]).unwrap();
+
+    // sleep for `3` seconds
+    tokio::time::sleep(Duration::from_secs(3)).await;
+
+    // insert tx4 at time `11`
+    service.shared.try_insert(vec![tx4.clone()]).unwrap();
+
+    universe
+        .waiting_txs_insertion(
+            service.shared.new_tx_notification_subscribe(),
+            vec![tx4.id(&Default::default())],
+        )
+        .await;
+    // time is now `11`, tx1 and tx2 should be pruned
+    let out = service
+        .shared
+        .find(vec![
+            tx1.id(&Default::default()),
+            tx2.id(&Default::default()),
+            tx3.id(&Default::default()),
+            tx4.id(&ChainId::default()),
+        ])
+        .await
+        .unwrap();
+
+    assert!(out[0].is_none(), "Tx1 should be pruned");
+    assert!(out[1].is_none(), "Tx2 should be pruned");
+    assert!(out[2].is_some(), "Tx3 should exist");
+    assert!(out[3].is_some(), "Tx4 should exist");
+
+    // sleep for `5` seconds
+    tokio::time::sleep(Duration::from_secs(TIMEOUT)).await;
+
+    // time is now `16`, tx3 should be pruned
+    let out = service
+        .shared
+        .find(vec![
+            tx1.id(&Default::default()),
+            tx2.id(&Default::default()),
+            tx3.id(&Default::default()),
+            tx4.id(&ChainId::default()),
+        ])
+        .await
+        .unwrap();
+
+    assert!(out[0].is_none(), "Tx1 should be pruned");
+    assert!(out[1].is_none(), "Tx2 should be pruned");
+    assert!(out[2].is_none(), "Tx3 should be pruned");
+    assert!(out[3].is_some(), "Tx4 should exist");
+
+    service.stop_and_await().await.unwrap();
+}
+
+#[tokio::test]
+async fn simple_insert_removal_subscription() {
+    const TIMEOUT: u64 = 2;
+    let mut universe = TestPoolUniverse::default().config(Config {
+        ttl_check_interval: Duration::from_secs(1),
+        max_txs_ttl: Duration::from_secs(TIMEOUT),
+        ..Default::default()
+    });
+
+    let tx1 = universe.build_script_transaction(None, None, 10);
+    let tx2 = universe.build_script_transaction(None, None, 20);
+
+    let service = universe.build_service(None, None);
+    service.start_and_await().await.unwrap();
+
+    let mut new_tx_notification = service.shared.new_tx_notification_subscribe();
+    let mut tx1_subscribe_updates = service
+        .shared
+        .tx_update_subscribe(tx1.cached_id().unwrap())
+        .unwrap();
+    let mut tx2_subscribe_updates = service
+        .shared
+        .tx_update_subscribe(tx2.cached_id().unwrap())
+        .unwrap();
+
+    service
+        .shared
+        .try_insert(vec![tx1.clone(), tx2.clone()])
+        .unwrap();
+
+    assert_eq!(
+        new_tx_notification.recv().await,
+        Ok(tx1.cached_id().unwrap()),
+        "First added should be tx1"
+    );
+    let update = tx1_subscribe_updates.next().await.unwrap();
+    assert!(
+        matches!(
+            update,
+            TxStatusMessage::Status(TransactionStatus::Submitted { .. })
+        ),
+        "First message in tx1 stream should be Submitted"
+    );
+    assert_eq!(
+        new_tx_notification.recv().await,
+        Ok(tx2.cached_id().unwrap()),
+        "Second added should be tx2"
+    );
+    let update = tx2_subscribe_updates.next().await.unwrap();
+    assert!(
+        matches!(
+            update,
+            TxStatusMessage::Status(TransactionStatus::Submitted { .. })
+        ),
+        "First message in tx2 stream should be Submitted"
+    );
+
+    // waiting for them to be removed
+    tokio::time::sleep(Duration::from_secs(TIMEOUT)).await;
+    tokio::time::sleep(Duration::from_secs(TIMEOUT)).await;
+
+    let update = tx1_subscribe_updates.next().await.unwrap();
+    assert_eq!(
+        update,
+        TxStatusMessage::Status(TransactionStatus::SqueezedOut {
+            reason: "Transaction is removed: Transaction expired because it exceeded the configured time to live `tx-pool-ttl`."
+                .to_string()
+        }),
+        "Second message in tx1 stream should be squeezed out"
+    );
+
+    let update = tx2_subscribe_updates.next().await.unwrap();
+    assert_eq!(
+        update,
+        TxStatusMessage::Status(TransactionStatus::SqueezedOut {
+            reason: "Transaction is removed: Transaction expired because it exceeded the configured time to live `tx-pool-ttl`."
+                .to_string()
+        }),
+        "Second message in tx2 stream should be squeezed out"
+    );
+
+    service.stop_and_await().await.unwrap();
+}
diff --git a/crates/services/txpool/src/service/update_sender/tests/test_subscribe.rs b/crates/services/txpool_v2/src/tests/tests_subscribe.rs
similarity index 64%
rename from crates/services/txpool/src/service/update_sender/tests/test_subscribe.rs
rename to crates/services/txpool_v2/src/tests/tests_subscribe.rs
index 936cbadaae9..5cca46d2206 100644
--- a/crates/services/txpool/src/service/update_sender/tests/test_subscribe.rs
+++ b/crates/services/txpool_v2/src/tests/tests_subscribe.rs
@@ -1,11 +1,22 @@
-use crate::service::update_sender::tests::utils::{
-    box_senders,
-    MockCreateChannel,
+use std::collections::HashMap;
+
+use fuel_core_types::fuel_tx::Bytes32;
+use test_strategy::{
+    proptest,
+    Arbitrary,
 };
 
-use super::{
-    utils::senders_strategy_all_ok,
-    *,
+use crate::{
+    tests::utils::{
+        box_senders,
+        senders_strategy_all_ok,
+        MockCreateChannel,
+    },
+    update_sender::{
+        subscribe,
+        MockSendStatus,
+        Sender,
+    },
 };
 
 #[derive(Debug, Arbitrary)]
@@ -29,5 +40,5 @@ fn test_subscriber(input: Input) {
         Box::new(()),
     );
     let len_after = senders.values().map(|v| v.len()).sum::<usize>();
-    assert_eq!(len_before + 1, len_after);
+    assert_eq!(len_before.saturating_add(1), len_after);
 }
diff --git a/crates/services/txpool/src/service/update_sender/tests.rs b/crates/services/txpool_v2/src/tests/tests_update_stream_state.rs
similarity index 88%
rename from crates/services/txpool/src/service/update_sender/tests.rs
rename to crates/services/txpool_v2/src/tests/tests_update_stream_state.rs
index 75e7f2266d8..55062aadf48 100644
--- a/crates/services/txpool/src/service/update_sender/tests.rs
+++ b/crates/services/txpool_v2/src/tests/tests_update_stream_state.rs
@@ -2,26 +2,24 @@
 
 #![allow(clippy::arithmetic_side_effects)]
 
+use fuel_core_types::services::txpool::TransactionStatus;
 use test_strategy::{
     proptest,
     Arbitrary,
 };
 
-use super::{
-    tx_status_stream::State,
-    *,
+use crate::{
+    tests::utils,
+    tx_status_stream::{
+        State,
+        TxStatusMessage,
+        TxUpdateStream,
+    },
 };
-use proptest::prelude::*;
-
-mod test_e2e;
-mod test_permits;
-mod test_sending;
-mod test_subscribe;
-mod utils;
 
 /// Represents the possible state transitions in TxUpdateStream.
 #[derive(Debug, PartialEq, Eq, Clone, Arbitrary)]
-enum StateTransitions {
+pub(crate) enum StateTransitions {
     AddMsg(#[strategy(utils::tx_status_message_strategy())] TxStatusMessage),
     AddFailure,
     CloseRecv,
@@ -29,7 +27,10 @@ enum StateTransitions {
 }
 
 /// Returns the new state after applying the given `transition` to the current `state`.
-fn validate_tx_update_stream_state(state: State, transition: StateTransitions) -> State {
+pub(crate) fn validate_tx_update_stream_state(
+    state: State,
+    transition: StateTransitions,
+) -> State {
     use State::*;
     use StateTransitions::*;
     match (state, transition) {
diff --git a/crates/services/txpool_v2/src/tests/universe.rs b/crates/services/txpool_v2/src/tests/universe.rs
new file mode 100644
index 00000000000..0703aaebe48
--- /dev/null
+++ b/crates/services/txpool_v2/src/tests/universe.rs
@@ -0,0 +1,465 @@
+use std::sync::Arc;
+
+use fuel_core_types::{
+    entities::{
+        coins::coin::{
+            Coin,
+            CompressedCoin,
+        },
+        relayer::message::{
+            Message,
+            MessageV1,
+        },
+    },
+    fuel_asm::op,
+    fuel_crypto::rand::{
+        rngs::StdRng,
+        Rng,
+        SeedableRng,
+    },
+    fuel_tx::{
+        field::Inputs,
+        input::{
+            coin::{
+                CoinPredicate,
+                CoinSigned,
+            },
+            contract::Contract as ContractInput,
+            Input,
+        },
+        Bytes32,
+        ConsensusParameters,
+        Contract,
+        ContractId,
+        Finalizable,
+        Output,
+        Transaction,
+        TransactionBuilder,
+        TxId,
+        UtxoId,
+    },
+    fuel_types::{
+        AssetId,
+        ChainId,
+        Word,
+    },
+    fuel_vm::{
+        checked_transaction::EstimatePredicates,
+        interpreter::MemoryInstance,
+        predicate::EmptyStorage,
+    },
+    services::txpool::ArcPoolTx,
+};
+use parking_lot::RwLock;
+use tokio::sync::broadcast::Receiver;
+
+use crate::{
+    collision_manager::basic::BasicCollisionManager,
+    config::Config,
+    error::Error,
+    new_service,
+    pool::Pool,
+    selection_algorithms::ratio_tip_gas::RatioTipGasSelection,
+    service::{
+        memory::MemoryPool,
+        verifications::Verification,
+        Shared,
+        TxPool,
+    },
+    storage::graph::{
+        GraphConfig,
+        GraphStorage,
+    },
+    tests::mocks::{
+        MockDBProvider,
+        MockDb,
+    },
+    GasPrice,
+    Service,
+};
+
+use super::mocks::{
+    MockConsensusParametersProvider,
+    MockImporter,
+    MockP2P,
+    MockTxPoolGasPrice,
+    MockWasmChecker,
+};
+
+// use some arbitrary large amount, this shouldn't affect the txpool logic except for covering
+// the byte and gas price fees.
+pub const TEST_COIN_AMOUNT: u64 = 100_000_000u64;
+pub const GAS_LIMIT: Word = 100000;
+
+pub struct TestPoolUniverse {
+    mock_db: MockDb,
+    rng: StdRng,
+    pub config: Config,
+    pool: Option<Shared<TxPool>>,
+}
+
+impl Default for TestPoolUniverse {
+    fn default() -> Self {
+        Self {
+            mock_db: MockDb::default(),
+            rng: StdRng::seed_from_u64(0),
+            config: Default::default(),
+            pool: None,
+        }
+    }
+}
+
+impl TestPoolUniverse {
+    pub fn database_mut(&mut self) -> &mut MockDb {
+        &mut self.mock_db
+    }
+
+    pub fn database(&self) -> &MockDb {
+        &self.mock_db
+    }
+
+    pub fn config(self, config: Config) -> Self {
+        if self.pool.is_some() {
+            panic!("Pool already built");
+        }
+        Self { config, ..self }
+    }
+
+    pub fn build_pool(&mut self) {
+        let pool = Arc::new(RwLock::new(Pool::new(
+            GraphStorage::new(GraphConfig {
+                max_txs_chain_count: self.config.max_txs_chain_count,
+            }),
+            BasicCollisionManager::new(),
+            RatioTipGasSelection::new(),
+            self.config.clone(),
+        )));
+        self.pool = Some(pool.clone());
+    }
+
+    pub fn build_service(
+        &self,
+        p2p: Option<MockP2P>,
+        importer: Option<MockImporter>,
+    ) -> Service<MockDb> {
+        let gas_price = 0;
+        let mut p2p = p2p.unwrap_or_else(|| MockP2P::new_with_txs(vec![]));
+        // set default handlers for p2p methods after test is set up, so they will be last on the FIFO
+        // ordering of methods handlers: https://docs.rs/mockall/0.12.1/mockall/index.html#matching-multiple-calls
+        p2p.expect_notify_gossip_transaction_validity()
+            .returning(move |_, _| Ok(()));
+        p2p.expect_broadcast_transaction()
+            .returning(move |_| Ok(()));
+        p2p.expect_subscribe_new_peers()
+            .returning(|| Box::pin(fuel_core_services::stream::pending()));
+
+        let importer = importer.unwrap_or_else(|| MockImporter::with_blocks(vec![]));
+        let gas_price_provider = MockTxPoolGasPrice::new(gas_price);
+        let mut consensus_parameters_provider =
+            MockConsensusParametersProvider::default();
+        consensus_parameters_provider
+            .expect_latest_consensus_parameters()
+            .returning(|| (0, Arc::new(Default::default())));
+
+        new_service(
+            ChainId::default(),
+            self.config.clone(),
+            p2p,
+            importer,
+            MockDBProvider(self.mock_db.clone()),
+            consensus_parameters_provider,
+            Default::default(),
+            gas_price_provider,
+            MockWasmChecker { result: Ok(()) },
+        )
+    }
+
+    pub fn build_script_transaction(
+        &mut self,
+        inputs: Option<Vec<Input>>,
+        outputs: Option<Vec<Output>>,
+        tip: u64,
+    ) -> Transaction {
+        let mut inputs = inputs.unwrap_or_default();
+        let (_, gas_coin) = self.setup_coin();
+        inputs.push(gas_coin);
+        let outputs = outputs.unwrap_or_default();
+        let mut tx_builder = TransactionBuilder::script(vec![], vec![]);
+        tx_builder.script_gas_limit(GAS_LIMIT);
+        for input in inputs {
+            tx_builder.add_input(input);
+        }
+        for output in outputs {
+            tx_builder.add_output(output);
+        }
+        tx_builder.tip(tip);
+        tx_builder.max_fee_limit(10000);
+        tx_builder.finalize().into()
+    }
+
+    pub fn verify_and_insert(
+        &mut self,
+        tx: Transaction,
+    ) -> Result<Vec<ArcPoolTx>, Error> {
+        if let Some(pool) = &self.pool {
+            let mut mock_consensus_params_provider =
+                MockConsensusParametersProvider::default();
+            mock_consensus_params_provider
+                .expect_latest_consensus_parameters()
+                .returning(|| (0, Arc::new(ConsensusParameters::standard())));
+            let verification = Verification {
+                persistent_storage_provider: Arc::new(MockDBProvider(
+                    self.mock_db.clone(),
+                )),
+                gas_price_provider: Arc::new(MockTxPoolGasPrice::new(0)),
+                consensus_parameters_provider: Arc::new(mock_consensus_params_provider),
+                wasm_checker: Arc::new(MockWasmChecker::new(Ok(()))),
+                memory_pool: MemoryPool::new(),
+            };
+            let tx = verification.perform_all_verifications(
+                tx,
+                &pool.clone(),
+                Default::default(),
+                true,
+            )?;
+            pool.write().insert(Arc::new(tx), &self.mock_db)
+        } else {
+            panic!("Pool needs to be built first");
+        }
+    }
+
+    pub fn verify_and_insert_with_gas_price(
+        &mut self,
+        tx: Transaction,
+        gas_price: GasPrice,
+    ) -> Result<Vec<ArcPoolTx>, Error> {
+        if let Some(pool) = &self.pool {
+            let mut mock_consensus_params_provider =
+                MockConsensusParametersProvider::default();
+            mock_consensus_params_provider
+                .expect_latest_consensus_parameters()
+                .returning(|| (0, Arc::new(ConsensusParameters::standard())));
+            let verification = Verification {
+                persistent_storage_provider: Arc::new(MockDBProvider(
+                    self.mock_db.clone(),
+                )),
+                gas_price_provider: Arc::new(MockTxPoolGasPrice::new(gas_price)),
+                consensus_parameters_provider: Arc::new(mock_consensus_params_provider),
+                wasm_checker: Arc::new(MockWasmChecker::new(Ok(()))),
+                memory_pool: MemoryPool::new(),
+            };
+            let tx = verification.perform_all_verifications(
+                tx,
+                &pool.clone(),
+                Default::default(),
+                true,
+            )?;
+            pool.write().insert(Arc::new(tx), &self.mock_db)
+        } else {
+            panic!("Pool needs to be built first");
+        }
+    }
+
+    pub fn verify_and_insert_with_consensus_params_wasm_checker(
+        &mut self,
+        tx: Transaction,
+        consensus_params: ConsensusParameters,
+        wasm_checker: MockWasmChecker,
+    ) -> Result<Vec<ArcPoolTx>, Error> {
+        if let Some(pool) = &self.pool {
+            let mut mock_consensus_params_provider =
+                MockConsensusParametersProvider::default();
+            mock_consensus_params_provider
+                .expect_latest_consensus_parameters()
+                .returning(move || (0, Arc::new(consensus_params.clone())));
+            let verification = Verification {
+                persistent_storage_provider: Arc::new(MockDBProvider(
+                    self.mock_db.clone(),
+                )),
+                gas_price_provider: Arc::new(MockTxPoolGasPrice::new(0)),
+                consensus_parameters_provider: Arc::new(mock_consensus_params_provider),
+                wasm_checker: Arc::new(wasm_checker),
+                memory_pool: MemoryPool::new(),
+            };
+            let tx = verification.perform_all_verifications(
+                tx,
+                &pool.clone(),
+                Default::default(),
+                true,
+            )?;
+            pool.write().insert(Arc::new(tx), &self.mock_db)
+        } else {
+            panic!("Pool needs to be built first");
+        }
+    }
+
+    pub fn get_pool(&self) -> Shared<TxPool> {
+        self.pool.clone().unwrap()
+    }
+
+    pub fn setup_coin(&mut self) -> (Coin, Input) {
+        let input = self.random_predicate(AssetId::BASE, TEST_COIN_AMOUNT, None);
+
+        // add coin to the state
+        let mut coin = CompressedCoin::default();
+        coin.set_owner(*input.input_owner().unwrap());
+        coin.set_amount(TEST_COIN_AMOUNT);
+        coin.set_asset_id(*input.asset_id(&AssetId::BASE).unwrap());
+        let utxo_id = *input.utxo_id().unwrap();
+        self.mock_db
+            .data
+            .lock()
+            .unwrap()
+            .coins
+            .insert(utxo_id, coin.clone());
+        (coin.uncompress(utxo_id), input)
+    }
+
+    pub fn create_output_and_input(&mut self) -> (Output, UnsetInput) {
+        let input = self.random_predicate(AssetId::BASE, 1, None);
+        let output = Output::coin(*input.input_owner().unwrap(), 1, AssetId::BASE);
+        (output, UnsetInput(input))
+    }
+
+    pub fn random_predicate(
+        &mut self,
+        asset_id: AssetId,
+        amount: Word,
+        utxo_id: Option<UtxoId>,
+    ) -> Input {
+        // use predicate inputs to avoid expensive cryptography for signatures
+        let mut predicate_code: Vec<u8> = vec![op::ret(1)].into_iter().collect();
+        // append some randomizing bytes after the predicate has already returned.
+        predicate_code.push(self.rng.gen());
+        let owner = Input::predicate_owner(&predicate_code);
+        Input::coin_predicate(
+            utxo_id.unwrap_or_else(|| self.rng.gen()),
+            owner,
+            amount,
+            asset_id,
+            Default::default(),
+            Default::default(),
+            predicate_code,
+            vec![],
+        )
+        .into_default_estimated()
+    }
+
+    pub fn custom_predicate(
+        &mut self,
+        asset_id: AssetId,
+        amount: Word,
+        code: Vec<u8>,
+        utxo_id: Option<UtxoId>,
+    ) -> Input {
+        let owner = Input::predicate_owner(&code);
+        Input::coin_predicate(
+            utxo_id.unwrap_or_else(|| self.rng.gen()),
+            owner,
+            amount,
+            asset_id,
+            Default::default(),
+            Default::default(),
+            code,
+            vec![],
+        )
+    }
+
+    pub async fn waiting_txs_insertion(
+        &self,
+        mut new_tx_notification_subscribe: Receiver<Bytes32>,
+        mut tx_ids: Vec<TxId>,
+    ) {
+        while !tx_ids.is_empty() {
+            let tx_id = new_tx_notification_subscribe.recv().await.unwrap();
+            let index = tx_ids.iter().position(|id| *id == tx_id).unwrap();
+            tx_ids.remove(index);
+        }
+    }
+}
+
+pub fn create_message_predicate_from_message(
+    amount: Word,
+    nonce: u64,
+) -> (Message, Input) {
+    let predicate = vec![op::ret(1)].into_iter().collect::<Vec<u8>>();
+    let message = MessageV1 {
+        sender: Default::default(),
+        recipient: Input::predicate_owner(&predicate),
+        nonce: nonce.into(),
+        amount,
+        data: vec![],
+        da_height: Default::default(),
+    };
+
+    (
+        message.clone().into(),
+        Input::message_coin_predicate(
+            message.sender,
+            Input::predicate_owner(&predicate),
+            message.amount,
+            message.nonce,
+            Default::default(),
+            predicate,
+            Default::default(),
+        )
+        .into_default_estimated(),
+    )
+}
+
+pub fn create_contract_input(
+    tx_id: TxId,
+    output_index: u16,
+    contract_id: ContractId,
+) -> Input {
+    Input::contract(
+        UtxoId::new(tx_id, output_index),
+        Default::default(),
+        Default::default(),
+        Default::default(),
+        contract_id,
+    )
+}
+
+pub fn create_contract_output(contract_id: ContractId) -> Output {
+    Output::contract_created(contract_id, Contract::default_state_root())
+}
+
+pub struct UnsetInput(Input);
+
+impl UnsetInput {
+    pub fn into_input(self, new_utxo_id: UtxoId) -> Input {
+        let mut input = self.0;
+        match &mut input {
+            Input::CoinSigned(CoinSigned { utxo_id, .. })
+            | Input::CoinPredicate(CoinPredicate { utxo_id, .. })
+            | Input::Contract(ContractInput { utxo_id, .. }) => {
+                *utxo_id = new_utxo_id;
+            }
+            _ => {}
+        }
+        input
+    }
+}
+
+pub trait IntoEstimated {
+    #[cfg(test)]
+    fn into_default_estimated(self) -> Self;
+    fn into_estimated(self, params: &ConsensusParameters) -> Self;
+}
+
+impl IntoEstimated for Input {
+    #[cfg(test)]
+    fn into_default_estimated(self) -> Self {
+        self.into_estimated(&Default::default())
+    }
+
+    fn into_estimated(self, params: &ConsensusParameters) -> Self {
+        let mut tx = TransactionBuilder::script(vec![], vec![])
+            .add_input(self)
+            .finalize();
+        let _ =
+            tx.estimate_predicates(&params.into(), MemoryInstance::new(), &EmptyStorage);
+        tx.inputs()[0].clone()
+    }
+}
diff --git a/crates/services/txpool/src/service/update_sender/tests/utils.rs b/crates/services/txpool_v2/src/tests/utils.rs
similarity index 91%
rename from crates/services/txpool/src/service/update_sender/tests/utils.rs
rename to crates/services/txpool_v2/src/tests/utils.rs
index 71c93859686..2e189db01e7 100644
--- a/crates/services/txpool/src/service/update_sender/tests/utils.rs
+++ b/crates/services/txpool_v2/src/tests/utils.rs
@@ -1,4 +1,40 @@
-use super::*;
+use std::{
+    collections::HashMap,
+    sync::Arc,
+};
+
+use fuel_core_types::{
+    fuel_tx::Bytes32,
+    services::txpool::TransactionStatus,
+    tai64::Tai64,
+};
+use proptest::{
+    prelude::*,
+    prop_oneof,
+};
+use test_strategy::Arbitrary;
+use tokio::time::Instant;
+
+use crate::{
+    tx_status_stream::{
+        State,
+        TxStatusMessage,
+        TxStatusStream,
+        TxUpdate,
+        TxUpdateStream,
+    },
+    update_sender::{
+        CreateChannel,
+        MockSendStatus,
+        Permit,
+        PermitTrait,
+        Permits,
+        SendError,
+        SendStatus,
+        Sender,
+        Tx,
+    },
+};
 
 pub fn transaction_status_strategy() -> impl Strategy<Value = TransactionStatus> {
     prop_oneof![
diff --git a/crates/services/txpool/src/service/update_sender/tx_status_stream.rs b/crates/services/txpool_v2/src/tx_status_stream.rs
similarity index 74%
rename from crates/services/txpool/src/service/update_sender/tx_status_stream.rs
rename to crates/services/txpool_v2/src/tx_status_stream.rs
index dc3adaed495..73e0d7b67fb 100644
--- a/crates/services/txpool/src/service/update_sender/tx_status_stream.rs
+++ b/crates/services/txpool_v2/src/tx_status_stream.rs
@@ -1,5 +1,44 @@
-use crate::service::TxStatusMessage;
-use fuel_core_types::services::txpool::TransactionStatus;
+use fuel_core_types::{
+    fuel_tx::Bytes32,
+    services::txpool::TransactionStatus,
+};
+use std::pin::Pin;
+use tokio_stream::Stream;
+
+#[derive(Debug, Clone)]
+pub struct TxUpdate {
+    pub(crate) tx_id: Bytes32,
+    pub(crate) message: TxStatusMessage,
+}
+
+impl TxUpdate {
+    pub fn new(tx_id: Bytes32, message: TxStatusMessage) -> Self {
+        Self { tx_id, message }
+    }
+
+    pub fn tx_id(&self) -> &Bytes32 {
+        &self.tx_id
+    }
+
+    pub fn into_msg(self) -> TxStatusMessage {
+        self.message
+    }
+}
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum TxStatusMessage {
+    Status(TransactionStatus),
+    FailedStatus,
+}
+
+impl<E> From<Result<TransactionStatus, E>> for TxStatusMessage {
+    fn from(result: Result<TransactionStatus, E>) -> Self {
+        match result {
+            Ok(status) => TxStatusMessage::Status(status),
+            _ => TxStatusMessage::FailedStatus,
+        }
+    }
+}
 
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub(super) enum State {
@@ -101,3 +140,5 @@ impl TxUpdateStream {
         matches!(self.state, State::Closed)
     }
 }
+
+pub type TxStatusStream = Pin<Box<dyn Stream<Item = TxStatusMessage> + Send + Sync>>;
diff --git a/crates/services/txpool/src/service/update_sender.rs b/crates/services/txpool_v2/src/update_sender.rs
similarity index 79%
rename from crates/services/txpool/src/service/update_sender.rs
rename to crates/services/txpool_v2/src/update_sender.rs
index 9362d934dd6..bfefd041883 100644
--- a/crates/services/txpool/src/service/update_sender.rs
+++ b/crates/services/txpool_v2/src/update_sender.rs
@@ -1,13 +1,22 @@
 use std::{
     collections::HashMap,
-    pin::Pin,
+    sync::Arc,
     time::Duration,
 };
 
-use super::*;
+use fuel_core_types::{
+    fuel_tx::{
+        Bytes32,
+        TxId,
+    },
+    fuel_types::BlockHeight,
+    services::txpool::TransactionStatus,
+    tai64::Tai64,
+};
 use parking_lot::Mutex;
 use tokio::{
     sync::{
+        broadcast,
         mpsc::{
             self,
             error::TrySendError,
@@ -17,22 +26,69 @@ use tokio::{
     },
     time::Instant,
 };
-use tokio_stream::{
-    wrappers::ReceiverStream,
-    Stream,
+use tokio_stream::wrappers::ReceiverStream;
+
+use crate::{
+    error::Error,
+    tx_status_stream::{
+        TxStatusMessage,
+        TxStatusStream,
+        TxUpdate,
+        TxUpdateStream,
+    },
 };
 
-use tx_status_stream::TxUpdateStream;
-
-#[cfg(test)]
-mod tests;
-mod tx_status_stream;
-
 /// Subscriber channel buffer size.
 /// Subscribers will only ever get at most a submitted
 /// and final transaction status update.
 const BUFFER_SIZE: usize = 2;
 
+#[derive(Clone)]
+pub struct TxStatusChange {
+    pub new_tx_notification_sender: broadcast::Sender<TxId>,
+    pub update_sender: UpdateSender,
+}
+
+impl TxStatusChange {
+    pub fn new(capacity: usize, ttl: Duration) -> Self {
+        let (new_tx_notification_sender, _) = broadcast::channel(capacity);
+        let update_sender = UpdateSender::new(capacity, ttl);
+        Self {
+            new_tx_notification_sender,
+            update_sender,
+        }
+    }
+
+    pub fn send_complete(
+        &self,
+        id: Bytes32,
+        block_height: &BlockHeight,
+        message: TxStatusMessage,
+    ) {
+        tracing::info!("Transaction {id} successfully included in block {block_height}");
+        self.update_sender.send(TxUpdate::new(id, message));
+    }
+
+    pub fn send_submitted(&self, id: Bytes32, time: Tai64) {
+        tracing::info!("Transaction {id} successfully submitted to the tx pool");
+        let _ = self.new_tx_notification_sender.send(id);
+        self.update_sender.send(TxUpdate::new(
+            id,
+            TxStatusMessage::Status(TransactionStatus::Submitted { time }),
+        ));
+    }
+
+    pub fn send_squeezed_out(&self, id: Bytes32, reason: Error) {
+        tracing::info!("Transaction {id} squeezed out because {reason}");
+        self.update_sender.send(TxUpdate::new(
+            id,
+            TxStatusMessage::Status(TransactionStatus::SqueezedOut {
+                reason: reason.to_string(),
+            }),
+        ));
+    }
+}
+
 /// UpdateSender is responsible for managing subscribers
 /// and sending transaction status updates to them.
 ///
@@ -40,11 +96,11 @@ const BUFFER_SIZE: usize = 2;
 #[derive(Debug)]
 pub struct UpdateSender {
     /// Map of senders, indexed by transaction hash.
-    senders: Arc<Mutex<SenderMap<Permit, Tx>>>,
+    pub(crate) senders: Arc<Mutex<SenderMap<Permit, Tx>>>,
     /// Semaphore used to limit the number of concurrent subscribers.
-    permits: GetPermit,
+    pub(crate) permits: GetPermit,
     /// TTL for senders
-    ttl: Duration,
+    pub(crate) ttl: Duration,
 }
 
 /// Error returned when a transaction status update cannot be sent.
@@ -68,23 +124,20 @@ pub type Tx = Box<dyn SendStatus + Send + Sync + 'static>;
 /// A map of senders, indexed by transaction hash.
 type SenderMap<P, Tx> = HashMap<Bytes32, Vec<Sender<P, Tx>>>;
 
-/// A stream of transaction status updates.
-pub type TxStatusStream = Pin<Box<dyn Stream<Item = TxStatusMessage> + Send + Sync>>;
-
 /// Gives permits to subscribe once they are available.
 type GetPermit = Arc<dyn PermitsDebug + Send + Sync>;
 
 /// A sender that is subscribed to transaction status updates
 /// for a specific transaction hash.
-struct Sender<P = OwnedSemaphorePermit, Tx = mpsc::Sender<TxStatusMessage>> {
+pub(crate) struct Sender<P = OwnedSemaphorePermit, Tx = mpsc::Sender<TxStatusMessage>> {
     /// The permit used to subscribe to transaction status updates.
-    _permit: P,
+    pub(crate) _permit: P,
     /// The stream of transaction status updates.
-    stream: TxUpdateStream,
+    pub(crate) stream: TxUpdateStream,
     /// The sending end of the subscriber channel.
-    tx: Tx,
+    pub(crate) tx: Tx,
     /// time that this sender was created
-    created: Instant,
+    pub(crate) created: Instant,
 }
 
 /// A trait for sending transaction status updates.
@@ -110,13 +163,13 @@ pub trait CreateChannel {
 
 /// A trait for getting a new permit.
 #[cfg_attr(test, mockall::automock(type P = ();))]
-trait Permits {
+pub(crate) trait Permits {
     /// Try to acquire a permit.
     fn try_acquire(self: Arc<Self>) -> Option<Permit>;
 }
 
 /// Combines `Permits` and `std::fmt::Debug`.
-trait PermitsDebug: Permits + std::fmt::Debug {}
+pub(crate) trait PermitsDebug: Permits + std::fmt::Debug {}
 
 impl<T: Permits + std::fmt::Debug> PermitsDebug for T {}
 
@@ -266,7 +319,7 @@ impl UpdateSender {
 }
 
 // Create and subscribe a new channel to the senders map
-fn subscribe<P, C>(
+pub(crate) fn subscribe<P, C>(
     tx_id: Bytes32,                 // transaction ID
     senders: &mut SenderMap<P, Tx>, // mutable senders map reference
     permit: P,                      // permit of type P
diff --git a/crates/services/upgradable-executor/src/executor.rs b/crates/services/upgradable-executor/src/executor.rs
index e4c6e31d171..fd8af535ba8 100644
--- a/crates/services/upgradable-executor/src/executor.rs
+++ b/crates/services/upgradable-executor/src/executor.rs
@@ -150,7 +150,10 @@ impl<S, R> Executor<S, R> {
         ("0-33-0", 8),
         ("0-34-0", 9),
         ("0-35-0", 10),
-        ("0-36-0", LATEST_STATE_TRANSITION_VERSION),
+        ("0-36-0", 11),
+        ("0-37-0", 12),
+        ("0-37-1", 13),
+        ("0-38-0", LATEST_STATE_TRANSITION_VERSION),
     ];
 
     pub fn new(
diff --git a/crates/services/upgradable-executor/wasm-executor/Cargo.toml b/crates/services/upgradable-executor/wasm-executor/Cargo.toml
index 687a338e046..6b64b98d698 100644
--- a/crates/services/upgradable-executor/wasm-executor/Cargo.toml
+++ b/crates/services/upgradable-executor/wasm-executor/Cargo.toml
@@ -33,7 +33,9 @@ fuel-core-types-v0 = { package = "fuel-core-types", version = "0.35.0", default-
 ], optional = true }
 postcard = { workspace = true }
 serde = { workspace = true }
-serde_json = { workspace = true, default-features = false }
+serde_json = { workspace = true, default-features = false, features = [
+  "alloc",
+] }
 
 [dev-dependencies]
 proptest = { workspace = true }
diff --git a/crates/storage/Cargo.toml b/crates/storage/Cargo.toml
index fbb71e24327..8750f3ae8b0 100644
--- a/crates/storage/Cargo.toml
+++ b/crates/storage/Cargo.toml
@@ -28,7 +28,7 @@ impl-tools = "0.10"
 itertools = { workspace = true, features = ["use_alloc"] }
 mockall = { workspace = true, optional = true }
 num_enum = { workspace = true }
-paste = "1"
+paste = { workspace = true }
 postcard = { workspace = true, features = ["alloc"] }
 primitive-types = { workspace = true, default-features = false }
 rand = { workspace = true, optional = true }
diff --git a/crates/storage/src/iter.rs b/crates/storage/src/iter.rs
index a00232876df..37c38463cc8 100644
--- a/crates/storage/src/iter.rs
+++ b/crates/storage/src/iter.rs
@@ -24,6 +24,8 @@ use alloc::{
     vec::Vec,
 };
 
+pub mod changes_iterator;
+
 // TODO: BoxedIter to be used until RPITIT lands in stable rust.
 /// A boxed variant of the iterator that can be used as a return type of the traits.
 pub struct BoxedIter<'a, T> {
diff --git a/crates/storage/src/iter/changes_iterator.rs b/crates/storage/src/iter/changes_iterator.rs
new file mode 100644
index 00000000000..9a3e566bdf3
--- /dev/null
+++ b/crates/storage/src/iter/changes_iterator.rs
@@ -0,0 +1,103 @@
+//! A type that allows to iterate over the `Changes`.
+
+use crate::{
+    iter::{
+        BoxedIter,
+        IntoBoxedIter,
+        IterDirection,
+        IterableStore,
+    },
+    kv_store::{
+        KVItem,
+        KeyValueInspect,
+        StorageColumn,
+        Value,
+        WriteOperation,
+    },
+    transactional::Changes,
+};
+
+/// A type that allows to iterate over the `Changes`.
+pub struct ChangesIterator<'a, Column> {
+    changes: &'a Changes,
+    _marker: core::marker::PhantomData<Column>,
+}
+
+impl<'a, Description> ChangesIterator<'a, Description> {
+    /// Creates a new instance of the `ChangesIterator`.
+    pub fn new(changes: &'a Changes) -> Self {
+        Self {
+            changes,
+            _marker: Default::default(),
+        }
+    }
+}
+
+impl<'a, Column> KeyValueInspect for ChangesIterator<'a, Column>
+where
+    Column: StorageColumn,
+{
+    type Column = Column;
+
+    fn get(&self, key: &[u8], column: Self::Column) -> crate::Result<Option<Value>> {
+        Ok(self
+            .changes
+            .get(&column.id())
+            .and_then(|tree| tree.get(key))
+            .and_then(|operation| match operation {
+                WriteOperation::Insert(value) => Some(value.clone()),
+                WriteOperation::Remove => None,
+            }))
+    }
+}
+
+impl<'a, Column> IterableStore for ChangesIterator<'a, Column>
+where
+    Column: StorageColumn,
+{
+    fn iter_store(
+        &self,
+        column: Self::Column,
+        prefix: Option<&[u8]>,
+        start: Option<&[u8]>,
+        direction: IterDirection,
+    ) -> BoxedIter<KVItem> {
+        if let Some(tree) = self.changes.get(&column.id()) {
+            crate::iter::iterator(tree, prefix, start, direction)
+                .filter_map(|(key, value)| match value {
+                    WriteOperation::Insert(value) => {
+                        Some((key.clone().into(), value.clone()))
+                    }
+                    WriteOperation::Remove => None,
+                })
+                .map(Ok)
+                .into_boxed()
+        } else {
+            core::iter::empty().into_boxed()
+        }
+    }
+
+    fn iter_store_keys(
+        &self,
+        column: Self::Column,
+        prefix: Option<&[u8]>,
+        start: Option<&[u8]>,
+        direction: IterDirection,
+    ) -> BoxedIter<crate::kv_store::KeyItem> {
+        // We cannot define iter_store_keys appropriately for the `ChangesIterator`,
+        // because we have to filter out the keys that were removed, which are
+        // marked as `WriteOperation::Remove` in the value
+        // copied as-is from the above function, but only to return keys
+        if let Some(tree) = self.changes.get(&column.id()) {
+            crate::iter::iterator(tree, prefix, start, direction)
+                .filter_map(|(key, value)| match value {
+                    WriteOperation::Insert(_) => Some(key.clone().into()),
+                    WriteOperation::Remove => None,
+                })
+                .map(Ok)
+                .into_boxed()
+        } else {
+            core::iter::empty().into_boxed()
+        }
+    }
+}
diff --git a/crates/storage/src/lib.rs b/crates/storage/src/lib.rs
index ee971992a06..c54fbf889b8 100644
--- a/crates/storage/src/lib.rs
+++ b/crates/storage/src/lib.rs
@@ -27,6 +27,7 @@ use alloc::{
 pub use fuel_vm_private::{
     fuel_storage::*,
     storage::{
+        predicate::PredicateStorageRequirements,
         ContractsAssetsStorage,
         InterpreterStorage,
     },
@@ -70,7 +71,7 @@ pub enum Error {
     #[display(fmt = "error occurred in the underlying datastore `{_0:?}`")]
     DatabaseError(Box<dyn core::fmt::Debug + Send + Sync>),
     /// This error should be created with `not_found` macro.
-    #[display(fmt = "resource of type `{_0}` was not found at the: {_1}")]
+    #[display(fmt = "resource was not found in table `{_0}` at the: {_1}")]
     NotFound(&'static str, &'static str),
     // TODO: Do we need this type at all?
     /// Unknown or not expected(by architecture) error.
@@ -194,7 +195,7 @@ macro_rules! not_found {
     };
     ($ty: path) => {
         $crate::Error::NotFound(
-            ::core::any::type_name::<<$ty as $crate::Mappable>::OwnedValue>(),
+            ::core::any::type_name::<$ty>(),
             concat!(file!(), ":", line!()),
         )
     };
@@ -209,12 +210,12 @@ mod test {
         #[rustfmt::skip]
         assert_eq!(
             format!("{}", not_found!("BlockId")),
-            format!("resource of type `BlockId` was not found at the: {}:{}", file!(), line!() - 1)
+            format!("resource was not found in table `BlockId` at the: {}:{}", file!(), line!() - 1)
         );
         #[rustfmt::skip]
         assert_eq!(
             format!("{}", not_found!(Coins)),
-            format!("resource of type `fuel_core_types::entities::coins::coin::CompressedCoin` was not found at the: {}:{}", file!(), line!() - 1)
+            format!("resource was not found in table `fuel_core_storage::tables::Coins` at the: {}:{}", file!(), line!() - 1)
         );
     }
 }
diff --git a/crates/storage/src/structured_storage.rs b/crates/storage/src/structured_storage.rs
index 507cd1f26d0..e78e9637484 100644
--- a/crates/storage/src/structured_storage.rs
+++ b/crates/storage/src/structured_storage.rs
@@ -47,13 +47,23 @@ use crate::{
 use core::ops::Deref;
 
 #[cfg(feature = "std")]
-use std::borrow::Cow;
+use std::{
+    borrow::Cow,
+    fmt::Debug,
+};
 
 #[cfg(not(feature = "std"))]
-use alloc::borrow::Cow;
+use alloc::{
+    borrow::Cow,
+    fmt::Debug,
+};
 
 #[cfg(feature = "alloc")]
 use alloc::vec::Vec;
+use fuel_vm_private::storage::{
+    predicate::PredicateStorageRequirements,
+    BlobData,
+};
 
 pub mod balances;
 pub mod blobs;
@@ -144,6 +154,16 @@ where
     }
 }
 
+impl<S> PredicateStorageRequirements for StructuredStorage<S>
+where
+    Self: StorageRead<BlobData>,
+    Self::Error: Debug,
+{
+    fn storage_error_to_string(error: Self::Error) -> alloc::string::String {
+        alloc::format!("{:?}", error)
+    }
+}
+
 impl<S> KeyValueMutate for StructuredStorage<S>
 where
     S: KeyValueMutate,
diff --git a/crates/types/Cargo.toml b/crates/types/Cargo.toml
index e889d03c8ba..58b9268e6c1 100644
--- a/crates/types/Cargo.toml
+++ b/crates/types/Cargo.toml
@@ -34,6 +34,7 @@ zeroize = "1.5"
 default = ["std"]
 alloc = ["fuel-vm-private/alloc"]
 serde = ["dep:serde", "fuel-vm-private/serde"]
+da-compression = ["fuel-vm-private/da-compression"]
 std = ["alloc", "fuel-vm-private/std", "bs58"]
 random = ["dep:rand", "fuel-vm-private/random"]
 test-helpers = ["random", "fuel-vm-private/test-helpers"]
diff --git a/crates/types/src/blockchain/block.rs b/crates/types/src/blockchain/block.rs
index d89a5e03682..7611082f232 100644
--- a/crates/types/src/blockchain/block.rs
+++ b/crates/types/src/blockchain/block.rs
@@ -59,7 +59,8 @@ pub struct BlockV1<TransactionRepresentation = Transaction> {
     transactions: Vec<TransactionRepresentation>,
 }
 
-/// Compressed version of the fuel `Block`.
+/// Fuel `Block` with transactions represented by their id only.
+/// Note that this is different from the DA compressed blocks.
 pub type CompressedBlock = Block<TxId>;
 
 /// Fuel block with all transaction data included
@@ -68,7 +69,7 @@ pub type CompressedBlock = Block<TxId>;
 /// transactions to produce a [`Block`] or
 /// it can be created with pre-executed transactions in
 /// order to validate they were constructed correctly.
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub struct PartialFuelBlock {
     /// The partial header.
     pub header: PartialBlockHeader,
@@ -121,6 +122,7 @@ impl Block<Transaction> {
     }
 
     /// Compresses the fuel block and replaces transactions with hashes.
+    /// Note that this is different from the DA compression process.
     pub fn compress(&self, chain_id: &ChainId) -> CompressedBlock {
         match self {
             Block::V1(inner) => {
@@ -184,6 +186,13 @@ impl<TransactionRepresentation> Block<TransactionRepresentation> {
         }
     }
 
+    /// Get the executed transactions as a `Vec` type.
+    pub fn transactions_vec(&self) -> &Vec<TransactionRepresentation> {
+        match self {
+            Block::V1(inner) => &inner.transactions,
+        }
+    }
+
     /// Get the complete header.
     pub fn header(&self) -> &BlockHeader {
         match self {
diff --git a/crates/types/src/blockchain/header.rs b/crates/types/src/blockchain/header.rs
index eecf4dbbaee..195632c1d97 100644
--- a/crates/types/src/blockchain/header.rs
+++ b/crates/types/src/blockchain/header.rs
@@ -148,9 +148,9 @@ impl BlockHeader {
     }
 }
 
-#[derive(Copy, Clone, Debug)]
+#[derive(Copy, Clone, Debug, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
-#[cfg_attr(any(test, feature = "test-helpers"), derive(Default))]
+#[derive(Default)]
 /// A partially complete fuel block header that does not
 /// have any generated fields because it has not been executed yet.
 pub struct PartialBlockHeader {
@@ -166,7 +166,7 @@ pub type ConsensusParametersVersion = u32;
 pub type StateTransitionBytecodeVersion = u32;
 
 /// The latest version of the state transition bytecode.
-pub const LATEST_STATE_TRANSITION_VERSION: StateTransitionBytecodeVersion = 11;
+pub const LATEST_STATE_TRANSITION_VERSION: StateTransitionBytecodeVersion = 14;
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
 #[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
@@ -188,7 +188,6 @@ pub struct ApplicationHeader<Generated> {
     pub generated: Generated,
 }
 
-#[cfg(any(test, feature = "test-helpers"))]
 impl<Generated> Default for ApplicationHeader<Generated>
 where
     Generated: Default,
@@ -543,7 +542,6 @@ impl ConsensusHeader<GeneratedConsensusFields> {
     }
 }
 
-#[cfg(any(test, feature = "test-helpers"))]
 impl<T> Default for ConsensusHeader<T>
 where
     T: Default,
diff --git a/crates/types/src/blockchain/primitives.rs b/crates/types/src/blockchain/primitives.rs
index 768c28ced91..f05826e186e 100644
--- a/crates/types/src/blockchain/primitives.rs
+++ b/crates/types/src/blockchain/primitives.rs
@@ -28,9 +28,9 @@ use zeroize::Zeroize;
 #[cfg(feature = "alloc")]
 use alloc::vec::Vec;
 
-#[derive(Clone, Copy, Debug, Default)]
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 /// Empty generated fields.
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Default)]
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
 pub struct Empty;
 
 /// A cryptographically secure hash, identifying a block.
@@ -153,9 +153,7 @@ impl rand::distributions::Distribution<DaBlockHeight> for rand::distributions::S
 }
 
 /// Wrapper around [`fuel_crypto::SecretKey`] to implement [`secrecy`] marker traits
-#[derive(
-    Default, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Zeroize, Deref, From,
-)]
+#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, Zeroize, Deref, From)]
 #[repr(transparent)]
 pub struct SecretKeyWrapper(SecretKey);
 
diff --git a/crates/types/src/lib.rs b/crates/types/src/lib.rs
index 85e38aa8767..7bf1d2b24ec 100644
--- a/crates/types/src/lib.rs
+++ b/crates/types/src/lib.rs
@@ -12,6 +12,9 @@
 #[cfg(feature = "alloc")]
 extern crate alloc;
 
+#[doc(no_inline)]
+#[cfg(feature = "da-compression")]
+pub use fuel_vm_private::fuel_compression;
 #[doc(no_inline)]
 pub use fuel_vm_private::{
     fuel_asm,
@@ -61,6 +64,7 @@ pub mod fuel_vm {
         },
         script_with_data_offset,
         state,
+        storage::predicate,
         storage::ContractsAssetKey,
         storage::ContractsStateKey,
         storage::UploadedBytecode,
diff --git a/crates/types/src/services/executor.rs b/crates/types/src/services/executor.rs
index abe0fb395bc..b8c0dfda407 100644
--- a/crates/types/src/services/executor.rs
+++ b/crates/types/src/services/executor.rs
@@ -264,8 +264,10 @@ pub enum Error {
     OutputAlreadyExists,
     #[display(fmt = "The computed fee caused an integer overflow")]
     FeeOverflow,
-    #[display(fmt = "The computed gas caused an integer overflow")]
-    GasOverflow,
+    #[display(
+        fmt = "The computed gas caused an integer overflow. reason: {_0}, Augend: {_1}, Addend: {_2}"
+    )]
+    GasOverflow(String, u64, u64),
     #[display(fmt = "The computed transaction size caused an integer overflow")]
     TxSizeOverflow,
     #[display(fmt = "The block is missing `Mint` transaction.")]
diff --git a/crates/types/src/services/p2p.rs b/crates/types/src/services/p2p.rs
index e425132522a..e6659a7db54 100644
--- a/crates/types/src/services/p2p.rs
+++ b/crates/types/src/services/p2p.rs
@@ -44,21 +44,19 @@ pub struct GossipsubMessageInfo {
     pub peer_id: PeerId,
 }
 
-// TODO: Maybe we can remove most of types from here directly into P2P
-
-/// Reporting levels on the status of a message received via Gossip
+/// Status of a message received via Gossip
 #[derive(Clone, Copy, PartialEq, Eq, Debug, Hash)]
 pub enum GossipsubMessageAcceptance {
-    /// Report whether the gossiped message is valid and safe to rebroadcast
+    /// The gossiped message is valid and safe to rebroadcast.
     Accept,
-    /// Ignore the received message and prevent further gossiping
-    Reject,
-    /// Punish the gossip sender for providing invalid
-    /// (or malicious) data and prevent further gossiping
+    /// The gossiped message is invalid and should be ignored.
     Ignore,
+    /// The gossiped message is invalid and anyone relaying it should be penalized.
+    Reject,
 }
 
 /// A gossipped message from the network containing all relevant data.
+// TODO: `T` should be inside of the `Arc` since vi broadcast it via the channel.
 #[derive(Debug, Clone)]
 pub struct GossipData<T> {
     /// The gossipped message payload
diff --git a/crates/types/src/services/txpool.rs b/crates/types/src/services/txpool.rs
index e1b047e27ff..55f0d6f96ca 100644
--- a/crates/types/src/services/txpool.rs
+++ b/crates/types/src/services/txpool.rs
@@ -43,46 +43,140 @@ use tai64::Tai64;
 /// Pool transaction wrapped in an Arc for thread-safe sharing
 pub type ArcPoolTx = Arc<PoolTransaction>;
 
+/// Metadata for the transaction pool.
+#[derive(Debug, Copy, Clone, Eq, PartialEq)]
+pub struct Metadata {
+    version: ConsensusParametersVersion,
+    size: Option<usize>,
+    max_gas_price: Word,
+    #[cfg(feature = "test-helpers")]
+    max_gas: Option<Word>,
+    #[cfg(feature = "test-helpers")]
+    tx_id: Option<TxId>,
+}
+
+impl Metadata {
+    /// Create a new metadata for the transaction from the pool.
+    pub fn new(
+        version: ConsensusParametersVersion,
+        size: usize,
+        max_gas_price: Word,
+    ) -> Self {
+        Self {
+            version,
+            size: Some(size),
+            max_gas_price,
+            #[cfg(feature = "test-helpers")]
+            max_gas: None,
+            #[cfg(feature = "test-helpers")]
+            tx_id: None,
+        }
+    }
+
+    /// Create a new test metadata for the transaction from the pool.
+    #[cfg(feature = "test-helpers")]
+    pub fn new_test(
+        version: ConsensusParametersVersion,
+        max_gas: Option<u64>,
+        tx_id: Option<TxId>,
+    ) -> Self {
+        Self {
+            version,
+            size: None,
+            max_gas_price: 0,
+            max_gas,
+            tx_id,
+        }
+    }
+
+    /// Returns the max gas price for the transaction.
+    pub fn max_gas_price(&self) -> Word {
+        self.max_gas_price
+    }
+}
+
 /// Transaction type used by the transaction pool.
 /// Not all `fuel_tx::Transaction` variants are supported by the txpool.
-#[derive(Debug, Eq, PartialEq)]
+#[derive(Debug, Clone, Eq, PartialEq)]
 pub enum PoolTransaction {
     /// Script
-    Script(Checked<Script>, ConsensusParametersVersion),
+    Script(Checked<Script>, Metadata),
     /// Create
-    Create(Checked<Create>, ConsensusParametersVersion),
+    Create(Checked<Create>, Metadata),
     /// Upgrade
-    Upgrade(Checked<Upgrade>, ConsensusParametersVersion),
+    Upgrade(Checked<Upgrade>, Metadata),
     /// Upload
-    Upload(Checked<Upload>, ConsensusParametersVersion),
+    Upload(Checked<Upload>, Metadata),
     /// Blob
-    Blob(Checked<Blob>, ConsensusParametersVersion),
+    Blob(Checked<Blob>, Metadata),
 }
 
 impl PoolTransaction {
     /// Returns the version of the consensus parameters used to create `Checked` transaction.
     pub fn used_consensus_parameters_version(&self) -> ConsensusParametersVersion {
-        match self {
-            PoolTransaction::Script(_, version)
-            | PoolTransaction::Create(_, version)
-            | PoolTransaction::Upgrade(_, version)
-            | PoolTransaction::Upload(_, version)
-            | PoolTransaction::Blob(_, version) => *version,
-        }
+        self.metadata_inner().version
     }
 
     /// Used for accounting purposes when charging byte based fees.
     pub fn metered_bytes_size(&self) -> usize {
+        if let Some(size) = self.metadata_inner().size {
+            size
+        } else {
+            match self {
+                PoolTransaction::Script(tx, _) => tx.transaction().metered_bytes_size(),
+                PoolTransaction::Create(tx, _) => tx.transaction().metered_bytes_size(),
+                PoolTransaction::Upgrade(tx, _) => tx.transaction().metered_bytes_size(),
+                PoolTransaction::Upload(tx, _) => tx.transaction().metered_bytes_size(),
+                PoolTransaction::Blob(tx, _) => tx.transaction().metered_bytes_size(),
+            }
+        }
+    }
+
+    /// Returns the maximum gas price for the transaction.
+    pub fn max_gas_price(&self) -> Word {
+        match self {
+            PoolTransaction::Script(_, metadata) => metadata.max_gas_price,
+            PoolTransaction::Create(_, metadata) => metadata.max_gas_price,
+            PoolTransaction::Upgrade(_, metadata) => metadata.max_gas_price,
+            PoolTransaction::Upload(_, metadata) => metadata.max_gas_price,
+            PoolTransaction::Blob(_, metadata) => metadata.max_gas_price,
+        }
+    }
+
+    #[cfg(feature = "test-helpers")]
+    fn id_inner(&self) -> TxId {
+        match self {
+            PoolTransaction::Script(tx, _) => tx.id(),
+            PoolTransaction::Create(tx, _) => tx.id(),
+            PoolTransaction::Upgrade(tx, _) => tx.id(),
+            PoolTransaction::Upload(tx, _) => tx.id(),
+            PoolTransaction::Blob(tx, _) => tx.id(),
+        }
+    }
+
+    #[cfg(feature = "test-helpers")]
+    fn max_gas_inner(&self) -> Word {
+        match self {
+            PoolTransaction::Script(tx, _) => tx.metadata().max_gas,
+            PoolTransaction::Create(tx, _) => tx.metadata().max_gas,
+            PoolTransaction::Upgrade(tx, _) => tx.metadata().max_gas,
+            PoolTransaction::Upload(tx, _) => tx.metadata().max_gas,
+            PoolTransaction::Blob(tx, _) => tx.metadata().max_gas,
+        }
+    }
+
+    fn metadata_inner(&self) -> &Metadata {
         match self {
-            PoolTransaction::Script(tx, _) => tx.transaction().metered_bytes_size(),
-            PoolTransaction::Create(tx, _) => tx.transaction().metered_bytes_size(),
-            PoolTransaction::Upgrade(tx, _) => tx.transaction().metered_bytes_size(),
-            PoolTransaction::Upload(tx, _) => tx.transaction().metered_bytes_size(),
-            PoolTransaction::Blob(tx, _) => tx.transaction().metered_bytes_size(),
+            PoolTransaction::Script(_, metadata) => metadata,
+            PoolTransaction::Create(_, metadata) => metadata,
+            PoolTransaction::Upgrade(_, metadata) => metadata,
+            PoolTransaction::Upload(_, metadata) => metadata,
+            PoolTransaction::Blob(_, metadata) => metadata,
         }
     }
 
     /// Returns the transaction ID
+    #[cfg(not(feature = "test-helpers"))]
     pub fn id(&self) -> TxId {
         match self {
             PoolTransaction::Script(tx, _) => tx.id(),
@@ -93,7 +187,18 @@ impl PoolTransaction {
         }
     }
 
+    /// Returns the transaction ID
+    #[cfg(feature = "test-helpers")]
+    pub fn id(&self) -> TxId {
+        if let Some(tx_id) = self.metadata_inner().tx_id {
+            tx_id
+        } else {
+            self.id_inner()
+        }
+    }
+
     /// Returns the maximum amount of gas that the transaction can consume.
+    #[cfg(not(feature = "test-helpers"))]
     pub fn max_gas(&self) -> Word {
         match self {
             PoolTransaction::Script(tx, _) => tx.metadata().max_gas,
@@ -103,6 +208,16 @@ impl PoolTransaction {
             PoolTransaction::Blob(tx, _) => tx.metadata().max_gas,
         }
     }
+
+    /// Returns the maximum amount of gas that the transaction can consume.
+    #[cfg(feature = "test-helpers")]
+    pub fn max_gas(&self) -> Word {
+        if let Some(max_gas) = self.metadata_inner().max_gas {
+            max_gas
+        } else {
+            self.max_gas_inner()
+        }
+    }
 }
 
 #[allow(missing_docs)]
@@ -160,6 +275,18 @@ impl PoolTransaction {
     }
 }
 
+impl From<PoolTransaction> for CheckedTransaction {
+    fn from(tx: PoolTransaction) -> Self {
+        match tx {
+            PoolTransaction::Script(tx, _) => CheckedTransaction::Script(tx),
+            PoolTransaction::Create(tx, _) => CheckedTransaction::Create(tx),
+            PoolTransaction::Upgrade(tx, _) => CheckedTransaction::Upgrade(tx),
+            PoolTransaction::Upload(tx, _) => CheckedTransaction::Upload(tx),
+            PoolTransaction::Blob(tx, _) => CheckedTransaction::Blob(tx),
+        }
+    }
+}
+
 impl From<&PoolTransaction> for Transaction {
     fn from(tx: &PoolTransaction) -> Self {
         match tx {
diff --git a/tests/Cargo.toml b/tests/Cargo.toml
index 2d60439028f..3c4ad33502e 100644
--- a/tests/Cargo.toml
+++ b/tests/Cargo.toml
@@ -34,6 +34,7 @@ fuel-core = { path = "../crates/fuel-core", default-features = false, features =
 fuel-core-benches = { path = "../benches" }
 fuel-core-bin = { path = "../bin/fuel-core", features = ["parquet", "p2p"] }
 fuel-core-client = { path = "../crates/client", features = ["test-helpers"] }
+fuel-core-compression = { path = "../crates/compression" }
 fuel-core-executor = { workspace = true }
 fuel-core-gas-price-service = { path = "../crates/services/gas_price_service" }
 fuel-core-p2p = { path = "../crates/services/p2p", features = [
@@ -45,7 +46,7 @@ fuel-core-relayer = { path = "../crates/services/relayer", features = [
 ], optional = true }
 fuel-core-storage = { path = "../crates/storage", features = ["test-helpers"] }
 fuel-core-trace = { path = "../crates/trace" }
-fuel-core-txpool = { path = "../crates/services/txpool", features = [
+fuel-core-txpool = { path = "../crates/services/txpool_v2", features = [
   "test-helpers",
 ] }
 fuel-core-types = { path = "../crates/types", features = ["test-helpers"] }
@@ -56,6 +57,7 @@ hyper = { workspace = true, features = ["server"] }
 insta = { workspace = true }
 itertools = { workspace = true }
 k256 = { version = "0.13.3", features = ["ecdsa-core"] }
+postcard = { workspace = true }
 primitive-types = { workspace = true, default-features = false }
 rand = { workspace = true }
 reqwest = { workspace = true }
diff --git a/tests/test-helpers/Cargo.toml b/tests/test-helpers/Cargo.toml
index 219d949fd87..a9ce35236c1 100644
--- a/tests/test-helpers/Cargo.toml
+++ b/tests/test-helpers/Cargo.toml
@@ -26,7 +26,7 @@ fuel-core-storage = { path = "../../crates/storage", features = [
   "test-helpers",
 ] }
 fuel-core-trace = { path = "../../crates/trace" }
-fuel-core-txpool = { path = "../../crates/services/txpool", features = [
+fuel-core-txpool = { path = "../../crates/services/txpool_v2", features = [
   "test-helpers",
 ] }
 fuel-core-types = { path = "../../crates/types", features = ["test-helpers"] }
diff --git a/tests/test-helpers/src/builder.rs b/tests/test-helpers/src/builder.rs
index 348b4bafca2..91134ceb7c3 100644
--- a/tests/test-helpers/src/builder.rs
+++ b/tests/test-helpers/src/builder.rs
@@ -225,7 +225,7 @@ impl TestSetupBuilder {
 
         let config = Config {
             utxo_validation: self.utxo_validation,
-            txpool: fuel_core_txpool::Config::default(),
+            txpool: fuel_core_txpool::config::Config::default(),
             block_production: self.trigger,
             starting_gas_price: self.starting_gas_price,
             ..Config::local_node_with_configs(chain_conf, state)
diff --git a/tests/tests/blob.rs b/tests/tests/blob.rs
index 1894970efc4..813dfea1418 100644
--- a/tests/tests/blob.rs
+++ b/tests/tests/blob.rs
@@ -1,6 +1,7 @@
 #![allow(non_snake_case)]
 
 use fuel_core::{
+    chain_config::StateConfig,
     database::{
         database_description::on_chain::OnChain,
         Database,
@@ -12,20 +13,36 @@ use fuel_core_client::client::{
     types::TransactionStatus,
     FuelClient,
 };
+use fuel_core_storage::transactional::AtomicView;
 use fuel_core_types::{
     fuel_asm::{
         op,
         GTFArgs,
+        Instruction,
         RegId,
     },
     fuel_tx::{
         BlobBody,
         BlobId,
         BlobIdExt,
+        Finalizable,
+        Input,
+        Transaction,
         TransactionBuilder,
     },
     fuel_types::canonical::Serialize,
-    fuel_vm::checked_transaction::IntoChecked,
+    fuel_vm::{
+        checked_transaction::IntoChecked,
+        constraints::reg_key::{
+            IS,
+            SSP,
+            ZERO,
+        },
+        interpreter::{
+            ExecutableTransaction,
+            MemoryInstance,
+        },
+    },
 };
 use tokio::io;
 
@@ -41,6 +58,10 @@ impl TestContext {
             ..Config::local_node()
         };
 
+        Self::new_with_config(config).await
+    }
+
+    async fn new_with_config(config: Config) -> Self {
         let node = FuelService::from_database(Database::<OnChain>::in_memory(), config)
             .await
             .unwrap();
@@ -55,23 +76,59 @@ impl TestContext {
     async fn new_blob(
         &mut self,
         blob_data: Vec<u8>,
+    ) -> io::Result<(TransactionStatus, BlobId)> {
+        self.new_blob_with_input(blob_data, None).await
+    }
+
+    async fn new_blob_with_input(
+        &mut self,
+        blob_data: Vec<u8>,
+        input: Option<Input>,
     ) -> io::Result<(TransactionStatus, BlobId)> {
         let blob_id = BlobId::compute(&blob_data);
-        let tx = TransactionBuilder::blob(BlobBody {
+        let mut builder = TransactionBuilder::blob(BlobBody {
             id: blob_id,
             witness_index: 0,
-        })
-        .add_witness(blob_data.into())
-        .add_random_fee_input()
-        .finalize_as_transaction()
-        .into_checked(Default::default(), &Default::default())
-        .expect("Cannot check transaction");
+        });
+        builder.add_witness(blob_data.into());
+
+        if let Some(input) = input {
+            builder.add_input(input);
+        } else {
+            builder.add_fee_input();
+        }
+
+        let tx = builder.finalize();
+        let status = self.submit(tx).await?;
+
+        Ok((status, blob_id))
+    }
+
+    async fn submit<Tx>(&mut self, mut tx: Tx) -> io::Result<TransactionStatus>
+    where
+        Tx: ExecutableTransaction,
+    {
+        let consensus_parameters =
+            self.client.chain_info().await.unwrap().consensus_parameters;
+
+        let database = self._node.shared.database.on_chain().latest_view().unwrap();
+        tx.estimate_predicates(
+            &consensus_parameters.clone().into(),
+            MemoryInstance::new(),
+            &database,
+        )
+        .unwrap();
+
+        let tx: Transaction = tx.into();
+        let tx = tx
+            .into_checked_basic(Default::default(), &consensus_parameters)
+            .expect("Cannot check transaction");
 
         let status = self
             .client
             .submit_and_await_commit(tx.transaction())
             .await?;
-        Ok((status, blob_id))
+        Ok(status)
     }
 }
 
@@ -99,7 +156,7 @@ async fn blob__upload_works() {
         blob_id.to_bytes(),
     )
     .script_gas_limit(1000000)
-    .add_random_fee_input()
+    .add_fee_input()
     .finalize_as_transaction();
     let tx_status = ctx
         .client
@@ -143,7 +200,7 @@ async fn blob__accessing_nonexitent_blob_panics_vm() {
         blob_id.to_bytes(),
     )
     .script_gas_limit(1000000)
-    .add_random_fee_input()
+    .add_fee_input()
     .finalize_as_transaction();
     let tx_status = ctx
         .client
@@ -175,3 +232,122 @@ async fn blob__can_be_queried_if_uploaded() {
     assert_eq!(queried_blob.id, blob_id);
     assert_eq!(queried_blob.bytecode, bytecode);
 }
+
+#[tokio::test]
+async fn blob__exists_if_uploaded() {
+    // Given
+    let mut ctx = TestContext::new().await;
+    let bytecode: Vec<u8> = [op::ret(RegId::ONE)].into_iter().collect();
+    let (status, blob_id) = ctx.new_blob(bytecode.clone()).await.unwrap();
+    assert!(matches!(status, TransactionStatus::Success { .. }));
+
+    // When
+    let blob_exists = ctx
+        .client
+        .blob_exists(blob_id)
+        .await
+        .expect("blob query failed");
+
+    // Then
+    assert!(blob_exists);
+}
+
+#[tokio::test]
+async fn blob__ask_whether_a_nonexisting_blob_exists() {
+    // Given
+    let ctx = TestContext::new().await;
+
+    // When
+    let blob_exists = ctx
+        .client
+        .blob_exists(Default::default())
+        .await
+        .expect("blob query failed");
+
+    // Then
+    assert!(!blob_exists);
+}
+
+#[tokio::test]
+async fn predicate_can_load_blob() {
+    let blob_predicate = vec![op::ret(RegId::ONE)].into_iter().collect::<Vec<u8>>();
+
+    // Use `LDC` with mode `1` to load the blob into the predicate.
+    let predicate = vec![
+        // Take the pointer to the predicate data section
+        // where the blob ID is stored
+        op::gtf(0x10, ZERO, GTFArgs::InputCoinPredicateData as u16),
+        // Store the size of the blob
+        op::bsiz(0x11, 0x10),
+        // Store start of the blob code
+        op::move_(0x12, SSP),
+        // Subtract the start of the code from the end of the code
+        op::sub(0x12, 0x12, IS),
+        // Divide the code by the instruction size to get the number of
+        // instructions
+        op::divi(0x12, 0x12, Instruction::SIZE as u16),
+        // Load the blob by `0x10` ID with the `0x11` size
+        op::ldc(0x10, ZERO, 0x11, 1),
+        // Jump to a new code location
+        op::jmp(0x12),
+    ]
+    .into_iter()
+    .collect::<Vec<u8>>();
+
+    let owner = Input::predicate_owner(predicate.clone());
+    let blob_owner = Input::predicate_owner(blob_predicate.clone());
+
+    let mut state = StateConfig::local_testnet();
+
+    state.coins[0].owner = blob_owner;
+    let blob_coin = state.coins[0].clone();
+    let blob_input = Input::coin_predicate(
+        blob_coin.utxo_id(),
+        blob_owner,
+        blob_coin.amount,
+        blob_coin.asset_id,
+        Default::default(),
+        0,
+        blob_predicate,
+        vec![],
+    );
+
+    state.coins[1].owner = owner;
+    let predicate_coin = state.coins[1].clone();
+
+    let mut config = Config::local_node_with_state_config(state);
+    config.debug = true;
+    config.utxo_validation = true;
+
+    let mut ctx = TestContext::new_with_config(config).await;
+
+    let bytecode: Vec<u8> = [op::ret(RegId::ONE)].into_iter().collect();
+    let (status, blob_id) = ctx
+        .new_blob_with_input(bytecode.clone(), Some(blob_input))
+        .await
+        .unwrap();
+    assert!(matches!(status, TransactionStatus::Success { .. }));
+
+    // Given
+    let predicate_data = blob_id.to_bytes();
+    let predicate_input = Input::coin_predicate(
+        predicate_coin.utxo_id(),
+        owner,
+        predicate_coin.amount,
+        predicate_coin.asset_id,
+        Default::default(),
+        0,
+        predicate,
+        predicate_data,
+    );
+
+    // When
+    let mut builder = TransactionBuilder::script(vec![], vec![]);
+    builder.add_input(predicate_input);
+    let tx_with_blobed_predicate = builder.finalize();
+    let result = ctx.submit(tx_with_blobed_predicate).await;
+
+    // Then
+    let status = result.expect("Transaction failed");
+    assert!(matches!(status, TransactionStatus::Success { .. }));
+}
diff --git a/tests/tests/blocks.rs b/tests/tests/blocks.rs
index 8449cf95ebb..7a5ba4688d5 100644
--- a/tests/tests/blocks.rs
+++ b/tests/tests/blocks.rs
@@ -366,6 +366,10 @@ mod full_block {
         FuelClient,
     };
     use fuel_core_executor::executor;
+    use fuel_core_txpool::config::{
+        HeavyWorkConfig,
+        PoolLimits,
+    };
     use fuel_core_types::fuel_types::BlockHeight;
 
     #[derive(cynic::QueryFragment, Debug)]
@@ -438,8 +442,18 @@ mod full_block {
         let mut rng = StdRng::seed_from_u64(2322);
 
         let local_node_config = Config::local_node();
-        let txpool = fuel_core_txpool::Config {
-            max_tx: usize::MAX,
+        let txpool = fuel_core_txpool::config::Config {
+            pool_limits: PoolLimits {
+                max_txs: usize::MAX,
+                max_gas: u64::MAX,
+                max_bytes_size: usize::MAX,
+            },
+            heavy_work: HeavyWorkConfig {
+                number_threads_to_verify_transactions: 4,
+                number_threads_p2p_sync: 0,
+                size_of_verification_queue: u16::MAX as usize,
+                size_of_p2p_sync_queue: 1,
+            },
             ..local_node_config.txpool
         };
         let chain_config = local_node_config.snapshot_reader.chain_config().clone();
diff --git a/tests/tests/contract.rs b/tests/tests/contract.rs
index 66fc7660e29..9a0fa4d213c 100644
--- a/tests/tests/contract.rs
+++ b/tests/tests/contract.rs
@@ -291,7 +291,7 @@ async fn can_get_message_proof() {
 
     // Create the contract deploy transaction.
     let mut contract_deploy = TransactionBuilder::create(bytecode, salt, vec![])
-        .add_random_fee_input()
+        .add_fee_input()
         .add_output(output)
         .finalize_as_transaction();
 
diff --git a/tests/tests/da_compression.rs b/tests/tests/da_compression.rs
new file mode 100644
index 00000000000..43fce2a27e6
--- /dev/null
+++ b/tests/tests/da_compression.rs
@@ -0,0 +1,118 @@
+use core::time::Duration;
+use fuel_core::{
+    combined_database::CombinedDatabase,
+    fuel_core_graphql_api::worker_service::DaCompressionConfig,
+    p2p_test_helpers::*,
+    service::{
+        Config,
+        FuelService,
+    },
+};
+use fuel_core_client::client::{
+    types::TransactionStatus,
+    FuelClient,
+};
+use fuel_core_compression::VersionedCompressedBlock;
+use fuel_core_poa::signer::SignMode;
+use fuel_core_types::{
+    fuel_asm::{
+        op,
+        RegId,
+    },
+    fuel_crypto::SecretKey,
+    fuel_tx::{
+        GasCosts,
+        Input,
+        TransactionBuilder,
+    },
+    secrecy::Secret,
+};
+use rand::{
+    rngs::StdRng,
+    SeedableRng,
+};
+
+#[tokio::test]
+async fn can_fetch_da_compressed_block_from_graphql() {
+    let mut rng = StdRng::seed_from_u64(10);
+    let poa_secret = SecretKey::random(&mut rng);
+
+    let db = CombinedDatabase::default();
+    let mut config = Config::local_node();
+    config.consensus_signer = SignMode::Key(Secret::new(poa_secret.into()));
+    let compression_config = fuel_core_compression::Config {
+        temporal_registry_retention: Duration::from_secs(3600),
+    };
+    config.da_compression = DaCompressionConfig::Enabled(compression_config);
+    let srv = FuelService::from_combined_database(db.clone(), config)
+        .await
+        .unwrap();
+    let client = FuelClient::from(srv.bound_address);
+
+    let tx =
+        TransactionBuilder::script([op::ret(RegId::ONE)].into_iter().collect(), vec![])
+            .max_fee_limit(0)
+            .script_gas_limit(1_000_000)
+            .with_gas_costs(GasCosts::free())
+            .add_fee_input()
+            .finalize_as_transaction();
+
+    let status = client.submit_and_await_commit(&tx).await.unwrap();
+
+    let block_height = match status {
+        TransactionStatus::Success { block_height, .. } => block_height,
+        other => {
+            panic!("unexpected result {other:?}")
+        }
+    };
+
+    let block = client.da_compressed_block(block_height).await.unwrap();
+    let block = block.expect("Unable to get compressed block");
+    let _: VersionedCompressedBlock = postcard::from_bytes(&block).unwrap();
+}
+
+#[tokio::test(flavor = "multi_thread")]
+async fn da_compressed_blocks_are_available_from_non_block_producing_nodes() {
+    let mut rng = StdRng::seed_from_u64(line!() as u64);
+
+    // Create a producer and a validator that share the same key pair.
+    let secret = SecretKey::random(&mut rng);
+    let pub_key = Input::owner(&secret.public_key());
+
+    let mut config = Config::local_node();
+    config.da_compression = DaCompressionConfig::Enabled(fuel_core_compression::Config {
+        temporal_registry_retention: Duration::from_secs(3600),
+    });
+
+    let Nodes {
+        mut producers,
+        mut validators,
+        bootstrap_nodes: _dont_drop,
+    } = make_nodes(
+        [Some(BootstrapSetup::new(pub_key))],
+        [Some(
+            ProducerSetup::new(secret).with_txs(1).with_name("Alice"),
+        )],
+        [Some(ValidatorSetup::new(pub_key).with_name("Bob"))],
+        Some(config),
+    )
+    .await;
+
+    let producer = producers.pop().unwrap();
+    let mut validator = validators.pop().unwrap();
+
+    let v_client = FuelClient::from(validator.node.shared.graph_ql.bound_address);
+
+    // Insert some txs
+    let expected = producer.insert_txs().await;
+    validator.consistency_20s(&expected).await;
+
+    let block_height = 1u32.into();
+
+    let block = v_client
+        .da_compressed_block(block_height)
+        .await
+        .unwrap()
+        .expect("Compressed block not available from validator");
+    let _: VersionedCompressedBlock = postcard::from_bytes(&block).unwrap();
+}
diff --git a/tests/tests/dos.rs b/tests/tests/dos.rs
index e038c70d297..ce9a631de48 100644
--- a/tests/tests/dos.rs
+++ b/tests/tests/dos.rs
@@ -1,10 +1,16 @@
 #![allow(warnings)]
 
+use std::time::{
+    Duration,
+    Instant,
+};
+
 use fuel_core::service::{
     Config,
     FuelService,
     ServiceTrait,
 };
+use fuel_core_types::blockchain::header::LATEST_STATE_TRANSITION_VERSION;
 use test_helpers::send_graph_ql_query;
 
 #[tokio::test]
@@ -78,37 +84,220 @@ async fn complex_queries__recursion() {
     assert!(result.contains("The recursion depth of the query cannot be greater than"));
 }
 
-#[tokio::test]
-async fn complex_queries__10_blocks__works() {
-    let query = r#"
-        query {
-          blocks(first: 10) {
-            nodes {
-              transactions {
-                id
+const FULL_BLOCK_QUERY: &str = r#"
+    query {
+      blocks(first: $NUMBER_OF_BLOCKS) {
+        edges {
+          cursor
+          node {
+            id
+            header {
+              id
+              daHeight
+              consensusParametersVersion
+              stateTransitionBytecodeVersion
+              transactionsCount
+              messageReceiptCount
+              transactionsRoot
+              messageOutboxRoot
+              eventInboxRoot
+              height
+              prevRoot
+              time
+              applicationHash
+            }
+            consensus {
+              ... on Genesis {
+                chainConfigHash
+                coinsRoot
+                contractsRoot
+                messagesRoot
+                transactionsRoot
+              }
+              ... on PoAConsensus {
+                signature
+              }
+            }
+            transactions {
+              rawPayload
+              status {
+                ... on SubmittedStatus {
+                  time
+                }
+                ... on SuccessStatus {
+                  transactionId
+                  blockHeight
+                  time
+                  programState {
+                    returnType
+                    data
+                  }
+                  receipts {
+                    param1
+                    param2
+                    amount
+                    assetId
+                    gas
+                    digest
+                    id
+                    is
+                    pc
+                    ptr
+                    ra
+                    rb
+                    rc
+                    rd
+                    reason
+                    receiptType
+                    to
+                    toAddress
+                    val
+                    len
+                    result
+                    gasUsed
+                    data
+                    sender
+                    recipient
+                    nonce
+                    contractId
+                    subId
+                  }
+                  totalGas
+                  totalFee
+                }
+                ... on SqueezedOutStatus {
+                  reason
+                }
+                ... on FailureStatus {
+                  transactionId
+                  blockHeight
+                  time
+                  reason
+                  programState {
+                    returnType
+                    data
+                  }
+                  receipts {
+                    param1
+                    param2
+                    amount
+                    assetId
+                    gas
+                    digest
+                    id
+                    is
+                    pc
+                    ptr
+                    ra
+                    rb
+                    rc
+                    rd
+                    reason
+                    receiptType
+                    to
+                    toAddress
+                    val
+                    len
+                    result
+                    gasUsed
+                    data
+                    sender
+                    recipient
+                    nonce
+                    contractId
+                    subId
+                  }
+                  totalGas
+                  totalFee
+                }
               }
             }
           }
         }
-    "#;
+        pageInfo {
+          endCursor
+          hasNextPage
+          hasPreviousPage
+          startCursor
+        }
+      }
+    }
+"#;
+
+#[tokio::test]
+async fn complex_queries__40_full_blocks__works() {
+    let query = FULL_BLOCK_QUERY.to_string();
+    let query = query.replace("$NUMBER_OF_BLOCKS", "40");
 
     let node = FuelService::new_node(Config::local_node()).await.unwrap();
     let url = format!("http://{}/v1/graphql", node.bound_address);
 
-    let result = send_graph_ql_query(&url, query).await;
+    let result = send_graph_ql_query(&url, query.as_str()).await;
     assert!(result.contains("transactions"));
 }
 
 #[tokio::test]
-async fn complex_queries__50_block__query_to_complex() {
+async fn complex_queries__41_full_block__query_to_complex() {
+    let query = FULL_BLOCK_QUERY.to_string();
+    let query = query.replace("$NUMBER_OF_BLOCKS", "41");
+
+    let node = FuelService::new_node(Config::local_node()).await.unwrap();
+    let url = format!("http://{}/v1/graphql", node.bound_address);
+
+    let result = send_graph_ql_query(&url, query.as_str()).await;
+    assert!(result.contains("Query is too complex."));
+}
+
+#[tokio::test]
+async fn complex_queries__100_block_headers__works() {
     let query = r#"
         query {
-          blocks(first: 50) {
-            nodes {
-              transactions {
+          blocks(first: 100) {
+            edges {
+              cursor
+              node {
                 id
+                header {
+                  id
+                  daHeight
+                  consensusParametersVersion
+                  stateTransitionBytecodeVersion
+                  transactionsCount
+                  messageReceiptCount
+                  transactionsRoot
+                  messageOutboxRoot
+                  eventInboxRoot
+                  height
+                  prevRoot
+                  time
+                  applicationHash
+                }
+                consensus {
+                  ... on Genesis {
+                    chainConfigHash
+                    coinsRoot
+                    contractsRoot
+                    messagesRoot
+                    transactionsRoot
+                  }
+                  ... on PoAConsensus {
+                    signature
+                  }
+                }
               }
             }
+            pageInfo {
+              endCursor
+              hasNextPage
+              hasPreviousPage
+              startCursor
+            }
+            pageInfo {
+              endCursor
+              hasNextPage
+              hasPreviousPage
+              startCursor
+            }
           }
         }
     "#;
@@ -117,7 +306,8 @@ async fn complex_queries__50_block__query_to_complex() {
     let url = format!("http://{}/v1/graphql", node.bound_address);
 
     let result = send_graph_ql_query(&url, query).await;
-    assert!(result.contains("Query is too complex."));
+    dbg!(&result);
+    assert!(result.contains("transactions"));
 }
 
 #[tokio::test]
@@ -140,3 +330,160 @@ async fn body_limit_prevents_from_huge_queries() {
     let result = response.unwrap();
     assert_eq!(result.status(), 413);
 }
+
+#[tokio::test]
+async fn complex_queries__1_state_transition_bytecode__works() {
+    let version = LATEST_STATE_TRANSITION_VERSION;
+    let query = r#"
+    query {
+      stateTransitionBytecodeByVersion(version: $VERSION) {
+        bytecode {
+          uploadedSubsectionsNumber
+          bytecode
+          completed
+        }
+      }
+    }"#
+    .to_string();
+    let query = query.replace("$VERSION", version.to_string().as_str());
+
+    let node = FuelService::new_node(Config::local_node()).await.unwrap();
+    let url = format!("http://{}/v1/graphql", node.bound_address);
+
+    let result = send_graph_ql_query(&url, query.as_str()).await;
+    assert!(result.contains("bytecode"), "{}", result);
+}
+
+#[tokio::test]
+async fn complex_queries__2_state_transition_bytecode__query_to_complex() {
+    let version = LATEST_STATE_TRANSITION_VERSION;
+    let query = r#"
+    query {
+      stateTransitionBytecodeByVersion(version: $VERSION) {
+        bytecode {
+          uploadedSubsectionsNumber
+          bytecode
+          completed
+        }
+      }
+      stateTransitionBytecodeByVersion(version: $VERSION) {
+        bytecode {
+          uploadedSubsectionsNumber
+          bytecode
+          completed
+        }
+      }
+    }"#
+    .to_string();
+    let query = query.replace("$VERSION", version.to_string().as_str());
+
+    let node = FuelService::new_node(Config::local_node()).await.unwrap();
+    let url = format!("http://{}/v1/graphql", node.bound_address);
+
+    let result = send_graph_ql_query(&url, query.as_str()).await;
+    assert!(result.contains("Query is too complex."));
+}
+
+#[tokio::test]
+async fn concurrency_limit_0_prevents_any_throttled_queries() {
+    // Given
+    let mut config = Config::local_node();
+    config.graphql_config.max_concurrent_queries = 0;
+    config.graphql_config.api_request_timeout = std::time::Duration::from_millis(100);
+
+    let node = FuelService::new_node(config).await.unwrap();
+    let url = format!("http://{}/v1/graphql", node.bound_address);
+    let client = reqwest::Client::new();
+
+    // When
+    let response = client
+        .post(url)
+        .header("Content-Type", "application/json")
+        .header("Content-Length", "10_000")
+        .body(vec![42; 10_000])
+        .send()
+        .await;
+
+    // Then
+    let result = response.unwrap();
+    assert_eq!(result.status(), 408);
+}
+
+#[tokio::test]
+async fn concurrency_limit_0_allows_unthrottled_queries() {
+    // Given
+    let mut config = Config::local_node();
+    // perhaps this shouldn't be called `graphql_config` but `api_config` or something
+    config.graphql_config.max_concurrent_queries = 0;
+
+    let node = FuelService::new_node(config).await.unwrap();
+    let url = format!("http://{}/v1/health", node.bound_address);
+    let client = reqwest::Client::new();
+
+    // When
+    let response = client.get(url).send().await;
+
+    // Then
+    let result = response.unwrap();
+    assert_eq!(result.status(), 200);
+}
+
+#[tokio::test(flavor = "multi_thread", worker_threads = 8)]
+async fn concurrency_limit_1_prevents_concurrent_queries() {
+    // Given
+    let num_samples = 100;
+
+    let mut config = Config::local_node();
+    config.graphql_config.max_concurrent_queries = 1;
+
+    let query = FULL_BLOCK_QUERY.to_string();
+    let query = query.replace("$NUMBER_OF_BLOCKS", "40");
+
+    let node = FuelService::new_node(config).await.unwrap();
+    let url = format!("http://{}/v1/graphql", node.bound_address);
+    let client = reqwest::Client::new();
+
+    let (mut tx, mut rx) = tokio::sync::mpsc::channel(100);
+
+    // When
+
+    // Measure the average request time for sequential queries
+    let mut avg_request_time = 0;
+    for _ in 0..num_samples {
+        let now = Instant::now();
+        send_graph_ql_query(&url, &query).await;
+        avg_request_time += now.elapsed().as_nanos() / num_samples;
+    }
+
+    // Measure the average request time for concurrent queries
+    for idx in 0..num_samples {
+        let tx = tx.clone();
+        let url = url.clone();
+        let query = query.clone();
+
+        tokio::spawn(async move {
+            let now = Instant::now();
+            send_graph_ql_query(&url, &query).await;
+            let _ = tx.send(now.elapsed().as_nanos()).await;
+        });
+    }
+
+    let mut avg_concurrent_request_time = 0;
+    for idx in 0..num_samples {
+        let request_time = rx.recv().await.unwrap();
+        avg_concurrent_request_time += request_time / num_samples;
+    }
+
+    // Then
+
+    // In an idealized model we should see c = s * n / 2
+    // where
+    //   c = average concurrent request time
+    //   s = single request time
+    //   n = number of request
+    //   2 = the first even natural non-zero number ;)
+    //
+    // However, since this is inherently flaky we divide by 4 instead of 2 to have some margin,
+    // while still maintaining our ability to assert a large deviation between the two measurements.
+    assert!(avg_concurrent_request_time > avg_request_time * num_samples / 4);
+}
diff --git a/tests/tests/fee_collection_contract.rs b/tests/tests/fee_collection_contract.rs
index 4105efc6202..54426b5c293 100644
--- a/tests/tests/fee_collection_contract.rs
+++ b/tests/tests/fee_collection_contract.rs
@@ -63,7 +63,7 @@ async fn setup(rng: &mut StdRng) -> TestContext {
     let state_root = Contract::default_state_root();
     let contract_id = contract.id(&salt, &root, &state_root);
     let mut create_tx = TransactionBuilder::create(witness.clone(), salt, vec![])
-        .add_random_fee_input()
+        .add_fee_input()
         .add_output(Output::contract_created(contract_id, state_root))
         .finalize();
     create_tx
@@ -166,7 +166,7 @@ async fn collect_fees(ctx: &TestContext) {
                 .chain(0u64.to_bytes().into_iter())
                 .collect(),
         )
-            .add_random_fee_input() // No coinbase fee for this block
+            .add_fee_input() // No coinbase fee for this block
             .script_gas_limit(1_000_000)
             .add_input(Input::contract(
                 Default::default(),
@@ -298,7 +298,7 @@ async fn missing_variable_output() {
                 .chain(0u64.to_bytes().into_iter())
                 .collect(),
         )
-            .add_random_fee_input() // No coinbase fee for this block
+            .add_fee_input() // No coinbase fee for this block
             .script_gas_limit(1_000_000)
             .add_input(Input::contract(
                 Default::default(),
diff --git a/tests/tests/gas_price.rs b/tests/tests/gas_price.rs
index ad982886c74..18507785eec 100644
--- a/tests/tests/gas_price.rs
+++ b/tests/tests/gas_price.rs
@@ -57,7 +57,7 @@ use test_helpers::fuel_core_driver::FuelCoreDriver;
 fn tx_for_gas_limit(max_fee_limit: Word) -> Transaction {
     TransactionBuilder::script(vec![], vec![])
         .max_fee_limit(max_fee_limit)
-        .add_random_fee_input()
+        .add_fee_input()
         .finalize()
         .into()
 }
@@ -309,7 +309,7 @@ async fn dry_run_opt__zero_gas_price_equal_to_none_gas_price() {
         op::ret(RegId::ONE).to_bytes().into_iter().collect(),
         vec![],
     )
-    .add_random_fee_input()
+    .add_fee_input()
     .script_gas_limit(1000)
     .max_fee_limit(600000)
     .finalize_as_transaction();
diff --git a/tests/tests/lib.rs b/tests/tests/lib.rs
index e7a3db5bce9..5337e134358 100644
--- a/tests/tests/lib.rs
+++ b/tests/tests/lib.rs
@@ -8,6 +8,7 @@ mod chain;
 mod coin;
 mod coins;
 mod contract;
+mod da_compression;
 mod dap;
 mod debugger;
 mod dos;
diff --git a/tests/tests/messages.rs b/tests/tests/messages.rs
index 84404041185..bee948105ea 100644
--- a/tests/tests/messages.rs
+++ b/tests/tests/messages.rs
@@ -355,7 +355,7 @@ async fn can_get_message_proof() {
 
         // Create the contract deploy transaction.
         let mut contract_deploy = TransactionBuilder::create(bytecode, salt, vec![])
-            .add_random_fee_input()
+            .add_fee_input()
             .add_output(output)
             .finalize_as_transaction();
 
diff --git a/tests/tests/metrics.rs b/tests/tests/metrics.rs
index 5e6a4da69dc..4cd577a9065 100644
--- a/tests/tests/metrics.rs
+++ b/tests/tests/metrics.rs
@@ -42,7 +42,7 @@ async fn test_metrics_endpoint() {
         .submit_and_await_commit(
             &TransactionBuilder::script(script, vec![])
                 .script_gas_limit(1000000)
-                .add_random_fee_input()
+                .add_fee_input()
                 .finalize_as_transaction(),
         )
         .await
diff --git a/tests/tests/node_info.rs b/tests/tests/node_info.rs
index f84b767e4df..0e3e2339a3d 100644
--- a/tests/tests/node_info.rs
+++ b/tests/tests/node_info.rs
@@ -23,8 +23,8 @@ async fn node_info() {
 
     assert_eq!(utxo_validation, node_config.utxo_validation);
     assert_eq!(vm_backtrace, node_config.vm.backtrace);
-    assert_eq!(max_depth, node_config.txpool.max_depth as u64);
-    assert_eq!(max_tx, node_config.txpool.max_tx as u64);
+    assert_eq!(max_depth, node_config.txpool.max_txs_chain_count as u64);
+    assert_eq!(max_tx, node_config.txpool.pool_limits.max_txs as u64);
 }
 
 #[cfg(feature = "p2p")]
@@ -92,8 +92,18 @@ async fn test_peer_info() {
     // This is just a mock of what we should be able to do with GQL API.
     let client = producer.node.bound_address;
     let client = FuelClient::from(client);
-    let peers = client.connected_peers_info().await.unwrap();
-    assert_eq!(peers.len(), 2);
+    let mut peers;
+
+    // It takes some time before all validators are connected.
+    loop {
+        peers = client.connected_peers_info().await.unwrap();
+
+        if peers.len() == 2 {
+            break;
+        }
+        tokio::time::sleep(Duration::from_secs(1)).await;
+    }
+
     let info = peers
         .iter()
         .find(|info| info.id.to_string() == validator_peer_id.to_base58())
diff --git a/tests/tests/regenesis.rs b/tests/tests/regenesis.rs
index 94d67d241ff..3ba03d27366 100644
--- a/tests/tests/regenesis.rs
+++ b/tests/tests/regenesis.rs
@@ -66,6 +66,7 @@ async fn take_snapshot(db_dir: &TempDir, snapshot_dir: &TempDir) -> anyhow::Resu
 
 #[tokio::test(flavor = "multi_thread")]
 async fn test_regenesis_old_blocks_are_preserved() -> anyhow::Result<()> {
+    const BLOCKS_QUERY: i32 = 50;
     let mut rng = StdRng::seed_from_u64(1234);
 
     let core =
@@ -77,7 +78,7 @@ async fn test_regenesis_old_blocks_are_preserved() -> anyhow::Result<()> {
         .client
         .blocks(PaginationRequest {
             cursor: None,
-            results: 100,
+            results: BLOCKS_QUERY,
             direction: PageDirection::Forward,
         })
         .await
@@ -112,7 +113,7 @@ async fn test_regenesis_old_blocks_are_preserved() -> anyhow::Result<()> {
         .client
         .blocks(PaginationRequest {
             cursor: None,
-            results: 100,
+            results: BLOCKS_QUERY,
             direction: PageDirection::Forward,
         })
         .await
@@ -150,7 +151,7 @@ async fn test_regenesis_old_blocks_are_preserved() -> anyhow::Result<()> {
         .client
         .blocks(PaginationRequest {
             cursor: None,
-            results: 100,
+            results: BLOCKS_QUERY,
             direction: PageDirection::Forward,
         })
         .await
diff --git a/tests/tests/state_rewind.rs b/tests/tests/state_rewind.rs
index c49be565914..3c8a7af810b 100644
--- a/tests/tests/state_rewind.rs
+++ b/tests/tests/state_rewind.rs
@@ -9,7 +9,6 @@ use fuel_core::{
     },
 };
 use fuel_core_storage::transactional::AtomicView;
-use fuel_core_txpool::types::TxId;
 use fuel_core_types::{
     fuel_tx::{
         AssetId,
@@ -17,6 +16,7 @@ use fuel_core_types::{
         Output,
         Transaction,
         TransactionBuilder,
+        TxId,
         UniqueIdentifier,
     },
     fuel_types::BlockHeight,
@@ -159,7 +159,11 @@ async fn rollback_existing_chain_to_target_height_and_verify(
         transactions.push(tx.id(&Default::default()));
 
         let result = node.submit_and_await_commit(tx).await.unwrap();
-        assert!(matches!(result, TransactionStatus::Success(_)));
+        assert!(
+            matches!(result, TransactionStatus::Success(_)),
+            "Transaction got unexpected status {:?}",
+            result
+        );
     }
     let all_transactions = all_real_transactions(node);
     assert_eq!(all_transactions.len(), blocks_in_the_chain as usize);
diff --git a/tests/tests/trigger_integration/instant.rs b/tests/tests/trigger_integration/instant.rs
index 3e9cc773e4d..df18da60190 100644
--- a/tests/tests/trigger_integration/instant.rs
+++ b/tests/tests/trigger_integration/instant.rs
@@ -50,7 +50,7 @@ async fn poa_instant_trigger_is_produces_instantly() {
                 .collect(),
             vec![],
         )
-        .add_random_fee_input()
+        .add_fee_input()
         .finalize_as_transaction();
         let _tx_id = client.submit(&tx).await.unwrap();
         let count = client
diff --git a/tests/tests/trigger_integration/never.rs b/tests/tests/trigger_integration/never.rs
index 50cdda4af49..ac412583ef4 100644
--- a/tests/tests/trigger_integration/never.rs
+++ b/tests/tests/trigger_integration/never.rs
@@ -43,7 +43,7 @@ async fn poa_never_trigger_doesnt_produce_blocks() {
     for i in 0..10 {
         let tx =
             TransactionBuilder::script([op::movi(0x10, i)].into_iter().collect(), vec![])
-                .add_random_fee_input()
+                .add_random_fee_input(&mut rng)
                 .finalize_as_transaction();
         let _tx_id = client.submit(&tx).await.unwrap();
         tokio::time::advance(tokio::time::Duration::new(10, 0)).await;
diff --git a/tests/tests/tx.rs b/tests/tests/tx.rs
index 58acbaf0dfe..2d9bc81915f 100644
--- a/tests/tests/tx.rs
+++ b/tests/tests/tx.rs
@@ -96,7 +96,7 @@ async fn dry_run_script() {
     let tx = TransactionBuilder::script(script, vec![])
         .script_gas_limit(gas_limit)
         .maturity(maturity)
-        .add_random_fee_input()
+        .add_fee_input()
         .finalize_as_transaction();
 
     let tx_statuses = client.dry_run(&[tx.clone()]).await.unwrap();
@@ -139,7 +139,7 @@ async fn dry_run_create() {
     let contract_id = contract.id(&salt, &root, &state_root);
 
     let tx = TransactionBuilder::create(contract_code.into(), salt, vec![])
-        .add_random_fee_input()
+        .add_fee_input()
         .add_output(Output::contract_created(contract_id, state_root))
         .finalize_as_transaction();
 
@@ -188,7 +188,7 @@ async fn dry_run_above_block_gas_limit() {
     let tx = TransactionBuilder::script(script, vec![])
         .script_gas_limit(gas_limit)
         .maturity(maturity)
-        .add_random_fee_input()
+        .add_fee_input()
         .finalize_as_transaction();
 
     // When
@@ -352,7 +352,7 @@ async fn submit() {
     let tx = TransactionBuilder::script(script, vec![])
         .script_gas_limit(gas_limit)
         .maturity(maturity)
-        .add_random_fee_input()
+        .add_fee_input()
         .finalize_as_transaction();
 
     client.submit_and_await_commit(&tx).await.unwrap();
@@ -388,7 +388,7 @@ async fn submit_and_await_status() {
     let tx = TransactionBuilder::script(script, vec![])
         .script_gas_limit(gas_limit)
         .maturity(maturity)
-        .add_random_fee_input()
+        .add_fee_input()
         .finalize_as_transaction();
 
     let mut status_stream = client.submit_and_await_status(&tx).await.unwrap();
@@ -429,7 +429,7 @@ async fn dry_run_transaction_should_use_latest_block_time() {
     let tx = TransactionBuilder::script(script, vec![])
         .script_gas_limit(gas_limit)
         .maturity(maturity)
-        .add_random_fee_input()
+        .add_fee_input()
         .finalize_as_transaction();
 
     // When
diff --git a/tests/tests/tx/predicates.rs b/tests/tests/tx/predicates.rs
index 998b33f064c..7dc2ab190f7 100644
--- a/tests/tests/tx/predicates.rs
+++ b/tests/tests/tx/predicates.rs
@@ -17,6 +17,7 @@ use fuel_core_types::{
             EstimatePredicates,
         },
         interpreter::MemoryInstance,
+        predicate::EmptyStorage,
     },
 };
 use rand::{
@@ -72,6 +73,7 @@ async fn transaction_with_valid_predicate_is_executed() {
                     .consensus_parameters,
             ),
             MemoryInstance::new(),
+            &EmptyStorage,
         )
         .expect("Predicate check failed");
 
diff --git a/tests/tests/tx/txn_status_subscription.rs b/tests/tests/tx/txn_status_subscription.rs
index f1bd14f2ffc..e01b60b60de 100644
--- a/tests/tests/tx/txn_status_subscription.rs
+++ b/tests/tests/tx/txn_status_subscription.rs
@@ -25,6 +25,7 @@ use fuel_core_types::{
             EstimatePredicates,
         },
         interpreter::MemoryInstance,
+        predicate::EmptyStorage,
     },
 };
 use futures::StreamExt;
@@ -63,8 +64,12 @@ fn create_transaction<R: Rng>(rng: &mut R, script: Vec<Instruction>) -> Transact
         .add_output(Output::coin(rng.gen(), 50, AssetId::default()))
         .add_output(Output::change(rng.gen(), 0, AssetId::default()))
         .finalize();
-    tx.estimate_predicates(&CheckPredicateParams::default(), MemoryInstance::new())
-        .expect("Predicate check failed");
+    tx.estimate_predicates(
+        &CheckPredicateParams::default(),
+        MemoryInstance::new(),
+        &EmptyStorage,
+    )
+    .expect("Predicate check failed");
     tx.into()
 }
 
@@ -81,6 +86,7 @@ async fn subscribe_txn_status() {
     let maturity = Default::default();
 
     let create_script = |i: u8| {
+        const AMOUNT: u64 = 1000;
         // The first two scripts will run and the rest will fail.
         let script = [op::addi(0x11 - i, 0x10, 1), op::ret(RegId::ONE)];
         let script: Vec<u8> = script
@@ -96,7 +102,7 @@ async fn subscribe_txn_status() {
         let coin_input = Input::coin_predicate(
             utxo_id,
             owner,
-            1000,
+            AMOUNT,
             AssetId::zeroed(),
             TxPointer::default(),
             Default::default(),
@@ -109,15 +115,20 @@ async fn subscribe_txn_status() {
             vec![],
             policies::Policies::new()
                 .with_maturity(maturity)
-                .with_max_fee(0),
+                .with_max_fee(AMOUNT)
+                .with_tip(i as u64),
             vec![coin_input],
             vec![],
             vec![],
         )
         .into();
         // estimate predicate gas for coin_input predicate
-        tx.estimate_predicates(&CheckPredicateParams::default(), MemoryInstance::new())
-            .expect("should estimate predicate");
+        tx.estimate_predicates(
+            &CheckPredicateParams::default(),
+            MemoryInstance::new(),
+            &EmptyStorage,
+        )
+        .expect("should estimate predicate");
 
         tx
     };
diff --git a/tests/tests/tx/txpool.rs b/tests/tests/tx/txpool.rs
index 53c5fd0bfdd..106c89bdd60 100644
--- a/tests/tests/tx/txpool.rs
+++ b/tests/tests/tx/txpool.rs
@@ -4,6 +4,7 @@ use crate::helpers::{
     TestContext,
     TestSetupBuilder,
 };
+use fuel_core_poa::Trigger;
 use fuel_core_types::{
     fuel_asm::*,
     fuel_crypto::*,
@@ -16,7 +17,6 @@ use rand::{
     Rng,
     SeedableRng,
 };
-use std::sync::Arc;
 
 #[tokio::test]
 async fn txs_max_script_gas_limit() {
@@ -50,6 +50,7 @@ async fn txs_max_script_gas_limit() {
 
     // setup genesis block with coins that transactions can spend
     test_builder.config_coin_inputs_from_transactions(&transactions.iter().collect_vec());
+    test_builder.trigger = Trigger::Never;
 
     // spin up node
     let TestContext { client, srv, .. } = test_builder.finalize().await;
@@ -58,10 +59,13 @@ async fn txs_max_script_gas_limit() {
     let txs = transactions
         .clone()
         .into_iter()
-        .map(|script| Arc::new(fuel_tx::Transaction::from(script)))
+        .map(fuel_tx::Transaction::from)
         .collect::<Vec<_>>();
-    srv.shared.txpool_shared_state.insert(txs).await;
+    for tx in txs {
+        srv.shared.txpool_shared_state.insert(tx).await.unwrap();
+    }
 
+    client.produce_blocks(1, None).await.unwrap();
     let block = client.block_by_height(1.into()).await.unwrap().unwrap();
     assert_eq!(
         block.transactions.len(),
diff --git a/tests/tests/tx/upgrade.rs b/tests/tests/tx/upgrade.rs
index 600b6967686..0bea3b41f11 100644
--- a/tests/tests/tx/upgrade.rs
+++ b/tests/tests/tx/upgrade.rs
@@ -224,7 +224,7 @@ async fn upgrading_to_invalid_state_transition_fails() {
     let result_str = format!("{:?}", result); // io::Result forces string handling
     result.expect_err("Upgrading to an incorrect bytecode should fail");
     assert!(
-        result_str.contains("WASM bytecode contents are not valid"),
+        result_str.contains("Error with Wasm validity: NotValid"),
         "msg: {}",
         result_str
     );
@@ -273,7 +273,7 @@ async fn upgrading_to_missing_state_transition_fails() {
     let result_str = format!("{:?}", result); // io::Result forces string handling
     result.expect_err("Upgrading to missing bytecode should fail");
     assert!(
-        result_str.contains("WASM bytecode matching the given root was not found"),
+        result_str.contains("Error with Wasm validity: NotFound"),
         "msg: {}",
         result_str
     );
@@ -332,7 +332,7 @@ async fn upgrade_to_a_partially_uploaded_state_transition_fails() {
     let result_str = format!("{:?}", result); // io::Result forces string handling
     result.expect_err("Upgrading to missing bytecode should fail");
     assert!(
-        result_str.contains("WASM bytecode matching the given root was not found"),
+        result_str.contains("Response errors; Error with Wasm validity: NotFound"),
         "msg: {}",
         result_str
     );
diff --git a/tests/tests/tx/utxo_validation.rs b/tests/tests/tx/utxo_validation.rs
index 286f5c096a4..0623ba580ef 100644
--- a/tests/tests/tx/utxo_validation.rs
+++ b/tests/tests/tx/utxo_validation.rs
@@ -110,7 +110,7 @@ async fn submit_utxo_verified_tx_below_min_gas_price_fails() {
         op::ret(RegId::ONE).to_bytes().into_iter().collect(),
         vec![],
     )
-    .add_random_fee_input()
+    .add_fee_input()
     .script_gas_limit(100)
     .finalize_as_transaction();
 
@@ -127,7 +127,10 @@ async fn submit_utxo_verified_tx_below_min_gas_price_fails() {
 
     assert!(result.is_err());
     let error = result.err().unwrap().to_string();
-    assert!(error.contains("InsufficientMaxFee"));
+    assert!(error.contains(
+        "The provided max fee can't cover the transaction cost. \
+            The minimal gas price should be 10, while it is 0"
+    ));
 }
 
 // verify that dry run can disable utxo_validation by simulating a transaction with unsigned
diff --git a/tests/tests/tx_gossip.rs b/tests/tests/tx_gossip.rs
index 8397d4068bd..1c11d180ff5 100644
--- a/tests/tests/tx_gossip.rs
+++ b/tests/tests/tx_gossip.rs
@@ -1,12 +1,15 @@
 #![allow(unexpected_cfgs)] // for cfg(coverage)
 
-use fuel_core::p2p_test_helpers::{
-    make_nodes,
-    BootstrapSetup,
-    BootstrapType,
-    Nodes,
-    ProducerSetup,
-    ValidatorSetup,
+use fuel_core::{
+    chain_config::StateConfig,
+    p2p_test_helpers::{
+        make_nodes,
+        BootstrapSetup,
+        BootstrapType,
+        Nodes,
+        ProducerSetup,
+        ValidatorSetup,
+    },
 };
 use fuel_core_client::client::FuelClient;
 use fuel_core_types::{
@@ -107,6 +110,9 @@ const NUMBER_OF_INVALID_TXS: usize = 100;
 async fn test_tx_gossiping_invalid_txs(
     bootstrap_type: BootstrapType,
 ) -> anyhow::Result<SharedImportResult> {
+    let state = StateConfig::local_testnet();
+    let coin = state.coins[0].clone();
+
     // Create a random seed based on the test parameters.
     let mut hasher = DefaultHasher::new();
     let num_txs = 1;
@@ -162,21 +168,20 @@ async fn test_tx_gossiping_invalid_txs(
     // Time for nodes to connect to each other.
     tokio::time::sleep(Duration::from_secs(2)).await;
 
-    use rand::Rng;
-
-    for _ in 0..NUMBER_OF_INVALID_TXS {
+    for i in 0..NUMBER_OF_INVALID_TXS {
         let invalid_tx = TransactionBuilder::script(vec![], vec![])
             .add_input(Input::CoinSigned(CoinSigned {
-                utxo_id: rng.gen(),
-                owner: rng.gen(),
-                amount: 0,
-                asset_id: rng.gen(),
+                utxo_id: coin.utxo_id(),
+                owner: coin.owner,
+                amount: coin.amount,
+                asset_id: coin.asset_id,
                 tx_pointer: Default::default(),
                 witness_index: 0,
                 predicate_gas_used: Empty::new(),
                 predicate: Empty::new(),
                 predicate_data: Empty::new(),
             }))
+            .tip(i as u64)
             .add_witness(Witness::default())
             .finalize()
             .into();
diff --git a/tests/tests/vm_storage.rs b/tests/tests/vm_storage.rs
index 154f09af153..cff95ef5053 100644
--- a/tests/tests/vm_storage.rs
+++ b/tests/tests/vm_storage.rs
@@ -9,8 +9,8 @@ mod tests {
         StorageAsMut,
         StorageMutate,
     };
-    use fuel_core_txpool::types::ContractId;
     use fuel_core_types::{
+        fuel_tx::ContractId,
         fuel_types::Bytes32,
         fuel_vm::ContractsStateKey,
     };
diff --git a/version-compatibility/forkless-upgrade/Cargo.toml b/version-compatibility/forkless-upgrade/Cargo.toml
index 33411ab9388..0792f3c6fc7 100644
--- a/version-compatibility/forkless-upgrade/Cargo.toml
+++ b/version-compatibility/forkless-upgrade/Cargo.toml
@@ -17,8 +17,8 @@ tokio = { version = "1.37.0", features = ["rt-multi-thread"] }
 
 # Neutral deps
 fuel-core-trace = { path = "../../crates/trace" }
-fuel-crypto = { version = "0.49.0" }
-fuel-tx = { version = "0.49.0", features = ["random"] }
+fuel-crypto = { version = "0.57.0" }
+fuel-tx = { version = "0.57.0", features = ["random"] }
 
 # Latest fuel-core
 latest-fuel-core-bin = { path = "../../bin/fuel-core", package = "fuel-core-bin", features = [
@@ -29,10 +29,9 @@ latest-fuel-core-type = { path = "../../crates/types", package = "fuel-core-type
   "test-helpers",
 ] }
 latest-fuel-core-client = { path = "../../crates/client", package = "fuel-core-client" }
-# TODO: https://github.com/FuelLabs/fuel-core/issues/2198
-#latest-fuel-core-upgradable-executor = { path = "../../crates/services/upgradable-executor", package = "fuel-core-upgradable-executor", features = [
-#  "wasm-executor",
-#] }
+latest-fuel-core-upgradable-executor = { path = "../../crates/services/upgradable-executor", package = "fuel-core-upgradable-executor", features = [
+  "wasm-executor",
+] }
 
 # Genesis fuel-core
 genesis-fuel-core-bin = { version = "0.26.0", package = "fuel-core-bin", features = [
@@ -41,3 +40,11 @@ genesis-fuel-core-bin = { version = "0.26.0", package = "fuel-core-bin", feature
 ] }
 genesis-fuel-core-client = { version = "0.26.0", package = "fuel-core-client" }
 genesis-fuel-core-services = { version = "0.26.0", package = "fuel-core-services" }
+
+# Fuel core version 0.36.0
+version-36-fuel-core-bin = { version = "0.36.0", package = "fuel-core-bin", features = [
+  "parquet",
+  "p2p",
+] }
+version-36-fuel-core-client = { version = "0.36.0", package = "fuel-core-client" }
+version-36-fuel-core-services = { version = "0.36.0", package = "fuel-core-services" }
diff --git a/version-compatibility/forkless-upgrade/chain-configurations/v36/README.md b/version-compatibility/forkless-upgrade/chain-configurations/v36/README.md
new file mode 100644
index 00000000000..f798abaf3ab
--- /dev/null
+++ b/version-compatibility/forkless-upgrade/chain-configurations/v36/README.md
@@ -0,0 +1,10 @@
+# The configuration of the V36 network
+
+This configuration was generated in the following way:
+1. Get the `fuel-core` from `release/v0.36.0` branch (commit b5d5ff8d13f16a0bd53e79ee0e8f5438971be2b9)
+2. Build and run in order to create a DB
+3. Run again with the `snapshot` parameter
+4. Apply the following modifications to `chain_config.json`
+  - PoA Key: `{"address":"3ba3b213c8d5ec4d4901ac34b0e924d635384a8b0a5df6e116bce9a783da8e02","secret":"e3d6eb39607650e22f0befa26d52e921d2e7924d0e165f38ffa8d9d0ac73de93","type":"block_production"}`
+  - Privileged Key: `{"address":"f034f7859dbf1d775cba16fc175eef249a045d6484a8b9388c9e280267125b73","secret":"dcbe36d8e890d7489b6e1be442eab98ae2fdbb5c7d77e1f9e1e12a545852304f","type":"block_production"}`
+  - Change "chain_name" from "Local testnet" to "V36"
\ No newline at end of file
diff --git a/version-compatibility/forkless-upgrade/chain-configurations/v36/chain_config.json b/version-compatibility/forkless-upgrade/chain-configurations/v36/chain_config.json
new file mode 100644
index 00000000000..755437c0f86
--- /dev/null
+++ b/version-compatibility/forkless-upgrade/chain-configurations/v36/chain_config.json
@@ -0,0 +1,307 @@
+{
+  "chain_name": "V36",
+  "consensus_parameters": {
+    "V2": {
+      "tx_params": {
+        "V1": {
+          "max_inputs": 255,
+          "max_outputs": 255,
+          "max_witnesses": 255,
+          "max_gas_per_tx": 30000000,
+          "max_size": 112640,
+          "max_bytecode_subsections": 256
+        }
+      },
+      "predicate_params": {
+        "V1": {
+          "max_predicate_length": 102400,
+          "max_predicate_data_length": 102400,
+          "max_message_data_length": 102400,
+          "max_gas_per_predicate": 30000000
+        }
+      },
+      "script_params": {
+        "V1": {
+          "max_script_length": 102400,
+          "max_script_data_length": 102400
+        }
+      },
+      "contract_params": {
+        "V1": {
+          "contract_max_size": 102400,
+          "max_storage_slots": 1760
+        }
+      },
+      "fee_params": {
+        "V1": {
+          "gas_price_factor": 92000,
+          "gas_per_byte": 63
+        }
+      },
+      "chain_id": 0,
+      "gas_costs": {
+        "V4": {
+          "add": 2,
+          "addi": 2,
+          "and": 2,
+          "andi": 2,
+          "bal": 29,
+          "bhei": 2,
+          "bhsh": 2,
+          "burn": 19976,
+          "cb": 2,
+          "cfsi": 2,
+          "div": 2,
+          "divi": 2,
+          "eck1": 1907,
+          "ecr1": 26135,
+          "eq": 2,
+          "exp": 2,
+          "expi": 2,
+          "flag": 2,
+          "gm": 2,
+          "gt": 2,
+          "gtf": 13,
+          "ji": 2,
+          "jmp": 2,
+          "jne": 2,
+          "jnei": 2,
+          "jnzi": 2,
+          "jmpf": 2,
+          "jmpb": 2,
+          "jnzf": 2,
+          "jnzb": 2,
+          "jnef": 2,
+          "jneb": 2,
+          "lb": 2,
+          "log": 102,
+          "lt": 2,
+          "lw": 2,
+          "mint": 18042,
+          "mlog": 2,
+          "mod": 2,
+          "modi": 2,
+          "move": 2,
+          "movi": 2,
+          "mroo": 4,
+          "mul": 2,
+          "muli": 2,
+          "mldv": 3,
+          "noop": 1,
+          "not": 2,
+          "or": 2,
+          "ori": 2,
+          "poph": 3,
+          "popl": 3,
+          "pshh": 5,
+          "pshl": 5,
+          "ret_contract": 53,
+          "rvrt_contract": 52,
+          "sb": 2,
+          "sll": 2,
+          "slli": 2,
+          "srl": 2,
+          "srli": 2,
+          "srw": 177,
+          "sub": 2,
+          "subi": 2,
+          "sw": 2,
+          "sww": 17302,
+          "time": 35,
+          "tr": 27852,
+          "tro": 19718,
+          "wdcm": 2,
+          "wqcm": 2,
+          "wdop": 3,
+          "wqop": 3,
+          "wdml": 3,
+          "wqml": 3,
+          "wddv": 4,
+          "wqdv": 5,
+          "wdmd": 8,
+          "wqmd": 12,
+          "wdam": 7,
+          "wqam": 8,
+          "wdmm": 8,
+          "wqmm": 8,
+          "xor": 2,
+          "xori": 2,
+          "aloc": {
+            "LightOperation": {
+              "base": 2,
+              "units_per_gas": 15
+            }
+          },
+          "bsiz": {
+            "LightOperation": {
+              "base": 17,
+              "units_per_gas": 790
+            }
+          },
+          "bldd": {
+            "LightOperation": {
+              "base": 15,
+              "units_per_gas": 272
+            }
+          },
+          "cfe": {
+            "LightOperation": {
+              "base": 10,
+              "units_per_gas": 1818181
+            }
+          },
+          "cfei": {
+            "LightOperation": {
+              "base": 2,
+              "units_per_gas": 1000000
+            }
+          },
+          "call": {
+            "LightOperation": {
+              "base": 13513,
+              "units_per_gas": 7
+            }
+          },
+          "ccp": {
+            "LightOperation": {
+              "base": 34,
+              "units_per_gas": 39
+            }
+          },
+          "croo": {
+            "LightOperation": {
+              "base": 91,
+              "units_per_gas": 3
+            }
+          },
+          "csiz": {
+            "LightOperation": {
+              "base": 31,
+              "units_per_gas": 438
+            }
+          },
+          "ed19": {
+            "LightOperation": {
+              "base": 3000,
+              "units_per_gas": 214
+            }
+          },
+          "k256": {
+            "LightOperation": {
+              "base": 27,
+              "units_per_gas": 5
+            }
+          },
+          "ldc": {
+            "LightOperation": {
+              "base": 43,
+              "units_per_gas": 102
+            }
+          },
+          "logd": {
+            "LightOperation": {
+              "base": 363,
+              "units_per_gas": 4
+            }
+          },
+          "mcl": {
+            "LightOperation": {
+              "base": 2,
+              "units_per_gas": 1041
+            }
+          },
+          "mcli": {
+            "LightOperation": {
+              "base": 2,
+              "units_per_gas": 1025
+            }
+          },
+          "mcp": {
+            "LightOperation": {
+              "base": 4,
+              "units_per_gas": 325
+            }
+          },
+          "mcpi": {
+            "LightOperation": {
+              "base": 8,
+              "units_per_gas": 511
+            }
+          },
+          "meq": {
+            "LightOperation": {
+              "base": 3,
+              "units_per_gas": 940
+            }
+          },
+          "retd_contract": {
+            "LightOperation": {
+              "base": 305,
+              "units_per_gas": 4
+            }
+          },
+          "s256": {
+            "LightOperation": {
+              "base": 31,
+              "units_per_gas": 4
+            }
+          },
+          "scwq": {
+            "HeavyOperation": {
+              "base": 16346,
+              "gas_per_unit": 17163
+            }
+          },
+          "smo": {
+            "LightOperation": {
+              "base": 40860,
+              "units_per_gas": 2
+            }
+          },
+          "srwq": {
+            "HeavyOperation": {
+              "base": 187,
+              "gas_per_unit": 179
+            }
+          },
+          "swwq": {
+            "HeavyOperation": {
+              "base": 17046,
+              "gas_per_unit": 16232
+            }
+          },
+          "contract_root": {
+            "LightOperation": {
+              "base": 31,
+              "units_per_gas": 2
+            }
+          },
+          "state_root": {
+            "HeavyOperation": {
+              "base": 236,
+              "gas_per_unit": 122
+            }
+          },
+          "new_storage_per_byte": 63,
+          "vm_initialization": {
+            "LightOperation": {
+              "base": 3957,
+              "units_per_gas": 48
+            }
+          }
+        }
+      },
+      "base_asset_id": "f8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07",
+      "block_gas_limit": 30000000,
+      "block_transaction_size_limit": 129024,
+      "privileged_address": "f034f7859dbf1d775cba16fc175eef249a045d6484a8b9388c9e280267125b73"
+    }
+  },
+  "genesis_state_transition_version": 11,
+  "consensus": {
+    "PoAV2": {
+      "genesis_signing_key": "3ba3b213c8d5ec4d4901ac34b0e924d635384a8b0a5df6e116bce9a783da8e02",
+      "signing_key_overrides": {}
+    }
+  }
+}
\ No newline at end of file
diff --git a/version-compatibility/forkless-upgrade/chain-configurations/v36/metadata.json b/version-compatibility/forkless-upgrade/chain-configurations/v36/metadata.json
new file mode 100644
index 00000000000..933a36e11a5
--- /dev/null
+++ b/version-compatibility/forkless-upgrade/chain-configurations/v36/metadata.json
@@ -0,0 +1,8 @@
+{
+  "chain_config": "chain_config.json",
+  "table_encoding": {
+    "Json": {
+      "filepath": "state_config.json"
+    }
+  }
+}
\ No newline at end of file
diff --git a/version-compatibility/forkless-upgrade/chain-configurations/v36/state_config.json b/version-compatibility/forkless-upgrade/chain-configurations/v36/state_config.json
new file mode 100644
index 00000000000..8087ca67338
--- /dev/null
+++ b/version-compatibility/forkless-upgrade/chain-configurations/v36/state_config.json
@@ -0,0 +1,152 @@
+{
+  "coins": [
+    {
+      "tx_id": "0000000000000000000000000000000000000000000000000000000000000001",
+      "output_index": 0,
+      "tx_pointer_block_height": 0,
+      "tx_pointer_tx_idx": 0,
+      "owner": "6b63804cfbf9856e68e5b6e7aef238dc8311ec55bec04df774003a2c96e0418e",
+      "amount": 1152921504606846976,
+      "asset_id": "f8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07"
+    },
+    {
+      "tx_id": "0000000000000000000000000000000000000000000000000000000000000002",
+      "output_index": 0,
+      "tx_pointer_block_height": 0,
+      "tx_pointer_tx_idx": 0,
+      "owner": "54944e5b8189827e470e5a8bacfc6c3667397dc4e1eef7ef3519d16d6d6c6610",
+      "amount": 1152921504606846976,
+      "asset_id": "f8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07"
+    },
+    {
+      "tx_id": "0000000000000000000000000000000000000000000000000000000000000003",
+      "output_index": 0,
+      "tx_pointer_block_height": 0,
+      "tx_pointer_tx_idx": 0,
+      "owner": "e10f526b192593793b7a1559a391445faba82a1d669e3eb2dcd17f9c121b24b1",
+      "amount": 1152921504606846976,
+      "asset_id": "f8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07"
+    },
+    {
+      "tx_id": "0000000000000000000000000000000000000000000000000000000000000004",
+      "output_index": 0,
+      "tx_pointer_block_height": 0,
+      "tx_pointer_tx_idx": 0,
+      "owner": "577e424ee53a16e6a85291feabc8443862495f74ac39a706d2dd0b9fc16955eb",
+      "amount": 1152921504606846976,
+      "asset_id": "f8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07"
+    },
+    {
+      "tx_id": "0000000000000000000000000000000000000000000000000000000000000005",
+      "output_index": 0,
+      "tx_pointer_block_height": 0,
+      "tx_pointer_tx_idx": 0,
+      "owner": "c36be0e14d3eaf5d8d233e0f4a40b3b4e48427d25f84c460d2b03b242a38479e",
+      "amount": 1152921504606846976,
+      "asset_id": "f8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07"
+    },
+    {
+      "tx_id": "0000000000000000000000000000000000000000000000000000000000000006",
+      "output_index": 0,
+      "tx_pointer_block_height": 0,
+      "tx_pointer_tx_idx": 0,
+      "owner": "a1184d77d0d08a064e03b2bd9f50863e88faddea4693a05ca1ee9b1732ea99b7",
+      "amount": 1152921504606846976,
+      "asset_id": "f8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07"
+    },
+    {
+      "tx_id": "0000000000000000000000000000000000000000000000000000000000000007",
+      "output_index": 0,
+      "tx_pointer_block_height": 0,
+      "tx_pointer_tx_idx": 0,
+      "owner": "b5566df884bee4e458151c2fe4082c8af38095cc442c61e0dc83a371d70d88fd",
+      "amount": 1152921504606846976,
+      "asset_id": "f8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07"
+    },
+    {
+      "tx_id": "0000000000000000000000000000000000000000000000000000000000000008",
+      "output_index": 0,
+      "tx_pointer_block_height": 0,
+      "tx_pointer_tx_idx": 0,
+      "owner": "9da7247e1d63d30d69f136f0f8654ee8340362c785b50f0a60513c7edbf5bb7c",
+      "amount": 1152921504606846976,
+      "asset_id": "f8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07"
+    },
+    {
+      "tx_id": "0000000000000000000000000000000000000000000000000000000000000009",
+      "output_index": 0,
+      "tx_pointer_block_height": 0,
+      "tx_pointer_tx_idx": 0,
+      "owner": "4b2ca966aad1a9d66994731db5138933cf61679107c3cde2a10d9594e47c084e",
+      "amount": 1152921504606846976,
+      "asset_id": "f8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07"
+    },
+    {
+      "tx_id": "000000000000000000000000000000000000000000000000000000000000000a",
+      "output_index": 0,
+      "tx_pointer_block_height": 0,
+      "tx_pointer_tx_idx": 0,
+      "owner": "26183fbe7375045250865947695dfc12500dcc43efb9102b4e8c4d3c20009dcb",
+      "amount": 1152921504606846976,
+      "asset_id": "f8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07"
+    },
+    {
+      "tx_id": "000000000000000000000000000000000000000000000000000000000000000b",
+      "output_index": 0,
+      "tx_pointer_block_height": 0,
+      "tx_pointer_tx_idx": 0,
+      "owner": "81f3a10b61828580d06cc4c7b0ed8f59b9fb618be856c55d33decd95489a1e23",
+      "amount": 1152921504606846976,
+      "asset_id": "f8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07"
+    },
+    {
+      "tx_id": "000000000000000000000000000000000000000000000000000000000000000c",
+      "output_index": 0,
+      "tx_pointer_block_height": 0,
+      "tx_pointer_tx_idx": 0,
+      "owner": "587aa0482482efea0234752d1ad9a9c438d1f34d2859b8bef2d56a432cb68e33",
+      "amount": 1152921504606846976,
+      "asset_id": "f8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07"
+    },
+    {
+      "tx_id": "000000000000000000000000000000000000000000000000000000000000000d",
+      "output_index": 0,
+      "tx_pointer_block_height": 0,
+      "tx_pointer_tx_idx": 0,
+      "owner": "53a9c6a74bee79c5e04115a007984f4bddaafed75f512f68766c6ed59d0aedec",
+      "amount": 1125899906842624,
+      "asset_id": "f8f8b6283d7fa5b672b530cbb84fcccb4ff8dc40f8176ef4544ddb1f1952ad07"
+    }
+  ],
+  "messages": [],
+  "blobs": [],
+  "contracts": [
+    {
+      "contract_id": "7777777777777777777777777777777777777777777777777777777777777777",
+      "code": "900000097b4b30b2437b0073e5ba5a9324cf55831d180a89f66332b541827e12e647b7516140000a504d00205d4d30001a4860004945048076440001240400005050c0043d51345024040000",
+      "tx_id": "0000000000000000000000000000000000000000000000000000000000000000",
+      "output_index": 0,
+      "tx_pointer_block_height": 0,
+      "tx_pointer_tx_idx": 0,
+      "states": [],
+      "balances": []
+    },
+    {
+      "contract_id": "7e2becd64cd598da59b4d1064b711661898656c6b1f4918a787156b8965dc83c",
+      "code": "1af030007400000200000000000014605dffc00110ffff00740000001aec500091000b285d43f015104103001a4460005d4d10491b441000104934405d47f008104404405d4920001b44144010453440504fb0205fed10045fed20055047ba8872500010284535005047ba88504fb46072500010284d15005d453000504fb0105fed10025fed20035047ba2872480010284534805047ba285fed00005d43f0085fed00015043b2d0724800102843b480504bb650724c0010284914c05047b660724c0010284504c01ae920001ae5100020f8330058fbe00250fbe0047400041a1a43d00076400001740000a71a4060005d41004a1b441000104104405047ba9872480020284504805043ba985047b03072480020284504805043b0b072480020284114805047b95072480020284504805043b95071440006504bb0f8724c0020284914c05047b890724c0020284504c05043b8f0724c0020284124c0a1411420764000065043b2e05fec005c504bb7907244001028490440740000085043b2805fec10505045000f5c4bf0505e452000504bb79072440010284904405d43f00b264000001a4070005fed01365d43f00b5fed01375fec01385057b9b05043b53072440010284124405d43b0f213410000764000475d43b0a613410040764000025d43f00c364000005043b5305041000f5c4100001ae810001ae5500020f8330058fbe00250fbe0047400042e5d4550005d4950015d4d5002104d3040165124c076500001135124c0765000065047b3605fec006c504fb7a072480018284d14807400000d124d3480104d30401b4d24c0264c0000281d14801a447000504bb1185fec10235fed10245fed3025504fb7a072440018284d24405047b54072480018284534805d47b0f4134510007644000f5d47b0a813451040764400025d43f00c364000005047b54050451008504bb5405049200850492008724c0008285514c050455008724c0008284524c05d4550005d4950021b481480104514805e4500005d415002104100405f550002740000061ae800001ae5500020f8330058fbe00250fbe004740003ef5043b9b050450010504bb1e0724c0008284904c050412008724c0008284114c05043ba3872440010284124405043ba385047b6c072480010284504801ae9100020f8330058fbe00250fbe004740004311a43d0005047ba38504bb780724c0010284914c01ae9200020f8330058fbe00250fbe004740003c01a47d000254110005d43f016104103005047ba28504bb3505fed006a5d43f00d5fed006b5043b3f0724c0010284124c0504bb670724c0010284914c05047b710724c0010284504c01ae920001ae5100020f8330058fbe00250fbe0047400035a1a43d000764000017400012f1a4060005d41004a1b441000104104405047bab872480020284504805043bab85047b05072480020284504805043b13072480020284114805047b97072480020284504805043b97071440006504bb150724c0020284914c05047b8b0724c0020284504c05043b910724c0020284124c0a1411420764000065043b3105fec0062504bb7b872440020284904407400002d5043b2905fec10525047b6405d4bf01710492300724c0008284524c05d4bf008264800001a4c7000284d14805047b1f05fed303e5d4bf00f5fed203f504bb470724c0010284914c05d492001504fb48072500010284d15005d4530001b492040504fb4b05fed10965fed20975047b4c072480010284534805d451000504bb4d072500010284935005d4920015053b4e072540010285135405d4d40015fed10535fed20545fed3055504bb7b872440020284904405d43f00b264000001a4070005fed01395d43f00b5fed013a5fec013b5057b9c85043b58872440020284124405d43b0f713410000764000aa5d43b0b113410040764000025d43f00c364000005043b588504100085047baf872480018284504801ae810001ae5500020f8330058fbe00250fbe00474000347505bbaf85d43b1615d4550005d4950015d4d50025d53f008104d3500165124c076500001135124c0765000065047b3a85fec0075504fb7d872480018284d14807400000d124d3480104d30401b4d24c0264c0000281d14801a447000504bb1705fec102e5fed102f5fed3030504fb7d872440018284d24405047b5d872480018284534805d47b0fb134510007644000f5d47b0bb13451040764400025d43f00c364000005047b5d850451008504bb5d85049200850492008724c0008285514c050455008724c0008284524c05d4550005d4950021b481480104514805f4500005d4150025d47f008104104405f5500021a5c00005d41600216417400764000017400005f5d416002164505c076440001134505c07644000b5d416000104105c05047b2f05fec105e5c4100005049100f5e490000504bb7f07240001028491400740000055043b0705fec000e504bb7f072440010284904405043b62072440010284124405d43b0fe1341004076400001360000005043b6205041000f5c4100005d4550005d4950015d4d5002104d3040165124c076500001135124c0765000065047b3785fec006f504fb80072480018284d14807400000d124d3480104d30401b4d24c0264c0000281d14801a447000504bb2005fec10405fed10415fed3042504fb80072440018284d24405047b55872480018284534805d47b100134510007644000f5d47b0ab13451040764400025d43f00c364000005047b55850451008504bb5585049200850492008724c0008285514c050455008724c0008284524c05d4550005d4950021b481480104514805e4500005d415002104100405f550002105d70407500005b1ae800001ae5500020f8330058fbe00250fbe004740002a75043b9c850450010504bb260724c0008284904c050412008724c0008284114c05043ba4872440010284124405043ba485047b6d072480010284504801ae9100020f8330058fbe00250fbe004740002e91a43d0005047ba48504bb680724c0010284914c01ae9200020f8330058fbe00250fbe004740002781a47d000254110005d43f018104103005047ba28504bb4005fed00805d43f0105fed00815043b410724c0010284124c0504bb720724c0010284914c05047b730724c0010284504c01ae920001ae5100020f8330058fbe00250fbe004740002121a43d000764000017400012f1a4060005d41004a1b441000104104405047bad872480020284504805043bad85047b08072480020284504805043b18872480020284114805047b99072480020284504805043b99071440006504bb1a8724c0020284914c05047b8d0724c0020284504c05043b930724c0020284124c0a1411420764000065043b3305fec0066504bb81872440020284904407400002d5043b2b05fec10565047b6485d4bf01910492300724c0008284524c05d4bf008264800001a4c7000284d14805047b2185fed30435d4bf0125fed2044504bb4f0724c0010284914c05d492001504fb50072500010284d15005d4530001b492040504fb5105fed10a25fed20a35047b52072480010284534805d451000504bb49072500010284935005d4920015053b4a072540010285135405d4d40015fed10575fed20585fed3059504bb81872440020284904405d43f00b264000001a4070005fed013c5d43f00b5fed013d5fec013e5057b9e05043b5a872440020284124405d43b10313410000764000aa5d43b0b513410040764000025d43f00c364000005043b5a8504100085047bb1072480018284504801ae810001ae5500020f8330058fbe00250fbe004740001ff505bbb105d43b1645d4550005d4950015d4d50025d53f008104d3500165124c076500001135124c0765000065047b3c05fec0078504fb83872480018284d14807400000d124d3480104d30401b4d24c0264c0000281d14801a447000504bb1c85fec10395fed103a5fed303b504fb83872440018284d24405047b5f072480018284534805d47b107134510007644000f5d47b0be13451040764400025d43f00c364000005047b5f050451008504bb5f05049200850492008724c0008285514c050455008724c0008284524c05d4550005d4950021b481480104514805f4500005d4150025d47f008104104405f5500021a5c00005d41600216417400764000017400005f5d416002164505c076440001134505c07644000b5d416000104105c05047b3005fec10605c4100005049100f5e490000504bb8507240001028491400740000055043b0a05fec0014504bb85072440010284904405043b63072440010284124405d43b10a1341004076400001360000005043b6305041000f5c4100005d4550005d4950015d4d5002104d3040165124c076500001135124c0765000065047b3905fec0072504fb86072480018284d14807400000d124d3480104d30401b4d24c0264c0000281d14801a447000504bb2285fec10455fed10465fed3047504fb86072440018284d24405047b57072480018284534805d47b10c134510007644000f5d47b0ae13451040764400025d43f00c364000005047b57050451008504bb5705049200850492008724c0008285514c050455008724c0008284524c05d4550005d4950021b481480104514805e4500005d415002104100405f550002105d70407500005b1ae800001ae5500020f8330058fbe00250fbe0047400015f5043b9e050450010504bb270724c0008284904c050412008724c0008284114c05043ba5872440010284124405043ba585047b6e072480010284504801ae9100020f8330058fbe00250fbe004740001a11a43d0005047ba58504bb690724c0010284914c01ae9200020f8330058fbe00250fbe004740001301a47d000254110005d43f01a104103005047ba28504bb4205fed00845d43f0135fed00855043b430724c0010284124c0504bb740724c0010284914c05047b750724c0010284504c01ae920001ae5100020f8330058fbe00250fbe004740000ca1a43d00076400001740000635d43f00b264000001a4070005fed013f5d43f00b5fed01405fec01415053b9f85d43b13f5d47b1405d4bb1415d4ff008104924c0164d1480764c0001134d1480764c00065043b3d85fec007b504bb87872440018284904407400000d12492440104920401b49148026480000281d04401a4070005047b0d05fec101a5fed001b5fed201c504bb87872400018284914005043b60872440018284124405d43b10f134100007640000f5d43b0c113410040764000025d43f00c364000005043b608504100085047b608504510085045100872480008285104805041400872480008284114805d4140005d4540021b441440104104401a4410005f4110005d4140025d47f008104104405f5100025043b9f850450010504bb240724c0008284904c050412008724c0008284114c05043ba6872440010284124405043ba685047b6f072480010284504801ae9100020f8330058fbe00250fbe004740001251a43d0005047ba68504bb6a0724c0010284914c01ae9200020f8330058fbe00250fbe004740000b41a47d000254110005d43f01b104103005047ba28504bb4405fed00885d43f0135fed00895043b450724c0010284124c0504bb760724c0010284914c05047b770724c0010284504c01ae920001ae5100020f8330058fbe00250fbe0047400004e1a43d00076400001740000495043b2505fec004a5d47f00b264400001a4470005fed11425d47f00b5fed11435fec01445047ba10504bb5c8724c0010284904c05d43b04a13410000764000135d43b0b913410040764000025d43f00c364000005d43b0ba1ae810001ae5100020f8330058fbe00250fbe0047400008e1ae900001ae5100020f8330058fbe00250fbe00474000088740000061ae800001ae5100020f8330058fbe00250fbe004740000815043ba1050450010504bb0e8724c0008284904c050412008724c0008284114c05043ba7872440010284124405043ba785047b70072480010284504801ae9100020f8330058fbe00250fbe004740000c31a43d0005047ba78504bb6b0724c0010284914c01ae9200020f8330058fbe00250fbe004740000521a47d000254110005d43f014364000009500003f960800001aec5000910000501a43a0001a4790001a4be000724c001028ed04c01aebb00020f8330058fbe00250fbe004740000301a4fd0005053b01072540010285115401ae9400020f8330058fbe00250fbe004740000271a53d000134d3500134d30001a500000764c001c504fb03072500010284d05001ae9300020f8330058fbe00250fbe004740000811a4fd0005053b04072540010285115401ae9400020f8330058fbe00250fbe004740000781a47d0005053b02072540010285105401ae9400020f8330058fbe00250fbe004740000081a43d000295134501af54000920000501af92000980800009700003f4af8000095000007960800001aec5000910000101a43a0001a47e0007248001028ed04801a43b0005d4100011af50000920000101af9100098080000970000074af8000095000007960800001aec5000910000101a43a0001a47e0007248001028ed04801a43b0005d410001124100401af50000920000101af9100098080000970000074af800009500007f960800001aec5000910000601a4fa0001a5790001a53e0005d5950005d4150015d4550025d4bf00810451480164904407648000113490440764800065043b0185fec0003504bb04872440018284904407400000c12451400104510401b45044026440000281d64001a4070005fec10005fed00015fed1002504bb04872400018284bb4005043b03072440018284124405d43b009134100007640000f5d43b00613410040764000025d43f00c364000005043b030504100085047b030504510085045100872480008285504805041500872480008284114805d4150005d4550021b441440104104405f4130005d4150025d47f008104104405f5500021af40000920000601af94000980800009700007f4af8000095000007960800001aec5000910000101a43a0001a47e0007248001028ed04801a43b0005d4100001af50000920000101af9100098080000970000074af8000095000007960800001aec5000910000101a43a0001a47e0007248001028ed04801a43b0005d4100001af50000920000101af9100098080000970000074af8000047000000646563696d616c736e616d650000000073796d626f6c0000746f74616c5f61737365747300000000746f74616c5f737570706c790000000000000000000002480000000000000008000000000000025009000000000000000000000000000400cccccccccccc0002000000000000000445746865720000000000000000000005000000000000000645544800000000000000000000000003000000000000000c000000000000007b0000000000001460000000000000146800000000000014d0000000000000147000000000000014e800000000000014780000000000001488",
+      "tx_id": "0000000000000000000000000000000000000000000000000000000000000001",
+      "output_index": 0,
+      "tx_pointer_block_height": 0,
+      "tx_pointer_tx_idx": 0,
+      "states": [],
+      "balances": []
+    }
+  ],
+  "last_block": {
+    "block_height": 0,
+    "da_block_height": 0,
+    "consensus_parameters_version": 0,
+    "state_transition_version": 11,
+    "blocks_root": "801049f397f4fae0edc37c3496f0e78bd2c6a02d3971b4627e8224d257e19258"
+  }
+}
\ No newline at end of file
diff --git a/version-compatibility/forkless-upgrade/chain-configurations/v36/state_transition_bytecode.wasm b/version-compatibility/forkless-upgrade/chain-configurations/v36/state_transition_bytecode.wasm
new file mode 100644
index 00000000000..d2ec849cc27
Binary files /dev/null and b/version-compatibility/forkless-upgrade/chain-configurations/v36/state_transition_bytecode.wasm differ
diff --git a/version-compatibility/forkless-upgrade/src/backward_compatibility.rs b/version-compatibility/forkless-upgrade/src/backward_compatibility.rs
index 229f9eadb75..cbec490a41f 100644
--- a/version-compatibility/forkless-upgrade/src/backward_compatibility.rs
+++ b/version-compatibility/forkless-upgrade/src/backward_compatibility.rs
@@ -2,8 +2,10 @@ use crate::tests_helper::{
     default_multiaddr,
     GenesisFuelCoreDriver,
     LatestFuelCoreDriver,
+    Version36FuelCoreDriver,
     IGNITION_TESTNET_SNAPSHOT,
     POA_SECRET_KEY,
+    V36_TESTNET_SNAPSHOT,
 };
 use latest_fuel_core_type::{
     fuel_tx::Transaction,
@@ -25,6 +27,8 @@ use libp2p::{
 };
 use std::time::Duration;
 
+const BLOCK_INCLUSION_TIMEOUT: Duration = Duration::from_secs(360);
+
 #[tokio::test]
 async fn latest_binary_is_backward_compatible_and_can_load_testnet_config() {
     // When
@@ -109,7 +113,76 @@ async fn latest_binary_is_backward_compatible_and_follows_blocks_created_by_gene
 
     // Then
     for i in 0..BLOCKS_TO_PRODUCE {
-        let _ = tokio::time::timeout(Duration::from_secs(120), imported_blocks.next())
+        let _ = tokio::time::timeout(BLOCK_INCLUSION_TIMEOUT, imported_blocks.next())
+            .await
+            .expect(format!("Timed out waiting for block import {i}").as_str())
+            .expect(format!("Failed to import block {i}").as_str());
+    }
+}
+
+#[tokio::test]
+async fn latest_binary_is_backward_compatible_and_follows_blocks_created_by_v36_binary() {
+    // Given
+    let v36_keypair = SecpKeypair::generate();
+    let hexed_secret = hex::encode(v36_keypair.secret().to_bytes());
+    let v36_port = "30334";
+    let v36_node = Version36FuelCoreDriver::spawn(&[
+        "--service-name",
+        "V36Producer",
+        "--debug",
+        "--poa-instant",
+        "true",
+        "--consensus-key",
+        POA_SECRET_KEY,
+        "--snapshot",
+        V36_TESTNET_SNAPSHOT,
+        "--enable-p2p",
+        "--keypair",
+        hexed_secret.as_str(),
+        "--peering-port",
+        v36_port,
+    ])
+    .await
+    .unwrap();
+    let public_key = Keypair::from(v36_keypair).public();
+    let v36_peer_id = PeerId::from_public_key(&public_key);
+    let v36_multiaddr = default_multiaddr(v36_port, v36_peer_id);
+
+    // Starting node that uses latest fuel core.
+    // It will connect to the v36 node and sync blocks.
+    let latest_keypair = SecpKeypair::generate();
+    let hexed_secret = hex::encode(latest_keypair.secret().to_bytes());
+    let latest_node = LatestFuelCoreDriver::spawn(&[
+        "--service-name",
+        "LatestValidator",
+        "--debug",
+        "--poa-instant",
+        "false",
+        "--snapshot",
+        V36_TESTNET_SNAPSHOT,
+        "--enable-p2p",
+        "--keypair",
+        hexed_secret.as_str(),
+        "--reserved-nodes",
+        v36_multiaddr.as_str(),
+        "--peering-port",
+        "0",
+    ])
+    .await
+    .unwrap();
+    let mut imported_blocks = latest_node.node.shared.block_importer.events();
+
+    // When
+    const BLOCKS_TO_PRODUCE: u32 = 10;
+    v36_node
+        .client
+        .produce_blocks(BLOCKS_TO_PRODUCE, None)
+        .await
+        .unwrap();
+
+    // Then
+    for i in 0..BLOCKS_TO_PRODUCE {
+        let _ = tokio::time::timeout(BLOCK_INCLUSION_TIMEOUT, imported_blocks.next())
             .await
             .expect(format!("Timed out waiting for block import {i}").as_str())
             .expect(format!("Failed to import block {i}").as_str());
@@ -122,7 +195,7 @@ async fn latest_binary_is_backward_compatible_and_can_deserialize_errors_from_ge
     // Given
     let genesis_keypair = SecpKeypair::generate();
     let hexed_secret = hex::encode(genesis_keypair.secret().to_bytes());
-    let genesis_port = "30333";
+    let genesis_port = "30335";
     let node_with_genesis_transition = LatestFuelCoreDriver::spawn(&[
         "--service-name",
         "GenesisProducer",
diff --git a/version-compatibility/forkless-upgrade/src/forward_compatibility.rs b/version-compatibility/forkless-upgrade/src/forward_compatibility.rs
index f18b19b78cf..3523468f430 100644
--- a/version-compatibility/forkless-upgrade/src/forward_compatibility.rs
+++ b/version-compatibility/forkless-upgrade/src/forward_compatibility.rs
@@ -6,7 +6,7 @@ use crate::tests_helper::{
     default_multiaddr,
     transactions_from_subsections,
     upgrade_transaction,
-    GenesisFuelCoreDriver,
+    Version36FuelCoreDriver,
     IGNITION_TESTNET_SNAPSHOT,
     POA_SECRET_KEY,
     SUBSECTION_SIZE,
@@ -31,24 +31,24 @@ use rand::{
 use std::time::Duration;
 
 #[tokio::test]
-async fn latest_state_transition_function_is_forward_compatible_with_genesis_binary() {
-    // The test has a genesis block producer and one genesis validator.
-    // Genesis nodes execute several blocks by using the genesis state transition function.
+async fn latest_state_transition_function_is_forward_compatible_with_v36_binary() {
+    // The test has a v36 block producer and one v36 validator.
+    // v36 nodes execute several blocks by using the v36 state transition function.
     // At some point, we upgrade the network to use the latest state transition function.
     // The network should be able to generate several new blocks with a new version.
-    // Genesis block producer and validator should process all blocks.
+    // v36 block producer and validator should process all blocks.
     //
     // These actions test that old nodes could use a new state transition function,
     // and it is forward compatible.
     //
     // To simplify the upgrade of the network `utxo_validation` is `false`.
 
-    let genesis_keypair = SecpKeypair::generate();
-    let hexed_secret = hex::encode(genesis_keypair.secret().to_bytes());
-    let genesis_port = "40333";
-    let genesis_node = GenesisFuelCoreDriver::spawn(&[
+    let v36_keypair = SecpKeypair::generate();
+    let hexed_secret = hex::encode(v36_keypair.secret().to_bytes());
+    let v36_port = "40333";
+    let v36_node = Version36FuelCoreDriver::spawn(&[
         "--service-name",
-        "GenesisProducer",
+        "V36Producer",
         "--debug",
         "--poa-instant",
         "true",
@@ -60,21 +60,21 @@ async fn latest_state_transition_function_is_forward_compatible_with_genesis_bin
         "--keypair",
         hexed_secret.as_str(),
         "--peering-port",
-        genesis_port,
+        v36_port,
     ])
     .await
     .unwrap();
-    let public_key = Keypair::from(genesis_keypair).public();
-    let genesis_peer_id = PeerId::from_public_key(&public_key);
-    let genesis_multiaddr = default_multiaddr(genesis_port, genesis_peer_id);
+    let public_key = Keypair::from(v36_keypair).public();
+    let v36_peer_id = PeerId::from_public_key(&public_key);
+    let v36_multiaddr = default_multiaddr(v36_port, v36_peer_id);
 
-    // Starting a genesis validator node.
-    // It will connect to the genesis node and sync blocks.
+    // Starting a v36 validator node.
+    // It will connect to the v36 node and sync blocks.
     let latest_keypair = SecpKeypair::generate();
     let hexed_secret = hex::encode(latest_keypair.secret().to_bytes());
-    let validator_node = GenesisFuelCoreDriver::spawn(&[
+    let validator_node = Version36FuelCoreDriver::spawn(&[
         "--service-name",
-        "GenesisValidator",
+        "V36Validator",
         "--debug",
         "--poa-instant",
         "false",
@@ -84,7 +84,7 @@ async fn latest_state_transition_function_is_forward_compatible_with_genesis_bin
         "--keypair",
         hexed_secret.as_str(),
         "--reserved-nodes",
-        genesis_multiaddr.as_str(),
+        v36_multiaddr.as_str(),
         "--peering-port",
         "0",
     ])
@@ -94,7 +94,7 @@ async fn latest_state_transition_function_is_forward_compatible_with_genesis_bin
     // Given
     let mut imported_blocks = validator_node.node.shared.block_importer.events();
     const BLOCKS_TO_PRODUCE: u32 = 10;
-    genesis_node
+    v36_node
         .client
         .produce_blocks(BLOCKS_TO_PRODUCE, None)
         .await
@@ -144,7 +144,7 @@ async fn latest_state_transition_function_is_forward_compatible_with_genesis_bin
 
     // Then
     let mut imported_blocks = validator_node.node.shared.block_importer.events();
-    genesis_node
+    v36_node
         .client
         .produce_blocks(BLOCKS_TO_PRODUCE, None)
         .await
diff --git a/version-compatibility/forkless-upgrade/src/lib.rs b/version-compatibility/forkless-upgrade/src/lib.rs
index 27583513f45..b40ca55c722 100644
--- a/version-compatibility/forkless-upgrade/src/lib.rs
+++ b/version-compatibility/forkless-upgrade/src/lib.rs
@@ -3,11 +3,8 @@
 
 #[cfg(test)]
 mod backward_compatibility;
-// TODO: Uncomment forward compatibility tests after release of the `fuel-core 0.36.0`.
-//  New forward compatibility test should use the `fuel-core 0.36.0`.
-//  https://github.com/FuelLabs/fuel-core/issues/2198
-// #[cfg(test)]
-// mod forward_compatibility;
+#[cfg(test)]
+mod forward_compatibility;
 #[cfg(test)]
 pub(crate) mod tests_helper;
 
diff --git a/version-compatibility/forkless-upgrade/src/tests_helper.rs b/version-compatibility/forkless-upgrade/src/tests_helper.rs
index 617b7403204..c48a1b512a1 100644
--- a/version-compatibility/forkless-upgrade/src/tests_helper.rs
+++ b/version-compatibility/forkless-upgrade/src/tests_helper.rs
@@ -26,6 +26,9 @@ use rand::{
     Rng,
 };
 use std::str::FromStr;
+use version_36_fuel_core_bin::FuelService as Version36FuelService;
+use version_36_fuel_core_client::client::FuelClient as Version36Client;
+use version_36_fuel_core_services as _;
 
 // Awful version compatibility hack.
 // `$bin_crate::cli::run::get_service` is async in the later versions of fuel-core-bin.
@@ -92,6 +95,14 @@ define_core_driver!(
     false
 );
 
+define_core_driver!(
+    version_36_fuel_core_bin,
+    Version36FuelService,
+    Version36Client,
+    Version36FuelCoreDriver,
+    true
+);
+
 define_core_driver!(
     latest_fuel_core_bin,
     LatestFuelService,
@@ -101,6 +112,7 @@ define_core_driver!(
 );
 
 pub const IGNITION_TESTNET_SNAPSHOT: &str = "./chain-configurations/ignition";
+pub const V36_TESTNET_SNAPSHOT: &str = "./chain-configurations/v36";
 pub const POA_SECRET_KEY: &str =
     "e3d6eb39607650e22f0befa26d52e921d2e7924d0e165f38ffa8d9d0ac73de93";
 pub const PRIVILEGED_ADDRESS_KEY: &str =