update: fix memory

Author: heemankv

.env.test

@@ -100,7 +100,7 @@ ETHEREUM_SETTLEMENT_TXN_WAIT_SLEEP_DELAY_SECS=60
 
 MADARA_ORCHESTRATOR_MADARA_RPC_URL=https://pathfinder-madara-ci.d.karnot.xyz
 # It's fine to use dummy for tests as it's not being used.
-MADARA_ORCHESTRATOR_MADARA_FEEDER_GATEWAY_URL=http://localhost:8080/feeder_gateway
+MADARA_ORCHESTRATOR_MADARA_FEEDER_GATEWAY_URL=http://localhost:8080
 
 
 #### SNOS ####

.github/workflows/task-test-cli.yml

@@ -1,11 +1,9 @@
 ---
 # yaml-language-server: $schema=https://raw.githubusercontent.com/SchemaStore/schemastore/refs/heads/master/src/schemas/json/github-workflow.json
 name: Task - Run CLI tests
-
 on:
   workflow_dispatch:
   workflow_call:
-
 jobs:
   test-cli:
     runs-on: blacksmith-16vcpu-ubuntu-2204
@@ -14,24 +12,22 @@ jobs:
         uses: actions/checkout@v4
         with:
           submodules: recursive
-
       - name: Load env
         uses: ./.github/actions/load-env
-
       - name: Rust setup
         uses: ./.github/actions/setup-rust
         with:
           rust-version: ${{ env.BUILD_RUST_VERSION }}
           cache-key: madara-${{ runner.os }}
-
       - name: Run cli without arguments
+        timeout-minutes: 10
         run: |
           CARGO_TARGET_DIR=target cargo run --manifest-path madara/Cargo.toml --bin madara --release -- --no-l1-sync --devnet &
           MADARA_PID=$!
           while ! echo exit | nc localhost 9944; do sleep 1; done
           kill $MADARA_PID
-
       - name: Run cli pointing to a file
+        timeout-minutes: 10
         run: |
           CARGO_TARGET_DIR=target cargo run --manifest-path madara/Cargo.toml --bin madara --release -- --no-l1-sync --devnet --config-file ./configs/args/config.json &
           MADARA_PID=$!

configs/args/config.json

@@ -27,7 +27,9 @@
     "db_memtable_blocks_budget_mib": 1024,
     "db_memtable_contracts_budget_mib": 128,
     "db_memtable_other_budget_mib": 128,
-    "db_memtable_prefix_bloom_filter_ratio": 0
+    "db_memtable_prefix_bloom_filter_ratio": 0,
+    "db_wal": true,
+    "db_fsync": false
   },
   "l2_sync_params": {
     "l2_sync_disabled": false,
@@ -105,6 +107,7 @@
   },
   "block_production_params": {
     "block_production_disabled": false,
+    "close_preconfirmed_block_upon_restart": false,
     "devnet_contracts": 10
   },
   "chain_config_override": {

configs/chain_config.example.yaml

@@ -1,3 +1,8 @@
+# Chain config version - REQUIRED field
+# This version number is used to track breaking changes to the chain config format.
+# Current version: 1
+config_version: 1
+
 # Human readable chain name, for displaying to the console.
 chain_name: "Starknet Mainnet"
 
@@ -76,6 +81,20 @@ mempool_max_declare_transactions: 20
 # Max age of a transaction in the mempool. Null for no age limit.
 # mempool_tx_max_age: "5h"
 mempool_ttl: null
-l2_gas_target: 2000000000
-min_l2_gas_price: 100000
-l2_gas_price_max_change_denominator: 48
+
+# L2 gas price configuration - choose either 'fixed' or 'eip1559'.
+# To override this through CLI, you need to override both the type and the values, or it will panic or lead to unexpected results!
+#
+# Option 1: Fixed gas price
+# l2_gas_price:
+#   type: fixed
+#   price: 2500
+# For overriding through CLI, use `--chain-config-override=l2_gas_price.type=fixed,l2_gas_price.price=25000`
+#
+# Option 2: EIP-1559 dynamic gas pricing
+# For overriding through CLI, use `--chain-config-override=l2_gas_price.type=eip1559,l2_gas_price.target=2000000000,l2_gas_price.min_price=100000,l2_gas_price.max_change_denominator=48`
+l2_gas_price:
+  type: eip1559
+  target: 2000000000
+  min_price: 100000
+  max_change_denominator: 48

configs/presets/devnet.yaml

@@ -1,3 +1,4 @@
+config_version: 1
 chain_name: "Madara"
 chain_id: "MADARA_DEVNET"
 feeder_gateway_url: "http://localhost:8080/feeder_gateway/"
@@ -36,6 +37,8 @@ eth_gps_statement_verifier: "0xf294781D719D2F4169cE54469C28908E6FA752C1"
 mempool_max_transactions: 10000
 mempool_max_declare_transactions: 20
 mempool_ttl: null
-l2_gas_target: 2000000000
-min_l2_gas_price: 100000
-l2_gas_price_max_change_denominator: 48
+l2_gas_price:
+  type: eip1559
+  target: 2000000000
+  min_price: 100000
+  max_change_denominator: 48

configs/presets/integration.yaml

@@ -1,3 +1,4 @@
+config_version: 1
 chain_name: "Starknet Sepolia"
 chain_id: "SN_INTEGRATION_SEPOLIA"
 feeder_gateway_url: "https://integration-sepolia.starknet.io/feeder_gateway/"
@@ -36,6 +37,8 @@ eth_gps_statement_verifier: "0x2046B966994Adcb88D83f467a41b75d64C2a619F"
 mempool_max_transactions: 10000
 mempool_max_declare_transactions: 20
 mempool_ttl: "5h"
-l2_gas_target: 2000000000
-min_l2_gas_price: 100000
-l2_gas_price_max_change_denominator: 48
+l2_gas_price:
+  type: eip1559
+  target: 2000000000
+  min_price: 100000
+  max_change_denominator: 48

configs/presets/mainnet.yaml

@@ -1,3 +1,4 @@
+config_version: 1
 chain_name: "Starknet Mainnet"
 chain_id: "SN_MAIN"
 feeder_gateway_url: "https://alpha-mainnet.starknet.io/feeder_gateway/"
@@ -36,6 +37,8 @@ eth_gps_statement_verifier: "0x47312450B3Ac8b5b8e247a6bB6d523e7605bDb60"
 mempool_max_transactions: 10000
 mempool_max_declare_transactions: 20
 mempool_ttl: "5h"
-l2_gas_target: 2000000000
-min_l2_gas_price: 100000
-l2_gas_price_max_change_denominator: 48
+l2_gas_price:
+  type: eip1559
+  target: 2000000000
+  min_price: 100000
+  max_change_denominator: 48

configs/presets/sepolia.yaml

@@ -1,3 +1,4 @@
+config_version: 1
 chain_name: "Starknet Sepolia"
 chain_id: "SN_SEPOLIA"
 feeder_gateway_url: "https://alpha-sepolia.starknet.io/feeder_gateway/"
@@ -36,6 +37,8 @@ eth_gps_statement_verifier: "0xf294781D719D2F4169cE54469C28908E6FA752C1"
 mempool_max_transactions: 10000
 mempool_max_declare_transactions: 20
 mempool_ttl: "5h"
-l2_gas_target: 2000000000
-min_l2_gas_price: 100000
-l2_gas_price_max_change_denominator: 48
+l2_gas_price:
+  type: eip1559
+  target: 2000000000
+  min_price: 100000
+  max_change_denominator: 48

madara/Cargo.lock

@@ -252,6 +252,7 @@ pub struct BlockProductionTask {
     bypass_pending_count: Arc<AtomicU64>,
     executor_batch_pending_count: Arc<AtomicU64>,
     executor_commands_pending_count: Arc<AtomicU64>,
+    close_preconfirmed_block_upon_restart: bool,
 }
 
 impl BlockProductionTask {
@@ -261,6 +262,7 @@ impl BlockProductionTask {
         metrics: Arc<BlockProductionMetrics>,
         l1_client: Arc<dyn SettlementClient>,
         no_charge_fee: bool,
+        close_preconfirmed_block_upon_restart: bool,
     ) -> Self {
         let (sender, recv) = mpsc::unbounded_channel();
         let (bypass_input_sender, bypass_tx_input) = mpsc::channel(16);
@@ -288,6 +290,7 @@ impl BlockProductionTask {
             bypass_pending_count,
             executor_batch_pending_count,
             executor_commands_pending_count,
+            close_preconfirmed_block_upon_restart,
         }
     }
 
@@ -312,18 +315,35 @@ impl BlockProductionTask {
     ///
     /// This avoids re-executing transaction by re-adding them to the [Mempool].
     async fn close_pending_block_if_exists(&mut self) -> anyhow::Result<()> {
-        if self.backend.has_preconfirmed_block() {
-            tracing::debug!("Close pending block on startup.");
-            let backend = self.backend.clone();
-            global_spawn_rayon_task(move || {
-                backend
-                    .write_access()
-                    .close_preconfirmed(
-                        /* pre_v0_13_2_hash_override */ true, None, /*this won't be none in ideal case*/
-                    )
-                    .context("Closing preconfirmed block on startup")
-            })
-            .await?;
+        if let Some(preconfirmed_block) = self.backend.preconfirmed_block() {
+            // Get the preconfirmed block info for logging
+            let block_number = preconfirmed_block.header.block_number;
+            let tx_count = preconfirmed_block.transaction_count();
+
+            if self.close_preconfirmed_block_upon_restart {
+                tracing::info!(
+                    "📦 Preconfirmed block #{} found with {} transactions. Closing it.",
+                    block_number,
+                    tx_count
+                );
+                let backend = self.backend.clone();
+                global_spawn_rayon_task(move || {
+                    backend
+                        .write_access()
+                        .close_preconfirmed(
+                            /* pre_v0_13_2_hash_override */ true, None, /*this won't be none in ideal case*/
+                        )
+                        .context("Closing preconfirmed block on startup")
+                })
+                .await?;
+                tracing::info!("✅ Preconfirmed block #{} closed successfully on startup.", block_number);
+            } else {
+                tracing::info!(
+                    "📦 Preconfirmed block #{} found with {} transactions. Resuming block production.",
+                    block_number,
+                    tx_count
+                );
+            }
         }
         Ok(())
     }
@@ -580,6 +600,7 @@ pub(crate) mod tests {
                 self.metrics.clone(),
                 Arc::new(self.l1_client.clone()),
                 true,
+                true, // close_preconfirmed_block_upon_restart - default to true for tests
             )
         }
     }