Merge branch '1.0' into issue/n1351

web3 · May 7, 2019 · 6b7590d · 6b7590d
2 parents ca334ea + cff590d
commit 6b7590d
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 32 deletions.
diff --git a/docs/web3-eth-ens.rst b/docs/web3-eth-ens.rst
@@ -711,7 +711,7 @@ getContenthash
 
  web3.eth.ens.getContenthash(ENSName, [callback]);
 
-Returns the contenthash associated with an Ens node.
+Returns the contenthash associated with an Ens node. `contenthash` encoding is defined in [EIP1577](http://eips.ethereum.org/EIPS/eip-1577)
 
 ----------
 Parameters
@@ -732,10 +732,10 @@ Example
 
 .. code-block:: javascript
 
- web3.eth.ens.getContenthash('ethereum.eth').then((result) => {
+ web3.eth.ens.getContenthash('pac-txt.eth').then((result) => {
  console.log(result);
  });
- > 'QmXpSwxdmgWaYrgMUzuDWCnjsZo5RxphE3oW7VhTMSCoKK'
+ > '0xe30101701220e08ea2458249e8f26aee72b95b39c33849a992a3eff40bd06d26c12197adef16'
 
 ------------------------------------------------------------------------------
 
@@ -771,7 +771,7 @@ Example
 
  web3.eth.ens.setContenthash(
  'ethereum.eth',
- 'QmXpSwxdmgWaYrgMUzuDWCnjsZo5RxphE3oW7VhTMSCoKK',
+ '0xe301017012208cd82588c4e08268fa0b824caa93847ac843410076eeedc41d65fb52eccbb9e6',
  {
  from: '0x9CC9a2c777605Af16872E0997b3Aeb91d96D5D8c'
  }
@@ -784,7 +784,7 @@ Example
 
  web3.eth.ens.setContenthash(
  'ethereum.eth',
- 'QmXpSwxdmgWaYrgMUzuDWCnjsZo5RxphE3oW7VhTMSCoKK',
+ '0xe301017012208cd82588c4e08268fa0b824caa93847ac843410076eeedc41d65fb52eccbb9e6',
  {
  from: '0x9CC9a2c777605Af16872E0997b3Aeb91d96D5D8c'
  }

diff --git a/packages/web3-core-helpers/package.json b/packages/web3-core-helpers/package.json
@@ -19,13 +19,12 @@
  "@babel/runtime": "^7.3.1",
  "lodash": "^4.17.11",
  "web3-eth-iban": "1.0.0-beta.54",
- "web3-utils": "1.0.0-beta.54"
+ "web3-utils": "1.0.0-beta.54",
+ "web3-core": "1.0.0-beta.54"
  },
  "devDependencies": {
  "definitelytyped-header-parser": "^1.0.1",
- "dtslint": "0.4.2",
- "web3-core": "1.0.0-beta.54",
- "web3-providers": "1.0.0-beta.54"
+ "dtslint": "0.4.2"
  },
  "files": [
  "dist",

diff --git a/packages/web3-core-method/package.json b/packages/web3-core-method/package.json
@@ -19,17 +19,17 @@
  "dependencies": {
  "@babel/runtime": "^7.3.1",
  "eventemitter3": "3.1.0",
+ "rxjs": "^6.4.0",
+ "web3-core": "1.0.0-beta.54",
+ "web3-core-helpers": "1.0.0-beta.54",
+ "web3-utils": "1.0.0-beta.54",
+ "web3-core-subscriptions": "1.0.0-beta.54",
  "lodash": "^4.17.11"
  },
  "devDependencies": {
  "definitelytyped-header-parser": "^1.0.1",
  "dtslint": "0.4.2",
- "rxjs": "^6.4.0",
- "web3-core": "1.0.0-beta.54",
- "web3-core-helpers": "1.0.0-beta.54",
- "web3-core-subscriptions": "1.0.0-beta.54",
- "web3-providers": "1.0.0-beta.54",
- "web3-utils": "1.0.0-beta.54"
+ "web3-providers": "1.0.0-beta.54"
  },
  "files": [
  "dist",

diff --git a/packages/web3-core/package.json b/packages/web3-core/package.json
@@ -20,14 +20,13 @@
  "@types/bn.js": "^4.11.4",
  "@types/node": "^10.12.18",
  "lodash": "^4.17.11",
- "web3-utils": "1.0.0-beta.54"
+ "web3-utils": "1.0.0-beta.54",
+ "web3-core-method": "1.0.0-beta.54",
+ "web3-providers": "1.0.0-beta.54"
  },
  "devDependencies": {
  "definitelytyped-header-parser": "^1.0.1",
- "dtslint": "0.4.2",
- "web3-core-method": "1.0.0-beta.54",
- "web3-eth-accounts": "1.0.0-beta.54",
- "web3-providers": "1.0.0-beta.54"
+ "dtslint": "0.4.2"
  },
  "files": [
  "dist",

diff --git a/packages/web3-eth-ens/package.json b/packages/web3-eth-ens/package.json
@@ -24,13 +24,13 @@
  "web3-eth-abi": "1.0.0-beta.54",
  "web3-eth-contract": "1.0.0-beta.54",
  "web3-net": "1.0.0-beta.54",
+ "web3-eth-accounts": "1.0.0-beta.54",
  "web3-providers": "1.0.0-beta.54",
  "web3-utils": "1.0.0-beta.54"
  },
  "devDependencies": {
  "definitelytyped-header-parser": "^1.0.1",
- "dtslint": "0.4.2",
- "web3-eth-accounts": "1.0.0-beta.54"
+ "dtslint": "0.4.2"
  },
  "files": [
  "dist",

diff --git a/packages/web3-providers/package.json b/packages/web3-providers/package.json
@@ -22,15 +22,15 @@
  "lodash": "^4.17.11",
  "url-parse": "1.4.4",
  "websocket": "^1.0.28",
+ "web3-core": "1.0.0-beta.54",
+ "web3-core-method": "1.0.0-beta.54",
+ "web3-core-helpers": "1.0.0-beta.54",
+ "web3-utils": "1.0.0-beta.54",
  "xhr2-cookies": "1.1.0"
  },
  "devDependencies": {
  "definitelytyped-header-parser": "^1.0.1",
- "dtslint": "0.4.2",
- "web3-core": "1.0.0-beta.54",
- "web3-core-helpers": "1.0.0-beta.54",
- "web3-core-method": "1.0.0-beta.54",
- "web3-utils": "1.0.0-beta.54"
+ "dtslint": "0.4.2"
  },
  "files": [
  "dist",

diff --git a/packages/web3-providers/types/tests/batch-request-test.ts b/packages/web3-providers/types/tests/batch-request-test.ts
@@ -31,7 +31,7 @@ const batchRequest = new BatchRequest(
 );
 
 // $ExpectType void
-batchRequest.add(new AbstractMethod('eth_coinbase', 1, Utils, new formatters(), new AbstractWeb3Module('http://localhost:7545')));
+batchRequest.add(new AbstractMethod('eth_coinbase', 1, Utils, formatters, new AbstractWeb3Module('http://localhost:7545')));
 
 // $ExpectType Promise<{ methods: AbstractMethod[]; response: any[]; } | Error[]>
 batchRequest.execute();
diff --git a/packages/web3/package.json b/packages/web3/package.json
@@ -61,8 +61,6 @@
  "@types/node": "^10.12.18",
  "web3-bzz": "1.0.0-beta.54",
  "web3-core": "1.0.0-beta.54",
- "web3-core-helpers": "1.0.0-beta.54",
- "web3-core-method": "1.0.0-beta.54",
  "web3-eth": "1.0.0-beta.54",
  "web3-eth-personal": "1.0.0-beta.54",
  "web3-net": "1.0.0-beta.54",

diff --git a/packages/web3/rollup.config.js b/packages/web3/rollup.config.js
@@ -3,8 +3,6 @@ import rollupConfig from '../../rollup.config';
 
 export default rollupConfig('Web3', pkg.name, {
  'web3-core': 'web3-core',
- 'web3-core-helpers': 'web3-core-helpers',
- 'web3-core-method': 'web3-core-method',
  'web3-providers': 'web3-providers',
  'web3-utils': 'web3-utils',
  'web3-eth': 'web3-eth',