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

chore: update encoder

Browse Source
This commit is contained in:
pedrobergamini
2025-08-08 11:35:34 -03:00
parent 1336eb5f90
commit 196900b749
1 changed files with 14 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -866,7 +866,7 @@ impl SwapEncoder for BebopSwapEncoder {
))); )));
} }
// Extract the original filledTakerAmount and receiver from the order // Extract the original filledTakerAmount from the order and use the context receiver
let (original_filled_taker_amount, receiver) = { let (original_filled_taker_amount, receiver) = {
let filled_taker_amount = U256::from_be_slice( let filled_taker_amount = U256::from_be_slice(
&bebop_calldata[filled_taker_amount_pos..filled_taker_amount_pos + 32], &bebop_calldata[filled_taker_amount_pos..filled_taker_amount_pos + 32],
@@ -881,62 +881,27 @@ impl SwapEncoder for BebopSwapEncoder {
const SWAP_AGGREGATE_SELECTOR: [u8; 4] = [0xa2, 0xf7, 0x48, 0x93]; const SWAP_AGGREGATE_SELECTOR: [u8; 4] = [0xa2, 0xf7, 0x48, 0x93];
if selector == SWAP_SINGLE_SELECTOR { if selector == SWAP_SINGLE_SELECTOR {
// For swapSingle, decode the Single struct // For swapSingle, only care about taker_amount; receiver comes from context
// Single struct layout (after selector at offset 4): // Single struct layout indicates taker_amount at bytes 292..324
// 0: offset to order (32 bytes) -> points to 96 (0x60) let taker_amount = if filled_taker_amount != U256::ZERO {
// 32: offset to signature (32 bytes) filled_taker_amount
// 64: filledTakerAmount (32 bytes) } else if bebop_calldata.len() >= 324 {
// 96: order struct starts here: U256::from_be_slice(&bebop_calldata[292..324])
// - expiry (32)
// - taker_address (32)
// - maker_address (32)
// - maker_nonce (32)
// - taker_token (32)
// - maker_token (32)
// - taker_amount (32)
// - maker_amount (32)
// - receiver (32)
// So receiver is at: 4 + 96 + 256 = 356
if bebop_calldata.len() >= 388 {
let taker_amount = if filled_taker_amount != U256::ZERO {
filled_taker_amount
} else {
// taker_amount is at: 4 + 96 + 192 = 292
U256::from_be_slice(&bebop_calldata[292..324])
};
// receiver is at: 4 + 96 + 256 = 356 (take 20 bytes, skip 12 padding)
let receiver_bytes = &bebop_calldata[368..388];
let receiver = Address::from_slice(receiver_bytes);
(taker_amount, receiver)
} else { } else {
(U256::ZERO, Address::ZERO) U256::ZERO
} };
(taker_amount, bytes_to_address(&encoding_context.receiver)?)
} else if selector == SWAP_AGGREGATE_SELECTOR { } else if selector == SWAP_AGGREGATE_SELECTOR {
// For swapAggregate, extract receiver from the aggregate order // For swapAggregate, compute taker_amount from calldata if needed; receiver from
// The order starts after: selector(4) + offset_to_order(32) + // context
// offset_to_signatures(32) + filledTakerAmount(32) = 100
// Then we have the order struct with dynamic arrays
// We need to carefully parse to find the receiver field
// Since receiver comes after all the dynamic arrays, it's complex to calculate its
// exact position For now, we'll use a simplified approach since the
// exact receiver extraction for aggregates requires full ABI decoding
// For aggregate orders, if filled_taker_amount is 0, we need to calculate the total
// from the order data because BebopExecutor requires a non-zero value
let taker_amount = if filled_taker_amount != U256::ZERO { let taker_amount = if filled_taker_amount != U256::ZERO {
filled_taker_amount filled_taker_amount
} else { } else {
// Extract and sum all taker amounts from the aggregate order
extract_aggregate_taker_amount(&bebop_calldata).unwrap_or(U256::ZERO) extract_aggregate_taker_amount(&bebop_calldata).unwrap_or(U256::ZERO)
}; };
(taker_amount, bytes_to_address(&encoding_context.receiver)?)
// For aggregate orders, extract receiver (this is a simplified extraction)
// In real implementation, we'd need proper ABI decoding for the complex nested
// structure For now, use zero address as fallback - this will be
// handled properly in production
(taker_amount, Address::ZERO)
} else { } else {
(U256::ZERO, Address::ZERO) (U256::ZERO, bytes_to_address(&encoding_context.receiver)?)
} }
}; };