Merge pull request #1707 from 0xProject/fix/update-ganache

Change `evmVersion` to `constantinople` for contract compilation
0xProject · Mar 19, 2019 · 3fff3d9 · 3fff3d9
2 parents 2675833 + a401b8f
commit 3fff3d9
Show file tree

Hide file tree

Showing 27 changed files with 142 additions and 79 deletions.
diff --git a/contracts/asset-proxy/CHANGELOG.json b/contracts/asset-proxy/CHANGELOG.json
@@ -2,10 +2,6 @@
     {
         "version": "2.0.0",
         "changes": [
-            {
-                "note": "Set evmVersion to byzantium",
-                "pr": 1678
-            },
             {
                 "note": "Do not reexport external dependencies",
                 "pr": 1682

diff --git a/contracts/asset-proxy/compiler.json b/contracts/asset-proxy/compiler.json
@@ -4,7 +4,7 @@
     "useDockerisedSolc": true,
     "isOfflineMode": false,
     "compilerSettings": {
-        "evmVersion": "byzantium",
+        "evmVersion": "constantinople",
         "optimizer": {
             "enabled": true,
             "runs": 1000000,

diff --git a/contracts/coordinator/CHANGELOG.json b/contracts/coordinator/CHANGELOG.json
@@ -1,6 +1,6 @@
 [
     {
-        "version": "0.0.1",
+        "version": "1.0.0",
         "changes": [
             {
                 "note": "Created Coordinator package"
@@ -12,6 +12,10 @@
             {
                 "note": "Add `SignatureType.Invalid`",
                 "pr": 1705
+            },
+            {
+                "note": "Set `evmVersion` to `constantinople`",
+                "pr": 1707
             }
         ]
     }

diff --git a/contracts/coordinator/compiler.json b/contracts/coordinator/compiler.json
@@ -3,7 +3,7 @@
     "contractsDir": "./contracts",
     "useDockerisedSolc": true,
     "compilerSettings": {
-        "evmVersion": "byzantium",
+        "evmVersion": "constantinople",
         "optimizer": {
             "enabled": true,
             "runs": 1000000,

diff --git a/contracts/erc1155/compiler.json b/contracts/erc1155/compiler.json
@@ -3,7 +3,7 @@
     "contractsDir": "contracts",
     "useDockerisedSolc": true,
     "compilerSettings": {
-        "evmVersion": "byzantium",
+        "evmVersion": "constantinople",
         "optimizer": { "enabled": true, "runs": 1000000 },
         "outputSelection": {
             "*": {

diff --git a/contracts/erc20/CHANGELOG.json b/contracts/erc20/CHANGELOG.json
@@ -2,10 +2,6 @@
     {
         "version": "2.0.0",
         "changes": [
-            {
-                "note": "Set evmVersion to byzantium",
-                "pr": 1678
-            },
             {
                 "note": "Upgrade contracts to Solidity 0.5.5",
                 "pr": 1682

diff --git a/contracts/erc20/compiler.json b/contracts/erc20/compiler.json
@@ -4,7 +4,7 @@
     "useDockerisedSolc": true,
     "isOfflineMode": false,
     "compilerSettings": {
-        "evmVersion": "byzantium",
+        "evmVersion": "constantinople",
         "optimizer": {
             "enabled": true,
             "runs": 1000000,

diff --git a/contracts/erc721/CHANGELOG.json b/contracts/erc721/CHANGELOG.json
@@ -2,10 +2,6 @@
     {
         "version": "2.0.0",
         "changes": [
-            {
-                "note": "Set evmVersion to byzantium",
-                "pr": 1678
-            },
             {
                 "note": "Upgrade contracts to Solidity 0.5.5",
                 "pr": 1682

diff --git a/contracts/erc721/compiler.json b/contracts/erc721/compiler.json
@@ -4,7 +4,7 @@
     "useDockerisedSolc": true,
     "isOfflineMode": false,
     "compilerSettings": {
-        "evmVersion": "byzantium",
+        "evmVersion": "constantinople",
         "optimizer": {
             "enabled": true,
             "runs": 1000000,

diff --git a/contracts/exchange-forwarder/CHANGELOG.json b/contracts/exchange-forwarder/CHANGELOG.json
@@ -2,10 +2,6 @@
     {
         "version": "2.0.0",
         "changes": [
-            {
-                "note": "Set evmVersion to byzantium",
-                "pr": 1678
-            },
             {
                 "note": "Do not reexport external dependencies",
                 "pr": 1682

diff --git a/contracts/exchange-forwarder/compiler.json b/contracts/exchange-forwarder/compiler.json
@@ -4,7 +4,7 @@
     "useDockerisedSolc": true,
     "isOfflineMode": false,
     "compilerSettings": {
-        "evmVersion": "byzantium",
+        "evmVersion": "constantinople",
         "optimizer": {
             "enabled": true,
             "runs": 1000000,

diff --git a/contracts/exchange-libs/CHANGELOG.json b/contracts/exchange-libs/CHANGELOG.json
@@ -2,10 +2,6 @@
     {
         "version": "2.0.0",
         "changes": [
-            {
-                "note": "Set evmVersion to byzantium",
-                "pr": 1678
-            },
             {
                 "note": "Upgrade contracts to Solidity 0.5.5",
                 "pr": 1682

diff --git a/contracts/exchange-libs/compiler.json b/contracts/exchange-libs/compiler.json
@@ -4,7 +4,7 @@
     "useDockerisedSolc": true,
     "isOfflineMode": false,
     "compilerSettings": {
-        "evmVersion": "byzantium",
+        "evmVersion": "constantinople",
         "optimizer": {
             "enabled": true,
             "runs": 1000000,

diff --git a/contracts/exchange/CHANGELOG.json b/contracts/exchange/CHANGELOG.json
@@ -2,10 +2,6 @@
     {
         "version": "2.0.0",
         "changes": [
-            {
-                "note": "Set evmVersion to byzantium",
-                "pr": 1678
-            },
             {
                 "note": "Do not reexport external dependencies",
                 "pr": 1682

diff --git a/contracts/exchange/compiler.json b/contracts/exchange/compiler.json
@@ -4,7 +4,7 @@
     "useDockerisedSolc": true,
     "isOfflineMode": false,
     "compilerSettings": {
-        "evmVersion": "byzantium",
+        "evmVersion": "constantinople",
         "optimizer": {
             "enabled": true,
             "runs": 1000000,

diff --git a/contracts/extensions/CHANGELOG.json b/contracts/extensions/CHANGELOG.json
@@ -2,10 +2,6 @@
     {
         "version": "3.0.0",
         "changes": [
-            {
-                "note": "Set evmVersion to byzantium",
-                "pr": 1678
-            },
             {
                 "note": "Do not reexport external dependencies",
                 "pr": 1682

diff --git a/contracts/extensions/compiler.json b/contracts/extensions/compiler.json
@@ -4,7 +4,7 @@
     "useDockerisedSolc": true,
     "isOfflineMode": false,
     "compilerSettings": {
-        "evmVersion": "byzantium",
+        "evmVersion": "constantinople",
         "optimizer": {
             "enabled": true,
             "runs": 1000000,

diff --git a/contracts/multisig/CHANGELOG.json b/contracts/multisig/CHANGELOG.json
@@ -2,10 +2,6 @@
     {
         "version": "3.0.0",
         "changes": [
-            {
-                "note": "Set evmVersion to byzantium",
-                "pr": 1678
-            },
             {
                 "note": "Do not reexport external dependencies",
                 "pr": 1682

diff --git a/contracts/multisig/compiler.json b/contracts/multisig/compiler.json
@@ -4,7 +4,7 @@
     "useDockerisedSolc": true,
     "isOfflineMode": false,
     "compilerSettings": {
-        "evmVersion": "byzantium",
+        "evmVersion": "constantinople",
         "optimizer": {
             "enabled": true,
             "runs": 1000000,

diff --git a/contracts/utils/CHANGELOG.json b/contracts/utils/CHANGELOG.json
@@ -2,10 +2,6 @@
     {
         "version": "3.0.0",
         "changes": [
-            {
-                "note": "Set evmVersion to byzantium",
-                "pr": 1678
-            },
             {
                 "note": "Optimize loops in LibAddressArray",
                 "pr": 1668

diff --git a/contracts/utils/compiler.json b/contracts/utils/compiler.json
@@ -4,7 +4,7 @@
     "useDockerisedSolc": true,
     "isOfflineMode": false,
     "compilerSettings": {
-        "evmVersion": "byzantium",
+        "evmVersion": "constantinople",
         "optimizer": {
             "enabled": true,
             "runs": 1000000,

diff --git a/packages/subproviders/CHANGELOG.json b/packages/subproviders/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "version": "4.0.3",
+        "changes": [
+            {
+                "note": "Update ganache-core to 2.5.3",
+                "pr": 1707
+            }
+        ]
+    },
     {
         "timestamp": 1551479279,
         "version": "4.0.2",

diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json
@@ -45,7 +45,7 @@
         "ethereum-types": "^2.1.0",
         "ethereumjs-tx": "^1.3.5",
         "ethereumjs-util": "^5.1.1",
-        "ganache-core": "^2.3.3",
+        "ganache-core": "^2.5.3",
         "hdkey": "^0.7.1",
         "json-rpc-error": "2.0.0",
         "lodash": "^4.17.11",

diff --git a/packages/web3-wrapper/CHANGELOG.json b/packages/web3-wrapper/CHANGELOG.json
@@ -1,4 +1,13 @@
 [
+    {
+        "version": "6.0.3",
+        "changes": [
+            {
+                "note": "Update ganache-core to 2.5.3",
+                "pr": 1707
+            }
+        ]
+    },
     {
         "timestamp": 1551479279,
         "version": "6.0.2",

diff --git a/packages/web3-wrapper/package.json b/packages/web3-wrapper/package.json
@@ -42,7 +42,7 @@
         "chai-as-promised": "^7.1.0",
         "chai-bignumber": "^3.0.0",
         "dirty-chai": "^2.0.1",
-        "ganache-core": "^2.3.3",
+        "ganache-core": "^2.5.3",
         "make-promises-safe": "^1.1.0",
         "mocha": "^4.1.0",
         "npm-run-all": "^4.1.2",

diff --git a/packages/web3-wrapper/test/web3_wrapper_test.ts b/packages/web3-wrapper/test/web3_wrapper_test.ts
@@ -35,7 +35,7 @@ describe('Web3Wrapper tests', () => {
     describe('#getNodeVersionAsync', () => {
         it('gets the node version', async () => {
             const nodeVersion = await web3Wrapper.getNodeVersionAsync();
-            const NODE_VERSION = 'EthereumJS TestRPC/v2.3.3/ethereum-js';
+            const NODE_VERSION = 'EthereumJS TestRPC/v2.5.3/ethereum-js';
             expect(nodeVersion).to.be.equal(NODE_VERSION);
         });
     });