Replace own web3 for 1.0.0-beta.30 and add modified web3-eth

lib/web3.js/packages/web3-eth/src/index.js → lib/web3-eth/index.js

@@ -30,7 +30,6 @@ var Method = require('web3-core-method');
 var utils = require('web3-utils');
 var Net = require('web3-net');
 
-var ENS = require('web3-eth-ens');
 var Personal = require('web3-eth-personal');
 var BaseContract = require('web3-eth-contract');
 var Iban = require('web3-eth-iban');
@@ -144,20 +143,8 @@ var Eth = function Eth() {
     // not create this proxy type, changing the provider in one instance of
     // web3-eth would subsequently change the provider for _all_ contract
     // instances!
-    var self = this;
     var Contract = function Contract() {
         BaseContract.apply(this, arguments);
-
-        // when Eth.setProvider is called, call packageInit
-        // on all contract instances instantiated via this Eth
-        // instances. This will update the currentProvider for
-        // the contract instances
-        var _this = this;
-        var setProvider = self.setProvider;
-        self.setProvider = function() {
-          setProvider.apply(self, arguments);
-          core.packageInit(_this, [self.currentProvider]);
-        };
     };
 
     Contract.setProvider = function() {
@@ -181,14 +168,8 @@ var Eth = function Eth() {
     // add ABI
     this.abi = abi;
 
-    // add ENS
-    this.ens = new ENS(this);
 
     var methods = [
-        new Method({
-            name: 'getNodeInfo',
-            call: 'web3_clientVersion'
-        }),
         new Method({
             name: 'getProtocolVersion',
             call: 'eth_protocolVersion',
@@ -210,6 +191,12 @@ var Eth = function Eth() {
             params: 0,
             outputFormatter: utils.hexToNumber
         }),
+        new Method({
+            name: 'getChainId',
+            call: 'eth_chainId',
+            params: 0,
+            outputFormatter: utils.hexToNumber
+        }),
         new Method({
             name: 'isSyncing',
             call: 'eth_syncing',
@@ -351,6 +338,26 @@ var Eth = function Eth() {
             inputFormatter: [formatter.inputCallFormatter],
             outputFormatter: utils.hexToNumber
         }),
+        new Method({
+            name: 'getCompilers',
+            call: 'eth_getCompilers',
+            params: 0
+        }),
+        new Method({
+            name: 'compile.solidity',
+            call: 'eth_compileSolidity',
+            params: 1
+        }),
+        new Method({
+            name: 'compile.lll',
+            call: 'eth_compileLLL',
+            params: 1
+        }),
+        new Method({
+            name: 'compile.serpent',
+            call: 'eth_compileSerpent',
+            params: 1
+        }),
         new Method({
             name: 'submitWork',
             call: 'eth_submitWork',
@@ -368,12 +375,6 @@ var Eth = function Eth() {
             inputFormatter: [formatter.inputLogFormatter],
             outputFormatter: formatter.outputLogFormatter
         }),
-	new Method({
-	    name: 'getChainId',
-	    call: 'eth_chainId',
-	    params: 0,
-	    outputFormatter: utils.hexToNumber
-	}),
 
         // subscriptions
         new Subscriptions({
@@ -468,5 +469,4 @@ var Eth = function Eth() {
 core.addProviders(Eth);
 
 
-module.exports = Eth;
-
+module.exports = Eth;