forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-25 06:06:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge continue 3

Browse source
This commit is contained in:
Christopher Franko 2016-05-18 13:32:14 -04:00
parent b37c24cdcd
commit 46b10efca0
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
jsre/expanse_js.go
View file

@ -5177,7 +5177,7 @@ function Exp(web3) {
this.sendIBANTransaction = transfer.bind(null, this); this.sendIBANTransaction = transfer.bind(null, this);
} }
Object.defineProperty(Eth.prototype, 'defaultBlock', { Object.defineProperty(Exp.prototype, 'defaultBlock', {
get: function () { get: function () {
return c.defaultBlock; return c.defaultBlock;
}, },
@ -5187,7 +5187,7 @@ Object.defineProperty(Eth.prototype, 'defaultBlock', {
} }
}); });
Object.defineProperty(Eth.prototype, 'defaultAccount', { Object.defineProperty(Exp.prototype, 'defaultAccount', {
get: function () { get: function () {
return c.defaultAccount; return c.defaultAccount;
}, },
@ -5419,24 +5419,24 @@ var properties = function () {
]; ];
}; };
Eth.prototype.contract = function (abi) { Exp.prototype.contract = function (abi) {
var factory = new Contract(this, abi); var factory = new Contract(this, abi);
return factory; return factory;
}; };
Eth.prototype.filter = function (fil, callback) { Exp.prototype.filter = function (fil, callback) {
return new Filter(this._requestManager, fil, watches.exp(), formatters.outputLogFormatter, callback); return new Filter(this._requestManager, fil, watches.exp(), formatters.outputLogFormatter, callback);
}; };
Eth.prototype.namereg = function () { Exp.prototype.namereg = function () {
return this.contract(namereg.global.abi).at(namereg.global.address); return this.contract(namereg.global.abi).at(namereg.global.address);
}; };
Eth.prototype.icapNamereg = function () { Exp.prototype.icapNamereg = function () {
return this.contract(namereg.icap.abi).at(namereg.icap.address); return this.contract(namereg.icap.abi).at(namereg.icap.address);
}; };
Eth.prototype.isSyncing = function (callback) { Exp.prototype.isSyncing = function (callback) {
return new IsSyncing(this._requestManager, callback); return new IsSyncing(this._requestManager, callback);
}; };