Merge pull request #2493 from 0xProject/feat/redeploy-devutils

Redeploy DevUtils
0xProject · Feb 25, 2020 · 8417fe4 · 8417fe4
2 parents 0f1c15a + 9345c4f
commit 8417fe4
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 6 deletions.
diff --git a/contracts/dev-utils/CHANGELOG.json b/contracts/dev-utils/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "version": "1.3.0",
+        "changes": [
+            {
+                "note": "Update `DevUtils` addresses in `DeploymentConstants`",
+                "pr": 2493
+            }
+        ]
+    },
     {
         "version": "1.2.0",
         "changes": [

diff --git a/contracts/utils/contracts/src/DeploymentConstants.sol b/contracts/utils/contracts/src/DeploymentConstants.sol
@@ -47,7 +47,7 @@ contract DeploymentConstants {
     /// @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 = 0xcCc2431a7335F21d9268bA62F0B32B0f2EFC463f;
+    address constant private DEV_UTILS_ADDRESS = 0x74134CF88b21383713E096a5ecF59e297dc7f547;
     // /// @dev Kovan address of the 0x DevUtils contract.
     // address constant private DEV_UTILS_ADDRESS = 0x161793Cdca4fF9E766A706c2C49c36AC1340bbcd;
     /// @dev Kyber ETH pseudo-address.

diff --git a/contracts/utils/package.json b/contracts/utils/package.json
@@ -38,7 +38,7 @@
     "config": {
         "publicInterfaceContracts": "Authorizable,IAuthorizable,IOwnable,LibAddress,LibAddressArray,LibAddressArrayRichErrors,LibAuthorizableRichErrors,LibBytes,LibBytesRichErrors,LibEIP1271,LibEIP712,LibFractions,LibOwnableRichErrors,LibReentrancyGuardRichErrors,LibRichErrors,LibSafeMath,LibSafeMathRichErrors,Ownable,ReentrancyGuard,Refundable",
         "abis:comment": "This list is auto-generated by contracts-gen. Don't edit manually.",
-        "abis": "./test/generated-artifacts/@(Authorizable|DeploymentConstants|IAuthorizable|IOwnable|LibAddress|LibAddressArray|LibAddressArrayRichErrors|LibAuthorizableRichErrors|LibBytes|LibBytesRichErrors|LibEIP1271|LibEIP712|LibFractions|LibOwnableRichErrors|LibReentrancyGuardRichErrors|LibRichErrors|LibSafeMath|LibSafeMathRichErrors|Ownable|ReentrancyGuard|Refundable|TestAuthorizable|TestLibAddress|TestLibAddressArray|TestLibBytes|TestLibEIP712|TestLibRichErrors|TestLibSafeMath|TestLogDecoding|TestLogDecodingDownstream|TestOwnable|TestReentrancyGuard|TestRefundable|TestRefundableReceiver).json"
+        "abis": "./test/generated-artifacts/@(Authorizable|D18|DeploymentConstants|IAuthorizable|IOwnable|LibAddress|LibAddressArray|LibAddressArrayRichErrors|LibAuthorizableRichErrors|LibBytes|LibBytesRichErrors|LibEIP1271|LibEIP712|LibFractions|LibOwnableRichErrors|LibReentrancyGuardRichErrors|LibRichErrors|LibSafeMath|LibSafeMathRichErrors|Ownable|ReentrancyGuard|Refundable|TestAuthorizable|TestLibAddress|TestLibAddressArray|TestLibBytes|TestLibEIP712|TestLibRichErrors|TestLibSafeMath|TestLogDecoding|TestLogDecodingDownstream|TestOwnable|TestReentrancyGuard|TestRefundable|TestRefundableReceiver).json"
     },
     "repository": {
         "type": "git",

diff --git a/contracts/utils/test/artifacts.ts b/contracts/utils/test/artifacts.ts
@@ -6,6 +6,7 @@
 import { ContractArtifact } from 'ethereum-types';
 
 import * as Authorizable from '../test/generated-artifacts/Authorizable.json';
+import * as D18 from '../test/generated-artifacts/D18.json';
 import * as DeploymentConstants from '../test/generated-artifacts/DeploymentConstants.json';
 import * as IAuthorizable from '../test/generated-artifacts/IAuthorizable.json';
 import * as IOwnable from '../test/generated-artifacts/IOwnable.json';
@@ -41,6 +42,7 @@ import * as TestRefundable from '../test/generated-artifacts/TestRefundable.json
 import * as TestRefundableReceiver from '../test/generated-artifacts/TestRefundableReceiver.json';
 export const artifacts = {
     Authorizable: Authorizable as ContractArtifact,
+    D18: D18 as ContractArtifact,
     DeploymentConstants: DeploymentConstants as ContractArtifact,
     LibAddress: LibAddress as ContractArtifact,
     LibAddressArray: LibAddressArray as ContractArtifact,

diff --git a/contracts/utils/test/wrappers.ts b/contracts/utils/test/wrappers.ts
@@ -4,6 +4,7 @@
  * -----------------------------------------------------------------------------
  */
 export * from '../test/generated-wrappers/authorizable';
+export * from '../test/generated-wrappers/d18';
 export * from '../test/generated-wrappers/deployment_constants';
 export * from '../test/generated-wrappers/i_authorizable';
 export * from '../test/generated-wrappers/i_ownable';

diff --git a/contracts/utils/tsconfig.json b/contracts/utils/tsconfig.json
@@ -24,6 +24,7 @@
         "generated-artifacts/ReentrancyGuard.json",
         "generated-artifacts/Refundable.json",
         "test/generated-artifacts/Authorizable.json",
+        "test/generated-artifacts/D18.json",
         "test/generated-artifacts/DeploymentConstants.json",
         "test/generated-artifacts/IAuthorizable.json",
         "test/generated-artifacts/IOwnable.json",

diff --git a/packages/contract-addresses/CHANGELOG.json b/packages/contract-addresses/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "version": "4.7.0",
+        "changes": [
+            {
+                "note": "Update `DevUtils` addresses.",
+                "pr": 2493
+            }
+        ]
+    },
     {
         "version": "4.6.0",
         "changes": [

diff --git a/packages/contract-addresses/addresses.json b/packages/contract-addresses/addresses.json
@@ -17,7 +17,7 @@
         "zrxVault": "0xba7f8b5fb1b19c1211c5d49550fcd149177a5eaf",
         "staking": "0x2a17c35ff147b32f13f19f2e311446eeb02503f3",
         "stakingProxy": "0xa26e80e7dea86279c6d778d702cc413e6cffa777",
-        "devUtils": "0xb1a3d901bad1df7d710fc8d008db7cdd6bbbffe6",
+        "devUtils": "0x74134cf88b21383713e096a5ecf59e297dc7f547",
         "erc20BridgeProxy": "0x8ed95d1746bf1e4dab58d8ed4724f1ef95b20db0",
         "uniswapBridge": "0x533344cfdf2a3e911e2cf4c6f5ed08e791f5355f",
         "erc20BridgeSampler": "0x43cfd1027bcc01d3df714d9e7bf989622e4bbec1",
@@ -45,7 +45,7 @@
         "multiAssetProxy": "0xab8fbd189c569ccdee3a4d929bb7f557be4028f6",
         "staticCallProxy": "0xe1b97e47aa3796276033a5341e884d2ba46b6ac1",
         "erc1155Proxy": "0x19bb6caa3bc34d39e5a23cedfa3e6c7e7f3c931d",
-        "devUtils": "0xb1a3d901bad1df7d710fc8d008db7cdd6bbbffe6",
+        "devUtils": "0x88e746ad9ab158210266e7765adbe1756c73cf84",
         "zrxVault": "0xffd161026865ad8b4ab28a76840474935eec4dfa",
         "staking": "0x986b588e472b712385579d172494fe2685669504",
         "stakingProxy": "0xfaabcee42ab6b9c649794ac6c133711071897ee9",
@@ -76,7 +76,7 @@
         "multiAssetProxy": "0xb34cde0ad3a83d04abebc0b66e75196f22216621",
         "staticCallProxy": "0xe1b97e47aa3796276033a5341e884d2ba46b6ac1",
         "erc1155Proxy": "0x19bb6caa3bc34d39e5a23cedfa3e6c7e7f3c931d",
-        "devUtils": "0xb1a3d901bad1df7d710fc8d008db7cdd6bbbffe6",
+        "devUtils": "0x9402639a828bdf4e9e4103ac3b69e1a6e522eb59",
         "zrxVault": "0xa5bf6ac73bc40790fc6ffc9dbbbce76c9176e224",
         "staking": "0x7cbe3c09cba24f26db24d9100ee915fa9fa21f5b",
         "stakingProxy": "0xc6ad5277ea225ac05e271eb14a7ebb480cd9dd9f",
@@ -107,7 +107,7 @@
         "multiAssetProxy": "0xf6313a772c222f51c28f2304c0703b8cf5428fd8",
         "staticCallProxy": "0x48e94bdb9033640d45ea7c721e25f380f8bffa43",
         "erc1155Proxy": "0x64517fa2b480ba3678a2a3c0cf08ef7fd4fad36f",
-        "devUtils": "0xb1a3d901bad1df7d710fc8d008db7cdd6bbbffe6",
+        "devUtils": "0x9402639a828bdf4e9e4103ac3b69e1a6e522eb59",
         "zrxVault": "0xf36eabdfe986b35b62c8fd5a98a7f2aebb79b291",
         "staking": "0x32b06d5611a03737a5f1834a24ccd641033fd89c",
         "stakingProxy": "0xbab9145f1d57cd4bb0c9aa2d1ece0a5b6e734d34",