Merge pull request #165 from cubedro/develop

Added workaround for eth until web3.js fix
This commit is contained in:
Marian OANCΞA 2015-06-02 13:00:58 +03:00
commit bd0513e5d0

View File

@ -504,6 +504,14 @@ Node.prototype.getPending = function()
if (this._web3) if (this._web3)
{ {
// TODO: Remove warkaround when web3.js is fixed
if( !this.chainFilter )
{
console.warn("Getting", chalk.reset.red('latest block'), chalk.reset.bold.red('forced'));
this.getLatestBlock();
}
console.info('==>', 'Getting Pending') console.info('==>', 'Getting Pending')
web3.eth.getBlockTransactionCount('pending', function (err, pending) web3.eth.getBlockTransactionCount('pending', function (err, pending)
@ -699,6 +707,8 @@ Node.prototype.setWatches = function()
} }
catch (err) catch (err)
{ {
this.chainFilter = false;
console.error("Couldn't set up chain filter"); console.error("Couldn't set up chain filter");
console.error(err); console.error(err);
} }
@ -729,6 +739,8 @@ Node.prototype.setWatches = function()
} }
catch (err) catch (err)
{ {
this.pendingFilter = false;
console.error("Couldn't set up pending filter"); console.error("Couldn't set up pending filter");
console.error(err); console.error(err);
} }