From a09f2b46d158ea034f3e4fff583bbbdd185c0dd1 Mon Sep 17 00:00:00 2001 From: Jacob Evans Date: Thu, 26 Mar 2020 15:01:17 +1000 Subject: [PATCH 1/2] Set GSTCollector address and deploy Curve --- contracts/utils/CHANGELOG.json | 3 +++ contracts/utils/contracts/src/DeploymentConstants.sol | 2 +- packages/contract-addresses/addresses.json | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/contracts/utils/CHANGELOG.json b/contracts/utils/CHANGELOG.json index a19a1d8b6b..f1ee406e3a 100644 --- a/contracts/utils/CHANGELOG.json +++ b/contracts/utils/CHANGELOG.json @@ -5,6 +5,9 @@ { "note": "Added `GST_ADDRESS` and `GST_COLLECTOR_ADDRESS`", "pr": 2523 + }, + { + "note": "Set GST Collector address in `DeploymentConstants`" } ] }, diff --git a/contracts/utils/contracts/src/DeploymentConstants.sol b/contracts/utils/contracts/src/DeploymentConstants.sol index 2d1eca1c0f..30a6cd0fa9 100644 --- a/contracts/utils/contracts/src/DeploymentConstants.sol +++ b/contracts/utils/contracts/src/DeploymentConstants.sol @@ -57,7 +57,7 @@ contract DeploymentConstants { /// @dev Mainnet address of the GST2 contract address constant private GST_ADDRESS = 0x0000000000b3F879cb30FE243b4Dfee438691c04; /// @dev Mainnet address of the GST Collector - address constant private GST_COLLECTOR_ADDRESS = address(0); + address constant private GST_COLLECTOR_ADDRESS = 0x000000D3b08566BE75A6DB803C03C85C0c1c5B96; // /// @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/addresses.json b/packages/contract-addresses/addresses.json index e6a1c7a070..6c4c4e7e62 100644 --- a/packages/contract-addresses/addresses.json +++ b/packages/contract-addresses/addresses.json @@ -28,7 +28,7 @@ "godsUnchainedValidator": "0x09a379ef7218bcfd8913faa8b281ebc5a2e0bc04", "broker": "0xd4690a51044db77d91d7aa8f7a3a5ad5da331af0", "chainlinkStopLimit": "0xeb27220f95f364e1d9531992c48613f231839f53", - "curveBridge": "0x6dc7950423ada9f56fb2c93a23edb787f1e29088", + "curveBridge": "0x1cf6ccc7e15d0d99a9498f37e16ba65b5c54bdd0", "maximumGasPrice": "0xe2bfd35306495d11e3c9db0d8de390cda24563cf" }, "3": { From 37d7df45e137035397b0b6aaddf214ea9b5da95b Mon Sep 17 00:00:00 2001 From: Jacob Evans Date: Thu, 26 Mar 2020 15:54:54 +1000 Subject: [PATCH 2/2] CHANGELOGs --- contracts/utils/CHANGELOG.json | 3 ++- packages/contract-addresses/CHANGELOG.json | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/contracts/utils/CHANGELOG.json b/contracts/utils/CHANGELOG.json index f1ee406e3a..f1e76f9fdf 100644 --- a/contracts/utils/CHANGELOG.json +++ b/contracts/utils/CHANGELOG.json @@ -7,7 +7,8 @@ "pr": 2523 }, { - "note": "Set GST Collector address in `DeploymentConstants`" + "note": "Set GST Collector address in `DeploymentConstants`", + "pr": 2530 } ] }, diff --git a/packages/contract-addresses/CHANGELOG.json b/packages/contract-addresses/CHANGELOG.json index b1776c442f..d53f2fd769 100644 --- a/packages/contract-addresses/CHANGELOG.json +++ b/packages/contract-addresses/CHANGELOG.json @@ -17,6 +17,10 @@ { "note": "Redeploy `KyberBridge`, `UniswapBridge`, `Eth2DaiBridge`, `CurveBridge`, `DydxBridge` on mainnet and kovan", "pr": 2529 + }, + { + "note": "Redeploy `CurveBridge` with GST support", + "pr": 2530 } ] },