diff --git a/contracts/erc20-bridge-sampler/contracts/src/ERC20BridgeSampler.sol b/contracts/erc20-bridge-sampler/contracts/src/ERC20BridgeSampler.sol index 277f5ef050..c34151262e 100644 --- a/contracts/erc20-bridge-sampler/contracts/src/ERC20BridgeSampler.sol +++ b/contracts/erc20-bridge-sampler/contracts/src/ERC20BridgeSampler.sol @@ -34,7 +34,7 @@ import "./IUniswapExchangeQuotes.sol"; import "./ICurve.sol"; import "./ILiquidityProvider.sol"; import "./ILiquidityProviderRegistry.sol"; -import "./IUniswapV2Router.sol"; +import "./IUniswapV2Router01.sol"; contract ERC20BridgeSampler is @@ -665,9 +665,9 @@ contract ERC20BridgeSampler is makerTokenAmounts = new uint256[](numSamples); for (uint256 i = 0; i < numSamples; i++) { (bool didSucceed, bytes memory resultData) = - _getUniswapV2RouterAddress().staticcall.gas(UNISWAPV2_CALL_GAS)( + _getUniswapV2Router01Address().staticcall.gas(UNISWAPV2_CALL_GAS)( abi.encodeWithSelector( - IUniswapV2Router(0).getAmountsOut.selector, + IUniswapV2Router01(0).getAmountsOut.selector, takerTokenAmounts[i], path )); @@ -699,9 +699,9 @@ contract ERC20BridgeSampler is takerTokenAmounts = new uint256[](numSamples); for (uint256 i = 0; i < numSamples; i++) { (bool didSucceed, bytes memory resultData) = - _getUniswapV2RouterAddress().staticcall.gas(UNISWAPV2_CALL_GAS)( + _getUniswapV2Router01Address().staticcall.gas(UNISWAPV2_CALL_GAS)( abi.encodeWithSelector( - IUniswapV2Router(0).getAmountsIn.selector, + IUniswapV2Router01(0).getAmountsIn.selector, makerTokenAmounts[i], path )); diff --git a/contracts/erc20-bridge-sampler/contracts/src/IUniswapV2Router.sol b/contracts/erc20-bridge-sampler/contracts/src/IUniswapV2Router01.sol similarity index 96% rename from contracts/erc20-bridge-sampler/contracts/src/IUniswapV2Router.sol rename to contracts/erc20-bridge-sampler/contracts/src/IUniswapV2Router01.sol index 64c3e48760..b13ce3b67b 100644 --- a/contracts/erc20-bridge-sampler/contracts/src/IUniswapV2Router.sol +++ b/contracts/erc20-bridge-sampler/contracts/src/IUniswapV2Router01.sol @@ -19,7 +19,7 @@ pragma solidity ^0.5.9; -interface IUniswapV2Router { +interface IUniswapV2Router01 { function getAmountsOut(uint256 amountIn, address[] calldata path) external diff --git a/contracts/erc20-bridge-sampler/contracts/test/TestERC20BridgeSampler.sol b/contracts/erc20-bridge-sampler/contracts/test/TestERC20BridgeSampler.sol index 4a23c2bd1d..2968154c6c 100644 --- a/contracts/erc20-bridge-sampler/contracts/test/TestERC20BridgeSampler.sol +++ b/contracts/erc20-bridge-sampler/contracts/test/TestERC20BridgeSampler.sol @@ -25,7 +25,7 @@ import "../src/ERC20BridgeSampler.sol"; import "../src/IEth2Dai.sol"; import "../src/IDevUtils.sol"; import "../src/IKyberNetworkProxy.sol"; -import "../src/IUniswapV2Router.sol"; +import "../src/IUniswapV2Router01.sol"; library LibDeterministicQuotes { @@ -195,14 +195,14 @@ contract TestERC20BridgeSamplerUniswapExchange is } -contract TestERC20BridgeSamplerUniswapV2Router is - IUniswapV2Router, +contract TestERC20BridgeSamplerUniswapV2Router01 is + IUniswapV2Router01, DeploymentConstants, FailTrigger { bytes32 constant private SALT = 0xadc7fcb33c735913b8635927e66896b356a53a912ab2ceff929e60a04b53b3c1; - // Deterministic `IUniswapV2Router.getAmountsOut()`. + // Deterministic `IUniswapV2Router01.getAmountsOut()`. function getAmountsOut(uint256 amountIn, address[] calldata path) external view @@ -222,7 +222,7 @@ contract TestERC20BridgeSamplerUniswapV2Router is } } - // Deterministic `IUniswapV2Router.getAmountsInt()`. + // Deterministic `IUniswapV2Router01.getAmountsInt()`. function getAmountsIn(uint256 amountOut, address[] calldata path) external view @@ -375,7 +375,7 @@ contract TestERC20BridgeSampler is FailTrigger { TestERC20BridgeSamplerUniswapExchangeFactory public uniswap; - TestERC20BridgeSamplerUniswapV2Router public uniswapV2Router; + TestERC20BridgeSamplerUniswapV2Router01 public uniswapV2Router; TestERC20BridgeSamplerEth2Dai public eth2Dai; TestERC20BridgeSamplerKyberNetwork public kyber; @@ -383,7 +383,7 @@ contract TestERC20BridgeSampler is constructor() public ERC20BridgeSampler(address(this)) { uniswap = new TestERC20BridgeSamplerUniswapExchangeFactory(); - uniswapV2Router = new TestERC20BridgeSamplerUniswapV2Router(); + uniswapV2Router = new TestERC20BridgeSamplerUniswapV2Router01(); eth2Dai = new TestERC20BridgeSamplerEth2Dai(); kyber = new TestERC20BridgeSamplerKyberNetwork(); } @@ -452,7 +452,7 @@ contract TestERC20BridgeSampler is } // Overriden to point to a custom contract. - function _getUniswapV2RouterAddress() + function _getUniswapV2Router01Address() internal view returns (address uniswapV2RouterAddress) diff --git a/contracts/erc20-bridge-sampler/package.json b/contracts/erc20-bridge-sampler/package.json index 1719b45b9c..9fe7b39861 100644 --- a/contracts/erc20-bridge-sampler/package.json +++ b/contracts/erc20-bridge-sampler/package.json @@ -38,7 +38,7 @@ "config": { "publicInterfaceContracts": "ERC20BridgeSampler,IERC20BridgeSampler,ILiquidityProvider,ILiquidityProviderRegistry,DummyLiquidityProviderRegistry,DummyLiquidityProvider", "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually.", - "abis": "./test/generated-artifacts/@(DummyLiquidityProvider|DummyLiquidityProviderRegistry|ERC20BridgeSampler|ICurve|IDevUtils|IERC20BridgeSampler|IEth2Dai|IKyberNetwork|IKyberNetworkProxy|ILiquidityProvider|ILiquidityProviderRegistry|IUniswapExchangeQuotes|IUniswapV2Router|TestERC20BridgeSampler).json" + "abis": "./test/generated-artifacts/@(DummyLiquidityProvider|DummyLiquidityProviderRegistry|ERC20BridgeSampler|ICurve|IDevUtils|IERC20BridgeSampler|IEth2Dai|IKyberNetwork|IKyberNetworkProxy|ILiquidityProvider|ILiquidityProviderRegistry|IUniswapExchangeQuotes|IUniswapV2Router01|TestERC20BridgeSampler).json" }, "repository": { "type": "git", diff --git a/contracts/erc20-bridge-sampler/test/artifacts.ts b/contracts/erc20-bridge-sampler/test/artifacts.ts index 9729273253..e09dfbbde6 100644 --- a/contracts/erc20-bridge-sampler/test/artifacts.ts +++ b/contracts/erc20-bridge-sampler/test/artifacts.ts @@ -17,7 +17,7 @@ import * as IKyberNetworkProxy from '../test/generated-artifacts/IKyberNetworkPr import * as ILiquidityProvider from '../test/generated-artifacts/ILiquidityProvider.json'; import * as ILiquidityProviderRegistry from '../test/generated-artifacts/ILiquidityProviderRegistry.json'; import * as IUniswapExchangeQuotes from '../test/generated-artifacts/IUniswapExchangeQuotes.json'; -import * as IUniswapV2Router from '../test/generated-artifacts/IUniswapV2Router.json'; +import * as IUniswapV2Router01 from '../test/generated-artifacts/IUniswapV2Router01.json'; import * as TestERC20BridgeSampler from '../test/generated-artifacts/TestERC20BridgeSampler.json'; export const artifacts = { DummyLiquidityProvider: DummyLiquidityProvider as ContractArtifact, @@ -32,6 +32,6 @@ export const artifacts = { ILiquidityProvider: ILiquidityProvider as ContractArtifact, ILiquidityProviderRegistry: ILiquidityProviderRegistry as ContractArtifact, IUniswapExchangeQuotes: IUniswapExchangeQuotes as ContractArtifact, - IUniswapV2Router: IUniswapV2Router as ContractArtifact, + IUniswapV2Router01: IUniswapV2Router01 as ContractArtifact, TestERC20BridgeSampler: TestERC20BridgeSampler as ContractArtifact, }; diff --git a/contracts/erc20-bridge-sampler/test/wrappers.ts b/contracts/erc20-bridge-sampler/test/wrappers.ts index 993d92615d..d292624166 100644 --- a/contracts/erc20-bridge-sampler/test/wrappers.ts +++ b/contracts/erc20-bridge-sampler/test/wrappers.ts @@ -15,5 +15,5 @@ export * from '../test/generated-wrappers/i_kyber_network_proxy'; export * from '../test/generated-wrappers/i_liquidity_provider'; export * from '../test/generated-wrappers/i_liquidity_provider_registry'; export * from '../test/generated-wrappers/i_uniswap_exchange_quotes'; -export * from '../test/generated-wrappers/i_uniswap_v2_router'; +export * from '../test/generated-wrappers/i_uniswap_v2_router01'; export * from '../test/generated-wrappers/test_erc20_bridge_sampler'; diff --git a/contracts/erc20-bridge-sampler/tsconfig.json b/contracts/erc20-bridge-sampler/tsconfig.json index 622eeabd0e..f0e03e1174 100644 --- a/contracts/erc20-bridge-sampler/tsconfig.json +++ b/contracts/erc20-bridge-sampler/tsconfig.json @@ -21,7 +21,7 @@ "test/generated-artifacts/ILiquidityProvider.json", "test/generated-artifacts/ILiquidityProviderRegistry.json", "test/generated-artifacts/IUniswapExchangeQuotes.json", - "test/generated-artifacts/IUniswapV2Router.json", + "test/generated-artifacts/IUniswapV2Router01.json", "test/generated-artifacts/TestERC20BridgeSampler.json" ], "exclude": ["./deploy/solc/solc_bin"] diff --git a/contracts/utils/contracts/src/DeploymentConstants.sol b/contracts/utils/contracts/src/DeploymentConstants.sol index 0e01d718f0..9876792a04 100644 --- a/contracts/utils/contracts/src/DeploymentConstants.sol +++ b/contracts/utils/contracts/src/DeploymentConstants.sol @@ -32,10 +32,10 @@ contract DeploymentConstants { address constant private UNISWAP_EXCHANGE_FACTORY_ADDRESS = 0xc0a47dFe034B400B47bDaD5FecDa2621de6c4d95; // /// @dev Kovan address of the `UniswapExchangeFactory` contract. // address constant private UNISWAP_EXCHANGE_FACTORY_ADDRESS = 0xD3E51Ef092B2845f10401a0159B2B96e8B6c3D30; - /// @dev Mainnet address of the `IIUniswapV2Router` contract. - address constant private UNISWAP_V2_ROUTER_ADDRESS = 0xf164fC0Ec4E93095b804a4795bBe1e041497b92a; - // /// @dev Kovan address of the `IIUniswapV2Router` contract. - // address constant private UNISWAP_V2_ROUTER_ADDRESS = 0xf164fC0Ec4E93095b804a4795bBe1e041497b92a; + /// @dev Mainnet address of the `UniswapV2Router01` contract. + address constant private UNISWAP_V2_ROUTER_01_ADDRESS = 0xf164fC0Ec4E93095b804a4795bBe1e041497b92a; + // /// @dev Kovan address of the `UniswapV2Router01` contract. + // address constant private UNISWAP_V2_ROUTER_01ADDRESS = 0xf164fC0Ec4E93095b804a4795bBe1e041497b92a; /// @dev Mainnet address of the Eth2Dai `MatchingMarket` contract. address constant private ETH2DAI_ADDRESS = 0x794e6e91555438aFc3ccF1c5076A74F42133d08D; // /// @dev Kovan address of the Eth2Dai `MatchingMarket` contract. @@ -97,14 +97,14 @@ contract DeploymentConstants { return UNISWAP_EXCHANGE_FACTORY_ADDRESS; } - /// @dev Overridable way to get the `IUniswapV2Router` address. - /// @return uniswapRouterAddress The `IUniswapV2Router` address. - function _getUniswapV2RouterAddress() + /// @dev Overridable way to get the `UniswapV2Router01` address. + /// @return uniswapRouterAddress The `UniswapV2Router01` address. + function _getUniswapV2Router01Address() internal view returns (address uniswapRouterAddress) { - return UNISWAP_V2_ROUTER_ADDRESS; + return UNISWAP_V2_ROUTER_01_ADDRESS; } /// @dev An overridable way to retrieve the Eth2Dai `MatchingMarket` contract.