Integrate with V1 algo for tests

.github/workflows/ci.yml

@@ -119,19 +119,19 @@ jobs:
           - command: make
             args: check --locked
           - command: nextest
-            args: run --workspace
+            args: run --workspace --retries 3 --no-fail-fast
           - command: nextest
-            args: run --all-features --workspace
+            args: run --all-features --workspace --retries 3 --no-fail-fast
           - command: nextest
-            args: run -p fuel-core --no-default-features
+            args: run -p fuel-core --no-default-features --retries 3 --no-fail-fast
           - command: nextest
-            args: run -p fuel-core --lib executor --features wasm-executor
+            args: run -p fuel-core --lib executor --features wasm-executor --retries 3 --no-fail-fast
             env:
               FUEL_ALWAYS_USE_WASM=true
           - command: nextest
-            args: run -p fuel-core-client --no-default-features
+            args: run -p fuel-core-client --no-default-features --retries 3 --no-fail-fast
           - command: nextest
-            args: run -p fuel-core-chain-config --no-default-features
+            args: run -p fuel-core-chain-config --no-default-features --retries 3 --no-fail-fast
           # Don't split this command; this is a workaround.
           # We need to run `cargo check` first to fetch the locked dependencies
           # for `fuel-core 0.26.0`(because of the bug with `--offline`

.gitignore

@@ -17,4 +17,4 @@ node_modules/
 package-lock.json
 package.json
 bin/fuel-core/chainspec/local-testnet/state_transition_bytecode.wasm
-
+.DS_Store

CHANGELOG.md

@@ -55,6 +55,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - [2233](https://github.com/FuelLabs/fuel-core/pull/2233): Introduce a new column `modification_history_v2` for storing the modification history in the historical rocksDB. Keys in this column are stored in big endian order. Changed the behaviour of the historical rocksDB to write changes for new block heights to the new column, and to perform lookup of values from the `modification_history_v2` table first, and then from the `modification_history` table, performing a migration upon access if necessary.
 
 #### Breaking
+- [2469](https://github.com/FuelLabs/fuel-core/pull/2469): Move from `GasPriceServicev0` to `GasPriceServiceV1`. Include new config values.
 - [2438](https://github.com/FuelLabs/fuel-core/pull/2438): The `fuel-core-client` can only work with new version of the `fuel-core`. The `0.40` and all older versions are not supported.
 - [2438](https://github.com/FuelLabs/fuel-core/pull/2438): Updated `fuel-vm` to `0.59.1` release. Check [release notes](https://github.com/FuelLabs/fuel-vm/releases/tag/v0.59.0) for more details.
 - [2389](https://github.com/FuelLabs/fuel-core/pull/2258): Updated the `messageProof` GraphQL schema to return a non-nullable `MessageProof`.

bin/e2e-test-client/tests/integration_tests.rs

@@ -135,8 +135,8 @@ fn dev_config() -> Config {
     chain_config.genesis_state_transition_version = Some(LATEST_STATE_TRANSITION_VERSION);
     let reader = reader.with_chain_config(chain_config);
 
-    let mut config = Config::local_node_with_reader(reader);
-    config.starting_gas_price = 1;
+    let mut config = Config::local_node_with_reader(reader, None);
+    config.starting_exec_gas_price = 1;
     config.block_producer.coinbase_recipient = Some(
         ContractId::from_str(
             "0x7777777777777777777777777777777777777777777777777777777777777777",

bin/fuel-core/src/cli/run.rs

@@ -187,21 +187,49 @@ pub struct Command {
     #[arg(long = "native-executor-version", env)]
     pub native_executor_version: Option<StateTransitionBytecodeVersion>,
 
-    /// The starting gas price for the network
-    #[arg(long = "starting-gas-price", default_value = "0", env)]
+    /// The starting execution gas price for the network
+    #[arg(long = "starting-gas-price", default_value = "1000", env)]
     pub starting_gas_price: u64,
 
     /// The percentage change in gas price per block
-    #[arg(long = "gas-price-change-percent", default_value = "0", env)]
-    pub gas_price_change_percent: u64,
+    #[arg(long = "gas-price-change-percent", default_value = "10", env)]
+    pub gas_price_change_percent: u16,
 
     /// The minimum allowed gas price
     #[arg(long = "min-gas-price", default_value = "0", env)]
     pub min_gas_price: u64,
 
     /// The percentage threshold for gas price increase
     #[arg(long = "gas-price-threshold-percent", default_value = "50", env)]
-    pub gas_price_threshold_percent: u64,
+    pub gas_price_threshold_percent: u8,
+
+    /// Minimum DA gas price
+    #[arg(long = "min-da-gas-price", default_value = "10000000", env)]
+    pub min_da_gas_price: u64,
+
+    /// P component of DA gas price calculation
+    /// **NOTE**: This is the **inverse** gain of a typical P controller.
+    /// Increasing this value will reduce gas price fluctuations.
+    #[arg(long = "da-p-component", default_value = "620090", env)]
+    pub da_p_component: i64,
+
+    /// D component of DA gas price calculation
+    /// **NOTE**: This is the **inverse** anticipatory control factor of a typical PD controller.
+    /// Increasing this value will reduce the dampening effect of quick algorithm changes.
+    #[arg(long = "da-d-component", default_value = "3528576", env)]
+    pub da_d_component: i64,
+
+    /// Maximum DA gas price change percent
+    #[arg(long = "max-da-gas-price-change-percent", default_value = "10", env)]
+    pub max_da_gas_price_change_percent: u16,
+
+    /// The URL for the DA Block Committer info
+    #[arg(long = "da-committer-url", env)]
+    pub da_committer_url: Option<String>,
+
+    /// The interval at which the `DaSourceService` polls for new data
+    #[arg(long = "da-poll-interval", env)]
+    pub da_poll_interval: Option<u32>,
 
     /// The signing key used when producing blocks.
     /// Setting via the `CONSENSUS_KEY_SECRET` ENV var is preferred.
@@ -301,6 +329,12 @@ impl Command {
             gas_price_change_percent,
             min_gas_price,
             gas_price_threshold_percent,
+            min_da_gas_price,
+            da_p_component,
+            da_d_component,
+            max_da_gas_price_change_percent,
+            da_committer_url,
+            da_poll_interval,
             consensus_key,
             #[cfg(feature = "aws-kms")]
             consensus_aws_kms,
@@ -592,10 +626,10 @@ impl Command {
                 coinbase_recipient,
                 metrics: disabled_metrics.is_enabled(Module::Producer),
             },
-            starting_gas_price,
-            gas_price_change_percent,
-            min_gas_price,
-            gas_price_threshold_percent,
+            starting_exec_gas_price: starting_gas_price,
+            exec_gas_price_change_percent: gas_price_change_percent,
+            min_exec_gas_price: min_gas_price,
+            exec_gas_price_threshold_percent: gas_price_threshold_percent,
             block_importer,
             da_compression,
             #[cfg(feature = "relayer")]
@@ -610,6 +644,17 @@ impl Command {
             min_connected_reserved_peers,
             time_until_synced: time_until_synced.into(),
             memory_pool_size,
+            da_gas_price_factor: NonZeroU64::new(100).expect("100 is not zero"),
+            min_da_gas_price,
+            max_da_gas_price_change_percent,
+            da_p_component,
+            da_d_component,
+            activity_normal_range_size: 100,
+            activity_capped_range_size: 0,
+            activity_decrease_range_size: 0,
+            da_committer_url,
+            block_activity_threshold: 0,
+            da_poll_interval,
         };
         Ok(config)
     }

crates/fuel-core/src/database/database_description/gas_price.rs

@@ -10,7 +10,7 @@ impl DatabaseDescription for GasPriceDatabase {
     type Height = BlockHeight;
 
     fn version() -> u32 {
-        0
+        1
     }
 
     fn name() -> String {

crates/fuel-core/src/service.rs

@@ -1,17 +1,13 @@
-use self::adapters::BlockImporterAdapter;
-use crate::{
-    combined_database::{
-        CombinedDatabase,
-        ShutdownListener,
-    },
-    database::Database,
-    service::{
-        adapters::{
-            ExecutorAdapter,
-            PoAAdapter,
-        },
-        sub_services::TxPoolSharedState,
-    },
+use std::{
+    net::SocketAddr,
+    sync::Arc,
+};
+
+pub use config::{
+    Config,
+    DbType,
+    RelayerConsensusConfig,
+    VMConfig,
 };
 use fuel_core_chain_config::{
     ConsensusConfig,
@@ -21,6 +17,7 @@ use fuel_core_poa::{
     ports::BlockImporter,
     verifier::verify_consensus,
 };
+pub use fuel_core_services::Service as ServiceTrait;
 use fuel_core_services::{
     RunnableService,
     RunnableTask,
@@ -40,18 +37,23 @@ use fuel_core_storage::{
     StorageAsMut,
 };
 use fuel_core_types::blockchain::consensus::Consensus;
-use std::{
-    net::SocketAddr,
-    sync::Arc,
-};
 
-pub use config::{
-    Config,
-    DbType,
-    RelayerConsensusConfig,
-    VMConfig,
+use crate::{
+    combined_database::{
+        CombinedDatabase,
+        ShutdownListener,
+    },
+    database::Database,
+    service::{
+        adapters::{
+            ExecutorAdapter,
+            PoAAdapter,
+        },
+        sub_services::TxPoolSharedState,
+    },
 };
-pub use fuel_core_services::Service as ServiceTrait;
+
+use self::adapters::BlockImporterAdapter;
 
 pub mod adapters;
 pub mod config;