crowetic/protocol
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Change `evmVersion` to `constantinople` for contract compilation
This commit is contained in:
Amir Bandeali
2019-03-19 08:23:12 -07:00
committed by GitHub
parent 2675833b0d a401b8f475
commit 3fff3d9c60
27 changed files with 142 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
contracts/asset-proxy/CHANGELOG.json
View File

@@ -2,10 +2,6 @@
{
"version": "2.0.0",
"changes": [
{
"note": "Set evmVersion to byzantium",
"pr": 1678
},
{
"note": "Do not reexport external dependencies",
"pr": 1682

2
contracts/asset-proxy/compiler.json
View File

@@ -4,7 +4,7 @@
"useDockerisedSolc": true,
"isOfflineMode": false,
"compilerSettings": {
"evmVersion": "byzantium",
"evmVersion": "constantinople",
"optimizer": {
"enabled": true,
"runs": 1000000,

6
contracts/coordinator/CHANGELOG.json
View File

@@ -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
}
]
}

2
contracts/coordinator/compiler.json
View File

@@ -3,7 +3,7 @@
"contractsDir": "./contracts",
"useDockerisedSolc": true,
"compilerSettings": {
"evmVersion": "byzantium",
"evmVersion": "constantinople",
"optimizer": {
"enabled": true,
"runs": 1000000,

2
contracts/erc1155/compiler.json
View File

@@ -3,7 +3,7 @@
"contractsDir": "contracts",
"useDockerisedSolc": true,
"compilerSettings": {
"evmVersion": "byzantium",
"evmVersion": "constantinople",
"optimizer": { "enabled": true, "runs": 1000000 },
"outputSelection": {
"*": {

4
contracts/erc20/CHANGELOG.json
View File

@@ -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

2
contracts/erc20/compiler.json
View File

@@ -4,7 +4,7 @@
"useDockerisedSolc": true,
"isOfflineMode": false,
"compilerSettings": {
"evmVersion": "byzantium",
"evmVersion": "constantinople",
"optimizer": {
"enabled": true,
"runs": 1000000,

4
contracts/erc721/CHANGELOG.json
View File

@@ -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

2
contracts/erc721/compiler.json
View File

@@ -4,7 +4,7 @@
"useDockerisedSolc": true,
"isOfflineMode": false,
"compilerSettings": {
"evmVersion": "byzantium",
"evmVersion": "constantinople",
"optimizer": {
"enabled": true,
"runs": 1000000,

4
contracts/exchange-forwarder/CHANGELOG.json
View File

@@ -2,10 +2,6 @@
{
"version": "2.0.0",
"changes": [
{
"note": "Set evmVersion to byzantium",
"pr": 1678
},
{
"note": "Do not reexport external dependencies",
"pr": 1682

2
contracts/exchange-forwarder/compiler.json
View File

@@ -4,7 +4,7 @@
"useDockerisedSolc": true,
"isOfflineMode": false,
"compilerSettings": {
"evmVersion": "byzantium",
"evmVersion": "constantinople",
"optimizer": {
"enabled": true,
"runs": 1000000,

4
contracts/exchange-libs/CHANGELOG.json
View File

@@ -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

2
contracts/exchange-libs/compiler.json
View File

@@ -4,7 +4,7 @@
"useDockerisedSolc": true,
"isOfflineMode": false,
"compilerSettings": {
"evmVersion": "byzantium",
"evmVersion": "constantinople",
"optimizer": {
"enabled": true,
"runs": 1000000,

4
contracts/exchange/CHANGELOG.json
View File

@@ -2,10 +2,6 @@
{
"version": "2.0.0",
"changes": [
{
"note": "Set evmVersion to byzantium",
"pr": 1678
},
{
"note": "Do not reexport external dependencies",
"pr": 1682

2
contracts/exchange/compiler.json
View File

@@ -4,7 +4,7 @@
"useDockerisedSolc": true,
"isOfflineMode": false,
"compilerSettings": {
"evmVersion": "byzantium",
"evmVersion": "constantinople",
"optimizer": {
"enabled": true,
"runs": 1000000,

4
contracts/extensions/CHANGELOG.json
View File

@@ -2,10 +2,6 @@
{
"version": "3.0.0",
"changes": [
{
"note": "Set evmVersion to byzantium",
"pr": 1678
},
{
"note": "Do not reexport external dependencies",
"pr": 1682

2
contracts/extensions/compiler.json
View File

@@ -4,7 +4,7 @@
"useDockerisedSolc": true,
"isOfflineMode": false,
"compilerSettings": {
"evmVersion": "byzantium",
"evmVersion": "constantinople",
"optimizer": {
"enabled": true,
"runs": 1000000,

4
contracts/multisig/CHANGELOG.json
View File

@@ -2,10 +2,6 @@
{
"version": "3.0.0",
"changes": [
{
"note": "Set evmVersion to byzantium",
"pr": 1678
},
{
"note": "Do not reexport external dependencies",
"pr": 1682

2
contracts/multisig/compiler.json
View File

@@ -4,7 +4,7 @@
"useDockerisedSolc": true,
"isOfflineMode": false,
"compilerSettings": {
"evmVersion": "byzantium",
"evmVersion": "constantinople",
"optimizer": {
"enabled": true,
"runs": 1000000,

4
contracts/utils/CHANGELOG.json
View File

@@ -2,10 +2,6 @@
{
"version": "3.0.0",
"changes": [
{
"note": "Set evmVersion to byzantium",
"pr": 1678
},
{
"note": "Optimize loops in LibAddressArray",
"pr": 1668

2
contracts/utils/compiler.json
View File

@@ -4,7 +4,7 @@
"useDockerisedSolc": true,
"isOfflineMode": false,
"compilerSettings": {
"evmVersion": "byzantium",
"evmVersion": "constantinople",
"optimizer": {
"enabled": true,
"runs": 1000000,

9
packages/subproviders/CHANGELOG.json
View File

@@ -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",

2
packages/subproviders/package.json
View File

@@ -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",

9
packages/web3-wrapper/CHANGELOG.json
View File

@@ -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",

2
packages/web3-wrapper/package.json
View File

@@ -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",

2
packages/web3-wrapper/test/web3_wrapper_test.ts
View File

@@ -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);
});
});

133
yarn.lock
View File

@@ -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"