Merge branch 'refs/heads/main' into encoding/dc/ENG-4081-split-swap-strategy

# Conflicts:
#	src/encoding/evm/router_encoder.rs
#	src/encoding/evm/strategy_encoder/encoder.rs
#	src/encoding/evm/strategy_encoder/selector.rs
#	src/encoding/strategy_encoder.rs

Took 2 minutes

src/encoding/evm/router_encoder.rs

@@ -54,7 +54,7 @@ impl<S: StrategySelector> RouterEncoder<S> for EVMRouterEncoder<S> {
                 self.chain,
             )?;
 
-            let contract_interaction =
+            let (contract_interaction,target_address) =
                 strategy.encode_strategy(solution.clone(), router_address)?;
 
             let value = if solution.native_action.clone().unwrap() == NativeAction::Wrap {
@@ -62,7 +62,11 @@ impl<S: StrategySelector> RouterEncoder<S> for EVMRouterEncoder<S> {
             } else {
                 BigUint::ZERO
             };
-            transactions.push(Transaction { value, data: contract_interaction });
+            transactions.push(Transaction {
+                value,
+                data: contract_interaction,
+                to: target_address,
+            });
         }
         Ok(transactions)
     }

src/encoding/evm/strategy_encoder/encoder.rs

@@ -0,0 +1,155 @@
+use std::str::FromStr;
+
+use alloy_primitives::Address;
+use alloy_sol_types::SolValue;
+use tycho_core::Bytes;
+
+use crate::encoding::{
+    errors::EncodingError,
+    evm::swap_encoder::SWAP_ENCODER_REGISTRY,
+    models::{EncodingContext, Solution},
+    strategy_encoder::StrategyEncoder,
+};
+
+#[allow(dead_code)]
+pub trait EVMStrategyEncoder: StrategyEncoder {
+    fn encode_protocol_header(
+        &self,
+        protocol_data: Vec<u8>,
+        executor_address: Address,
+        // Token indices, split, and token inclusion are only used for split swaps
+        token_in: u16,
+        token_out: u16,
+        split: u16, // not sure what should be the type of this :/
+    ) -> Vec<u8> {
+        let args = (executor_address, token_in, token_out, split, protocol_data);
+        args.abi_encode()
+    }
+}
+
+pub struct SplitSwapStrategyEncoder {}
+impl EVMStrategyEncoder for SplitSwapStrategyEncoder {}
+impl StrategyEncoder for SplitSwapStrategyEncoder {
+    fn encode_strategy(&self, _solution: Solution) -> Result<(Vec<u8>, Bytes), EncodingError> {
+        todo!()
+    }
+    fn selector(&self, _exact_out: bool) -> &str {
+        "swap(uint256, address, uint256, bytes[])"
+    }
+}
+
+/// This strategy encoder is used for solutions that are sent directly to the pool.
+/// Only 1 solution with 1 swap is supported.
+pub struct ExecutorStrategyEncoder {}
+impl EVMStrategyEncoder for ExecutorStrategyEncoder {}
+impl StrategyEncoder for ExecutorStrategyEncoder {
+    fn encode_strategy(&self, solution: Solution) -> Result<(Vec<u8>, Bytes), EncodingError> {
+        if solution.router_address.is_none() {
+            return Err(EncodingError::InvalidInput(
+                "Router address is required for straight to pool solutions".to_string(),
+            ));
+        }
+        let swap = solution.swaps.first().unwrap();
+        let registry = SWAP_ENCODER_REGISTRY
+            .read()
+            .map_err(|_| {
+                EncodingError::FatalError("Failed to read the swap encoder registry".to_string())
+            })?;
+        let swap_encoder = registry
+            .get_encoder(&swap.component.protocol_system)
+            .ok_or_else(|| {
+                EncodingError::InvalidInput(format!(
+                    "Swap encoder not found for protocol: {}",
+                    swap.component.protocol_system
+                ))
+            })?;
+        let router_address = solution.router_address.unwrap();
+
+        let encoding_context = EncodingContext {
+            receiver: solution.receiver,
+            exact_out: solution.exact_out,
+            router_address,
+        };
+        let protocol_data = swap_encoder.encode_swap(swap.clone(), encoding_context)?;
+        let executor_address = Bytes::from_str(swap_encoder.executor_address())
+            .map_err(|_| EncodingError::FatalError("Invalid executor address".to_string()))?;
+        Ok((protocol_data, executor_address))
+    }
+    fn selector(&self, _exact_out: bool) -> &str {
+        "swap(uint256, bytes)"
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use alloy::hex::encode;
+    use num_bigint::BigUint;
+    use tycho_core::{dto::ProtocolComponent, Bytes};
+
+    use super::*;
+    use crate::encoding::models::Swap;
+
+    #[test]
+    fn test_executor_strategy_encode() {
+        let encoder = ExecutorStrategyEncoder {};
+
+        let token_in = Bytes::from("0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2");
+        let token_out = Bytes::from("0x6b175474e89094c44da98b954eedeac495271d0f");
+
+        let swap = Swap {
+            component: ProtocolComponent {
+                id: "0xA478c2975Ab1Ea89e8196811F51A7B7Ade33eB11".to_string(),
+                protocol_system: "uniswap_v2".to_string(),
+                ..Default::default()
+            },
+            token_in: token_in.clone(),
+            token_out: token_out.clone(),
+            split: 0f64,
+        };
+
+        let solution = Solution {
+            exact_out: false,
+            given_token: token_in,
+            given_amount: BigUint::from(1000000000000000000u64),
+            expected_amount: BigUint::from(1000000000000000000u64),
+            checked_token: token_out,
+            check_amount: None,
+            sender: Bytes::from_str("0x0000000000000000000000000000000000000000").unwrap(),
+            // The receiver was generated with `makeAddr("bob") using forge`
+            receiver: Bytes::from_str("0x1d96f2f6bef1202e4ce1ff6dad0c2cb002861d3e").unwrap(),
+            swaps: vec![swap],
+            direct_execution: true,
+            router_address: Some(Bytes::zero(20)),
+            slippage: None,
+            native_action: None,
+        };
+
+        let (protocol_data, executor_address) = encoder
+            .encode_strategy(solution)
+            .unwrap();
+        let hex_protocol_data = encode(&protocol_data);
+        assert_eq!(
+            executor_address,
+            Bytes::from_str("0x5c2f5a71f67c01775180adc06909288b4c329308").unwrap()
+        );
+        assert_eq!(
+            hex_protocol_data,
+            String::from(concat!(
+                // in token
+                "c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2",
+                // component id
+                "a478c2975ab1ea89e8196811f51a7b7ade33eb11",
+                // receiver
+                "1d96f2f6bef1202e4ce1ff6dad0c2cb002861d3e",
+                // zero for one
+                "00",
+            ))
+        );
+    }
+
+    #[test]
+    fn test_selector() {
+        let encoder = ExecutorStrategyEncoder {};
+        assert_eq!(encoder.selector(false), "swap(uint256, bytes)");
+    }
+}

src/encoding/evm/swap_encoder/swap_encoders.rs

@@ -58,7 +58,6 @@ impl SwapEncoder for UniswapV2SwapEncoder {
             component_id,
             bytes_to_address(&encoding_context.receiver)?,
             zero_to_one,
-            encoding_context.exact_out,
         );
 
         Ok(args.abi_encode_packed())
@@ -129,7 +128,6 @@ impl SwapEncoder for UniswapV3SwapEncoder {
             bytes_to_address(&encoding_context.receiver)?,
             component_id,
             zero_to_one,
-            encoding_context.exact_out,
         );
 
         Ok(args.abi_encode_packed())
@@ -238,8 +236,6 @@ mod tests {
                 "0000000000000000000000000000000000000001",
                 // zero for one
                 "00",
-                // exact out
-                "00",
             ))
         );
     }
@@ -290,8 +286,6 @@ mod tests {
                 "88e6a0c2ddd26feeb64f039a2c41296fcb3f5640",
                 // zero for one
                 "00",
-                // exact out
-                "00",
             ))
         );
     }