From b397ddd2beb007d0bed378949d35a9ce5c5b76c9 Mon Sep 17 00:00:00 2001
From: TAMARA LIPOWSKI <data.lipowski@extaccount.com>
Date: Tue, 1 Apr 2025 19:59:58 +0200
Subject: [PATCH] fix: fix Solution.router_address for Ekubo

---
 src/encoding/evm/strategy_encoder/strategy_encoders.rs | 10 +++++++---
 src/encoding/evm/swap_encoder/swap_encoders.rs         |  8 +++-----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/encoding/evm/strategy_encoder/strategy_encoders.rs b/src/encoding/evm/strategy_encoder/strategy_encoders.rs
index aed32da..e6ff1fd 100644
--- a/src/encoding/evm/strategy_encoder/strategy_encoders.rs
+++ b/src/encoding/evm/strategy_encoder/strategy_encoders.rs
@@ -1077,8 +1077,13 @@ mod tests {
         };
 
         let swap_encoder_registry = get_swap_encoder_registry();
-        let encoder =
-            SplitSwapStrategyEncoder::new(eth_chain(), swap_encoder_registry, None).unwrap();
+        let encoder = SplitSwapStrategyEncoder::new(
+            eth_chain(),
+            swap_encoder_registry,
+            None,
+            Some(Bytes::from_str("0x3Ede3eCa2a72B3aeCC820E955B36f38437D01395").unwrap()),
+        )
+        .unwrap();
 
         let solution = Solution {
             exact_out: false,
@@ -1091,7 +1096,6 @@ mod tests {
             // Alice
             sender: Bytes::from_str("0xcd09f75E2BF2A4d11F3AB23f1389FcC1621c0cc2").unwrap(),
             receiver: Bytes::from_str("0xcd09f75E2BF2A4d11F3AB23f1389FcC1621c0cc2").unwrap(),
-            router_address: Bytes::from_str("0x3Ede3eCa2a72B3aeCC820E955B36f38437D01395").unwrap(),
             swaps: vec![swap],
             ..Default::default()
         };
diff --git a/src/encoding/evm/swap_encoder/swap_encoders.rs b/src/encoding/evm/swap_encoder/swap_encoders.rs
index 6a8ef9d..ad6ffc9 100644
--- a/src/encoding/evm/swap_encoder/swap_encoders.rs
+++ b/src/encoding/evm/swap_encoder/swap_encoders.rs
@@ -232,9 +232,7 @@ impl SwapEncoder for BalancerV2SwapEncoder {
         let approval_needed: bool;
 
         if let Some(router_address) = encoding_context.router_address {
-            let tycho_router_address = bytes_to_address(
-                &router_address,
-            )?;
+            let tycho_router_address = bytes_to_address(&router_address)?;
             approval_needed = token_approvals_manager.approval_needed(
                 token,
                 tycho_router_address,
@@ -742,7 +740,7 @@ mod tests {
                 group_token_in: token_in.clone(),
                 group_token_out: token_out.clone(),
                 exact_out: false,
-                router_address: Bytes::default(),
+                router_address: Some(Bytes::default()),
             };
 
             let encoder = EkuboSwapEncoder::new(String::default());
@@ -780,7 +778,7 @@ mod tests {
                 group_token_in: group_token_in.clone(),
                 group_token_out: group_token_out.clone(),
                 exact_out: false,
-                router_address: Bytes::default(),
+                router_address: Some(Bytes::default()),
             };
 
             let first_swap = Swap {