From 7788d0f423099bc61d4f177d6c691ae49dbfec8f Mon Sep 17 00:00:00 2001 From: Facundo Spagnuolo Date: Thu, 10 Jan 2019 13:17:26 -0300 Subject: [PATCH] v2.1.0 --- examples/cli-with-deps/package.json | 8 ++-- examples/dep-basic/package.json | 6 +-- examples/lib-complex/package-lock.json | 2 +- examples/lib-complex/package.json | 4 +- examples/lib-simple/package.json | 4 +- examples/truffle-migrate/package.json | 6 +-- lerna.json | 2 +- packages/cli/package-lock.json | 60 +++++++++++--------------- packages/cli/package.json | 4 +- packages/docs/package.json | 2 +- packages/lib/package-lock.json | 2 +- packages/lib/package.json | 2 +- packages/vouching/package.json | 6 +-- tests/cli-app/files/package.json.v1 | 4 +- tests/cli-app/files/package.json.v2 | 4 +- tests/cli-app/package.json | 2 +- 16 files changed, 54 insertions(+), 64 deletions(-) diff --git a/examples/cli-with-deps/package.json b/examples/cli-with-deps/package.json index ad22374f2..40b741d74 100644 --- a/examples/cli-with-deps/package.json +++ b/examples/cli-with-deps/package.json @@ -1,15 +1,15 @@ { "name": "cli-with-deps", - "version": "2.1.0-rc.0", + "version": "2.1.0", "description": "Sample CLI project for ZeppelinOS", "author": "santiago@zeppelin.solutions", "private": true, "license": "MIT", "devDependencies": { - "dep-basic": "^2.1.0-rc.0", + "dep-basic": "^2.1.0", "openzeppelin-zos": "^1.9.1", "truffle": "^4.1.14", - "zos": "^2.1.0-rc.0", - "zos-lib": "^2.1.0-rc.0" + "zos": "^2.1.0", + "zos-lib": "^2.1.0" } } diff --git a/examples/dep-basic/package.json b/examples/dep-basic/package.json index 0271d1d89..5af40d52e 100644 --- a/examples/dep-basic/package.json +++ b/examples/dep-basic/package.json @@ -1,13 +1,13 @@ { "name": "dep-basic", "private": true, - "version": "2.1.0-rc.0", + "version": "2.1.0", "description": "Sample basic dependency library for ZeppelinOS", "author": "santiago@zeppelin.solutions", "license": "MIT", "devDependencies": { "truffle": "^4.1.14", - "zos": "^2.1.0-rc.0", - "zos-lib": "^2.1.0-rc.0" + "zos": "^2.1.0", + "zos-lib": "^2.1.0" } } diff --git a/examples/lib-complex/package-lock.json b/examples/lib-complex/package-lock.json index a44b7f557..07595da5e 100644 --- a/examples/lib-complex/package-lock.json +++ b/examples/lib-complex/package-lock.json @@ -1,6 +1,6 @@ { "name": "zos-lib-complex-example", - "version": "2.1.0-rc.0", + "version": "2.1.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/examples/lib-complex/package.json b/examples/lib-complex/package.json index 03266ff98..a34c61723 100644 --- a/examples/lib-complex/package.json +++ b/examples/lib-complex/package.json @@ -1,6 +1,6 @@ { "name": "zos-lib-complex-example", - "version": "2.1.0-rc.0", + "version": "2.1.0", "private": true, "description": "Example of using the upgradeability-lib's App", "main": "index.js", @@ -21,7 +21,7 @@ "minimist": "^1.2.0", "openzeppelin-zos": "git+https://github.com/OpenZeppelin/openzeppelin-zos.git#19610325924e03f008bb57dd8868f196bb7e3c98", "truffle": "^4.1.13", - "zos-lib": "^2.1.0-rc.0" + "zos-lib": "^2.1.0" }, "devDependencies": { "babel-polyfill": "^6.23.0", diff --git a/examples/lib-simple/package.json b/examples/lib-simple/package.json index eb99564ee..9943d0684 100644 --- a/examples/lib-simple/package.json +++ b/examples/lib-simple/package.json @@ -1,6 +1,6 @@ { "name": "zos-lib-simple-example", - "version": "2.1.0-rc.0", + "version": "2.1.0", "private": true, "main": "index.js", "scripts": { @@ -10,6 +10,6 @@ "license": "ISC", "dependencies": { "truffle": "^4.1.14", - "zos-lib": "^2.1.0-rc.0" + "zos-lib": "^2.1.0" } } diff --git a/examples/truffle-migrate/package.json b/examples/truffle-migrate/package.json index 33c1cc5bb..1af8361f1 100644 --- a/examples/truffle-migrate/package.json +++ b/examples/truffle-migrate/package.json @@ -1,6 +1,6 @@ { "name": "example-truffle-migrate", - "version": "2.1.0-rc.0", + "version": "2.1.0", "description": "Sample project for using ZeppelinOS within truffle migrations", "main": "index.js", "scripts": { @@ -11,7 +11,7 @@ "license": "MIT", "devDependencies": { "truffle": "^4.1.13", - "zos": "2.1.0-rc.0", - "zos-lib": "2.1.0-rc.0" + "zos": "^2.1.0", + "zos-lib": "^2.1.0" } } diff --git a/lerna.json b/lerna.json index 1ba854986..a8aa24a39 100644 --- a/lerna.json +++ b/lerna.json @@ -5,7 +5,7 @@ "tests/*", "tests/cli-app/workdir" ], - "version": "2.1.0-rc.0", + "version": "2.1.0", "command": { "publish": { "ignoreChanges": [ diff --git a/packages/cli/package-lock.json b/packages/cli/package-lock.json index c60faca6b..67b96fcb5 100644 --- a/packages/cli/package-lock.json +++ b/packages/cli/package-lock.json @@ -1,6 +1,6 @@ { "name": "zos", - "version": "2.1.0-rc.0", + "version": "2.1.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -1360,10 +1360,6 @@ "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz", "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==" }, - "bignumber.js": { - "version": "git+https://github.com/debris/bignumber.js.git#c7a38de919ed75e6fb6ba38051986e294b328df9", - "from": "git+https://github.com/debris/bignumber.js.git#master" - }, "binary-extensions": { "version": "1.11.0", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz", @@ -3363,6 +3359,10 @@ "truffle-contract-schema": "^0.0.5" }, "dependencies": { + "bignumber.js": { + "version": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", + "from": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934" + }, "fs-extra": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz", @@ -3389,7 +3389,6 @@ "resolved": "https://registry.npmjs.org/web3/-/web3-0.20.7.tgz", "integrity": "sha512-VU6/DSUX93d1fCzBz7WP/SGCQizO1rKZi4Px9j/3yRyfssHyFcZamMw2/sj4E8TlfMXONvZLoforR8B4bRoyTQ==", "requires": { - "bignumber.js": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", "crypto-js": "^3.1.4", "utf8": "^2.1.1", "xhr2-cookies": "^1.1.0", @@ -3406,12 +3405,15 @@ "web3": "^0.20.1" }, "dependencies": { + "bignumber.js": { + "version": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", + "from": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934" + }, "web3": { "version": "0.20.7", "resolved": "https://registry.npmjs.org/web3/-/web3-0.20.7.tgz", "integrity": "sha512-VU6/DSUX93d1fCzBz7WP/SGCQizO1rKZi4Px9j/3yRyfssHyFcZamMw2/sj4E8TlfMXONvZLoforR8B4bRoyTQ==", "requires": { - "bignumber.js": "git+https://github.com/frozeman/bignumber.js-nolookahead.git#57692b3ecfc98bbdd6b3a516cb2353652ea49934", "crypto-js": "^3.1.4", "utf8": "^2.1.1", "xhr2-cookies": "^1.1.0", @@ -3462,7 +3464,6 @@ "resolved": "https://registry.npmjs.org/web3/-/web3-0.16.0.tgz", "integrity": "sha1-pFVBdc1GKUMDWx8dOUMvdBxrYBk=", "requires": { - "bignumber.js": "git+https://github.com/debris/bignumber.js.git#c7a38de919ed75e6fb6ba38051986e294b328df9", "crypto-js": "^3.1.4", "utf8": "^2.1.1", "xmlhttprequest": "*" @@ -3470,7 +3471,7 @@ "dependencies": { "bignumber.js": { "version": "git+https://github.com/debris/bignumber.js.git#c7a38de919ed75e6fb6ba38051986e294b328df9", - "from": "git+https://github.com/debris/bignumber.js.git#master" + "from": "git+https://github.com/debris/bignumber.js.git#c7a38de919ed75e6fb6ba38051986e294b328df9" } } } @@ -8837,12 +8838,15 @@ "web3": "^0.16.0" }, "dependencies": { + "bignumber.js": { + "version": "git+https://github.com/debris/bignumber.js.git#c7a38de919ed75e6fb6ba38051986e294b328df9", + "from": "git+https://github.com/debris/bignumber.js.git#c7a38de919ed75e6fb6ba38051986e294b328df9" + }, "web3": { "version": "0.16.0", "resolved": "https://registry.npmjs.org/web3/-/web3-0.16.0.tgz", "integrity": "sha1-pFVBdc1GKUMDWx8dOUMvdBxrYBk=", "requires": { - "bignumber.js": "git+https://github.com/debris/bignumber.js.git#c7a38de919ed75e6fb6ba38051986e294b328df9", "crypto-js": "^3.1.4", "utf8": "^2.1.1", "xmlhttprequest": "*" @@ -10352,14 +10356,6 @@ "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=" }, - "typedarray-to-buffer": { - "version": "3.1.5", - "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", - "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", - "requires": { - "is-typedarray": "^1.0.0" - } - }, "ua-parser-js": { "version": "0.7.18", "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.18.tgz", @@ -11036,14 +11032,23 @@ "integrity": "sha512-8p6ZLv+1JYa5Vs8oBn33Nn3VGFBbF+wVfO+b78RJS1Qf1uIOzjFVDk3XwYDD7rlz9G5BKpxhaQw+6EGQ7L02aw==", "requires": { "underscore": "1.8.3", - "web3-core-helpers": "1.0.0-beta.37", - "websocket": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2" + "web3-core-helpers": "1.0.0-beta.37" }, "dependencies": { "underscore": { "version": "1.8.3", "resolved": "http://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz", "integrity": "sha1-Tz+1OxBuYJf8+ctBCfKl6b36UCI=" + }, + "websocket": { + "version": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2", + "from": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2", + "requires": { + "debug": "^2.2.0", + "nan": "^2.3.3", + "typedarray-to-buffer": "^3.1.2", + "yaeti": "^0.0.6" + } } } }, @@ -11286,16 +11291,6 @@ } } }, - "websocket": { - "version": "git://github.com/frozeman/WebSocket-Node.git#6c72925e3f8aaaea8dc8450f97627e85263999f2", - "from": "git://github.com/frozeman/WebSocket-Node.git#browserifyCompatible", - "requires": { - "debug": "^2.2.0", - "nan": "^2.3.3", - "typedarray-to-buffer": "^3.1.2", - "yaeti": "^0.0.6" - } - }, "wget-improved": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/wget-improved/-/wget-improved-1.5.0.tgz", @@ -11449,11 +11444,6 @@ "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=" }, - "yaeti": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/yaeti/-/yaeti-0.0.6.tgz", - "integrity": "sha1-8m9ITXJoTPQr7ft2lwqhYI+/lXc=" - }, "yallist": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", diff --git a/packages/cli/package.json b/packages/cli/package.json index fb12dc793..adcebfdf4 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "zos", - "version": "2.1.0-rc.0", + "version": "2.1.0", "description": "Command-line interface for the ZeppelinOS smart contract platform", "main": "./lib/index.js", "private": false, @@ -44,7 +44,7 @@ "truffle-core": "4.1.14", "truffle-provider": "0.0.6", "web3-provider-engine": "14.0.6", - "zos-lib": "^2.1.0-rc.0" + "zos-lib": "^2.1.0" }, "devDependencies": { "babel-cli": "^6.26.0", diff --git a/packages/docs/package.json b/packages/docs/package.json index 936466541..61f077ead 100644 --- a/packages/docs/package.json +++ b/packages/docs/package.json @@ -1,6 +1,6 @@ { "name": "zos-docs", - "version": "2.1.0-rc.0", + "version": "2.1.0", "description": "Documentation for the ZeppelinOS smart contract platform", "main": "index.js", "private": true, diff --git a/packages/lib/package-lock.json b/packages/lib/package-lock.json index e5424a7d8..710e5d3b4 100644 --- a/packages/lib/package-lock.json +++ b/packages/lib/package-lock.json @@ -1,6 +1,6 @@ { "name": "zos-lib", - "version": "2.1.0-rc.0", + "version": "2.1.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/lib/package.json b/packages/lib/package.json index 09ae33c14..72e3a8dfb 100644 --- a/packages/lib/package.json +++ b/packages/lib/package.json @@ -1,6 +1,6 @@ { "name": "zos-lib", - "version": "2.1.0-rc.0", + "version": "2.1.0", "description": "JavaScript library for the ZeppelinOS smart contract platform", "main": "./lib/index.js", "private": false, diff --git a/packages/vouching/package.json b/packages/vouching/package.json index 6910eb6ea..abf1f13f5 100644 --- a/packages/vouching/package.json +++ b/packages/vouching/package.json @@ -1,6 +1,6 @@ { "name": "zos-vouching", - "version": "2.1.0-rc.0", + "version": "2.1.0", "description": "Vouching logic for the EVM packages of the ZeppelinOS smart contract platform", "main": "truffle-config.js", "private": false, @@ -47,8 +47,8 @@ "minimist": "^1.2.0", "openzeppelin-eth": "^2.0.0", "tpl-contracts-eth": "^1.0.0", - "zos": "^2.1.0-rc.0", - "zos-lib": "^2.1.0-rc.0" + "zos": "^2.1.0", + "zos-lib": "^2.1.0" }, "devDependencies": { "babel-cli": "^6.26.0", diff --git a/tests/cli-app/files/package.json.v1 b/tests/cli-app/files/package.json.v1 index 771a37eb8..d540d6838 100644 --- a/tests/cli-app/files/package.json.v1 +++ b/tests/cli-app/files/package.json.v1 @@ -7,8 +7,8 @@ "license": "MIT", "dependencies": { "truffle": "^4.1.14", - "zos": "2.1.0-rc.0", - "zos-lib": "2.1.0-rc.0", + "zos": "2.1.0", + "zos-lib": "2.1.0", "mock-stdlib": "file:../dependencies/mock-stdlib-1.1.0", "bignumber.js": "^7.2.0", "truffle-hdwallet-provider": "0.0.6" diff --git a/tests/cli-app/files/package.json.v2 b/tests/cli-app/files/package.json.v2 index 37594f88e..24e6e43e2 100644 --- a/tests/cli-app/files/package.json.v2 +++ b/tests/cli-app/files/package.json.v2 @@ -7,8 +7,8 @@ "license": "MIT", "dependencies": { "truffle": "^4.1.14", - "zos": "2.1.0-rc.0", - "zos-lib": "2.1.0-rc.0", + "zos": "2.1.0", + "zos-lib": "2.1.0", "mock-stdlib": "file:../dependencies/mock-stdlib-1.2.0", "bignumber.js": "^7.2.0", "truffle-hdwallet-provider": "0.0.6" diff --git a/tests/cli-app/package.json b/tests/cli-app/package.json index 28bae5db5..06ddeb29c 100644 --- a/tests/cli-app/package.json +++ b/tests/cli-app/package.json @@ -1,7 +1,7 @@ { "name": "cli-app-tests", "private": true, - "version": "2.1.0-rc.0", + "version": "2.1.0", "description": "Integration tests for CLI app", "author": "santiago@zeppelin.solutions", "license": "MIT",