diff --git a/evm/src/angle/AngleAdapter.sol b/evm/src/angle/AngleAdapter.sol index 9aaa50d..0ac5c50 100644 --- a/evm/src/angle/AngleAdapter.sol +++ b/evm/src/angle/AngleAdapter.sol @@ -56,7 +56,8 @@ contract AngleAdapter is ISwapAdapter { address sellToken, address buyToken, OrderSide side, - uint256 specifiedAmount + uint256 specifiedAmount, + bytes32 ) external returns (Trade memory trade) { if (specifiedAmount == 0) { return trade; @@ -223,7 +224,7 @@ contract AngleAdapter is ISwapAdapter { interface IAgToken is IERC20 { /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - MINTER ROLE ONLY FUNCTIONS + MINTER ROLE ONLY FUNCTIONS //////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/ /// @notice Lets a whitelisted contract mint agTokens @@ -254,7 +255,7 @@ interface IAgToken is IERC20 { function burnSelf(uint256 amount, address burner) external; /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - TREASURY ONLY FUNCTIONS + TREASURY ONLY FUNCTIONS //////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/ /// @notice Adds a minter in the contract @@ -274,7 +275,7 @@ interface IAgToken is IERC20 { function setTreasury(address _treasury) external; /*////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - EXTERNAL FUNCTIONS + EXTERNAL FUNCTIONS //////////////////////////////////////////////////////////////////////////////////////////////////////////////////*/ /// @notice Checks whether an address has the right to mint agTokens diff --git a/evm/src/balancer-v2/BalancerV2SwapAdapter.sol b/evm/src/balancer-v2/BalancerV2SwapAdapter.sol index 253f724..d7328d6 100644 --- a/evm/src/balancer-v2/BalancerV2SwapAdapter.sol +++ b/evm/src/balancer-v2/BalancerV2SwapAdapter.sol @@ -118,10 +118,12 @@ contract BalancerV2SwapAdapter is ISwapAdapter { address sellToken, address buyToken, OrderSide side, - uint256 specifiedAmount + uint256 specifiedAmount, + bytes32 data ) external override returns (Trade memory trade) { uint256 sellAmount; IVault.SwapKind kind; + bool reduceFee = abi.decode(abi.encodePacked(data), (bool)); uint256 limit; // TODO set this slippage limit properly if (side == OrderSide.Sell) { kind = IVault.SwapKind.GIVEN_IN; diff --git a/evm/src/etherfi/EtherfiAdapter.sol b/evm/src/etherfi/EtherfiAdapter.sol index a032a2e..f30c9d6 100644 --- a/evm/src/etherfi/EtherfiAdapter.sol +++ b/evm/src/etherfi/EtherfiAdapter.sol @@ -99,7 +99,8 @@ contract EtherfiAdapter is ISwapAdapter { address sellToken, address buyToken, OrderSide side, - uint256 specifiedAmount + uint256 specifiedAmount, + bytes32 ) external override diff --git a/evm/src/integral/IntegralSwapAdapter.sol b/evm/src/integral/IntegralSwapAdapter.sol index 36a0f11..d74ff0d 100644 --- a/evm/src/integral/IntegralSwapAdapter.sol +++ b/evm/src/integral/IntegralSwapAdapter.sol @@ -59,7 +59,8 @@ contract IntegralSwapAdapter is ISwapAdapter { address sellToken, address buyToken, OrderSide side, - uint256 specifiedAmount + uint256 specifiedAmount, + bytes32 ) external override returns (Trade memory trade) { if (specifiedAmount == 0) { return trade; diff --git a/evm/src/interfaces/ISwapAdapter.sol b/evm/src/interfaces/ISwapAdapter.sol index ab3bacc..397ed53 100644 --- a/evm/src/interfaces/ISwapAdapter.sol +++ b/evm/src/interfaces/ISwapAdapter.sol @@ -54,6 +54,7 @@ interface ISwapAdapter is ISwapAdapterTypes { * @param buyToken The token being bought. * @param side The side of the trade (Sell or Buy). * @param specifiedAmount The amount to be traded. + * @param data Additional arbitrary data for the swap. * @return trade Trade struct representing the executed trade. */ function swap( @@ -61,7 +62,8 @@ interface ISwapAdapter is ISwapAdapterTypes { address sellToken, address buyToken, OrderSide side, - uint256 specifiedAmount + uint256 specifiedAmount, + bytes32 data ) external returns (Trade memory trade); /// @notice Retrieves the limits for each token. diff --git a/evm/src/template/TemplateSwapAdapter.sol b/evm/src/template/TemplateSwapAdapter.sol index b64d64c..cd130b4 100644 --- a/evm/src/template/TemplateSwapAdapter.sol +++ b/evm/src/template/TemplateSwapAdapter.sol @@ -22,7 +22,8 @@ contract TemplateSwapAdapter is ISwapAdapter { address sellToken, address buyToken, OrderSide side, - uint256 specifiedAmount + uint256 specifiedAmount, + bytes32 ) external returns (Trade memory trade) { revert NotImplemented("TemplateSwapAdapter.swap"); } diff --git a/evm/src/uniswap-v2/UniswapV2SwapAdapter.sol b/evm/src/uniswap-v2/UniswapV2SwapAdapter.sol index 4cf969b..a58d41d 100644 --- a/evm/src/uniswap-v2/UniswapV2SwapAdapter.sol +++ b/evm/src/uniswap-v2/UniswapV2SwapAdapter.sol @@ -66,7 +66,8 @@ contract UniswapV2SwapAdapter is ISwapAdapter { address sellToken, address buyToken, OrderSide side, - uint256 specifiedAmount + uint256 specifiedAmount, + bytes32 ) external override returns (Trade memory trade) { if (specifiedAmount == 0) { return trade; diff --git a/evm/test/AdapterTest.sol b/evm/test/AdapterTest.sol index 76950ea..cdb2c58 100644 --- a/evm/test/AdapterTest.sol +++ b/evm/test/AdapterTest.sol @@ -10,6 +10,7 @@ import "src/libraries/FractionMath.sol"; contract AdapterTest is Test, ISwapAdapterTypes { using FractionMath for Fraction; + bytes32 mockData; uint256 constant pricePrecision = 10e24; string[] public stringPctgs = ["0%", "0.1%", "50%", "100%"]; @@ -102,7 +103,7 @@ contract AdapterTest is Test, ISwapAdapterTypes { console2.log("TEST: Swapping %d of %s", amounts[j], tokenIn); trade = adapter.swap( - poolId, tokenIn, tokenOut, OrderSide.Sell, amounts[j] + poolId, tokenIn, tokenOut, OrderSide.Sell, amounts[j], mockData ); uint256 executedPrice = trade.calculatedAmount * pricePrecision / amounts[j]; @@ -191,7 +192,12 @@ contract AdapterTest is Test, ISwapAdapterTypes { ); } try adapter.swap( - poolId, tokenIn, tokenOut, OrderSide.Sell, aboveLimitArray[0] + poolId, + tokenIn, + tokenOut, + OrderSide.Sell, + aboveLimitArray[0], + mockData ) { revert("Pool shouldn't be able to swap above the sell limit"); } catch Error(string memory s) { @@ -217,7 +223,12 @@ contract AdapterTest is Test, ISwapAdapterTypes { adapter.price(poolId, tokenIn, tokenOut, aboveLimitArray); adapter.swap( - poolId, tokenIn, tokenOut, OrderSide.Sell, aboveLimitArray[0] + poolId, + tokenIn, + tokenOut, + OrderSide.Sell, + aboveLimitArray[0], + mockData ); } diff --git a/evm/test/AngleAdapter.t.sol b/evm/test/AngleAdapter.t.sol index b8e50c6..082a475 100644 --- a/evm/test/AngleAdapter.t.sol +++ b/evm/test/AngleAdapter.t.sol @@ -18,6 +18,7 @@ contract AngleAdapterTest is Test, ISwapAdapterTypes { ITransmuter(0x00253582b2a3FE112feEC532221d9708c64cEFAb); uint256 constant TEST_ITERATIONS = 100; + bytes32 mockData; function setUp() public { uint256 forkBlock = 18921770; @@ -55,7 +56,7 @@ contract AngleAdapterTest is Test, ISwapAdapterTypes { uint256 agEUR_balance = agEUR.balanceOf(address(this)); Trade memory trade = adapter.swap( - pair, address(EURC), address(agEUR), side, specifiedAmount + pair, address(EURC), address(agEUR), side, specifiedAmount, mockData ); if (trade.calculatedAmount > 0) { @@ -106,7 +107,7 @@ contract AngleAdapterTest is Test, ISwapAdapterTypes { uint256 agEUR_balance = agEUR.balanceOf(address(this)); Trade memory trade = adapter.swap( - pair, address(agEUR), address(EURC), side, specifiedAmount + pair, address(agEUR), address(EURC), side, specifiedAmount, mockData ); if (trade.calculatedAmount > 0) { @@ -159,7 +160,7 @@ contract AngleAdapterTest is Test, ISwapAdapterTypes { agEUR.approve(address(adapter), type(uint256).max); } trades[i] = adapter.swap( - pair, address(agEUR), address(EURC), side, amounts[i] + pair, address(agEUR), address(EURC), side, amounts[i], mockData ); vm.revertTo(beforeSwap); } @@ -178,19 +179,20 @@ contract AngleAdapterTest is Test, ISwapAdapterTypes { function testGetCapabilitiesAngle(bytes32 pair, address t0, address t1) public + view { Capability[] memory res = adapter.getCapabilities(pair, t0, t1); assertEq(res.length, 2); } - function testGetTokensAngle() public { + function testGetTokensAngle() public view { address[] memory tokens = adapter.getTokens(bytes32(0)); assertGe(tokens.length, 2); } - function testGetLimitsAngle() public { + function testGetLimitsAngle() public view { bytes32 pair = bytes32(0); uint256[] memory limits = adapter.getLimits(pair, address(agEUR), address(EURC)); diff --git a/evm/test/BalancerV2SwapAdapter.t.sol b/evm/test/BalancerV2SwapAdapter.t.sol index e75933a..c1053ec 100644 --- a/evm/test/BalancerV2SwapAdapter.t.sol +++ b/evm/test/BalancerV2SwapAdapter.t.sol @@ -12,6 +12,7 @@ import {FractionMath} from "src/libraries/FractionMath.sol"; contract BalancerV2SwapAdapterTest is AdapterTest { using FractionMath for Fraction; + bytes32 mockBoolData = bytes32(abi.encode(false)); IVault constant balancerV2Vault = IVault(payable(0xBA12222222228d8Ba445958a75a0704d566BF2C8)); BalancerV2SwapAdapter adapter; @@ -111,7 +112,12 @@ contract BalancerV2SwapAdapterTest is AdapterTest { uint256 weth_balance = IERC20(WETH).balanceOf(address(this)); Trade memory trade = adapter.swap( - B_80BAL_20WETH_POOL_ID, BAL, WETH, side, specifiedAmount + B_80BAL_20WETH_POOL_ID, + BAL, + WETH, + side, + specifiedAmount, + mockBoolData ); if (trade.calculatedAmount > 0) { @@ -149,7 +155,12 @@ contract BalancerV2SwapAdapterTest is AdapterTest { deal(BAL, address(this), amounts[i]); IERC20(BAL).approve(address(adapter), amounts[i]); trades[i] = adapter.swap( - B_80BAL_20WETH_POOL_ID, BAL, WETH, OrderSide.Sell, amounts[i] + B_80BAL_20WETH_POOL_ID, + BAL, + WETH, + OrderSide.Sell, + amounts[i], + mockBoolData ); vm.revertTo(beforeSwap); @@ -180,7 +191,12 @@ contract BalancerV2SwapAdapterTest is AdapterTest { deal(BAL, address(this), amountIn); IERC20(BAL).approve(address(adapter), amountIn); trades[i] = adapter.swap( - B_80BAL_20WETH_POOL_ID, BAL, WETH, OrderSide.Buy, amounts[i] + B_80BAL_20WETH_POOL_ID, + BAL, + WETH, + OrderSide.Buy, + amounts[i], + mockBoolData ); vm.revertTo(beforeSwap); @@ -204,6 +220,7 @@ contract BalancerV2SwapAdapterTest is AdapterTest { function testGetCapabilitiesFuzz(bytes32 pool, address t0, address t1) public + view { Capability[] memory res = adapter.getCapabilities(pool, t0, t1); @@ -211,9 +228,10 @@ contract BalancerV2SwapAdapterTest is AdapterTest { assertEq(uint256(res[0]), uint256(Capability.SellOrder)); assertEq(uint256(res[1]), uint256(Capability.BuyOrder)); assertEq(uint256(res[2]), uint256(Capability.PriceFunction)); + assertEq(uint256(res[3]), uint256(Capability.HardLimits)); } - function testGetTokens() public { + function testGetTokens() public view { address[] memory tokens = adapter.getTokens(B_80BAL_20WETH_POOL_ID); assertEq(tokens[0], BAL); diff --git a/evm/test/EtherfiAdapter.t.sol b/evm/test/EtherfiAdapter.t.sol index 366561a..9f60173 100644 --- a/evm/test/EtherfiAdapter.t.sol +++ b/evm/test/EtherfiAdapter.t.sol @@ -15,6 +15,7 @@ contract EtherfiAdapterTest is Test, ISwapAdapterTypes { IeEth eEth; uint256 constant TEST_ITERATIONS = 100; + bytes32 mockData; function setUp() public { uint256 forkBlock = 19218495; @@ -72,7 +73,8 @@ contract EtherfiAdapterTest is Test, ISwapAdapterTypes { address(address(0)), address(eEth_), OrderSide.Buy, - limits[0] + limits[0], + mockData ); eEth_.approve(address(adapter), type(uint256).max); @@ -87,7 +89,8 @@ contract EtherfiAdapterTest is Test, ISwapAdapterTypes { address(address(0)), address(eEth_), OrderSide.Buy, - specifiedAmount + specifiedAmount, + mockData ); eEth_.approve(address(adapter), specifiedAmount); @@ -97,7 +100,12 @@ contract EtherfiAdapterTest is Test, ISwapAdapterTypes { uint256 weEth_balance = weEth_.balanceOf(address(this)); Trade memory trade = adapter.swap( - pair, address(eEth_), address(weEth_), side, specifiedAmount + pair, + address(eEth_), + address(weEth_), + side, + specifiedAmount, + mockData ); if (trade.calculatedAmount > 0) { @@ -164,7 +172,8 @@ contract EtherfiAdapterTest is Test, ISwapAdapterTypes { address(address(0)), address(weEth_), OrderSide.Buy, - limits[0] + limits[0], + mockData ); weEth_.approve(address(adapter), type(uint256).max); @@ -179,7 +188,8 @@ contract EtherfiAdapterTest is Test, ISwapAdapterTypes { address(address(0)), address(weEth_), OrderSide.Buy, - specifiedAmount + specifiedAmount, + mockData ); weEth_.approve(address(adapter), specifiedAmount); @@ -194,7 +204,12 @@ contract EtherfiAdapterTest is Test, ISwapAdapterTypes { uint256 realAmountWeEth_ = weEth_balance - weEth_bal_before; Trade memory trade = adapter.swap( - pair, address(weEth_), address(eEth_), side, realAmountWeEth_ + pair, + address(weEth_), + address(eEth_), + side, + realAmountWeEth_, + mockData ); if (trade.calculatedAmount > 0) { @@ -254,8 +269,9 @@ contract EtherfiAdapterTest is Test, ISwapAdapterTypes { uint256 eth_balance = address(adapter).balance; uint256 eEth_balance = eEth_.balanceOf(address(this)); - Trade memory trade = - adapter.swap(pair, eth_, address(eEth_), side, specifiedAmount); + Trade memory trade = adapter.swap( + pair, eth_, address(eEth_), side, specifiedAmount, mockData + ); if (trade.calculatedAmount > 0) { if (side == OrderSide.Buy) { @@ -309,8 +325,9 @@ contract EtherfiAdapterTest is Test, ISwapAdapterTypes { uint256 eth_balance = address(adapter).balance; uint256 weEth_balance = weEth_.balanceOf(address(this)); - Trade memory trade = - adapter.swap(pair, eth_, address(weEth_), side, specifiedAmount); + Trade memory trade = adapter.swap( + pair, eth_, address(weEth_), side, specifiedAmount, mockData + ); if (trade.calculatedAmount > 0) { if (side == OrderSide.Buy) { @@ -373,7 +390,8 @@ contract EtherfiAdapterTest is Test, ISwapAdapterTypes { address(address(weEth)), address(address(eEth)), side, - amounts[i] + amounts[i], + mockData ); vm.revertTo(beforeSwap); } @@ -386,6 +404,7 @@ contract EtherfiAdapterTest is Test, ISwapAdapterTypes { function testGetCapabilitiesEtherfi(bytes32 pair, address t0, address t1) public + view { Capability[] memory res = adapter.getCapabilities(pair, address(t0), address(t1)); @@ -393,14 +412,14 @@ contract EtherfiAdapterTest is Test, ISwapAdapterTypes { assertEq(res.length, 3); } - function testGetTokensEtherfi() public { + function testGetTokensEtherfi() public view { bytes32 pair = bytes32(0); address[] memory tokens = adapter.getTokens(pair); assertEq(tokens.length, 3); } - function testGetLimitsEtherfi() public { + function testGetLimitsEtherfi() public view { bytes32 pair = bytes32(0); uint256[] memory limits = adapter.getLimits(pair, address(eEth), address(weEth)); diff --git a/evm/test/IntegralSwapAdapter.t.sol b/evm/test/IntegralSwapAdapter.t.sol index 8c3e129..18dde5c 100644 --- a/evm/test/IntegralSwapAdapter.t.sol +++ b/evm/test/IntegralSwapAdapter.t.sol @@ -16,6 +16,7 @@ contract IntegralSwapAdapterTest is Test, ISwapAdapterTypes { address constant USDC = 0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48; address constant USDC_WETH_PAIR = 0x2fe16Dd18bba26e457B7dD2080d5674312b026a2; address constant relayerAddress = 0xd17b3c9784510E33cD5B87b490E79253BcD81e2E; + bytes32 mockData; uint256 constant TEST_ITERATIONS = 100; @@ -30,7 +31,10 @@ contract IntegralSwapAdapterTest is Test, ISwapAdapterTypes { vm.label(address(USDC_WETH_PAIR), "USDC_WETH_PAIR"); } - function testPriceFuzzIntegral(uint256 amount0, uint256 amount1) public { + function testPriceFuzzIntegral(uint256 amount0, uint256 amount1) + public + view + { bytes32 pair = bytes32(bytes20(USDC_WETH_PAIR)); uint256[] memory limits = adapter.getLimits(pair, USDC, WETH); vm.assume(amount0 < limits[0]); @@ -83,7 +87,7 @@ contract IntegralSwapAdapterTest is Test, ISwapAdapterTypes { uint256 weth_balance_before = IERC20(WETH).balanceOf(address(this)); Trade memory trade = - adapter.swap(pair, USDC, WETH, side, specifiedAmount); + adapter.swap(pair, USDC, WETH, side, specifiedAmount, mockData); if (trade.calculatedAmount > 0) { if (side == OrderSide.Buy) { @@ -138,7 +142,8 @@ contract IntegralSwapAdapterTest is Test, ISwapAdapterTypes { deal(USDC, address(this), amounts[i]); IERC20(USDC).approve(address(adapter), amounts[i]); - trades[i] = adapter.swap(pair, USDC, WETH, side, amounts[i]); + trades[i] = + adapter.swap(pair, USDC, WETH, side, amounts[i], mockData); vm.revertTo(beforeSwap); } @@ -157,14 +162,14 @@ contract IntegralSwapAdapterTest is Test, ISwapAdapterTypes { assertEq(res.length, 4); } - function testGetTokensIntegral() public { + function testGetTokensIntegral() public view { bytes32 pair = bytes32(bytes20(USDC_WETH_PAIR)); address[] memory tokens = adapter.getTokens(pair); assertEq(tokens.length, 2); } - function testGetLimitsIntegral() public { + function testGetLimitsIntegral() public view { bytes32 pair = bytes32(bytes20(USDC_WETH_PAIR)); uint256[] memory limits = adapter.getLimits(pair, USDC, WETH); diff --git a/evm/test/UniswapV2SwapAdapter.t.sol b/evm/test/UniswapV2SwapAdapter.t.sol index 4ed3eb7..7be622d 100644 --- a/evm/test/UniswapV2SwapAdapter.t.sol +++ b/evm/test/UniswapV2SwapAdapter.t.sol @@ -29,7 +29,7 @@ contract UniswapV2PairFunctionTest is AdapterTest { vm.label(USDC_WETH_PAIR, "USDC_WETH_PAIR"); } - function testPriceFuzz(uint256 amount0, uint256 amount1) public { + function testPriceFuzz(uint256 amount0, uint256 amount1) public view { bytes32 pair = bytes32(bytes20(USDC_WETH_PAIR)); uint256[] memory limits = adapter.getLimits(pair, USDC, WETH); vm.assume(amount0 < limits[0]); @@ -47,7 +47,7 @@ contract UniswapV2PairFunctionTest is AdapterTest { } } - function testPriceDecreasing() public { + function testPriceDecreasing() public view { bytes32 pair = bytes32(bytes20(USDC_WETH_PAIR)); uint256[] memory amounts = new uint256[](TEST_ITERATIONS); @@ -88,7 +88,7 @@ contract UniswapV2PairFunctionTest is AdapterTest { uint256 weth_balance = IERC20(WETH).balanceOf(address(this)); Trade memory trade = - adapter.swap(pair, USDC, WETH, side, specifiedAmount); + adapter.swap(pair, USDC, WETH, side, specifiedAmount, mockData); if (trade.calculatedAmount > 0) { if (side == OrderSide.Buy) { @@ -133,7 +133,8 @@ contract UniswapV2PairFunctionTest is AdapterTest { deal(USDC, address(this), amounts[i]); IERC20(USDC).approve(address(adapter), amounts[i]); - trades[i] = adapter.swap(pair, USDC, WETH, side, amounts[i]); + trades[i] = + adapter.swap(pair, USDC, WETH, side, amounts[i], mockData); vm.revertTo(beforeSwap); } @@ -148,13 +149,16 @@ contract UniswapV2PairFunctionTest is AdapterTest { executeIncreasingSwaps(OrderSide.Buy); } - function testGetCapabilities(bytes32 pair, address t0, address t1) public { + function testGetCapabilities(bytes32 pair, address t0, address t1) + public + view + { Capability[] memory res = adapter.getCapabilities(pair, t0, t1); assertEq(res.length, 4); } - function testGetLimits() public { + function testGetLimits() public view { bytes32 pair = bytes32(bytes20(USDC_WETH_PAIR)); uint256[] memory limits = adapter.getLimits(pair, USDC, WETH);