Merge 894502d into 894c55c

package.json

@@ -1,7 +1,7 @@
 {
     "name": "web3",
     "namespace": "ethereum",
-    "version": "1.0.0-beta.49",
+    "version": "1.0.0-beta.51",
     "description": "Ethereum JavaScript API wrapper repository",
     "license": "LGPL-3.0",
     "main": "./packages/web3/src/index.js",

packages/web3-core-helpers/README.md

@@ -16,7 +16,7 @@ npm install web3-core-helpers
 ## Usage
 
 ```js
-import {errors, formatters} from 'web3-core-helpers';
+import {formatters} from 'web3-core-helpers';
 ```
 
 ## Types 

packages/web3-core-helpers/src/Formatters.js

@@ -280,6 +280,8 @@ export const outputTransactionReceiptFormatter = (receipt) => {
 
     if (typeof receipt.status !== 'undefined' && receipt.status !== null) {
         receipt.status = Boolean(parseInt(receipt.status));
+    } else {
+        receipt.status = true;
     }
 
     return receipt;

packages/web3-core-method/lib/factories/AbstractMethodFactory.js

@@ -132,9 +132,8 @@ export default class AbstractMethodFactory {
      */
     getTimeout(moduleInstance) {
         let timeout = moduleInstance.transactionBlockTimeout;
-        const providerName = moduleInstance.currentProvider.constructor.name;
 
-        if (providerName === 'HttpProvider' || providerName === 'CustomProvider') {
+        if (!moduleInstance.currentProvider.SOCKET_MESSAGE) {
             timeout = moduleInstance.transactionPollingTimeout;
         }
 

packages/web3-core-method/lib/methods/transaction/AbstractObservedTransactionMethod.js

@@ -80,7 +80,7 @@ export default class AbstractObservedTransactionMethod extends AbstractMethod {
                         confirmations = transactionConfirmation.confirmations;
                         receipt = transactionConfirmation.receipt;
 
-                        if (this.hasRevertReceiptStatus(receipt)) {
+                        if (!receipt.status) {
                             if (this.parameters[0].gas === receipt.gasUsed) {
                                 this.handleError(
                                     new Error(
@@ -161,17 +161,4 @@ export default class AbstractObservedTransactionMethod extends AbstractMethod {
 
         this.promiEvent.reject(error);
     }
-
-    /**
-     * Checks if the status property has a revert state
-     *
-     * @method hasRevertReceiptStatus
-     *
-     * @param {Object} receipt
-     *
-     * @returns {Boolean}
-     */
-    hasRevertReceiptStatus(receipt) {
-        return receipt.status === false && receipt.status !== undefined && receipt.status !== null;
-    }
 }

packages/web3-core-subscriptions/README.md

@@ -13,14 +13,6 @@ If you would like to know all supported subscriptions please have a look in the
 npm install web3-core-subscriptions
 ```
 
-## Exported classes
-
-```js
-SubscriptionsFactory
-LogSubscription
-AbstractSubscription
-```
-
 ## Types 
 
 All the typescript typings are placed in the types folder. 

packages/web3-eth-accounts/README.md

@@ -20,6 +20,7 @@ import {Accounts} from 'web3-eth-accounts';
 
 const accounts = new Accounts(
     'http://127.0.0.1:4546',
+    null,
     options
 );
 ```

packages/web3-eth-accounts/src/index.js

@@ -36,5 +36,5 @@ import AccountsModule from './Accounts';
  * @constructor
  */
 export function Accounts(provider, net = null, options = {}) {
-    return new AccountsModule(provider, Utils, new MethodFactory(Utils, formatters), options, net);
+    return new AccountsModule(provider, Utils, formatters, new MethodFactory(Utils, formatters), options, net);
 }

packages/web3-eth-contract/src/AbstractContract.js

@@ -213,13 +213,17 @@ export default class AbstractContract extends AbstractWeb3Module {
      * @returns {AbstractContract}
      */
     clone() {
-        const clone = this.contractModuleFactory.createContract(
-            this.currentProvider,
-            this.accounts,
-            [],
-            '',
-            this.options
-        );
+        const clone = this.contractModuleFactory.createContract(this.currentProvider, this.accounts, [], '', {
+            defaultAccount: this.defaultAccount,
+            defaultBlock: this.defaultBlock,
+            defaultGas: this.defaultGas,
+            defaultGasPrice: this.defaultGasPrice,
+            transactionBlockTimeout: this.transactionBlockTimeout,
+            transactionConfirmationBlocks: this.transactionConfirmationBlocks,
+            transactionPollingTimeout: this.transactionPollingTimeout,
+            transactionSigner: this.transactionSigner,
+            data: this.options.data
+        });
 
         clone.abiModel = this.abiModel;
 

packages/web3-eth-contract/tests/src/AbstractContractTest.js

@@ -153,7 +153,8 @@ describe('AbstractContractTest', () => {
         });
 
         const options = {fromBlock: true};
-        abstractContract.once('event', options, () => {});
+        abstractContract.once('event', options, () => {
+        });
 
         expect(eventSubscriptionMock.unsubscribe).toHaveBeenCalled();
 
@@ -173,7 +174,8 @@ describe('AbstractContractTest', () => {
 
         methodFactoryMock.createPastEventLogsMethod.mockReturnValueOnce(getPastLogsMethodMock);
 
-        await expect(abstractContract.getPastEvents('eventName', {}, () => {})).resolves.toEqual(true);
+        await expect(abstractContract.getPastEvents('eventName', {}, () => {
+        })).resolves.toEqual(true);
 
         expect(abiModelMock.hasEvent).toHaveBeenCalledWith('eventName');
 
@@ -195,7 +197,8 @@ describe('AbstractContractTest', () => {
 
         methodFactoryMock.createAllPastEventLogsMethod.mockReturnValueOnce(getPastLogsMethodMock);
 
-        await expect(abstractContract.getPastEvents('allEvents', {}, () => {})).resolves.toEqual(true);
+        await expect(abstractContract.getPastEvents('allEvents', {}, () => {
+        })).resolves.toEqual(true);
 
         expect(getPastLogsMethodMock.execute).toHaveBeenCalled();
 
@@ -209,7 +212,8 @@ describe('AbstractContractTest', () => {
     it('calls getPastEvents and returns a rejected promise', async () => {
         abiModelMock.hasEvent.mockReturnValueOnce(false);
 
-        await expect(abstractContract.getPastEvents('eventName', {}, () => {})).rejects.toThrow(
+        await expect(abstractContract.getPastEvents('eventName', {}, () => {
+        })).rejects.toThrow(
             'Event with name "eventName" does not exists.'
         );
 
@@ -236,7 +240,17 @@ describe('AbstractContractTest', () => {
             abstractContract.accounts,
             [],
             '',
-            abstractContract.options
+            {
+                data: '',
+                defaultAccount: undefined,
+                defaultBlock: 'latest',
+                defaultGas: undefined,
+                defaultGasPrice: undefined,
+                transactionBlockTimeout: 50,
+                transactionConfirmationBlocks: 24,
+                transactionPollingTimeout: 750,
+                transactionSigner: {}
+            }
         );
     });
 

packages/web3-eth-ens/README.md

@@ -18,8 +18,9 @@ import {Ens} from 'web3-eth-ens';
 
 new Ens(
     'ws://localhost:8546',
-    accounts,
-    {}
+    null,
+    options,
+    accountsModule
 );
 ```
 

packages/web3-eth-personal/README.md

@@ -18,7 +18,7 @@ import {Personal} from 'web3-eth-personal';
 
 const personal = new Personal(
     'http://127.0.0.1:4546',
-    accounts,
+    null,
     options
 );
 ```

packages/web3-eth-personal/src/index.js

@@ -35,11 +35,10 @@ import PersonalModule from './Personal.js';
  * @param {Web3EthereumProvider|HttpProvider|WebsocketProvider|IpcProvider|String} provider
  * @param {Net.Socket} net
  * @param {Object} options
- * @param {Accounts} accounts
  *
  * @returns {Personal}
  */
-export function Personal(provider, net = null, options = {}, accounts = {}) {
+export function Personal(provider, net = null, options = {}) {
     const resolvedProvider = new ProviderResolver().resolve(provider, net);
 
     return new PersonalModule(

packages/web3-eth/README.md

@@ -14,8 +14,11 @@ npm install web3-eth
 ## Usage
 
 ```js
+import {Eth} from 'web3-eth';
+
 const eth = new Eth(
     'http://127.0.0.1:4546',
+    null,
     options
 );
 ```

packages/web3-eth/src/methods/EthSignMethod.js

@@ -63,7 +63,7 @@ export default class EthSignMethod extends SignMethod {
 
             let signedMessage = this.moduleInstance.accounts.sign(
                 this.parameters[1],
-                this.moduleInstance.accounts.wallet[this.parameters[0]].address
+                this.moduleInstance.accounts.wallet[this.parameters[0]].privateKey
             );
 
             if (this.callback) {

packages/web3-net/README.md

@@ -18,6 +18,7 @@ import {Network} from 'web3-net';
 
 const net = new Network(
     'http://127.0.0.1:4546',
+    null,
     options
 );
 ```

packages/web3-providers/README.md

@@ -59,12 +59,9 @@ The BatchRequest provides the possibility to send JSON-RPC requests as batch.
 Please read the [documentation][docs] for more.
 
 ```js 
-import {ProvidersModuleFactory, BatchRequest} 'web3-providers';
-
-const provider = new ProvidersModuleFactory()
-                        .createProviderResolver
-                        .resolve('ws://localhost:8546');
+import {ProviderResolver, BatchRequest} 'web3-providers';
 
+const provider = new ProviderResolver().resolve('ws://localhost:8546');
 const batchRequest = new BatchRequest(provider);
 
 batchRequest.add(web3.eth.getBalance.request(
@@ -80,22 +77,19 @@ await batchRequest.execute();
 Checks if an provider is given from the environment (Mist, MetaMask) and returns the provider.
 
 ```js
-import {ProvidersModuleFactory} from 'web3-providers';
+import {ProviderDetector} from 'web3-providers';
 
-const providerDetector = new ProvidersModuleFactory.createProviderDetector();
-const givenProvider = providerDetector.detect();
+const givenProvider = ProviderDetector.detect();
 ```
 
 #### ProviderResolver
 The ProviderResolver resolves an url or an given provider object to the correct provider class. 
 Because of the resolves does web3 has internally just one provider interface and we have no direct dependency to third party providers.
 
 ```js 
-import {ProvidersModuleFactory} 'web3-providers';
+import {ProviderResolver} 'web3-providers';
 
-const socketProviderAdapter = new ProvidersModuleFactory()
-                        .createProviderResolver
-                        .resolve('ws://localhost:8546');
+const socketProviderAdapter = new ProviderResolver().resolve('ws://localhost:8546');
 ```
 
 ## Types 

packages/web3-providers/src/factories/ProvidersModuleFactory.js

@@ -85,7 +85,7 @@ export default class ProvidersModuleFactory {
      *
      * @returns {XMLHttpRequest}
      */
-    createXMLHttpRequest(host, timeout = 0, headers, agent, withCredentials) {
+    createXMLHttpRequest(host, timeout, headers, agent, withCredentials) {
         let request;
 
         // runtime is of type node

packages/web3-shh/README.md

@@ -18,6 +18,7 @@ import {Shh} from 'web3-shh';
 
 const shh = new Shh(
     'http://127.0.0.1:4546',
+    null,
     options
 );
 ```

packages/web3/package.json

@@ -1,7 +1,7 @@
 {
     "name": "web3",
     "namespace": "ethereum",
-    "version": "1.0.0-beta.50",
+    "version": "1.0.0-beta.51",
     "description": "Ethereum JavaScript API",
     "repository": "https://github.com/ethereum/web3.js/tree/1.0/packages/web3",
     "license": "LGPL-3.0",