[pull] main from agglayer:main

crates/agglayer-config/src/settlement_service.rs

@@ -275,19 +275,17 @@ pub struct SettlementServiceConfig {
 /// The Agglayer settlement configuration.
 ///
 /// This configuration controls how the Agglayer settlement service interacts
-/// with the L1 blockchain for settling certificates and validium transactions.
-/// It provides separate transaction configurations for certificate settlements
-/// and validium settlements, allowing fine-grained control over gas prices,
-/// retries, and confirmation requirements.
+/// with the L1 blockchain for settling certificates.
+/// It provides transaction configuration for certificate settlements, allowing
+/// fine-grained control over gas prices, retries, and confirmation
+/// requirements.
 ///
 /// # Configuration Structure
 ///
-/// The settlement configuration is organized into three main components:
+/// The settlement configuration is organized into two main components:
 ///
 /// - **Certificate Transaction Config**: Controls settlement transactions for
 ///   certificates with pessimistic proofs (proofs of state transitions).
-/// - **Validium Transaction Config**: Controls settlement transactions for
-///   validium data (off-chain data availability).
 /// - **Settlement Service Config**: General settlement service configuration.
 ///
 /// # Gas Price Configuration
@@ -327,14 +325,6 @@ pub struct SettlementConfig {
     #[serde(default)]
     pub pessimistic_proof_tx_config: SettlementTransactionConfig,
 
-    /// Configuration for validium settlement transactions.
-    ///
-    /// This controls how validium data (off-chain data availability proofs)
-    /// are submitted to the L1 settlement layer. Validium transactions may
-    /// have different gas and retry requirements than certificate transactions.
-    #[serde(default)]
-    pub validium_tx_config: SettlementTransactionConfig,
-
     /// General settlement service configuration.
     ///
     /// Contains service-wide settings that apply to the overall settlement

crates/agglayer-config/tests/fixtures/settlement/full_settlement_config.toml

@@ -1,4 +1,4 @@
-# Full settlement configuration with both certificate and validium configs
+# Full settlement configuration for pessimistic-proof settlement
 [pessimistic-proof-tx-config]
 max-expected-retries = 2048
 retry-on-transient-failure.initial-interval = "15s"
@@ -12,16 +12,6 @@ gas-limit-multiplier-factor = 1.1
 max-fee-per-gas-multiplier-factor = 1.2
 max-fee-per-gas-ceiling = "200gwei"
 
-[validium-tx-config]
-max-expected-retries = 512
-retry-on-transient-failure.initial-interval = "5s"
-confirmations = 16
-settlement-policy = "LatestBlock"
-gas-limit-ceiling = "0x1c9c380"
-gas-limit-multiplier-factor = 1.05
-max-fee-per-gas-floor = "2gwei"
-max-fee-per-gas-ceiling = "50gwei"
-
 [settlement-service-config]
 # Currently no service-specific fields
 

crates/agglayer-config/tests/settlement_service.rs

@@ -62,7 +62,7 @@ fn deserialize_custom_config_2() {
     let content = std::fs::read_to_string(input).unwrap();
     let config: SettlementTransactionConfig = toml::from_str(&content).unwrap();
 
-    // Assert custom validium values
+    // Assert custom latest-block values
     assert_eq!(
         config.retry_on_transient_failure.initial_interval,
         Duration::from_secs(5)
@@ -124,41 +124,6 @@ fn deserialize_full_settlement_config() {
         1.2
     );
 
-    // Assert validium config
-    assert_eq!(
-        config
-            .validium_tx_config
-            .retry_on_transient_failure
-            .initial_interval,
-        Duration::from_secs(5)
-    );
-    assert_eq!(config.validium_tx_config.confirmations, 16);
-    assert_eq!(
-        config.validium_tx_config.settlement_policy,
-        SettlementPolicy::LatestBlock
-    );
-    assert_eq!(
-        config.validium_tx_config.gas_limit_ceiling,
-        U256::from(30_000_000_u64)
-    );
-    assert_eq!(
-        config.validium_tx_config.max_fee_per_gas_floor,
-        2_000_000_000_u128
-    );
-    assert_eq!(
-        config.validium_tx_config.max_fee_per_gas_ceiling,
-        50_000_000_000_u128
-    );
-
-    // Assert validium multipliers
-    assert_eq!(
-        config
-            .validium_tx_config
-            .gas_limit_multiplier_factor
-            .as_f64(),
-        1.05
-    );
-
     assert_toml_snapshot!(config);
 }
 

crates/agglayer-config/tests/snapshots/settlement_service__deserialize_full_settlement_config.snap

@@ -23,25 +23,4 @@ interval-multiplier-factor = 2.0
 max-interval = "10m"
 jitter = "10s"
 
-[validium-tx-config]
-confirmations = 16
-settlement-policy = "LatestBlock"
-gas-limit-multiplier-factor = 1.05
-gas-limit-ceiling = "0x1c9c380"
-max-fee-per-gas-floor = "2gwei"
-max-fee-per-gas-ceiling = "50gwei"
-max-priority-fee-per-gas-ceiling = "100gwei"
-
-[validium-tx-config.retry-on-transient-failure]
-initial-interval = "5s"
-interval-multiplier-factor = 1.5
-max-interval = "2m"
-jitter = "1s"
-
-[validium-tx-config.retry-on-not-included-on-l1]
-initial-interval = "1m"
-interval-multiplier-factor = 2.0
-max-interval = "10m"
-jitter = "10s"
-
 [settlement-service-config]

crates/agglayer-settlement-service/src/settlement_service.rs

@@ -1,6 +1,6 @@
 use std::{collections::HashMap, future::Future, pin::Pin, sync::Arc};
 
-use agglayer_config::settlement_service::SettlementServiceConfig;
+use agglayer_config::settlement_service::{SettlementServiceConfig, SettlementTransactionConfig};
 use agglayer_storage::stores::{SettlementReader, SettlementWriter};
 use agglayer_types::{SettlementJob, SettlementJobId, SettlementJobResult};
 use alloy::providers::Provider;
@@ -21,6 +21,7 @@ const ADMIN_CHANNEL_BUFFER_SIZE: usize = 10;
 #[derive(Educe)]
 #[educe(Clone)]
 pub struct SettlementService<L1Provider, SettlementStore> {
+    tx_config: Arc<SettlementTransactionConfig>,
     provider: Arc<L1Provider>,
     store: Arc<SettlementStore>,
     cancellation_token: CancellationToken,
@@ -56,11 +57,13 @@ impl<
 {
     pub async fn start(
         _config: SettlementServiceConfig,
+        tx_config: Arc<SettlementTransactionConfig>,
         provider: Arc<L1Provider>,
         store: Arc<SettlementStore>,
         cancellation_token: CancellationToken,
     ) -> eyre::Result<Self> {
         let this = Self {
+            tx_config,
             provider,
             store,
             cancellation_token,
@@ -119,9 +122,14 @@ impl<
         let (result_sender, result_receiver) = watch::channel(None);
         let (task_control_handle, task_control) =
             TaskControlHandle::new(&self.cancellation_token, admin_sender, admin_receiver);
-        let (job_id, mut task) =
-            SettlementTask::create(job, self.provider.clone(), self.store.clone(), task_control)
-                .await?;
+        let (job_id, mut task) = SettlementTask::create(
+            job,
+            self.tx_config.clone(),
+            self.provider.clone(),
+            self.store.clone(),
+            task_control,
+        )
+        .await?;
         self.task_controls
             .lock()
             .await