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

fix: in bebop's encode_swap, fail early if router address is not present

Browse Source
This commit is contained in:
adrian
2025-08-20 10:13:12 +02:00
committed by Adrian Benavides
parent 58bb3d7bdb
commit c013bf7072
1 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -711,28 +711,24 @@ impl SwapEncoder for BebopSwapEncoder {
) -> Result<Vec<u8>, EncodingError> { ) -> Result<Vec<u8>, EncodingError> {
let token_in = bytes_to_address(&swap.token_in)?; let token_in = bytes_to_address(&swap.token_in)?;
let token_out = bytes_to_address(&swap.token_out)?; let token_out = bytes_to_address(&swap.token_out)?;
let sender = encoding_context
let token_approvals_manager = ProtocolApprovalsManager::new()?; .router_address
let approval_needed: bool; .clone()
.ok_or(EncodingError::FatalError(
if let Some(router_address) = &encoding_context.router_address { "The router address is needed to perform a Hashflow swap".to_string(),
let tycho_router_address = bytes_to_address(router_address)?; ))?;
let approval_needed = if swap.token_in == self.native_token_address {
false
} else {
let tycho_router_address = bytes_to_address(&sender)?;
let settlement_address = Address::from_str(&self.settlement_address) let settlement_address = Address::from_str(&self.settlement_address)
.map_err(|_| EncodingError::FatalError("Invalid settlement address".to_string()))?; .map_err(|_| EncodingError::FatalError("Invalid settlement address".to_string()))?;
ProtocolApprovalsManager::new()?.approval_needed(
// Native ETH doesn't need approval, only ERC20 tokens do
if swap.token_in == self.native_token_address {
approval_needed = false;
} else {
approval_needed = token_approvals_manager.approval_needed(
token_in, token_in,
tycho_router_address, tycho_router_address,
settlement_address, settlement_address,
)?; )?
} };
} else {
approval_needed = true;
}
let (partial_fill_offset, original_filled_taker_amount, bebop_calldata) = let (partial_fill_offset, original_filled_taker_amount, bebop_calldata) =
if let Some(state) = swap.protocol_state { if let Some(state) = swap.protocol_state {
@@ -894,16 +890,16 @@ impl SwapEncoder for HashflowSwapEncoder {
.ok_or(EncodingError::FatalError( .ok_or(EncodingError::FatalError(
"The router address is needed to perform a Hashflow swap".to_string(), "The router address is needed to perform a Hashflow swap".to_string(),
))?; ))?;
let tycho_router_address = bytes_to_address(&sender)?;
let hashflow_router_address =
Address::from_str(&self.hashflow_router_address).map_err(|_| {
EncodingError::FatalError("Invalid hashflow router address address".to_string())
})?;
// Native ETH doesn't need approval, only ERC20 tokens do // Native ETH doesn't need approval, only ERC20 tokens do
let approval_needed = if swap.token_in == self.native_token_address { let approval_needed = if swap.token_in == self.native_token_address {
false false
} else { } else {
let tycho_router_address = bytes_to_address(&sender)?;
let hashflow_router_address = Address::from_str(&self.hashflow_router_address)
.map_err(|_| {
EncodingError::FatalError("Invalid hashflow router address address".to_string())
})?;
ProtocolApprovalsManager::new()?.approval_needed( ProtocolApprovalsManager::new()?.approval_needed(
bytes_to_address(&swap.token_in)?, bytes_to_address(&swap.token_in)?,
tycho_router_address, tycho_router_address,