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

refactor: check given/checked tokens before swap tokens

Browse Source 
It's a more intuitive order, since these are higher-level attributes.

Also remove the validation from the trait - it doesn't have to be part of the trait.
This commit is contained in:
TAMARA LIPOWSKI
2025-02-04 10:01:38 -05:00
parent 4bc615913e
commit f873bb5187
2 changed files with 44 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
src/encoding/evm/tycho_encoder.rs
View File

@@ -32,6 +32,50 @@ impl<S: StrategySelector> EVMTychoEncoder<S> {
Ok(EVMTychoEncoder { strategy_selector, signer, chain, router_address })
}
}
impl<S: StrategySelector> EVMTychoEncoder<S> {
fn validate_solution(&self, solution: &Solution) -> Result<(), EncodingError> {
if solution.exact_out {
return Err(EncodingError::FatalError(
"Currently only exact input solutions are supported".to_string(),
));
}
if solution.swaps.is_empty() {
return Err(EncodingError::FatalError("No swaps found in solution".to_string()));
}
if let Some(native_action) = solution.clone().native_action {
if native_action == NativeAction::Wrap {
if solution.given_token != *NATIVE_ADDRESS {
return Err(EncodingError::FatalError(
"ETH must be the input token in order to wrap".to_string(),
));
}
if let Some(first_swap) = solution.swaps.first() {
if first_swap.token_in != *WETH_ADDRESS {
return Err(EncodingError::FatalError(
"WETH must be the first swap's input in order to wrap".to_string(),
));
}
}
} else if native_action == NativeAction::Unwrap {
if solution.checked_token != *NATIVE_ADDRESS {
return Err(EncodingError::FatalError(
"ETH must be the output token in order to unwrap".to_string(),
));
}
if let Some(last_swap) = solution.swaps.last() {
if last_swap.token_out != *WETH_ADDRESS {
return Err(EncodingError::FatalError(
"WETH must be the last swap's output in order to unwrap".to_string(),
));
}
}
}
}
Ok(())
}
}
impl<S: StrategySelector> TychoEncoder<S> for EVMTychoEncoder<S> {
fn encode_router_calldata(
&self,
@@ -67,47 +111,6 @@ impl<S: StrategySelector> TychoEncoder<S> for EVMTychoEncoder<S> {
}
Ok(transactions)
}
fn validate_solution(&self, solution: &Solution) -> Result<(), EncodingError> {
if solution.exact_out {
return Err(EncodingError::FatalError(
"Currently only exact input solutions are supported".to_string(),
));
}
if solution.swaps.is_empty() {
return Err(EncodingError::FatalError("No swaps found in solution".to_string()));
}
if let Some(native_action) = solution.clone().native_action {
if native_action == NativeAction::Wrap {
if let Some(first_swap) = solution.swaps.first() {
if first_swap.token_in != *WETH_ADDRESS {
return Err(EncodingError::FatalError(
"WETH must be the first swap's input in order to wrap".to_string(),
));
}
}
if solution.given_token != *NATIVE_ADDRESS {
return Err(EncodingError::FatalError(
"ETH must be the input token in order to wrap".to_string(),
));
}
} else if native_action == NativeAction::Unwrap {
if let Some(last_swap) = solution.swaps.last() {
if last_swap.token_out != *WETH_ADDRESS {
return Err(EncodingError::FatalError(
"WETH must be the last swap's output in order to unwrap".to_string(),
));
}
}
if solution.checked_token != *NATIVE_ADDRESS {
return Err(EncodingError::FatalError(
"ETH must be the output token in order to unwrap".to_string(),
));
}
}
}
Ok(())
}
}
#[cfg(test)]

2
src/encoding/tycho_encoder.rs
View File

@@ -10,6 +10,4 @@ pub trait TychoEncoder<S: StrategySelector> {
&self,
solutions: Vec<Solution>,
) -> Result<Vec<Transaction>, EncodingError>;
fn validate_solution(&self, solution: &Solution) -> Result<(), EncodingError>;
}