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

fix: After rebase fixes

Browse Source 
Took 6 minutes
This commit is contained in:
Diana Carvalho
2025-06-23 14:34:58 +01:00
parent e09789f347
commit 1d263f8b4c
4 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,9 +92,9 @@ impl StrategyEncoder for SingleSwapStrategyEncoder {
let (mut unwrap, mut wrap) = (false, false);
if let Some(action) = &solution.native_action {
match action {
&NativeAction::Wrap => wrap = true,
&NativeAction::Unwrap => unwrap = true,
match *action {
NativeAction::Wrap => wrap = true,
NativeAction::Unwrap => unwrap = true,
}
}
let protocol = &grouped_swap.protocol_system;
@@ -255,7 +255,7 @@ impl StrategyEncoder for SequentialSwapStrategyEncoder {
let transfer = self
.transfer_optimization
.get_transfers(
&grouped_swap,
grouped_swap,
&solution.given_token,
wrap,
in_between_swap_optimization_allowed,
@@ -410,9 +410,9 @@ impl StrategyEncoder for SplitSwapStrategyEncoder {
let (mut unwrap, mut wrap) = (false, false);
if let Some(action) = &solution.native_action {
match action {
&NativeAction::Wrap => wrap = true,
&NativeAction::Unwrap => unwrap = true,
match *action {
NativeAction::Wrap => wrap = true,
NativeAction::Unwrap => unwrap = true,
}
}

6
src/encoding/evm/swap_encoder/swap_encoder_registry.rs
View File

@@ -19,12 +19,12 @@ pub struct SwapEncoderRegistry {
impl SwapEncoderRegistry {
/// Populates the registry with the `SwapEncoders` for the given blockchain by parsing the
/// protocols' addresses in the file at the given path.
/// executors' addresses in the file at the given path.
pub fn new(executors_file_path: Option<String>, chain: Chain) -> Result<Self, EncodingError> {
let config_str = if let Some(ref path) = executors_file_path {
fs::read_to_string(path).map_err(|e| {
EncodingError::FatalError(format!(
"Error reading protocols file from {executors_file_path:?}: {e}",
"Error reading executors file from {executors_file_path:?}: {e}",
))
})?
} else {
@@ -33,7 +33,7 @@ impl SwapEncoderRegistry {
let config: HashMap<String, HashMap<String, String>> = serde_json::from_str(&config_str)?;
let executors = config
.get(&chain.name)
.ok_or(EncodingError::FatalError("No protocols found for chain".to_string()))?;
.ok_or(EncodingError::FatalError("No executors found for chain".to_string()))?;
let protocol_specific_config: HashMap<String, HashMap<String, HashMap<String, String>>> =
serde_json::from_str(PROTOCOL_SPECIFIC_CONFIG)?;

16
src/encoding/evm/swap_encoder/swap_encoders.rs
View File

@@ -110,7 +110,7 @@ impl SwapEncoder for UniswapV3SwapEncoder {
let zero_to_one = Self::get_zero_to_one(token_in_address, token_out_address);
let component_id = Address::from_str(&swap.component.id)
.map_err(|_| EncodingError::FatalError("Invalid USV3 component id".to_string()))?;
let pool_fee_bytes = get_static_attribute(&swap, "fee")?;
let pool_fee_bytes = get_static_attribute(swap, "fee")?;
let pool_fee_u24 = pad_to_fixed_size::<3>(&pool_fee_bytes)
.map_err(|_| EncodingError::FatalError("Failed to extract fee bytes".to_string()))?;
@@ -165,12 +165,12 @@ impl SwapEncoder for UniswapV4SwapEncoder {
swap: &Swap,
encoding_context: &EncodingContext,
) -> Result<Vec<u8>, EncodingError> {
let fee = get_static_attribute(&swap, "key_lp_fee")?;
let fee = get_static_attribute(swap, "key_lp_fee")?;
let pool_fee_u24 = pad_to_fixed_size::<3>(&fee)
.map_err(|_| EncodingError::FatalError("Failed to pad fee bytes".to_string()))?;
let tick_spacing = get_static_attribute(&swap, "tick_spacing")?;
let tick_spacing = get_static_attribute(swap, "tick_spacing")?;
let pool_tick_spacing_u24 = pad_to_fixed_size::<3>(&tick_spacing).map_err(|_| {
EncodingError::FatalError("Failed to pad tick spacing bytes".to_string())
@@ -314,20 +314,20 @@ impl SwapEncoder for EkuboSwapEncoder {
}
let fee = u64::from_be_bytes(
get_static_attribute(&swap, "fee")?
get_static_attribute(swap, "fee")?
.try_into()
.map_err(|_| EncodingError::FatalError("fee should be an u64".to_string()))?,
);
let tick_spacing = u32::from_be_bytes(
get_static_attribute(&swap, "tick_spacing")?
get_static_attribute(swap, "tick_spacing")?
.try_into()
.map_err(|_| {
EncodingError::FatalError("tick_spacing should be an u32".to_string())
})?,
);
let extension: Address = get_static_attribute(&swap, "extension")?
let extension: Address = get_static_attribute(swap, "extension")?
.as_slice()
.try_into()
.map_err(|_| EncodingError::FatalError("extension should be an address".to_string()))?;
@@ -424,7 +424,7 @@ impl CurveSwapEncoder {
token_in: Address,
token_out: Address,
) -> Result<(U8, U8), EncodingError> {
let coins_bytes = get_static_attribute(&swap, "coins")?;
let coins_bytes = get_static_attribute(swap, "coins")?;
let coins: Vec<Address> = from_str(std::str::from_utf8(&coins_bytes)?)?;
let token_in = self.normalize_token(token_in, &coins)?;
@@ -508,7 +508,7 @@ impl SwapEncoder for CurveSwapEncoder {
approval_needed = true;
}
let factory_bytes = get_static_attribute(&swap, "factory")?.to_vec();
let factory_bytes = get_static_attribute(swap, "factory")?.to_vec();
// the conversion to Address is necessary to checksum the address
let factory_address =
Address::from_str(std::str::from_utf8(&factory_bytes).map_err(|_| {