Support alternative receiver feature in Monitor

monitor/.eslintrc

@@ -8,5 +8,8 @@
   "rules": {
     "no-use-before-define": "off",
     "node/no-unpublished-require": "off"
+  },
+  "env": {
+    "mocha": true
   }
 }

monitor/alerts.js

@@ -3,7 +3,7 @@ const Web3 = require('web3')
 const logger = require('./logger')('alerts')
 const eventsInfo = require('./utils/events')
 const { getBlockNumber } = require('./utils/contract')
-const { processedMsgNotDelivered } = require('./utils/message')
+const { processedMsgNotDelivered, eventWithoutReference } = require('./utils/message')
 const { BRIDGE_MODES } = require('../commons')
 
 const { COMMON_HOME_RPC_URL, COMMON_FOREIGN_RPC_URL } = process.env
@@ -29,10 +29,9 @@ async function main() {
     xSignatures = homeToForeignConfirmations.filter(processedMsgNotDelivered(homeToForeignRequests))
     xAffirmations = foreignToHomeConfirmations.filter(processedMsgNotDelivered(foreignToHomeRequests))
   } else {
-    xSignatures = homeToForeignConfirmations.filter(findDifferences(homeToForeignRequests))
-    xAffirmations = foreignToHomeConfirmations.filter(findDifferences(foreignToHomeRequests))
+    xSignatures = homeToForeignConfirmations.filter(eventWithoutReference(homeToForeignRequests))
+    xAffirmations = foreignToHomeConfirmations.filter(eventWithoutReference(foreignToHomeRequests))
   }
-
   logger.debug('building misbehavior blocks')
   const [homeBlockNumber, foreignBlockNumber] = await getBlockNumber(web3Home, web3Foreign)
 
@@ -52,8 +51,8 @@ async function main() {
   const foreignValidators = await Promise.all(xSignatures.map(event => findTxSender(web3Foreign)(event)))
   const homeValidators = await Promise.all(xAffirmations.map(event => findTxSender(web3Home)(event)))
 
-  const xSignaturesTxs = xSignatures.map(normalizeEventInformation).reduce(buildTxList(foreignValidators), {})
-  const xAffirmationsTxs = xAffirmations.map(normalizeEventInformation).reduce(buildTxList(homeValidators), {})
+  const xSignaturesTxs = xSignatures.reduce(buildTxList(foreignValidators), {})
+  const xAffirmationsTxs = xAffirmations.reduce(buildTxList(homeValidators), {})
 
   logger.debug('Done')
 
@@ -150,7 +149,7 @@ const findTxSender = web3 => async ({ transactionHash }) => {
  * }}}
  */
 const buildTxList = validatorsList => (acc, event, index) => {
-  acc[event.txHash] = {
+  acc[event.transactionHash] = {
     value: event.value,
     block: event.blockNumber,
     referenceTx: event.referenceTx,
@@ -160,38 +159,4 @@ const buildTxList = validatorsList => (acc, event, index) => {
   return acc
 }
 
-/**
- * Finds a missing destDeposit in src list if there's any
- * @param {Array} src
- * @returns {function(*=): boolean}
- */
-const findDifferences = src => dest => {
-  const b = normalizeEventInformation(dest)
-
-  return (
-    src
-      .map(normalizeEventInformation)
-      .filter(a => a.referenceTx === b.referenceTx && a.recipient === b.recipient && a.value === b.value).length === 0
-  )
-}
-
-/**
- * Normalizes the different event objects to facilitate data processing
- * @param {Object} event
- * @returns {{
- *  txHash: string,
- *  blockNumber: number,
- *  referenceTx: string,
- *  recipient: string | *,
- *  value: *
- * }}
- */
-const normalizeEventInformation = event => ({
-  txHash: event.transactionHash,
-  blockNumber: event.blockNumber,
-  referenceTx: event.returnValues.transactionHash || event.transactionHash,
-  recipient: event.returnValues.recipient || event.returnValues.from,
-  value: event.returnValues.value
-})
-
 module.exports = main

monitor/eventsStats.js

@@ -1,69 +1,14 @@
 require('dotenv').config()
 const eventsInfo = require('./utils/events')
-const { processedMsgNotDelivered, deliveredMsgNotProcessed } = require('./utils/message')
+const { processedMsgNotDelivered, deliveredMsgNotProcessed, eventWithoutReference } = require('./utils/message')
 const { BRIDGE_MODES } = require('../commons')
 
-function compareDepositsHome(foreign) {
-  return homeDeposit => {
-    return (
-      foreign.filter(foreignDeposit => {
-        return (
-          foreignDeposit.returnValues.transactionHash === homeDeposit.transactionHash &&
-          foreignDeposit.returnValues.recipient === homeDeposit.returnValues.recipient &&
-          foreignDeposit.returnValues.value === homeDeposit.returnValues.value
-        )
-      }).length === 0
-    )
-  }
-}
-function compareDepositsForeign(home) {
-  return foreignDeposit => {
-    return (
-      home.filter(homeDeposit => {
-        return (
-          homeDeposit.transactionHash === foreignDeposit.returnValues.transactionHash &&
-          homeDeposit.returnValues.recipient === foreignDeposit.returnValues.recipient &&
-          homeDeposit.returnValues.value === foreignDeposit.returnValues.value
-        )
-      }).length === 0
-    )
-  }
-}
-
-function compareTransferHome(foreign) {
-  return homeDeposit => {
-    return (
-      foreign.filter(foreignDeposit => {
-        return (
-          homeDeposit.returnValues.transactionHash === foreignDeposit.transactionHash &&
-          homeDeposit.returnValues.recipient === foreignDeposit.returnValues.from &&
-          homeDeposit.returnValues.value === foreignDeposit.returnValues.value
-        )
-      }).length === 0
-    )
-  }
-}
-function compareTransferForeign(home) {
-  return foreignDeposit => {
-    return (
-      home.filter(homeDeposit => {
-        return (
-          foreignDeposit.transactionHash === homeDeposit.returnValues.transactionHash &&
-          foreignDeposit.returnValues.from === homeDeposit.returnValues.recipient &&
-          foreignDeposit.returnValues.value === homeDeposit.returnValues.value
-        )
-      }).length === 0
-    )
-  }
-}
-
 async function main() {
   const {
     homeToForeignRequests,
     homeToForeignConfirmations,
     foreignToHomeConfirmations,
     foreignToHomeRequests,
-    isExternalErc20,
     bridgeMode
   } = await eventsInfo()
 
@@ -88,17 +33,11 @@ async function main() {
       lastChecked: Math.floor(Date.now() / 1000)
     }
   } else {
-    const onlyInHomeDeposits = homeToForeignRequests.filter(compareDepositsHome(homeToForeignConfirmations))
-    const onlyInForeignDeposits = homeToForeignConfirmations
-      .concat([])
-      .filter(compareDepositsForeign(homeToForeignRequests))
+    const onlyInHomeDeposits = homeToForeignRequests.filter(eventWithoutReference(homeToForeignConfirmations))
+    const onlyInForeignDeposits = homeToForeignConfirmations.filter(eventWithoutReference(homeToForeignRequests))
 
-    const onlyInHomeWithdrawals = isExternalErc20
-      ? foreignToHomeConfirmations.filter(compareTransferHome(foreignToHomeRequests))
-      : foreignToHomeConfirmations.filter(compareDepositsForeign(foreignToHomeRequests))
-    const onlyInForeignWithdrawals = isExternalErc20
-      ? foreignToHomeRequests.filter(compareTransferForeign(foreignToHomeConfirmations))
-      : foreignToHomeRequests.filter(compareDepositsHome(foreignToHomeConfirmations))
+    const onlyInHomeWithdrawals = foreignToHomeConfirmations.filter(eventWithoutReference(foreignToHomeRequests))
+    const onlyInForeignWithdrawals = foreignToHomeRequests.filter(eventWithoutReference(foreignToHomeConfirmations))
 
     return {
       onlyInHomeDeposits,

monitor/package.json

@@ -8,7 +8,8 @@
     "start": "node index.js",
     "check-and-start": "yarn check-all && yarn start",
     "lint": "eslint . --ignore-path ../.eslintignore",
-    "lint:fix": "eslint . --fix"
+    "lint:fix": "eslint . --fix",
+    "test": "NODE_ENV=test mocha"
   },
   "author": "",
   "license": "ISC",
@@ -23,5 +24,6 @@
     "node": ">=8.9"
   },
   "devDependencies": {
+    "chai": "^4.2.0"
   }
 }