From 81e51931ad4d0645b31994787f3a75f28089b8f5 Mon Sep 17 00:00:00 2001
From: Amin Moghaddam <amin@dourolabs.xyz>
Date: Fri, 24 May 2024 08:29:28 +0200
Subject: [PATCH] fix(fortuna): Manual eip1559 as the automatic version buggy
 (#1604)

---
 apps/fortuna/Cargo.lock            | 2 +-
 apps/fortuna/Cargo.toml            | 2 +-
 apps/fortuna/src/chain/ethereum.rs | 7 +------
 apps/fortuna/src/config.rs         | 4 ++++
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/apps/fortuna/Cargo.lock b/apps/fortuna/Cargo.lock
index f68ab3d605..bc53f6c528 100644
--- a/apps/fortuna/Cargo.lock
+++ b/apps/fortuna/Cargo.lock
@@ -1488,7 +1488,7 @@ dependencies = [
 
 [[package]]
 name = "fortuna"
-version = "5.4.4"
+version = "5.4.5"
 dependencies = [
  "anyhow",
  "axum",
diff --git a/apps/fortuna/Cargo.toml b/apps/fortuna/Cargo.toml
index bbeef890bf..68622e143f 100644
--- a/apps/fortuna/Cargo.toml
+++ b/apps/fortuna/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name    = "fortuna"
-version = "5.4.4"
+version = "5.4.5"
 edition = "2021"
 
 [dependencies]
diff --git a/apps/fortuna/src/chain/ethereum.rs b/apps/fortuna/src/chain/ethereum.rs
index eaddab61a8..1661829800 100644
--- a/apps/fortuna/src/chain/ethereum.rs
+++ b/apps/fortuna/src/chain/ethereum.rs
@@ -102,15 +102,10 @@ impl SignablePythContract {
     ) -> Result<SignablePythContract> {
         let provider = Provider::<Http>::try_from(&chain_config.geth_rpc_addr)?;
         let chain_id = provider.get_chainid().await?;
-        let eip1559_supported = match provider.estimate_eip1559_fees(None).await {
-            Ok((max_fee, max_priority_fee)) => !max_fee.is_zero() && !max_priority_fee.is_zero(),
-            Err(_) => false,
-        };
         let gas_oracle = EthProviderOracle::new(provider.clone());
         let transformer = LegacyTxTransformer {
-            use_legacy_tx: !eip1559_supported,
+            use_legacy_tx: chain_config.legacy_tx,
         };
-
         let wallet__ = private_key
             .parse::<LocalWallet>()?
             .with_chain_id(chain_id.as_u64());
diff --git a/apps/fortuna/src/config.rs b/apps/fortuna/src/config.rs
index 5c8deff6af..54c3ef296c 100644
--- a/apps/fortuna/src/config.rs
+++ b/apps/fortuna/src/config.rs
@@ -153,6 +153,10 @@ pub struct EthereumConfig {
     #[serde(default)]
     pub confirmed_block_status: BlockStatus,
 
+    /// Use the legacy transaction format (for networks without EIP 1559)
+    #[serde(default)]
+    pub legacy_tx: bool,
+
     /// The gas limit to use for entropy callback transactions.
     pub gas_limit: u64,
 }