requestManager handling and add of 'data' listener improved

packages/web3-core-requestmanager/src/index.js

@@ -41,7 +41,7 @@ var RequestManager = function RequestManager(provider) {
     this.provider = null;
     this.providers = RequestManager.providers;
 
-    this.setProvider(provider);
+    this.setProvider(provider, null, false);
     this.subscriptions = {};
 };
 
@@ -61,9 +61,14 @@ RequestManager.providers = {
  * Should be used to set provider of request manager
  *
  * @method setProvider
+ *
  * @param {Object} p
+ * @param {net.Socket} net
+ * @param {boolean} registerDataListener - default true
+ *
+ * @returns void
  */
-RequestManager.prototype.setProvider = function (p, net) {
+RequestManager.prototype.setProvider = function (p, net, registerDataListener) {
     var _this = this;
 
     // autodetect provider
@@ -94,7 +99,7 @@ RequestManager.prototype.setProvider = function (p, net) {
     this.provider = p || null;
 
     // listen to incoming notifications
-    if(this.provider && this.provider.on) {
+    if(this.provider && this.provider.on && registerDataListener !== false) {
         this.provider.on('data', function requestManagerNotification(result, deprecatedResult){
             result = result || deprecatedResult; // this is for possible old providers, which may had the error first handler
 

packages/web3-core/src/index.js

@@ -34,7 +34,6 @@ module.exports = {
             throw new Error('You need to instantiate using the "new" keyword.');
         }
 
-
         // make property of pkg._provider, which can properly set providers
         Object.defineProperty(pkg, 'currentProvider', {
             get: function () {
@@ -50,7 +49,6 @@ module.exports = {
         // inherit from web3 umbrella package
         if (args[0] && args[0]._requestManager) {
             pkg._requestManager = new requestManager.Manager(args[0].currentProvider);
-
         // set requestmanager on package
         } else {
             pkg._requestManager = new requestManager.Manager();

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

@@ -60,7 +60,7 @@ var Contract = function Contract(jsonInterface, address, options) {
     }
 
     // sets _requestmanager
-    core.packageInit(this, [this.constructor.currentProvider]);
+    core.packageInit(this, [this.constructor]);
 
     this.clearSubscriptions = this._requestManager.clearSubscriptions;
 
@@ -225,6 +225,17 @@ var Contract = function Contract(jsonInterface, address, options) {
 
 };
 
+/**
+ * Sets the new provider, creates a new requestManager, registers the "data" listener on the provider and sets the
+ * accounts module for the Contract class.
+ *
+ * @method setProvider
+ *
+ * @param {string|provider} provider
+ * @param {Accounts} accounts
+ *
+ * @returns void
+ */
 Contract.setProvider = function(provider, accounts) {
     // Contract.currentProvider = provider;
     core.packageInit(this, [provider]);

packages/web3-eth-ens/src/contracts/Registry.js

@@ -36,13 +36,10 @@ var RESOLVER_ABI = require('../ressources/ABI/Resolver');
  * @constructor
  */
 function Registry(ens) {
-    var self = this;
     this.ens = ens;
     this.contract = ens.checkNetwork().then(function (address) {
-        var contract = new Contract(REGISTRY_ABI, address);
-        contract.setProvider(self.ens.eth.currentProvider);
-
-        return contract;
+        return new Contract(REGISTRY_ABI, address);
+        // contract.setProvider(self.ens.eth.currentProvider);
     });
 }
 
@@ -86,14 +83,10 @@ Registry.prototype.owner = function (name, callback) {
  * @return {Promise<Contract>}
  */
 Registry.prototype.resolver = function (name) {
-    var self = this;
-
     return this.contract.then(function (contract) {
         return contract.methods.resolver(namehash.hash(name)).call();
     }).then(function (address) {
-        var contract = new Contract(RESOLVER_ABI, address);
-        contract.setProvider(self.ens.eth.currentProvider);
-        return contract;
+        return new Contract(RESOLVER_ABI, address);
     });
 };
 

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

@@ -36,7 +36,7 @@ var Personal = function Personal() {
     // sets _requestmanager
     core.packageInit(this, arguments);
 
-    this.net = new Net(this.currentProvider);
+    this.net = new Net(this);
 
     var defaultAccount = null;
     var defaultBlock = 'latest';

packages/web3-eth/src/index.js

@@ -75,7 +75,8 @@ var Eth = function Eth() {
         _this.net.setProvider.apply(_this, arguments);
         _this.personal.setProvider.apply(_this, arguments);
         _this.accounts.setProvider.apply(_this, arguments);
-        _this.Contract.setProvider(_this.currentProvider, _this.accounts);
+        _this.Contract._requestManager = _this._requestManager;
+        _this.Contract.accounts = _this.accounts;
     };
 
 
@@ -234,15 +235,15 @@ var Eth = function Eth() {
     this.clearSubscriptions = _this._requestManager.clearSubscriptions;
 
     // add net
-    this.net = new Net(this.currentProvider);
+    this.net = new Net(this);
     // add chain detection
     this.net.getNetworkType = getNetworkType.bind(this);
 
     // add accounts
-    this.accounts = new Accounts(this.currentProvider);
+    this.accounts = new Accounts(this);
 
     // add personal
-    this.personal = new Personal(this.currentProvider);
+    this.personal = new Personal(this);
     this.personal.defaultAccount = this.defaultAccount;
 
     // create a proxy Contract type for this instance, as a Contract's provider
@@ -262,7 +263,7 @@ var Eth = function Eth() {
         var setProvider = self.setProvider;
         self.setProvider = function() {
           setProvider.apply(self, arguments);
-          core.packageInit(_this, [self.currentProvider]);
+          core.packageInit(_this, [self]);
         };
     };
 
@@ -282,7 +283,9 @@ var Eth = function Eth() {
     this.Contract.transactionBlockTimeout = this.transactionBlockTimeout;
     this.Contract.transactionConfirmationBlocks = this.transactionConfirmationBlocks;
     this.Contract.transactionPollingTimeout = this.transactionPollingTimeout;
-    this.Contract.setProvider(this.currentProvider, this.accounts);
+    this.Contract._requestManager = this._requestManager;
+    this.Contract._ethAccounts = this.accounts;
+    this.Contract.currentProvider = this._requestManager.provider;
 
     // add IBAN
     this.Iban = Iban;
@@ -567,7 +570,7 @@ var Eth = function Eth() {
 
     methods.forEach(function(method) {
         method.attachToObject(_this);
-        method.setRequestManager(_this._requestManager, _this.accounts); // second param means is eth.accounts (necessary for wallet signing)
+        method.setRequestManager(_this._requestManager, _this.accounts); // second param is the eth.accounts module (necessary for signing transactions locally)
         method.defaultBlock = _this.defaultBlock;
         method.defaultAccount = _this.defaultAccount;
         method.transactionBlockTimeout = _this.transactionBlockTimeout;
@@ -577,6 +580,7 @@ var Eth = function Eth() {
 
 };
 
+// Adds the static givenProvider and providers property to the Eth module
 core.addProviders(Eth);