make everything configurable

Author: jayantk

Cargo.lock

@@ -56,8 +56,19 @@ impl<T: JsonRpcClient + 'static + Clone> SignablePythContractInner<T> {
         provider: Provider<T>,
     ) -> Result<SignablePythContractInner<T>> {
         let chain_id = provider.get_chainid().await?;
-        let gas_oracle =
-            EthProviderOracle::new(provider.clone(), chain_config.priority_fee_multiplier_pct);
+        let gas_oracle = EthProviderOracle::new(
+            provider.clone(),
+            chain_config.priority_fee_multiplier_pct,
+            0, // min_reward_samples - default value
+            10, // fee_estimation_past_blocks - default value
+            5.0, // fee_estimation_reward_percentile - default value
+            3_000, // eip1559_fee_estimation_default_priority_fee - default value
+            100_000, // eip1559_fee_estimation_priority_fee_trigger - default value
+            200, // eip1559_fee_estimation_threshold_max_change - default value
+            40_000, // surge_threshold_1 - default value
+            100_000, // surge_threshold_2 - default value
+            200_000, // surge_threshold_3 - default value
+        );
         let wallet__ = private_key
             .parse::<LocalWallet>()?
             .with_chain_id(chain_id.as_u64());

apps/argus/src/adapters/ethereum.rs

@@ -1,6 +1,6 @@
 [package]
 name = "fortuna"
-version = "9.3.0"
+version = "9.4.0"
 edition = "2021"
 
 [lib]

apps/fortuna/Cargo.toml

@@ -603,6 +603,15 @@ mod test {
                 legacy_tx: false,
                 gas_limit: 500000,
                 priority_fee_multiplier_pct: 100,
+                min_reward_samples: 0,
+                fee_estimation_past_blocks: 10,
+                fee_estimation_reward_percentile: 5.0,
+                eip1559_fee_estimation_default_priority_fee: 3000,
+                eip1559_fee_estimation_priority_fee_trigger: 100000,
+                eip1559_fee_estimation_threshold_max_change: 200,
+                surge_threshold_1: 40000,
+                surge_threshold_2: 100000,
+                surge_threshold_3: 200000,
                 escalation_policy: crate::config::EscalationPolicyConfig::default(),
                 min_profit_pct: 0,
                 target_profit_pct: 20,
@@ -627,6 +636,15 @@ mod test {
                 legacy_tx: false,
                 gas_limit: 600000,
                 priority_fee_multiplier_pct: 100,
+                min_reward_samples: 0,
+                fee_estimation_past_blocks: 10,
+                fee_estimation_reward_percentile: 5.0,
+                eip1559_fee_estimation_default_priority_fee: 3000,
+                eip1559_fee_estimation_priority_fee_trigger: 100000,
+                eip1559_fee_estimation_threshold_max_change: 200,
+                surge_threshold_1: 40000,
+                surge_threshold_2: 100000,
+                surge_threshold_3: 200000,
                 escalation_policy: crate::config::EscalationPolicyConfig::default(),
                 min_profit_pct: 0,
                 target_profit_pct: 20,

apps/fortuna/src/api.rs

@@ -167,8 +167,19 @@ impl<T: JsonRpcClient + 'static + Clone> SignablePythContractInner<T> {
         provider: Provider<T>,
         network_id: u64,
     ) -> Result<SignablePythContractInner<T>> {
-        let gas_oracle =
-            EthProviderOracle::new(provider.clone(), chain_config.priority_fee_multiplier_pct);
+        let gas_oracle = EthProviderOracle::new(
+            provider.clone(),
+            chain_config.priority_fee_multiplier_pct,
+            chain_config.min_reward_samples,
+            chain_config.fee_estimation_past_blocks,
+            chain_config.fee_estimation_reward_percentile,
+            chain_config.eip1559_fee_estimation_default_priority_fee,
+            chain_config.eip1559_fee_estimation_priority_fee_trigger,
+            chain_config.eip1559_fee_estimation_threshold_max_change,
+            chain_config.surge_threshold_1,
+            chain_config.surge_threshold_2,
+            chain_config.surge_threshold_3,
+        );
         let wallet__ = private_key
             .parse::<LocalWallet>()?
             .with_chain_id(network_id);

apps/fortuna/src/chain/ethereum.rs

@@ -157,6 +157,54 @@ pub struct EthereumConfig {
     #[serde(default = "default_priority_fee_multiplier_pct")]
     pub priority_fee_multiplier_pct: u64,
 
+    /// The minimum number of reward samples required for priority fee estimation.
+    /// If fewer samples are available, the priority fee will be set to zero.
+    /// Defaults to 0 if not provided.
+    #[serde(default = "default_min_reward_samples")]
+    pub min_reward_samples: usize,
+
+    /// The number of past blocks to use for fee estimation.
+    /// Defaults to 10 if not provided.
+    #[serde(default = "default_fee_estimation_past_blocks")]
+    pub fee_estimation_past_blocks: u64,
+
+    /// The reward percentile to use for fee estimation (e.g., 5.0 for the 5th percentile).
+    /// Defaults to 5.0 if not provided.
+    #[serde(default = "default_fee_estimation_reward_percentile")]
+    pub fee_estimation_reward_percentile: f64,
+
+    /// The default max priority fee per gas, used in case the base fee is within a threshold.
+    /// Defaults to 3000 if not provided.
+    #[serde(default = "default_eip1559_fee_estimation_default_priority_fee")]
+    pub eip1559_fee_estimation_default_priority_fee: u64,
+
+    /// The threshold for base fee below which we use the default priority fee, and beyond which we
+    /// estimate an appropriate value for priority fee.
+    /// Defaults to 100000 if not provided.
+    #[serde(default = "default_eip1559_fee_estimation_priority_fee_trigger")]
+    pub eip1559_fee_estimation_priority_fee_trigger: u64,
+
+    /// The threshold max change/difference (in %) at which we will ignore the fee history values
+    /// under it.
+    /// Defaults to 200 if not provided.
+    #[serde(default = "default_eip1559_fee_estimation_threshold_max_change")]
+    pub eip1559_fee_estimation_threshold_max_change: i64,
+
+    /// First threshold at which the base fee gets a multiplier.
+    /// Defaults to 40000 if not provided.
+    #[serde(default = "default_surge_threshold_1")]
+    pub surge_threshold_1: u64,
+
+    /// Second threshold at which the base fee gets a multiplier.
+    /// Defaults to 100000 if not provided.
+    #[serde(default = "default_surge_threshold_2")]
+    pub surge_threshold_2: u64,
+
+    /// Third threshold at which the base fee gets a multiplier.
+    /// Defaults to 200000 if not provided.
+    #[serde(default = "default_surge_threshold_3")]
+    pub surge_threshold_3: u64,
+
     /// The escalation policy governs how the gas limit and fee are increased during backoff retries.
     #[serde(default)]
     pub escalation_policy: EscalationPolicyConfig,
@@ -226,6 +274,42 @@ fn default_priority_fee_multiplier_pct() -> u64 {
     100
 }
 
+fn default_min_reward_samples() -> usize {
+    0
+}
+
+fn default_fee_estimation_past_blocks() -> u64 {
+    10
+}
+
+fn default_fee_estimation_reward_percentile() -> f64 {
+    5.0
+}
+
+fn default_eip1559_fee_estimation_default_priority_fee() -> u64 {
+    3_000
+}
+
+fn default_eip1559_fee_estimation_priority_fee_trigger() -> u64 {
+    100_000
+}
+
+fn default_eip1559_fee_estimation_threshold_max_change() -> i64 {
+    200
+}
+
+fn default_surge_threshold_1() -> u64 {
+    40_000
+}
+
+fn default_surge_threshold_2() -> u64 {
+    100_000
+}
+
+fn default_surge_threshold_3() -> u64 {
+    200_000
+}
+
 fn default_backlog_range() -> u64 {
     1000
 }