Merge branch 'refs/heads/main' into feature/gas-optimization
# Conflicts: # foundry/test/TychoRouter.t.sol # src/encoding/evm/strategy_encoder/strategy_encoders.rs # src/encoding/evm/utils.rs Took 3 minutes Took 35 seconds
This commit is contained in:
23
CHANGELOG.md
23
CHANGELOG.md
@@ -1,3 +1,26 @@
|
|||||||
|
## [0.78.1](https://github.com/propeller-heads/tycho-execution/compare/0.78.0...0.78.1) (2025-04-09)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* Curve factory addresses are utf-8 encoded ([ce71894](https://github.com/propeller-heads/tycho-execution/commit/ce7189423f90881cdaf9f8682d39fc47bfd1ce39))
|
||||||
|
|
||||||
|
## [0.78.0](https://github.com/propeller-heads/tycho-execution/compare/0.77.0...0.78.0) (2025-04-08)
|
||||||
|
|
||||||
|
|
||||||
|
### Features
|
||||||
|
|
||||||
|
* Add protocol_specific_addresses.json file ([739fb46](https://github.com/propeller-heads/tycho-execution/commit/739fb46d205251e39188afe983d8ce5ff3cb5d60))
|
||||||
|
* **curve:** Add CurveEncoder ([e9bb8c5](https://github.com/propeller-heads/tycho-execution/commit/e9bb8c576a96f3e523dc4e5011d48028cbc4d599))
|
||||||
|
* **curve:** Add integration test ([1e47d0e](https://github.com/propeller-heads/tycho-execution/commit/1e47d0e25b7906d73981a26d0d8b882a5820b61a))
|
||||||
|
* Support Curve ETH ([913d677](https://github.com/propeller-heads/tycho-execution/commit/913d677ffbfba61afae066a5a3d3c1f98e2a3f0f))
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* Add empty dicts for unichain and base in config ([c0b50c0](https://github.com/propeller-heads/tycho-execution/commit/c0b50c06616cf18c55cdbedf0196cda748a1a138))
|
||||||
|
* Fix Ekubo test ([1838ccf](https://github.com/propeller-heads/tycho-execution/commit/1838ccf8a17d518e174ad926a979bc9d9c151cbd))
|
||||||
|
|
||||||
## [0.77.0](https://github.com/propeller-heads/tycho-execution/compare/0.76.0...0.77.0) (2025-04-07)
|
## [0.77.0](https://github.com/propeller-heads/tycho-execution/compare/0.76.0...0.77.0) (2025-04-07)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
2
Cargo.lock
generated
2
Cargo.lock
generated
@@ -4341,7 +4341,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tycho-execution"
|
name = "tycho-execution"
|
||||||
version = "0.77.0"
|
version = "0.78.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"alloy",
|
"alloy",
|
||||||
"alloy-primitives",
|
"alloy-primitives",
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "tycho-execution"
|
name = "tycho-execution"
|
||||||
version = "0.77.0"
|
version = "0.78.1"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
description = "Provides tools for encoding and executing swaps against Tycho router and protocol executors."
|
description = "Provides tools for encoding and executing swaps against Tycho router and protocol executors."
|
||||||
repository = "https://github.com/propeller-heads/tycho-execution"
|
repository = "https://github.com/propeller-heads/tycho-execution"
|
||||||
|
|||||||
@@ -7,7 +7,8 @@
|
|||||||
"pancakeswap_v3": "0x4929B619A8F0D9c06ed0FfD497636580D823F65d",
|
"pancakeswap_v3": "0x4929B619A8F0D9c06ed0FfD497636580D823F65d",
|
||||||
"uniswap_v4": "0x042C0ebBEAb9d9987c2f64Ee05f2B3aeB86eAf70",
|
"uniswap_v4": "0x042C0ebBEAb9d9987c2f64Ee05f2B3aeB86eAf70",
|
||||||
"vm:balancer_v2": "0x00BE8EfAE40219Ff76287b0F9b9e497942f5BC91",
|
"vm:balancer_v2": "0x00BE8EfAE40219Ff76287b0F9b9e497942f5BC91",
|
||||||
"ekubo_v2": "0x4f88f6630a33dB05BEa1FeF7Dc7ff7508D1c531D"
|
"ekubo_v2": "0x4f88f6630a33dB05BEa1FeF7Dc7ff7508D1c531D",
|
||||||
|
"vm:curve": "0x1d1499e622D69689cdf9004d05Ec547d650Ff211"
|
||||||
},
|
},
|
||||||
"tenderly_ethereum": {
|
"tenderly_ethereum": {
|
||||||
"uniswap_v2": "0x00C1b81e3C8f6347E69e2DDb90454798A6Be975E",
|
"uniswap_v2": "0x00C1b81e3C8f6347E69e2DDb90454798A6Be975E",
|
||||||
|
|||||||
13
config/protocol_specific_addresses.json
Normal file
13
config/protocol_specific_addresses.json
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
{
|
||||||
|
"ethereum": {
|
||||||
|
"vm:balancer_v2": {
|
||||||
|
"vault_address": "0xba12222222228d8ba445958a75a0704d566bf2c8"
|
||||||
|
},
|
||||||
|
"vm:curve": {
|
||||||
|
"native_token_address": "0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE",
|
||||||
|
"meta_registry_address": "0xF98B45FA17DE75FB1aD0e7aFD971b0ca00e379fC"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"base": {},
|
||||||
|
"unichain": {}
|
||||||
|
}
|
||||||
@@ -7,6 +7,7 @@
|
|||||||
"pancakeswap_v3": "0x5991A2dF15A8F6A256D3Ec51E99254Cd3fb576A9",
|
"pancakeswap_v3": "0x5991A2dF15A8F6A256D3Ec51E99254Cd3fb576A9",
|
||||||
"uniswap_v4": "0xF62849F9A0B5Bf2913b396098F7c7019b51A820a",
|
"uniswap_v4": "0xF62849F9A0B5Bf2913b396098F7c7019b51A820a",
|
||||||
"vm:balancer_v2": "0xc7183455a4C133Ae270771860664b6B7ec320bB1",
|
"vm:balancer_v2": "0xc7183455a4C133Ae270771860664b6B7ec320bB1",
|
||||||
"ekubo_v2": "0x2a07706473244BC757E10F2a9E86fB532828afe3"
|
"ekubo_v2": "0x3D7Ebc40AF7092E3F1C81F2e996cbA5Cae2090d7",
|
||||||
|
"vm:curve": "0x1d1499e622D69689cdf9004d05Ec547d650Ff211"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -54,8 +54,8 @@ fn main() {
|
|||||||
given_token: weth.clone(),
|
given_token: weth.clone(),
|
||||||
given_amount: BigUint::from_str("1_000000000000000000").expect("Failed to create amount"),
|
given_amount: BigUint::from_str("1_000000000000000000").expect("Failed to create amount"),
|
||||||
checked_token: usdc.clone(),
|
checked_token: usdc.clone(),
|
||||||
exact_out: false, // it's an exact in solution
|
exact_out: false, // it's an exact in solution
|
||||||
checked_amount: None, // the amount out will not be checked in execution
|
checked_amount: Some(BigUint::from(1u64)),
|
||||||
swaps: vec![simple_swap],
|
swaps: vec![simple_swap],
|
||||||
..Default::default()
|
..Default::default()
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ pragma solidity ^0.8.26;
|
|||||||
import "@interfaces/IExecutor.sol";
|
import "@interfaces/IExecutor.sol";
|
||||||
import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
|
import "@openzeppelin/contracts/token/ERC20/utils/SafeERC20.sol";
|
||||||
|
|
||||||
error CurveExecutor__InvalidAddresses();
|
error CurveExecutor__AddressZero();
|
||||||
|
|
||||||
interface CryptoPool {
|
interface CryptoPool {
|
||||||
// slither-disable-next-line naming-convention
|
// slither-disable-next-line naming-convention
|
||||||
@@ -39,7 +39,7 @@ contract CurveExecutor is IExecutor {
|
|||||||
|
|
||||||
constructor(address _nativeToken) {
|
constructor(address _nativeToken) {
|
||||||
if (_nativeToken == address(0)) {
|
if (_nativeToken == address(0)) {
|
||||||
revert CurveExecutor__InvalidAddresses();
|
revert CurveExecutor__AddressZero();
|
||||||
}
|
}
|
||||||
nativeToken = _nativeToken;
|
nativeToken = _nativeToken;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -30,7 +30,8 @@ contract Constants is Test, BaseConstants {
|
|||||||
address UNPAUSER = makeAddr("unpauser");
|
address UNPAUSER = makeAddr("unpauser");
|
||||||
|
|
||||||
// Assets
|
// Assets
|
||||||
address ETH_ADDR = address(0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE);
|
address ETH_ADDR_FOR_CURVE =
|
||||||
|
address(0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE);
|
||||||
address WETH_ADDR = address(0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2);
|
address WETH_ADDR = address(0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2);
|
||||||
address DAI_ADDR = address(0x6B175474E89094C44Da98b954EedeAC495271d0F);
|
address DAI_ADDR = address(0x6B175474E89094C44Da98b954EedeAC495271d0F);
|
||||||
address BAL_ADDR = address(0xba100000625a3754423978a60c9317c58a424e3D);
|
address BAL_ADDR = address(0xba100000625a3754423978a60c9317c58a424e3D);
|
||||||
|
|||||||
@@ -212,4 +212,33 @@ contract TychoRouterTest is TychoRouterTestSetup {
|
|||||||
vm.expectRevert(TychoRouter__EmptySwaps.selector);
|
vm.expectRevert(TychoRouter__EmptySwaps.selector);
|
||||||
tychoRouter.exposedSplitSwap(amountIn, 2, swaps);
|
tychoRouter.exposedSplitSwap(amountIn, 2, swaps);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function testCurveIntegration() public {
|
||||||
|
deal(UWU_ADDR, ALICE, 1 ether);
|
||||||
|
|
||||||
|
vm.startPrank(ALICE);
|
||||||
|
IERC20(UWU_ADDR).approve(tychoRouterAddr, type(uint256).max);
|
||||||
|
// Encoded solution generated using `test_split_encoding_strategy_curve`
|
||||||
|
(bool success,) = tychoRouterAddr.call(
|
||||||
|
hex"0a83cb080000000000000000000000000000000000000000000000000de0b6b3a764000000000000000000000000000055c08ca52497e2f1534b59e2917bf524d4765257000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc20000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000cd09f75e2bf2a4d11f3ab23f1389fcc1621c0cc20000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000005b005900010000001d1499e622d69689cdf9004d05ec547d650ff21155c08ca52497e2f1534b59e2917bf524d4765257c02aaa39b223fe8d0a0e5c4f27ead9083c756cc277146b0a1d08b6844376df6d9da99ba7f1b19e71020100010000000000"
|
||||||
|
);
|
||||||
|
|
||||||
|
assertEq(IERC20(WETH_ADDR).balanceOf(ALICE), 4691958787921);
|
||||||
|
|
||||||
|
vm.stopPrank();
|
||||||
|
}
|
||||||
|
|
||||||
|
function testCurveIntegrationStETH() public {
|
||||||
|
deal(ALICE, 1 ether);
|
||||||
|
|
||||||
|
vm.startPrank(ALICE);
|
||||||
|
// Encoded solution generated using `test_split_encoding_strategy_curve_st_eth`
|
||||||
|
(bool success,) = tychoRouterAddr.call{value: 1 ether}(
|
||||||
|
hex"0a83cb080000000000000000000000000000000000000000000000000de0b6b3a76400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ae7ab96520de3a18e5e111b5eaab095312d7fe840000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000cd09f75e2bf2a4d11f3ab23f1389fcc1621c0cc20000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000005b005900010000001d1499e622d69689cdf9004d05ec547d650ff211eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeae7ab96520de3a18e5e111b5eaab095312d7fe84dc24316b9ae028f1497c275eb9192a3ea0f67022010001000000000000"
|
||||||
|
);
|
||||||
|
|
||||||
|
assertEq(IERC20(STETH_ADDR).balanceOf(ALICE), 1000754689941529590);
|
||||||
|
|
||||||
|
vm.stopPrank();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
pragma solidity ^0.8.26;
|
pragma solidity ^0.8.26;
|
||||||
|
|
||||||
import "../src/executors/BalancerV2Executor.sol";
|
import "../src/executors/BalancerV2Executor.sol";
|
||||||
|
import "../src/executors/CurveExecutor.sol";
|
||||||
import "../src/executors/EkuboExecutor.sol";
|
import "../src/executors/EkuboExecutor.sol";
|
||||||
import "../src/executors/UniswapV2Executor.sol";
|
import "../src/executors/UniswapV2Executor.sol";
|
||||||
import "../src/executors/UniswapV3Executor.sol";
|
import "../src/executors/UniswapV3Executor.sol";
|
||||||
@@ -49,6 +50,7 @@ contract TychoRouterTestSetup is Constants {
|
|||||||
UniswapV4Executor public usv4Executor;
|
UniswapV4Executor public usv4Executor;
|
||||||
BalancerV2Executor public balancerv2Executor;
|
BalancerV2Executor public balancerv2Executor;
|
||||||
EkuboExecutor public ekuboExecutor;
|
EkuboExecutor public ekuboExecutor;
|
||||||
|
CurveExecutor public curveExecutor;
|
||||||
MockERC20[] tokens;
|
MockERC20[] tokens;
|
||||||
|
|
||||||
function setUp() public {
|
function setUp() public {
|
||||||
@@ -103,14 +105,16 @@ contract TychoRouterTestSetup is Constants {
|
|||||||
new UniswapV3Executor(factoryPancakeV3, initCodePancakeV3);
|
new UniswapV3Executor(factoryPancakeV3, initCodePancakeV3);
|
||||||
balancerv2Executor = new BalancerV2Executor();
|
balancerv2Executor = new BalancerV2Executor();
|
||||||
ekuboExecutor = new EkuboExecutor(ekuboCore);
|
ekuboExecutor = new EkuboExecutor(ekuboCore);
|
||||||
|
curveExecutor = new CurveExecutor(ETH_ADDR_FOR_CURVE);
|
||||||
|
|
||||||
address[] memory executors = new address[](6);
|
address[] memory executors = new address[](7);
|
||||||
executors[0] = address(usv2Executor);
|
executors[0] = address(usv2Executor);
|
||||||
executors[1] = address(usv3Executor);
|
executors[1] = address(usv3Executor);
|
||||||
executors[2] = address(pancakev3Executor);
|
executors[2] = address(pancakev3Executor);
|
||||||
executors[3] = address(usv4Executor);
|
executors[3] = address(usv4Executor);
|
||||||
executors[4] = address(balancerv2Executor);
|
executors[4] = address(balancerv2Executor);
|
||||||
executors[5] = address(ekuboExecutor);
|
executors[5] = address(ekuboExecutor);
|
||||||
|
executors[6] = address(curveExecutor);
|
||||||
return executors;
|
return executors;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -21,19 +21,6 @@ interface MetaRegistry {
|
|||||||
returns (int128, int128, bool);
|
returns (int128, int128, bool);
|
||||||
}
|
}
|
||||||
|
|
||||||
interface IAaveLendingPool {
|
|
||||||
function deposit(
|
|
||||||
address asset,
|
|
||||||
uint256 amount,
|
|
||||||
address onBehalfOf,
|
|
||||||
uint16 referralCode
|
|
||||||
) external;
|
|
||||||
|
|
||||||
function withdraw(address asset, uint256 amount, address to)
|
|
||||||
external
|
|
||||||
returns (uint256);
|
|
||||||
}
|
|
||||||
|
|
||||||
contract CurveExecutorExposed is CurveExecutor {
|
contract CurveExecutorExposed is CurveExecutor {
|
||||||
constructor(address _nativeToken) CurveExecutor(_nativeToken) {}
|
constructor(address _nativeToken) CurveExecutor(_nativeToken) {}
|
||||||
|
|
||||||
@@ -63,7 +50,7 @@ contract CurveExecutorTest is Test, Constants {
|
|||||||
function setUp() public {
|
function setUp() public {
|
||||||
uint256 forkBlock = 22031795;
|
uint256 forkBlock = 22031795;
|
||||||
vm.createSelectFork(vm.rpcUrl("mainnet"), forkBlock);
|
vm.createSelectFork(vm.rpcUrl("mainnet"), forkBlock);
|
||||||
curveExecutorExposed = new CurveExecutorExposed(ETH_ADDR);
|
curveExecutorExposed = new CurveExecutorExposed(ETH_ADDR_FOR_CURVE);
|
||||||
metaRegistry = MetaRegistry(CURVE_META_REGISTRY);
|
metaRegistry = MetaRegistry(CURVE_META_REGISTRY);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -118,7 +105,8 @@ contract CurveExecutorTest is Test, Constants {
|
|||||||
uint256 amountIn = 1 ether;
|
uint256 amountIn = 1 ether;
|
||||||
deal(address(curveExecutorExposed), amountIn);
|
deal(address(curveExecutorExposed), amountIn);
|
||||||
|
|
||||||
bytes memory data = _getData(ETH_ADDR, STETH_ADDR, STETH_POOL, 1);
|
bytes memory data =
|
||||||
|
_getData(ETH_ADDR_FOR_CURVE, STETH_ADDR, STETH_POOL, 1);
|
||||||
|
|
||||||
uint256 amountOut = curveExecutorExposed.swap(amountIn, data);
|
uint256 amountOut = curveExecutorExposed.swap(amountIn, data);
|
||||||
|
|
||||||
@@ -216,7 +204,8 @@ contract CurveExecutorTest is Test, Constants {
|
|||||||
uint256 initialBalance = address(curveExecutorExposed).balance; // this address already has some ETH assigned to it
|
uint256 initialBalance = address(curveExecutorExposed).balance; // this address already has some ETH assigned to it
|
||||||
deal(XYO_ADDR, address(curveExecutorExposed), amountIn);
|
deal(XYO_ADDR, address(curveExecutorExposed), amountIn);
|
||||||
|
|
||||||
bytes memory data = _getData(XYO_ADDR, ETH_ADDR, ETH_XYO_POOL, 2);
|
bytes memory data =
|
||||||
|
_getData(XYO_ADDR, ETH_ADDR_FOR_CURVE, ETH_XYO_POOL, 2);
|
||||||
|
|
||||||
uint256 amountOut = curveExecutorExposed.swap(amountIn, data);
|
uint256 amountOut = curveExecutorExposed.swap(amountIn, data);
|
||||||
|
|
||||||
|
|||||||
@@ -19,10 +19,7 @@ use tycho_common::Bytes;
|
|||||||
|
|
||||||
use crate::encoding::{
|
use crate::encoding::{
|
||||||
errors::EncodingError,
|
errors::EncodingError,
|
||||||
evm::{
|
evm::utils::{biguint_to_u256, bytes_to_address, encode_input, get_client, get_runtime},
|
||||||
approvals::protocol_approvals_manager::get_client,
|
|
||||||
utils::{biguint_to_u256, bytes_to_address, encode_input, get_runtime},
|
|
||||||
},
|
|
||||||
models::Chain,
|
models::Chain,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -1,13 +1,12 @@
|
|||||||
use std::{env, sync::Arc};
|
use std::sync::Arc;
|
||||||
|
|
||||||
use alloy::{
|
use alloy::{
|
||||||
providers::{Provider, ProviderBuilder, RootProvider},
|
providers::{Provider, RootProvider},
|
||||||
rpc::types::{TransactionInput, TransactionRequest},
|
rpc::types::{TransactionInput, TransactionRequest},
|
||||||
transports::BoxTransport,
|
transports::BoxTransport,
|
||||||
};
|
};
|
||||||
use alloy_primitives::{Address, Bytes, TxKind, U256};
|
use alloy_primitives::{Address, Bytes, TxKind, U256};
|
||||||
use alloy_sol_types::SolValue;
|
use alloy_sol_types::SolValue;
|
||||||
use dotenv::dotenv;
|
|
||||||
use tokio::{
|
use tokio::{
|
||||||
runtime::{Handle, Runtime},
|
runtime::{Handle, Runtime},
|
||||||
task::block_in_place,
|
task::block_in_place,
|
||||||
@@ -15,7 +14,7 @@ use tokio::{
|
|||||||
|
|
||||||
use crate::encoding::{
|
use crate::encoding::{
|
||||||
errors::EncodingError,
|
errors::EncodingError,
|
||||||
evm::utils::{encode_input, get_runtime},
|
evm::utils::{encode_input, get_client, get_runtime},
|
||||||
};
|
};
|
||||||
|
|
||||||
/// A manager for checking if an approval is needed for interacting with a certain spender.
|
/// A manager for checking if an approval is needed for interacting with a certain spender.
|
||||||
@@ -72,18 +71,6 @@ impl ProtocolApprovalsManager {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Gets the client used for interacting with the EVM-compatible network.
|
|
||||||
pub async fn get_client() -> Result<Arc<RootProvider<BoxTransport>>, EncodingError> {
|
|
||||||
dotenv().ok();
|
|
||||||
let eth_rpc_url = env::var("RPC_URL")
|
|
||||||
.map_err(|_| EncodingError::FatalError("Missing RPC_URL in environment".to_string()))?;
|
|
||||||
let client = ProviderBuilder::new()
|
|
||||||
.on_builtin(ð_rpc_url)
|
|
||||||
.await
|
|
||||||
.map_err(|_| EncodingError::FatalError("Failed to build provider".to_string()))?;
|
|
||||||
Ok(Arc::new(client))
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use std::str::FromStr;
|
use std::str::FromStr;
|
||||||
|
|||||||
@@ -2,6 +2,8 @@ use std::{collections::HashSet, sync::LazyLock};
|
|||||||
|
|
||||||
pub const DEFAULT_EXECUTORS_JSON: &str = include_str!("../../../config/executor_addresses.json");
|
pub const DEFAULT_EXECUTORS_JSON: &str = include_str!("../../../config/executor_addresses.json");
|
||||||
pub const DEFAULT_ROUTERS_JSON: &str = include_str!("../../../config/router_addresses.json");
|
pub const DEFAULT_ROUTERS_JSON: &str = include_str!("../../../config/router_addresses.json");
|
||||||
|
pub const PROTOCOL_SPECIFIC_CONFIG: &str =
|
||||||
|
include_str!("../../../config/protocol_specific_addresses.json");
|
||||||
|
|
||||||
/// These protocols support the optimization of grouping swaps.
|
/// These protocols support the optimization of grouping swaps.
|
||||||
///
|
///
|
||||||
|
|||||||
@@ -1390,7 +1390,7 @@ mod tests {
|
|||||||
eth_chain(),
|
eth_chain(),
|
||||||
swap_encoder_registry,
|
swap_encoder_registry,
|
||||||
None,
|
None,
|
||||||
Bytes::from_str("0x1d1499e622D69689cdf9004d05Ec547d650Ff211").unwrap(),
|
Bytes::from_str("0xA4AD4f68d0b91CFD19687c881e50f3A00242828c").unwrap(),
|
||||||
)
|
)
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
@@ -2158,4 +2158,128 @@ mod tests {
|
|||||||
assert_eq!(hex_calldata[1288..], expected_swaps);
|
assert_eq!(hex_calldata[1288..], expected_swaps);
|
||||||
println!("{}", hex_calldata);
|
println!("{}", hex_calldata);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_split_encoding_strategy_curve() {
|
||||||
|
// UWU ──(curve 2 crypto pool)──> WETH
|
||||||
|
|
||||||
|
let token_in = Bytes::from("0x55C08ca52497e2f1534B59E2917BF524D4765257"); // UWU
|
||||||
|
let token_out = Bytes::from("0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2"); // USDC
|
||||||
|
|
||||||
|
let static_attributes = HashMap::from([(
|
||||||
|
"factory".to_string(),
|
||||||
|
Bytes::from(
|
||||||
|
"0x98ee851a00abee0d95d08cf4ca2bdce32aeaaf7f"
|
||||||
|
.as_bytes()
|
||||||
|
.to_vec(),
|
||||||
|
),
|
||||||
|
)]);
|
||||||
|
|
||||||
|
let component = ProtocolComponent {
|
||||||
|
id: String::from("0x77146B0a1d08B6844376dF6d9da99bA7F1b19e71"),
|
||||||
|
protocol_system: String::from("vm:curve"),
|
||||||
|
static_attributes,
|
||||||
|
..Default::default()
|
||||||
|
};
|
||||||
|
|
||||||
|
let swap = Swap {
|
||||||
|
component,
|
||||||
|
token_in: token_in.clone(),
|
||||||
|
token_out: token_out.clone(),
|
||||||
|
split: 0f64,
|
||||||
|
};
|
||||||
|
|
||||||
|
let swap_encoder_registry = get_swap_encoder_registry();
|
||||||
|
let encoder = SplitSwapStrategyEncoder::new(
|
||||||
|
eth_chain(),
|
||||||
|
swap_encoder_registry,
|
||||||
|
None,
|
||||||
|
Some(Bytes::from_str("0x3Ede3eCa2a72B3aeCC820E955B36f38437D01395").unwrap()),
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
let solution = Solution {
|
||||||
|
exact_out: false,
|
||||||
|
given_token: token_in,
|
||||||
|
given_amount: BigUint::from_str("1_000000000000000000").unwrap(),
|
||||||
|
checked_token: token_out,
|
||||||
|
expected_amount: None,
|
||||||
|
checked_amount: Some(BigUint::from_str("1").unwrap()),
|
||||||
|
slippage: None,
|
||||||
|
// Alice
|
||||||
|
sender: Bytes::from_str("0xcd09f75E2BF2A4d11F3AB23f1389FcC1621c0cc2").unwrap(),
|
||||||
|
receiver: Bytes::from_str("0xcd09f75E2BF2A4d11F3AB23f1389FcC1621c0cc2").unwrap(),
|
||||||
|
swaps: vec![swap],
|
||||||
|
..Default::default()
|
||||||
|
};
|
||||||
|
|
||||||
|
let (calldata, _) = encoder
|
||||||
|
.encode_strategy(solution)
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
let hex_calldata = encode(&calldata);
|
||||||
|
println!("{}", hex_calldata);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_split_encoding_strategy_curve_st_eth() {
|
||||||
|
// ETH ──(curve stETH pool)──> STETH
|
||||||
|
|
||||||
|
let token_in = Bytes::from("0x0000000000000000000000000000000000000000"); // ETH
|
||||||
|
let token_out = Bytes::from("0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84"); // STETH
|
||||||
|
|
||||||
|
let static_attributes = HashMap::from([(
|
||||||
|
"factory".to_string(),
|
||||||
|
Bytes::from(
|
||||||
|
"0x0000000000000000000000000000000000000000"
|
||||||
|
.as_bytes()
|
||||||
|
.to_vec(),
|
||||||
|
),
|
||||||
|
)]);
|
||||||
|
|
||||||
|
let component = ProtocolComponent {
|
||||||
|
id: String::from("0xDC24316b9AE028F1497c275EB9192a3Ea0f67022"),
|
||||||
|
protocol_system: String::from("vm:curve"),
|
||||||
|
static_attributes,
|
||||||
|
..Default::default()
|
||||||
|
};
|
||||||
|
|
||||||
|
let swap = Swap {
|
||||||
|
component,
|
||||||
|
token_in: token_in.clone(),
|
||||||
|
token_out: token_out.clone(),
|
||||||
|
split: 0f64,
|
||||||
|
};
|
||||||
|
|
||||||
|
let swap_encoder_registry = get_swap_encoder_registry();
|
||||||
|
let encoder = SplitSwapStrategyEncoder::new(
|
||||||
|
eth_chain(),
|
||||||
|
swap_encoder_registry,
|
||||||
|
None,
|
||||||
|
Some(Bytes::from_str("0x3Ede3eCa2a72B3aeCC820E955B36f38437D01395").unwrap()),
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
let solution = Solution {
|
||||||
|
exact_out: false,
|
||||||
|
given_token: token_in,
|
||||||
|
given_amount: BigUint::from_str("1_000000000000000000").unwrap(),
|
||||||
|
checked_token: token_out,
|
||||||
|
expected_amount: None,
|
||||||
|
checked_amount: Some(BigUint::from_str("1").unwrap()),
|
||||||
|
slippage: None,
|
||||||
|
// Alice
|
||||||
|
sender: Bytes::from_str("0xcd09f75E2BF2A4d11F3AB23f1389FcC1621c0cc2").unwrap(),
|
||||||
|
receiver: Bytes::from_str("0xcd09f75E2BF2A4d11F3AB23f1389FcC1621c0cc2").unwrap(),
|
||||||
|
swaps: vec![swap],
|
||||||
|
..Default::default()
|
||||||
|
};
|
||||||
|
|
||||||
|
let (calldata, _) = encoder
|
||||||
|
.encode_strategy(solution)
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
|
let hex_calldata = encode(&calldata);
|
||||||
|
println!("{}", hex_calldata);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,12 @@
|
|||||||
|
use std::collections::HashMap;
|
||||||
|
|
||||||
use crate::encoding::{
|
use crate::encoding::{
|
||||||
errors::EncodingError,
|
errors::EncodingError,
|
||||||
evm::swap_encoder::swap_encoders::{
|
evm::swap_encoder::swap_encoders::{
|
||||||
BalancerV2SwapEncoder, EkuboSwapEncoder, UniswapV2SwapEncoder, UniswapV3SwapEncoder,
|
BalancerV2SwapEncoder, CurveSwapEncoder, EkuboSwapEncoder, UniswapV2SwapEncoder,
|
||||||
UniswapV4SwapEncoder,
|
UniswapV3SwapEncoder, UniswapV4SwapEncoder,
|
||||||
},
|
},
|
||||||
|
models::Chain,
|
||||||
swap_encoder::SwapEncoder,
|
swap_encoder::SwapEncoder,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -11,26 +14,68 @@ use crate::encoding::{
|
|||||||
pub struct SwapEncoderBuilder {
|
pub struct SwapEncoderBuilder {
|
||||||
protocol_system: String,
|
protocol_system: String,
|
||||||
executor_address: String,
|
executor_address: String,
|
||||||
|
chain: Chain,
|
||||||
|
config: Option<HashMap<String, String>>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl SwapEncoderBuilder {
|
impl SwapEncoderBuilder {
|
||||||
pub fn new(protocol_system: &str, executor_address: &str) -> Self {
|
pub fn new(
|
||||||
|
protocol_system: &str,
|
||||||
|
executor_address: &str,
|
||||||
|
chain: Chain,
|
||||||
|
config: Option<HashMap<String, String>>,
|
||||||
|
) -> Self {
|
||||||
SwapEncoderBuilder {
|
SwapEncoderBuilder {
|
||||||
protocol_system: protocol_system.to_string(),
|
protocol_system: protocol_system.to_string(),
|
||||||
executor_address: executor_address.to_string(),
|
executor_address: executor_address.to_string(),
|
||||||
|
chain,
|
||||||
|
config,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn build(self) -> Result<Box<dyn SwapEncoder>, EncodingError> {
|
pub fn build(self) -> Result<Box<dyn SwapEncoder>, EncodingError> {
|
||||||
match self.protocol_system.as_str() {
|
match self.protocol_system.as_str() {
|
||||||
"uniswap_v2" => Ok(Box::new(UniswapV2SwapEncoder::new(self.executor_address))),
|
"uniswap_v2" => Ok(Box::new(UniswapV2SwapEncoder::new(
|
||||||
"sushiswap_v2" => Ok(Box::new(UniswapV2SwapEncoder::new(self.executor_address))),
|
self.executor_address,
|
||||||
"pancakeswap_v2" => Ok(Box::new(UniswapV2SwapEncoder::new(self.executor_address))),
|
self.chain,
|
||||||
"vm:balancer_v2" => Ok(Box::new(BalancerV2SwapEncoder::new(self.executor_address))),
|
self.config,
|
||||||
"uniswap_v3" => Ok(Box::new(UniswapV3SwapEncoder::new(self.executor_address))),
|
)?)),
|
||||||
"pancakeswap_v3" => Ok(Box::new(UniswapV3SwapEncoder::new(self.executor_address))),
|
"sushiswap_v2" => Ok(Box::new(UniswapV2SwapEncoder::new(
|
||||||
"uniswap_v4" => Ok(Box::new(UniswapV4SwapEncoder::new(self.executor_address))),
|
self.executor_address,
|
||||||
"ekubo_v2" => Ok(Box::new(EkuboSwapEncoder::new(self.executor_address))),
|
self.chain,
|
||||||
|
self.config,
|
||||||
|
)?)),
|
||||||
|
"pancakeswap_v2" => Ok(Box::new(UniswapV2SwapEncoder::new(
|
||||||
|
self.executor_address,
|
||||||
|
self.chain,
|
||||||
|
self.config,
|
||||||
|
)?)),
|
||||||
|
"vm:balancer_v2" => Ok(Box::new(BalancerV2SwapEncoder::new(
|
||||||
|
self.executor_address,
|
||||||
|
self.chain,
|
||||||
|
self.config,
|
||||||
|
)?)),
|
||||||
|
"uniswap_v3" => Ok(Box::new(UniswapV3SwapEncoder::new(
|
||||||
|
self.executor_address,
|
||||||
|
self.chain,
|
||||||
|
self.config,
|
||||||
|
)?)),
|
||||||
|
"pancakeswap_v3" => Ok(Box::new(UniswapV3SwapEncoder::new(
|
||||||
|
self.executor_address,
|
||||||
|
self.chain,
|
||||||
|
self.config,
|
||||||
|
)?)),
|
||||||
|
"uniswap_v4" => Ok(Box::new(UniswapV4SwapEncoder::new(
|
||||||
|
self.executor_address,
|
||||||
|
self.chain,
|
||||||
|
self.config,
|
||||||
|
)?)),
|
||||||
|
"ekubo_v2" => {
|
||||||
|
Ok(Box::new(EkuboSwapEncoder::new(self.executor_address, self.chain, self.config)?))
|
||||||
|
}
|
||||||
|
"vm:curve" => {
|
||||||
|
Ok(Box::new(CurveSwapEncoder::new(self.executor_address, self.chain, self.config)?))
|
||||||
|
}
|
||||||
_ => Err(EncodingError::FatalError(format!(
|
_ => Err(EncodingError::FatalError(format!(
|
||||||
"Unknown protocol system: {}",
|
"Unknown protocol system: {}",
|
||||||
self.protocol_system
|
self.protocol_system
|
||||||
|
|||||||
@@ -2,7 +2,10 @@ use std::{collections::HashMap, fs};
|
|||||||
|
|
||||||
use crate::encoding::{
|
use crate::encoding::{
|
||||||
errors::EncodingError,
|
errors::EncodingError,
|
||||||
evm::{constants::DEFAULT_EXECUTORS_JSON, swap_encoder::builder::SwapEncoderBuilder},
|
evm::{
|
||||||
|
constants::{DEFAULT_EXECUTORS_JSON, PROTOCOL_SPECIFIC_CONFIG},
|
||||||
|
swap_encoder::builder::SwapEncoderBuilder,
|
||||||
|
},
|
||||||
models::Chain,
|
models::Chain,
|
||||||
swap_encoder::SwapEncoder,
|
swap_encoder::SwapEncoder,
|
||||||
};
|
};
|
||||||
@@ -29,12 +32,27 @@ impl SwapEncoderRegistry {
|
|||||||
DEFAULT_EXECUTORS_JSON.to_string()
|
DEFAULT_EXECUTORS_JSON.to_string()
|
||||||
};
|
};
|
||||||
let config: HashMap<String, HashMap<String, String>> = serde_json::from_str(&config_str)?;
|
let config: HashMap<String, HashMap<String, String>> = serde_json::from_str(&config_str)?;
|
||||||
let mut encoders = HashMap::new();
|
|
||||||
let executors = config
|
let executors = config
|
||||||
.get(&chain.name)
|
.get(&chain.name)
|
||||||
.ok_or(EncodingError::FatalError("No executors found for chain".to_string()))?;
|
.ok_or(EncodingError::FatalError("No executors found for chain".to_string()))?;
|
||||||
|
|
||||||
|
let protocol_specific_config: HashMap<String, HashMap<String, HashMap<String, String>>> =
|
||||||
|
serde_json::from_str(PROTOCOL_SPECIFIC_CONFIG)?;
|
||||||
|
let protocol_specific_config = protocol_specific_config
|
||||||
|
.get(&chain.name)
|
||||||
|
.ok_or(EncodingError::FatalError(
|
||||||
|
"No protocol specific config found for chain".to_string(),
|
||||||
|
))?;
|
||||||
|
let mut encoders = HashMap::new();
|
||||||
for (protocol, executor_address) in executors {
|
for (protocol, executor_address) in executors {
|
||||||
let builder = SwapEncoderBuilder::new(protocol, executor_address);
|
let builder = SwapEncoderBuilder::new(
|
||||||
|
protocol,
|
||||||
|
executor_address,
|
||||||
|
chain.clone(),
|
||||||
|
protocol_specific_config
|
||||||
|
.get(protocol)
|
||||||
|
.cloned(),
|
||||||
|
);
|
||||||
let encoder = builder.build()?;
|
let encoder = builder.build()?;
|
||||||
encoders.insert(protocol.to_string(), encoder);
|
encoders.insert(protocol.to_string(), encoder);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,16 +1,24 @@
|
|||||||
use std::str::FromStr;
|
use std::{collections::HashMap, str::FromStr};
|
||||||
|
|
||||||
use alloy_primitives::{Address, Bytes as AlloyBytes};
|
use alloy::{
|
||||||
|
providers::Provider,
|
||||||
|
rpc::types::{TransactionInput, TransactionRequest},
|
||||||
|
};
|
||||||
|
use alloy_primitives::{Address, Bytes as AlloyBytes, TxKind, U256, U8};
|
||||||
use alloy_sol_types::SolValue;
|
use alloy_sol_types::SolValue;
|
||||||
|
use tokio::task::block_in_place;
|
||||||
use tycho_common::Bytes;
|
use tycho_common::Bytes;
|
||||||
|
|
||||||
use crate::encoding::{
|
use crate::encoding::{
|
||||||
errors::EncodingError,
|
errors::EncodingError,
|
||||||
evm::{
|
evm::{
|
||||||
approvals::protocol_approvals_manager::ProtocolApprovalsManager,
|
approvals::protocol_approvals_manager::ProtocolApprovalsManager,
|
||||||
utils::{bytes_to_address, get_static_attribute, pad_to_fixed_size},
|
utils,
|
||||||
|
utils::{
|
||||||
|
bytes_to_address, encode_input, get_runtime, get_static_attribute, pad_to_fixed_size,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
models::{EncodingContext, Swap},
|
models::{Chain, EncodingContext, Swap},
|
||||||
swap_encoder::SwapEncoder,
|
swap_encoder::SwapEncoder,
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -31,8 +39,12 @@ impl UniswapV2SwapEncoder {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl SwapEncoder for UniswapV2SwapEncoder {
|
impl SwapEncoder for UniswapV2SwapEncoder {
|
||||||
fn new(executor_address: String) -> Self {
|
fn new(
|
||||||
Self { executor_address }
|
executor_address: String,
|
||||||
|
_chain: Chain,
|
||||||
|
_config: Option<HashMap<String, String>>,
|
||||||
|
) -> Result<Self, EncodingError> {
|
||||||
|
Ok(Self { executor_address })
|
||||||
}
|
}
|
||||||
|
|
||||||
fn encode_swap(
|
fn encode_swap(
|
||||||
@@ -85,8 +97,12 @@ impl UniswapV3SwapEncoder {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl SwapEncoder for UniswapV3SwapEncoder {
|
impl SwapEncoder for UniswapV3SwapEncoder {
|
||||||
fn new(executor_address: String) -> Self {
|
fn new(
|
||||||
Self { executor_address }
|
executor_address: String,
|
||||||
|
_chain: Chain,
|
||||||
|
_config: Option<HashMap<String, String>>,
|
||||||
|
) -> Result<Self, EncodingError> {
|
||||||
|
Ok(Self { executor_address })
|
||||||
}
|
}
|
||||||
|
|
||||||
fn encode_swap(
|
fn encode_swap(
|
||||||
@@ -143,8 +159,12 @@ impl UniswapV4SwapEncoder {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl SwapEncoder for UniswapV4SwapEncoder {
|
impl SwapEncoder for UniswapV4SwapEncoder {
|
||||||
fn new(executor_address: String) -> Self {
|
fn new(
|
||||||
Self { executor_address }
|
executor_address: String,
|
||||||
|
_chain: Chain,
|
||||||
|
_config: Option<HashMap<String, String>>,
|
||||||
|
) -> Result<Self, EncodingError> {
|
||||||
|
Ok(Self { executor_address })
|
||||||
}
|
}
|
||||||
|
|
||||||
fn encode_swap(
|
fn encode_swap(
|
||||||
@@ -216,12 +236,23 @@ pub struct BalancerV2SwapEncoder {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl SwapEncoder for BalancerV2SwapEncoder {
|
impl SwapEncoder for BalancerV2SwapEncoder {
|
||||||
fn new(executor_address: String) -> Self {
|
fn new(
|
||||||
Self {
|
executor_address: String,
|
||||||
executor_address,
|
_chain: Chain,
|
||||||
vault_address: "0xba12222222228d8ba445958a75a0704d566bf2c8".to_string(),
|
config: Option<HashMap<String, String>>,
|
||||||
}
|
) -> Result<Self, EncodingError> {
|
||||||
|
let config = config.ok_or(EncodingError::FatalError(
|
||||||
|
"Missing balancer specific addresses in config".to_string(),
|
||||||
|
))?;
|
||||||
|
let vault_address = config
|
||||||
|
.get("vault_address")
|
||||||
|
.ok_or(EncodingError::FatalError(
|
||||||
|
"Missing balancer vault address in config".to_string(),
|
||||||
|
))?
|
||||||
|
.to_string();
|
||||||
|
Ok(Self { executor_address, vault_address })
|
||||||
}
|
}
|
||||||
|
|
||||||
fn encode_swap(
|
fn encode_swap(
|
||||||
&self,
|
&self,
|
||||||
swap: Swap,
|
swap: Swap,
|
||||||
@@ -274,8 +305,12 @@ pub struct EkuboSwapEncoder {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl SwapEncoder for EkuboSwapEncoder {
|
impl SwapEncoder for EkuboSwapEncoder {
|
||||||
fn new(executor_address: String) -> Self {
|
fn new(
|
||||||
Self { executor_address }
|
executor_address: String,
|
||||||
|
_chain: Chain,
|
||||||
|
_config: Option<HashMap<String, String>>,
|
||||||
|
) -> Result<Self, EncodingError> {
|
||||||
|
Ok(Self { executor_address })
|
||||||
}
|
}
|
||||||
|
|
||||||
fn encode_swap(
|
fn encode_swap(
|
||||||
@@ -328,13 +363,213 @@ impl SwapEncoder for EkuboSwapEncoder {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Encodes a swap on a Curve pool through the given executor address.
|
||||||
|
///
|
||||||
|
/// # Fields
|
||||||
|
/// * `executor_address` - The address of the executor contract that will perform the swap.
|
||||||
|
/// * `meta_registry_address` - The address of the Curve meta registry contract. Used to get coin
|
||||||
|
/// indexes.
|
||||||
|
/// * `native_token_curve_address` - The address used as native token in curve pools.
|
||||||
|
/// * `native_token_address` - The address of the native token.
|
||||||
|
#[derive(Clone)]
|
||||||
|
pub struct CurveSwapEncoder {
|
||||||
|
executor_address: String,
|
||||||
|
meta_registry_address: String,
|
||||||
|
native_token_curve_address: String,
|
||||||
|
native_token_address: Bytes,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl CurveSwapEncoder {
|
||||||
|
fn get_pool_type(&self, pool_id: &str, factory_address: &str) -> Result<U8, EncodingError> {
|
||||||
|
match pool_id {
|
||||||
|
// TriPool
|
||||||
|
"0xbEbc44782C7dB0a1A60Cb6fe97d0b483032FF1C7" => Ok(U8::from(1)),
|
||||||
|
// STETHPool
|
||||||
|
"0xDC24316b9AE028F1497c275EB9192a3Ea0f67022" => Ok(U8::from(1)),
|
||||||
|
// TriCryptoPool
|
||||||
|
"0xD51a44d3FaE010294C616388b506AcdA1bfAAE46" => Ok(U8::from(3)),
|
||||||
|
// SUSDPool
|
||||||
|
"0xA5407eAE9Ba41422680e2e00537571bcC53efBfD" => Ok(U8::from(1)),
|
||||||
|
// FRAXUSDCPool
|
||||||
|
"0xDcEF968d416a41Cdac0ED8702fAC8128A64241A2" => Ok(U8::from(1)),
|
||||||
|
_ => match factory_address {
|
||||||
|
// CryptoSwapNG factory
|
||||||
|
"0x6A8cbed756804B16E05E741eDaBd5cB544AE21bf" => Ok(U8::from(1)),
|
||||||
|
// Metapool factory
|
||||||
|
"0xB9fC157394Af804a3578134A6585C0dc9cc990d4" => Ok(U8::from(1)),
|
||||||
|
// CryptoPool factory
|
||||||
|
"0xF18056Bbd320E96A48e3Fbf8bC061322531aac99" => Ok(U8::from(2)),
|
||||||
|
// Tricrypto factory
|
||||||
|
"0x0c0e5f2fF0ff18a3be9b835635039256dC4B4963" => Ok(U8::from(3)),
|
||||||
|
// Twocrypto factory
|
||||||
|
"0x98EE851a00abeE0d95D08cF4CA2BdCE32aeaAF7F" => Ok(U8::from(2)),
|
||||||
|
// StableSwap factory
|
||||||
|
"0x4F8846Ae9380B90d2E71D5e3D042dff3E7ebb40d" => Ok(U8::from(1)),
|
||||||
|
_ => Err(EncodingError::FatalError(format!(
|
||||||
|
"Unsupported curve factory address: {}",
|
||||||
|
factory_address
|
||||||
|
))),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn get_coin_indexes(
|
||||||
|
&self,
|
||||||
|
pool_id: Address,
|
||||||
|
token_in: Address,
|
||||||
|
token_out: Address,
|
||||||
|
) -> Result<(U8, U8), EncodingError> {
|
||||||
|
let (handle, _runtime) = get_runtime()?;
|
||||||
|
let client = block_in_place(|| handle.block_on(utils::get_client()))?;
|
||||||
|
let args = (pool_id, token_in, token_out);
|
||||||
|
let data = encode_input("get_coin_indices(address,address,address)", args.abi_encode());
|
||||||
|
let tx = TransactionRequest {
|
||||||
|
to: Some(TxKind::from(Address::from_str(&self.meta_registry_address).map_err(
|
||||||
|
|_| EncodingError::FatalError("Invalid Curve meta registry address".to_string()),
|
||||||
|
)?)),
|
||||||
|
input: TransactionInput {
|
||||||
|
input: Some(alloy_primitives::Bytes::from(data)),
|
||||||
|
data: None,
|
||||||
|
},
|
||||||
|
..Default::default()
|
||||||
|
};
|
||||||
|
let output = block_in_place(|| handle.block_on(async { client.call(&tx).await }));
|
||||||
|
type ResponseType = (U256, U256, bool);
|
||||||
|
|
||||||
|
match output {
|
||||||
|
Ok(response) => {
|
||||||
|
let (i_256, j_256, _): ResponseType = ResponseType::abi_decode(&response, true)
|
||||||
|
.map_err(|_| {
|
||||||
|
EncodingError::FatalError(
|
||||||
|
"Failed to decode response when getting coin indexes on a curve pool"
|
||||||
|
.to_string(),
|
||||||
|
)
|
||||||
|
})?;
|
||||||
|
let i = U8::from(i_256);
|
||||||
|
let j = U8::from(j_256);
|
||||||
|
Ok((i, j))
|
||||||
|
}
|
||||||
|
Err(err) => Err(EncodingError::RecoverableError(format!(
|
||||||
|
"Curve meta registry call failed with error: {:?}",
|
||||||
|
err
|
||||||
|
))),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl SwapEncoder for CurveSwapEncoder {
|
||||||
|
fn new(
|
||||||
|
executor_address: String,
|
||||||
|
chain: Chain,
|
||||||
|
config: Option<HashMap<String, String>>,
|
||||||
|
) -> Result<Self, EncodingError> {
|
||||||
|
let config = config.ok_or(EncodingError::FatalError(
|
||||||
|
"Missing curve specific addresses in config".to_string(),
|
||||||
|
))?;
|
||||||
|
let native_token_curve_address = config
|
||||||
|
.get("native_token_address")
|
||||||
|
.ok_or(EncodingError::FatalError(
|
||||||
|
"Missing native token curve address in config".to_string(),
|
||||||
|
))?
|
||||||
|
.to_string();
|
||||||
|
let meta_registry_address = config
|
||||||
|
.get("meta_registry_address")
|
||||||
|
.ok_or(EncodingError::FatalError(
|
||||||
|
"Missing meta registry address in config".to_string(),
|
||||||
|
))?
|
||||||
|
.to_string();
|
||||||
|
Ok(Self {
|
||||||
|
executor_address,
|
||||||
|
meta_registry_address,
|
||||||
|
native_token_address: chain.native_token()?,
|
||||||
|
native_token_curve_address,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
fn encode_swap(
|
||||||
|
&self,
|
||||||
|
swap: Swap,
|
||||||
|
encoding_context: EncodingContext,
|
||||||
|
) -> Result<Vec<u8>, EncodingError> {
|
||||||
|
let token_approvals_manager = ProtocolApprovalsManager::new()?;
|
||||||
|
let native_token_curve_address = Address::from_str(&self.native_token_curve_address)
|
||||||
|
.map_err(|_| {
|
||||||
|
EncodingError::FatalError("Invalid Curve native token curve address".to_string())
|
||||||
|
})?;
|
||||||
|
let token_in = if swap.token_in == self.native_token_address {
|
||||||
|
native_token_curve_address
|
||||||
|
} else {
|
||||||
|
bytes_to_address(&swap.token_in)?
|
||||||
|
};
|
||||||
|
let token_out = if swap.token_out == self.native_token_address {
|
||||||
|
native_token_curve_address
|
||||||
|
} else {
|
||||||
|
bytes_to_address(&swap.token_out)?
|
||||||
|
};
|
||||||
|
let approval_needed: bool;
|
||||||
|
|
||||||
|
let component_address = Address::from_str(&swap.component.id)
|
||||||
|
.map_err(|_| EncodingError::FatalError("Invalid curve pool address".to_string()))?;
|
||||||
|
if let Some(router_address) = encoding_context.router_address {
|
||||||
|
if token_in != native_token_curve_address {
|
||||||
|
let tycho_router_address = bytes_to_address(&router_address)?;
|
||||||
|
approval_needed = token_approvals_manager.approval_needed(
|
||||||
|
token_in,
|
||||||
|
tycho_router_address,
|
||||||
|
component_address,
|
||||||
|
)?;
|
||||||
|
} else {
|
||||||
|
approval_needed = false;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
approval_needed = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
let factory_bytes = get_static_attribute(&swap, "factory")?.to_vec();
|
||||||
|
// the conversion to Address is necessary to checksum the address
|
||||||
|
let factory_address =
|
||||||
|
Address::from_str(std::str::from_utf8(&factory_bytes).map_err(|_| {
|
||||||
|
EncodingError::FatalError(
|
||||||
|
"Failed to convert curve factory address to string".to_string(),
|
||||||
|
)
|
||||||
|
})?)
|
||||||
|
.map_err(|_| EncodingError::FatalError("Invalid curve factory address".to_string()))?;
|
||||||
|
|
||||||
|
let pool_type = self.get_pool_type(&swap.component.id, &factory_address.to_string())?;
|
||||||
|
|
||||||
|
let (i, j) = self.get_coin_indexes(component_address, token_in, token_out)?;
|
||||||
|
|
||||||
|
let args = (
|
||||||
|
token_in,
|
||||||
|
token_out,
|
||||||
|
component_address,
|
||||||
|
pool_type.to_be_bytes::<1>(),
|
||||||
|
i.to_be_bytes::<1>(),
|
||||||
|
j.to_be_bytes::<1>(),
|
||||||
|
approval_needed,
|
||||||
|
);
|
||||||
|
|
||||||
|
Ok(args.abi_encode_packed())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn executor_address(&self) -> &str {
|
||||||
|
&self.executor_address
|
||||||
|
}
|
||||||
|
fn clone_box(&self) -> Box<dyn SwapEncoder> {
|
||||||
|
Box::new(self.clone())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
|
|
||||||
use alloy::hex::encode;
|
use alloy::hex::encode;
|
||||||
use num_bigint::BigInt;
|
use num_bigint::BigInt;
|
||||||
use tycho_common::{models::protocol::ProtocolComponent, Bytes};
|
use tycho_common::{
|
||||||
|
models::{protocol::ProtocolComponent, Chain as TychoCoreChain},
|
||||||
|
Bytes,
|
||||||
|
};
|
||||||
|
|
||||||
use super::*;
|
use super::*;
|
||||||
|
|
||||||
@@ -360,8 +595,12 @@ mod tests {
|
|||||||
group_token_in: token_in.clone(),
|
group_token_in: token_in.clone(),
|
||||||
group_token_out: token_out.clone(),
|
group_token_out: token_out.clone(),
|
||||||
};
|
};
|
||||||
let encoder =
|
let encoder = UniswapV2SwapEncoder::new(
|
||||||
UniswapV2SwapEncoder::new(String::from("0x543778987b293C7E8Cf0722BB2e935ba6f4068D4"));
|
String::from("0x543778987b293C7E8Cf0722BB2e935ba6f4068D4"),
|
||||||
|
TychoCoreChain::Ethereum.into(),
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
let encoded_swap = encoder
|
let encoded_swap = encoder
|
||||||
.encode_swap(swap, encoding_context)
|
.encode_swap(swap, encoding_context)
|
||||||
.unwrap();
|
.unwrap();
|
||||||
@@ -407,8 +646,12 @@ mod tests {
|
|||||||
group_token_in: token_in.clone(),
|
group_token_in: token_in.clone(),
|
||||||
group_token_out: token_out.clone(),
|
group_token_out: token_out.clone(),
|
||||||
};
|
};
|
||||||
let encoder =
|
let encoder = UniswapV3SwapEncoder::new(
|
||||||
UniswapV3SwapEncoder::new(String::from("0x543778987b293C7E8Cf0722BB2e935ba6f4068D4"));
|
String::from("0x543778987b293C7E8Cf0722BB2e935ba6f4068D4"),
|
||||||
|
TychoCoreChain::Ethereum.into(),
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
let encoded_swap = encoder
|
let encoded_swap = encoder
|
||||||
.encode_swap(swap, encoding_context)
|
.encode_swap(swap, encoding_context)
|
||||||
.unwrap();
|
.unwrap();
|
||||||
@@ -455,8 +698,15 @@ mod tests {
|
|||||||
group_token_in: token_in.clone(),
|
group_token_in: token_in.clone(),
|
||||||
group_token_out: token_out.clone(),
|
group_token_out: token_out.clone(),
|
||||||
};
|
};
|
||||||
let encoder =
|
let encoder = BalancerV2SwapEncoder::new(
|
||||||
BalancerV2SwapEncoder::new(String::from("0x543778987b293C7E8Cf0722BB2e935ba6f4068D4"));
|
String::from("0x543778987b293C7E8Cf0722BB2e935ba6f4068D4"),
|
||||||
|
TychoCoreChain::Ethereum.into(),
|
||||||
|
Some(HashMap::from([(
|
||||||
|
"vault_address".to_string(),
|
||||||
|
"0xba12222222228d8ba445958a75a0704d566bf2c8".to_string(),
|
||||||
|
)])),
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
let encoded_swap = encoder
|
let encoded_swap = encoder
|
||||||
.encode_swap(swap, encoding_context)
|
.encode_swap(swap, encoding_context)
|
||||||
.unwrap();
|
.unwrap();
|
||||||
@@ -514,8 +764,12 @@ mod tests {
|
|||||||
group_token_in: token_in.clone(),
|
group_token_in: token_in.clone(),
|
||||||
group_token_out: token_out.clone(),
|
group_token_out: token_out.clone(),
|
||||||
};
|
};
|
||||||
let encoder =
|
let encoder = UniswapV4SwapEncoder::new(
|
||||||
UniswapV4SwapEncoder::new(String::from("0xF62849F9A0B5Bf2913b396098F7c7019b51A820a"));
|
String::from("0xF62849F9A0B5Bf2913b396098F7c7019b51A820a"),
|
||||||
|
TychoCoreChain::Ethereum.into(),
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
let encoded_swap = encoder
|
let encoded_swap = encoder
|
||||||
.encode_swap(swap, encoding_context)
|
.encode_swap(swap, encoding_context)
|
||||||
.unwrap();
|
.unwrap();
|
||||||
@@ -579,8 +833,12 @@ mod tests {
|
|||||||
group_token_out: token_out.clone(),
|
group_token_out: token_out.clone(),
|
||||||
};
|
};
|
||||||
|
|
||||||
let encoder =
|
let encoder = UniswapV4SwapEncoder::new(
|
||||||
UniswapV4SwapEncoder::new(String::from("0x543778987b293C7E8Cf0722BB2e935ba6f4068D4"));
|
String::from("0x543778987b293C7E8Cf0722BB2e935ba6f4068D4"),
|
||||||
|
TychoCoreChain::Ethereum.into(),
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
let encoded_swap = encoder
|
let encoded_swap = encoder
|
||||||
.encode_swap(swap, encoding_context)
|
.encode_swap(swap, encoding_context)
|
||||||
.unwrap();
|
.unwrap();
|
||||||
@@ -667,8 +925,12 @@ mod tests {
|
|||||||
split: 0f64,
|
split: 0f64,
|
||||||
};
|
};
|
||||||
|
|
||||||
let encoder =
|
let encoder = UniswapV4SwapEncoder::new(
|
||||||
UniswapV4SwapEncoder::new(String::from("0xF62849F9A0B5Bf2913b396098F7c7019b51A820a"));
|
String::from("0xF62849F9A0B5Bf2913b396098F7c7019b51A820a"),
|
||||||
|
TychoCoreChain::Ethereum.into(),
|
||||||
|
None,
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
let initial_encoded_swap = encoder
|
let initial_encoded_swap = encoder
|
||||||
.encode_swap(initial_swap, context.clone())
|
.encode_swap(initial_swap, context.clone())
|
||||||
.unwrap();
|
.unwrap();
|
||||||
@@ -743,7 +1005,9 @@ mod tests {
|
|||||||
router_address: Some(Bytes::default()),
|
router_address: Some(Bytes::default()),
|
||||||
};
|
};
|
||||||
|
|
||||||
let encoder = EkuboSwapEncoder::new(String::default());
|
let encoder =
|
||||||
|
EkuboSwapEncoder::new(String::default(), TychoCoreChain::Ethereum.into(), None)
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
let encoded_swap = encoder
|
let encoded_swap = encoder
|
||||||
.encode_swap(swap, encoding_context)
|
.encode_swap(swap, encoding_context)
|
||||||
@@ -771,7 +1035,9 @@ mod tests {
|
|||||||
let group_token_out = Bytes::from("0xdAC17F958D2ee523a2206206994597C13D831ec7"); // USDT
|
let group_token_out = Bytes::from("0xdAC17F958D2ee523a2206206994597C13D831ec7"); // USDT
|
||||||
let intermediary_token = Bytes::from("0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48"); // USDC
|
let intermediary_token = Bytes::from("0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48"); // USDC
|
||||||
|
|
||||||
let encoder = EkuboSwapEncoder::new(String::default());
|
let encoder =
|
||||||
|
EkuboSwapEncoder::new(String::default(), TychoCoreChain::Ethereum.into(), None)
|
||||||
|
.unwrap();
|
||||||
|
|
||||||
let encoding_context = EncodingContext {
|
let encoding_context = EncodingContext {
|
||||||
receiver: RECEIVER.into(),
|
receiver: RECEIVER.into(),
|
||||||
@@ -844,4 +1110,288 @@ mod tests {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mod curve {
|
||||||
|
use rstest::rstest;
|
||||||
|
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
fn curve_config() -> Option<HashMap<String, String>> {
|
||||||
|
Some(HashMap::from([
|
||||||
|
(
|
||||||
|
"native_token_address".to_string(),
|
||||||
|
"0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE".to_string(),
|
||||||
|
),
|
||||||
|
(
|
||||||
|
"meta_registry_address".to_string(),
|
||||||
|
"0xF98B45FA17DE75FB1aD0e7aFD971b0ca00e379fC".to_string(),
|
||||||
|
),
|
||||||
|
]))
|
||||||
|
}
|
||||||
|
|
||||||
|
#[rstest]
|
||||||
|
#[case(
|
||||||
|
"0x5500307Bcf134E5851FB4D7D8D1Dc556dCdB84B4",
|
||||||
|
"0xdA16Cf041E2780618c49Dbae5d734B89a6Bac9b3",
|
||||||
|
"0xdAC17F958D2ee523a2206206994597C13D831ec7",
|
||||||
|
1,
|
||||||
|
0
|
||||||
|
)]
|
||||||
|
#[case(
|
||||||
|
"0xef484de8C07B6e2d732A92B5F78e81B38f99f95E",
|
||||||
|
"0x865377367054516e17014CcdED1e7d814EDC9ce4",
|
||||||
|
"0xA5588F7cdf560811710A2D82D3C9c99769DB1Dcb",
|
||||||
|
0,
|
||||||
|
1
|
||||||
|
)]
|
||||||
|
#[case(
|
||||||
|
"0xA5407eAE9Ba41422680e2e00537571bcC53efBfD",
|
||||||
|
"0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
|
||||||
|
"0x57Ab1ec28D129707052df4dF418D58a2D46d5f51",
|
||||||
|
1,
|
||||||
|
3
|
||||||
|
)]
|
||||||
|
#[case(
|
||||||
|
"0xD51a44d3FaE010294C616388b506AcdA1bfAAE46",
|
||||||
|
"0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
|
||||||
|
"0x2260FAC5E5542a773Aa44fBCfeDf7C193bc2C599",
|
||||||
|
2,
|
||||||
|
1
|
||||||
|
)]
|
||||||
|
#[case(
|
||||||
|
"0x7F86Bf177Dd4F3494b841a37e810A34dD56c829B",
|
||||||
|
"0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2",
|
||||||
|
"0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48",
|
||||||
|
2,
|
||||||
|
0
|
||||||
|
)]
|
||||||
|
fn test_curve_get_coin_indexes(
|
||||||
|
#[case] pool: &str,
|
||||||
|
#[case] token_in: &str,
|
||||||
|
#[case] token_out: &str,
|
||||||
|
#[case] expected_i: u64,
|
||||||
|
#[case] expected_j: u64,
|
||||||
|
) {
|
||||||
|
let encoder = CurveSwapEncoder::new(
|
||||||
|
String::default(),
|
||||||
|
TychoCoreChain::Ethereum.into(),
|
||||||
|
curve_config(),
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
let (i, j) = encoder
|
||||||
|
.get_coin_indexes(
|
||||||
|
Address::from_str(pool).unwrap(),
|
||||||
|
Address::from_str(token_in).unwrap(),
|
||||||
|
Address::from_str(token_out).unwrap(),
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
assert_eq!(i, U8::from(expected_i));
|
||||||
|
assert_eq!(j, U8::from(expected_j));
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_curve_encode_tripool() {
|
||||||
|
let mut static_attributes: HashMap<String, Bytes> = HashMap::new();
|
||||||
|
static_attributes.insert(
|
||||||
|
"factory".into(),
|
||||||
|
Bytes::from(
|
||||||
|
"0x0000000000000000000000000000000000000000"
|
||||||
|
.as_bytes()
|
||||||
|
.to_vec(),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
let curve_tri_pool = ProtocolComponent {
|
||||||
|
id: String::from("0xbEbc44782C7dB0a1A60Cb6fe97d0b483032FF1C7"),
|
||||||
|
protocol_system: String::from("vm:curve"),
|
||||||
|
static_attributes,
|
||||||
|
..Default::default()
|
||||||
|
};
|
||||||
|
let token_in = Bytes::from("0x6B175474E89094C44Da98b954EedeAC495271d0F");
|
||||||
|
let token_out = Bytes::from("0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48");
|
||||||
|
let swap = Swap {
|
||||||
|
component: curve_tri_pool,
|
||||||
|
token_in: token_in.clone(),
|
||||||
|
token_out: token_out.clone(),
|
||||||
|
split: 0f64,
|
||||||
|
};
|
||||||
|
let encoding_context = EncodingContext {
|
||||||
|
// The receiver was generated with `makeAddr("bob") using forge`
|
||||||
|
receiver: Bytes::from("0x1d96f2f6bef1202e4ce1ff6dad0c2cb002861d3e"),
|
||||||
|
exact_out: false,
|
||||||
|
router_address: None,
|
||||||
|
group_token_in: token_in.clone(),
|
||||||
|
group_token_out: token_out.clone(),
|
||||||
|
};
|
||||||
|
let encoder = CurveSwapEncoder::new(
|
||||||
|
String::from("0x5615dEB798BB3E4dFa0139dFa1b3D433Cc23b72f"),
|
||||||
|
TychoCoreChain::Ethereum.into(),
|
||||||
|
curve_config(),
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
let encoded_swap = encoder
|
||||||
|
.encode_swap(swap, encoding_context)
|
||||||
|
.unwrap();
|
||||||
|
let hex_swap = encode(&encoded_swap);
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
hex_swap,
|
||||||
|
String::from(concat!(
|
||||||
|
// token in
|
||||||
|
"6b175474e89094c44da98b954eedeac495271d0f",
|
||||||
|
// token out
|
||||||
|
"a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
|
||||||
|
// pool address
|
||||||
|
"bebc44782c7db0a1a60cb6fe97d0b483032ff1c7",
|
||||||
|
// pool type 1
|
||||||
|
"01",
|
||||||
|
// i index
|
||||||
|
"00",
|
||||||
|
// j index
|
||||||
|
"01",
|
||||||
|
// approval needed
|
||||||
|
"01",
|
||||||
|
))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn test_curve_encode_factory() {
|
||||||
|
let mut static_attributes: HashMap<String, Bytes> = HashMap::new();
|
||||||
|
static_attributes.insert(
|
||||||
|
"factory".into(),
|
||||||
|
Bytes::from(
|
||||||
|
"0x6A8cbed756804B16E05E741eDaBd5cB544AE21bf"
|
||||||
|
.as_bytes()
|
||||||
|
.to_vec(),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
let curve_pool = ProtocolComponent {
|
||||||
|
id: String::from("0x02950460E2b9529D0E00284A5fA2d7bDF3fA4d72"),
|
||||||
|
protocol_system: String::from("vm:curve"),
|
||||||
|
static_attributes,
|
||||||
|
..Default::default()
|
||||||
|
};
|
||||||
|
let token_in = Bytes::from("0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48");
|
||||||
|
let token_out = Bytes::from("0x4c9EDD5852cd905f086C759E8383e09bff1E68B3");
|
||||||
|
let swap = Swap {
|
||||||
|
component: curve_pool,
|
||||||
|
token_in: token_in.clone(),
|
||||||
|
token_out: token_out.clone(),
|
||||||
|
split: 0f64,
|
||||||
|
};
|
||||||
|
let encoding_context = EncodingContext {
|
||||||
|
// The receiver was generated with `makeAddr("bob") using forge`
|
||||||
|
receiver: Bytes::from("0x1d96f2f6bef1202e4ce1ff6dad0c2cb002861d3e"),
|
||||||
|
exact_out: false,
|
||||||
|
router_address: None,
|
||||||
|
group_token_in: token_in.clone(),
|
||||||
|
group_token_out: token_out.clone(),
|
||||||
|
};
|
||||||
|
let encoder = CurveSwapEncoder::new(
|
||||||
|
String::from("0x5615dEB798BB3E4dFa0139dFa1b3D433Cc23b72f"),
|
||||||
|
TychoCoreChain::Ethereum.into(),
|
||||||
|
curve_config(),
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
let encoded_swap = encoder
|
||||||
|
.encode_swap(swap, encoding_context)
|
||||||
|
.unwrap();
|
||||||
|
let hex_swap = encode(&encoded_swap);
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
hex_swap,
|
||||||
|
String::from(concat!(
|
||||||
|
// token in
|
||||||
|
"a0b86991c6218b36c1d19d4a2e9eb0ce3606eb48",
|
||||||
|
// token out
|
||||||
|
"4c9edd5852cd905f086c759e8383e09bff1e68b3",
|
||||||
|
// pool address
|
||||||
|
"02950460e2b9529d0e00284a5fa2d7bdf3fa4d72",
|
||||||
|
// pool type 1
|
||||||
|
"01",
|
||||||
|
// i index
|
||||||
|
"01",
|
||||||
|
// j index
|
||||||
|
"00",
|
||||||
|
// approval needed
|
||||||
|
"01",
|
||||||
|
))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
#[test]
|
||||||
|
fn test_curve_encode_st_eth() {
|
||||||
|
// This test is for the stETH pool, which is a special case in Curve
|
||||||
|
// where the token in is ETH but not as the zero address.
|
||||||
|
let mut static_attributes: HashMap<String, Bytes> = HashMap::new();
|
||||||
|
static_attributes.insert(
|
||||||
|
"factory".into(),
|
||||||
|
Bytes::from(
|
||||||
|
"0x0000000000000000000000000000000000000000"
|
||||||
|
.as_bytes()
|
||||||
|
.to_vec(),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
let curve_pool = ProtocolComponent {
|
||||||
|
id: String::from("0xDC24316b9AE028F1497c275EB9192a3Ea0f67022"),
|
||||||
|
protocol_system: String::from("vm:curve"),
|
||||||
|
static_attributes,
|
||||||
|
..Default::default()
|
||||||
|
};
|
||||||
|
let token_in = Bytes::from("0x0000000000000000000000000000000000000000");
|
||||||
|
let token_out = Bytes::from("0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84");
|
||||||
|
let swap = Swap {
|
||||||
|
component: curve_pool,
|
||||||
|
token_in: token_in.clone(),
|
||||||
|
token_out: token_out.clone(),
|
||||||
|
split: 0f64,
|
||||||
|
};
|
||||||
|
let encoding_context = EncodingContext {
|
||||||
|
// The receiver was generated with `makeAddr("bob") using forge`
|
||||||
|
receiver: Bytes::from("0x1d96f2f6bef1202e4ce1ff6dad0c2cb002861d3e"),
|
||||||
|
exact_out: false,
|
||||||
|
router_address: None,
|
||||||
|
group_token_in: token_in.clone(),
|
||||||
|
group_token_out: token_out.clone(),
|
||||||
|
};
|
||||||
|
let encoder = CurveSwapEncoder::new(
|
||||||
|
String::from("0x5615dEB798BB3E4dFa0139dFa1b3D433Cc23b72f"),
|
||||||
|
TychoCoreChain::Ethereum.into(),
|
||||||
|
Some(HashMap::from([
|
||||||
|
(
|
||||||
|
"native_token_address".to_string(),
|
||||||
|
"0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE".to_string(),
|
||||||
|
),
|
||||||
|
(
|
||||||
|
"meta_registry_address".to_string(),
|
||||||
|
"0xF98B45FA17DE75FB1aD0e7aFD971b0ca00e379fC".to_string(),
|
||||||
|
),
|
||||||
|
])),
|
||||||
|
)
|
||||||
|
.unwrap();
|
||||||
|
let encoded_swap = encoder
|
||||||
|
.encode_swap(swap, encoding_context)
|
||||||
|
.unwrap();
|
||||||
|
let hex_swap = encode(&encoded_swap);
|
||||||
|
|
||||||
|
assert_eq!(
|
||||||
|
hex_swap,
|
||||||
|
String::from(concat!(
|
||||||
|
// token in
|
||||||
|
"eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee",
|
||||||
|
// token out
|
||||||
|
"ae7ab96520de3a18e5e111b5eaab095312d7fe84",
|
||||||
|
// pool address
|
||||||
|
"dc24316b9ae028f1497c275eb9192a3ea0f67022",
|
||||||
|
// pool type 1
|
||||||
|
"01",
|
||||||
|
// i index
|
||||||
|
"00",
|
||||||
|
// j index
|
||||||
|
"01",
|
||||||
|
// approval needed
|
||||||
|
"01",
|
||||||
|
))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,9 @@
|
|||||||
use std::{cmp::max, sync::Arc};
|
use std::{cmp::max, env, sync::Arc};
|
||||||
|
|
||||||
|
use alloy::{
|
||||||
|
providers::{ProviderBuilder, RootProvider},
|
||||||
|
transports::BoxTransport,
|
||||||
|
};
|
||||||
use alloy_primitives::{aliases::U24, keccak256, Address, FixedBytes, Keccak256, U256, U8};
|
use alloy_primitives::{aliases::U24, keccak256, Address, FixedBytes, Keccak256, U256, U8};
|
||||||
use alloy_sol_types::SolValue;
|
use alloy_sol_types::SolValue;
|
||||||
use num_bigint::BigUint;
|
use num_bigint::BigUint;
|
||||||
@@ -150,6 +154,19 @@ pub fn ple_encode(action_data_array: Vec<Vec<u8>>) -> Vec<u8> {
|
|||||||
encoded_action_data
|
encoded_action_data
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/// Gets the client used for interacting with the EVM-compatible network.
|
||||||
|
pub async fn get_client() -> Result<Arc<RootProvider<BoxTransport>>, EncodingError> {
|
||||||
|
dotenv::dotenv().ok();
|
||||||
|
let eth_rpc_url = env::var("RPC_URL")
|
||||||
|
.map_err(|_| EncodingError::FatalError("Missing RPC_URL in environment".to_string()))?;
|
||||||
|
let client = ProviderBuilder::new()
|
||||||
|
.on_builtin(ð_rpc_url)
|
||||||
|
.await
|
||||||
|
.map_err(|_| EncodingError::FatalError("Failed to build provider".to_string()))?;
|
||||||
|
Ok(Arc::new(client))
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod tests {
|
mod tests {
|
||||||
use num_bigint::BigUint;
|
use num_bigint::BigUint;
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
|
use std::collections::HashMap;
|
||||||
|
|
||||||
use crate::encoding::{
|
use crate::encoding::{
|
||||||
errors::EncodingError,
|
errors::EncodingError,
|
||||||
models::{EncodingContext, Swap},
|
models::{Chain, EncodingContext, Swap},
|
||||||
};
|
};
|
||||||
|
|
||||||
/// A trait for protocol-specific swap encoding, where each implementation should handle the
|
/// A trait for protocol-specific swap encoding, where each implementation should handle the
|
||||||
@@ -10,7 +12,14 @@ pub trait SwapEncoder: Sync + Send {
|
|||||||
///
|
///
|
||||||
/// # Arguments
|
/// # Arguments
|
||||||
/// * `executor_address` - The address of the contract that will execute the swap
|
/// * `executor_address` - The address of the contract that will execute the swap
|
||||||
fn new(executor_address: String) -> Self
|
/// * `chain` - The chain on which the swap will be executed
|
||||||
|
/// * `config` - Additional configuration parameters for the encoder, like vault or registry
|
||||||
|
/// address
|
||||||
|
fn new(
|
||||||
|
executor_address: String,
|
||||||
|
chain: Chain,
|
||||||
|
config: Option<HashMap<String, String>>,
|
||||||
|
) -> Result<Self, EncodingError>
|
||||||
where
|
where
|
||||||
Self: Sized;
|
Self: Sized;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user