status-im
/
web3.js
mirror of https://github.com/status-im/web3.js.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'develop' into events_refactor 

Conflicts:
	dist/web3-light.js.map
	dist/web3-light.min.js
	dist/web3.js.map
	dist/web3.min.js
This commit is contained in:
Marek Kotewicz 2015-04-21 17:17:22 +02:00
parent eeb0bc014b a5c1bcc6e4
commit d38f5a215a
8 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dist/web3-light.js vendored
View File

@ -1975,12 +1975,6 @@ var compileSerpent = new Method({
params: 1
});
var flush = new Method({
name: 'flush',
call: 'eth_flush',
params: 0
});
var methods = [
getBalance,
getStorageAt,
@ -1998,7 +1992,6 @@ var methods = [
compileSolidity,
compileLLL,
compileSerpent,
flush
];
/// @returns an array of objects describing web3.eth api properties
@ -2739,7 +2732,7 @@ var XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest; // jshint ignore:
var errors = require('./errors');
var HttpProvider = function (host) {
this.host = host || 'http://localhost:8080';
this.host = host || 'http://localhost:8545';
};
HttpProvider.prototype.send = function (payload) {

6
dist/web3-light.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
dist/web3-light.min.js vendored
View File

File diff suppressed because one or more lines are too long

9
dist/web3.js vendored
View File

@ -1975,12 +1975,6 @@ var compileSerpent = new Method({
params: 1
});
var flush = new Method({
name: 'flush',
call: 'eth_flush',
params: 0
});
var methods = [
getBalance,
getStorageAt,
@ -1998,7 +1992,6 @@ var methods = [
compileSolidity,
compileLLL,
compileSerpent,
flush
];
/// @returns an array of objects describing web3.eth api properties
@ -2739,7 +2732,7 @@ var XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest; // jshint ignore:
var errors = require('./errors');
var HttpProvider = function (host) {
this.host = host || 'http://localhost:8080';
this.host = host || 'http://localhost:8545';
};
HttpProvider.prototype.send = function (payload) {

6
dist/web3.js.map vendored
View File

File diff suppressed because one or more lines are too long

4
dist/web3.min.js vendored
View File

File diff suppressed because one or more lines are too long

7
lib/web3/eth.js
View File

@ -192,12 +192,6 @@ var compileSerpent = new Method({
params: 1
});
var flush = new Method({
name: 'flush',
call: 'eth_flush',
params: 0
});
var methods = [
getBalance,
getStorageAt,
@ -215,7 +209,6 @@ var methods = [
compileSolidity,
compileLLL,
compileSerpent,
flush
];
/// @returns an array of objects describing web3.eth api properties

2
lib/web3/httpprovider.js
View File

@ -28,7 +28,7 @@ var XMLHttpRequest = require('xmlhttprequest').XMLHttpRequest; // jshint ignore:
var errors = require('./errors');
var HttpProvider = function (host) {
this.host = host || 'http://localhost:8080';
this.host = host || 'http://localhost:8545';
};
HttpProvider.prototype.send = function (payload) {