diff --git a/contracts/erc20-bridge-sampler/contracts/src/ERC20BridgeSampler.sol b/contracts/erc20-bridge-sampler/contracts/src/ERC20BridgeSampler.sol index 4babce7a75..facb665e5f 100644 --- a/contracts/erc20-bridge-sampler/contracts/src/ERC20BridgeSampler.sol +++ b/contracts/erc20-bridge-sampler/contracts/src/ERC20BridgeSampler.sol @@ -40,6 +40,7 @@ contract ERC20BridgeSampler is uint256 constant internal KYBER_SAMPLE_CALL_GAS = 1500e3; uint256 constant internal UNISWAP_SAMPLE_CALL_GAS = 150e3; uint256 constant internal ETH2DAI_SAMPLE_CALL_GAS = 1000e3; + uint256 constant internal DEV_UTILS_SAMPLE_CALL_GAS = 500e3; address constant private UNISWAP_SOURCE = 0xc0a47dFe034B400B47bDaD5FecDa2621de6c4d95; address constant private ETH2DAI_SOURCE = 0x39755357759cE0d7f32dC8dC45414CCa409AE24e; address constant private KYBER_SOURCE = 0x818E6FECD516Ecc3849DAf6845e3EC868087B755; @@ -208,7 +209,7 @@ contract ERC20BridgeSampler is LibOrder.OrderInfo memory orderInfo, uint256 fillableTakerAssetAmount, bool isValidSignature - ) = IDevUtils(_getDevUtilsAddress()).getOrderRelevantState( + ) = IDevUtils(_getDevUtilsAddress()).getOrderRelevantState.gas(DEV_UTILS_SAMPLE_CALL_GAS)( orders[i], orderSignatures[i] ); diff --git a/contracts/utils/CHANGELOG.json b/contracts/utils/CHANGELOG.json index 1a35edcee5..167d907d67 100644 --- a/contracts/utils/CHANGELOG.json +++ b/contracts/utils/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "version": "4.3.0", + "changes": [ + { + "note": "Update Eth2Dai addresses in `DeploymentConstants`", + "pr": 2474 + } + ] + }, { "timestamp": 1580988106, "version": "4.2.1", diff --git a/contracts/utils/contracts/src/DeploymentConstants.sol b/contracts/utils/contracts/src/DeploymentConstants.sol index fc4bf0c3b9..44abc36d50 100644 --- a/contracts/utils/contracts/src/DeploymentConstants.sol +++ b/contracts/utils/contracts/src/DeploymentConstants.sol @@ -24,18 +24,18 @@ contract DeploymentConstants { address constant private WETH_ADDRESS = 0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2; // /// @dev Kovan address of the WETH contract. // address constant private WETH_ADDRESS = 0xd0A1E359811322d97991E03f863a0C30C2cF029C; - /// @dev Mainnet address of the KyberNeworkProxy contract. + /// @dev Mainnet address of the KyberNetworkProxy contract. address constant private KYBER_NETWORK_PROXY_ADDRESS = 0x818E6FECD516Ecc3849DAf6845e3EC868087B755; - // /// @dev Kovan address of the KyberNeworkProxy contract. + // /// @dev Kovan address of the KyberNetworkProxy contract. // address constant private KYBER_NETWORK_PROXY_ADDRESS = 0x692f391bCc85cefCe8C237C01e1f636BbD70EA4D; /// @dev Mainnet address of the `UniswapExchangeFactory` contract. 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 Eth2Dai `MatchingMarket` contract. - address constant private ETH2DAI_ADDRESS = 0x39755357759cE0d7f32dC8dC45414CCa409AE24e; + address constant private ETH2DAI_ADDRESS = 0x794e6e91555438aFc3ccF1c5076A74F42133d08D; // /// @dev Kovan address of the Eth2Dai `MatchingMarket` contract. - // address constant private ETH2DAI_ADDRESS = 0x4A6bC4e803c62081ffEbCc8d227B5a87a58f1F8F ; + // address constant private ETH2DAI_ADDRESS = 0xe325acB9765b02b8b418199bf9650972299235F4; /// @dev Mainnet address of the `ERC20BridgeProxy` contract address constant private ERC20_BRIDGE_PROXY_ADDRESS = 0x8ED95d1746bf1E4dAb58d8ED4724f1Ef95B20Db0; // /// @dev Kovan address of the `ERC20BridgeProxy` contract diff --git a/packages/contract-addresses/CHANGELOG.json b/packages/contract-addresses/CHANGELOG.json index 5ab82ae0b2..09e254d477 100644 --- a/packages/contract-addresses/CHANGELOG.json +++ b/packages/contract-addresses/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "version": "4.5.0", + "changes": [ + { + "note": "Update `ERC20BridgeSampler` and `Eth2Dai` on mainnet and kovan.", + "pr": 2474 + } + ] + }, { "version": "4.4.0", "changes": [ diff --git a/packages/contract-addresses/addresses.json b/packages/contract-addresses/addresses.json index 9770dc7f9d..ac50f823e6 100644 --- a/packages/contract-addresses/addresses.json +++ b/packages/contract-addresses/addresses.json @@ -23,9 +23,9 @@ "devUtils": "0x161793cdca4ff9e766a706c2c49c36ac1340bbcd", "erc20BridgeProxy": "0x8ed95d1746bf1e4dab58d8ed4724f1ef95b20db0", "uniswapBridge": "0x533344cfdf2a3e911e2cf4c6f5ed08e791f5355f", - "erc20BridgeSampler": "0x19b883391f61ae82d282a93f829353fdc5920f7f", + "erc20BridgeSampler": "0x45d41caec1cd893517e6e4e8222717d3d7a3bcb0", "kyberBridge": "0xf342f3a80fdc9b48713d58fe97e17f5cc764ee62", - "eth2DaiBridge": "0xe97ea901d034ba2e018155264f77c417ce7717f9", + "eth2DaiBridge": "0xe3379a1956f4a79f39eb2e87bb441419e167538e", "chaiBridge": "0x77c31eba23043b9a72d13470f3a3a311344d7438", "dydxBridge": "0x55dc8f21d20d4c6ed3c82916a438a413ca68e335" }, @@ -113,8 +113,8 @@ "stakingProxy": "0xbab9145f1d57cd4bb0c9aa2d1ece0a5b6e734d34", "erc20BridgeProxy": "0xfb2dd2a1366de37f7241c83d47da58fd503e2c64", "uniswapBridge": "0x8224aa8fe5c9f07d5a59c735386ff6cc6aaeb568", - "eth2DaiBridge": "0xd5a01c9b4e154d483aa57012a1115613df0032b1", - "erc20BridgeSampler": "0x476898f5aCf513d35d655F8128cE647a6D590094", + "eth2DaiBridge": "0x9485d65c6a2fae0d519cced5bd830e57c41998a9", + "erc20BridgeSampler": "0x5ad1553c2e60db118d2c01c0b73ac71e6c586b84", "kyberBridge": "0xde7b2747624a647600fdb349184d0448ab954929", "chaiBridge": "0x0000000000000000000000000000000000000000", "dydxBridge": "0x0000000000000000000000000000000000000000"