From 2a69b63f62c59bf6d921fbeea517930fb5679d20 Mon Sep 17 00:00:00 2001 From: Jonathan Rainville Date: Thu, 10 Oct 2019 10:07:43 -0400 Subject: [PATCH] fix: fix error logs in the cockpit due from negative blocks numbers --- .../src/lib/modules/ethereum-blockchain-client/api.js | 10 ++++++---- packages/stack/proxy/src/proxy.js | 1 + 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/embark/src/lib/modules/ethereum-blockchain-client/api.js b/packages/embark/src/lib/modules/ethereum-blockchain-client/api.js index fa3cbb5424..0b6d5c496f 100644 --- a/packages/embark/src/lib/modules/ethereum-blockchain-client/api.js +++ b/packages/embark/src/lib/modules/ethereum-blockchain-client/api.js @@ -153,11 +153,13 @@ export default class EthereumAPI { }); }, function (next) { - async.times(limit, function (n, eachCb) { - self.web3.eth.getBlock(from - n, returnTransactionObjects, function (err, block) { + if (from - limit < 0) { + limit = from + 1; + } + async.times(limit, (n, eachCb) => { + self.web3.eth.getBlock(from - n, returnTransactionObjects, (err, block) => { if (err) { - // FIXME Returns an error because we are too low - return eachCb(); + return eachCb(err); } if (!block) { return eachCb(); diff --git a/packages/stack/proxy/src/proxy.js b/packages/stack/proxy/src/proxy.js index 0c347d6e58..2c91cc6655 100644 --- a/packages/stack/proxy/src/proxy.js +++ b/packages/stack/proxy/src/proxy.js @@ -57,6 +57,7 @@ export class Proxy { // Send the possibly modified request to the Node requestManager.send(resp.reqData, (err, result) => { if (err) { + this.logger.debug(JSON.stringify(resp.reqData)); return this.logger.error(__('Error executing the request on the Node'), err.message || err); } this.emitActionsForResponse(resp.reqData, {jsonrpc: "2.0", id: resp.reqData.id, result}, (_err, resp) => {