Fix UniswapV2 tests
This commit is contained in:
pistomat
@@ -1,66 +1,13 @@
|
||||
// SPDX-License-Identifier: AGPL-3.0-or-later
|
||||
pragma experimental ABIEncoderV2;
|
||||
pragma solidity ^0.8.13;
|
||||
|
||||
import {IERC20, ISwapAdapter} from "src/interfaces/ISwapAdapter.sol";
|
||||
|
||||
interface IVault {
|
||||
function getPoolTokens(bytes32 poolId)
|
||||
external
|
||||
view
|
||||
returns (
|
||||
IERC20[] memory tokens,
|
||||
uint256[] memory balances,
|
||||
uint256 lastChangeBlock
|
||||
);
|
||||
|
||||
function swap(
|
||||
SingleSwap memory singleSwap,
|
||||
FundManagement memory funds,
|
||||
uint256 limit,
|
||||
uint256 deadline
|
||||
) external payable returns (uint256);
|
||||
|
||||
function queryBatchSwap(
|
||||
SwapKind kind,
|
||||
BatchSwapStep[] memory swaps,
|
||||
IAsset[] memory assets,
|
||||
FundManagement memory funds
|
||||
) external returns (int256[] memory assetDeltas);
|
||||
|
||||
struct SingleSwap {
|
||||
bytes32 poolId;
|
||||
SwapKind kind;
|
||||
IAsset assetIn;
|
||||
IAsset assetOut;
|
||||
uint256 amount;
|
||||
bytes userData;
|
||||
}
|
||||
|
||||
struct BatchSwapStep {
|
||||
bytes32 poolId;
|
||||
uint256 assetInIndex;
|
||||
uint256 assetOutIndex;
|
||||
uint256 amount;
|
||||
bytes userData;
|
||||
}
|
||||
|
||||
struct FundManagement {
|
||||
address sender;
|
||||
bool fromInternalBalance;
|
||||
address payable recipient;
|
||||
bool toInternalBalance;
|
||||
}
|
||||
|
||||
enum SwapKind { GIVEN_IN, GIVEN_OUT }
|
||||
}
|
||||
|
||||
interface IAsset is IERC20 {
|
||||
}
|
||||
|
||||
contract BalancerV2SwapAdapter is ISwapAdapter {
|
||||
IVault immutable vault;
|
||||
|
||||
constructor(address vault_) {
|
||||
constructor(address payable vault_) {
|
||||
vault = IVault(vault_);
|
||||
}
|
||||
|
||||
@@ -73,31 +20,59 @@ contract BalancerV2SwapAdapter is ISwapAdapter {
|
||||
revert NotImplemented("BalancerV2SwapAdapter.price");
|
||||
}
|
||||
|
||||
function getPriceAt(uint256 amountIn, uint256 reserveIn, uint256 reserveOut)
|
||||
internal
|
||||
pure
|
||||
returns (Fraction memory)
|
||||
{
|
||||
revert NotImplemented("BalancerV2SwapAdapter.getPriceAt");
|
||||
}
|
||||
|
||||
function swap(
|
||||
bytes32 pairId,
|
||||
IERC20 sellToken,
|
||||
IERC20 buyToken,
|
||||
SwapSide side,
|
||||
OrderSide side,
|
||||
uint256 specifiedAmount
|
||||
) external override returns (Trade memory trade) {
|
||||
revert NotImplemented("BalancerV2SwapAdapter.swap");
|
||||
if (side == OrderSide.Sell) {
|
||||
sellToken.approve(address(vault), specifiedAmount);
|
||||
} else {
|
||||
buyToken.approve(address(vault), type(uint256).max);
|
||||
}
|
||||
uint256 gasBefore = gasleft();
|
||||
trade.receivedAmount = vault.swap(
|
||||
IVault.SingleSwap({
|
||||
poolId: pairId,
|
||||
kind: side == OrderSide.Sell
|
||||
? IVault.SwapKind.GIVEN_IN
|
||||
: IVault.SwapKind.GIVEN_OUT,
|
||||
assetIn: address(sellToken),
|
||||
assetOut: address(buyToken),
|
||||
amount: specifiedAmount,
|
||||
userData: ""
|
||||
}),
|
||||
IVault.FundManagement({
|
||||
sender: msg.sender,
|
||||
fromInternalBalance: false,
|
||||
recipient: payable(msg.sender),
|
||||
toInternalBalance: false
|
||||
}),
|
||||
0,
|
||||
block.number
|
||||
);
|
||||
trade.gasUsed = gasBefore - gasleft();
|
||||
trade.price = Fraction(0, 1); // Without the price function return 0.
|
||||
}
|
||||
|
||||
function getLimits(bytes32 pairId, SwapSide side)
|
||||
function getLimits(bytes32 pairId, IERC20 sellToken, IERC20 buyToken)
|
||||
external
|
||||
view
|
||||
override
|
||||
returns (uint256[] memory limits)
|
||||
{
|
||||
(, limits, ) = vault.getPoolTokens(pairId);
|
||||
(IERC20[] memory tokens, uint256[] memory balances,) =
|
||||
vault.getPoolTokens(pairId);
|
||||
for (uint256 i = 0; i < tokens.length; i++) {
|
||||
if (tokens[i] == sellToken) {
|
||||
limits[0] = balances[i];
|
||||
}
|
||||
if (tokens[i] == buyToken) {
|
||||
limits[1] = balances[i];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function getCapabilities(bytes32, IERC20, IERC20)
|
||||
@@ -106,10 +81,9 @@ contract BalancerV2SwapAdapter is ISwapAdapter {
|
||||
override
|
||||
returns (Capability[] memory capabilities)
|
||||
{
|
||||
capabilities = new Capability[](3);
|
||||
capabilities[0] = Capability.SellSide;
|
||||
capabilities[1] = Capability.BuySide;
|
||||
capabilities[2] = Capability.PriceFunction;
|
||||
capabilities = new Capability[](2);
|
||||
capabilities[0] = Capability.SellOrder;
|
||||
capabilities[1] = Capability.BuyOrder;
|
||||
}
|
||||
|
||||
function getTokens(bytes32 pairId)
|
||||
@@ -118,10 +92,10 @@ contract BalancerV2SwapAdapter is ISwapAdapter {
|
||||
override
|
||||
returns (IERC20[] memory tokens)
|
||||
{
|
||||
revert NotImplemented("BalancerV2SwapAdapter.getTokens");
|
||||
(tokens,,) = vault.getPoolTokens(pairId);
|
||||
}
|
||||
|
||||
/// @dev Balancer V2 does not support listing pools.
|
||||
/// @dev Balancer V2 does not support enumerating pools, they have to be indexed off-chain.
|
||||
function getPoolIds(uint256 offset, uint256 limit)
|
||||
external
|
||||
view
|
||||
@@ -131,3 +105,261 @@ contract BalancerV2SwapAdapter is ISwapAdapter {
|
||||
revert NotImplemented("BalancerV2SwapAdapter.getPoolIds");
|
||||
}
|
||||
}
|
||||
|
||||
interface IVault {
|
||||
struct BatchSwapStep {
|
||||
bytes32 poolId;
|
||||
uint256 assetInIndex;
|
||||
uint256 assetOutIndex;
|
||||
uint256 amount;
|
||||
bytes userData;
|
||||
}
|
||||
|
||||
struct FundManagement {
|
||||
address sender;
|
||||
bool fromInternalBalance;
|
||||
address recipient;
|
||||
bool toInternalBalance;
|
||||
}
|
||||
|
||||
struct ExitPoolRequest {
|
||||
address[] assets;
|
||||
uint256[] minAmountsOut;
|
||||
bytes userData;
|
||||
bool toInternalBalance;
|
||||
}
|
||||
|
||||
struct JoinPoolRequest {
|
||||
address[] assets;
|
||||
uint256[] maxAmountsIn;
|
||||
bytes userData;
|
||||
bool fromInternalBalance;
|
||||
}
|
||||
|
||||
struct PoolBalanceOp {
|
||||
SwapKind kind;
|
||||
bytes32 poolId;
|
||||
address token;
|
||||
uint256 amount;
|
||||
}
|
||||
|
||||
struct UserBalanceOp {
|
||||
SwapKind kind;
|
||||
address asset;
|
||||
uint256 amount;
|
||||
address sender;
|
||||
address recipient;
|
||||
}
|
||||
|
||||
struct SingleSwap {
|
||||
bytes32 poolId;
|
||||
SwapKind kind;
|
||||
address assetIn;
|
||||
address assetOut;
|
||||
uint256 amount;
|
||||
bytes userData;
|
||||
}
|
||||
|
||||
event AuthorizerChanged(address indexed newAuthorizer);
|
||||
event ExternalBalanceTransfer(
|
||||
address indexed token,
|
||||
address indexed sender,
|
||||
address recipient,
|
||||
uint256 amount
|
||||
);
|
||||
event FlashLoan(
|
||||
address indexed recipient,
|
||||
address indexed token,
|
||||
uint256 amount,
|
||||
uint256 feeAmount
|
||||
);
|
||||
event InternalBalanceChanged(
|
||||
address indexed user,
|
||||
address indexed token,
|
||||
int256 delta
|
||||
);
|
||||
event PausedStateChanged(bool paused);
|
||||
event PoolBalanceChanged(
|
||||
bytes32 indexed poolId,
|
||||
address indexed liquidityProvider,
|
||||
address[] tokens,
|
||||
int256[] deltas,
|
||||
uint256[] protocolFeeAmounts
|
||||
);
|
||||
event PoolBalanceManaged(
|
||||
bytes32 indexed poolId,
|
||||
address indexed assetManager,
|
||||
address indexed token,
|
||||
int256 cashDelta,
|
||||
int256 managedDelta
|
||||
);
|
||||
event PoolRegistered(
|
||||
bytes32 indexed poolId,
|
||||
address indexed poolAddress,
|
||||
uint8 specialization
|
||||
);
|
||||
event RelayerApprovalChanged(
|
||||
address indexed relayer,
|
||||
address indexed sender,
|
||||
bool approved
|
||||
);
|
||||
event Swap(
|
||||
bytes32 indexed poolId,
|
||||
address indexed tokenIn,
|
||||
address indexed tokenOut,
|
||||
uint256 amountIn,
|
||||
uint256 amountOut
|
||||
);
|
||||
event TokensDeregistered(bytes32 indexed poolId, address[] tokens);
|
||||
event TokensRegistered(
|
||||
bytes32 indexed poolId,
|
||||
address[] tokens,
|
||||
address[] assetManagers
|
||||
);
|
||||
|
||||
function WETH() external view returns (address);
|
||||
|
||||
function batchSwap(
|
||||
SwapKind kind,
|
||||
BatchSwapStep[] memory swaps,
|
||||
address[] memory assets,
|
||||
FundManagement memory funds,
|
||||
int256[] memory limits,
|
||||
uint256 deadline
|
||||
) external payable returns (int256[] memory assetDeltas);
|
||||
|
||||
function deregisterTokens(bytes32 poolId, address[] memory tokens) external;
|
||||
|
||||
function exitPool(
|
||||
bytes32 poolId,
|
||||
address sender,
|
||||
address recipient,
|
||||
ExitPoolRequest memory request
|
||||
) external;
|
||||
|
||||
function flashLoan(
|
||||
address recipient,
|
||||
address[] memory tokens,
|
||||
uint256[] memory amounts,
|
||||
bytes memory userData
|
||||
) external;
|
||||
|
||||
function getActionId(bytes4 selector) external view returns (bytes32);
|
||||
|
||||
function getAuthorizer() external view returns (address);
|
||||
|
||||
function getDomainSeparator() external view returns (bytes32);
|
||||
|
||||
function getInternalBalance(address user, address[] memory tokens)
|
||||
external
|
||||
view
|
||||
returns (uint256[] memory balances);
|
||||
|
||||
function getNextNonce(address user) external view returns (uint256);
|
||||
|
||||
function getPausedState()
|
||||
external
|
||||
view
|
||||
returns (
|
||||
bool paused,
|
||||
uint256 pauseWindowEndTime,
|
||||
uint256 bufferPeriodEndTime
|
||||
);
|
||||
|
||||
function getPool(bytes32 poolId) external view returns (address, uint8);
|
||||
|
||||
function getPoolTokenInfo(bytes32 poolId, address token)
|
||||
external
|
||||
view
|
||||
returns (
|
||||
uint256 cash,
|
||||
uint256 managed,
|
||||
uint256 lastChangeBlock,
|
||||
address assetManager
|
||||
);
|
||||
|
||||
function getProtocolFeesCollector() external view returns (address);
|
||||
|
||||
function hasApprovedRelayer(address user, address relayer)
|
||||
external
|
||||
view
|
||||
returns (bool);
|
||||
|
||||
function joinPool(
|
||||
bytes32 poolId,
|
||||
address sender,
|
||||
address recipient,
|
||||
JoinPoolRequest memory request
|
||||
) external payable;
|
||||
|
||||
function managePoolBalance(PoolBalanceOp[] memory ops) external;
|
||||
|
||||
function manageUserBalance(UserBalanceOp[] memory ops) external payable;
|
||||
|
||||
function queryBatchSwap(
|
||||
SwapKind kind,
|
||||
BatchSwapStep[] memory swaps,
|
||||
address[] memory assets,
|
||||
FundManagement memory funds
|
||||
) external returns (int256[] memory);
|
||||
|
||||
function registerPool(uint8 specialization) external returns (bytes32);
|
||||
|
||||
function registerTokens(
|
||||
bytes32 poolId,
|
||||
address[] memory tokens,
|
||||
address[] memory assetManagers
|
||||
) external;
|
||||
|
||||
function setAuthorizer(address newAuthorizer) external;
|
||||
|
||||
function setPaused(bool paused) external;
|
||||
|
||||
function setRelayerApproval(
|
||||
address sender,
|
||||
address relayer,
|
||||
bool approved
|
||||
) external;
|
||||
|
||||
/**
|
||||
* @dev Performs a swap with a single Pool.
|
||||
*
|
||||
* If the swap is 'given in' (the number of tokens to send to the Pool is
|
||||
* known), it returns the amount of tokens
|
||||
* taken from the Pool, which must be greater than or equal to `limit`.
|
||||
*
|
||||
* If the swap is 'given out' (the number of tokens to take from the Pool is
|
||||
* known), it returns the amount of tokens
|
||||
* sent to the Pool, which must be less than or equal to `limit`.
|
||||
*
|
||||
* Internal Balance usage and the recipient are determined by the `funds`
|
||||
* struct.
|
||||
*
|
||||
* Emits a `Swap` event.
|
||||
*/
|
||||
function swap(
|
||||
SingleSwap memory singleSwap,
|
||||
FundManagement memory funds,
|
||||
uint256 limit,
|
||||
uint256 deadline
|
||||
) external payable returns (uint256);
|
||||
|
||||
receive() external payable;
|
||||
|
||||
function getPoolTokens(bytes32 poolId)
|
||||
external
|
||||
view
|
||||
returns (
|
||||
IERC20[] memory tokens,
|
||||
uint256[] memory balances,
|
||||
uint256 lastChangeBlock
|
||||
);
|
||||
|
||||
enum SwapKind
|
||||
{
|
||||
/// The number of tokens to send to the Pool is known
|
||||
GIVEN_IN,
|
||||
/// The number of tokens to take from the Pool is known
|
||||
GIVEN_OUT
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user