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

feat: Simplify router encoder

Browse Source 
Don't make selector() a member of the StrategyEncoder trait. It is needed only for certain strategies. The strategy should manage it itself.

--- don't change below this line ---
ENG-4081 Took 17 minutes
This commit is contained in:
Diana Carvalho
2025-01-30 15:19:09 +00:00
parent 089e7d2e0f
commit 6e8d2ede59
3 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,9 @@ use crate::encoding::{
evm::{
approvals::permit2::Permit2,
swap_encoder::SWAP_ENCODER_REGISTRY,
utils::{biguint_to_u256, bytes_to_address, percentage_to_uint24, ple_encode},
utils::{
biguint_to_u256, bytes_to_address, encode_input, percentage_to_uint24, ple_encode,
},
},
models::{EncodingContext, NativeAction, Solution},
strategy_encoder::StrategyEncoder,
@@ -36,11 +38,13 @@ pub trait EVMStrategyEncoder: StrategyEncoder {
pub struct SplitSwapStrategyEncoder {
permit2: Permit2,
selector: String,
}
impl SplitSwapStrategyEncoder {
pub fn new(signer_pk: String, chain: Chain) -> Result<Self, EncodingError> {
Ok(Self { permit2: Permit2::new(signer_pk, chain)? })
let selector = "swap(uint256, address, address, uint256, bool, bool, uint256, address, ((address,uint160,uint48,uint48),address,uint256),bytes, bytes)".to_string();
Ok(Self { permit2: Permit2::new(signer_pk, chain)?, selector })
}
}
impl EVMStrategyEncoder for SplitSwapStrategyEncoder {}
@@ -145,11 +149,9 @@ impl StrategyEncoder for SplitSwapStrategyEncoder {
encoded_swaps,
)
.abi_encode();
Ok(method_calldata)
}
fn selector(&self, _exact_out: bool) -> &str {
"swap(uint256, address, uint256, bytes[])"
let contract_interaction = encode_input(&self.selector, method_calldata);
Ok(contract_interaction)
}
}
@@ -193,9 +195,6 @@ impl StrategyEncoder for StraightToPoolStrategyEncoder {
// TODO: here we need to pass also the address of the executor to be used
Ok(protocol_data)
}
fn selector(&self, _exact_out: bool) -> &str {
unimplemented!();
}
}
#[cfg(test)]
@@ -248,7 +247,7 @@ mod tests {
.unwrap();
let expected_input = String::from(concat!(
"0000000000000000000000000000000000000000000000000000000000000020", // offset
"e73e3baa", // selector
"0000000000000000000000000000000000000000000000000de0b6b3a7640000", // amount out
"000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2", // token in
"0000000000000000000000006b175474e89094c44da98b954eedeac495271d0f", // token out
@@ -298,7 +297,7 @@ mod tests {
"0000000000", // padding
));
let hex_calldata = encode(&calldata);
assert_eq!(hex_calldata[..576], expected_input);
assert_eq!(hex_calldata[1283..], expected_swaps);
assert_eq!(hex_calldata[..520], expected_input);
assert_eq!(hex_calldata[1227..], expected_swaps);
}
}