From c546787994e66a92f95f8eac9a349a6c81ff748e Mon Sep 17 00:00:00 2001 From: Lawrence Forman Date: Fri, 10 Jul 2020 00:19:38 -0400 Subject: [PATCH] `@0x/contract-addresses`: Redeploy DFB on kovan. `@0x/contracts-utils`: Reorganize `DeploymentConstants` addresses. --- contracts/utils/CHANGELOG.json | 9 ++++ .../contracts/src/DeploymentConstants.sol | 44 ++++++++++++------- packages/contract-addresses/CHANGELOG.json | 4 ++ packages/contract-addresses/addresses.json | 2 +- 4 files changed, 42 insertions(+), 17 deletions(-) diff --git a/contracts/utils/CHANGELOG.json b/contracts/utils/CHANGELOG.json index c9d2a82f19..a70c5fd8ec 100644 --- a/contracts/utils/CHANGELOG.json +++ b/contracts/utils/CHANGELOG.json @@ -1,4 +1,13 @@ [ + { + "version": "4.5.1", + "changes": [ + { + "note": "Reorganize `DeploymentConstants` addresses", + "pr": 2628 + } + ] + }, { "version": "4.5.0", "changes": [ diff --git a/contracts/utils/contracts/src/DeploymentConstants.sol b/contracts/utils/contracts/src/DeploymentConstants.sol index 537193d53a..fb4b59a1f9 100644 --- a/contracts/utils/contracts/src/DeploymentConstants.sol +++ b/contracts/utils/contracts/src/DeploymentConstants.sol @@ -20,40 +20,28 @@ pragma solidity ^0.5.9; contract DeploymentConstants { + + // solhint-disable separate-by-one-line-in-contract + + // Mainnet addresses /////////////////////////////////////////////////////// /// @dev Mainnet address of the WETH contract. address constant private WETH_ADDRESS = 0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2; - // /// @dev Kovan address of the WETH contract. - // address constant private WETH_ADDRESS = 0xd0A1E359811322d97991E03f863a0C30C2cF029C; /// @dev Mainnet address of the KyberNetworkProxy contract. address constant private KYBER_NETWORK_PROXY_ADDRESS = 0x818E6FECD516Ecc3849DAf6845e3EC868087B755; - // /// @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 `UniswapV2Router01` contract. address constant private UNISWAP_V2_ROUTER_01_ADDRESS = 0xf164fC0Ec4E93095b804a4795bBe1e041497b92a; - // /// @dev Kovan address of the `UniswapV2Router01` contract. - // address constant private UNISWAP_V2_ROUTER_01_ADDRESS = 0xf164fC0Ec4E93095b804a4795bBe1e041497b92a; /// @dev Mainnet address of the Eth2Dai `MatchingMarket` contract. address constant private ETH2DAI_ADDRESS = 0x794e6e91555438aFc3ccF1c5076A74F42133d08D; - // /// @dev Kovan address of the Eth2Dai `MatchingMarket` contract. - // 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 - // address constant private ERC20_BRIDGE_PROXY_ADDRESS = 0xFb2DD2A1366dE37f7241C83d47DA58fd503E2C64; ///@dev Mainnet address of the `Dai` (multi-collateral) contract address constant private DAI_ADDRESS = 0x6B175474E89094C44Da98b954EedeAC495271d0F; - // ///@dev Kovan address of the `Dai` (multi-collateral) contract - // address constant private DAI_ADDRESS = 0x4F96Fe3b7A6Cf9725f59d353F723c1bDb64CA6Aa; /// @dev Mainnet address of the `Chai` contract address constant private CHAI_ADDRESS = 0x06AF07097C9Eeb7fD685c692751D5C66dB49c215; /// @dev Mainnet address of the 0x DevUtils contract. address constant private DEV_UTILS_ADDRESS = 0x74134CF88b21383713E096a5ecF59e297dc7f547; - // /// @dev Kovan address of the 0x DevUtils contract. - // address constant private DEV_UTILS_ADDRESS = 0x9402639A828BdF4E9e4103ac3B69E1a6E522eB59; /// @dev Kyber ETH pseudo-address. address constant internal KYBER_ETH_ADDRESS = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE; /// @dev Mainnet address of the dYdX contract. @@ -62,6 +50,30 @@ contract DeploymentConstants { address constant private GST_ADDRESS = 0x0000000000b3F879cb30FE243b4Dfee438691c04; /// @dev Mainnet address of the GST Collector address constant private GST_COLLECTOR_ADDRESS = 0x000000D3b08566BE75A6DB803C03C85C0c1c5B96; + + // Kovan addresses ///////////////////////////////////////////////////////// + // /// @dev Kovan address of the WETH contract. + // address constant private WETH_ADDRESS = 0xd0A1E359811322d97991E03f863a0C30C2cF029C; + // /// @dev Kovan address of the KyberNetworkProxy contract. + // address constant private KYBER_NETWORK_PROXY_ADDRESS = 0x692f391bCc85cefCe8C237C01e1f636BbD70EA4D; + // /// @dev Kovan address of the `UniswapExchangeFactory` contract. + // address constant private UNISWAP_EXCHANGE_FACTORY_ADDRESS = 0xD3E51Ef092B2845f10401a0159B2B96e8B6c3D30; + // /// @dev Kovan address of the `UniswapV2Router01` contract. + // address constant private UNISWAP_V2_ROUTER_01_ADDRESS = 0xf164fC0Ec4E93095b804a4795bBe1e041497b92a; + // /// @dev Kovan address of the Eth2Dai `MatchingMarket` contract. + // address constant private ETH2DAI_ADDRESS = 0xe325acB9765b02b8b418199bf9650972299235F4; + // /// @dev Kovan address of the `ERC20BridgeProxy` contract + // address constant private ERC20_BRIDGE_PROXY_ADDRESS = 0xFb2DD2A1366dE37f7241C83d47DA58fd503E2C64; + // /// @dev Kovan address of the `Chai` contract + // address constant private CHAI_ADDRESS = address(0); + // /// @dev Kovan address of the `Dai` (multi-collateral) contract + // address constant private DAI_ADDRESS = 0x4F96Fe3b7A6Cf9725f59d353F723c1bDb64CA6Aa; + // /// @dev Kovan address of the 0x DevUtils contract. + // address constant private DEV_UTILS_ADDRESS = 0x9402639A828BdF4E9e4103ac3B69E1a6E522eB59; + // /// @dev Kyber ETH pseudo-address. + // address constant internal KYBER_ETH_ADDRESS = 0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE; + // /// @dev Kovan address of the dYdX contract. + // address constant private DYDX_ADDRESS = address(0); // /// @dev Kovan address of the GST2 contract // address constant private GST_ADDRESS = address(0); // /// @dev Kovan address of the GST Collector diff --git a/packages/contract-addresses/CHANGELOG.json b/packages/contract-addresses/CHANGELOG.json index d2daf314c9..35456d19e5 100644 --- a/packages/contract-addresses/CHANGELOG.json +++ b/packages/contract-addresses/CHANGELOG.json @@ -17,6 +17,10 @@ { "note": "Deploy FQT from PR 2608", "pr": 2625 + }, + { + "note": "Redeploy DFB on kovan", + "pr": 2628 } ] }, diff --git a/packages/contract-addresses/addresses.json b/packages/contract-addresses/addresses.json index 8992a852b0..4218f34553 100644 --- a/packages/contract-addresses/addresses.json +++ b/packages/contract-addresses/addresses.json @@ -169,7 +169,7 @@ "chainlinkStopLimit": "0x0000000000000000000000000000000000000000", "curveBridge": "0x90c62c91a9f655f4f739e6cee85c84f9ccf47323", "maximumGasPrice": "0x67a094cf028221ffdd93fc658f963151d05e2a74", - "dexForwarderBridge": "0x0ea9f5c5cf7a4e6630cb01c5cca11d289963b188", + "dexForwarderBridge": "0xf220eb0b29e18bbc8ebc964e915b7547c7b4de4f", "multiBridge": "0x0000000000000000000000000000000000000000", "exchangeProxyGovernor": "0x618f9c67ce7bf1a50afa1e7e0238422601b0ff6e", "exchangeProxy": "0xdef1c0ded9bec7f1a1670819833240f027b25eff",