fix: Replicate a real Uniswap X order in integration test

Took 16 minutes

foundry/test/assets/calldata.txt

@@ -33,4 +33,4 @@ test_encode_balancer_v3:7bc3485026ac48b6cf9baf0a377477fff5703af8c71ea051a5f82c67
 test_single_encoding_strategy_balancer_v3:5c4b639c0000000000000000000000000000000000000000000000000de0b6b3a7640000000000000000000000000000097ffedb80d4b2ca6105a07a4d90eb739c45a66600000000000000000000000030881baa943777f92dc934d53d3bfdf33382cab300000000000000000000000000000000000000000000000000000000000003e800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cd09f75e2bf2a4d11f3ab23f1389fcc1621c0cc200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000006503a6a84cd762d9707a21605b548aaab891562aab097ffedb80d4b2ca6105a07a4d90eb739c45a66630881baa943777f92dc934d53d3bfdf33382cab3f028ac624074d6793c36dc8a06ecec0f5a39a71800cd09f75e2bf2a4d11f3ab23f1389fcc1621c0cc2000000000000000000000000000000000000000000000000000000
 test_uniswap_v3_balancer_v3:e21dd0d3000000000000000000000000000000000000000000000000002386f26fc10000000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000004a220e6096b25eadb88358cb44068a324825467500000000000000000000000000000000000000000000000000000000018f61ec00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cd09f75e2bf2a4d11f3ab23f1389fcc1621c0cc20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000000d200692e234dae75c793f67a35089c9d99245e1c58470bc02aaa39b223fe8d0a0e5c4f27ead9083c756cc22260fac5e5542a773aa44fbcfedf7c193bc2c599000bb83ede3eca2a72b3aecc820e955b36f38437d01395cbcdf9626bc03e24f779434178a73a0b4bad62ed0000006503a6a84cd762d9707a21605b548aaab891562aab2260fac5e5542a773aa44fbcfedf7c193bc2c5994a220e6096b25eadb88358cb44068a3248254675571bea0e99e139cd0b6b7d9352ca872dfe0d72dd01cd09f75e2bf2a4d11f3ab23f1389fcc1621c0cc20000000000000000000000000000
 test_single_swap_strategy_encoder:30ace1b10000000000000000000000000000000000000000000000000de0b6b3a7640000000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000006b175474e89094c44da98b954eedeac495271d0f00000000000000000000000000000000000000000000006d70b85442ed96492800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cd09f75e2bf2a4d11f3ab23f1389fcc1621c0cc2000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000de0b6b3a7640000000000000000000000000000000000000000000000000000000000006880f27700000000000000000000000000000000000000000000000000000000000000000000000000000000000000003ede3eca2a72b3aecc820e955b36f38437d013950000000000000000000000000000000000000000000000000000000068596c7f00000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000000411d60a13b5e993ef8088cb2cb7e16281f47fbc329bd0ec2a48165e7898542a7ed12fe7ffdec713b6d94e99ddf0a384674617b6190b8534491d525ecb090c8e4881c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000525615deb798bb3e4dfa0139dfa1b3d433cc23b72fc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2a478c2975ab1ea89e8196811f51a7b7ade33eb11cd09f75e2bf2a4d11f3ab23f1389fcc1621c0cc200000000000000000000000000000000
-test_sequential_swap_unix:0101e21dd0d30000000000000000000000000000000000000000000000000de0b6b3a7640000000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000000018f61ec00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cd09f75e2bf2a4d11f3ab23f1389fcc1621c0cc20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000000bf00692e234dae75c793f67a35089c9d99245e1c58470bc02aaa39b223fe8d0a0e5c4f27ead9083c756cc22260fac5e5542a773aa44fbcfedf7c193bc2c599000bb8004375dff511095cc5a197a54140a24efef3a416cbcdf9626bc03e24f779434178a73a0b4bad62ed000000525615deb798bb3e4dfa0139dfa1b3d433cc23b72f2260fac5e5542a773aa44fbcfedf7c193bc2c599004375dff511095cc5a197a54140a24efef3a416cd09f75e2bf2a4d11f3ab23f1389fcc1621c0cc2010200
+test_sequential_swap_unix:0101e21dd0d300000000000000000000000000000000000000000000006c6b935b8bbd4000000000000000000000000000006b175474e89094c44da98b954eedeac495271d0f000000000000000000000000dac17f958d2ee523a2206206994597c13d831ec700000000000000000000000000000000000000000000000000000000769cfd8000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000cd09f75e2bf2a4d11f3ab23f1389fcc1621c0cc20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000012000000000000000000000000000000000000000000000000000000000000000bf00692e234dae75c793f67a35089c9d99245e1c58470b6b175474e89094c44da98b954eedeac495271d0fa0b86991c6218b36c1d19d4a2e9eb0ce3606eb480000643041cbd36888becc7bbcbc0045e3b1f144466f5f5777d92f208679db4b9778590fa3cab3ac9e2168010000525615deb798bb3e4dfa0139dfa1b3d433cc23b72fa0b86991c6218b36c1d19d4a2e9eb0ce3606eb483041cbd36888becc7bbcbc0045e3b1f144466f5fcd09f75e2bf2a4d11f3ab23f1389fcc1621c0cc2010200

tests/common/mod.rs

@@ -43,6 +43,10 @@ pub fn pepe() -> Bytes {
     Bytes::from_str("0x6982508145454Ce325dDbE47a25d4ec3d2311933").unwrap()
 }
 
+pub fn usdt() -> Bytes {
+    Bytes::from_str("0xdAC17F958D2ee523a2206206994597C13D831ec7").unwrap()
+}
+
 pub fn get_signer() -> PrivateKeySigner {
     // Set up a mock private key for signing (Alice's pk in our contract tests)
     let private_key =

tests/uniswap_x_integration_tests.rs

@@ -12,54 +12,54 @@ use tycho_execution::encoding::{
 };
 
 use crate::common::{
-    encoding::encode_tycho_router_call, eth, eth_chain, get_tycho_router_encoder, router_address,
-    usdc, wbtc, weth,
+    dai, encoding::encode_tycho_router_call, eth, eth_chain, get_tycho_router_encoder,
+    router_address, usdc, usdt,
 };
 
 mod common;
 
 #[test]
 fn test_sequential_swap_unix() {
-    // Performs a sequential swap from WETH to USDC though WBTC using USV3 and USV2
-    // pools
+    // Replicates real uniswap X order settled in tx:
+    // 0x005d7b150017ba1b59d2f99395ccae7bda9b739938ade4e509817e32760aaf9d
+    // Performs a sequential
+    // swap from DAI to USDT though USDC using USV3 and USV2 pools
     //
-    //   WETH ───(USV3)──> WBTC ───(USV2)──> USDC
+    //   DAI ───(USV3)──> USDC ───(USV2)──> USDT
     // Creates all the calldata needed for the uniswap X callbackData
 
     let filler = Bytes::from_str("0xcd09f75E2BF2A4d11F3AB23f1389FcC1621c0cc2").unwrap();
     let unix_reactor = Address::from_str("0x00000011F84B9aa48e5f8aA8B9897600006289Be").unwrap();
 
-    let weth = weth();
-    let wbtc = wbtc();
+    let dai = dai();
     let usdc = usdc();
+    let usdt = usdt();
 
-    let swap_weth_wbtc = Swap {
+    let swap_dai_usdc = Swap {
         component: ProtocolComponent {
-            id: "0xCBCdF9626bC03E24f779434178A73a0B4bad62eD".to_string(),
+            id: "0x5777d92f208679DB4b9778590Fa3CAB3aC9e2168".to_string(),
             protocol_system: "uniswap_v3".to_string(),
             static_attributes: {
                 let mut attrs = HashMap::new();
-                attrs.insert(
-                    "fee".to_string(),
-                    Bytes::from(BigInt::from(3000).to_signed_bytes_be()),
-                );
+                attrs
+                    .insert("fee".to_string(), Bytes::from(BigInt::from(100).to_signed_bytes_be()));
                 attrs
             },
             ..Default::default()
         },
-        token_in: weth.clone(),
-        token_out: wbtc.clone(),
+        token_in: dai.clone(),
+        token_out: usdc.clone(),
         split: 0f64,
         user_data: None,
     };
-    let swap_wbtc_usdc = Swap {
+    let swap_usdc_usdt = Swap {
         component: ProtocolComponent {
-            id: "0x004375Dff511095CC5A197A54140a24eFEF3A416".to_string(),
+            id: "0x3041CbD36888bECc7bbCBc0045E3B1f144466f5f".to_string(),
             protocol_system: "uniswap_v2".to_string(),
             ..Default::default()
         },
-        token_in: wbtc.clone(),
-        token_out: usdc.clone(),
+        token_in: usdc.clone(),
+        token_out: usdt.clone(),
         split: 0f64,
         user_data: None,
     };
@@ -67,13 +67,13 @@ fn test_sequential_swap_unix() {
 
     let solution = Solution {
         exact_out: false,
-        given_token: weth.clone(),
-        given_amount: BigUint::from_str("1_000000000000000000").unwrap(),
-        checked_token: usdc.clone(),
-        checked_amount: BigUint::from_str("26173932").unwrap(),
+        given_token: dai.clone(),
+        given_amount: BigUint::from_str("2_000_000000000000000000").unwrap(),
+        checked_token: usdt.clone(),
+        checked_amount: BigUint::from_str("1_990_000000").unwrap(),
         sender: filler.clone(),
         receiver: filler.clone(),
-        swaps: vec![swap_weth_wbtc, swap_wbtc_usdc],
+        swaps: vec![swap_dai_usdc, swap_usdc_usdt],
         ..Default::default()
     };
 
@@ -99,7 +99,7 @@ fn test_sequential_swap_unix() {
 
     let token_in_approval_needed = token_approvals_manager
         .approval_needed(
-            bytes_to_address(&weth).unwrap(),
+            bytes_to_address(&dai).unwrap(),
             filler_address,
             bytes_to_address(&router_address()).unwrap(),
         )