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

feat: UniswapV4 integration test and fixes

Browse Source 
- Biggest issue: We must encode the executor address, not the router address, in the USV4 swap encoder
This commit is contained in:
TAMARA LIPOWSKI
2025-02-19 18:12:11 -05:00
parent 81c8a04cbb
commit 45fdfc708d
6 changed files with 191 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
foundry/test/Constants.sol
View File

@@ -30,6 +30,7 @@ contract Constants is Test {
address INCH_ADDR = address(0x111111111117dC0aa78b770fA6A738034120C302); address INCH_ADDR = address(0x111111111117dC0aa78b770fA6A738034120C302);
address USDE_ADDR = address(0x4c9EDD5852cd905f086C759E8383e09bff1E68B3); address USDE_ADDR = address(0x4c9EDD5852cd905f086C759E8383e09bff1E68B3);
address USDT_ADDR = address(0xdAC17F958D2ee523a2206206994597C13D831ec7); address USDT_ADDR = address(0xdAC17F958D2ee523a2206206994597C13D831ec7);
address PEPE_ADDR = address(0x6982508145454Ce325dDbE47a25d4ec3d2311933);
// uniswap v2 // uniswap v2
address WETH_DAI_POOL = 0xA478c2975Ab1Ea89e8196811F51A7B7Ade33eB11; address WETH_DAI_POOL = 0xA478c2975Ab1Ea89e8196811F51A7B7Ade33eB11;

32
foundry/test/TychoRouter.t.sol
View File

@@ -666,6 +666,38 @@ contract TychoRouterTest is TychoRouterTestSetup {
assertGt(balancerAfter - balancerBefore, 26173932); assertGt(balancerAfter - balancerBefore, 26173932);
} }
function testUSV4Integration() public {
// Test created with calldata from our router encoder, replacing the executor
// address with the USV4 executor address.
// Performs a sequential swap from USDC to PEPE though ETH using two
// consecutive USV4 pools
//
// USDC ──(USV4)──> ETH ───(USV4)──> PEPE
//
deal(USDC_ADDR, ALICE, 1 ether);
uint256 balancerBefore = IERC20(PEPE_ADDR).balanceOf(ALICE);
console.logAddress(address(usv4Executor));
// Approve permit2
vm.startPrank(ALICE);
IERC20(USDC_ADDR).approve(address(permit2Address), type(uint256).max);
// Encoded solution generated using `test_split_swap_strategy_encoder_simple`
// but manually replacing the executor address
// `5c2f5a71f67c01775180adc06909288b4c329308` with the one in this test
// `f62849f9a0b5bf2913b396098f7c7019b51a820a`
(bool success,) = tychoRouterAddr.call(
hex"4860f9ed000000000000000000000000000000000000000000000000000000003b9aca00000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000000000000000000000006982508145454ce325ddbe47a25d4ec3d23119330000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000cd09f75e2bf2a4d11f3ab23f1389fcc1621c0cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48000000000000000000000000000000000000000000000000000000003b9aca000000000000000000000000000000000000000000000000000000000067ddee9e00000000000000000000000000000000000000000000000000000000000000000000000000000000000000003ede3eca2a72b3aecc820e955b36f38437d013950000000000000000000000000000000000000000000000000000000067b668a6000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000002800000000000000000000000000000000000000000000000000000000000000041bdf91011918dcb5f59ab3588212a035c770a2839fe2c19060491370fa89685b8469def9e83c7b9cf8f0ef5088a3179556a6ba1096cefbe83c09a1182981c93e41c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b400b20001000000f62849f9a0b5bf2913b396098f7c7019b51a820abd0625aba0b86991c6218b36c1d19d4a2e9eb0ce3606eb486982508145454ce325ddbe47a25d4ec3d2311933000000000000000000000000000000000000000000000000000000000000000000f62849f9a0b5bf2913b396098f7c7019b51a820a91dd73460000000000000000000000000000000000000000000bb800003c6982508145454ce325ddbe47a25d4ec3d23119330061a80001f4000000000000000000000000"
);
vm.stopPrank();
uint256 balancerAfter = IERC20(PEPE_ADDR).balanceOf(ALICE);
assertTrue(success, "Call Failed");
assertGt(balancerAfter - balancerBefore, 26173932);
}
function testSingleSwapWithWrapIntegration() public { function testSingleSwapWithWrapIntegration() public {
// Test created with calldata from our router encoder, replacing the executor // Test created with calldata from our router encoder, replacing the executor
// address with the USV2 executor address. // address with the USV2 executor address.

2
src/encoding/config/executor_addresses.json
View File

@@ -2,7 +2,7 @@
"ethereum": { "ethereum": {
"uniswap_v2": "0x5C2F5a71f67c01775180ADc06909288B4C329308", "uniswap_v2": "0x5C2F5a71f67c01775180ADc06909288B4C329308",
"uniswap_v3": "0x5C2F5a71f67c01775180ADc06909288B4C329308", "uniswap_v3": "0x5C2F5a71f67c01775180ADc06909288B4C329308",
"uniswap_v4": "0x5C2F5a71f67c01775180ADc06909288B4C329308", "uniswap_v4": "0xF62849F9A0B5Bf2913b396098F7c7019b51A820a",
"vm:balancer_v2": "0x543778987b293C7E8Cf0722BB2e935ba6f4068D4" "vm:balancer_v2": "0x543778987b293C7E8Cf0722BB2e935ba6f4068D4"
} }
} }

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

@@ -324,11 +324,11 @@ impl StrategyEncoder for ExecutorStrategyEncoder {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use std::str::FromStr; use std::{collections::HashMap, str::FromStr};
use alloy::hex::encode; use alloy::hex::encode;
use alloy_primitives::hex; use alloy_primitives::hex;
use num_bigint::BigUint; use num_bigint::{BigInt, BigUint};
use rstest::rstest; use rstest::rstest;
use tycho_core::{ use tycho_core::{
dto::{Chain as TychoCoreChain, ProtocolComponent}, dto::{Chain as TychoCoreChain, ProtocolComponent},
@@ -456,45 +456,66 @@ mod tests {
let swap_encoder_registry = get_swap_encoder_registry(); let swap_encoder_registry = get_swap_encoder_registry();
let encoder = ExecutorStrategyEncoder::new(swap_encoder_registry); let encoder = ExecutorStrategyEncoder::new(swap_encoder_registry);
let weth = weth(); let eth = eth();
let dai = Bytes::from("0x6b175474e89094c44da98b954eedeac495271d0f"); let usdc = Bytes::from_str("0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48").unwrap();
let usdc = Bytes::from("0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"); let pepe = Bytes::from_str("0x6982508145454Ce325dDbE47a25d4ec3d2311933").unwrap();
let swap_a = Swap { // Fee and tick spacing information for this test is obtained by querying the
// USV4 Position Manager contract: 0xbd216513d74c8cf14cf4747e6aaa6420ff64ee9e
// Using the poolKeys function with the first 25 bytes of the pool id
let pool_fee_usdc_eth = Bytes::from(BigInt::from(3000).to_signed_bytes_be());
let tick_spacing_usdc_eth = Bytes::from(BigInt::from(60).to_signed_bytes_be());
let mut static_attributes_usdc_eth: HashMap<String, Bytes> = HashMap::new();
static_attributes_usdc_eth.insert("fee".into(), pool_fee_usdc_eth);
static_attributes_usdc_eth.insert("tick_spacing".into(), tick_spacing_usdc_eth);
let pool_fee_eth_pepe = Bytes::from(BigInt::from(25000).to_signed_bytes_be());
let tick_spacing_eth_pepe = Bytes::from(BigInt::from(500).to_signed_bytes_be());
let mut static_attributes_eth_pepe: HashMap<String, Bytes> = HashMap::new();
static_attributes_eth_pepe.insert("fee".into(), pool_fee_eth_pepe);
static_attributes_eth_pepe.insert("tick_spacing".into(), tick_spacing_eth_pepe);
let swap_usdc_eth = Swap {
component: ProtocolComponent { component: ProtocolComponent {
id: "0xA478c2975Ab1Ea89e8196811F51A7B7Ade33eB11".to_string(), id: "0xdce6394339af00981949f5f3baf27e3610c76326a700af57e4b3e3ae4977f78d"
.to_string(),
protocol_system: "uniswap_v4".to_string(), protocol_system: "uniswap_v4".to_string(),
static_attributes: static_attributes_usdc_eth,
..Default::default() ..Default::default()
}, },
token_in: weth.clone(), token_in: usdc.clone(),
token_out: dai.clone(), token_out: eth.clone(),
// This represents the remaining 50%, but to avoid any rounding errors we set this to
// 0 to signify "the remainder of the WETH value". It should still be very close to 50%
split: 0f64, split: 0f64,
}; };
let swap_b = Swap {
let swap_eth_pepe = Swap {
component: ProtocolComponent { component: ProtocolComponent {
id: "0xAE461cA67B15dc8dc81CE7615e0320dA1A9aB8D5".to_string(), id: "0xecd73ecbf77219f21f129c8836d5d686bbc27d264742ddad620500e3e548e2c9"
.to_string(),
protocol_system: "uniswap_v4".to_string(), protocol_system: "uniswap_v4".to_string(),
static_attributes: static_attributes_eth_pepe,
..Default::default() ..Default::default()
}, },
token_in: dai.clone(), token_in: eth.clone(),
token_out: usdc.clone(), token_out: pepe.clone(),
split: 0f64, split: 0f64,
}; };
let solution = Solution { let solution = Solution {
exact_out: false, exact_out: false,
given_token: weth, given_token: usdc,
given_amount: BigUint::from(1000000000000000000u64), given_amount: BigUint::from_str("1000_000000").unwrap(),
expected_amount: Some(BigUint::from(1000000000000000000u64)), checked_token: pepe,
checked_token: usdc, expected_amount: Some(BigUint::from_str("105_152_000000000000000000").unwrap()),
checked_amount: None, checked_amount: None,
sender: Bytes::from_str("0x0000000000000000000000000000000000000000").unwrap(),
// The receiver was generated with `makeAddr("bob") using forge`
receiver: Bytes::from_str("0x1d96f2f6bef1202e4ce1ff6dad0c2cb002861d3e").unwrap(),
swaps: vec![swap_a, swap_b],
router_address: Bytes::from_str("0x3Ede3eCa2a72B3aeCC820E955B36f38437D01395").unwrap(),
slippage: None, slippage: None,
native_action: None, sender: Bytes::from_str("0xcd09f75E2BF2A4d11F3AB23f1389FcC1621c0cc2").unwrap(),
receiver: Bytes::from_str("0xcd09f75E2BF2A4d11F3AB23f1389FcC1621c0cc2").unwrap(),
router_address: Bytes::from_str("0x3Ede3eCa2a72B3aeCC820E955B36f38437D01395").unwrap(),
swaps: vec![swap_usdc_eth, swap_eth_pepe],
..Default::default()
}; };
let (protocol_data, executor_address, selector) = encoder let (protocol_data, executor_address, selector) = encoder
@@ -503,27 +524,35 @@ mod tests {
let hex_protocol_data = encode(&protocol_data); let hex_protocol_data = encode(&protocol_data);
assert_eq!( assert_eq!(
executor_address, executor_address,
Bytes::from_str("0x5c2f5a71f67c01775180adc06909288b4c329308").unwrap() Bytes::from_str("0xF62849F9A0B5Bf2913b396098F7c7019b51A820a").unwrap()
); );
assert_eq!( assert_eq!(
hex_protocol_data, hex_protocol_data,
String::from(concat!( String::from(concat!(
// in token // group in token
"c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2", "a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
// component id // group out token
"a478c2975ab1ea89e8196811f51a7b7ade33eb11", "6982508145454ce325ddbe47a25d4ec3d2311933",
// receiver // group min amount out
"1d96f2f6bef1202e4ce1ff6dad0c2cb002861d3e", "0000000000000000000000000000000000000000000000000000000000000000",
// zero for one // zero for one
"00", "00",
// in token // executor address
"6b175474e89094c44da98b954eedeac495271d0f", "f62849f9a0b5bf2913b396098f7c7019b51a820a",
// component id // callback selector
"ae461ca67b15dc8dc81ce7615e0320da1a9ab8d5", "91dd7346",
// receiver // first pool intermediary token (ETH)
"1d96f2f6bef1202e4ce1ff6dad0c2cb002861d3e", "0000000000000000000000000000000000000000",
// zero for one // fee
"01", "000bb8",
// tick spacing
"00003c",
// second pool intermediary token (PEPE)
"6982508145454ce325ddbe47a25d4ec3d2311933",
// fee
"0061a8",
// tick spacing
"0001f4"
)) ))
); );
assert_eq!(selector, Some("swap(uint256,bytes)".to_string())); assert_eq!(selector, Some("swap(uint256,bytes)".to_string()));
@@ -844,39 +873,59 @@ mod tests {
#[test] #[test]
fn test_split_encoding_strategy_usv4() { fn test_split_encoding_strategy_usv4() {
// Performs a split swap from WETH to USDC though WBTC using two consecutive USV4 pools // Performs a sequential swap from USDC to PEPE though ETH using two consecutive USV4 pools
// //
// WETH ──(USV4)──> WBTC ───(USV4)──> USDC // USDC ──(USV4)──> ETH ───(USV4)──> PEPE
// //
// Set up a mock private key for signing // Set up a mock private key for signing (Alice's pk in our router tests)
let private_key = let private_key =
"0x123456789abcdef123456789abcdef123456789abcdef123456789abcdef1234".to_string(); "0x123456789abcdef123456789abcdef123456789abcdef123456789abcdef1234".to_string();
let weth = weth(); let eth = eth();
let wbtc = Bytes::from_str("0x2260fac5e5542a773aa44fbcfedf7c193bc2c599").unwrap();
let usdc = Bytes::from_str("0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48").unwrap(); let usdc = Bytes::from_str("0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48").unwrap();
let pepe = Bytes::from_str("0x6982508145454Ce325dDbE47a25d4ec3d2311933").unwrap();
let swap_weth_wbtc = Swap { // Fee and tick spacing information for this test is obtained by querying the
// USV4 Position Manager contract: 0xbd216513d74c8cf14cf4747e6aaa6420ff64ee9e
// Using the poolKeys function with the first 25 bytes of the pool id
let pool_fee_usdc_eth = Bytes::from(BigInt::from(3000).to_signed_bytes_be());
let tick_spacing_usdc_eth = Bytes::from(BigInt::from(60).to_signed_bytes_be());
let mut static_attributes_usdc_eth: HashMap<String, Bytes> = HashMap::new();
static_attributes_usdc_eth.insert("fee".into(), pool_fee_usdc_eth);
static_attributes_usdc_eth.insert("tick_spacing".into(), tick_spacing_usdc_eth);
let pool_fee_eth_pepe = Bytes::from(BigInt::from(25000).to_signed_bytes_be());
let tick_spacing_eth_pepe = Bytes::from(BigInt::from(500).to_signed_bytes_be());
let mut static_attributes_eth_pepe: HashMap<String, Bytes> = HashMap::new();
static_attributes_eth_pepe.insert("fee".into(), pool_fee_eth_pepe);
static_attributes_eth_pepe.insert("tick_spacing".into(), tick_spacing_eth_pepe);
let swap_usdc_eth = Swap {
component: ProtocolComponent { component: ProtocolComponent {
id: "0xBb2b8038a1640196FbE3e38816F3e67Cba72D940".to_string(), id: "0xdce6394339af00981949f5f3baf27e3610c76326a700af57e4b3e3ae4977f78d"
.to_string(),
protocol_system: "uniswap_v4".to_string(), protocol_system: "uniswap_v4".to_string(),
static_attributes: static_attributes_usdc_eth,
..Default::default() ..Default::default()
}, },
token_in: weth.clone(), token_in: usdc.clone(),
token_out: wbtc.clone(), token_out: eth.clone(),
// This represents the remaining 50%, but to avoid any rounding errors we set this to // This represents the remaining 50%, but to avoid any rounding errors we set this to
// 0 to signify "the remainder of the WETH value". It should still be very close to 50% // 0 to signify "the remainder of the WETH value". It should still be very close to 50%
split: 0f64, split: 0f64,
}; };
let swap_wbtc_usdc = Swap {
let swap_eth_pepe = Swap {
component: ProtocolComponent { component: ProtocolComponent {
id: "0xAE461cA67B15dc8dc81CE7615e0320dA1A9aB8D5".to_string(), id: "0xecd73ecbf77219f21f129c8836d5d686bbc27d264742ddad620500e3e548e2c9"
.to_string(),
protocol_system: "uniswap_v4".to_string(), protocol_system: "uniswap_v4".to_string(),
static_attributes: static_attributes_eth_pepe,
..Default::default() ..Default::default()
}, },
token_in: wbtc.clone(), token_in: eth.clone(),
token_out: usdc.clone(), token_out: pepe.clone(),
split: 0f64, split: 0f64,
}; };
let swap_encoder_registry = get_swap_encoder_registry(); let swap_encoder_registry = get_swap_encoder_registry();
@@ -884,16 +933,16 @@ mod tests {
SplitSwapStrategyEncoder::new(private_key, eth_chain(), swap_encoder_registry).unwrap(); SplitSwapStrategyEncoder::new(private_key, eth_chain(), swap_encoder_registry).unwrap();
let solution = Solution { let solution = Solution {
exact_out: false, exact_out: false,
given_token: weth, given_token: usdc,
given_amount: BigUint::from_str("1_000000000000000000").unwrap(), given_amount: BigUint::from_str("1000_000000").unwrap(),
checked_token: usdc, checked_token: pepe,
expected_amount: Some(BigUint::from_str("3_000_000000").unwrap()), expected_amount: Some(BigUint::from_str("105_152_000000000000000000").unwrap()),
checked_amount: None, checked_amount: None,
slippage: None, slippage: None,
sender: Bytes::from_str("0xcd09f75E2BF2A4d11F3AB23f1389FcC1621c0cc2").unwrap(), sender: Bytes::from_str("0xcd09f75E2BF2A4d11F3AB23f1389FcC1621c0cc2").unwrap(),
receiver: Bytes::from_str("0xcd09f75E2BF2A4d11F3AB23f1389FcC1621c0cc2").unwrap(), receiver: Bytes::from_str("0xcd09f75E2BF2A4d11F3AB23f1389FcC1621c0cc2").unwrap(),
router_address: Bytes::from_str("0x3Ede3eCa2a72B3aeCC820E955B36f38437D01395").unwrap(), router_address: Bytes::from_str("0x3Ede3eCa2a72B3aeCC820E955B36f38437D01395").unwrap(),
swaps: vec![swap_weth_wbtc, swap_wbtc_usdc], swaps: vec![swap_usdc_eth, swap_eth_pepe],
..Default::default() ..Default::default()
}; };
@@ -903,9 +952,9 @@ mod tests {
let expected_input = [ let expected_input = [
"4860f9ed", // Function selector "4860f9ed", // Function selector
"0000000000000000000000000000000000000000000000000de0b6b3a7640000", // amount out "000000000000000000000000000000000000000000000000000000003b9aca00", // amount in
"000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2", // token in "000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48", // token in
"000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48", // token out "0000000000000000000000006982508145454ce325ddbe47a25d4ec3d2311933", // token out
"0000000000000000000000000000000000000000000000000000000000000000", // min amount out "0000000000000000000000000000000000000000000000000000000000000000", // min amount out
"0000000000000000000000000000000000000000000000000000000000000000", // wrap "0000000000000000000000000000000000000000000000000000000000000000", // wrap
"0000000000000000000000000000000000000000000000000000000000000000", // unwrap "0000000000000000000000000000000000000000000000000000000000000000", // unwrap
@@ -936,29 +985,35 @@ mod tests {
let expected_swaps = String::from(concat!( let expected_swaps = String::from(concat!(
// length of ple encoded swaps without padding // length of ple encoded swaps without padding
"0000000000000000000000000000000000000000000000000000000000000099", "00000000000000000000000000000000000000000000000000000000000000b4",
// ple encoded swaps // ple encoded swaps
"0097", // Swap length "00b2", // Swap length
"00", // token in index "00", // token in index
"01", // token out index "01", // token out index
"000000", // split "000000", // split
// Swap data header // Swap data header
"5c2f5a71f67c01775180adc06909288b4c329308", // executor address "f62849f9a0b5bf2913b396098f7c7019b51a820a", // executor address
"bd0625ab", // selector "bd0625ab", // selector
// First swap protocol data // Protocol data
"c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2", // token in "a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48", // group token in
"bb2b8038a1640196fbe3e38816f3e67cba72d940", // component id "6982508145454ce325ddbe47a25d4ec3d2311933", // group token in
"3ede3eca2a72b3aecc820e955b36f38437d01395", // receiver "0000000000000000000000000000000000000000000000000000000000000000", // amount out min
"00", // zero2one "00", // zero2one
// Second swap protocol data "f62849f9a0b5bf2913b396098f7c7019b51a820a", // executor address
"2260fac5e5542a773aa44fbcfedf7c193bc2c599", // token in "91dd7346", // callback selector
"ae461ca67b15dc8dc81ce7615e0320da1a9ab8d5", // component id // First pool params
"3ede3eca2a72b3aecc820e955b36f38437d01395", // receiver "0000000000000000000000000000000000000000", // intermediary token (ETH)
"01", // zero2one "000bb8", // fee
"00000000000000", // padding "00003c", // tick spacing
// Second pool params
"6982508145454ce325ddbe47a25d4ec3d2311933", // intermediary token (PEPE)
"0061a8", // fee
"0001f4", // tick spacing
"000000000000000000000000" // padding
)); ));
let hex_calldata = encode(&calldata); let hex_calldata = encode(&calldata);
println!("{}", hex_calldata);
assert_eq!(hex_calldata[..520], expected_input); assert_eq!(hex_calldata[..520], expected_input);
assert_eq!(hex_calldata[1288..], expected_swaps); assert_eq!(hex_calldata[1288..], expected_swaps);
} }

4
src/encoding/evm/swap_encoder/builder.rs
View File

@@ -1,7 +1,7 @@
use crate::encoding::{ use crate::encoding::{
errors::EncodingError, errors::EncodingError,
evm::swap_encoder::swap_encoders::{ evm::swap_encoder::swap_encoders::{
BalancerV2SwapEncoder, UniswapV2SwapEncoder, UniswapV3SwapEncoder, BalancerV2SwapEncoder, UniswapV2SwapEncoder, UniswapV3SwapEncoder, UniswapV4SwapEncoder,
}, },
swap_encoder::SwapEncoder, swap_encoder::SwapEncoder,
}; };
@@ -26,7 +26,7 @@ impl SwapEncoderBuilder {
"vm:balancer_v2" => Ok(Box::new(BalancerV2SwapEncoder::new(self.executor_address))), "vm:balancer_v2" => Ok(Box::new(BalancerV2SwapEncoder::new(self.executor_address))),
"uniswap_v3" => Ok(Box::new(UniswapV3SwapEncoder::new(self.executor_address))), "uniswap_v3" => Ok(Box::new(UniswapV3SwapEncoder::new(self.executor_address))),
// TODO replace this with V4 encoder once implemented // TODO replace this with V4 encoder once implemented
"uniswap_v4" => Ok(Box::new(UniswapV2SwapEncoder::new(self.executor_address))), "uniswap_v4" => Ok(Box::new(UniswapV4SwapEncoder::new(self.executor_address))),
_ => Err(EncodingError::FatalError(format!( _ => Err(EncodingError::FatalError(format!(
"Unknown protocol system: {}", "Unknown protocol system: {}",
self.protocol_system self.protocol_system

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

@@ -2,6 +2,7 @@ use std::str::FromStr;
use alloy_primitives::{Address, Bytes as AlloyBytes, U256}; use alloy_primitives::{Address, Bytes as AlloyBytes, U256};
use alloy_sol_types::SolValue; use alloy_sol_types::SolValue;
use tycho_core::Bytes;
use crate::encoding::{ use crate::encoding::{
errors::EncodingError, errors::EncodingError,
@@ -173,7 +174,7 @@ impl SwapEncoder for UniswapV4SwapEncoder {
let pool_fee_u24 = pad_to_fixed_size::<3>(&fee) let pool_fee_u24 = pad_to_fixed_size::<3>(&fee)
.map_err(|_| EncodingError::FatalError("Failed to pad fee bytes".to_string()))?; .map_err(|_| EncodingError::FatalError("Failed to pad fee bytes".to_string()))?;
let tick_spacing = get_static_attribute(&swap, "tickSpacing")?; let tick_spacing = get_static_attribute(&swap, "tick_spacing")?;
let pool_tick_spacing_u24 = pad_to_fixed_size::<3>(&tick_spacing).map_err(|_| { let pool_tick_spacing_u24 = pad_to_fixed_size::<3>(&tick_spacing).map_err(|_| {
EncodingError::FatalError("Failed to pad tick spacing bytes".to_string()) EncodingError::FatalError("Failed to pad tick spacing bytes".to_string())
@@ -193,7 +194,10 @@ impl SwapEncoder for UniswapV4SwapEncoder {
let amount_out_min = U256::from(0); let amount_out_min = U256::from(0);
let zero_to_one = Self::get_zero_to_one(token_in_address, token_out_address); let zero_to_one = Self::get_zero_to_one(token_in_address, token_out_address);
let callback_executor = bytes_to_address(&encoding_context.router_address)?; let callback_executor =
bytes_to_address(&Bytes::from_str(&self.executor_address).map_err(|_| {
EncodingError::FatalError("Invalid UniswapV4 executor address".into())
})?)?;
let pool_params = let pool_params =
(token_out_address, pool_fee_u24, pool_tick_spacing_u24).abi_encode_packed(); (token_out_address, pool_fee_u24, pool_tick_spacing_u24).abi_encode_packed();
@@ -439,14 +443,13 @@ mod tests {
fn test_encode_uniswap_v4_simple_swap() { fn test_encode_uniswap_v4_simple_swap() {
let fee = BigInt::from(100); let fee = BigInt::from(100);
let tick_spacing = BigInt::from(1); let tick_spacing = BigInt::from(1);
let encoded_pool_fee = Bytes::from(fee.to_signed_bytes_be());
let encoded_tick_spacing = Bytes::from(tick_spacing.to_signed_bytes_be());
let token_in = Bytes::from("0x4c9EDD5852cd905f086C759E8383e09bff1E68B3"); // USDE let token_in = Bytes::from("0x4c9EDD5852cd905f086C759E8383e09bff1E68B3"); // USDE
let token_out = Bytes::from("0xdAC17F958D2ee523a2206206994597C13D831ec7"); // USDT let token_out = Bytes::from("0xdAC17F958D2ee523a2206206994597C13D831ec7"); // USDT
let mut static_attributes: HashMap<String, Bytes> = HashMap::new(); let mut static_attributes: HashMap<String, Bytes> = HashMap::new();
static_attributes.insert("fee".into(), Bytes::from(encoded_pool_fee.to_vec())); static_attributes.insert("fee".into(), Bytes::from(fee.to_signed_bytes_be()));
static_attributes.insert("tickSpacing".into(), Bytes::from(encoded_tick_spacing.to_vec())); static_attributes
.insert("tick_spacing".into(), Bytes::from(tick_spacing.to_signed_bytes_be()));
let usv4_pool = ProtocolComponent { let usv4_pool = ProtocolComponent {
// Pool manager // Pool manager
@@ -472,7 +475,7 @@ mod tests {
group_token_out: token_out.clone(), group_token_out: token_out.clone(),
}; };
let encoder = let encoder =
UniswapV4SwapEncoder::new(String::from("0x543778987b293C7E8Cf0722BB2e935ba6f4068D4")); UniswapV4SwapEncoder::new(String::from("0xF62849F9A0B5Bf2913b396098F7c7019b51A820a"));
let encoded_swap = encoder let encoded_swap = encoder
.encode_swap(swap, encoding_context) .encode_swap(swap, encoding_context)
.unwrap(); .unwrap();
@@ -489,8 +492,8 @@ mod tests {
"0000000000000000000000000000000000000000000000000000000000000000", "0000000000000000000000000000000000000000000000000000000000000000",
// zero for one // zero for one
"01", "01",
// router address // executor address
"5615deb798bb3e4dfa0139dfa1b3d433cc23b72f", "f62849f9a0b5bf2913b396098f7c7019b51a820a",
// callback selector for "unlockCallback(bytes)" // callback selector for "unlockCallback(bytes)"
"91dd7346", "91dd7346",
// pool params: // pool params:
@@ -508,15 +511,14 @@ mod tests {
fn test_encode_uniswap_v4_second_swap() { fn test_encode_uniswap_v4_second_swap() {
let fee = BigInt::from(3000); let fee = BigInt::from(3000);
let tick_spacing = BigInt::from(60); let tick_spacing = BigInt::from(60);
let encoded_pool_fee = Bytes::from(fee.to_signed_bytes_be());
let encoded_tick_spacing = Bytes::from(tick_spacing.to_signed_bytes_be());
let group_token_in = Bytes::from("0x4c9EDD5852cd905f086C759E8383e09bff1E68B3"); // USDE let group_token_in = Bytes::from("0x4c9EDD5852cd905f086C759E8383e09bff1E68B3"); // USDE
let token_in = Bytes::from("0xdAC17F958D2ee523a2206206994597C13D831ec7"); // USDT let token_in = Bytes::from("0xdAC17F958D2ee523a2206206994597C13D831ec7"); // USDT
let token_out = Bytes::from("0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599"); // WBTC let token_out = Bytes::from("0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599"); // WBTC
let mut static_attributes: HashMap<String, Bytes> = HashMap::new(); let mut static_attributes: HashMap<String, Bytes> = HashMap::new();
static_attributes.insert("fee".into(), Bytes::from(encoded_pool_fee.to_vec())); static_attributes.insert("fee".into(), Bytes::from(fee.to_signed_bytes_be()));
static_attributes.insert("tickSpacing".into(), Bytes::from(encoded_tick_spacing.to_vec())); static_attributes
.insert("tick_spacing".into(), Bytes::from(tick_spacing.to_signed_bytes_be()));
let usv4_pool = ProtocolComponent { let usv4_pool = ProtocolComponent {
id: String::from("0x000000000004444c5dc75cB358380D2e3dE08A90"), id: String::from("0x000000000004444c5dc75cB358380D2e3dE08A90"),
@@ -581,15 +583,14 @@ mod tests {
// Setup - First sequence: USDE -> USDT // Setup - First sequence: USDE -> USDT
let usde_usdt_fee = BigInt::from(100); let usde_usdt_fee = BigInt::from(100);
let usde_usdt_tick_spacing = BigInt::from(1); let usde_usdt_tick_spacing = BigInt::from(1);
let usde_usdt_encoded_pool_fee = Bytes::from(usde_usdt_fee.to_signed_bytes_be());
let usde_usdt_encoded_tick_spacing =
Bytes::from(usde_usdt_tick_spacing.to_signed_bytes_be());
let mut usde_usdt_static_attributes: HashMap<String, Bytes> = HashMap::new(); let mut usde_usdt_static_attributes: HashMap<String, Bytes> = HashMap::new();
usde_usdt_static_attributes usde_usdt_static_attributes
.insert("fee".into(), Bytes::from(usde_usdt_encoded_pool_fee.to_vec())); .insert("fee".into(), Bytes::from(usde_usdt_fee.to_signed_bytes_be()));
usde_usdt_static_attributes usde_usdt_static_attributes.insert(
.insert("tickSpacing".into(), Bytes::from(usde_usdt_encoded_tick_spacing.to_vec())); "tick_spacing".into(),
Bytes::from(usde_usdt_tick_spacing.to_signed_bytes_be()),
);
let usde_usdt_component = ProtocolComponent { let usde_usdt_component = ProtocolComponent {
id: String::from("0x000000000004444c5dc75cB358380D2e3dE08A90"), id: String::from("0x000000000004444c5dc75cB358380D2e3dE08A90"),
@@ -600,15 +601,14 @@ mod tests {
// Setup - Second sequence: USDT -> WBTC // Setup - Second sequence: USDT -> WBTC
let usdt_wbtc_fee = BigInt::from(3000); let usdt_wbtc_fee = BigInt::from(3000);
let usdt_wbtc_tick_spacing = BigInt::from(60); let usdt_wbtc_tick_spacing = BigInt::from(60);
let usdt_wbtc_encoded_pool_fee = Bytes::from(usdt_wbtc_fee.to_signed_bytes_be());
let usdt_wbtc_encoded_tick_spacing =
Bytes::from(usdt_wbtc_tick_spacing.to_signed_bytes_be());
let mut usdt_wbtc_static_attributes: HashMap<String, Bytes> = HashMap::new(); let mut usdt_wbtc_static_attributes: HashMap<String, Bytes> = HashMap::new();
usdt_wbtc_static_attributes usdt_wbtc_static_attributes
.insert("fee".into(), Bytes::from(usdt_wbtc_encoded_pool_fee.to_vec())); .insert("fee".into(), Bytes::from(usdt_wbtc_fee.to_signed_bytes_be()));
usdt_wbtc_static_attributes usdt_wbtc_static_attributes.insert(
.insert("tickSpacing".into(), Bytes::from(usdt_wbtc_encoded_tick_spacing.to_vec())); "tick_spacing".into(),
Bytes::from(usdt_wbtc_tick_spacing.to_signed_bytes_be()),
);
let usdt_wbtc_component = ProtocolComponent { let usdt_wbtc_component = ProtocolComponent {
id: String::from("0x000000000004444c5dc75cB358380D2e3dE08A90"), id: String::from("0x000000000004444c5dc75cB358380D2e3dE08A90"),
@@ -631,7 +631,7 @@ mod tests {
}; };
let encoder = let encoder =
UniswapV4SwapEncoder::new(String::from("0x543778987b293C7E8Cf0722BB2e935ba6f4068D4")); UniswapV4SwapEncoder::new(String::from("0xF62849F9A0B5Bf2913b396098F7c7019b51A820a"));
let initial_encoded_swap = encoder let initial_encoded_swap = encoder
.encode_swap(initial_swap, context.clone()) .encode_swap(initial_swap, context.clone())
.unwrap(); .unwrap();
@@ -653,8 +653,8 @@ mod tests {
"0000000000000000000000000000000000000000000000000000000000000000", "0000000000000000000000000000000000000000000000000000000000000000",
// zero for one // zero for one
"01", "01",
// router address // executor address
"5615deb798bb3e4dfa0139dfa1b3d433cc23b72f", "f62849f9a0b5bf2913b396098f7c7019b51a820a",
// callback selector for "unlockCallback(bytes)" // callback selector for "unlockCallback(bytes)"
"91dd7346", "91dd7346",
// pool params: // pool params: