diff --git a/.jshintignore b/.jshintignore index 42bb00f77d8..ff16e08d03a 100644 --- a/.jshintignore +++ b/.jshintignore @@ -1,2 +1,3 @@ node_modules packages/**/node_modules/ +karma.conf.js diff --git a/README.md b/README.md index a4b6c2574a5..26991696539 100644 --- a/README.md +++ b/README.md @@ -139,7 +139,7 @@ npm test ### Contributing -- All contributions have to go into develop, or the 1.0 branch +- All contributions have to go into 1.x, or the 2.x branch - Please follow the code style of the other files, we use 4 spaces as tabs. ### Community diff --git a/gulpfile.js b/gulpfile.js index 7a43c6c3419..2b205ee7058 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -55,11 +55,11 @@ var packages = [{ fileName: 'web3-eth-abi', expose: 'Web3EthAbi', src: './packages/web3-eth-abi/src/index.js' -},{ +}, { fileName: 'web3-eth-ens', expose: 'EthEns', src: './packages/web3-eth-ens/src/index.js' -},{ +}, { fileName: 'web3-net', expose: 'Web3Net', src: './packages/web3-net/src/index.js' @@ -83,7 +83,7 @@ var packages = [{ }, { fileName: 'web3-providers-ws', expose: 'Web3WsProvider', - src: './packages/web3-providers-ws/src/index.js', + src: './packages/web3-providers-ws/src/index.js' }, { fileName: 'web3-core-subscriptions', expose: 'Web3Subscriptions', @@ -116,14 +116,14 @@ var ugliyOptions = { dead_code: true, // jshint ignore:line drop_debugger: true, // jshint ignore:line global_defs: { // jshint ignore:line - "DEBUG": false // matters for some libraries + 'DEBUG': false // matters for some libraries } } }; -gulp.task('version', function () { +gulp.task('version', function() { if (!lernaJSON.version) { - throw new Error("version property is missing from lerna.json"); + throw new Error('version property is missing from lerna.json'); } var version = lernaJSON.version; @@ -137,69 +137,88 @@ gulp.task('version', function () { return gulp.src(glob, {base: './'}) .pipe(replace(jsonPattern, '"version": "' + version + '"')) - .pipe(replace(jsPattern, "version: '" + version + "'")) + .pipe(replace(jsPattern, 'version: \'' + version + '\'')) .pipe(gulp.dest('./')); }); -gulp.task('bower', gulp.series('version', function (cb) { - bower.commands.install().on('end', function (installed) { +gulp.task('bower', gulp.series('version', function(cb) { + bower.commands.install().on('end', function(installed) { console.log(installed); cb(); }); })); -gulp.task('lint', function () { +gulp.task('lint', function() { return gulp.src(['./*.js', './lib/*.js']) .pipe(jshint()) .pipe(jshint.reporter('default')); }); -gulp.task('clean', gulp.series('lint', function (cb) { +gulp.task('clean', gulp.series('lint', function(cb) { del([DEST]).then(cb.bind(null, null)); })); -packages.forEach(function (pckg, i) { +packages.forEach(function(pckg, i) { var prevPckg = (!i) ? 'clean' : packages[i - 1].fileName; - gulp.task(pckg.fileName, gulp.series(prevPckg, function () { + gulp.task(pckg.fileName, gulp.series(prevPckg, function() { browserifyOptions.standalone = pckg.expose; - var pipe = browserify(browserifyOptions) - .require(pckg.src, { expose: pckg.expose }) - .require('bn.js', { expose: 'BN' }) // expose it to dapp developers + var stream = browserify(browserifyOptions) + .require(pckg.src, {expose: pckg.expose}) + .require('bn.js', {expose: 'BN'}) // expose it to dapp developers .add(pckg.src); if (pckg.ignore) { - pckg.ignore.forEach(function (ignore) { - pipe.ignore(ignore); + pckg.ignore.forEach(function(ignore) { + stream.ignore(ignore); }); } - return pipe.bundle() - .pipe(exorcist(path.join(DEST, pckg.fileName + '.js.map'))) - .pipe(source(pckg.fileName + '.js')) + var bundle = stream.bundle(); + + stream = bundle + .pipe(exorcist(path.join(DEST, pckg.fileName + '.js.map'))); + + if (pckg.fileName === 'web3') { + bundle + .pipe(exorcist(path.join(WEB3_PACKAGE_DEST, pckg.fileName + '.js.map'))); + } + + stream = stream.pipe(source(pckg.fileName + '.js')) .pipe(streamify(babel({ compact: false, presets: ['@babel/preset-env'] - }))) + }))); + + if (pckg.fileName === 'web3') { + stream = stream + .pipe(gulp.dest(WEB3_PACKAGE_DEST)); + } + + stream = stream .pipe(gulp.dest(DEST)) - .pipe(streamify(babel({ - compact: true, - presets: ['@babel/preset-env'] - }))) .pipe(streamify(uglify(ugliyOptions))) - .on('error', function (err) { console.error(err); }) - .pipe(rename(pckg.fileName + '.min.js')) - .pipe(gulp.dest(WEB3_PACKAGE_DEST)) + .on('error', function(err) { + console.error(err); + }) + .pipe(rename(pckg.fileName + '.min.js')); + + if (pckg.fileName === 'web3') { + stream = stream + .pipe(gulp.dest(WEB3_PACKAGE_DEST)); + } + + return stream .pipe(gulp.dest(DEST)); })); }); -gulp.task('publishTag', function () { - exec("git commit -am \"add tag v"+ lernaJSON.version +"\"; git tag v"+ lernaJSON.version +"; git push origin v"+ lernaJSON.version +";"); +gulp.task('publishTag', function() { + exec('git commit -am "add tag v' + lernaJSON.version + '"; git tag v' + lernaJSON.version + '; git push origin v' + lernaJSON.version + ';'); }); -gulp.task('watch', function () { +gulp.task('watch', function() { gulp.watch(['./packages/web3/src/*.js'], gulp.series('lint', 'default')); }); diff --git a/lerna.json b/lerna.json index 5baae3ca6f0..aaa01a3abb8 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "1.2.1", + "version": "1.2.2", "lerna": "2.0.0", "command": { "init": { diff --git a/package-lock.json b/package-lock.json index bd7f625e307..876e56aee52 100644 --- a/package-lock.json +++ b/package-lock.json @@ -707,6 +707,14 @@ "requires": { "core-js": "^2.6.5", "regenerator-runtime": "^0.13.2" + }, + "dependencies": { + "regenerator-runtime": { + "version": "0.13.3", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz", + "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==", + "dev": true + } } }, "@babel/preset-env": { @@ -1494,14 +1502,6 @@ "requires": { "core-js": "^2.4.0", "regenerator-runtime": "^0.11.0" - }, - "dependencies": { - "regenerator-runtime": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", - "dev": true - } } }, "babel-template": { @@ -4864,7 +4864,8 @@ "version": "2.1.1", "resolved": false, "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true + "dev": true, + "optional": true }, "aproba": { "version": "1.2.0", @@ -4888,13 +4889,15 @@ "version": "1.0.0", "resolved": false, "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true + "dev": true, + "optional": true }, "brace-expansion": { "version": "1.1.11", "resolved": false, "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", "dev": true, + "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -4911,19 +4914,22 @@ "version": "1.1.0", "resolved": false, "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true + "dev": true, + "optional": true }, "concat-map": { "version": "0.0.1", "resolved": false, "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true + "dev": true, + "optional": true }, "console-control-strings": { "version": "1.1.0", "resolved": false, "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", - "dev": true + "dev": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -5054,7 +5060,8 @@ "version": "2.0.3", "resolved": false, "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true + "dev": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -5068,6 +5075,7 @@ "resolved": false, "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", "dev": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -5084,6 +5092,7 @@ "resolved": false, "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", "dev": true, + "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -5092,13 +5101,15 @@ "version": "0.0.8", "resolved": false, "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true + "dev": true, + "optional": true }, "minipass": { "version": "2.3.5", "resolved": false, "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==", "dev": true, + "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -5119,6 +5130,7 @@ "resolved": false, "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", "dev": true, + "optional": true, "requires": { "minimist": "0.0.8" } @@ -5207,7 +5219,8 @@ "version": "1.0.1", "resolved": false, "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true + "dev": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -5221,6 +5234,7 @@ "resolved": false, "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", "dev": true, + "optional": true, "requires": { "wrappy": "1" } @@ -5316,7 +5330,8 @@ "version": "5.1.2", "resolved": false, "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true + "dev": true, + "optional": true }, "safer-buffer": { "version": "2.1.2", @@ -5358,6 +5373,7 @@ "resolved": false, "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", "dev": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -5379,6 +5395,7 @@ "resolved": false, "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", "dev": true, + "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -5427,13 +5444,15 @@ "version": "1.0.2", "resolved": false, "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true + "dev": true, + "optional": true }, "yallist": { "version": "3.0.3", "resolved": false, "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==", - "dev": true + "dev": true, + "optional": true } } }, @@ -7264,9 +7283,9 @@ "dev": true }, "https-proxy-agent": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.2.tgz", - "integrity": "sha512-c8Ndjc9Bkpfx/vCJueCPy0jlP4ccCCSNDp8xwCZzPjKJUm+B+u9WX2x98Qx4n1PiMNTWo3D7KK5ifNV/yJyRzg==", + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.3.tgz", + "integrity": "sha512-Ytgnz23gm2DVftnzqRRz2dOXZbGd2uiajSw/95bPp6v53zPRspQjLm/AfBgqbJ2qfeRXWIOMVLpp86+/5yX39Q==", "dev": true, "requires": { "agent-base": "^4.3.0", @@ -11001,9 +11020,9 @@ } }, "regenerator-runtime": { - "version": "0.13.3", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz", - "integrity": "sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==", + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", "dev": true }, "regenerator-transform": { @@ -12658,9 +12677,9 @@ } }, "typescript": { - "version": "3.7.0-dev.20191017", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.7.0-dev.20191017.tgz", - "integrity": "sha512-Yi0lCPEN0cn9Gp8TEEkPpgKNR5SWAmx9Hmzzz+oEuivw6amURqRGynaLyFZkMA9iMsvYG5LLqhdlFO3uu5ZT/w==", + "version": "3.8.0-dev.20191022", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.8.0-dev.20191022.tgz", + "integrity": "sha512-bPzngFizYevpE3s4mb3uTR0zeB5SFZRO1/zDk1FF+TjJHFZ0+DR09RQjMVd+8RU3iZAe7GeTHHboDlq+EtkPjA==", "dev": true }, "uglify-js": { @@ -13539,7 +13558,7 @@ "requires": { "underscore": "1.9.1", "web3-core-helpers": "1.2.1", - "websocket": "github:web3-js/WebSocket-Node#905deb4812572b344f5801f8c9ce8bb02799d82e" + "websocket": "github:web3-js/WebSocket-Node#polyfill/globalThis" } }, "web3-shh": { diff --git a/package.json b/package.json index d2e3e442e19..fb1ce91239c 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "postinstall": "lerna bootstrap", "build": "gulp", "build-all": "gulp all", - "release": "lerna bootstrap; lerna publish", + "release": "lerna bootstrap; lerna publish from-package", "bootstrap": "lerna bootstrap", "watch": "gulp watch", "docs": "cd docs; make html;", diff --git a/packages/web3-bzz/package.json b/packages/web3-bzz/package.json index 264ea0f5d8b..8321d40960a 100644 --- a/packages/web3-bzz/package.json +++ b/packages/web3-bzz/package.json @@ -1,6 +1,6 @@ { "name": "web3-bzz", - "version": "1.2.1", + "version": "1.2.2", "description": "Web3 module to interact with the Swarm network.", "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-bzz", "license": "LGPL-3.0", diff --git a/packages/web3-core-helpers/package.json b/packages/web3-core-helpers/package.json index a2e2dc28258..3b014cb5c6a 100644 --- a/packages/web3-core-helpers/package.json +++ b/packages/web3-core-helpers/package.json @@ -1,6 +1,6 @@ { "name": "web3-core-helpers", - "version": "1.2.1", + "version": "1.2.2", "description": "Web3 core tools helper for sub packages. This is an internal package.", "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core-helpers", "license": "LGPL-3.0", @@ -14,8 +14,8 @@ "main": "src/index.js", "dependencies": { "underscore": "1.9.1", - "web3-eth-iban": "1.2.1", - "web3-utils": "1.2.1" + "web3-eth-iban": "1.2.2", + "web3-utils": "1.2.2" }, "devDependencies": { "definitelytyped-header-parser": "^1.0.1", diff --git a/packages/web3-core-method/package.json b/packages/web3-core-method/package.json index 90bc0654f8e..63671765513 100644 --- a/packages/web3-core-method/package.json +++ b/packages/web3-core-method/package.json @@ -1,6 +1,6 @@ { "name": "web3-core-method", - "version": "1.2.1", + "version": "1.2.2", "description": "Creates the methods on the web3 modules. This is an internal package.", "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core-method", "license": "LGPL-3.0", @@ -14,10 +14,10 @@ "main": "src/index.js", "dependencies": { "underscore": "1.9.1", - "web3-core-helpers": "1.2.1", - "web3-core-promievent": "1.2.1", - "web3-core-subscriptions": "1.2.1", - "web3-utils": "1.2.1" + "web3-core-helpers": "1.2.2", + "web3-core-promievent": "1.2.2", + "web3-core-subscriptions": "1.2.2", + "web3-utils": "1.2.2" }, "devDependencies": { "definitelytyped-header-parser": "^1.0.1", diff --git a/packages/web3-core-promievent/package.json b/packages/web3-core-promievent/package.json index ab023679546..476b0c38435 100644 --- a/packages/web3-core-promievent/package.json +++ b/packages/web3-core-promievent/package.json @@ -1,7 +1,7 @@ { "name": "web3-core-promievent", - "version": "1.2.1", - "description": "This package extends eventEmitters with promises to allow chaining as well as multiple final states of a function.", + "version": "1.2.2", + "description": "This package extends the EventEmitter with the Promise class to allow chaining as well as multiple final states of a function.", "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core-promievent", "license": "LGPL-3.0", "engines": { diff --git a/packages/web3-core-requestmanager/package.json b/packages/web3-core-requestmanager/package.json index d81fbfcd68d..30d1664222c 100644 --- a/packages/web3-core-requestmanager/package.json +++ b/packages/web3-core-requestmanager/package.json @@ -1,6 +1,6 @@ { "name": "web3-core-requestmanager", - "version": "1.2.1", + "version": "1.2.2", "description": "Web3 module to handle requests to external providers.", "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core-requestmanager", "license": "LGPL-3.0", @@ -10,9 +10,9 @@ "main": "src/index.js", "dependencies": { "underscore": "1.9.1", - "web3-core-helpers": "1.2.1", - "web3-providers-http": "1.2.1", - "web3-providers-ipc": "1.2.1", - "web3-providers-ws": "1.2.1" + "web3-core-helpers": "1.2.2", + "web3-providers-http": "1.2.2", + "web3-providers-ipc": "1.2.2", + "web3-providers-ws": "1.2.2" } } diff --git a/packages/web3-core-subscriptions/package.json b/packages/web3-core-subscriptions/package.json index 44f356a8946..3a9719889aa 100644 --- a/packages/web3-core-subscriptions/package.json +++ b/packages/web3-core-subscriptions/package.json @@ -1,6 +1,6 @@ { "name": "web3-core-subscriptions", - "version": "1.2.1", + "version": "1.2.2", "description": "Manages web3 subscriptions. This is an internal package.", "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core-subscriptions", "license": "LGPL-3.0", @@ -15,7 +15,7 @@ "dependencies": { "eventemitter3": "3.1.2", "underscore": "1.9.1", - "web3-core-helpers": "1.2.1" + "web3-core-helpers": "1.2.2" }, "devDependencies": { "definitelytyped-header-parser": "^1.0.1", diff --git a/packages/web3-core/package.json b/packages/web3-core/package.json index 95d3f951a13..ba8b09761a8 100644 --- a/packages/web3-core/package.json +++ b/packages/web3-core/package.json @@ -1,6 +1,6 @@ { "name": "web3-core", - "version": "1.2.1", + "version": "1.2.2", "description": "Web3 core tools for sub packages. This is an internal package.", "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-core", "license": "LGPL-3.0", @@ -15,10 +15,10 @@ "dependencies": { "@types/bn.js": "^4.11.4", "@types/node": "^12.6.1", - "web3-core-helpers": "1.2.1", - "web3-core-method": "1.2.1", - "web3-core-requestmanager": "1.2.1", - "web3-utils": "1.2.1" + "web3-core-helpers": "1.2.2", + "web3-core-method": "1.2.2", + "web3-core-requestmanager": "1.2.2", + "web3-utils": "1.2.2" }, "devDependencies": { "definitelytyped-header-parser": "^1.0.1", diff --git a/packages/web3-eth-abi/package.json b/packages/web3-eth-abi/package.json index 5c6600df154..7a0d0d2d10d 100644 --- a/packages/web3-eth-abi/package.json +++ b/packages/web3-eth-abi/package.json @@ -1,6 +1,6 @@ { "name": "web3-eth-abi", - "version": "1.2.1", + "version": "1.2.2", "description": "Web3 module encode and decode EVM in/output.", "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-eth-abi", "license": "LGPL-3.0", @@ -15,7 +15,7 @@ "dependencies": { "ethers": "4.0.0-beta.3", "underscore": "1.9.1", - "web3-utils": "1.2.1" + "web3-utils": "1.2.2" }, "devDependencies": { "definitelytyped-header-parser": "^1.0.1", diff --git a/packages/web3-eth-accounts/package-lock.json b/packages/web3-eth-accounts/package-lock.json index 4d91cd846d0..6857548d2ac 100644 --- a/packages/web3-eth-accounts/package-lock.json +++ b/packages/web3-eth-accounts/package-lock.json @@ -336,7 +336,7 @@ "resolved": "https://registry.npmjs.org/dtslint/-/dtslint-0.4.2.tgz", "integrity": "sha512-ph4GXLw3HYzlQMJOFcpCqWHuL3MxJ/344OR7wn0wlQGchQGTIVNsSUl8iKEMatpy2geNMysgA9fQa6xVhHOkTQ==", "requires": { - "definitelytyped-header-parser": "github:Microsoft/definitelytyped-header-parser#d957ad0bb2f4ecb60ac04f734e0b38fbc8e70b8a", + "definitelytyped-header-parser": "github:Microsoft/definitelytyped-header-parser#production", "fs-extra": "^6.0.1", "strip-json-comments": "^2.0.1", "tslint": "^5.12.0", diff --git a/packages/web3-eth-accounts/package.json b/packages/web3-eth-accounts/package.json index 40c9c4c705a..f8381a41d70 100644 --- a/packages/web3-eth-accounts/package.json +++ b/packages/web3-eth-accounts/package.json @@ -1,6 +1,6 @@ { "name": "web3-eth-accounts", - "version": "1.2.1", + "version": "1.2.2", "description": "Web3 module to generate Ethereum accounts and sign data and transactions.", "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-eth-accounts", "license": "LGPL-3.0", @@ -21,10 +21,10 @@ "scrypt-shim": "github:web3-js/scrypt-shim", "underscore": "1.9.1", "uuid": "3.3.2", - "web3-core": "1.2.1", - "web3-core-helpers": "1.2.1", - "web3-core-method": "1.2.1", - "web3-utils": "1.2.1" + "web3-core": "1.2.2", + "web3-core-helpers": "1.2.2", + "web3-core-method": "1.2.2", + "web3-utils": "1.2.2" }, "devDependencies": { "definitelytyped-header-parser": "^1.0.1", diff --git a/packages/web3-eth-contract/package.json b/packages/web3-eth-contract/package.json index 5db279ea73e..8edca264bc4 100644 --- a/packages/web3-eth-contract/package.json +++ b/packages/web3-eth-contract/package.json @@ -1,6 +1,6 @@ { "name": "web3-eth-contract", - "version": "1.2.1", + "version": "1.2.2", "description": "Web3 module to interact with Ethereum smart contracts.", "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-eth-contract", "license": "LGPL-3.0", @@ -15,13 +15,13 @@ "dependencies": { "@types/bn.js": "^4.11.4", "underscore": "1.9.1", - "web3-core": "1.2.1", - "web3-core-helpers": "1.2.1", - "web3-core-method": "1.2.1", - "web3-core-promievent": "1.2.1", - "web3-core-subscriptions": "1.2.1", - "web3-eth-abi": "1.2.1", - "web3-utils": "1.2.1" + "web3-core": "1.2.2", + "web3-core-helpers": "1.2.2", + "web3-core-method": "1.2.2", + "web3-core-promievent": "1.2.2", + "web3-core-subscriptions": "1.2.2", + "web3-eth-abi": "1.2.2", + "web3-utils": "1.2.2" }, "devDependencies": { "definitelytyped-header-parser": "^1.0.1", diff --git a/packages/web3-eth-ens/package.json b/packages/web3-eth-ens/package.json index 1f1dd8899bd..d00240b957b 100644 --- a/packages/web3-eth-ens/package.json +++ b/packages/web3-eth-ens/package.json @@ -1,6 +1,6 @@ { "name": "web3-eth-ens", - "version": "1.2.1", + "version": "1.2.2", "description": "ENS support for web3.", "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-eth-ens", "license": "LGPL-3.0", @@ -15,12 +15,12 @@ "dependencies": { "eth-ens-namehash": "2.0.8", "underscore": "1.9.1", - "web3-core": "1.2.1", - "web3-core-helpers": "1.2.1", - "web3-core-promievent": "1.2.1", - "web3-eth-abi": "1.2.1", - "web3-eth-contract": "1.2.1", - "web3-utils": "1.2.1" + "web3-core": "1.2.2", + "web3-core-helpers": "1.2.2", + "web3-core-promievent": "1.2.2", + "web3-eth-abi": "1.2.2", + "web3-eth-contract": "1.2.2", + "web3-utils": "1.2.2" }, "devDependencies": { "definitelytyped-header-parser": "^1.0.1", diff --git a/packages/web3-eth-iban/package.json b/packages/web3-eth-iban/package.json index 40e61f1091b..7d52bf27e1a 100644 --- a/packages/web3-eth-iban/package.json +++ b/packages/web3-eth-iban/package.json @@ -1,6 +1,6 @@ { "name": "web3-eth-iban", - "version": "1.2.1", + "version": "1.2.2", "description": "This package converts Ethereum addresses to IBAN addresses a vice versa.", "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-eth-iban", "license": "LGPL-3.0", @@ -14,7 +14,7 @@ "main": "src/index.js", "dependencies": { "bn.js": "4.11.8", - "web3-utils": "1.2.1" + "web3-utils": "1.2.2" }, "devDependencies": { "definitelytyped-header-parser": "^1.0.1", diff --git a/packages/web3-eth-personal/package.json b/packages/web3-eth-personal/package.json index 42b4d0aaec6..580d4e600a8 100644 --- a/packages/web3-eth-personal/package.json +++ b/packages/web3-eth-personal/package.json @@ -1,6 +1,6 @@ { "name": "web3-eth-personal", - "version": "1.2.1", + "version": "1.2.2", "description": "Web3 module to interact with the Ethereum blockchain accounts stored in the node.", "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-eth-personal", "license": "LGPL-3.0", @@ -14,11 +14,11 @@ "main": "src/index.js", "dependencies": { "@types/node": "^12.6.1", - "web3-core": "1.2.1", - "web3-core-helpers": "1.2.1", - "web3-core-method": "1.2.1", - "web3-net": "1.2.1", - "web3-utils": "1.2.1" + "web3-core": "1.2.2", + "web3-core-helpers": "1.2.2", + "web3-core-method": "1.2.2", + "web3-net": "1.2.2", + "web3-utils": "1.2.2" }, "devDependencies": { "definitelytyped-header-parser": "^1.0.1", diff --git a/packages/web3-eth/package.json b/packages/web3-eth/package.json index fbb28b74bd4..bb447a56adc 100644 --- a/packages/web3-eth/package.json +++ b/packages/web3-eth/package.json @@ -1,6 +1,6 @@ { "name": "web3-eth", - "version": "1.2.1", + "version": "1.2.2", "description": "Web3 module to interact with the Ethereum blockchain and smart contracts.", "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-eth", "license": "LGPL-3.0", @@ -14,18 +14,18 @@ "main": "src/index.js", "dependencies": { "underscore": "1.9.1", - "web3-core": "1.2.1", - "web3-core-helpers": "1.2.1", - "web3-core-method": "1.2.1", - "web3-core-subscriptions": "1.2.1", - "web3-eth-abi": "1.2.1", - "web3-eth-accounts": "1.2.1", - "web3-eth-contract": "1.2.1", - "web3-eth-ens": "1.2.1", - "web3-eth-iban": "1.2.1", - "web3-eth-personal": "1.2.1", - "web3-net": "1.2.1", - "web3-utils": "1.2.1" + "web3-core": "1.2.2", + "web3-core-helpers": "1.2.2", + "web3-core-method": "1.2.2", + "web3-core-subscriptions": "1.2.2", + "web3-eth-abi": "1.2.2", + "web3-eth-accounts": "1.2.2", + "web3-eth-contract": "1.2.2", + "web3-eth-ens": "1.2.2", + "web3-eth-iban": "1.2.2", + "web3-eth-personal": "1.2.2", + "web3-net": "1.2.2", + "web3-utils": "1.2.2" }, "devDependencies": { "definitelytyped-header-parser": "^1.0.1", diff --git a/packages/web3-net/package.json b/packages/web3-net/package.json index 7649d6609f5..fd3d32f7197 100644 --- a/packages/web3-net/package.json +++ b/packages/web3-net/package.json @@ -1,6 +1,6 @@ { "name": "web3-net", - "version": "1.2.1", + "version": "1.2.2", "description": "Web3 module to interact with the Ethereum nodes networking properties.", "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-net", "license": "LGPL-3.0", @@ -13,9 +13,9 @@ }, "main": "src/index.js", "dependencies": { - "web3-core": "1.2.1", - "web3-core-method": "1.2.1", - "web3-utils": "1.2.1" + "web3-core": "1.2.2", + "web3-core-method": "1.2.2", + "web3-utils": "1.2.2" }, "devDependencies": { "definitelytyped-header-parser": "^1.0.1", diff --git a/packages/web3-providers-http/package.json b/packages/web3-providers-http/package.json index 825a53e07f1..53901ca7566 100644 --- a/packages/web3-providers-http/package.json +++ b/packages/web3-providers-http/package.json @@ -1,6 +1,6 @@ { "name": "web3-providers-http", - "version": "1.2.1", + "version": "1.2.2", "description": "Module to handle web3 RPC connections over HTTP.", "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-providers-http", "license": "LGPL-3.0", @@ -13,7 +13,7 @@ "types": "types/index.d.ts", "main": "src/index.js", "dependencies": { - "web3-core-helpers": "1.2.1", + "web3-core-helpers": "1.2.2", "xhr2-cookies": "1.1.0" }, "devDependencies": { diff --git a/packages/web3-providers-ipc/package.json b/packages/web3-providers-ipc/package.json index f0338bf0e1a..79696115202 100644 --- a/packages/web3-providers-ipc/package.json +++ b/packages/web3-providers-ipc/package.json @@ -1,6 +1,6 @@ { "name": "web3-providers-ipc", - "version": "1.2.1", + "version": "1.2.2", "description": "Module to handle web3 RPC connections over IPC sockets.", "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-providers-ipc", "license": "LGPL-3.0", @@ -15,7 +15,7 @@ "dependencies": { "oboe": "2.1.4", "underscore": "1.9.1", - "web3-core-helpers": "1.2.1" + "web3-core-helpers": "1.2.2" }, "devDependencies": { "definitelytyped-header-parser": "^1.0.1", diff --git a/packages/web3-providers-ws/package-lock.json b/packages/web3-providers-ws/package-lock.json index 3fe8d2c4339..bb288261e0b 100644 --- a/packages/web3-providers-ws/package-lock.json +++ b/packages/web3-providers-ws/package-lock.json @@ -129,7 +129,7 @@ "resolved": "https://registry.npmjs.org/dtslint/-/dtslint-0.4.2.tgz", "integrity": "sha512-ph4GXLw3HYzlQMJOFcpCqWHuL3MxJ/344OR7wn0wlQGchQGTIVNsSUl8iKEMatpy2geNMysgA9fQa6xVhHOkTQ==", "requires": { - "definitelytyped-header-parser": "github:Microsoft/definitelytyped-header-parser#d957ad0bb2f4ecb60ac04f734e0b38fbc8e70b8a", + "definitelytyped-header-parser": "github:Microsoft/definitelytyped-header-parser#production", "fs-extra": "^6.0.1", "strip-json-comments": "^2.0.1", "tslint": "^5.12.0", diff --git a/packages/web3-providers-ws/package.json b/packages/web3-providers-ws/package.json index 3ad67bca94e..50519e7d119 100644 --- a/packages/web3-providers-ws/package.json +++ b/packages/web3-providers-ws/package.json @@ -1,6 +1,6 @@ { "name": "web3-providers-ws", - "version": "1.2.1", + "version": "1.2.2", "description": "Module to handle web3 RPC connections over WebSockets.", "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-providers-ws", "license": "LGPL-3.0", @@ -14,7 +14,7 @@ "main": "src/index.js", "dependencies": { "underscore": "1.9.1", - "web3-core-helpers": "1.2.1", + "web3-core-helpers": "1.2.2", "websocket": "github:web3-js/WebSocket-Node#polyfill/globalThis" }, "devDependencies": { diff --git a/packages/web3-shh/package.json b/packages/web3-shh/package.json index 0c05a795957..a8d7eb9365a 100644 --- a/packages/web3-shh/package.json +++ b/packages/web3-shh/package.json @@ -1,6 +1,6 @@ { "name": "web3-shh", - "version": "1.2.1", + "version": "1.2.2", "description": "Web3 module to interact with the Whisper messaging protocol.", "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-shh", "license": "LGPL-3.0", @@ -13,10 +13,10 @@ }, "main": "src/index.js", "dependencies": { - "web3-core": "1.2.1", - "web3-core-method": "1.2.1", - "web3-core-subscriptions": "1.2.1", - "web3-net": "1.2.1" + "web3-core": "1.2.2", + "web3-core-method": "1.2.2", + "web3-core-subscriptions": "1.2.2", + "web3-net": "1.2.2" }, "devDependencies": { "definitelytyped-header-parser": "^1.0.1", diff --git a/packages/web3-utils/package.json b/packages/web3-utils/package.json index 2af56567c7c..184a3fb7cec 100644 --- a/packages/web3-utils/package.json +++ b/packages/web3-utils/package.json @@ -1,6 +1,6 @@ { "name": "web3-utils", - "version": "1.2.1", + "version": "1.2.2", "description": "Collection of utility functions used in web3.js.", "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3-utils", "license": "LGPL-3.0", diff --git a/packages/web3/package.json b/packages/web3/package.json index bdbe2e3520b..3bf2c136c27 100644 --- a/packages/web3/package.json +++ b/packages/web3/package.json @@ -1,6 +1,6 @@ { "name": "web3", - "version": "1.2.1", + "version": "1.2.2", "description": "Ethereum JavaScript API", "repository": "https://github.com/ethereum/web3.js/tree/1.x/packages/web3", "license": "LGPL-3.0", @@ -51,13 +51,13 @@ ], "dependencies": { "@types/node": "^12.6.1", - "web3-bzz": "1.2.1", - "web3-core": "1.2.1", - "web3-eth": "1.2.1", - "web3-eth-personal": "1.2.1", - "web3-net": "1.2.1", - "web3-shh": "1.2.1", - "web3-utils": "1.2.1" + "web3-bzz": "1.2.2", + "web3-core": "1.2.2", + "web3-eth": "1.2.2", + "web3-eth-personal": "1.2.2", + "web3-net": "1.2.2", + "web3-shh": "1.2.2", + "web3-utils": "1.2.2" }, "devDependencies": { "definitelytyped-header-parser": "^1.0.1",