Merge branch '1.0' into 1.0

web3 · Sep 18, 2017 · 8033f6f · 8033f6f
2 parents ee76dab + f5bc2ba
commit 8033f6f
Show file tree

Hide file tree

Showing 52 changed files with 188 additions and 118 deletions.
diff --git a/bower.json b/bower.json
@@ -29,30 +29,30 @@
  "API"
  ],
  "authors": [
-  {
-  "name": "Fabian Vogelsteller",
-  "email": "fabian@ethereum.org",
-  "homepage": "http://frozeman.de"
-  },
-  {
-  "name": "Marek Kotewicz",
-  "email": "marek@parity.io",
-  "url": "https://github.com/debris"
-  },
-  {
-  "name": "Marian Oancea",
-  "url": "https://github.com/cubedro"
-  },
-  {
-  "name": "Gav Wood",
-  "email": "g@parity.io",
-  "homepage": "http://gavwood.com"
-  },
-  {
-  "name": "Jeffery Wilcke",
-  "email": "jeffrey.wilcke@ethereum.org",
-  "url": "https://github.com/obscuren"
-  }
+ {
+ "name": "Fabian Vogelsteller",
+ "email": "fabian@ethereum.org",
+ "homepage": "http://frozeman.de"
+ },
+ {
+ "name": "Marek Kotewicz",
+ "email": "marek@parity.io",
+ "url": "https://github.com/debris"
+ },
+ {
+ "name": "Marian Oancea",
+ "url": "https://github.com/cubedro"
+ },
+ {
+ "name": "Gav Wood",
+ "email": "g@parity.io",
+ "homepage": "http://gavwood.com"
+ },
+ {
+ "name": "Jeffery Wilcke",
+ "email": "jeffrey.wilcke@ethereum.org",
+ "url": "https://github.com/obscuren"
+ }
  ],
  "ignore": [
  "test",

diff --git a/gulpfile.js b/gulpfile.js
@@ -23,7 +23,7 @@ var DEST = path.join(__dirname, 'dist/');
 var packages = [{
  fileName: 'web3',
  expose: 'Web3',
- src: './src/index.js',
+ src: './packages/web3/src/index.js',
  ignore: ['xmlhttprequest','websocket']
 },{
  fileName: 'web3-utils',
@@ -185,7 +185,7 @@ packages.forEach(function(pckg, i){
 
 
 gulp.task('watch', function() {
- gulp.watch(['./src/*.js'], ['lint', 'build']);
+ gulp.watch(['./packages/web3/src/*.js'], ['lint', 'build']);
 });
 
 gulp.task('all', ['version', 'lint', 'clean', packages[packages.length-1].fileName]);

diff --git a/package.json b/package.json
@@ -2,19 +2,17 @@
  "name": "web3",
  "namespace": "ethereum",
  "version": "1.0.0-beta.20",
- "description": "Ethereum JavaScript API",
+ "description": "Ethereum JavaScript API wrapper repository",
  "license": "LGPL-3.0",
- "main": "./src/index.js",
  "directories": {
- "lib": "./src",
  "doc": "./doc",
  "test": "./test"
  },
  "scripts": {
  "postinstall": "lerna bootstrap",
  "build": "gulp",
  "build-all": "gulp all",
- "release": "lerna bootstrap; gulp; lerna publish --skip-git; gulp version; npm publish",
+ "release": "lerna bootstrap; gulp; lerna publish --skip-git; gulp version;",
  "watch": "gulp watch",
  "docs": "cd docs; make html;",
  "lint": "jshint *.js packages",
@@ -61,9 +59,6 @@
  "url": "https://github.com/obscuren"
  }
  ],
- "dependencies": {
- "lerna": "^2.0.0"
- },
  "devDependencies": {
  "babel-preset-env": "^1.6.0",
  "bignumber.js": "^4.0.0",
@@ -86,6 +81,7 @@
  "gulp-uglify": "^3.0.0",
  "istanbul": "^0.4.4",
  "jshint": ">=2.5.0",
+ "lerna": "^2.0.0",
  "mocha": ">=2.3.3",
  "sandboxed-module": "^2.0.2",
  "underscore": "^1.8.3",

diff --git a/packages/web3-bzz/package.json b/packages/web3-bzz/package.json
@@ -1,6 +1,7 @@
 {
  "name": "web3-bzz",
- "version": "1.0.0-beta.17",
+ "namespace": "ethereum",
+ "version": "1.0.0-beta.20",
  "description": "Web3 module to interact with the Swarm network.",
  "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-bzz",
  "license": "LGPL-3.0",

diff --git a/packages/web3-core-helpers/package.json b/packages/web3-core-helpers/package.json
@@ -1,5 +1,6 @@
 {
  "name": "web3-core-helpers",
+ "namespace": "ethereum",
  "version": "1.0.0-beta.20",
  "description": "Web3 core tools helper for sub packages. This is an internal package.",
  "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-core-helpers",

diff --git a/packages/web3-core-method/package.json b/packages/web3-core-method/package.json
@@ -1,5 +1,6 @@
 {
  "name": "web3-core-method",
+ "namespace": "ethereum",
  "version": "1.0.0-beta.20",
  "description": "Creates the methods on the web3 modules. This is an internal package.",
  "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-core-method",

diff --git a/packages/web3-core-promievent/package.json b/packages/web3-core-promievent/package.json
@@ -1,6 +1,7 @@
 {
  "name": "web3-core-promievent",
- "version": "1.0.0-beta.17",
+ "namespace": "ethereum",
+ "version": "1.0.0-beta.20",
  "description": "This package extends eventEmitters with promises to allow chaining as well as multiple final states of a function.",
  "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-core-promievent",
  "license": "LGPL-3.0",

diff --git a/packages/web3-core-requestmanager/package.json b/packages/web3-core-requestmanager/package.json
@@ -1,5 +1,6 @@
 {
  "name": "web3-core-requestmanager",
+ "namespace": "ethereum",
  "version": "1.0.0-beta.20",
  "description": "Web3 module to handle requests to external providers.",
  "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-core-requestmanager",

diff --git a/packages/web3-core-subscriptions/package.json b/packages/web3-core-subscriptions/package.json
@@ -1,5 +1,6 @@
 {
  "name": "web3-core-subscriptions",
+ "namespace": "ethereum",
  "version": "1.0.0-beta.20",
  "description": "Manages web3 subscriptions. This is an internal package.",
  "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-core-subscriptions",

diff --git a/packages/web3-core/package.json b/packages/web3-core/package.json
@@ -1,5 +1,6 @@
 {
  "name": "web3-core",
+ "namespace": "ethereum",
  "version": "1.0.0-beta.20",
  "description": "Web3 core tools for sub packages. This is an internal package.",
  "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-core",

diff --git a/packages/web3-eth-abi/package.json b/packages/web3-eth-abi/package.json
@@ -1,5 +1,6 @@
 {
  "name": "web3-eth-abi",
+ "namespace": "ethereum",
  "version": "1.0.0-beta.20",
  "description": "Web3 module encode and decode EVM in/output.",
  "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-eth-abi",

diff --git a/packages/web3-eth-accounts/package.json b/packages/web3-eth-accounts/package.json
@@ -1,19 +1,20 @@
 {
- "name": "web3-eth-accounts",
- "version": "1.0.0-beta.20",
- "description": "Web3 module to generate Ethereum accounts and sign data and transactions.",
- "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-eth-accounts",
- "license": "LGPL-3.0",
- "main": "src/index.js",
- "dependencies": {
- "bluebird": "3.3.1",
- "eth-lib": "^0.1.27",
- "scrypt.js": "0.2.0",
- "underscore": "1.8.3",
- "uuid": "2.0.1",
- "web3-core": "^1.0.0-beta.20",
- "web3-core-helpers": "^1.0.0-beta.20",
- "web3-core-method": "^1.0.0-beta.20",
- "web3-utils": "^1.0.0-beta.20"
- }
+ "name": "web3-eth-accounts",
+ "namespace": "ethereum",
+ "version": "1.0.0-beta.20",
+ "description": "Web3 module to generate Ethereum accounts and sign data and transactions.",
+ "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-eth-accounts",
+ "license": "LGPL-3.0",
+ "main": "src/index.js",
+ "dependencies": {
+ "bluebird": "3.3.1",
+ "eth-lib": "^0.1.27",
+ "scrypt.js": "0.2.0",
+ "underscore": "1.8.3",
+ "uuid": "2.0.1",
+ "web3-core": "^1.0.0-beta.20",
+ "web3-core-helpers": "^1.0.0-beta.20",
+ "web3-core-method": "^1.0.0-beta.20",
+ "web3-utils": "^1.0.0-beta.20"
+ }
 }
diff --git a/packages/web3-eth-contract/package.json b/packages/web3-eth-contract/package.json
@@ -1,5 +1,6 @@
 {
  "name": "web3-eth-contract",
+ "namespace": "ethereum",
  "version": "1.0.0-beta.20",
  "description": "Web3 module to interact with Ethereum smart contracts.",
  "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-eth-contract",

diff --git a/packages/web3-eth-iban/package.json b/packages/web3-eth-iban/package.json
@@ -1,5 +1,6 @@
 {
  "name": "web3-eth-iban",
+ "namespace": "ethereum",
  "version": "1.0.0-beta.20",
  "description": "This package converts Ethereum addresses to IBAN addresses a vice versa.",
  "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-eth-iban",

diff --git a/packages/web3-eth-personal/package.json b/packages/web3-eth-personal/package.json
@@ -1,5 +1,6 @@
 {
  "name": "web3-eth-personal",
+ "namespace": "ethereum",
  "version": "1.0.0-beta.20",
  "description": "Web3 module to interact with the Ethereum blockchain accounts stored in the node.",
  "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-eth-personal",

diff --git a/packages/web3-eth/package.json b/packages/web3-eth/package.json
@@ -1,5 +1,6 @@
 {
  "name": "web3-eth",
+ "namespace": "ethereum",
  "version": "1.0.0-beta.20",
  "description": "Web3 module to interact with the Ethereum blockchain and smart contracts.",
  "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-eth",

diff --git a/packages/web3-net/package.json b/packages/web3-net/package.json
@@ -1,5 +1,6 @@
 {
  "name": "web3-net",
+ "namespace": "ethereum",
  "version": "1.0.0-beta.20",
  "description": "Web3 module to interact with the Ethereum nodes networking properties.",
  "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-net",

diff --git a/packages/web3-net/src/index.js b/packages/web3-net/src/index.js
diff --git a/packages/web3-providers-http/package.json b/packages/web3-providers-http/package.json
@@ -1,5 +1,6 @@
 {
  "name": "web3-providers-http",
+ "namespace": "ethereum",
  "version": "1.0.0-beta.20",
  "description": "Module to handle web3 RPC connections over HTTP.",
  "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-providers-http",

diff --git a/packages/web3-providers-ipc/package.json b/packages/web3-providers-ipc/package.json
@@ -1,5 +1,6 @@
 {
  "name": "web3-providers-ipc",
+ "namespace": "ethereum",
  "version": "1.0.0-beta.20",
  "description": "Module to handle web3 RPC connections over IPC sockets.",
  "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-providers-ipc",

diff --git a/packages/web3-providers-ws/package.json b/packages/web3-providers-ws/package.json
@@ -1,5 +1,6 @@
 {
  "name": "web3-providers-ws",
+ "namespace": "ethereum",
  "version": "1.0.0-beta.20",
  "description": "Module to handle web3 RPC connections over WebSockets.",
  "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-providers-ws",

diff --git a/packages/web3-shh/package.json b/packages/web3-shh/package.json
@@ -1,5 +1,6 @@
 {
  "name": "web3-shh",
+ "namespace": "ethereum",
  "version": "1.0.0-beta.20",
  "description": "Web3 module to interact with the Whisper messaging protocol.",
  "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-shh",

diff --git a/packages/web3-utils/package.json b/packages/web3-utils/package.json
@@ -1,17 +1,18 @@
 {
- "name": "web3-utils",
- "version": "1.0.0-beta.20",
- "description": "Collection of utility functions used in web3.js.",
- "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-utils",
- "license": "LGPL-3.0",
- "main": "src/index.js",
- "dependencies": {
- "bn.js": "4.11.6",
- "eth-lib": "^0.1.27",
- "ethjs-unit": "0.1.6",
- "number-to-bn": "1.7.0",
- "randomhex": "0.1.5",
- "underscore": "1.8.3",
- "utf8": "2.1.1"
- }
+ "name": "web3-utils",
+ "namespace": "ethereum",
+ "version": "1.0.0-beta.20",
+ "description": "Collection of utility functions used in web3.js.",
+ "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3-utils",
+ "license": "LGPL-3.0",
+ "main": "src/index.js",
+ "dependencies": {
+ "bn.js": "4.11.6",
+ "eth-lib": "^0.1.27",
+ "ethjs-unit": "0.1.6",
+ "number-to-bn": "1.7.0",
+ "randomhex": "0.1.5",
+ "underscore": "1.8.3",
+ "utf8": "2.1.1"
+ }
 }
diff --git a/packages/web3/README.md b/packages/web3/README.md
@@ -0,0 +1,13 @@
+# web3
+
+This is a main package of [web3.js][repo]
+
+Please read the [documentation][docs] for more.
+
+## Installation
+
+### Node.js
+
+```bash
+npm install web3
+```
diff --git a/packages/web3/package.json b/packages/web3/package.json
@@ -0,0 +1,53 @@
+{
+ "name": "web3",
+ "namespace": "ethereum",
+ "version": "1.0.0-beta.20",
+ "description": "Ethereum JavaScript API",
+ "repository": "https://github.com/ethereum/web3.js/tree/master/packages/web3",
+ "license": "LGPL-3.0",
+ "main": "src/index.js",
+ "bugs": {
+ "url": "https://github.com/ethereum/web3.js/issues"
+ },
+ "keywords": [
+ "Ethereum",
+ "JavaScript",
+ "API"
+ ],
+ "author": "ethereum.org",
+ "authors": [
+ {
+ "name": "Fabian Vogelsteller",
+ "email": "fabian@ethereum.org",
+ "homepage": "http://frozeman.de"
+ },
+ {
+ "name": "Marek Kotewicz",
+ "email": "marek@parity.io",
+ "url": "https://github.com/debris"
+ },
+ {
+ "name": "Marian Oancea",
+ "url": "https://github.com/cubedro"
+ },
+ {
+ "name": "Gav Wood",
+ "email": "g@parity.io",
+ "homepage": "http://gavwood.com"
+ },
+ {
+ "name": "Jeffery Wilcke",
+ "email": "jeffrey.wilcke@ethereum.org",
+ "url": "https://github.com/obscuren"
+ }
+ ],
+ "dependencies": {
+ "web3-core": "^1.0.0-beta.20",
+ "web3-eth": "^1.0.0-beta.20",
+ "web3-net": "^1.0.0-beta.20",
+ "web3-eth-personal": "^1.0.0-beta.20",
+ "web3-shh": "^1.0.0-beta.20",
+ "web3-bzz": "^1.0.0-beta.20",
+ "web3-utils": "^1.0.0-beta.20"
+ }
+}