Merge branch 'develop' into allow-relay-tokens

Merge branch 'reduce-logs-in-sender' into allow-relay-tokens
remove nonce update for the re-send case
2020-10-08 19:08:06 +03:00 · 2020-10-08 18:26:20 +03:00 · 2020-10-08 18:21:52 +03:00 · 2020-10-07 18:14:20 +03:00 · 2020-10-07 18:05:17 +03:00 · 2020-10-07 17:59:21 +03:00
1 changed files with 6 additions and 2 deletions
--- a/oracle/src/events/processCollectedSignatures/index.js
+++ b/oracle/src/events/processCollectedSignatures/index.js
@ -66,8 +66,12 @@ function processCollectedSignaturesBuilder(config) {
            if (allowanceList.indexOf(recipient) === -1) {
              if (ORACLE_HOME_TO_FOREIGN_CHECK_SENDER === 'true') {
                logger.debug({ txHash: originalTxHash }, 'Requested sender of an original withdrawal transaction')
-                const sender = (await web3Home.eth.getTransaction(originalTxHash)).from.toLowerCase()
-                if (allowanceList.indexOf(sender) === -1) {
+                const originalTx = await web3Home.eth.getTransaction(originalTxHash)
+                logger.debug(`Tx data of an original withdrawal transaction ${originalTx.input}`)
+                const isRelayTokens = originalTx.input.slice(2, 10) === '5d1e9307'
+                logger.info(`Is the relayTokens method invoked: ${isRelayTokens}`)
+                const sender = originalTx.from.toLowerCase()
+                if (allowanceList.indexOf(sender) === -1 && !isRelayTokens) {
                  logger.info(
                    { sender, recipient },
                    'Validator skips a transaction. Neither sender nor recipient addresses are in the allowance list.'
Author	SHA1	Message	Date
Alexander Kolotov	60b45faa6c	Merge branch 'develop' into allow-relay-tokens	2020-10-08 19:08:06 +03:00
Alexander Kolotov	86a47f4a0b	Merge branch 'reduce-logs-in-sender' into allow-relay-tokens	2020-10-08 18:26:20 +03:00
Alexander Kolotov	7af04fa0e8	remove nonce update for the re-send case	2020-10-08 18:21:52 +03:00
Alexander Kolotov	bc871a6844	another fix brackets usage	2020-10-07 18:14:20 +03:00
Alexander Kolotov	4198b092a6	fix brackets usage	2020-10-07 18:05:17 +03:00
Alexander Kolotov	30208b4f8e	fix lint issues	2020-10-07 17:59:21 +03:00
Alexander Kolotov	d5946f7df1	Merge branch 'develop' into allow-relay-tokens	2020-10-07 17:55:20 +03:00
Alexander Kolotov	9e309db876	allow withdrawals made by relayTokens handled by oracle	2020-10-07 00:10:57 +03:00