Skip to content

Commit fe27eba

Browse files
committed
Replace own web3 for 1.0.0-beta.30 and add modified web3-eth
1 parent db2c20a commit fe27eba

File tree

121 files changed

+1156
-40440
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

121 files changed

+1156
-40440
lines changed

lib/web3.js/packages/web3-eth/src/index.js renamed to lib/web3-eth/index.js

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ var Method = require('web3-core-method');
3030
var utils = require('web3-utils');
3131
var Net = require('web3-net');
3232

33-
var ENS = require('web3-eth-ens');
3433
var Personal = require('web3-eth-personal');
3534
var BaseContract = require('web3-eth-contract');
3635
var Iban = require('web3-eth-iban');
@@ -144,20 +143,8 @@ var Eth = function Eth() {
144143
// not create this proxy type, changing the provider in one instance of
145144
// web3-eth would subsequently change the provider for _all_ contract
146145
// instances!
147-
var self = this;
148146
var Contract = function Contract() {
149147
BaseContract.apply(this, arguments);
150-
151-
// when Eth.setProvider is called, call packageInit
152-
// on all contract instances instantiated via this Eth
153-
// instances. This will update the currentProvider for
154-
// the contract instances
155-
var _this = this;
156-
var setProvider = self.setProvider;
157-
self.setProvider = function() {
158-
setProvider.apply(self, arguments);
159-
core.packageInit(_this, [self.currentProvider]);
160-
};
161148
};
162149

163150
Contract.setProvider = function() {
@@ -181,14 +168,8 @@ var Eth = function Eth() {
181168
// add ABI
182169
this.abi = abi;
183170

184-
// add ENS
185-
this.ens = new ENS(this);
186171

187172
var methods = [
188-
new Method({
189-
name: 'getNodeInfo',
190-
call: 'web3_clientVersion'
191-
}),
192173
new Method({
193174
name: 'getProtocolVersion',
194175
call: 'eth_protocolVersion',
@@ -210,6 +191,12 @@ var Eth = function Eth() {
210191
params: 0,
211192
outputFormatter: utils.hexToNumber
212193
}),
194+
new Method({
195+
name: 'getChainId',
196+
call: 'eth_chainId',
197+
params: 0,
198+
outputFormatter: utils.hexToNumber
199+
}),
213200
new Method({
214201
name: 'isSyncing',
215202
call: 'eth_syncing',
@@ -351,6 +338,26 @@ var Eth = function Eth() {
351338
inputFormatter: [formatter.inputCallFormatter],
352339
outputFormatter: utils.hexToNumber
353340
}),
341+
new Method({
342+
name: 'getCompilers',
343+
call: 'eth_getCompilers',
344+
params: 0
345+
}),
346+
new Method({
347+
name: 'compile.solidity',
348+
call: 'eth_compileSolidity',
349+
params: 1
350+
}),
351+
new Method({
352+
name: 'compile.lll',
353+
call: 'eth_compileLLL',
354+
params: 1
355+
}),
356+
new Method({
357+
name: 'compile.serpent',
358+
call: 'eth_compileSerpent',
359+
params: 1
360+
}),
354361
new Method({
355362
name: 'submitWork',
356363
call: 'eth_submitWork',
@@ -368,12 +375,6 @@ var Eth = function Eth() {
368375
inputFormatter: [formatter.inputLogFormatter],
369376
outputFormatter: formatter.outputLogFormatter
370377
}),
371-
new Method({
372-
name: 'getChainId',
373-
call: 'eth_chainId',
374-
params: 0,
375-
outputFormatter: utils.hexToNumber
376-
}),
377378

378379
// subscriptions
379380
new Subscriptions({
@@ -468,5 +469,4 @@ var Eth = function Eth() {
468469
core.addProviders(Eth);
469470

470471

471-
module.exports = Eth;
472-
472+
module.exports = Eth;

lib/web3.js/.bowerrc

Lines changed: 0 additions & 5 deletions
This file was deleted.

lib/web3.js/.editorconfig

Lines changed: 0 additions & 12 deletions
This file was deleted.

lib/web3.js/.gitignore

Lines changed: 0 additions & 17 deletions
This file was deleted.

lib/web3.js/.jshintignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

lib/web3.js/.jshintrc

Lines changed: 0 additions & 19 deletions
This file was deleted.

lib/web3.js/.npmignore

Lines changed: 0 additions & 10 deletions
This file was deleted.

lib/web3.js/.travis.yml

Lines changed: 0 additions & 28 deletions
This file was deleted.

lib/web3.js/.versions

Lines changed: 0 additions & 2 deletions
This file was deleted.

lib/web3.js/ISSUE_TEMPLATE.md

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)