From 4e20fe1602868e41a63f22b4ba0dbaf63ce674db Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Sun, 17 Mar 2019 19:46:45 -0700 Subject: [PATCH 1/5] Update ganache-core to 2.5.3 --- packages/subproviders/package.json | 2 +- packages/web3-wrapper/package.json | 2 +- yarn.lock | 133 +++++++++++++++++++++++------ 3 files changed, 107 insertions(+), 30 deletions(-) diff --git a/packages/subproviders/package.json b/packages/subproviders/package.json index 925fa66b52..49dadb2ed9 100644 --- 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/package.json b/packages/web3-wrapper/package.json index 21ed0f28f2..d93e1d1dc0 100644 --- 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/yarn.lock b/yarn.lock index 4f342df7da..ed2369fc1a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6495,6 +6495,17 @@ ethereumjs-block@^1.2.2, ethereumjs-block@^1.4.1, ethereumjs-block@^1.6.0, ether ethereumjs-util "^5.0.0" merkle-patricia-tree "^2.1.2" +ethereumjs-block@~2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/ethereumjs-block/-/ethereumjs-block-2.2.0.tgz#8c6c3ab4a5eff0a16d9785fbeedbe643f4dbcbef" + integrity sha512-Ye+uG/L2wrp364Zihdlr/GfC3ft+zG8PdHcRtsBFNNH1CkOhxOwdB8friBU85n89uRZ9eIMAywCq0F4CwT1wAw== + dependencies: + async "^2.0.1" + ethereumjs-common "^1.1.0" + ethereumjs-tx "^1.2.2" + ethereumjs-util "^5.0.0" + merkle-patricia-tree "^2.1.2" + ethereumjs-blockstream@6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/ethereumjs-blockstream/-/ethereumjs-blockstream-6.0.0.tgz#79d726d1f358935eb65195e91d40344c31e87eff" @@ -6507,9 +6518,10 @@ ethereumjs-common@^0.6.0: version "0.6.1" resolved "https://registry.yarnpkg.com/ethereumjs-common/-/ethereumjs-common-0.6.1.tgz#ec98edf315a7f107afb6acc48e937a8266979fae" -ethereumjs-common@~0.4.0: - version "0.4.1" - resolved "https://registry.yarnpkg.com/ethereumjs-common/-/ethereumjs-common-0.4.1.tgz#27690a24a817b058cc3a2aedef9392e8d7d63984" +ethereumjs-common@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/ethereumjs-common/-/ethereumjs-common-1.1.0.tgz#5ec9086c314d619d8f05e79a0525829fcb0e93cb" + integrity sha512-LUmYkKV/HcZbWRyu3OU9YOevsH3VJDXtI6kEd8VZweQec+JjDGKCmAVKUyzhYUHqxRJu7JNALZ3A/b3NXOP6tA== ethereumjs-tx@1.3.7: version "1.3.7" @@ -6559,21 +6571,18 @@ ethereumjs-util@^5.0.0, ethereumjs-util@^5.0.1, ethereumjs-util@^5.1.1, ethereum safe-buffer "^5.1.1" secp256k1 "^3.0.1" -ethereumjs-vm@2.4.0: - version "2.4.0" - resolved "https://registry.yarnpkg.com/ethereumjs-vm/-/ethereumjs-vm-2.4.0.tgz#244f1e35f2755e537a13546111d1a4c159d34b13" +ethereumjs-util@^6.0.0: + version "6.1.0" + resolved "https://registry.yarnpkg.com/ethereumjs-util/-/ethereumjs-util-6.1.0.tgz#e9c51e5549e8ebd757a339cc00f5380507e799c8" + integrity sha512-URESKMFbDeJxnAxPppnk2fN6Y3BIatn9fwn76Lm8bQlt+s52TpG8dN9M66MLPuRAiAOIqL3dfwqWJf0sd0fL0Q== dependencies: - async "^2.1.2" - async-eventemitter "^0.2.2" - ethereumjs-account "^2.0.3" - ethereumjs-block "~1.7.0" - ethereumjs-common "~0.4.0" - ethereumjs-util "^5.2.0" - fake-merkle-patricia-tree "^1.0.1" - functional-red-black-tree "^1.0.1" - merkle-patricia-tree "^2.1.2" - rustbn.js "~0.2.0" + bn.js "^4.11.0" + create-hash "^1.1.2" + ethjs-util "0.1.6" + keccak "^1.0.2" + rlp "^2.0.0" safe-buffer "^5.1.1" + secp256k1 "^3.0.1" ethereumjs-vm@^2.0.2, ethereumjs-vm@^2.1.0, ethereumjs-vm@^2.3.4: version "2.3.4" @@ -6591,6 +6600,23 @@ ethereumjs-vm@^2.0.2, ethereumjs-vm@^2.1.0, ethereumjs-vm@^2.3.4: rustbn.js "~0.1.1" safe-buffer "^5.1.1" +ethereumjs-vm@^2.6.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/ethereumjs-vm/-/ethereumjs-vm-2.6.0.tgz#76243ed8de031b408793ac33907fb3407fe400c6" + integrity sha512-r/XIUik/ynGbxS3y+mvGnbOKnuLo40V5Mj1J25+HEO63aWYREIqvWeRO/hnROlMBE5WoniQmPmhiaN0ctiHaXw== + dependencies: + async "^2.1.2" + async-eventemitter "^0.2.2" + ethereumjs-account "^2.0.3" + ethereumjs-block "~2.2.0" + ethereumjs-common "^1.1.0" + ethereumjs-util "^6.0.0" + fake-merkle-patricia-tree "^1.0.1" + functional-red-black-tree "^1.0.1" + merkle-patricia-tree "^2.3.2" + rustbn.js "~0.2.0" + safe-buffer "^5.1.1" + ethereumjs-wallet@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/ethereumjs-wallet/-/ethereumjs-wallet-0.6.2.tgz#67244b6af3e8113b53d709124b25477b64aeccda" @@ -6642,6 +6668,14 @@ ethjs-unit@0.1.6: bn.js "4.11.6" number-to-bn "1.7.0" +ethjs-util@0.1.6: + version "0.1.6" + resolved "https://registry.yarnpkg.com/ethjs-util/-/ethjs-util-0.1.6.tgz#f308b62f185f9fe6237132fb2a9818866a5cd536" + integrity sha512-CUnVOQq7gSpDHZVVrQW8ExxUETWrnrvXYvYz55wOU8Uj4VCgw56XC2B/fVqQN+f7gmrnRHSLVnFAwsCuNwji8w== + dependencies: + is-hex-prefixed "1.0.0" + strip-hex-prefix "1.0.0" + ethjs-util@^0.1.3: version "0.1.4" resolved "https://registry.yarnpkg.com/ethjs-util/-/ethjs-util-0.1.4.tgz#1c8b6879257444ef4d3f3fbbac2ded12cd997d93" @@ -7506,9 +7540,10 @@ ganache-cli@6.4.1: source-map-support "0.5.9" yargs "11.1.0" -ganache-core@^2.3.3: - version "2.3.3" - resolved "https://registry.yarnpkg.com/ganache-core/-/ganache-core-2.3.3.tgz#e35c76d405f0ffba5c48621596fdcc38b0a03136" +ganache-core@^2.5.3: + version "2.5.3" + resolved "https://registry.yarnpkg.com/ganache-core/-/ganache-core-2.5.3.tgz#8c6f21d820a694826082dfbb2dc59f834a6874fc" + integrity sha512-lTqPSxgWS5p4zJ8yNbhhsBXMPfcuV+jjnnYtsbJTph9L6InA6UkNpO0hhHuDFWF3GpblP3LjvWPpqW+X6pdZGg== dependencies: abstract-leveldown "3.0.0" async "2.6.1" @@ -7524,11 +7559,11 @@ ganache-core@^2.3.3: ethereumjs-block "2.1.0" ethereumjs-tx "1.3.7" ethereumjs-util "5.2.0" - ethereumjs-vm "2.4.0" + ethereumjs-vm "^2.6.0" heap "0.2.6" level-sublevel "6.6.4" levelup "3.1.1" - lodash "4.17.10" + lodash "4.17.11" merkle-patricia-tree "2.3.1" rlp "2.1.0" seedrandom "2.4.4" @@ -10627,9 +10662,9 @@ lodash.words@^3.0.0: dependencies: lodash._root "^3.0.0" -lodash@4.17.10, lodash@^4.17.10: - version "4.17.10" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7" +lodash@4.17.11, lodash@^4.0.0, lodash@^4.13.1, lodash@^4.15.0, lodash@^4.17.11, lodash@^4.17.3: + version "4.17.11" + resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" lodash@=4.17.4: version "4.17.4" @@ -10639,14 +10674,14 @@ lodash@^3.3.1, lodash@^3.6.0, lodash@^3.7.0: version "3.10.1" resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" -lodash@^4.0.0, lodash@^4.13.1, lodash@^4.15.0, lodash@^4.17.11, lodash@^4.17.3: - version "4.17.11" - resolved "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" - lodash@^4.14.0, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.2.1, lodash@^4.3.0, lodash@^4.5.1: version "4.17.5" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511" +lodash@^4.17.10: + version "4.17.10" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7" + lodash@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/lodash/-/lodash-1.0.2.tgz#8f57560c83b59fc270bd3d561b690043430e2551" @@ -11046,6 +11081,20 @@ merkle-patricia-tree@2.3.1, merkle-patricia-tree@^2.1.2: rlp "^2.0.0" semaphore ">=1.0.1" +merkle-patricia-tree@^2.3.2: + version "2.3.2" + resolved "https://registry.yarnpkg.com/merkle-patricia-tree/-/merkle-patricia-tree-2.3.2.tgz#982ca1b5a0fde00eed2f6aeed1f9152860b8208a" + integrity sha512-81PW5m8oz/pz3GvsAwbauj7Y00rqm81Tzad77tHBwU7pIAtN+TJnMSOJhxBKflSVYhptMMb9RskhqHqrSm1V+g== + dependencies: + async "^1.4.2" + ethereumjs-util "^5.0.0" + level-ws "0.0.0" + levelup "^1.2.1" + memdown "^1.0.0" + readable-stream "^2.0.0" + rlp "^2.0.0" + semaphore ">=1.0.1" + methods@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" @@ -13506,6 +13555,16 @@ react-dom@^16.3.2: object-assign "^4.1.1" prop-types "^15.6.0" +react-dom@^16.4.2: + version "16.8.4" + resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.8.4.tgz#1061a8e01a2b3b0c8160037441c3bf00a0e3bc48" + integrity sha512-Ob2wK7XG2tUDt7ps7LtLzGYYB6DXMCLj0G5fO6WeEICtT4/HdpOi7W/xLzZnR6RCG1tYza60nMdqtxzA8FaPJQ== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + prop-types "^15.6.2" + scheduler "^0.13.4" + react-dom@^16.5.2: version "16.5.2" resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.5.2.tgz#b69ee47aa20bab5327b2b9d7c1fe2a30f2cfa9d7" @@ -13809,6 +13868,16 @@ react@^16.3.2: object-assign "^4.1.1" prop-types "^15.6.0" +react@^16.4.2: + version "16.8.4" + resolved "https://registry.yarnpkg.com/react/-/react-16.8.4.tgz#fdf7bd9ae53f03a9c4cd1a371432c206be1c4768" + integrity sha512-0GQ6gFXfUH7aZcjGVymlPOASTuSjlQL4ZtVC5YKH+3JL6bBLCVO21DknzmaPlI90LN253ojj02nsapy+j7wIjg== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + prop-types "^15.6.2" + scheduler "^0.13.4" + react@^16.5.2: version "16.5.2" resolved "https://registry.yarnpkg.com/react/-/react-16.5.2.tgz#19f6b444ed139baa45609eee6dc3d318b3895d42" @@ -14680,6 +14749,14 @@ schedule@^0.5.0: dependencies: object-assign "^4.1.1" +scheduler@^0.13.4: + version "0.13.4" + resolved "https://registry.yarnpkg.com/scheduler/-/scheduler-0.13.4.tgz#8fef05e7a3580c76c0364d2df5e550e4c9140298" + integrity sha512-cvSOlRPxOHs5dAhP9yiS/6IDmVAVxmk33f0CtTJRkmUWcb1Us+t7b1wqdzoC0REw2muC9V5f1L/w5R5uKGaepA== + dependencies: + loose-envify "^1.1.0" + object-assign "^4.1.1" + schema-utils@^0.4.4: version "0.4.7" resolved "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187" From aea278c0226d7317256f206e51e9656a4459e756 Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Sun, 17 Mar 2019 19:48:02 -0700 Subject: [PATCH 2/5] Update evmVersion to petersburg --- contracts/asset-proxy/compiler.json | 2 +- contracts/coordinator/compiler.json | 2 +- contracts/erc1155/compiler.json | 2 +- contracts/erc20/compiler.json | 2 +- contracts/erc721/compiler.json | 2 +- contracts/exchange-forwarder/compiler.json | 2 +- contracts/exchange-libs/compiler.json | 2 +- contracts/exchange/compiler.json | 2 +- contracts/extensions/compiler.json | 2 +- contracts/multisig/compiler.json | 2 +- contracts/utils/compiler.json | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/contracts/asset-proxy/compiler.json b/contracts/asset-proxy/compiler.json index 28f73402ca..e3b9ed00ec 100644 --- a/contracts/asset-proxy/compiler.json +++ b/contracts/asset-proxy/compiler.json @@ -4,7 +4,7 @@ "useDockerisedSolc": true, "isOfflineMode": false, "compilerSettings": { - "evmVersion": "byzantium", + "evmVersion": "petersburg", "optimizer": { "enabled": true, "runs": 1000000, diff --git a/contracts/coordinator/compiler.json b/contracts/coordinator/compiler.json index 40b486d1a7..28e07105b9 100644 --- a/contracts/coordinator/compiler.json +++ b/contracts/coordinator/compiler.json @@ -3,7 +3,7 @@ "contractsDir": "./contracts", "useDockerisedSolc": true, "compilerSettings": { - "evmVersion": "byzantium", + "evmVersion": "petersburg", "optimizer": { "enabled": true, "runs": 1000000, diff --git a/contracts/erc1155/compiler.json b/contracts/erc1155/compiler.json index e545f46b08..46d62f1178 100644 --- a/contracts/erc1155/compiler.json +++ b/contracts/erc1155/compiler.json @@ -3,7 +3,7 @@ "contractsDir": "contracts", "useDockerisedSolc": true, "compilerSettings": { - "evmVersion": "byzantium", + "evmVersion": "petersburg", "optimizer": { "enabled": true, "runs": 1000000 }, "outputSelection": { "*": { diff --git a/contracts/erc20/compiler.json b/contracts/erc20/compiler.json index 714ee44df9..910c18689d 100644 --- a/contracts/erc20/compiler.json +++ b/contracts/erc20/compiler.json @@ -4,7 +4,7 @@ "useDockerisedSolc": true, "isOfflineMode": false, "compilerSettings": { - "evmVersion": "byzantium", + "evmVersion": "petersburg", "optimizer": { "enabled": true, "runs": 1000000, diff --git a/contracts/erc721/compiler.json b/contracts/erc721/compiler.json index d7294e62ae..bfbcbb878e 100644 --- a/contracts/erc721/compiler.json +++ b/contracts/erc721/compiler.json @@ -4,7 +4,7 @@ "useDockerisedSolc": true, "isOfflineMode": false, "compilerSettings": { - "evmVersion": "byzantium", + "evmVersion": "petersburg", "optimizer": { "enabled": true, "runs": 1000000, diff --git a/contracts/exchange-forwarder/compiler.json b/contracts/exchange-forwarder/compiler.json index deb76ddfa8..4be147db96 100644 --- a/contracts/exchange-forwarder/compiler.json +++ b/contracts/exchange-forwarder/compiler.json @@ -4,7 +4,7 @@ "useDockerisedSolc": true, "isOfflineMode": false, "compilerSettings": { - "evmVersion": "byzantium", + "evmVersion": "petersburg", "optimizer": { "enabled": true, "runs": 1000000, diff --git a/contracts/exchange-libs/compiler.json b/contracts/exchange-libs/compiler.json index 8523e1155e..4abdfde931 100644 --- a/contracts/exchange-libs/compiler.json +++ b/contracts/exchange-libs/compiler.json @@ -4,7 +4,7 @@ "useDockerisedSolc": true, "isOfflineMode": false, "compilerSettings": { - "evmVersion": "byzantium", + "evmVersion": "petersburg", "optimizer": { "enabled": true, "runs": 1000000, diff --git a/contracts/exchange/compiler.json b/contracts/exchange/compiler.json index dfbf86a0bc..95bbd3bee4 100644 --- a/contracts/exchange/compiler.json +++ b/contracts/exchange/compiler.json @@ -4,7 +4,7 @@ "useDockerisedSolc": true, "isOfflineMode": false, "compilerSettings": { - "evmVersion": "byzantium", + "evmVersion": "petersburg", "optimizer": { "enabled": true, "runs": 1000000, diff --git a/contracts/extensions/compiler.json b/contracts/extensions/compiler.json index 9e8471e32b..534f4a93fd 100644 --- a/contracts/extensions/compiler.json +++ b/contracts/extensions/compiler.json @@ -4,7 +4,7 @@ "useDockerisedSolc": true, "isOfflineMode": false, "compilerSettings": { - "evmVersion": "byzantium", + "evmVersion": "petersburg", "optimizer": { "enabled": true, "runs": 1000000, diff --git a/contracts/multisig/compiler.json b/contracts/multisig/compiler.json index 2395d7c8ff..8b024af976 100644 --- a/contracts/multisig/compiler.json +++ b/contracts/multisig/compiler.json @@ -4,7 +4,7 @@ "useDockerisedSolc": true, "isOfflineMode": false, "compilerSettings": { - "evmVersion": "byzantium", + "evmVersion": "petersburg", "optimizer": { "enabled": true, "runs": 1000000, diff --git a/contracts/utils/compiler.json b/contracts/utils/compiler.json index 7dd36ba4d9..ce996091e8 100644 --- a/contracts/utils/compiler.json +++ b/contracts/utils/compiler.json @@ -4,7 +4,7 @@ "useDockerisedSolc": true, "isOfflineMode": false, "compilerSettings": { - "evmVersion": "byzantium", + "evmVersion": "petersburg", "optimizer": { "enabled": true, "runs": 1000000, From caf286b8cbc4e31253a0b055f2203bbbcd48e3ee Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Sun, 17 Mar 2019 20:01:48 -0700 Subject: [PATCH 3/5] Update CHANGELOGs --- contracts/asset-proxy/CHANGELOG.json | 4 ---- contracts/coordinator/CHANGELOG.json | 14 +++++++++++++- contracts/erc20/CHANGELOG.json | 4 ---- contracts/erc721/CHANGELOG.json | 4 ---- contracts/exchange-forwarder/CHANGELOG.json | 4 ---- contracts/exchange-libs/CHANGELOG.json | 4 ---- contracts/exchange/CHANGELOG.json | 4 ---- contracts/extensions/CHANGELOG.json | 4 ---- contracts/multisig/CHANGELOG.json | 4 ---- contracts/utils/CHANGELOG.json | 4 ---- packages/subproviders/CHANGELOG.json | 9 +++++++++ packages/web3-wrapper/CHANGELOG.json | 9 +++++++++ 12 files changed, 31 insertions(+), 37 deletions(-) diff --git a/contracts/asset-proxy/CHANGELOG.json b/contracts/asset-proxy/CHANGELOG.json index d4a8083933..fc665e19a1 100644 --- 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/coordinator/CHANGELOG.json b/contracts/coordinator/CHANGELOG.json index 9aae87f350..eb06267e8d 100644 --- 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,18 @@ { "note": "Add `SignatureType.Invalid`", "pr": 1705 + }, + { +<<<<<<< HEAD + "note": "Add `SignatureType.Invalid`", + "pr": 1705 + }, + { + "note": "Set `evmVersion` to `petersburg`", +======= + "note": "Set `evmVersion` to `constantinople`", +>>>>>>> 4a3e9e8f4... fgrtre + "pr": 1707 } ] } diff --git a/contracts/erc20/CHANGELOG.json b/contracts/erc20/CHANGELOG.json index 7d2d6d8218..87a442ea37 100644 --- 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/erc721/CHANGELOG.json b/contracts/erc721/CHANGELOG.json index f7cfc8b6b5..91d3674e16 100644 --- 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/exchange-forwarder/CHANGELOG.json b/contracts/exchange-forwarder/CHANGELOG.json index 50d4375ca1..1bebb14105 100644 --- 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-libs/CHANGELOG.json b/contracts/exchange-libs/CHANGELOG.json index 23d12e531d..19f4222093 100644 --- 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/CHANGELOG.json b/contracts/exchange/CHANGELOG.json index 76bad01b67..f5ec62d609 100644 --- 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/extensions/CHANGELOG.json b/contracts/extensions/CHANGELOG.json index 88f6fc4628..337addf6af 100644 --- 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/multisig/CHANGELOG.json b/contracts/multisig/CHANGELOG.json index de02c953b0..9c224349a3 100644 --- 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/utils/CHANGELOG.json b/contracts/utils/CHANGELOG.json index a3787b8dbc..ecec7db642 100644 --- 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/packages/subproviders/CHANGELOG.json b/packages/subproviders/CHANGELOG.json index cda828df83..7851c865f0 100644 --- 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/web3-wrapper/CHANGELOG.json b/packages/web3-wrapper/CHANGELOG.json index 6f92903073..216e058d70 100644 --- 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", From b008fabdacb4171f25fa36871903f6de071cd72d Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Sun, 17 Mar 2019 20:32:17 -0700 Subject: [PATCH 4/5] Change petersburg to constantinople --- contracts/asset-proxy/compiler.json | 2 +- contracts/coordinator/CHANGELOG.json | 8 -------- contracts/coordinator/compiler.json | 2 +- contracts/erc1155/compiler.json | 2 +- contracts/erc20/compiler.json | 2 +- contracts/erc721/compiler.json | 2 +- contracts/exchange-forwarder/compiler.json | 2 +- contracts/exchange-libs/compiler.json | 2 +- contracts/exchange/compiler.json | 2 +- contracts/extensions/compiler.json | 2 +- contracts/multisig/compiler.json | 2 +- contracts/utils/compiler.json | 2 +- 12 files changed, 11 insertions(+), 19 deletions(-) diff --git a/contracts/asset-proxy/compiler.json b/contracts/asset-proxy/compiler.json index e3b9ed00ec..6bf9c16c56 100644 --- a/contracts/asset-proxy/compiler.json +++ b/contracts/asset-proxy/compiler.json @@ -4,7 +4,7 @@ "useDockerisedSolc": true, "isOfflineMode": false, "compilerSettings": { - "evmVersion": "petersburg", + "evmVersion": "constantinople", "optimizer": { "enabled": true, "runs": 1000000, diff --git a/contracts/coordinator/CHANGELOG.json b/contracts/coordinator/CHANGELOG.json index eb06267e8d..fc1a3f7f0d 100644 --- a/contracts/coordinator/CHANGELOG.json +++ b/contracts/coordinator/CHANGELOG.json @@ -14,15 +14,7 @@ "pr": 1705 }, { -<<<<<<< HEAD - "note": "Add `SignatureType.Invalid`", - "pr": 1705 - }, - { - "note": "Set `evmVersion` to `petersburg`", -======= "note": "Set `evmVersion` to `constantinople`", ->>>>>>> 4a3e9e8f4... fgrtre "pr": 1707 } ] diff --git a/contracts/coordinator/compiler.json b/contracts/coordinator/compiler.json index 28e07105b9..8df8f3cd33 100644 --- a/contracts/coordinator/compiler.json +++ b/contracts/coordinator/compiler.json @@ -3,7 +3,7 @@ "contractsDir": "./contracts", "useDockerisedSolc": true, "compilerSettings": { - "evmVersion": "petersburg", + "evmVersion": "constantinople", "optimizer": { "enabled": true, "runs": 1000000, diff --git a/contracts/erc1155/compiler.json b/contracts/erc1155/compiler.json index 46d62f1178..2c3318284a 100644 --- a/contracts/erc1155/compiler.json +++ b/contracts/erc1155/compiler.json @@ -3,7 +3,7 @@ "contractsDir": "contracts", "useDockerisedSolc": true, "compilerSettings": { - "evmVersion": "petersburg", + "evmVersion": "constantinople", "optimizer": { "enabled": true, "runs": 1000000 }, "outputSelection": { "*": { diff --git a/contracts/erc20/compiler.json b/contracts/erc20/compiler.json index 910c18689d..c84caf47f1 100644 --- a/contracts/erc20/compiler.json +++ b/contracts/erc20/compiler.json @@ -4,7 +4,7 @@ "useDockerisedSolc": true, "isOfflineMode": false, "compilerSettings": { - "evmVersion": "petersburg", + "evmVersion": "constantinople", "optimizer": { "enabled": true, "runs": 1000000, diff --git a/contracts/erc721/compiler.json b/contracts/erc721/compiler.json index bfbcbb878e..a3b8f417d5 100644 --- a/contracts/erc721/compiler.json +++ b/contracts/erc721/compiler.json @@ -4,7 +4,7 @@ "useDockerisedSolc": true, "isOfflineMode": false, "compilerSettings": { - "evmVersion": "petersburg", + "evmVersion": "constantinople", "optimizer": { "enabled": true, "runs": 1000000, diff --git a/contracts/exchange-forwarder/compiler.json b/contracts/exchange-forwarder/compiler.json index 4be147db96..d49cd34b7d 100644 --- a/contracts/exchange-forwarder/compiler.json +++ b/contracts/exchange-forwarder/compiler.json @@ -4,7 +4,7 @@ "useDockerisedSolc": true, "isOfflineMode": false, "compilerSettings": { - "evmVersion": "petersburg", + "evmVersion": "constantinople", "optimizer": { "enabled": true, "runs": 1000000, diff --git a/contracts/exchange-libs/compiler.json b/contracts/exchange-libs/compiler.json index 4abdfde931..fed143589c 100644 --- a/contracts/exchange-libs/compiler.json +++ b/contracts/exchange-libs/compiler.json @@ -4,7 +4,7 @@ "useDockerisedSolc": true, "isOfflineMode": false, "compilerSettings": { - "evmVersion": "petersburg", + "evmVersion": "constantinople", "optimizer": { "enabled": true, "runs": 1000000, diff --git a/contracts/exchange/compiler.json b/contracts/exchange/compiler.json index 95bbd3bee4..c1f8663d37 100644 --- a/contracts/exchange/compiler.json +++ b/contracts/exchange/compiler.json @@ -4,7 +4,7 @@ "useDockerisedSolc": true, "isOfflineMode": false, "compilerSettings": { - "evmVersion": "petersburg", + "evmVersion": "constantinople", "optimizer": { "enabled": true, "runs": 1000000, diff --git a/contracts/extensions/compiler.json b/contracts/extensions/compiler.json index 534f4a93fd..bf3756c15b 100644 --- a/contracts/extensions/compiler.json +++ b/contracts/extensions/compiler.json @@ -4,7 +4,7 @@ "useDockerisedSolc": true, "isOfflineMode": false, "compilerSettings": { - "evmVersion": "petersburg", + "evmVersion": "constantinople", "optimizer": { "enabled": true, "runs": 1000000, diff --git a/contracts/multisig/compiler.json b/contracts/multisig/compiler.json index 8b024af976..942df6bb25 100644 --- a/contracts/multisig/compiler.json +++ b/contracts/multisig/compiler.json @@ -4,7 +4,7 @@ "useDockerisedSolc": true, "isOfflineMode": false, "compilerSettings": { - "evmVersion": "petersburg", + "evmVersion": "constantinople", "optimizer": { "enabled": true, "runs": 1000000, diff --git a/contracts/utils/compiler.json b/contracts/utils/compiler.json index ce996091e8..4632bf57b7 100644 --- a/contracts/utils/compiler.json +++ b/contracts/utils/compiler.json @@ -4,7 +4,7 @@ "useDockerisedSolc": true, "isOfflineMode": false, "compilerSettings": { - "evmVersion": "petersburg", + "evmVersion": "constantinople", "optimizer": { "enabled": true, "runs": 1000000, From a401b8f475b20d20fed516b7c02dbd9a6b97eb36 Mon Sep 17 00:00:00 2001 From: Amir Bandeali Date: Mon, 18 Mar 2019 13:07:19 -0700 Subject: [PATCH 5/5] Fix web3wrapper node version test --- packages/web3-wrapper/test/web3_wrapper_test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/web3-wrapper/test/web3_wrapper_test.ts b/packages/web3-wrapper/test/web3_wrapper_test.ts index c4ee91d3dc..54f77d75b6 100644 --- 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); }); });