Merge branch 'master' into use_bytes20_relayer_config

CHANGELOG.md

@@ -9,8 +9,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Breaking
 - [#1951](https://github.com/FuelLabs/fuel-core/pull/1951): Replace `H160` in config and cli options of relayer by `Bytes20` of `fuel-types`
 
+### Added
+- [#1889](https://github.com/FuelLabs/fuel-core/pull/1889): Add new `FuelGasPriceProvider` that receives the gas price algorithm from a `GasPriceService`
+
+
 ### Changed
 - [#1942](https://github.com/FuelLabs/fuel-core/pull/1942): Sequential relayer's commits.
+- [#1952](https://github.com/FuelLabs/fuel-core/pull/1952): Change tip sorting to ratio between tip and max gas sorting in txpool
 
 ### Fixed
 - [#1950](https://github.com/FuelLabs/fuel-core/pull/1950): Fix cursor `BlockHeight` encoding in `SortedTXCursor`

Cargo.toml

@@ -17,6 +17,7 @@ members = [
   "crates/services/consensus_module/bft",
   "crates/services/consensus_module/poa",
   "crates/services/executor",
+  "crates/services/gas_price_service",
   "crates/services/importer",
   "crates/services/p2p",
   "crates/services/producer",
@@ -67,6 +68,7 @@ fuel-core-bft = { version = "0.28.0", path = "./crates/services/consensus_module
 fuel-core-poa = { version = "0.28.0", path = "./crates/services/consensus_module/poa" }
 fuel-core-executor = { version = "0.28.0", path = "./crates/services/executor", default-features = false }
 fuel-core-importer = { version = "0.28.0", path = "./crates/services/importer" }
+fuel-core-gas-price-service = { version = "0.28.0", path = "crates/services/gas_price_service" }
 fuel-core-p2p = { version = "0.28.0", path = "./crates/services/p2p" }
 fuel-core-producer = { version = "0.28.0", path = "./crates/services/producer" }
 fuel-core-relayer = { version = "0.28.0", path = "./crates/services/relayer" }
@@ -92,6 +94,7 @@ derivative = { version = "2" }
 derive_more = { version = "0.99" }
 enum-iterator = "1.2"
 hyper = { version = "0.14.26" }
+num-rational = "0.4.2"
 primitive-types = { version = "0.12", default-features = false }
 rand = "0.8"
 parking_lot = "0.12"

crates/client/Cargo.toml

@@ -14,7 +14,7 @@ description = "Tx client and schema specification."
 anyhow = { workspace = true }
 cynic = { workspace = true }
 derive_more = { workspace = true }
-eventsource-client = { version = "0.10.2", optional = true }
+eventsource-client = { version = "0.12.2", optional = true }
 fuel-core-types = { workspace = true, features = ["serde"] }
 futures = { workspace = true, optional = true }
 hex = "0.4"

crates/fuel-core/Cargo.toml

@@ -24,6 +24,7 @@ fuel-core-chain-config = { workspace = true, features = ["std"] }
 fuel-core-consensus-module = { workspace = true }
 fuel-core-database = { workspace = true }
 fuel-core-executor = { workspace = true, features = ["std"] }
+fuel-core-gas-price-service = { workspace = true }
 fuel-core-importer = { workspace = true }
 fuel-core-metrics = { workspace = true }
 fuel-core-p2p = { workspace = true, optional = true }

crates/fuel-core/src/service.rs

@@ -325,9 +325,9 @@ mod tests {
             i += 1;
         }
 
-        // current services: graphql, graphql worker, txpool, PoA
+        // current services: graphql, graphql worker, txpool, PoA, gas price service
         #[allow(unused_mut)]
-        let mut expected_services = 5;
+        let mut expected_services = 6;
 
         // Relayer service is disabled with `Config::local_node`.
         // #[cfg(feature = "relayer")]

crates/fuel-core/src/service/adapters.rs

@@ -39,6 +39,8 @@ pub mod relayer;
 pub mod sync;
 pub mod txpool;
 
+pub mod fuel_gas_price_provider;
+
 #[derive(Debug, Clone)]
 pub struct ConsensusParametersProvider {
     shared_state: consensus_parameters_provider::SharedState,