Fixes web3#1188 (web3#1191)

* Fixes web3#1188

* Exercise standalone Contracts, plus extra set provider tests

* forgot to fix up new test during merge

* fix broken test

* Review changes: get rid of util.inherits, rename ContractWrapper to Contract

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

@@ -55,16 +55,16 @@ var Contract = function Contract(jsonInterface, address, options) {
     var _this = this,
         args = Array.prototype.slice.call(arguments);
 
+    if(!(this instanceof Contract)) {
+        throw new Error('Please use the "new" keyword to instantiate a web3.eth.contract() object!');
+    }
 
     // sets _requestmanager
-    core.packageInit(this, [Contract.currentProvider]);
+    core.packageInit(this, [this.constructor.currentProvider]);
 
     this.clearSubscriptions = this._requestManager.clearSubscriptions;
 
 
-    if(!(this instanceof Contract)) {
-        throw new Error('Please use the "new" keyword to instantiate a web3.eth.contract() object!');
-    }
 
     if(!jsonInterface || !(Array.isArray(jsonInterface))) {
         throw new Error('You must provide the json interface of the contract when instantiating a contract object.');
@@ -173,8 +173,8 @@ var Contract = function Contract(jsonInterface, address, options) {
     });
 
     // get default account from the Class
-    var defaultAccount = Contract.defaultAccount;
-    var defaultBlock = Contract.defaultBlock || 'latest';
+    var defaultAccount = this.constructor.defaultAccount;
+    var defaultBlock = this.constructor.defaultBlock || 'latest';
 
     Object.defineProperty(this, 'defaultAccount', {
         get: function () {
@@ -216,9 +216,9 @@ var Contract = function Contract(jsonInterface, address, options) {
 
 Contract.setProvider = function(provider, accounts) {
     // Contract.currentProvider = provider;
-    core.packageInit(Contract, [provider]);
+    core.packageInit(this, [provider]);
 
-    Contract._ethAccounts = accounts;
+    this._ethAccounts = accounts;
 };
 
 
@@ -498,7 +498,8 @@ Contract.prototype.deploy = function(options, callback){
     return this._createTxObject.apply({
         method: constructor,
         parent: this,
-        deployData: options.data
+        deployData: options.data,
+        _ethAccounts: this.constructor._ethAccounts
     }, options.arguments);
 
 };
@@ -695,6 +696,7 @@ Contract.prototype._createTxObject =  function _createTxObject(){
     txObject.arguments = args || [];
     txObject._method = this.method;
     txObject._parent = this.parent;
+    txObject._ethAccounts = this.constructor._ethAccounts || this._ethAccounts;
 
     if(this.deployData) {
         txObject._deployData = this.deployData;
@@ -756,8 +758,8 @@ Contract.prototype._processExecuteArguments = function _processExecuteArguments(
 Contract.prototype._executeMethod = function _executeMethod(){
     var _this = this,
         args = this._parent._processExecuteArguments.call(this, Array.prototype.slice.call(arguments), defer),
-        defer = promiEvent((args.type !== 'send'));
-
+        defer = promiEvent((args.type !== 'send')),
+        ethAccounts = _this.constructor._ethAccounts || _this._ethAccounts;
 
     // simple return request for batch requests
     if(args.generateRequest) {
@@ -788,7 +790,7 @@ Contract.prototype._executeMethod = function _executeMethod(){
                     inputFormatter: [formatters.inputCallFormatter],
                     outputFormatter: utils.hexToNumber,
                     requestManager: _this._parent._requestManager,
-                    accounts: Contract._ethAccounts, // is eth.accounts (necessary for wallet signing)
+                    accounts: ethAccounts, // is eth.accounts (necessary for wallet signing)
                     defaultAccount: _this._parent.defaultAccount,
                     defaultBlock: _this._parent.defaultBlock
                 })).createFunction();
@@ -809,7 +811,7 @@ Contract.prototype._executeMethod = function _executeMethod(){
                         return _this._parent._decodeMethodReturn(_this._method.outputs, result);
                     },
                     requestManager: _this._parent._requestManager,
-                    accounts: Contract._ethAccounts, // is eth.accounts (necessary for wallet signing)
+                    accounts: ethAccounts, // is eth.accounts (necessary for wallet signing)
                     defaultAccount: _this._parent.defaultAccount,
                     defaultBlock: _this._parent.defaultBlock
                 })).createFunction();
@@ -879,7 +881,7 @@ Contract.prototype._executeMethod = function _executeMethod(){
                     params: 1,
                     inputFormatter: [formatters.inputTransactionFormatter],
                     requestManager: _this._parent._requestManager,
-                    accounts: Contract._ethAccounts, // is eth.accounts (necessary for wallet signing)
+                    accounts: _this.constructor._ethAccounts || _this._ethAccounts, // is eth.accounts (necessary for wallet signing)
                     defaultAccount: _this._parent.defaultAccount,
                     defaultBlock: _this._parent.defaultBlock,
                     extraFormatters: extraFormatters

packages/web3-eth/src/index.js

@@ -31,7 +31,7 @@ var utils = require('web3-utils');
 var Net = require('web3-net');
 
 var Personal = require('web3-eth-personal');
-var Contract = require('web3-eth-contract');
+var BaseContract = require('web3-eth-contract');
 var Iban = require('web3-eth-iban');
 var Accounts = require('web3-eth-accounts');
 var abi = require('web3-eth-abi');
@@ -138,6 +138,24 @@ var Eth = function Eth() {
     this.personal = new Personal(this.currentProvider);
     this.personal.defaultAccount = this.defaultAccount;
 
+    // create a proxy Contract type for this instance, as a Contract's provider
+    // is stored as a class member rather than an instance variable. If we do
+    // not create this proxy type, changing the provider in one instance of
+    // web3-eth would subsequently change the provider for _all_ contract
+    // instances!
+    var Contract = function Contract() {
+        BaseContract.apply(this, arguments);
+    };
+
+    Contract.setProvider = function() {
+        BaseContract.setProvider.apply(this, arguments);
+    };
+
+    // make our proxy Contract inherit from web3-eth-contract so that it has all
+    // the right functionality and so that instanceof and friends work properly
+    Contract.prototype = Object.create(BaseContract.prototype);
+    Contract.prototype.constructor = Contract;
+
     // add contract
     this.Contract = Contract;
     this.Contract.defaultAccount = this.defaultAccount;