UniswapV2AMMAdapter

contracts/interfaces/IAmmAdapter.sol

@@ -25,6 +25,7 @@ pragma solidity 0.6.10;
 interface IAmmAdapter {
 
     function getProvideLiquidityCalldata(
+        address _setToken,
         address _pool,
         address[] calldata _components,
         uint256[] calldata _maxTokensIn,
@@ -35,26 +36,29 @@ interface IAmmAdapter {
         returns (address _target, uint256 _value, bytes memory _calldata);
 
     function getProvideLiquiditySingleAssetCalldata(
+        address _setToken,
         address _pool,
         address _component,
         uint256 _maxTokenIn,
         uint256 _minLiquidity
     ) external view returns (address _target, uint256 _value, bytes memory _calldata);
 
     function getRemoveLiquidityCalldata(
+        address _setToken,
         address _pool,
         address[] calldata _components,
         uint256[] calldata _minTokensOut,
         uint256 _liquidity
     ) external view returns (address _target, uint256 _value, bytes memory _calldata);
 
     function getRemoveLiquiditySingleAssetCalldata(
+        address _setToken,
         address _pool,
         address _component,
         uint256 _minTokenOut,
         uint256 _liquidity
     ) external view returns (address _target, uint256 _value, bytes memory _calldata);
 
     function getSpenderAddress(address _pool) external view returns(address);
-    function isValidPool(address _pool) external view returns(bool);
+    function isValidPool(address _pool, address[] memory _components) external view returns(bool);
 }

contracts/mocks/integrations/AmmAdapterMock.sol

@@ -85,16 +85,17 @@ contract AmmAdapterMock is ERC20 {
     /* ============ Adapter Functions ============ */
 
     function getProvideLiquidityCalldata(
+        address /* _setToken */,
         address _pool,
-        address[] calldata /* _components */,
+        address[] calldata _components,
         uint256[] calldata _maxTokensIn,
         uint256 _minLiquidity
     )
         external
         view
         returns (address _target, uint256 _value, bytes memory _calldata)
     {
-        isValidPool(_pool);
+        isValidPool(_pool, _components);
 
         // Check that components match the pool tokens
 
@@ -103,13 +104,18 @@ contract AmmAdapterMock is ERC20 {
     }
 
     function getProvideLiquiditySingleAssetCalldata(
+        address /* _setToken */,
         address _pool,
         address _component,
         uint256 _maxTokenIn,
         uint256 _minLiquidity
     ) external view returns (address _target, uint256 _value, bytes memory _calldata) {
+
+        address[] memory components = new address[](1);
+        components[0] = _component;
+
         // This address must be the pool
-        isValidPool(_pool);
+        isValidPool(_pool, components);
 
         bytes memory callData = abi.encodeWithSignature(
             "joinswapPoolAmountOut(address,uint256,uint256)",
@@ -121,26 +127,32 @@ contract AmmAdapterMock is ERC20 {
     }
 
     function getRemoveLiquidityCalldata(
+        address /* _setToken */,
         address _pool,
-        address[] calldata /* _components */,
+        address[] calldata _components,
         uint256[] calldata _minTokensOut,
         uint256 _liquidity
     ) external view returns (address _target, uint256 _value, bytes memory _calldata) {
         // Validate the pool and components are legit?
-        isValidPool(_pool);
+        isValidPool(_pool, _components);
 
         bytes memory callData = abi.encodeWithSignature("exitPool(uint256,uint256[])", _liquidity, _minTokensOut);
         return (address(this), 0, callData);
     }
 
     function getRemoveLiquiditySingleAssetCalldata(
+        address /* _setToken */,
         address _pool,
         address _component,
         uint256 _minTokenOut,
         uint256 _liquidity
     ) external view returns (address _target, uint256 _value, bytes memory _calldata) {
+
+        address[] memory components = new address[](1);
+        components[0] = _component;
+
         // Pool must be this address
-        isValidPool(_pool);
+        isValidPool(_pool, components);
 
         bytes memory callData = abi.encodeWithSignature(
             "exitswapPoolAmountIn(address,uint256,uint256)",
@@ -151,7 +163,7 @@ contract AmmAdapterMock is ERC20 {
         return (address(this), 0, callData);
     }
 
-    function isValidPool(address _pool) public view returns(bool) {
+    function isValidPool(address _pool,address[] memory /*_components*/) public view returns(bool) {
         return _pool == address(this) || _pool == approvedToken;
     }