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

chore: Rename signer_pk to swapper_pk

Browse Source 
--- don't change below this line ---
ENG-4246 Took 15 minutes
This commit is contained in:
Diana Carvalho
2025-02-18 17:50:47 +00:00
parent 8794dc674a
commit d9d56e7a8c
7 changed files with 22 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/encoding/evm/approvals/permit2.rs
View File

@@ -69,7 +69,7 @@ sol! {
}
impl Permit2 {
pub fn new(signer_pk: String, chain: Chain) -> Result<Self, EncodingError> {
pub fn new(swapper_pk: String, chain: Chain) -> Result<Self, EncodingError> {
let (handle, runtime) = match Handle::try_current() {
Ok(h) => (h, None),
Err(_) => {
@@ -80,8 +80,8 @@ impl Permit2 {
}
};
let client = block_in_place(|| handle.block_on(get_client()))?;
let pk = B256::from_str(&signer_pk).map_err(|_| {
EncodingError::FatalError("Failed to convert signer private key to B256".to_string())
let pk = B256::from_str(&swapper_pk).map_err(|_| {
EncodingError::FatalError("Failed to convert swapper private key to B256".to_string())
})?;
let signer = PrivateKeySigner::from_bytes(&pk).map_err(|_| {
EncodingError::FatalError("Failed to create signer from private key".to_string())
@@ -224,9 +224,9 @@ mod tests {
#[test]
fn test_get_existing_allowance() {
let signer_pk =
let swapper_pk =
"4c0883a69102937d6231471b5dbb6204fe512961708279feb1be6ae5538da033".to_string();
let manager = Permit2::new(signer_pk, eth_chain()).unwrap();
let manager = Permit2::new(swapper_pk, eth_chain()).unwrap();
let token = Bytes::from_str("0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48").unwrap();
let owner = Bytes::from_str("0x2c6a3cd97c6283b95ac8c5a4459ebb0d5fd404f4").unwrap();

4
src/encoding/evm/encoder_builder.rs
View File

@@ -21,12 +21,12 @@ impl EVMEncoderBuilder {
}
pub fn tycho_router(
chain: Chain,
signer_pk: String,
swapper_pk: String,
executors_file_path: Option<String>,
) -> Result<Self, EncodingError> {
let swap_encoder_registry = SwapEncoderRegistry::new(executors_file_path, chain)?;
let strategy =
Box::new(SplitSwapStrategyEncoder::new(signer_pk, chain, swap_encoder_registry)?);
Box::new(SplitSwapStrategyEncoder::new(swapper_pk, chain, swap_encoder_registry)?);
Ok(EVMEncoderBuilder { chain, strategy })
}
pub fn direct_execution(

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

@@ -88,14 +88,14 @@ pub struct SplitSwapStrategyEncoder {
impl SplitSwapStrategyEncoder {
pub fn new(
signer_pk: String,
swapper_pk: String,
blockchain: tycho_core::dto::Chain,
swap_encoder_registry: SwapEncoderRegistry,
) -> Result<Self, EncodingError> {
let chain = Chain::from(blockchain);
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.clone())?,
permit2: Permit2::new(swapper_pk, chain.clone())?,
selector,
swap_encoder_registry,
native_address: chain.native_token()?,