From 7407dabfb63da0fc0dacad4c6543098b8db80b14 Mon Sep 17 00:00:00 2001 From: Alexander Kolotov Date: Mon, 18 Nov 2019 22:10:07 +0300 Subject: [PATCH 1/4] another init of array to iterate getting signatures --- .../src/events/processAMBCollectedSignatures/index.js | 4 +++- oracle/src/events/processCollectedSignatures/index.js | 10 +++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/oracle/src/events/processAMBCollectedSignatures/index.js b/oracle/src/events/processAMBCollectedSignatures/index.js index c3ed54cb9..950b471fe 100644 --- a/oracle/src/events/processAMBCollectedSignatures/index.js +++ b/oracle/src/events/processAMBCollectedSignatures/index.js @@ -47,7 +47,9 @@ function processCollectedSignaturesBuilder(config) { logger.info(`Processing CollectedSignatures ${colSignature.transactionHash}`) const message = await homeBridge.methods.message(messageHash).call() - const requiredSignatures = new Array(NumberOfCollectedSignatures).fill(0) + const requiredSignatures = [] + requiredSignatures.length = NumberOfCollectedSignatures + requiredSignatures.fill(0) const signaturesArray = [] const [v, r, s] = [[], [], []] diff --git a/oracle/src/events/processCollectedSignatures/index.js b/oracle/src/events/processCollectedSignatures/index.js index e88516463..67dd5ab1d 100644 --- a/oracle/src/events/processCollectedSignatures/index.js +++ b/oracle/src/events/processCollectedSignatures/index.js @@ -46,7 +46,11 @@ function processCollectedSignaturesBuilder(config) { logger.info(`Processing CollectedSignatures ${colSignature.transactionHash}`) const message = await homeBridge.methods.message(messageHash).call() - const requiredSignatures = new Array(NumberOfCollectedSignatures).fill(0) + logger.debug(`Number of signatures to get ${NumberOfCollectedSignatures}`) + + const requiredSignatures = [] + requiredSignatures.length = NumberOfCollectedSignatures + requiredSignatures.fill(0) const [v, r, s] = [[], [], []] logger.debug('Getting message signatures') @@ -61,6 +65,10 @@ function processCollectedSignaturesBuilder(config) { await Promise.all(signaturePromises) + if (v.length !== NumberOfCollectedSignatures) { + throw new Error('Number of recovered signatures is not equal collected signatures') + } + let gasEstimate try { logger.debug('Estimate gas') From 45f2bfb5324de03f4820703920ac4aec1a8b1d95 Mon Sep 17 00:00:00 2001 From: Alexander Kolotov Date: Mon, 18 Nov 2019 22:20:09 +0300 Subject: [PATCH 2/4] lint issue --- oracle/src/events/processCollectedSignatures/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/oracle/src/events/processCollectedSignatures/index.js b/oracle/src/events/processCollectedSignatures/index.js index 67dd5ab1d..f01f7f4d8 100644 --- a/oracle/src/events/processCollectedSignatures/index.js +++ b/oracle/src/events/processCollectedSignatures/index.js @@ -68,7 +68,7 @@ function processCollectedSignaturesBuilder(config) { if (v.length !== NumberOfCollectedSignatures) { throw new Error('Number of recovered signatures is not equal collected signatures') } - + let gasEstimate try { logger.debug('Estimate gas') From cc061e2cac990470163a26fd1585bc1900598dd4 Mon Sep 17 00:00:00 2001 From: Alexander Kolotov Date: Mon, 18 Nov 2019 22:54:56 +0300 Subject: [PATCH 3/4] logging changed --- oracle/src/events/processCollectedSignatures/index.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/oracle/src/events/processCollectedSignatures/index.js b/oracle/src/events/processCollectedSignatures/index.js index f01f7f4d8..1d446de3e 100644 --- a/oracle/src/events/processCollectedSignatures/index.js +++ b/oracle/src/events/processCollectedSignatures/index.js @@ -46,7 +46,7 @@ function processCollectedSignaturesBuilder(config) { logger.info(`Processing CollectedSignatures ${colSignature.transactionHash}`) const message = await homeBridge.methods.message(messageHash).call() - logger.debug(`Number of signatures to get ${NumberOfCollectedSignatures}`) + logger.debug({ NumberOfCollectedSignatures }, 'Number of signatures to get') const requiredSignatures = [] requiredSignatures.length = NumberOfCollectedSignatures @@ -65,10 +65,6 @@ function processCollectedSignaturesBuilder(config) { await Promise.all(signaturePromises) - if (v.length !== NumberOfCollectedSignatures) { - throw new Error('Number of recovered signatures is not equal collected signatures') - } - let gasEstimate try { logger.debug('Estimate gas') From cf34dd5eb85c77afe215c5b496e51b5d676d1726 Mon Sep 17 00:00:00 2001 From: Alexander Kolotov Date: Mon, 18 Nov 2019 23:06:02 +0300 Subject: [PATCH 4/4] make logging consistent --- oracle/src/events/processAMBCollectedSignatures/index.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/oracle/src/events/processAMBCollectedSignatures/index.js b/oracle/src/events/processAMBCollectedSignatures/index.js index 950b471fe..128598132 100644 --- a/oracle/src/events/processAMBCollectedSignatures/index.js +++ b/oracle/src/events/processAMBCollectedSignatures/index.js @@ -47,6 +47,8 @@ function processCollectedSignaturesBuilder(config) { logger.info(`Processing CollectedSignatures ${colSignature.transactionHash}`) const message = await homeBridge.methods.message(messageHash).call() + logger.debug({ NumberOfCollectedSignatures }, 'Number of signatures to get') + const requiredSignatures = [] requiredSignatures.length = NumberOfCollectedSignatures requiredSignatures.fill(0)