Liquidity.Party/tycho-execution
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: update EncodingContext in strategy_encoder

Browse Source
This commit is contained in:
royvardhan
2025-02-19 21:50:43 +05:30
parent 78bc045d14
commit 7f3aca90ba
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/encoding/evm/strategy_encoder/strategy_encoders.rs
View File

@@ -2,6 +2,7 @@ use std::{collections::HashSet, str::FromStr};
use alloy_primitives::{aliases::U24, FixedBytes, U256, U8}; use alloy_primitives::{aliases::U24, FixedBytes, U256, U8};
use alloy_sol_types::SolValue; use alloy_sol_types::SolValue;
use num_bigint::BigUint;
use tycho_core::{keccak256, Bytes}; use tycho_core::{keccak256, Bytes};
use crate::encoding::{ use crate::encoding::{
@@ -189,6 +190,9 @@ impl StrategyEncoder for SplitSwapStrategyEncoder {
receiver: solution.router_address.clone(), receiver: solution.router_address.clone(),
exact_out: solution.exact_out, exact_out: solution.exact_out,
router_address: solution.router_address.clone(), router_address: solution.router_address.clone(),
group_token_in: Some(tokens.first().unwrap().clone()),
group_token_out: Some(tokens.last().unwrap().clone()),
amount_out_min: Some(min_amount_out.clone()),
}; };
let mut grouped_protocol_data: Vec<u8> = vec![]; let mut grouped_protocol_data: Vec<u8> = vec![];
for swap in grouped_swap.swaps.iter() { for swap in grouped_swap.swaps.iter() {
@@ -204,7 +208,7 @@ impl StrategyEncoder for SplitSwapStrategyEncoder {
Bytes::from_str(swap_encoder.executor_address()).map_err(|_| { Bytes::from_str(swap_encoder.executor_address()).map_err(|_| {
EncodingError::FatalError("Invalid executor address".to_string()) EncodingError::FatalError("Invalid executor address".to_string())
})?, })?,
self.encode_executor_selector(swap_encoder.executor_selector()), self.encode_executor_selector(swap_encoder.swap_selector()),
grouped_protocol_data, grouped_protocol_data,
); );
swaps.push(swap_data); swaps.push(swap_data);
@@ -292,6 +296,9 @@ impl StrategyEncoder for ExecutorStrategyEncoder {
receiver: receiver.clone(), receiver: receiver.clone(),
exact_out: solution.exact_out, exact_out: solution.exact_out,
router_address: router_address.clone(), router_address: router_address.clone(),
group_token_in: Some(swap.token_in.clone()),
group_token_out: Some(swap.token_out.clone()),
amount_out_min: Some(BigUint::from(1u128)),
}; };
let protocol_data = swap_encoder.encode_swap(swap.clone(), encoding_context.clone())?; let protocol_data = swap_encoder.encode_swap(swap.clone(), encoding_context.clone())?;
grouped_protocol_data.extend(protocol_data); grouped_protocol_data.extend(protocol_data);
@@ -303,11 +310,7 @@ impl StrategyEncoder for ExecutorStrategyEncoder {
Ok(( Ok((
grouped_protocol_data, grouped_protocol_data,
executor_address, executor_address,
Some( Some(swap_encoder.swap_selector().to_string()),
swap_encoder
.executor_selector()
.to_string(),
),
)) ))
} }
@@ -964,4 +967,4 @@ mod tests {
assert_eq!(hex_calldata[..520], expected_input); assert_eq!(hex_calldata[..520], expected_input);
assert_eq!(hex_calldata[1288..], expected_swaps); assert_eq!(hex_calldata[1288..], expected_swaps);
} }
} }