Merge the develop branch to the master branch, preparation to v3.4.0

This merge contains the following set of changes: * [Oracle, Improvement] Refetch old logs ranges to see if there are missed events (#627) * [Oracle, Improvement] Add support for EIP1559 gas price oracle (#631) * [Oracle, Improvement] CollectedSignatures AMB watcher for MEV bundling (#634) * [Oracle, Fix] Fix eip1559 transaction sending problems (#632)
CollectedSignatures AMB watcher for MEV bundling (#634 )
2022-02-11 10:24:38 +03:00 · 2022-02-07 23:32:41 +03:00 · 2022-01-17 16:51:29 +03:00 · 2022-01-03 17:58:36 +03:00 · 2022-01-03 15:32:38 +03:00 · 2021-11-05 20:22:46 +03:00
73 changed files with 3141 additions and 1778 deletions
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -77,7 +77,7 @@ jobs:
      - name: Rebuild and push updated images
        run: |
          function check_if_image_exists() {
-            curl -fsSlL -H 'Authorization: bearer ${{ github.token }}' "https://${DOCKER_REGISTRY}/v2/${DOCKER_REPO}/tokenbridge-e2e-$1/manifests/$2" > /dev/null
+            curl -fsSlL "https://${{ github.actor }}:${{ github.token }}@${DOCKER_REGISTRY}/v2/${DOCKER_REPO}/tokenbridge-e2e-$1/manifests/$2" > /dev/null
          }
          updated=()
          if ! check_if_image_exists e2e ${E2E_TAG};         then updated+=("e2e"); fi
@@ -104,7 +104,7 @@ jobs:
      - name: Rebuild and push molecule runner e2e image
        run: |
          function check_if_image_exists() {
-            curl -fsSlL -H 'Authorization: bearer ${{ github.token }}' "https://${DOCKER_REGISTRY}/v2/${DOCKER_REPO}/tokenbridge-e2e-$1/manifests/$2" > /dev/null
+            curl -fsSlL "https://${{ github.actor }}:${{ github.token }}@${DOCKER_REGISTRY}/v2/${DOCKER_REPO}/tokenbridge-e2e-$1/manifests/$2" > /dev/null
          }
          if check_if_image_exists molecule_runner ${MOLECULE_RUNNER_TAG}; then
            echo "Image already exists"
--- a/CONFIGURATION.md
+++ b/CONFIGURATION.md
@@ -8,11 +8,11 @@ COMMON_HOME_RPC_URL | The HTTPS URL(s) used to communicate to the RPC nodes in t
 COMMON_FOREIGN_RPC_URL | The HTTPS URL(s) used to communicate to the RPC nodes in the Foreign network. Several URLs can be specified, delimited by spaces. If the connection to one of these nodes is lost the next URL is used for connection. | URL(s)
 COMMON_HOME_BRIDGE_ADDRESS | The address of the bridge contract address in the Home network. It is used to listen to events from and send validators' transactions to the Home network. | hexidecimal beginning with "0x"
 COMMON_FOREIGN_BRIDGE_ADDRESS | The  address of the bridge contract address in the Foreign network. It is used to listen to events from and send validators' transactions to the Foreign network. | hexidecimal beginning with "0x"
-COMMON_HOME_GAS_PRICE_SUPPLIER_URL | The URL used to get a JSON response from the gas price prediction oracle for the Home network. The gas price provided by the oracle is used to send the validator's transactions to the RPC node. Since it is assumed that the Home network has a predefined gas price (e.g. the gas price in the Core of POA.Network is `1 GWei`), the gas price oracle parameter can be omitted for such networks. | URL
+COMMON_HOME_GAS_PRICE_SUPPLIER_URL | The URL used to get a JSON response from the gas price prediction oracle for the Home network. The gas price provided by the oracle is used to send the validator's transactions to the RPC node. Since it is assumed that the Home network has a predefined gas price (e.g. the gas price in the Core of POA.Network is `1 GWei`), the gas price oracle parameter can be omitted for such networks. Set to `eip1559-gas-estimation` if you want to use EIP1559 RPC-based gas estimation. | URL
 COMMON_HOME_GAS_PRICE_SPEED_TYPE | Assuming the gas price oracle responds with the following JSON structure: `{"fast": 20.0, "block_time": 12.834, "health": true, "standard": 6.0, "block_number": 6470469, "instant": 71.0, "slow": 1.889}`, this parameter specifies the desirable transaction speed. The speed type can be omitted when `COMMON_HOME_GAS_PRICE_SUPPLIER_URL` is not used. | `instant` / `fast` / `standard` / `slow`
 COMMON_HOME_GAS_PRICE_FALLBACK | The gas price (in Wei) that is used if both the oracle and the fall back gas price specified in the Home Bridge contract are not available. | integer
 COMMON_HOME_GAS_PRICE_FACTOR | A value that will multiply the gas price of the oracle to convert it to gwei. If the oracle API returns gas prices in gwei then this can be set to `1`. Also, it could be used to intentionally pay more gas than suggested by the oracle to guarantee the transaction verification. E.g. `1.25` or `1.5`. | integer
-COMMON_FOREIGN_GAS_PRICE_SUPPLIER_URL | The URL used to get a JSON response from the gas price prediction oracle for the Foreign network. The provided gas price is used to send the validator's transactions to the RPC node. If the Foreign network is Ethereum Foundation mainnet, the oracle URL can be: https://gasprice.poa.network. Otherwise this parameter can be omitted. Set to `gas-price-oracle` if you want to use npm `gas-price-oracle` package for retrieving gas price from multiple sources. | URL
+COMMON_FOREIGN_GAS_PRICE_SUPPLIER_URL | The URL used to get a JSON response from the gas price prediction oracle for the Foreign network. The provided gas price is used to send the validator's transactions to the RPC node. If the Foreign network is Ethereum Foundation mainnet, the oracle URL can be: https://gasprice.poa.network. Otherwise this parameter can be omitted. Set to `gas-price-oracle` if you want to use npm `gas-price-oracle` package for retrieving gas price from multiple sources. Set to `eip1559-gas-estimation` if you want to use EIP1559 RPC-based gas estimation. | URL
 COMMON_FOREIGN_GAS_PRICE_SPEED_TYPE | Assuming the gas price oracle responds with the following JSON structure: `{"fast": 20.0, "block_time": 12.834, "health": true, "standard": 6.0, "block_number": 6470469, "instant": 71.0, "slow": 1.889}`, this parameter specifies the desirable transaction speed. The speed type can be omitted when `COMMON_FOREIGN_GAS_PRICE_SUPPLIER_URL`is not used. | `instant` / `fast` / `standard` / `slow`
 COMMON_FOREIGN_GAS_PRICE_FALLBACK | The gas price (in Wei) used if both the oracle and fall back gas price specified in the Foreign Bridge contract are not available. | integer
 COMMON_FOREIGN_GAS_PRICE_FACTOR | A value that will multiply the gas price of the oracle to convert it to gwei. If the oracle API returns gas prices in gwei then this can be set to `1`. Also, it could be used to intentionally pay more gas than suggested by the oracle to guarantee the transaction verification. E.g. `1.25` or `1.5`. | integer
@@ -52,6 +52,13 @@ ORACLE_SHUTDOWN_CONTRACT_ADDRESS | Optional contract address in the side chain a
 ORACLE_SHUTDOWN_CONTRACT_METHOD | Method signature to be used in the side chain to identify the current shutdown status. Method should return boolean. Default value is `isShutdown()`. | `function signature`
 ORACLE_FOREIGN_RPC_BLOCK_POLLING_LIMIT | Max length for the block range used in `eth_getLogs` requests for polling contract events for the Foreign chain. Infinite, if not provided. | `integer`
 ORACLE_HOME_RPC_BLOCK_POLLING_LIMIT | Max length for the block range used in `eth_getLogs` requests for polling contract events for the Home chain. Infinite, if not provided. | `integer`
+ORACLE_JSONRPC_ERROR_CODES | Override default JSON rpc error codes that can trigger RPC fallback to the next URL from the list (or a retry in case of a single RPC URL). Default is `-32603,-32002,-32005`. Should be a comma-separated list of negative integers. | `string`
+ORACLE_HOME_EVENTS_REPROCESSING | If set to `true`, home events happened in the past will be refetched and processed once again, to ensure that nothing was missed on the first pass. | `bool`
+ORACLE_HOME_EVENTS_REPROCESSING_BATCH_SIZE | Batch size for one `eth_getLogs` request when reprocessing old logs in the home chain. Defaults to `1000` | `integer`
+ORACLE_HOME_EVENTS_REPROCESSING_BLOCK_DELAY | Block confirmations number, after which old logs are being reprocessed in the home chain. Defaults to `500` | `integer`
+ORACLE_FOREIGN_EVENTS_REPROCESSING  | If set to `true`, foreign events happened in the past will be refetched and processed once again, to ensure that nothing was missed on the first pass. | `bool`
+ORACLE_FOREIGN_EVENTS_REPROCESSING_BATCH_SIZE | Batch size for one `eth_getLogs` request when reprocessing old logs in the foreign chain. Defaults to `500` | `integer`
+ORACLE_FOREIGN_EVENTS_REPROCESSING_BLOCK_DELAY | Block confirmations number, after which old logs are being reprocessed in the foreign chain. Defaults to `250` | `integer`


 ## Monitor configuration
--- a/Dockerfile.e2e
+++ b/Dockerfile.e2e
@@ -19,6 +19,7 @@ COPY --from=contracts /mono/contracts/build ./contracts/build
 COPY commons/package.json ./commons/
 COPY oracle-e2e/package.json ./oracle-e2e/
 COPY monitor-e2e/package.json ./monitor-e2e/
+COPY oracle/src/utils/constants.js ./oracle/src/utils/constants.js

 COPY yarn.lock .
 RUN NOYARNPOSTINSTALL=1 yarn install --frozen-lockfile --production
--- a/alm/src/components/ManualExecutionButton.tsx
+++ b/alm/src/components/ManualExecutionButton.tsx
@@ -45,6 +45,7 @@ export const ManualExecutionButton = ({
  const { library, activate, account, active } = useWeb3React()
  const [manualExecution, setManualExecution] = useState(false)
  const [allowFailures, setAllowFailures] = useState(false)
+  const notReady = !foreign.bridgeContract || !signatureCollected || !signatureCollected.length

  useEffect(
    () => {
@@ -150,7 +151,7 @@ export const ManualExecutionButton = ({
  return (
    <div>
      <div className="is-center">
-        <ActionButton className="button outline" onClick={() => setManualExecution(true)}>
+        <ActionButton disabled={notReady} className="button outline" onClick={() => setManualExecution(true)}>
          Execute
        </ActionButton>
      </div>
--- a/alm/src/utils/getConfirmationsForTx.ts
+++ b/alm/src/utils/getConfirmationsForTx.ts
@@ -86,6 +86,14 @@ export const getConfirmationsForTx = async (
    setPendingConfirmations(validatorPendingConfirmations.length > 0)
  } else {
    setPendingConfirmations(false)
+    if (fromHome) {
+      // fetch collected signatures for possible manual processing
+      setSignatureCollected(
+        await Promise.all(
+          Array.from(Array(requiredSignatures).keys()).map(i => bridgeContract.methods.signature(hashMsg, i).call())
+        )
+      )
+    }
  }

  const undefinedConfirmations = validatorConfirmations.filter(
@@ -115,15 +123,6 @@ export const getConfirmationsForTx = async (
      status: VALIDATOR_CONFIRMATION_STATUS.NOT_REQUIRED
    }))
    updateConfirmations(notRequiredConfirmations)
-
-    if (fromHome) {
-      // fetch collected signatures for possible manual processing
-      setSignatureCollected(
-        await Promise.all(
-          Array.from(Array(requiredSignatures).keys()).map(i => bridgeContract.methods.signature(hashMsg, i).call())
-        )
-      )
-    }
  }

  // get transactions from success signatures
--- a/audit/chainsecurity/FT-AMB-6.0.0-and-OmniBridge-1.1.0-contracts-security-assessment-report.pdf
+++ b/audit/chainsecurity/FT-AMB-6.0.0-and-OmniBridge-1.1.0-contracts-security-assessment-report.pdf
--- a/commons/abis.js
+++ b/commons/abis.js
@@ -1,5 +1,5 @@
 const HOME_ERC_TO_NATIVE_ABI = require('../contracts/build/contracts/HomeBridgeErcToNative').abi
-const FOREIGN_ERC_TO_NATIVE_ABI = require('../contracts/build/contracts/ForeignBridgeErcToNative').abi
+const FOREIGN_ERC_TO_NATIVE_ABI = require('../contracts/build/contracts/XDaiForeignBridge.json').abi
 const ERC20_ABI = require('../contracts/build/contracts/ERC20').abi
 const BLOCK_REWARD_ABI = require('../contracts/build/contracts/BlockRewardMock').abi
 const BRIDGE_VALIDATORS_ABI = require('../contracts/build/contracts/BridgeValidators').abi
--- a/commons/package.json
+++ b/commons/package.json
@@ -8,6 +8,7 @@
    "test": "NODE_ENV=test mocha"
  },
  "dependencies": {
+    "@mycrypto/gas-estimation": "^1.1.0",
    "gas-price-oracle": "^0.1.5",
    "web3-utils": "^1.3.0",
    "node-fetch": "^2.1.2"
--- a/commons/utils.js
+++ b/commons/utils.js
@@ -1,5 +1,6 @@
 const { toWei, toBN, BN } = require('web3-utils')
 const { GasPriceOracle } = require('gas-price-oracle')
+const { estimateFees } = require('@mycrypto/gas-estimation')
 const fetch = require('node-fetch')
 const { BRIDGE_MODES } = require('./constants')
 const { REWARDABLE_VALIDATORS_ABI } = require('./abis')
@@ -176,12 +177,20 @@ const gasPriceWithinLimits = (gasPrice, limits) => {
 const normalizeGasPrice = (oracleGasPrice, factor, limits = null) => {
  let gasPrice = oracleGasPrice * factor
  gasPrice = gasPriceWithinLimits(gasPrice, limits)
-  return toBN(toWei(gasPrice.toFixed(2).toString(), 'gwei'))
+  return toWei(gasPrice.toFixed(2).toString(), 'gwei')
 }

-const gasPriceFromSupplier = async (url, options = {}) => {
+const gasPriceFromSupplier = async (web3, url, options = {}) => {
  try {
    let json
+    if (url === 'eip1559-gas-estimation') {
+      const { maxFeePerGas, maxPriorityFeePerGas } = await estimateFees(web3)
+      const res = { maxFeePerGas: maxFeePerGas.toString(10), maxPriorityFeePerGas: maxPriorityFeePerGas.toString(10) }
+      options.logger &&
+        options.logger.debug &&
+        options.logger.debug(res, 'Gas price updated using eip1559-gas-estimation')
+      return res
+    }
    if (url === 'gas-price-oracle') {
      json = await gasPriceOracle.fetchGasPricesOffChain()
    } else if (url) {
@@ -205,7 +214,7 @@ const gasPriceFromSupplier = async (url, options = {}) => {
      options.logger.debug &&
      options.logger.debug({ oracleGasPrice, normalizedGasPrice }, 'Gas price updated using the API')

-    return normalizedGasPrice
+    return { gasPrice: normalizedGasPrice }
  } catch (e) {
    options.logger && options.logger.error && options.logger.error(`Gas Price API is not available. ${e.message}`)
  }
@@ -214,11 +223,11 @@ const gasPriceFromSupplier = async (url, options = {}) => {

 const gasPriceFromContract = async (bridgeContract, options = {}) => {
  try {
-    const gasPrice = await bridgeContract.methods.gasPrice().call()
+    const gasPrice = (await bridgeContract.methods.gasPrice().call()).toString()
    options.logger &&
      options.logger.debug &&
      options.logger.debug({ gasPrice }, 'Gas price updated using the contracts')
-    return gasPrice
+    return { gasPrice }
  } catch (e) {
    options.logger &&
      options.logger.error &&
--- a/2
+++ b/2
--- a/deployment/roles/common/templates/docker-logs.j2
+++ b/deployment/roles/common/templates/docker-logs.j2
@@ -1,6 +1,6 @@
 /var/log/docker/*/docker.log {
  rotate 5
-  size 1G
+  size 100M
  compress
  missingok
  delaycompress
@@ -8,7 +8,7 @@
 }
 /var/log/docker/*.log {
  rotate 5
-  size 1G
+  size 100M
  compress
  missingok
  delaycompress
--- a/deployment/roles/oracle/tasks/logging.yml
+++ b/deployment/roles/oracle/tasks/logging.yml
@@ -7,7 +7,7 @@
  loop_control:
    loop_var: file

- name: Set the local container logs configuration file
+- name: Set the oracle's containers local logs configuration file
  template:
    src: 31-oracle-docker.conf.j2
    dest: /etc/rsyslog.d/31-oracle-docker.conf
@@ -15,6 +15,22 @@
    group: root
    mode: 0644

+- name: Set the redis container local logs configuration file
+  template:
+    src: 32-redis-docker.conf.j2
+    dest: /etc/rsyslog.d/32-redis-docker.conf
+    owner: root
+    group: root
+    mode: 0644
+
+- name: Set the rabbit MQ container local logs configuration file
+  template:
+    src: 33-rabbit-docker.conf.j2
+    dest: /etc/rsyslog.d/33-rabbit-docker.conf
+    owner: root
+    group: root
+    mode: 0644
+
 - name: Set the log configuration file to send container logs to remote server
  template:
    src: 36-oracle-remote-logging.conf.j2
--- a/deployment/roles/oracle/templates/.env.j2
+++ b/deployment/roles/oracle/templates/.env.j2
@@ -11,9 +11,16 @@ ORACLE_HOME_RPC_POLLING_INTERVAL={{ ORACLE_HOME_RPC_POLLING_INTERVAL }}

 ## Foreign contract
 COMMON_FOREIGN_RPC_URL={{ COMMON_FOREIGN_RPC_URL }}
+{% if ORACLE_FOREIGN_ARCHIVE_RPC_URL | default('') != '' %}
+ORACLE_FOREIGN_ARCHIVE_RPC_URL={{ ORACLE_FOREIGN_ARCHIVE_RPC_URL }}
+{% endif %}
 COMMON_FOREIGN_BRIDGE_ADDRESS={{ COMMON_FOREIGN_BRIDGE_ADDRESS }}
 ORACLE_FOREIGN_RPC_POLLING_INTERVAL={{ ORACLE_FOREIGN_RPC_POLLING_INTERVAL }}

+{% if ORACLE_TX_REDUNDANCY | default('') != '' %}
+ORACLE_TX_REDUNDANCY={{ ORACLE_TX_REDUNDANCY }}
+{% endif %}
+
 ## Gasprice
 {% if COMMON_HOME_GAS_PRICE_SUPPLIER_URL | default('') != '' %}
 COMMON_HOME_GAS_PRICE_SUPPLIER_URL={{ COMMON_HOME_GAS_PRICE_SUPPLIER_URL }}
@@ -47,8 +54,28 @@ COMMON_FOREIGN_GAS_PRICE_FACTOR={{ COMMON_FOREIGN_GAS_PRICE_FACTOR }}
 ORACLE_ALLOW_HTTP_FOR_RPC={{ "yes" if ORACLE_ALLOW_HTTP_FOR_RPC else "no" }}
 ORACLE_QUEUE_URL={{ ORACLE_QUEUE_URL }}
 ORACLE_REDIS_URL={{ ORACLE_REDIS_URL }}
-{% if ORACLE_TX_REDUNDANCY | default('') != '' %}
-ORACLE_TX_REDUNDANCY={{ ORACLE_TX_REDUNDANCY }}
+{% if ORACLE_FOREIGN_TX_RESEND_INTERVAL | default('') != '' %}
+ORACLE_FOREIGN_TX_RESEND_INTERVAL={{ ORACLE_FOREIGN_TX_RESEND_INTERVAL }}
+{% endif %}
+{% if ORACLE_HOME_TX_RESEND_INTERVAL | default('') != '' %}
+ORACLE_HOME_TX_RESEND_INTERVAL={{ ORACLE_HOME_TX_RESEND_INTERVAL }}
+{% endif %}
+
+## Emergency shutdown configuration
+{% if ORACLE_SHUTDOWN_SERVICE_URL | default('') != '' %}
+ORACLE_SHUTDOWN_SERVICE_URL={{ ORACLE_SHUTDOWN_SERVICE_URL }}
+{% endif %}
+{% if ORACLE_SHUTDOWN_SERVICE_POLLING_INTERVAL | default('') != '' %}
+ORACLE_SHUTDOWN_SERVICE_POLLING_INTERVAL={{ ORACLE_SHUTDOWN_SERVICE_POLLING_INTERVAL }}
+{% endif %}
+{% if ORACLE_SIDE_RPC_URL | default('') != '' %}
+ORACLE_SIDE_RPC_URL={{ ORACLE_SIDE_RPC_URL }}
+{% endif %}
+{% if ORACLE_SHUTDOWN_CONTRACT_ADDRESS | default('') != '' %}
+ORACLE_SHUTDOWN_CONTRACT_ADDRESS={{ ORACLE_SHUTDOWN_CONTRACT_ADDRESS }}
+{% endif %}
+{% if ORACLE_SHUTDOWN_CONTRACT_METHOD | default('') != '' %}
+ORACLE_SHUTDOWN_CONTRACT_METHOD={{ ORACLE_SHUTDOWN_CONTRACT_METHOD }}
 {% endif %}

 {% if ORACLE_HOME_START_BLOCK | default('') != '' %}
--- a/deployment/roles/oracle/templates/32-redis-docker.conf.j2
+++ b/deployment/roles/oracle/templates/32-redis-docker.conf.j2
@@ -0,0 +1,11 @@
+$FileCreateMode 0644
+template(name="DockerLogFileName_Redis" type="list") {
+   constant(value="/var/log/docker/")
+   property(name="syslogtag" securepath="replace" regex.type="ERE" regex.submatch="1" regex.expression="oracle_(.*redis.*)\\/[a-zA-Z0-9]+\\[")
+   constant(value="/docker.log")
+}
+
+if $programname contains 'oracle' and $programname contains 'redis' then \
+  ?DockerLogFileName_Redis
+
+$FileCreateMode 0600
--- a/deployment/roles/oracle/templates/33-rabbit-docker.conf.j2
+++ b/deployment/roles/oracle/templates/33-rabbit-docker.conf.j2
@@ -0,0 +1,11 @@
+$FileCreateMode 0644
+template(name="DockerLogFileName_Rabbit" type="list") {
+   constant(value="/var/log/docker/")
+   property(name="syslogtag" securepath="replace" regex.type="ERE" regex.submatch="1" regex.expression="oracle_(.*rabbit.*)\\/[a-zA-Z0-9]+\\[")
+   constant(value="/docker.log")
+}
+
+if $programname contains 'oracle' and $programname contains 'rabbit' then \
+  ?DockerLogFileName_Rabbit
+
+$FileCreateMode 0600
--- a/e2e-commons/components-envs/oracle-amb.env
+++ b/e2e-commons/components-envs/oracle-amb.env
@@ -23,3 +23,9 @@ ORACLE_HOME_START_BLOCK=1
 ORACLE_FOREIGN_START_BLOCK=1
 ORACLE_HOME_TO_FOREIGN_BLOCK_LIST=/mono/oracle/access-lists/block_list.txt
 ORACLE_FOREIGN_ARCHIVE_RPC_URL=http://parity2:8545
+ORACLE_HOME_EVENTS_REPROCESSING=false
+ORACLE_HOME_EVENTS_REPROCESSING_BATCH_SIZE=10
+ORACLE_HOME_EVENTS_REPROCESSING_BLOCK_DELAY=10
+ORACLE_FOREIGN_EVENTS_REPROCESSING=true
+ORACLE_FOREIGN_EVENTS_REPROCESSING_BATCH_SIZE=10
+ORACLE_FOREIGN_EVENTS_REPROCESSING_BLOCK_DELAY=10
--- a/e2e-commons/components-envs/oracle-erc20-native.env
+++ b/e2e-commons/components-envs/oracle-erc20-native.env
@@ -22,3 +22,9 @@ ORACLE_ALLOW_HTTP_FOR_RPC=yes
 ORACLE_HOME_START_BLOCK=1
 ORACLE_FOREIGN_START_BLOCK=1
 ORACLE_HOME_TO_FOREIGN_BLOCK_LIST=/mono/oracle/access-lists/block_list.txt
+ORACLE_HOME_EVENTS_REPROCESSING=true
+ORACLE_HOME_EVENTS_REPROCESSING_BATCH_SIZE=10
+ORACLE_HOME_EVENTS_REPROCESSING_BLOCK_DELAY=10
+ORACLE_FOREIGN_EVENTS_REPROCESSING=true
+ORACLE_FOREIGN_EVENTS_REPROCESSING_BATCH_SIZE=10
+ORACLE_FOREIGN_EVENTS_REPROCESSING_BLOCK_DELAY=10
--- a/e2e-commons/constants.json
+++ b/e2e-commons/constants.json
@@ -38,7 +38,7 @@
  "ercToNativeBridge": {
    "home": "0x5118AC62AE912Dd5B51EEfF7338c4fcb0248Ba8c",
    "foreign": "0x32198D570fffC7033641F8A9094FFDCaAEF42624",
-    "foreignToken": "0x7cc4b1851c35959d34e635a470f6b5c43ba3c9c9",
+    "foreignToken": "0x6B175474E89094C44Da98b954EedeAC495271d0F",
    "monitor": "http://monitor-erc20-native:3012/bridge"
  },
  "amb": {
--- a/e2e-commons/contracts-envs/erc-to-native.env
+++ b/e2e-commons/contracts-envs/erc-to-native.env
@@ -32,7 +32,7 @@ FOREIGN_GAS_PRICE=10000000000
 FOREIGN_REWARDABLE=false

 BLOCK_REWARD_ADDRESS=0xdbeE25CbE97e4A5CC6c499875774dc7067E9426B
-ERC20_TOKEN_ADDRESS=0x7cc4b1851c35959d34e635a470f6b5c43ba3c9c9
+ERC20_TOKEN_ADDRESS=0x6B175474E89094C44Da98b954EedeAC495271d0F

 REQUIRED_NUMBER_OF_VALIDATORS=1
 VALIDATORS="0xaaB52d66283F7A1D5978bcFcB55721ACB467384b 0xdCC784657C78054aa61FbcFFd2605F32374816A4 0xDcef88209a20D52165230104B245803C3269454d"
--- a/monitor/getBalances.js
+++ b/monitor/getBalances.js
@@ -46,29 +46,19 @@ async function main(bridgeMode, eventsInfo) {
    const foreignBridge = new web3Foreign.eth.Contract(FOREIGN_ERC_TO_NATIVE_ABI, COMMON_FOREIGN_BRIDGE_ADDRESS)
    const erc20Address = await foreignBridge.methods.erc20token().call()
    const erc20Contract = new web3Foreign.eth.Contract(ERC20_ABI, erc20Address)
-    let investedAmountInDai = 0
-    let bridgeDsrBalance = 0
-    let displayChaiToken = false
-
-    try {
-      logger.debug('calling foreignBridge.methods.isChaiTokenEnabled')
-      if (await foreignBridge.methods.isChaiTokenEnabled().call()) {
-        displayChaiToken = true
-        logger.debug('calling foreignBridge.methods.investedAmountInDai')
-        investedAmountInDai = await foreignBridge.methods.investedAmountInDai().call()
-        logger.debug('calling foreignBridge.methods.dsrBalance')
-        bridgeDsrBalance = await foreignBridge.methods.dsrBalance().call()
-      } else {
-        logger.debug('Chai token is currently disabled')
-      }
-    } catch (e) {
-      logger.debug('Methods for chai token are not present')
-    }

    logger.debug('calling erc20Contract.methods.balanceOf')
    const foreignErc20Balance = await erc20Contract.methods
      .balanceOf(COMMON_FOREIGN_BRIDGE_ADDRESS)
      .call({}, foreignDelayedBlockNumber)
+    let foreignErc20BalanceBN = new BN(foreignErc20Balance).plus(lateForeignConfirmationsTotalValue)
+    try {
+      logger.debug('calling foreignBridge.methods.investedAmount')
+      const invested = await foreignBridge.methods.investedAmount(erc20Address).call({}, foreignDelayedBlockNumber)
+      foreignErc20BalanceBN = foreignErc20BalanceBN.plus(invested)
+    } catch (_) {
+      logger.debug('compounding related methods are not present in the foreign bridge')
+    }

    const homeBridge = new web3Home.eth.Contract(HOME_ERC_TO_NATIVE_ABI, COMMON_HOME_BRIDGE_ADDRESS)
    logger.debug('calling homeBridge.methods.blockRewardContract')
@@ -84,30 +74,16 @@ async function main(bridgeMode, eventsInfo) {
    const mintedCoinsBN = new BN(mintedCoins)
    const burntCoinsBN = new BN(burntCoins)
    const totalSupplyBN = mintedCoinsBN.minus(burntCoinsBN)
-    const foreignErc20BalanceBN = new BN(foreignErc20Balance).plus(lateForeignConfirmationsTotalValue)
-    const investedAmountInDaiBN = new BN(investedAmountInDai)
-    const bridgeDsrBalanceBN = new BN(bridgeDsrBalance)
-
-    const diff = foreignErc20BalanceBN
-      .plus(investedAmountInDaiBN)
-      .minus(totalSupplyBN)
-      .toFixed()
-
-    const foreign = {
-      erc20Balance: Web3Utils.fromWei(foreignErc20Balance)
-    }
-
-    if (displayChaiToken) {
-      foreign.investedErc20Balance = Web3Utils.fromWei(investedAmountInDai)
-      foreign.accumulatedInterest = Web3Utils.fromWei(bridgeDsrBalanceBN.minus(investedAmountInDaiBN).toString(10))
-    }

+    const diff = foreignErc20BalanceBN.minus(totalSupplyBN).toFixed()
    logger.debug('Done')
    return {
      home: {
        totalSupply: Web3Utils.fromWei(totalSupplyBN.toFixed())
      },
-      foreign,
+      foreign: {
+        erc20Balance: Web3Utils.fromWei(foreignErc20Balance)
+      },
      balanceDiff: Number(Web3Utils.fromWei(diff)),
      ...blockRanges,
      lastChecked: Math.floor(Date.now() / 1000)
--- a/monitor/utils/events.js
+++ b/monitor/utils/events.js
@@ -11,7 +11,6 @@ const {
  OLD_AMB_USER_REQUEST_FOR_AFFIRMATION_ABI
 } = require('../../commons')
 const { normalizeEventInformation } = require('./message')
-const { filterTransferBeforeES } = require('./tokenUtils')
 const { writeFile, readCacheFile } = require('./file')
 const { web3Home, web3Foreign, getHomeBlockNumber, getForeignBlockNumber } = require('./web3')
 const { getPastEvents } = require('./web3Cache')
@@ -160,80 +159,32 @@ async function main(mode) {
        filter: { to: COMMON_FOREIGN_BRIDGE_ADDRESS }
      },
      chain: 'foreign'
+    }))
+      .map(normalizeEvent)
+      .filter(e => e.recipient !== ZERO_ADDRESS) // filter mint operation during SCD-to-MCD swaps
+      .filter(e => e.recipient.toLowerCase() !== '0x5d3a536e4d6dbd6114cc1ead35777bab948e3643') // filter cDai withdraws during compounding
+
+    // Get transfer events for each previously used Sai token
+    const saiTokenAddress = '0x89d24A6b4CcB1B6fAA2625fE562bDD9a23260359'
+    const halfDuplexTokenContract = new web3Foreign.eth.Contract(ERC20_ABI, saiTokenAddress)
+    logger.debug('Half duplex token:', saiTokenAddress)
+    logger.debug("calling halfDuplexTokenContract.getPastEvents('Transfer')")
+    // https://etherscan.io/tx/0xd0c3c92c94e05bc71256055ce8c4c993e047f04e04f3283a04e4cb077b71f6c6
+    const blockNumberHalfDuplexDisabled = 9884448
+    const halfDuplexTransferEvents = (await getPastEvents(halfDuplexTokenContract, {
+      event: 'Transfer',
+      fromBlock: MONITOR_FOREIGN_START_BLOCK,
+      toBlock: Math.min(blockNumberHalfDuplexDisabled, foreignDelayedBlockNumber),
+      options: {
+        filter: { to: COMMON_FOREIGN_BRIDGE_ADDRESS }
+      },
+      chain: 'foreign'
    })).map(normalizeEvent)

-    let directTransfers = transferEvents
-    const tokensSwappedAbiExists = FOREIGN_ABI.filter(e => e.type === 'event' && e.name === 'TokensSwapped')[0]
-    if (tokensSwappedAbiExists) {
-      logger.debug('collecting half duplex tokens participated in the bridge balance')
-      logger.debug("calling foreignBridge.getPastEvents('TokensSwapped')")
-      const tokensSwappedEvents = await getPastEvents(foreignBridge, {
-        event: 'TokensSwapped',
-        fromBlock: MONITOR_FOREIGN_START_BLOCK,
-        toBlock: foreignBlockNumber,
-        chain: 'foreign',
-        safeToBlock: foreignDelayedBlockNumber
-      })
-
-      // Get token swap events emitted by foreign bridge
-      const bridgeTokensSwappedEvents = tokensSwappedEvents.filter(e => e.address === COMMON_FOREIGN_BRIDGE_ADDRESS)
-
-      // Get transfer events for each previous erc20
-      const uniqueTokenAddressesSet = new Set(bridgeTokensSwappedEvents.map(e => e.returnValues.from))
-
-      // Exclude chai token from previous erc20
-      try {
-        logger.debug('calling foreignBridge.chaiToken() to remove it from half duplex tokens list')
-        const chaiToken = await foreignBridge.methods.chaiToken().call()
-        uniqueTokenAddressesSet.delete(chaiToken)
-      } catch (e) {
-        logger.debug('call to foreignBridge.chaiToken() failed')
-      }
-      // Exclude dai token from previous erc20
-      try {
-        logger.debug('calling foreignBridge.erc20token()  to remove it from half duplex tokens list')
-        const daiToken = await foreignBridge.methods.erc20token().call()
-        uniqueTokenAddressesSet.delete(daiToken)
-      } catch (e) {
-        logger.debug('call to foreignBridge.erc20token() failed')
-      }
-
-      const uniqueTokenAddresses = [...uniqueTokenAddressesSet]
-      await Promise.all(
-        uniqueTokenAddresses.map(async tokenAddress => {
-          const halfDuplexTokenContract = new web3Foreign.eth.Contract(ERC20_ABI, tokenAddress)
-
-          logger.debug('Half duplex token:', tokenAddress)
-          logger.debug("calling halfDuplexTokenContract.getPastEvents('Transfer')")
-          const halfDuplexTransferEvents = (await getPastEvents(halfDuplexTokenContract, {
-            event: 'Transfer',
-            fromBlock: MONITOR_FOREIGN_START_BLOCK,
-            toBlock: foreignDelayedBlockNumber,
-            options: {
-              filter: { to: COMMON_FOREIGN_BRIDGE_ADDRESS }
-            },
-            chain: 'foreign'
-          })).map(normalizeEvent)
-
-          // Remove events after the ES
-          logger.debug('filtering half duplex transfers happened before ES')
-          const validHalfDuplexTransfers = await filterTransferBeforeES(halfDuplexTransferEvents)
-
-          transferEvents = [...validHalfDuplexTransfers, ...transferEvents]
-        })
-      )
-
-      // filter transfer that is part of a token swap
-      directTransfers = transferEvents.filter(
-        e =>
-          bridgeTokensSwappedEvents.findIndex(
-            t => t.transactionHash === e.referenceTx && e.recipient === ZERO_ADDRESS
-          ) === -1
-      )
-    }
+    transferEvents = [...halfDuplexTransferEvents, ...transferEvents]

    // Get transfer events that didn't have a UserRequestForAffirmation event in the same transaction
-    directTransfers = directTransfers.filter(
+    const directTransfers = transferEvents.filter(
      e => foreignToHomeRequests.findIndex(t => t.referenceTx === e.referenceTx) === -1
    )

--- a/monitor/utils/tokenUtils.js
+++ b/monitor/utils/tokenUtils.js
@@ -1,27 +0,0 @@
-// https://etherscan.io/tx/0xd0c3c92c94e05bc71256055ce8c4c993e047f04e04f3283a04e4cb077b71f6c6
-const blockNumberHalfDuplexDisabled = 9884448
-
-/**
- * Returns true if the event was before the bridge stopped supporting half duplex transfers.
- */
-async function transferBeforeES(event) {
-  return event.blockNumber < blockNumberHalfDuplexDisabled
-}
-
-async function filterTransferBeforeES(array) {
-  const newArray = []
-  // Iterate events from newer to older
-  for (let i = array.length - 1; i >= 0; i--) {
-    const beforeES = await transferBeforeES(array[i])
-    if (beforeES) {
-      // add element to first position so the new array will have the same order
-      newArray.unshift(array[i])
-    }
-  }
-  return newArray
-}
-
-module.exports = {
-  filterTransferBeforeES,
-  blockNumberHalfDuplexDisabled
-}
--- a/oracle-e2e/test/amb.js
+++ b/oracle-e2e/test/amb.js
@@ -1,5 +1,6 @@
 const Web3 = require('web3')
 const assert = require('assert')
+const { ASYNC_CALL_ERRORS } = require('../../oracle/src/utils/constants')
 const { user, homeRPC, foreignRPC, amb, validator } = require('../../e2e-commons/constants.json')
 const { uniformRetry } = require('../../e2e-commons/utils')
 const { BOX_ABI, HOME_AMB_ABI, FOREIGN_AMB_ABI, ambInformationSignatures } = require('../../commons')
@@ -26,6 +27,45 @@ const foreignBox = new foreignWeb3.eth.Contract(BOX_ABI, amb.foreignBox, opts)
 const homeBridge = new homeWeb3.eth.Contract(HOME_AMB_ABI, amb.home, opts)
 const foreignBridge = new foreignWeb3.eth.Contract(FOREIGN_AMB_ABI, amb.foreign, opts)

+function validateBlock(web3, serialized, block) {
+  assert.strictEqual(serialized.length, 2 + 64 * 12)
+  const values = web3.eth.abi.decodeParameter(
+    '(uint256,bytes32,address,uint256,uint256,bytes32,bytes32,bytes32,bytes32,uint256,uint256,uint256)',
+    serialized
+  )
+  assert.strictEqual(values[0], block.number.toString(), 'wrong block number returned')
+  assert.strictEqual(values[1], block.hash, 'wrong block hash returned')
+  assert.strictEqual(values[2], block.miner, 'wrong block miner returned')
+  assert.strictEqual(values[3], block.gasUsed.toString(), 'wrong block gasUsed returned')
+  assert.strictEqual(values[4], block.gasLimit.toString(), 'wrong block gasLimit returned')
+  assert.strictEqual(values[5], block.parentHash, 'wrong block parentHash returned')
+  assert.strictEqual(values[6], block.receiptsRoot, 'wrong block receiptsRoot returned')
+  assert.strictEqual(values[7], block.stateRoot, 'wrong block stateRoot returned')
+  assert.strictEqual(values[8], block.transactionsRoot, 'wrong block transactionsRoot returned')
+  assert.strictEqual(values[9], block.timestamp.toString(), 'wrong block timestamp returned')
+  assert.strictEqual(values[10], block.difficulty, 'wrong block difficulty returned')
+  assert.strictEqual(values[11], block.totalDifficulty, 'wrong block totalDifficulty returned')
+}
+
+function validateTransaction(web3, serialized, tx) {
+  assert.strictEqual(serialized.length, 64 * 13 + tx.input.length + 56)
+  const values = web3.eth.abi.decodeParameter(
+    '(bytes32,uint256,bytes32,uint256,address,address,uint256,uint256,uint256,uint256,bytes)',
+    serialized
+  )
+  assert.strictEqual(values[0], tx.hash, 'wrong txHash returned')
+  assert.strictEqual(values[1], tx.blockNumber.toString(), 'wrong tx blockNumber returned')
+  assert.strictEqual(values[2], tx.blockHash.toString(), 'wrong tx blockHash returned')
+  assert.strictEqual(values[3], tx.transactionIndex.toString(), 'wrong tx transactionIndex returned')
+  assert.strictEqual(values[4], tx.from, 'wrong tx from returned')
+  assert.strictEqual(values[5], tx.to, 'wrong tx to returned')
+  assert.strictEqual(values[6], tx.value, 'wrong tx value returned')
+  assert.strictEqual(values[7], tx.nonce.toString(), 'wrong tx nonce returned')
+  assert.strictEqual(values[8], tx.gas.toString(), 'wrong tx gas returned')
+  assert.strictEqual(values[9], tx.gasPrice, 'wrong tx gasPrice returned')
+  assert.strictEqual(values[10], tx.input, 'wrong tx data returned')
+}
+
 describe('arbitrary message bridging', () => {
  let requiredSignatures = 1
  before(async () => {
@@ -264,7 +304,7 @@ describe('arbitrary message bridging', () => {
      await makeAsyncCall(selector, data2)

      assert(!(await homeBox.methods.status().call()), 'status is true')
-      assert.strictEqual(await homeBox.methods.data().call(), null, 'returned data is incorrect')
+      assert.strictEqual(await homeBox.methods.data().call(), ASYNC_CALL_ERRORS.REVERT, 'returned data is incorrect')

      const data3 = homeWeb3.eth.abi.encodeParameters(
        ['address', 'address', 'uint256', 'bytes'],
@@ -274,7 +314,7 @@ describe('arbitrary message bridging', () => {
      await makeAsyncCall(selector, data3)

      assert(!(await homeBox.methods.status().call()), 'status is true')
-      assert.strictEqual(await homeBox.methods.data().call(), null, 'returned data is incorrect')
+      assert.strictEqual(await homeBox.methods.data().call(), ASYNC_CALL_ERRORS.REVERT, 'returned data is incorrect')
    })

    it('should make async eth_call for specific block', async () => {
@@ -315,6 +355,11 @@ describe('arbitrary message bridging', () => {
      await makeAsyncCall(selector, data3)

      assert(!(await homeBox.methods.status().call()), 'status is true')
+      assert.strictEqual(
+        await homeBox.methods.data().call(),
+        ASYNC_CALL_ERRORS.BLOCK_IS_IN_THE_FUTURE,
+        'returned data is incorrect'
+      )
    })

    it('should make async eth_blockNumber', async () => {
@@ -334,15 +379,8 @@ describe('arbitrary message bridging', () => {

      assert(await homeBox.methods.status().call(), 'status is false')
      const data = await homeBox.methods.data().call()
-      assert.strictEqual(data.length, 2 + 64 * 3)
-      const { 0: number, 1: hash, 2: miner } = homeWeb3.eth.abi.decodeParameters(
-        ['uint256', 'bytes32', 'address'],
-        data
-      )
      const block = await foreignWeb3.eth.getBlock(blockNumber)
-      assert.strictEqual(number, blockNumber, 'wrong block number returned')
-      assert.strictEqual(hash, block.hash, 'wrong block hash returned')
-      assert.strictEqual(miner, block.miner, 'wrong block miner returned')
+      validateBlock(homeWeb3, data, block)
    })

    it('should make async eth_getBlockByNumber and return latest block', async () => {
@@ -352,7 +390,7 @@ describe('arbitrary message bridging', () => {

      assert(await homeBox.methods.status().call(), 'status is false')
      const data = await homeBox.methods.data().call()
-      assert.strictEqual(data.length, 2 + 64 * 3)
+      assert.strictEqual(data.length, 2 + 64 * 12)
    })

    it('should make async eth_getBlockByHash', async () => {
@@ -364,16 +402,7 @@ describe('arbitrary message bridging', () => {

      assert(await homeBox.methods.status().call(), 'status is false')
      const data = await homeBox.methods.data().call()
-      assert.strictEqual(data.length, 2 + 64 * 3)
-
-      const { 0: number, 1: hash, 2: miner } = homeWeb3.eth.abi.decodeParameters(
-        ['uint256', 'bytes32', 'address'],
-        data
-      )
-
-      assert.strictEqual(number, blockNumber, 'wrong block number returned')
-      assert.strictEqual(hash, block.hash, 'wrong block hash returned')
-      assert.strictEqual(miner, block.miner, 'wrong block miner returned')
+      validateBlock(homeWeb3, data, block)
    })

    it('should make async eth_getBalance', async () => {
@@ -469,28 +498,7 @@ describe('arbitrary message bridging', () => {

      assert(await homeBox.methods.status().call(), 'status is false')
      const data = await homeBox.methods.data().call()
-      const dataTypes = [
-        'bytes32',
-        'uint256',
-        'address',
-        'address',
-        'uint256',
-        'uint256',
-        'uint256',
-        'uint256',
-        'bytes'
-      ]
-      const values = homeWeb3.eth.abi.decodeParameters(dataTypes, data)
-
-      assert.strictEqual(values[0], txHash, 'wrong txHash returned')
-      assert.strictEqual(values[1], tx.blockNumber.toString(), 'wrong tx blockNumber returned')
-      assert.strictEqual(values[2], tx.from, 'wrong tx from returned')
-      assert.strictEqual(values[3], tx.to, 'wrong tx to returned')
-      assert.strictEqual(values[4], tx.value, 'wrong tx value returned')
-      assert.strictEqual(values[5], tx.nonce.toString(), 'wrong tx nonce returned')
-      assert.strictEqual(values[6], tx.gas.toString(), 'wrong tx gas returned')
-      assert.strictEqual(values[7], tx.gasPrice, 'wrong tx gasPrice returned')
-      assert.strictEqual(values[8], tx.input, 'wrong tx data returned')
+      validateTransaction(homeWeb3, data, tx)
    })

    it('should make async eth_getTransactionReceipt', async () => {
@@ -502,18 +510,25 @@ describe('arbitrary message bridging', () => {

      assert(await homeBox.methods.status().call(), 'status is false')
      const data = await homeBox.methods.data().call()
-      const dataTypes = ['bytes32', 'uint256', 'bool', '(address,bytes32[],bytes)[]']
-      const values = homeWeb3.eth.abi.decodeParameters(dataTypes, data)
+      const values = homeWeb3.eth.abi.decodeParameter(
+        '(bytes32,uint256,bytes32,uint256,address,address,uint256,bool,(address,bytes32[],bytes)[])',
+        data
+      )

      assert.strictEqual(values[0], txHash, 'wrong txHash returned')
      assert.strictEqual(values[1], receipt.blockNumber.toString(), 'wrong tx blockNumber returned')
-      assert.strictEqual(values[2], receipt.status, 'wrong tx status returned')
-      assert.strictEqual(values[3].length, 1, 'wrong logs length returned')
-      assert.strictEqual(values[3][0][0], receipt.logs[0].address, 'wrong log address returned')
-      assert.strictEqual(values[3][0][1].length, 2, 'wrong log topics length returned')
-      assert.strictEqual(values[3][0][1][0], receipt.logs[0].topics[0], 'wrong event signature returned')
-      assert.strictEqual(values[3][0][1][1], receipt.logs[0].topics[1], 'wrong message id returned')
-      assert.strictEqual(values[3][0][2], receipt.logs[0].data, 'wrong log data returned')
+      assert.strictEqual(values[2], receipt.blockHash, 'wrong tx blockHash returned')
+      assert.strictEqual(values[3], receipt.transactionIndex.toString(), 'wrong tx transactionIndex returned')
+      assert.strictEqual(values[4].toLowerCase(), receipt.from, 'wrong tx from returned')
+      assert.strictEqual(values[5].toLowerCase(), receipt.to, 'wrong tx to returned')
+      assert.strictEqual(values[6], receipt.gasUsed.toString(), 'wrong gasUsed to returned')
+      assert.strictEqual(values[7], receipt.status, 'wrong tx status returned')
+      assert.strictEqual(values[8].length, 1, 'wrong logs length returned')
+      assert.strictEqual(values[8][0][0], receipt.logs[0].address, 'wrong log address returned')
+      assert.strictEqual(values[8][0][1].length, 2, 'wrong log topics length returned')
+      assert.strictEqual(values[8][0][1][0], receipt.logs[0].topics[0], 'wrong event signature returned')
+      assert.strictEqual(values[8][0][1][1], receipt.logs[0].topics[1], 'wrong message id returned')
+      assert.strictEqual(values[8][0][2], receipt.logs[0].data, 'wrong log data returned')
    })

    it('should make async eth_getStorageAt', async () => {
--- a/oracle-e2e/test/ercToNative.js
+++ b/oracle-e2e/test/ercToNative.js
@@ -33,6 +33,10 @@ const homeBridge = new homeWeb3.eth.Contract(HOME_ERC_TO_NATIVE_ABI, COMMON_HOME

 describe('erc to native', () => {
  before(async () => {
+    console.log('Initializing interest')
+    await foreignBridge.methods
+      .initializeInterest(ercToNativeBridge.foreignToken, 1, 1, validator.address)
+      .send({ from: validator.address, gas: '4000000' })
    if (process.env.ULTIMATE === 'true') {
      return
    }
@@ -112,6 +116,7 @@ describe('erc to native', () => {
      .catch(e => {
        console.error(e)
      })
+    await foreignBridge.methods.investDai().send({ from: validator.address, gas: '4000000' })

    // check that balance increases
    await uniformRetry(async retry => {
--- a/oracle/config/base.config.js
+++ b/oracle/config/base.config.js
@@ -23,7 +23,13 @@ const {
  ORACLE_HOME_START_BLOCK,
  ORACLE_FOREIGN_START_BLOCK,
  ORACLE_HOME_RPC_BLOCK_POLLING_LIMIT,
-  ORACLE_FOREIGN_RPC_BLOCK_POLLING_LIMIT
+  ORACLE_FOREIGN_RPC_BLOCK_POLLING_LIMIT,
+  ORACLE_HOME_EVENTS_REPROCESSING,
+  ORACLE_HOME_EVENTS_REPROCESSING_BATCH_SIZE,
+  ORACLE_HOME_EVENTS_REPROCESSING_BLOCK_DELAY,
+  ORACLE_FOREIGN_EVENTS_REPROCESSING,
+  ORACLE_FOREIGN_EVENTS_REPROCESSING_BATCH_SIZE,
+  ORACLE_FOREIGN_EVENTS_REPROCESSING_BLOCK_DELAY
 } = process.env

 let homeAbi
@@ -61,7 +67,12 @@ const homeConfig = {
  blockPollingLimit: parseInt(ORACLE_HOME_RPC_BLOCK_POLLING_LIMIT, 10),
  web3: web3Home,
  bridgeContract: homeContract,
-  eventContract: homeContract
+  eventContract: homeContract,
+  reprocessingOptions: {
+    enabled: ORACLE_HOME_EVENTS_REPROCESSING === 'true',
+    batchSize: parseInt(ORACLE_HOME_EVENTS_REPROCESSING_BATCH_SIZE, 10) || 1000,
+    blockDelay: parseInt(ORACLE_HOME_EVENTS_REPROCESSING_BLOCK_DELAY, 10) || 500
+  }
 }

 const foreignContract = new web3Foreign.eth.Contract(foreignAbi, COMMON_FOREIGN_BRIDGE_ADDRESS)
@@ -74,7 +85,12 @@ const foreignConfig = {
  blockPollingLimit: parseInt(ORACLE_FOREIGN_RPC_BLOCK_POLLING_LIMIT, 10),
  web3: web3Foreign,
  bridgeContract: foreignContract,
-  eventContract: foreignContract
+  eventContract: foreignContract,
+  reprocessingOptions: {
+    enabled: ORACLE_FOREIGN_EVENTS_REPROCESSING === 'true',
+    batchSize: parseInt(ORACLE_FOREIGN_EVENTS_REPROCESSING_BATCH_SIZE, 10) || 500,
+    blockDelay: parseInt(ORACLE_FOREIGN_EVENTS_REPROCESSING_BLOCK_DELAY, 10) || 250
+  }
 }

 const maxProcessingTime =
--- a/oracle/config/foreign-mev-sender.config.js
+++ b/oracle/config/foreign-mev-sender.config.js
@@ -0,0 +1,37 @@
+const baseConfig = require('./base.config')
+
+const { DEFAULT_TRANSACTION_RESEND_INTERVAL } = require('../src/utils/constants')
+const { MEV_HELPER_ABI } = require('../src/utils/mev')
+const { web3Foreign, getFlashbotsProvider } = require('../src/services/web3')
+
+const {
+  ORACLE_FOREIGN_TX_RESEND_INTERVAL,
+  ORACLE_MEV_FOREIGN_HELPER_CONTRACT_ADDRESS,
+  ORACLE_MEV_FOREIGN_MIN_GAS_PRICE,
+  ORACLE_MEV_FOREIGN_FLAT_MINER_FEE,
+  ORACLE_MEV_FOREIGN_MAX_PRIORITY_FEE_PER_GAS,
+  ORACLE_MEV_FOREIGN_MAX_FEE_PER_GAS,
+  ORACLE_MEV_FOREIGN_BUNDLES_BLOCK_RANGE
+} = process.env
+
+const contract = new baseConfig.foreign.web3.eth.Contract(MEV_HELPER_ABI, ORACLE_MEV_FOREIGN_HELPER_CONTRACT_ADDRESS)
+
+module.exports = {
+  ...baseConfig,
+  pollingInterval: baseConfig.foreign.pollingInterval,
+  mevForeign: {
+    contractAddress: ORACLE_MEV_FOREIGN_HELPER_CONTRACT_ADDRESS,
+    contract,
+    minGasPrice: ORACLE_MEV_FOREIGN_MIN_GAS_PRICE,
+    flatMinerFee: ORACLE_MEV_FOREIGN_FLAT_MINER_FEE,
+    maxPriorityFeePerGas: ORACLE_MEV_FOREIGN_MAX_PRIORITY_FEE_PER_GAS,
+    maxFeePerGas: ORACLE_MEV_FOREIGN_MAX_FEE_PER_GAS,
+    bundlesPerIteration: Math.max(parseInt(ORACLE_MEV_FOREIGN_BUNDLES_BLOCK_RANGE, 10) || 5, 1),
+    getFlashbotsProvider
+  },
+  mevJobsRedisKey: `${baseConfig.id}-collected-signatures-mev:mevJobs`,
+  id: 'mev-sender-foreign',
+  name: 'mev-sender-foreign',
+  web3: web3Foreign,
+  resendInterval: parseInt(ORACLE_FOREIGN_TX_RESEND_INTERVAL, 10) || DEFAULT_TRANSACTION_RESEND_INTERVAL
+}
--- a/oracle/config/foreign-sender.config.js
+++ b/oracle/config/foreign-sender.config.js
@@ -8,7 +8,6 @@ const { ORACLE_FOREIGN_TX_RESEND_INTERVAL } = process.env
 module.exports = {
  ...baseConfig,
  queue: 'foreign-prioritized',
-  oldQueue: 'foreign',
  id: 'foreign',
  name: 'sender-foreign',
  web3: web3Foreign,
--- a/oracle/config/home-sender.config.js
+++ b/oracle/config/home-sender.config.js
@@ -8,7 +8,6 @@ const { ORACLE_HOME_TX_RESEND_INTERVAL } = process.env
 module.exports = {
  ...baseConfig,
  queue: 'home-prioritized',
-  oldQueue: 'home',
  id: 'home',
  name: 'sender-home',
  web3: web3Home,
--- a/oracle/config/mev-collected-signatures-watcher.config.js
+++ b/oracle/config/mev-collected-signatures-watcher.config.js
@@ -0,0 +1,30 @@
+const baseConfig = require('./base.config')
+const { MEV_HELPER_ABI } = require('../src/utils/mev')
+
+const {
+  ORACLE_MEV_FOREIGN_HELPER_CONTRACT_ADDRESS,
+  ORACLE_MEV_FOREIGN_MIN_GAS_PRICE,
+  ORACLE_MEV_FOREIGN_FLAT_MINER_FEE,
+  ORACLE_MEV_FOREIGN_MAX_PRIORITY_FEE_PER_GAS,
+  ORACLE_MEV_FOREIGN_MAX_FEE_PER_GAS
+} = process.env
+
+const id = `${baseConfig.id}-collected-signatures-mev`
+
+const contract = new baseConfig.foreign.web3.eth.Contract(MEV_HELPER_ABI, ORACLE_MEV_FOREIGN_HELPER_CONTRACT_ADDRESS)
+
+module.exports = {
+  ...baseConfig,
+  mevForeign: {
+    contractAddress: ORACLE_MEV_FOREIGN_HELPER_CONTRACT_ADDRESS,
+    contract,
+    minGasPrice: ORACLE_MEV_FOREIGN_MIN_GAS_PRICE,
+    flatMinerFee: ORACLE_MEV_FOREIGN_FLAT_MINER_FEE,
+    maxPriorityFeePerGas: ORACLE_MEV_FOREIGN_MAX_PRIORITY_FEE_PER_GAS,
+    maxFeePerGas: ORACLE_MEV_FOREIGN_MAX_FEE_PER_GAS
+  },
+  main: baseConfig.home,
+  event: 'CollectedSignatures',
+  name: `watcher-${id}`,
+  id
+}
--- a/oracle/docker-compose-helpers.yml
+++ b/oracle/docker-compose-helpers.yml
@@ -0,0 +1,61 @@
+---
+version: '2.4'
+services:
+  redis:
+    cpus: 0.1
+    mem_limit: 500m
+    command: [ redis-server, --appendonly, 'yes' ]
+    hostname: redis
+    image: redis:4
+    restart: unless-stopped
+    volumes: [ '~/bridge_data/helpers/redis:/data' ]
+  interestFetcher:
+    cpus: 0.1
+    mem_limit: 500m
+    image: poanetwork/tokenbridge-oracle:latest
+    env_file: ./.env
+    environment:
+      NODE_ENV: production
+      INTEREST_FETCHER_PRIVATE_KEY: ${INTEREST_FETCHER_PRIVATE_KEY}
+      INTEREST_FETCH_CONTRACT_ADDRESS: '0xCd152c7Bd4189Ddee97EaBb783FC5cD93CF2D230'
+      INTERVAL: 300000
+    restart: unless-stopped
+    entrypoint: yarn helper:interestFether
+  mevWatcher:
+    cpus: 0.1
+    mem_limit: 500m
+    image: poanetwork/tokenbridge-oracle:latest
+    env_file: ./.env
+    environment:
+      NODE_ENV: production
+      ORACLE_VALIDATOR_ADDRESS: ${ORACLE_VALIDATOR_ADDRESS}
+      ORACLE_MEV_FOREIGN_HELPER_CONTRACT_ADDRESS: 'TBD'
+      ORACLE_MEV_FOREIGN_MIN_GAS_PRICE: '50000000000' # 50 gwei
+      ORACLE_MEV_FOREIGN_FLAT_MINER_FEE: '1500000000000000' # 0.0015 eth = 300k gas * 5 gwei
+      ORACLE_MEV_FOREIGN_MAX_PRIORITY_FEE_PER_GAS: '0' # 0 gwei
+      ORACLE_MEV_FOREIGN_MAX_FEE_PER_GAS: '1000000000000' # 1000 gwei
+      ORACLE_FOREIGN_RPC_POLLING_INTERVAL: '15000' # CollectedSignatures event polling interval
+      ORACLE_HOME_START_BLOCK: 'TBD'
+      ORACLE_HOME_SKIP_MANUAL_LANE: 'true'
+    restart: unless-stopped
+    entrypoint: yarn mev:watcher:collected-signatures
+  mevSender:
+    cpus: 0.1
+    mem_limit: 500m
+    image: poanetwork/tokenbridge-oracle:latest
+    env_file: ./.env
+    environment:
+      NODE_ENV: production
+      ORACLE_VALIDATOR_ADDRESS: ${ORACLE_VALIDATOR_ADDRESS}
+      ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY: ${ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY}
+      ORACLE_MEV_FOREIGN_HELPER_CONTRACT_ADDRESS: 'TBD'
+      ORACLE_MEV_FOREIGN_MIN_GAS_PRICE: '50000000000' # 50 gwei
+      ORACLE_MEV_FOREIGN_FLAT_MINER_FEE: '1500000000000000' # 0.0015 eth = 300k gas * 5 gwei
+      ORACLE_MEV_FOREIGN_MAX_PRIORITY_FEE_PER_GAS: '0' # 0 gwei
+      ORACLE_MEV_FOREIGN_MAX_FEE_PER_GAS: '1000000000000' # 1000 gwei
+      ORACLE_MEV_FOREIGN_FLASHBOTS_RPC_URL: 'https://relay-goerli.flashbots.net'
+      ORACLE_MEV_FOREIGN_FLASHBOTS_AUTH_SIGNING_KEY: 82db7175932f4e6c8e45283b78b54fd5f195149378ec90d95b8fd0ec8bdadf1d
+      ORACLE_MEV_FOREIGN_BUNDLES_BLOCK_RANGE: '5'
+      ORACLE_FOREIGN_RPC_POLLING_INTERVAL: '70000' # time between sending different batches of MEV bundles (~= 5 blocks * 14 seconds)
+    restart: unless-stopped
+    entrypoint: yarn mev:sender:foreign
--- a/oracle/package.json
+++ b/oracle/package.json
@@ -18,6 +18,9 @@
    "confirm:collected-signatures": "./scripts/start-worker.sh confirmRelay collected-signatures-watcher",
    "confirm:information-request": "./scripts/start-worker.sh confirmRelay information-request-watcher",
    "manager:shutdown": "./scripts/start-worker.sh shutdownManager shutdown-manager",
+    "helper:interestFether": "node ./scripts/interestFetcher.js",
+    "mev:watcher:collected-signatures": "./scripts/start-worker.sh mevWatcher mev-collected-signatures-watcher",
+    "mev:sender:foreign": "./scripts/start-worker.sh mevSender foreign-mev-sender",
    "dev": "concurrently -n 'watcher:signature-request,watcher:collected-signatures,watcher:affirmation-request,watcher:transfer, sender:home,sender:foreign' -c 'red,green,yellow,blue,magenta,cyan' 'yarn watcher:signature-request' 'yarn watcher:collected-signatures' 'yarn watcher:affirmation-request' 'yarn watcher:transfer' 'yarn sender:home' 'yarn sender:foreign'",
    "test": "NODE_ENV=test mocha",
    "test:watch": "NODE_ENV=test mocha --watch --reporter=min",
@@ -27,17 +30,19 @@
  "author": "",
  "license": "ISC",
  "dependencies": {
+    "@flashbots/ethers-provider-bundle": "^0.4.3",
    "amqp-connection-manager": "^2.0.0",
    "amqplib": "^0.5.2",
    "bignumber.js": "^7.2.1",
    "dotenv": "^5.0.1",
+    "ethers": "^5.5.3",
    "ioredis": "^3.2.2",
    "node-fetch": "^2.1.2",
    "pino": "^4.17.3",
    "pino-pretty": "^2.0.1",
    "promise-limit": "^2.7.0",
    "promise-retry": "^1.1.1",
-    "web3": "^1.3.0"
+    "web3": "^1.6.0"
  },
  "devDependencies": {
    "bn-chai": "^1.0.1",
--- a/oracle/scripts/erc20_to_native/sendForeign.js
+++ b/oracle/scripts/erc20_to_native/sendForeign.js
@@ -36,7 +36,7 @@ async function main() {
        data,
        nonce,
        gasPrice: FOREIGN_TEST_TX_GAS_PRICE,
-        amount: '0',
+        value: '0',
        gasLimit,
        to: bridgeableTokenAddress,
        web3: web3Foreign,
--- a/oracle/scripts/erc20_to_native/sendHome.js
+++ b/oracle/scripts/erc20_to_native/sendHome.js
@@ -29,7 +29,7 @@ async function main() {
        data: '0x',
        nonce,
        gasPrice: HOME_TEST_TX_GAS_PRICE,
-        amount: HOME_MIN_AMOUNT_PER_TX,
+        value: web3Home.utils.toWei(HOME_MIN_AMOUNT_PER_TX),
        gasLimit: 100000,
        to: COMMON_HOME_BRIDGE_ADDRESS,
        web3: web3Home,
--- a/oracle/scripts/interestFetcher.js
+++ b/oracle/scripts/interestFetcher.js
@@ -0,0 +1,65 @@
+require('../env')
+const { isAddress } = require('web3').utils
+const { privateKeyToAddress, setIntervalAndRun } = require('../src/utils/utils')
+const { EXIT_CODES } = require('../src/utils/constants')
+const { web3Home } = require('../src/services/web3')
+const { sendTx } = require('../src/tx/sendTx')
+
+const privateKey = process.env.INTEREST_FETCHER_PRIVATE_KEY
+const interval = process.env.INTERVAL ? parseInt(process.env.INTERVAL, 10) : 3600 * 1000
+const contractAddress = process.env.INTEREST_FETCH_CONTRACT_ADDRESS
+
+if (!privateKey) {
+  console.error('Environment variable INTEREST_FETCHER_PRIVATE_KEY is not set')
+  process.exit(EXIT_CODES.GENERAL_ERROR)
+}
+
+if (interval < 300 * 1000) {
+  console.error('Interval is to small, should be at least 5 minutes')
+  process.exit(EXIT_CODES.GENERAL_ERROR)
+}
+
+if (!isAddress(contractAddress)) {
+  console.error('Invalid contract address provided', contractAddress)
+  process.exit(EXIT_CODES.GENERAL_ERROR)
+}
+
+const gasPrice = process.env.COMMON_HOME_GAS_PRICE_FALLBACK || '1000000000'
+
+async function main() {
+  // assuming that we are using this contract - https://github.com/omni/interest-fetcher-contract
+  const contract = new web3Home.eth.Contract([{ name: 'fetchInterest', type: 'function', inputs: [] }], contractAddress)
+  const chainId = await web3Home.eth.getChainId()
+  const data = contract.methods.fetchInterest().encodeABI()
+  const senderAddress = privateKeyToAddress(privateKey)
+  console.log(
+    `Initialized, chainId=${chainId}, data=${data}, contract=${contractAddress}, interval=${interval / 1000}s`
+  )
+
+  await setIntervalAndRun(async () => {
+    let gasLimit
+    try {
+      gasLimit = await contract.methods.fetchInterest().estimateGas()
+    } catch (e) {
+      console.log('Gas limit estimation failed, will retry later', new Date())
+      return
+    }
+
+    const nonce = await web3Home.eth.getTransactionCount(senderAddress)
+
+    const txHash = await sendTx({
+      privateKey,
+      to: contractAddress,
+      data,
+      nonce,
+      gasPrice,
+      gasLimit: Math.round(gasLimit * 1.5),
+      value: '0',
+      chainId,
+      web3: web3Home
+    })
+    console.log('Sent transaction with fetch interest', txHash, new Date())
+  }, interval)
+}
+
+main()
--- a/oracle/src/confirmRelay.js
+++ b/oracle/src/confirmRelay.js
@@ -6,6 +6,7 @@ const logger = require('./services/logger')
 const GasPrice = require('./services/gasPrice')
 const { getNonce, getChainId, getEventsFromTx } = require('./tx/web3')
 const { sendTx } = require('./tx/sendTx')
+const { getTokensState } = require('./utils/tokenState')
 const { checkHTTPS, watchdog, syncForEach, addExtraGas } = require('./utils/utils')
 const { EXIT_CODES, EXTRA_GAS_PERCENTAGE, MAX_GAS_LIMIT } = require('./utils/constants')

@@ -17,7 +18,7 @@ if (process.argv.length < 4) {
 }

 const config = require(path.join('../config/', process.argv[2]))
-const { web3, eventContract, chain } = config.main
+const { web3, eventContract, chain, bridgeContract } = config.main

 const isTxHash = txHash => txHash.length === 66 && web3.utils.isHexStrict(txHash)
 function readTxHashes(filePath) {
@@ -49,7 +50,7 @@ async function initialize() {
  try {
    const checkHttps = checkHTTPS(ORACLE_ALLOW_HTTP_FOR_RPC, logger)

-    web3.currentProvider.subProvider.urls.forEach(checkHttps(chain))
+    web3.currentProvider.urls.forEach(checkHttps(chain))

    attached = await isAttached()
    if (attached) {
@@ -114,6 +115,12 @@ function processEvents(events) {
 }

 async function main({ sendJob, txHashes }) {
+  if (config.id === 'erc-native-transfer') {
+    logger.debug('Getting token address to listen Transfer events')
+    const state = await getTokensState(bridgeContract, logger)
+    eventContract.options.address = state.bridgeableTokenAddress
+  }
+
  logger.info(`Processing ${txHashes.length} input transactions`)
  for (const txHash of txHashes) {
    try {
@@ -146,11 +153,11 @@ async function main({ sendJob, txHashes }) {
 }

 async function sendJobTx(jobs) {
-  await GasPrice.start(chain, true)
-  const gasPrice = GasPrice.getPrice().toString(10)
-
  const { web3 } = config.sender === 'foreign' ? config.foreign : config.home

+  await GasPrice.start(chain, web3, true)
+  const gasPriceOptions = GasPrice.gasPriceOptions()
+
  const chainId = await getChainId(web3)
  let nonce = await getNonce(web3, config.validatorAddress)

@@ -167,13 +174,13 @@ async function sendJobTx(jobs) {
      const txHash = await sendTx({
        data: job.data,
        nonce,
-        gasPrice,
-        amount: '0',
+        value: '0',
        gasLimit,
        privateKey: config.validatorPrivateKey,
        to: job.to,
        chainId,
-        web3
+        web3,
+        gasPriceOptions
      })

      nonce++
@@ -190,7 +197,7 @@ async function sendJobTx(jobs) {

      if (e.message.toLowerCase().includes('insufficient funds')) {
        const currentBalance = await web3.eth.getBalance(config.validatorAddress)
-        const minimumBalance = gasLimit.multipliedBy(gasPrice)
+        const minimumBalance = gasLimit.multipliedBy(gasPriceOptions.gasPrice || gasPriceOptions.maxFeePerGas)
        logger.error(
          `Insufficient funds: ${currentBalance}. Stop processing messages until the balance is at least ${minimumBalance}.`
        )
--- a/oracle/src/events/processAMBAffirmationRequests/estimateGas.js
+++ b/oracle/src/events/processAMBAffirmationRequests/estimateGas.js
@@ -15,7 +15,7 @@ async function estimateGas({ web3, homeBridge, validatorContract, message, addre
    const gasEstimate = await homeBridge.methods.executeAffirmation(message).estimateGas({
      from: address
    })
-    const msgGasLimit = parseAMBHeader(message).gasLimit
+    const msgGasLimit = Math.ceil((parseAMBHeader(message).gasLimit * 64) / 63)
    // message length in bytes
    const len = strip0x(message).length / 2 - MIN_AMB_HEADER_LENGTH

--- a/oracle/src/events/processAMBCollectedSignatures/estimateGas.js
+++ b/oracle/src/events/processAMBCollectedSignatures/estimateGas.js
@@ -4,7 +4,6 @@ const { AlreadyProcessedError, IncompatibleContractError, InvalidValidatorError
 const logger = require('../../services/logger').child({
  module: 'processCollectedSignatures:estimateGas'
 })
-const { parseAMBHeader } = require('../../utils/message')

 const web3 = new Web3()
 const { toBN } = Web3.utils
@@ -22,15 +21,9 @@ async function estimateGas({
  address
 }) {
  try {
-    const gasEstimate = await foreignBridge.methods.executeSignatures(message, signatures).estimateGas({
+    return await foreignBridge.methods.executeSignatures(message, signatures).estimateGas({
      from: address
    })
-    const msgGasLimit = parseAMBHeader(message).gasLimit
-
-    // + estimateExtraGas(len)
-    // is not needed here, since estimateGas will already take into account gas
-    // needed for memory expansion, message processing, etc.
-    return gasEstimate + msgGasLimit
  } catch (e) {
    if (e instanceof HttpListProviderError) {
      throw e
--- a/oracle/src/events/processAMBCollectedSignaturesMEV/index.js
+++ b/oracle/src/events/processAMBCollectedSignaturesMEV/index.js
@@ -0,0 +1,183 @@
+require('dotenv').config()
+const promiseLimit = require('promise-limit')
+const { HttpListProviderError } = require('../../services/HttpListProvider')
+const { getValidatorContract } = require('../../tx/web3')
+const rootLogger = require('../../services/logger')
+const { signatureToVRS, packSignatures } = require('../../utils/message')
+const { readAccessListFile, isRevertError } = require('../../utils/utils')
+const { parseAMBMessage } = require('../../../../commons')
+const estimateGas = require('../processAMBCollectedSignatures/estimateGas')
+const { AlreadyProcessedError, IncompatibleContractError, InvalidValidatorError } = require('../../utils/errors')
+const { MAX_CONCURRENT_EVENTS, EXTRA_GAS_ABSOLUTE } = require('../../utils/constants')
+
+const limit = promiseLimit(MAX_CONCURRENT_EVENTS)
+
+const { ORACLE_HOME_TO_FOREIGN_ALLOWANCE_LIST, ORACLE_HOME_TO_FOREIGN_BLOCK_LIST } = process.env
+const ORACLE_HOME_SKIP_MANUAL_LANE = process.env.ORACLE_HOME_SKIP_MANUAL_LANE === 'true'
+
+function processCollectedSignaturesBuilder(config) {
+  const { home, foreign, mevForeign } = config
+
+  let validatorContract = null
+
+  return async function processCollectedSignatures(signatures) {
+    const txToSend = []
+
+    if (validatorContract === null) {
+      validatorContract = await getValidatorContract(foreign.bridgeContract, foreign.web3)
+    }
+
+    rootLogger.debug(`Processing ${signatures.length} CollectedSignatures events`)
+    const callbacks = signatures
+      .map(colSignature => async () => {
+        const { messageHash, NumberOfCollectedSignatures } = colSignature.returnValues
+
+        const logger = rootLogger.child({
+          eventTransactionHash: colSignature.transactionHash
+        })
+
+        logger.info(`Processing CollectedSignatures ${colSignature.transactionHash}`)
+        const message = await home.bridgeContract.methods.message(messageHash).call()
+        const parsedMessage = parseAMBMessage(message)
+
+        if (ORACLE_HOME_TO_FOREIGN_ALLOWANCE_LIST || ORACLE_HOME_TO_FOREIGN_BLOCK_LIST) {
+          const sender = parsedMessage.sender.toLowerCase()
+          const executor = parsedMessage.executor.toLowerCase()
+
+          if (ORACLE_HOME_TO_FOREIGN_ALLOWANCE_LIST) {
+            const allowanceList = await readAccessListFile(ORACLE_HOME_TO_FOREIGN_ALLOWANCE_LIST, logger)
+            if (!allowanceList.includes(executor) && !allowanceList.includes(sender)) {
+              logger.info(
+                { sender, executor },
+                'Validator skips a message. Neither sender nor executor addresses are in the allowance list.'
+              )
+              return
+            }
+          } else if (ORACLE_HOME_TO_FOREIGN_BLOCK_LIST) {
+            const blockList = await readAccessListFile(ORACLE_HOME_TO_FOREIGN_BLOCK_LIST, logger)
+            if (blockList.includes(executor)) {
+              logger.info({ executor }, 'Validator skips a message. Executor address is in the block list.')
+              return
+            }
+            if (blockList.includes(sender)) {
+              logger.info({ sender }, 'Validator skips a message. Sender address is in the block list.')
+              return
+            }
+          }
+        }
+
+        if (ORACLE_HOME_SKIP_MANUAL_LANE && parsedMessage.decodedDataType.manualLane) {
+          logger.info(
+            { dataType: parsedMessage.dataType },
+            'Validator skips a message. Message was forwarded to the manual lane by the extension'
+          )
+          return
+        }
+
+        logger.debug({ NumberOfCollectedSignatures }, 'Number of signatures to get')
+
+        const requiredSignatures = []
+        requiredSignatures.length = NumberOfCollectedSignatures
+        requiredSignatures.fill(0)
+
+        const signaturesArray = []
+        const [v, r, s] = [[], [], []]
+        logger.debug('Getting message signatures')
+        const signaturePromises = requiredSignatures.map(async (el, index) => {
+          logger.debug({ index }, 'Getting message signature')
+          const signature = await home.bridgeContract.methods.signature(messageHash, index).call()
+          const vrs = signatureToVRS(signature)
+          v.push(vrs.v)
+          r.push(vrs.r)
+          s.push(vrs.s)
+          signaturesArray.push(vrs)
+        })
+
+        await Promise.all(signaturePromises)
+        const signatures = packSignatures(signaturesArray)
+        logger.info(`Processing messageId: ${parsedMessage.messageId}`)
+
+        let gasEstimate
+        try {
+          logger.debug('Estimate gas')
+          gasEstimate = await estimateGas({
+            foreignBridge: foreign.bridgeContract,
+            validatorContract,
+            v,
+            r,
+            s,
+            signatures,
+            message,
+            numberOfCollectedSignatures: NumberOfCollectedSignatures,
+            messageId: parsedMessage.messageId,
+            address: config.validatorAddress
+          })
+          logger.debug({ gasEstimate }, 'Gas estimated')
+        } catch (e) {
+          if (e instanceof HttpListProviderError) {
+            throw new Error('RPC Connection Error: submitSignature Gas Estimate cannot be obtained.')
+          } else if (e instanceof AlreadyProcessedError) {
+            logger.info(`Already processed CollectedSignatures ${colSignature.transactionHash}`)
+            return
+          } else if (e instanceof IncompatibleContractError || e instanceof InvalidValidatorError) {
+            logger.error(`The message couldn't be processed; skipping: ${e.message}`)
+            return
+          } else {
+            logger.error(e, 'Unknown error while processing transaction')
+            throw e
+          }
+        }
+
+        const executeData = foreign.bridgeContract.methods.executeSignatures(message, signatures).encodeABI()
+        const profit = await estimateProfit(
+          mevForeign.contract,
+          mevForeign.minGasPrice,
+          executeData,
+          mevForeign.flatMinerFee
+        )
+        if (profit === '0') {
+          logger.error('No MEV opportunity found when testing with min gas price, skipping job')
+          return
+        }
+        logger.info(`Estimated profit of ${profit} when simulating with ${mevForeign.minGasPrice} gas price`)
+
+        txToSend.push({
+          profit,
+          executeData,
+          data: mevForeign.contract.methods.execute(executeData).encodeABI(),
+          gasEstimate,
+          extraGas: EXTRA_GAS_ABSOLUTE,
+          maxFeePerGas: mevForeign.maxFeePerGas,
+          maxPriorityFeePerGas: mevForeign.maxPriorityFeePerGas,
+          transactionReference: colSignature.transactionHash,
+          to: mevForeign.contractAddress,
+          value: mevForeign.flatMinerFee
+        })
+      })
+      .map(promise => limit(promise))
+
+    await Promise.all(callbacks)
+
+    return txToSend
+  }
+}
+
+async function estimateProfit(contract, gasPrice, data, minerFee) {
+  return contract.methods
+    .estimateProfit(gasPrice, data)
+    .call({ value: minerFee })
+    .then(
+      res => res.toString(),
+      e => {
+        if (isRevertError(e)) {
+          return '0'
+        }
+        throw e
+      }
+    )
+}
+
+module.exports = {
+  processCollectedSignaturesBuilder,
+  estimateProfit
+}
--- a/oracle/src/events/processAMBInformationRequests/calls/ethCall.js
+++ b/oracle/src/events/processAMBInformationRequests/calls/ethCall.js
@@ -1,6 +1,7 @@
 const { toBN } = require('web3').utils

-const { zipToObject } = require('../../../utils/utils')
+const { ASYNC_CALL_ERRORS, ASYNC_ETH_CALL_MAX_GAS_LIMIT } = require('../../../utils/constants')
+const { zipToObject, isRevertError } = require('../../../utils/utils')

 const argTypes = {
  to: 'address',
@@ -17,14 +18,23 @@ function makeCall(argNames) {
    const { blockNumber, ...opts } = zipToObject(argNames, args)

    if (blockNumber && toBN(blockNumber).gt(toBN(foreignBlock.number))) {
-      return [false, '0x']
+      return [false, ASYNC_CALL_ERRORS.BLOCK_IS_IN_THE_FUTURE]
    }

-    const [status, result] = await web3.eth
-      .call(opts, blockNumber || foreignBlock.number)
-      .then(result => [true, result], err => [false, err.data])
+    // different clients might use different default gas limits, so it makes sense to limit it by some large number
+    if (!opts.gas || toBN(opts.gas).gt(toBN(ASYNC_ETH_CALL_MAX_GAS_LIMIT))) {
+      opts.gas = ASYNC_ETH_CALL_MAX_GAS_LIMIT
+    }

-    return [status, web3.eth.abi.encodeParameter('bytes', result)]
+    return web3.eth
+      .call(opts, blockNumber || foreignBlock.number)
+      .then(result => [true, web3.eth.abi.encodeParameter('bytes', result)])
+      .catch(e => {
+        if (isRevertError(e)) {
+          return [false, ASYNC_CALL_ERRORS.REVERT]
+        }
+        throw e
+      })
  }
 }

--- a/oracle/src/events/processAMBInformationRequests/calls/ethGetBalance.js
+++ b/oracle/src/events/processAMBInformationRequests/calls/ethGetBalance.js
@@ -1,5 +1,7 @@
 const { toBN } = require('web3').utils

+const { ASYNC_CALL_ERRORS } = require('../../../utils/constants')
+
 async function call(web3, data, foreignBlock) {
  const address = web3.eth.abi.decodeParameter('address', data)

@@ -12,7 +14,7 @@ async function callArchive(web3, data, foreignBlock) {
  const { 0: address, 1: blockNumber } = web3.eth.abi.decodeParameters(['address', 'uint256'], data)

  if (toBN(blockNumber).gt(toBN(foreignBlock.number))) {
-    return [false, '0x']
+    return [false, ASYNC_CALL_ERRORS.BLOCK_IS_IN_THE_FUTURE]
  }

  const balance = await web3.eth.getBalance(address, blockNumber)
--- a/oracle/src/events/processAMBInformationRequests/calls/ethGetBlockByHash.js
+++ b/oracle/src/events/processAMBInformationRequests/calls/ethGetBlockByHash.js
@@ -1,3 +1,4 @@
+const { ASYNC_CALL_ERRORS } = require('../../../utils/constants')
 const { serializeBlock } = require('./serializers')

 async function call(web3, data, foreignBlock) {
@@ -6,7 +7,7 @@ async function call(web3, data, foreignBlock) {
  const block = await web3.eth.getBlock(blockHash)

  if (block === null || block.number > foreignBlock.number) {
-    return [false, '0x']
+    return [false, ASYNC_CALL_ERRORS.NOT_FOUND]
  }

  return [true, serializeBlock(web3, block)]
--- a/oracle/src/events/processAMBInformationRequests/calls/ethGetBlockByNumber.js
+++ b/oracle/src/events/processAMBInformationRequests/calls/ethGetBlockByNumber.js
@@ -1,12 +1,13 @@
 const { toBN } = require('web3').utils

+const { ASYNC_CALL_ERRORS } = require('../../../utils/constants')
 const { serializeBlock } = require('./serializers')

 async function call(web3, data, foreignBlock) {
  const blockNumber = web3.eth.abi.decodeParameter('uint256', data)

  if (toBN(blockNumber).gt(toBN(foreignBlock.number))) {
-    return [false, '0x']
+    return [false, ASYNC_CALL_ERRORS.BLOCK_IS_IN_THE_FUTURE]
  }

  const block = await web3.eth.getBlock(blockNumber)
--- a/oracle/src/events/processAMBInformationRequests/calls/ethGetStorageAt.js
+++ b/oracle/src/events/processAMBInformationRequests/calls/ethGetStorageAt.js
@@ -1,5 +1,7 @@
 const { toBN } = require('web3').utils

+const { ASYNC_CALL_ERRORS } = require('../../../utils/constants')
+
 async function call(web3, data, foreignBlock) {
  const { 0: address, 1: slot } = web3.eth.abi.decodeParameters(['address', 'bytes32'], data)

@@ -12,7 +14,7 @@ async function callArchive(web3, data, foreignBlock) {
  const { 0: address, 1: slot, 2: blockNumber } = web3.eth.abi.decodeParameters(['address', 'bytes32', 'uint256'], data)

  if (toBN(blockNumber).gt(toBN(foreignBlock.number))) {
-    return [false, '0x']
+    return [false, ASYNC_CALL_ERRORS.BLOCK_IS_IN_THE_FUTURE]
  }

  const value = await web3.eth.getStorageAt(address, slot, blockNumber)
--- a/oracle/src/events/processAMBInformationRequests/calls/ethGetTransactionByHash.js
+++ b/oracle/src/events/processAMBInformationRequests/calls/ethGetTransactionByHash.js
@@ -1,3 +1,4 @@
+const { ASYNC_CALL_ERRORS } = require('../../../utils/constants')
 const { serializeTx } = require('./serializers')

 async function call(web3, data, foreignBlock) {
@@ -6,7 +7,7 @@ async function call(web3, data, foreignBlock) {
  const tx = await web3.eth.getTransaction(hash)

  if (tx === null || tx.blockNumber > foreignBlock.number) {
-    return [false, '0x']
+    return [false, ASYNC_CALL_ERRORS.NOT_FOUND]
  }

  return [true, serializeTx(web3, tx)]
--- a/oracle/src/events/processAMBInformationRequests/calls/ethGetTransactionCount.js
+++ b/oracle/src/events/processAMBInformationRequests/calls/ethGetTransactionCount.js
@@ -1,5 +1,7 @@
 const { toBN } = require('web3').utils

+const { ASYNC_CALL_ERRORS } = require('../../../utils/constants')
+
 async function call(web3, data, foreignBlock) {
  const address = web3.eth.abi.decodeParameter('address', data)

@@ -12,7 +14,7 @@ async function callArchive(web3, data, foreignBlock) {
  const { 0: address, 1: blockNumber } = web3.eth.abi.decodeParameters(['address', 'uint256'], data)

  if (toBN(blockNumber).gt(toBN(foreignBlock.number))) {
-    return [false, '0x']
+    return [false, ASYNC_CALL_ERRORS.BLOCK_IS_IN_THE_FUTURE]
  }

  const nonce = await web3.eth.getTransactionCount(address, blockNumber)
--- a/oracle/src/events/processAMBInformationRequests/calls/ethGetTransactionReceipt.js
+++ b/oracle/src/events/processAMBInformationRequests/calls/ethGetTransactionReceipt.js
@@ -1,3 +1,4 @@
+const { ASYNC_CALL_ERRORS } = require('../../../utils/constants')
 const { serializeReceipt } = require('./serializers')

 async function call(web3, data, foreignBlock) {
@@ -6,7 +7,7 @@ async function call(web3, data, foreignBlock) {
  const receipt = await web3.eth.getTransactionReceipt(hash)

  if (receipt === null || receipt.blockNumber > foreignBlock.number) {
-    return [false, '0x']
+    return [false, ASYNC_CALL_ERRORS.NOT_FOUND]
  }

  return [true, serializeReceipt(web3, receipt)]
--- a/oracle/src/events/processAMBInformationRequests/calls/serializers.js
+++ b/oracle/src/events/processAMBInformationRequests/calls/serializers.js
@@ -1,15 +1,30 @@
 const { ZERO_ADDRESS } = require('../../../../../commons')

 const serializeBlock = (web3, block) => {
-  const args = [block.number, block.hash, block.miner]
-  const types = ['uint256', 'bytes32', 'address']
-  return web3.eth.abi.encodeParameters(types, args)
+  const args = [
+    block.number,
+    block.hash,
+    block.miner,
+    block.gasUsed,
+    block.gasLimit,
+    block.parentHash,
+    block.receiptsRoot,
+    block.stateRoot,
+    block.transactionsRoot,
+    block.timestamp,
+    block.difficulty,
+    block.totalDifficulty
+  ]
+  const type = '(uint256,bytes32,address,uint256,uint256,bytes32,bytes32,bytes32,bytes32,uint256,uint256,uint256)'
+  return web3.eth.abi.encodeParameter(type, args)
 }

 const serializeTx = (web3, tx) => {
  const args = [
    tx.hash,
    tx.blockNumber,
+    tx.blockHash,
+    tx.transactionIndex,
    tx.from,
    tx.to || ZERO_ADDRESS,
    tx.value,
@@ -18,16 +33,26 @@ const serializeTx = (web3, tx) => {
    tx.gasPrice,
    tx.input
  ]
-  const types = ['bytes32', 'uint256', 'address', 'address', 'uint256', 'uint256', 'uint256', 'uint256', 'bytes']
-  return web3.eth.abi.encodeParameters(types, args)
+  const type = '(bytes32,uint256,bytes32,uint256,address,address,uint256,uint256,uint256,uint256,bytes)'
+  return web3.eth.abi.encodeParameter(type, args)
 }

 const normalizeLog = log => [log.address, log.topics, log.data]

 const serializeReceipt = (web3, receipt) => {
-  const args = [receipt.transactionHash, receipt.blockNumber, receipt.status, receipt.logs.map(normalizeLog)]
-  const types = ['bytes32', 'uint256', 'bool', '(address,bytes32[],bytes)[]']
-  return web3.eth.abi.encodeParameters(types, args)
+  const args = [
+    receipt.transactionHash,
+    receipt.blockNumber,
+    receipt.blockHash,
+    receipt.transactionIndex,
+    receipt.from,
+    receipt.to || ZERO_ADDRESS,
+    receipt.gasUsed,
+    receipt.status,
+    receipt.logs.map(normalizeLog)
+  ]
+  const type = '(bytes32,uint256,bytes32,uint256,address,address,uint256,bool,(address,bytes32[],bytes)[])'
+  return web3.eth.abi.encodeParameter(type, args)
 }

 module.exports = {
--- a/oracle/src/events/processAMBInformationRequests/estimateGas.js
+++ b/oracle/src/events/processAMBInformationRequests/estimateGas.js
@@ -6,7 +6,16 @@ const logger = require('../../services/logger').child({
 const { strip0x } = require('../../../../commons')
 const { AMB_AFFIRMATION_REQUEST_EXTRA_GAS_ESTIMATOR: estimateExtraGas } = require('../../utils/constants')

-async function estimateGas({ web3, homeBridge, validatorContract, messageId, status, result, address }) {
+async function estimateGas({
+  web3,
+  homeBridge,
+  validatorContract,
+  messageId,
+  status,
+  result,
+  address,
+  homeBlockNumber
+}) {
  try {
    const gasEstimate = await homeBridge.methods.confirmInformation(messageId, status, result).estimateGas({
      from: address
@@ -15,7 +24,8 @@ async function estimateGas({ web3, homeBridge, validatorContract, messageId, sta
    // message length in bytes
    const len = strip0x(result).length / 2

-    const callbackGasLimit = parseInt(await homeBridge.methods.maxGasPerTx().call(), 10)
+    let callbackGasLimit = parseInt(await homeBridge.methods.maxGasPerTx().call(), 10)
+    callbackGasLimit = Math.ceil((callbackGasLimit * 64) / 63)

    return gasEstimate + callbackGasLimit + estimateExtraGas(len)
  } catch (e) {
@@ -51,6 +61,20 @@ async function estimateGas({ web3, homeBridge, validatorContract, messageId, sta
      throw new InvalidValidatorError(`${address} is not a validator`)
    }

+    logger.debug('Check if InformationRetrieved event for this message already exists')
+    const logs = await homeBridge.getPastEvents('InformationRetrieved', {
+      fromBlock: homeBlockNumber,
+      toBlock: 'latest',
+      filter: { messageId }
+    })
+    if (logs.length > 0) {
+      logger.warn(
+        'This particular message was already signed and processed by other validators.' +
+          'However, evaluated async call result is different from the one recorded on-chain.'
+      )
+      throw new AlreadyProcessedError(e.message)
+    }
+
    throw new Error('Unknown error while processing message')
  }
 }
--- a/oracle/src/events/processAMBInformationRequests/index.js
+++ b/oracle/src/events/processAMBInformationRequests/index.js
@@ -4,7 +4,13 @@ const { soliditySha3 } = require('web3').utils
 const { HttpListProviderError } = require('../../services/HttpListProvider')
 const rootLogger = require('../../services/logger')
 const makeBlockFinder = require('../../services/blockFinder')
-const { EXIT_CODES, MAX_CONCURRENT_EVENTS, EXTRA_GAS_ABSOLUTE } = require('../../utils/constants')
+const {
+  EXIT_CODES,
+  MAX_CONCURRENT_EVENTS,
+  EXTRA_GAS_ABSOLUTE,
+  ASYNC_CALL_ERRORS,
+  MAX_ASYNC_CALL_RESULT_LENGTH
+} = require('../../utils/constants')
 const estimateGas = require('./estimateGas')
 const { getValidatorContract, getBlock, getBlockNumber, getRequiredBlockConfirmations } = require('../../tx/web3')
 const { AlreadyProcessedError, AlreadySignedError, InvalidValidatorError } = require('../../utils/errors')
@@ -79,12 +85,17 @@ function processInformationRequestsBuilder(config) {
        logger.info({ requestSelector, method: asyncCallMethod, data }, 'Processing async request')

        const call = asyncCalls[asyncCallMethod]
-        const [status, result] = await call(web3ForeignArchive, data, foreignClosestBlock).catch(e => {
+        let [status, result] = await call(web3ForeignArchive, data, foreignClosestBlock).catch(e => {
          if (e instanceof HttpListProviderError) {
            throw e
          }
-          return [false, '0x']
+          logger.error({ error: e.message }, 'Unknown error during async call execution')
+          throw e
        })
+        if (result.length > 2 + MAX_ASYNC_CALL_RESULT_LENGTH * 2) {
+          status = false
+          result = ASYNC_CALL_ERRORS.RESULT_IS_TOO_LONG
+        }
        logger.info({ requestSelector, method: asyncCallMethod, status, result }, 'Request result obtained')

        let gasEstimate
@@ -97,7 +108,8 @@ function processInformationRequestsBuilder(config) {
            messageId,
            status,
            result,
-            address: config.validatorAddress
+            address: config.validatorAddress,
+            homeBlockNumber: homeBlock.number
          })
          logger.debug({ gasEstimate }, 'Gas estimated')
        } catch (e) {
--- a/oracle/src/events/processAffirmationRequests/estimateGas.js
+++ b/oracle/src/events/processAffirmationRequests/estimateGas.js
@@ -6,11 +6,9 @@ const logger = require('../../services/logger').child({

 async function estimateGas({ web3, homeBridge, validatorContract, recipient, value, txHash, address }) {
  try {
-    const gasEstimate = await homeBridge.methods.executeAffirmation(recipient, value, txHash).estimateGas({
+    return await homeBridge.methods.executeAffirmation(recipient, value, txHash).estimateGas({
      from: address
    })
-
-    return gasEstimate
  } catch (e) {
    if (e instanceof HttpListProviderError) {
      throw e
--- a/oracle/src/events/processCollectedSignatures/estimateGas.js
+++ b/oracle/src/events/processCollectedSignatures/estimateGas.js
@@ -20,8 +20,7 @@ async function estimateGas({
  signatures
 }) {
  try {
-    const gasEstimate = await foreignBridge.methods.executeSignatures(message, signatures).estimateGas()
-    return gasEstimate
+    return await foreignBridge.methods.executeSignatures(message, signatures).estimateGas()
  } catch (e) {
    if (e instanceof HttpListProviderError) {
      throw e
--- a/oracle/src/events/processSignatureRequests/estimateGas.js
+++ b/oracle/src/events/processSignatureRequests/estimateGas.js
@@ -6,10 +6,9 @@ const logger = require('../../services/logger').child({

 async function estimateGas({ web3, homeBridge, validatorContract, signature, message, address }) {
  try {
-    const gasEstimate = await homeBridge.methods.submitSignature(signature, message).estimateGas({
+    return await homeBridge.methods.submitSignature(signature, message).estimateGas({
      from: address
    })
-    return gasEstimate
  } catch (e) {
    if (e instanceof HttpListProviderError) {
      throw e
--- a/oracle/src/events/processTransfers/index.js
+++ b/oracle/src/events/processTransfers/index.js
@@ -13,12 +13,25 @@ const limit = promiseLimit(MAX_CONCURRENT_EVENTS)
 function processTransfersBuilder(config) {
  const { bridgeContract, web3 } = config.home

-  const userRequestForAffirmationAbi = config.foreign.bridgeABI.find(
-    e => e.type === 'event' && e.name === 'UserRequestForAffirmation'
-  )
-  const tokensSwappedAbi = config.foreign.bridgeABI.find(e => e.type === 'event' && e.name === 'TokensSwapped')
-  const userRequestForAffirmationHash = web3.eth.abi.encodeEventSignature(userRequestForAffirmationAbi)
-  const tokensSwappedHash = tokensSwappedAbi ? web3.eth.abi.encodeEventSignature(tokensSwappedAbi) : '0x'
+  const userRequestForAffirmationHash = web3.eth.abi.encodeEventSignature('UserRequestForAffirmation(address,uint256)')
+  const redeemHash = web3.eth.abi.encodeEventSignature('Redeem(address,uint256,uint256)')
+  const transferHash = web3.eth.abi.encodeEventSignature('Transfer(address,address,uint256)')
+
+  const foreignBridgeAddress = config.foreign.bridgeAddress
+
+  const decodeAddress = data => web3.eth.abi.decodeParameter('address', data)
+
+  const isUserRequestForAffirmation = e =>
+    e.address.toLowerCase() === foreignBridgeAddress.toLowerCase() && e.topics[0] === userRequestForAffirmationHash
+  const isRedeem = cTokenAddress => e =>
+    e.address.toLowerCase() === cTokenAddress.toLowerCase() &&
+    e.topics[0] === redeemHash &&
+    decodeAddress(e.data.slice(0, 66)).toLowerCase() === foreignBridgeAddress.toLowerCase()
+  const isCTokenTransfer = cTokenAddress => e =>
+    e.address.toLowerCase() === cTokenAddress.toLowerCase() &&
+    e.topics[0] === transferHash &&
+    decodeAddress(e.topics[1]).toLowerCase() === foreignBridgeAddress.toLowerCase() &&
+    decodeAddress(e.topics[2]).toLowerCase() === cTokenAddress.toLowerCase()

  let validatorContract = null

@@ -32,37 +45,35 @@ function processTransfersBuilder(config) {
    rootLogger.debug(`Processing ${transfers.length} Transfer events`)
    const callbacks = transfers
      .map(transfer => async () => {
-        const { from, value } = transfer.returnValues
+        const { from, to, value } = transfer.returnValues

        const logger = rootLogger.child({
-          eventTransactionHash: transfer.transactionHash
+          eventTransactionHash: transfer.transactionHash,
+          from,
+          to,
+          value
        })

-        logger.info({ from, value }, `Processing transfer ${transfer.transactionHash}`)
+        logger.info('Processing transfer')

        const receipt = await config.foreign.web3.eth.getTransactionReceipt(transfer.transactionHash)

-        const existsAffirmationEvent = receipt.logs.some(
-          e => e.address === config.foreign.bridgeAddress && e.topics[0] === userRequestForAffirmationHash
-        )
-
-        if (existsAffirmationEvent) {
-          logger.info(
-            `Transfer event discarded because a transaction with alternative receiver detected in transaction ${
-              transfer.transactionHash
-            }`
-          )
+        if (receipt.logs.some(isUserRequestForAffirmation)) {
+          logger.info('Transfer event discarded because affirmation is detected in the same transaction')
          return
        }

-        const existsTokensSwappedEvent = tokensSwappedAbi
-          ? receipt.logs.some(e => e.address === config.foreign.bridgeAddress && e.topics[0] === tokensSwappedHash)
-          : false
+        if (from === ZERO_ADDRESS) {
+          logger.info('Mint-like transfers from zero address are not processed')
+          return
+        }

-        if (from === ZERO_ADDRESS && existsTokensSwappedEvent) {
-          logger.info(
-            `Transfer event discarded because token swap is detected in transaction ${transfer.transactionHash}`
-          )
+        // when bridge performs a withdrawal from Compound, the following three events occur
+        // * token.Transfer(from=cToken, to=bridge, amount=X)
+        // * cToken.Redeem(redeemer=bridge, amount=X, tokens=Y)
+        // * cToken.Transfer(from=bridge, to=cToken, amount=Y)
+        if (receipt.logs.some(isRedeem(from)) && receipt.logs.some(isCTokenTransfer(from))) {
+          logger.info('Transfer event discarded because cToken redeem is detected in the same transaction')
          return
        }

--- a/oracle/src/mevSender.js
+++ b/oracle/src/mevSender.js
@@ -0,0 +1,159 @@
+require('../env')
+const path = require('path')
+const BigNumber = require('bignumber.js')
+const { redis } = require('./services/redisClient')
+const logger = require('./services/logger')
+const { sendTx } = require('./tx/sendTx')
+const { getNonce, getChainId, getBlock } = require('./tx/web3')
+const { addExtraGas, checkHTTPS, watchdog } = require('./utils/utils')
+const { EXIT_CODES, EXTRA_GAS_PERCENTAGE, MAX_GAS_LIMIT } = require('./utils/constants')
+const { estimateProfit } = require('./events/processAMBCollectedSignaturesMEV')
+
+if (process.argv.length < 3) {
+  logger.error('Please check the number of arguments, config file was not provided')
+  process.exit(EXIT_CODES.GENERAL_ERROR)
+}
+
+const config = require(path.join('../config/', process.argv[2]))
+
+const { web3, mevForeign, validatorAddress } = config
+
+let chainId = 0
+let flashbotsProvider
+
+async function initialize() {
+  try {
+    const checkHttps = checkHTTPS(process.env.ORACLE_ALLOW_HTTP_FOR_RPC, logger)
+
+    web3.currentProvider.urls.forEach(checkHttps(config.id))
+
+    chainId = await getChainId(web3)
+    flashbotsProvider = await mevForeign.getFlashbotsProvider(chainId)
+    return runMain()
+  } catch (e) {
+    logger.error(e.message)
+    process.exit(EXIT_CODES.GENERAL_ERROR)
+  }
+}
+
+async function runMain() {
+  try {
+    if (redis.status === 'ready') {
+      if (config.maxProcessingTime) {
+        await watchdog(main, config.maxProcessingTime, () => {
+          logger.fatal('Max processing time reached')
+          process.exit(EXIT_CODES.MAX_TIME_REACHED)
+        })
+      } else {
+        await main()
+      }
+    }
+  } catch (e) {
+    logger.error(e)
+  }
+
+  setTimeout(runMain, config.pollingInterval)
+}
+
+async function main() {
+  try {
+    const jobs = Object.values(await redis.hgetall(config.mevJobsRedisKey)).map(JSON.parse)
+    const totalJobs = jobs.length
+
+    if (totalJobs === 0) {
+      logger.debug('Nothing to process')
+      return
+    }
+
+    const { baseFeePerGas: pendingBaseFee, number: pendingBlockNumber } = await getBlock(web3, 'pending')
+    const bestJob = pickBestJob(jobs, pendingBaseFee)
+
+    if (!bestJob) {
+      logger.info({ totalJobs, pendingBaseFee }, 'No suitable job was found, waiting for a lower gas price')
+      return
+    }
+
+    const jobLogger = logger.child({ eventTransactionHash: bestJob.transactionReference })
+
+    const maxProfit = await estimateProfit(
+      mevForeign.contract,
+      mevForeign.minGasPrice,
+      bestJob.executeData,
+      bestJob.value
+    )
+
+    if (maxProfit === '0') {
+      jobLogger.info(`No MEV opportunity found when testing with min gas price ${mevForeign.minGasPrice}, removing job`)
+      await redis.hdel(config.mevJobsRedisKey, bestJob.transactionReference)
+      return
+    }
+    jobLogger.info(`Estimated profit of ${maxProfit} when simulating with ${mevForeign.minGasPrice} gas price`)
+    bestJob.profit = maxProfit
+
+    if (new BigNumber(pendingBaseFee).gt(mevForeign.minGasPrice)) {
+      const profit = await estimateProfit(mevForeign.contract, pendingBaseFee, bestJob.executeData, bestJob.value)
+      if (profit === '0') {
+        jobLogger.info(
+          `No MEV opportunity found when testing with current gas price ${pendingBaseFee}, waiting for lower gas price`
+        )
+        bestJob.maxFeePerGas = pendingBaseFee
+        await redis.hset(config.mevJobsRedisKey, bestJob.transactionReference, JSON.stringify(bestJob))
+        return
+      }
+      jobLogger.info(`Estimated profit of ${profit} when simulating with ${pendingBaseFee} gas price`)
+    }
+
+    let gasLimit
+    if (typeof bestJob.extraGas === 'number') {
+      gasLimit = addExtraGas(bestJob.gasEstimate + bestJob.extraGas, 0, MAX_GAS_LIMIT)
+    } else {
+      gasLimit = addExtraGas(bestJob.gasEstimate, EXTRA_GAS_PERCENTAGE, MAX_GAS_LIMIT)
+    }
+
+    const nonce = await getNonce(web3, validatorAddress)
+    jobLogger.info(
+      { nonce, fromBlock: pendingBlockNumber, toBlock: pendingBlockNumber + mevForeign.bundlesPerIteration - 1 },
+      'Sending MEV bundles'
+    )
+    const txHash = await sendTx({
+      data: bestJob.data,
+      nonce,
+      value: bestJob.value,
+      gasLimit,
+      privateKey: config.validatorPrivateKey,
+      to: bestJob.to,
+      chainId,
+      web3,
+      gasPriceOptions: {
+        maxFeePerGas: bestJob.maxFeePerGas,
+        maxPriorityFeePerGas: bestJob.maxPriorityFeePerGas
+      },
+      mevOptions: {
+        provider: flashbotsProvider,
+        fromBlock: pendingBlockNumber,
+        toBlock: pendingBlockNumber + mevForeign.bundlesPerIteration - 1,
+        logger
+      }
+    })
+
+    jobLogger.info({ txHash }, `Tx generated ${txHash} for event Tx ${bestJob.transactionReference}`)
+
+    await redis.hset(config.mevJobsRedisKey, bestJob.transactionReference, JSON.stringify(bestJob))
+    jobLogger.debug(`Finished processing msg`)
+  } catch (e) {
+    logger.error(e)
+  }
+}
+
+function pickBestJob(jobs, feePerGas) {
+  const feePerGasBN = new BigNumber(feePerGas)
+  let best = null
+  jobs.forEach(job => {
+    if (feePerGasBN.lt(job.maxFeePerGas) && (!best || new BigNumber(best.profit).lt(job.profit))) {
+      best = job
+    }
+  })
+  return best
+}
+
+initialize()
--- a/oracle/src/mevWatcher.js
+++ b/oracle/src/mevWatcher.js
@@ -0,0 +1,251 @@
+require('../env')
+const path = require('path')
+const { redis } = require('./services/redisClient')
+const logger = require('./services/logger')
+const { getBlockNumber, getRequiredBlockConfirmations, getEvents } = require('./tx/web3')
+const { checkHTTPS, watchdog, syncForEach } = require('./utils/utils')
+const { processCollectedSignaturesBuilder } = require('./events/processAMBCollectedSignaturesMEV')
+const {
+  EXIT_CODES,
+  BLOCK_NUMBER_PROGRESS_ITERATIONS_LIMIT,
+  MAX_HISTORY_BLOCK_TO_REPROCESS
+} = require('./utils/constants')
+
+if (process.argv.length < 3) {
+  logger.error('Please check the number of arguments, config file was not provided')
+  process.exit(EXIT_CODES.GENERAL_ERROR)
+}
+
+const config = require(path.join('../config/', process.argv[2]))
+
+const processAMBCollectedSignaturesMEV = processCollectedSignaturesBuilder(config)
+
+const {
+  web3,
+  bridgeContract,
+  eventContract,
+  startBlock,
+  pollingInterval,
+  chain,
+  reprocessingOptions,
+  blockPollingLimit
+} = config.main
+const lastBlockRedisKey = `${config.id}:lastProcessedBlock`
+const lastReprocessedBlockRedisKey = `${config.id}:lastReprocessedBlock`
+const seenEventsRedisKey = `${config.id}:seenEvents`
+const mevJobsRedisKey = `${config.id}:mevJobs`
+let lastProcessedBlock = Math.max(startBlock - 1, 0)
+let lastReprocessedBlock
+let lastSeenBlockNumber = 0
+let sameBlockNumberCounter = 0
+
+async function initialize() {
+  try {
+    const checkHttps = checkHTTPS(process.env.ORACLE_ALLOW_HTTP_FOR_RPC, logger)
+
+    web3.currentProvider.urls.forEach(checkHttps(chain))
+
+    await getLastProcessedBlock()
+    await getLastReprocessedBlock()
+    runMain({ sendToQueue: saveJobsToRedis })
+  } catch (e) {
+    logger.error(e)
+    process.exit(EXIT_CODES.GENERAL_ERROR)
+  }
+}
+
+async function runMain({ sendToQueue }) {
+  try {
+    if (redis.status === 'ready') {
+      if (config.maxProcessingTime) {
+        await watchdog(() => main({ sendToQueue }), config.maxProcessingTime, () => {
+          logger.fatal('Max processing time reached')
+          process.exit(EXIT_CODES.MAX_TIME_REACHED)
+        })
+      } else {
+        await main({ sendToQueue })
+      }
+    }
+  } catch (e) {
+    logger.error(e)
+  }
+
+  setTimeout(() => {
+    runMain({ sendToQueue })
+  }, pollingInterval)
+}
+
+async function saveJobsToRedis(jobs) {
+  return syncForEach(jobs, job => redis.hset(mevJobsRedisKey, job.transactionReference, JSON.stringify(job)))
+}
+
+async function getLastProcessedBlock() {
+  const result = await redis.get(lastBlockRedisKey)
+  logger.debug({ fromRedis: result, fromConfig: lastProcessedBlock }, 'Last Processed block obtained')
+  lastProcessedBlock = result ? parseInt(result, 10) : lastProcessedBlock
+}
+
+async function getLastReprocessedBlock() {
+  if (reprocessingOptions.enabled) {
+    const result = await redis.get(lastReprocessedBlockRedisKey)
+    if (result) {
+      lastReprocessedBlock = Math.max(parseInt(result, 10), lastProcessedBlock - MAX_HISTORY_BLOCK_TO_REPROCESS)
+    } else {
+      lastReprocessedBlock = lastProcessedBlock
+    }
+    logger.debug({ block: lastReprocessedBlock }, 'Last reprocessed block obtained')
+  } else {
+    // when reprocessing is being enabled not for the first time,
+    // we do not want to process blocks for which we didn't recorded seen events,
+    // instead, we want to start from the current block.
+    // Thus we should delete this reprocessing pointer once it is disabled.
+    await redis.del(lastReprocessedBlockRedisKey)
+  }
+}
+
+function updateLastProcessedBlock(lastBlockNumber) {
+  lastProcessedBlock = lastBlockNumber
+  return redis.set(lastBlockRedisKey, lastProcessedBlock)
+}
+
+function updateLastReprocessedBlock(lastBlockNumber) {
+  lastReprocessedBlock = lastBlockNumber
+  return redis.set(lastReprocessedBlockRedisKey, lastReprocessedBlock)
+}
+
+function processEvents(events) {
+  switch (config.id) {
+    case 'amb-collected-signatures-mev':
+      return processAMBCollectedSignaturesMEV(events)
+    default:
+      return []
+  }
+}
+
+const eventKey = e => `${e.transactionHash}-${e.logIndex}`
+
+async function reprocessOldLogs(sendToQueue) {
+  const fromBlock = lastReprocessedBlock + 1
+  const toBlock = lastReprocessedBlock + reprocessingOptions.batchSize
+  const events = await getEvents({
+    contract: eventContract,
+    event: config.event,
+    fromBlock,
+    toBlock,
+    filter: config.eventFilter
+  })
+  const alreadySeenEvents = await getSeenEvents(fromBlock, toBlock)
+  const missingEvents = events.filter(e => !alreadySeenEvents[eventKey(e)])
+  if (missingEvents.length === 0) {
+    logger.debug('No missed events were found')
+  } else {
+    logger.info(`Found ${missingEvents.length} ${config.event} missed events`)
+    const job = await processEvents(missingEvents)
+    logger.info('Missed events transactions to send:', job.length)
+    if (job.length) {
+      await sendToQueue(job)
+    }
+  }
+
+  await updateLastReprocessedBlock(toBlock)
+  await deleteSeenEvents(0, toBlock)
+}
+
+async function getSeenEvents(fromBlock, toBlock) {
+  const keys = await redis.zrangebyscore(seenEventsRedisKey, fromBlock, toBlock)
+  const res = {}
+  keys.forEach(k => {
+    res[k] = true
+  })
+  return res
+}
+
+function deleteSeenEvents(fromBlock, toBlock) {
+  return redis.zremrangebyscore(seenEventsRedisKey, fromBlock, toBlock)
+}
+
+function addSeenEvents(events) {
+  return redis.zadd(seenEventsRedisKey, ...events.flatMap(e => [e.blockNumber, eventKey(e)]))
+}
+
+async function getLastBlockToProcess(web3, bridgeContract) {
+  const [lastBlockNumber, requiredBlockConfirmations] = await Promise.all([
+    getBlockNumber(web3),
+    getRequiredBlockConfirmations(bridgeContract)
+  ])
+
+  if (lastBlockNumber < lastSeenBlockNumber) {
+    sameBlockNumberCounter = 0
+    logger.warn({ lastBlockNumber, lastSeenBlockNumber }, 'Received block number less than already seen block')
+    web3.currentProvider.switchToFallbackRPC()
+  } else if (lastBlockNumber === lastSeenBlockNumber) {
+    sameBlockNumberCounter++
+    if (sameBlockNumberCounter > 1) {
+      logger.info({ lastBlockNumber, sameBlockNumberCounter }, 'Received the same block number more than twice')
+      if (sameBlockNumberCounter >= BLOCK_NUMBER_PROGRESS_ITERATIONS_LIMIT) {
+        sameBlockNumberCounter = 0
+        logger.warn(
+          { lastBlockNumber, n: BLOCK_NUMBER_PROGRESS_ITERATIONS_LIMIT },
+          'Received the same block number for too many times. Probably node is not synced anymore'
+        )
+        web3.currentProvider.switchToFallbackRPC()
+      }
+    }
+  } else {
+    sameBlockNumberCounter = 0
+    lastSeenBlockNumber = lastBlockNumber
+  }
+  return lastBlockNumber - requiredBlockConfirmations
+}
+
+async function main({ sendToQueue }) {
+  try {
+    const lastBlockToProcess = await getLastBlockToProcess(web3, bridgeContract)
+
+    if (reprocessingOptions.enabled) {
+      if (lastReprocessedBlock + reprocessingOptions.batchSize + reprocessingOptions.blockDelay < lastBlockToProcess) {
+        await reprocessOldLogs(sendToQueue)
+        return
+      }
+    }
+
+    if (lastBlockToProcess <= lastProcessedBlock) {
+      logger.debug('All blocks already processed')
+      return
+    }
+
+    const fromBlock = lastProcessedBlock + 1
+    const rangeEndBlock = blockPollingLimit ? fromBlock + blockPollingLimit : lastBlockToProcess
+    const toBlock = Math.min(lastBlockToProcess, rangeEndBlock)
+
+    const events = await getEvents({
+      contract: eventContract,
+      event: config.event,
+      fromBlock,
+      toBlock,
+      filter: config.eventFilter
+    })
+    logger.info(`Found ${events.length} ${config.event} events`)
+
+    if (events.length) {
+      const job = await processEvents(events)
+      logger.info('Transactions to send:', job.length)
+
+      if (job.length) {
+        await sendToQueue(job)
+      }
+      if (reprocessingOptions.enabled) {
+        await addSeenEvents(events)
+      }
+    }
+
+    logger.debug({ lastProcessedBlock: toBlock.toString() }, 'Updating last processed block')
+    await updateLastProcessedBlock(toBlock)
+  } catch (e) {
+    logger.error(e)
+  }
+
+  logger.debug('Finished')
+}
+
+initialize()
--- a/oracle/src/sender.js
+++ b/oracle/src/sender.js
@@ -9,6 +9,8 @@ const { sendTx } = require('./tx/sendTx')
 const { getNonce, getChainId } = require('./tx/web3')
 const {
  addExtraGas,
+  applyMinGasFeeBump,
+  chooseGasPriceOptions,
  checkHTTPS,
  syncForEach,
  waitForFunds,
@@ -19,7 +21,7 @@ const {
  isInsufficientBalanceError,
  isNonceError
 } = require('./utils/utils')
-const { EXIT_CODES, EXTRA_GAS_PERCENTAGE, MAX_GAS_LIMIT } = require('./utils/constants')
+const { EXIT_CODES, EXTRA_GAS_PERCENTAGE, MAX_GAS_LIMIT, MIN_GAS_PRICE_BUMP_FACTOR } = require('./utils/constants')

 const { ORACLE_TX_REDUNDANCY } = process.env

@@ -40,9 +42,9 @@ async function initialize() {
  try {
    const checkHttps = checkHTTPS(process.env.ORACLE_ALLOW_HTTP_FOR_RPC, logger)

-    web3.currentProvider.subProvider.urls.forEach(checkHttps(config.id))
+    web3.currentProvider.urls.forEach(checkHttps(config.id))

-    GasPrice.start(config.id)
+    GasPrice.start(config.id, web3)

    chainId = await getChainId(web3)
    connectQueue()
@@ -55,7 +57,6 @@ async function initialize() {
 function connectQueue() {
  connectSenderToQueue({
    queueName: config.queue,
-    oldQueueName: config.oldQueue,
    resendInterval: config.resendInterval,
    cb: options => {
      if (config.maxProcessingTime) {
@@ -121,7 +122,7 @@ async function main({ msg, ackMsg, nackMsg, channel, scheduleForRetry, scheduleT

    const txArray = JSON.parse(msg.content)
    logger.debug(`Msg received with ${txArray.length} Tx to send`)
-    const gasPrice = GasPrice.getPrice().toString(10)
+    const gasPriceOptions = GasPrice.gasPriceOptions()

    let nonce
    let insufficientFunds = false
@@ -147,6 +148,7 @@ async function main({ msg, ackMsg, nackMsg, channel, scheduleForRetry, scheduleT
      }

      try {
+        const newGasPriceOptions = chooseGasPriceOptions(gasPriceOptions, job.gasPriceOptions)
        if (isResend) {
          const tx = await web3Fallback.eth.getTransaction(job.txHash)

@@ -159,24 +161,26 @@ async function main({ msg, ackMsg, nackMsg, channel, scheduleForRetry, scheduleT
            nonce = await readNonce(true)
          }

-          logger.info(`Transaction ${job.txHash} was not mined, updating gasPrice: ${job.gasPrice} -> ${gasPrice}`)
+          const oldGasPrice = JSON.stringify(job.gasPriceOptions)
+          const newGasPrice = JSON.stringify(newGasPriceOptions)
+          logger.info(`Transaction ${job.txHash} was not mined, updating gasPrice: ${oldGasPrice} -> ${newGasPrice}`)
        }
        logger.info(`Sending transaction with nonce ${nonce}`)
        const txHash = await sendTx({
          data: job.data,
          nonce,
-          gasPrice,
-          amount: '0',
+          value: '0',
          gasLimit,
          privateKey: config.validatorPrivateKey,
          to: job.to,
          chainId,
-          web3: web3Redundant
+          web3: web3Redundant,
+          gasPriceOptions: newGasPriceOptions
        })
        const resendJob = {
          ...job,
          txHash,
-          gasPrice
+          gasPriceOptions: newGasPriceOptions
        }
        resendJobs.push(resendJob)

@@ -194,8 +198,8 @@ async function main({ msg, ackMsg, nackMsg, channel, scheduleForRetry, scheduleT

        if (isGasPriceError(e)) {
          logger.info('Replacement transaction underpriced, forcing gas price update')
-          GasPrice.start(config.id)
-          failedTx.push(job)
+          GasPrice.start(config.id, web3)
+          failedTx.push(applyMinGasFeeBump(job, MIN_GAS_PRICE_BUMP_FACTOR))
        } else if (isResend || isSameTransactionError(e)) {
          resendJobs.push(job)
        } else {
@@ -208,7 +212,7 @@ async function main({ msg, ackMsg, nackMsg, channel, scheduleForRetry, scheduleT
        if (isInsufficientBalanceError(e)) {
          insufficientFunds = true
          const currentBalance = await web3.eth.getBalance(config.validatorAddress)
-          minimumBalance = gasLimit.multipliedBy(gasPrice)
+          minimumBalance = gasLimit.multipliedBy(gasPriceOptions.gasPrice || gasPriceOptions.maxFeePerGas)
          logger.error(
            `Insufficient funds: ${currentBalance}. Stop processing messages until the balance is at least ${minimumBalance}.`
          )
--- a/oracle/src/services/HttpListProvider.js
+++ b/oracle/src/services/HttpListProvider.js
@@ -4,8 +4,12 @@ const { FALLBACK_RPC_URL_SWITCH_TIMEOUT } = require('../utils/constants')

 const { onInjected } = require('./injectedLogger')

+const { ORACLE_JSONRPC_ERROR_CODES } = process.env
+
 // From EIP-1474 and Infura documentation
-const JSONRPC_ERROR_CODES = [-32603, -32002, -32005]
+const JSONRPC_ERROR_CODES = ORACLE_JSONRPC_ERROR_CODES
+  ? ORACLE_JSONRPC_ERROR_CODES.split(',').map(s => parseInt(s, 10))
+  : [-32603, -32002, -32005]

 const defaultOptions = {
  name: 'main',
@@ -41,6 +45,20 @@ function HttpListProvider(urls, options = {}) {
  })
 }

+HttpListProvider.prototype.switchToFallbackRPC = function() {
+  if (this.urls.length < 2) {
+    return
+  }
+
+  const prevIndex = this.currentIndex
+  const newIndex = (prevIndex + 1) % this.urls.length
+  this.logger.info(
+    { index: newIndex, oldURL: this.urls[prevIndex], newURL: this.urls[newIndex] },
+    'Switching to fallback JSON-RPC URL'
+  )
+  this.currentIndex = newIndex
+}
+
 HttpListProvider.prototype.send = async function send(payload, callback) {
  // if fallback URL is being used for too long, switch back to the primary URL
  if (this.currentIndex > 0 && Date.now() - this.lastTimeUsedPrimary > FALLBACK_RPC_URL_SWITCH_TIMEOUT) {
--- a/oracle/src/services/SafeEthLogsProvider.js
+++ b/oracle/src/services/SafeEthLogsProvider.js
@@ -1,39 +1,35 @@
 const { hexToNumber, isHexStrict } = require('web3').utils

-const { onInjected } = require('./injectedLogger')
-
 function SafeEthLogsProvider(provider) {
-  this.subProvider = provider
-  onInjected(logger => {
-    this.logger = logger.child({ module: 'SafeEthLogsProvider' })
-  })
-}
+  const oldSend = provider.send.bind(provider)
+  const newSend = function(payload, callback) {
+    if (payload.method === 'eth_getLogs' && isHexStrict(payload.params[0].toBlock)) {
+      this.logger.debug('Modifying eth_getLogs request to include batch eth_blockNumber request')

-SafeEthLogsProvider.prototype.send = function send(payload, callback) {
-  if (payload.method === 'eth_getLogs' && isHexStrict(payload.params[0].toBlock)) {
-    this.logger.debug('Modifying eth_getLogs request to include batch eth_blockNumber request')
-
-    const newPayload = [payload, { jsonrpc: '2.0', id: payload.id + 1, method: 'eth_blockNumber', params: [] }]
-    this.subProvider.send(newPayload, (err, res) => {
-      if (err) {
-        callback(err, null)
-      } else {
-        const rawLogs = res.find(({ id }) => id === payload.id)
-        const rawBlockNumber = res.find(({ id }) => id === payload.id + 1)
-        const blockNumber = hexToNumber(rawBlockNumber.result)
-        const toBlock = hexToNumber(payload.params[0].toBlock)
-
-        if (blockNumber < toBlock) {
-          this.logger.warn({ toBlock, blockNumber }, 'Returned block number is less than the specified toBlock')
-          callback(new Error('block number too low'), null)
+      const newPayload = [payload, { jsonrpc: '2.0', id: payload.id + 1, method: 'eth_blockNumber', params: [] }]
+      oldSend(newPayload, (err, res) => {
+        if (err) {
+          callback(err, null)
        } else {
-          callback(null, rawLogs)
+          const rawLogs = res.find(({ id }) => id === payload.id)
+          const rawBlockNumber = res.find(({ id }) => id === payload.id + 1)
+          const blockNumber = hexToNumber(rawBlockNumber.result)
+          const toBlock = hexToNumber(payload.params[0].toBlock)
+
+          if (blockNumber < toBlock) {
+            this.logger.warn({ toBlock, blockNumber }, 'Returned block number is less than the specified toBlock')
+            callback(new Error('block number too low'), null)
+          } else {
+            callback(null, rawLogs)
+          }
        }
-      }
-    })
-  } else {
-    this.subProvider.send(payload, callback)
+      })
+    } else {
+      oldSend(payload, callback)
+    }
  }
+  provider.send = newSend.bind(provider)
+  return provider
 }

 module.exports = {
--- a/oracle/src/services/amqpClient.js
+++ b/oracle/src/services/amqpClient.js
@@ -40,23 +40,9 @@ function connectWatcherToQueue({ queueName, cb }) {
  cb({ sendToQueue, channel: channelWrapper })
 }

-function connectSenderToQueue({ queueName, oldQueueName, cb, resendInterval }) {
+function connectSenderToQueue({ queueName, cb, resendInterval }) {
  const deadLetterExchange = `${queueName}-retry`

-  async function resendMessagesToNewQueue(channel) {
-    logger.info(`Trying to check messages in the old non-priority queue ${queueName}`)
-    while (true) {
-      const msg = await channel.get(oldQueueName)
-      if (msg === false) {
-        logger.info(`No messages in the old queue ${oldQueueName} left`)
-        break
-      }
-      logger.debug(`Message in the old queue ${oldQueueName} was found, redirecting it to the new queue ${queueName}`)
-      await channel.sendToQueue(queueName, msg.content, { persistent: true, priority: SENDER_QUEUE_SEND_PRIORITY })
-      await channel.ack(msg)
-    }
-  }
-
  const channelWrapper = connection.createChannel({
    json: true
  })
@@ -64,7 +50,6 @@ function connectSenderToQueue({ queueName, oldQueueName, cb, resendInterval }) {
  channelWrapper.addSetup(async channel => {
    await channel.assertExchange(deadLetterExchange, 'fanout', { durable: true })
    await channel.assertQueue(queueName, { durable: true, maxPriority: SENDER_QUEUE_MAX_PRIORITY })
-    await channel.assertQueue(oldQueueName, { durable: true }).then(() => resendMessagesToNewQueue(channel))
    await channel.bindQueue(queueName, deadLetterExchange)
    await channel.prefetch(1)
    await channel.consume(queueName, msg =>
--- a/oracle/src/services/gasPrice.js
+++ b/oracle/src/services/gasPrice.js
@@ -20,21 +20,21 @@ const {
  COMMON_HOME_GAS_PRICE_FACTOR
 } = process.env

-let cachedGasPrice = null
+let cachedGasPriceOptions = null

 let fetchGasPriceInterval = null

-const fetchGasPrice = async (speedType, factor, bridgeContract, gasPriceSupplierUrl) => {
+const fetchGasPrice = async (speedType, factor, web3, bridgeContract, gasPriceSupplierUrl) => {
  const contractOptions = { logger }
  const supplierOptions = { speedType, factor, limits: GAS_PRICE_BOUNDARIES, logger }
-  cachedGasPrice =
-    (await gasPriceFromSupplier(gasPriceSupplierUrl, supplierOptions)) ||
+  cachedGasPriceOptions =
+    (await gasPriceFromSupplier(web3, gasPriceSupplierUrl, supplierOptions)) ||
    (await gasPriceFromContract(bridgeContract, contractOptions)) ||
-    cachedGasPrice
-  return cachedGasPrice
+    cachedGasPriceOptions
+  return cachedGasPriceOptions
 }

-async function start(chainId, fetchOnce) {
+async function start(chainId, web3, fetchOnce) {
  clearInterval(fetchGasPriceInterval)

  let contract = null
@@ -49,7 +49,7 @@ async function start(chainId, fetchOnce) {
    updateInterval = ORACLE_HOME_GAS_PRICE_UPDATE_INTERVAL || DEFAULT_UPDATE_INTERVAL
    factor = Number(COMMON_HOME_GAS_PRICE_FACTOR) || DEFAULT_GAS_PRICE_FACTOR

-    cachedGasPrice = COMMON_HOME_GAS_PRICE_FALLBACK
+    cachedGasPriceOptions = { gasPrice: COMMON_HOME_GAS_PRICE_FALLBACK }
  } else if (chainId === 'foreign') {
    contract = foreign.bridgeContract
    gasPriceSupplierUrl = COMMON_FOREIGN_GAS_PRICE_SUPPLIER_URL
@@ -57,7 +57,7 @@ async function start(chainId, fetchOnce) {
    updateInterval = ORACLE_FOREIGN_GAS_PRICE_UPDATE_INTERVAL || DEFAULT_UPDATE_INTERVAL
    factor = Number(COMMON_FOREIGN_GAS_PRICE_FACTOR) || DEFAULT_GAS_PRICE_FACTOR

-    cachedGasPrice = COMMON_FOREIGN_GAS_PRICE_FALLBACK
+    cachedGasPriceOptions = { gasPrice: COMMON_FOREIGN_GAS_PRICE_FALLBACK }
  } else {
    throw new Error(`Unrecognized chainId '${chainId}'`)
  }
@@ -67,21 +67,21 @@ async function start(chainId, fetchOnce) {
  }

  if (fetchOnce) {
-    await fetchGasPrice(speedType, factor, contract, gasPriceSupplierUrl)
+    await fetchGasPrice(speedType, factor, web3, contract, gasPriceSupplierUrl)
  } else {
    fetchGasPriceInterval = await setIntervalAndRun(
-      () => fetchGasPrice(speedType, factor, contract, gasPriceSupplierUrl),
+      () => fetchGasPrice(speedType, factor, web3, contract, gasPriceSupplierUrl),
      updateInterval
    )
  }
 }

-function getPrice() {
-  return cachedGasPrice
+function gasPriceOptions() {
+  return cachedGasPriceOptions
 }

 module.exports = {
  start,
-  getPrice,
+  gasPriceOptions,
  fetchGasPrice
 }
--- a/oracle/src/services/web3.js
+++ b/oracle/src/services/web3.js
@@ -1,4 +1,6 @@
 const Web3 = require('web3')
+const ethers = require('ethers')
+const flashbots = require('@flashbots/ethers-provider-bundle')
 const { HttpListProvider } = require('./HttpListProvider')
 const { SafeEthLogsProvider } = require('./SafeEthLogsProvider')
 const { RedundantHttpListProvider } = require('./RedundantHttpListProvider')
@@ -9,6 +11,8 @@ const {
  COMMON_FOREIGN_RPC_URL,
  ORACLE_SIDE_RPC_URL,
  ORACLE_FOREIGN_ARCHIVE_RPC_URL,
+  ORACLE_MEV_FOREIGN_FLASHBOTS_RPC_URL,
+  ORACLE_MEV_FOREIGN_FLASHBOTS_AUTH_SIGNING_KEY,
  ORACLE_RPC_REQUEST_TIMEOUT,
  ORACLE_HOME_RPC_POLLING_INTERVAL,
  ORACLE_FOREIGN_RPC_POLLING_INTERVAL
@@ -38,10 +42,10 @@ const foreignOptions = {
  retry: RETRY_CONFIG
 }

-const homeProvider = new SafeEthLogsProvider(new HttpListProvider(homeUrls, homeOptions))
+const homeProvider = SafeEthLogsProvider(new HttpListProvider(homeUrls, homeOptions))
 const web3Home = new Web3(homeProvider)

-const foreignProvider = new SafeEthLogsProvider(new HttpListProvider(foreignUrls, foreignOptions))
+const foreignProvider = SafeEthLogsProvider(new HttpListProvider(foreignUrls, foreignOptions))
 const web3Foreign = new Web3(foreignProvider)

 let web3ForeignArchive = null
@@ -94,6 +98,15 @@ if (foreignUrls.length > 1) {
  web3ForeignRedundant = new Web3(redundantProvider)
 }

+let getFlashbotsProvider
+if (ORACLE_MEV_FOREIGN_FLASHBOTS_RPC_URL) {
+  const provider = new ethers.providers.JsonRpcProvider(foreignUrls[0])
+  const authSigner = new ethers.Wallet(ORACLE_MEV_FOREIGN_FLASHBOTS_AUTH_SIGNING_KEY, provider)
+
+  getFlashbotsProvider = chainId =>
+    flashbots.FlashbotsBundleProvider.create(provider, authSigner, ORACLE_MEV_FOREIGN_FLASHBOTS_RPC_URL, chainId)
+}
+
 module.exports = {
  web3Home,
  web3Foreign,
@@ -102,5 +115,6 @@ module.exports = {
  web3HomeRedundant,
  web3ForeignRedundant,
  web3HomeFallback,
-  web3ForeignFallback
+  web3ForeignFallback,
+  getFlashbotsProvider
 }
--- a/oracle/src/tx/sendTx.js
+++ b/oracle/src/tx/sendTx.js
@@ -1,25 +1,38 @@
-const { toWei } = require('web3').utils
-
-async function sendTx({ privateKey, data, nonce, gasPrice, amount, gasLimit, to, chainId, web3 }) {
+async function sendTx(opts) {
+  const { privateKey, data, nonce, gasPrice, gasPriceOptions, value, gasLimit, to, chainId, web3, mevOptions } = opts
+  const gasOpts = gasPriceOptions || { gasPrice }
  const serializedTx = await web3.eth.accounts.signTransaction(
    {
      nonce: Number(nonce),
      chainId,
      to,
      data,
-      value: toWei(amount),
-      gasPrice,
-      gas: gasLimit
+      value,
+      gas: gasLimit,
+      ...gasOpts
    },
    privateKey
  )

-  return new Promise((res, rej) =>
-    web3.eth
-      .sendSignedTransaction(serializedTx.rawTransaction)
-      .once('transactionHash', res)
-      .once('error', rej)
+  if (!mevOptions) {
+    return new Promise((res, rej) =>
+      web3.eth
+        .sendSignedTransaction(serializedTx.rawTransaction)
+        .once('transactionHash', res)
+        .once('error', rej)
+    )
+  }
+
+  mevOptions.logger.debug(
+    { rawTx: serializedTx.rawTransaction, txHash: serializedTx.transactionHash },
+    'Signed MEV helper transaction'
  )
+
+  for (let blockNumber = mevOptions.fromBlock; blockNumber <= mevOptions.toBlock; blockNumber++) {
+    mevOptions.logger.debug({ txHash: serializedTx.transactionHash, blockNumber }, 'Sending MEV bundle transaction')
+    await mevOptions.provider.sendRawBundle([serializedTx.rawTransaction], blockNumber)
+  }
+  return Promise.resolve(serializedTx.transactionHash)
 }

 module.exports = {
--- a/oracle/src/tx/web3.js
+++ b/oracle/src/tx/web3.js
@@ -87,7 +87,7 @@ async function getEvents({ contract, event, fromBlock, toBlock, filter }) {
    )
    const pastEvents = await contract.getPastEvents(event, { fromBlock, toBlock, filter })
    logger.debug({ contractAddress, event, count: pastEvents.length }, 'Past events obtained')
-    return pastEvents
+    return pastEvents.sort((a, b) => a.blockNumber - b.blockNumber || a.transactionIndex - b.transactionIndex)
  } catch (e) {
    logger.error(e.message)
    throw new Error(`${event} events cannot be obtained`)
--- a/oracle/src/utils/constants.js
+++ b/oracle/src/utils/constants.js
@@ -1,10 +1,11 @@
 module.exports = {
  EXTRA_GAS_PERCENTAGE: 4,
-  EXTRA_GAS_ABSOLUTE: 200000,
+  EXTRA_GAS_ABSOLUTE: 250000,
  AMB_AFFIRMATION_REQUEST_EXTRA_GAS_ESTIMATOR: len => Math.floor(0.0035 * len ** 2 + 40 * len),
  MIN_AMB_HEADER_LENGTH: 32 + 20 + 20 + 4 + 2 + 1 + 2,
  MAX_GAS_LIMIT: 10000000,
  MAX_CONCURRENT_EVENTS: 50,
+  MAX_HISTORY_BLOCK_TO_REPROCESS: 10000,
  RETRY_CONFIG: {
    retries: 20,
    factor: 1.4,
@@ -23,9 +24,23 @@ module.exports = {
    MIN: 1,
    MAX: 1000
  },
+  MIN_GAS_PRICE_BUMP_FACTOR: 0.1,
  DEFAULT_TRANSACTION_RESEND_INTERVAL: 20 * 60 * 1000,
  FALLBACK_RPC_URL_SWITCH_TIMEOUT: 60 * 60 * 1000,
+  BLOCK_NUMBER_PROGRESS_ITERATIONS_LIMIT: 10,
  SENDER_QUEUE_MAX_PRIORITY: 10,
  SENDER_QUEUE_SEND_PRIORITY: 5,
-  SENDER_QUEUE_CHECK_STATUS_PRIORITY: 1
+  SENDER_QUEUE_CHECK_STATUS_PRIORITY: 1,
+  ASYNC_CALL_ERRORS: {
+    // requested transaction/block/receipt does not exist
+    NOT_FOUND: '0x0000000000000000000000000000000000000000000000000000000000000000',
+    // requested custom block does not exist yet or its timestamp is greater than the home block timestamp
+    BLOCK_IS_IN_THE_FUTURE: '0x0000000000000000000000000000000000000000000000000000000000000001',
+    // eth_call has reverted or finished with OOG error
+    REVERT: '0x0000000000000000000000000000000000000000000000000000000000000002',
+    // evaluated output length exceeds allowed length of 64 KB
+    RESULT_IS_TOO_LONG: '0x0000000000000000000000000000000000000000000000000000000000000003'
+  },
+  MAX_ASYNC_CALL_RESULT_LENGTH: 64 * 1024,
+  ASYNC_ETH_CALL_MAX_GAS_LIMIT: 100000000
 }
--- a/oracle/src/utils/mev.js
+++ b/oracle/src/utils/mev.js
@@ -0,0 +1,43 @@
+const MEV_HELPER_ABI = [
+  {
+    constant: false,
+    inputs: [
+      {
+        name: '_data',
+        type: 'bytes'
+      }
+    ],
+    name: 'execute',
+    outputs: [],
+    payable: false,
+    stateMutability: 'nonpayable',
+    type: 'function'
+  },
+  {
+    constant: false,
+    inputs: [
+      {
+        name: '_gasPrice',
+        type: 'uint256'
+      },
+      {
+        name: '_data',
+        type: 'bytes'
+      }
+    ],
+    name: 'estimateProfit',
+    outputs: [
+      {
+        name: '',
+        type: 'uint256'
+      }
+    ],
+    payable: true,
+    stateMutability: 'nonpayable',
+    type: 'function'
+  }
+]
+
+module.exports = {
+  MEV_HELPER_ABI
+}
--- a/oracle/src/utils/utils.js
+++ b/oracle/src/utils/utils.js
@@ -2,6 +2,9 @@ const fs = require('fs')
 const BigNumber = require('bignumber.js')
 const promiseRetry = require('promise-retry')
 const Web3 = require('web3')
+const { GAS_PRICE_BOUNDARIES } = require('./constants')
+
+const { toBN, toWei } = Web3.utils

 const retrySequence = [1, 2, 3, 5, 8, 13, 21, 34, 55, 60]

@@ -34,8 +37,8 @@ const promiseRetryForever = f => promiseRetry(f, { forever: true, factor: 1 })
 async function waitForFunds(web3, address, minimumBalance, cb, logger) {
  promiseRetryForever(async retry => {
    logger.debug('Getting balance of validator account')
-    const newBalance = web3.utils.toBN(await web3.eth.getBalance(address))
-    if (newBalance.gte(web3.utils.toBN(minimumBalance.toString(10)))) {
+    const newBalance = toBN(await web3.eth.getBalance(address))
+    if (newBalance.gte(toBN(minimumBalance.toString(10)))) {
      logger.debug({ balance: newBalance, minimumBalance }, 'Validator has minimum necessary balance')
      cb(newBalance)
    } else {
@@ -64,6 +67,48 @@ function addExtraGas(gas, extraPercentage, maxGasLimit = Infinity) {
  return BigNumber.min(maxGasLimit, gasWithExtra)
 }

+function applyMinGasFeeBump(job, bumpFactor = 0.1) {
+  if (!job.gasPriceOptions) {
+    return job
+  }
+  const { gasPrice, maxFeePerGas, maxPriorityFeePerGas } = job.gasPriceOptions
+  const maxGasPrice = toWei(GAS_PRICE_BOUNDARIES.MAX.toString(), 'gwei')
+  if (gasPrice) {
+    return {
+      ...job,
+      gasPriceOptions: {
+        gasPrice: addExtraGas(gasPrice, bumpFactor, maxGasPrice).toString()
+      }
+    }
+  }
+  if (maxFeePerGas && maxPriorityFeePerGas) {
+    return {
+      ...job,
+      gasPriceOptions: {
+        maxFeePerGas: addExtraGas(maxFeePerGas, bumpFactor, maxGasPrice).toString(),
+        maxPriorityFeePerGas: addExtraGas(maxPriorityFeePerGas, bumpFactor, maxGasPrice).toString()
+      }
+    }
+  }
+  return job
+}
+
+function chooseGasPriceOptions(a, b) {
+  if (!a) {
+    return b
+  }
+  if (a && b && a.gasPrice && b.gasPrice) {
+    return { gasPrice: BigNumber.max(a.gasPrice, b.gasPrice).toString() }
+  }
+  if (a && b && a.maxFeePerGas && b.maxFeePerGas && a.maxPriorityFeePerGas && b.maxPriorityFeePerGas) {
+    return {
+      maxFeePerGas: BigNumber.max(a.maxFeePerGas, b.maxFeePerGas).toString(),
+      maxPriorityFeePerGas: BigNumber.max(a.maxPriorityFeePerGas, b.maxPriorityFeePerGas).toString()
+    }
+  }
+  return a
+}
+
 async function setIntervalAndRun(f, interval) {
  const handler = setInterval(f, interval)
  await f()
@@ -106,7 +151,11 @@ function isGasPriceError(e) {

 function isSameTransactionError(e) {
  const message = e.message.toLowerCase()
-  return message.includes('transaction with the same hash was already imported') || message.includes('already known')
+  return (
+    message.includes('transaction with the same hash was already imported') ||
+    message.includes('already known') ||
+    message.includes('alreadyknown')
+  )
 }

 function isInsufficientBalanceError(e) {
@@ -119,7 +168,20 @@ function isNonceError(e) {
  return (
    message.includes('transaction nonce is too low') ||
    message.includes('nonce too low') ||
-    message.includes('transaction with same nonce in the queue')
+    message.includes('transaction with same nonce in the queue') ||
+    message.includes('oldnonce')
+  )
+}
+
+function isRevertError(e) {
+  const message = e.message.toLowerCase()
+  // OE and NE returns "VM execution error"/"Transaction execution error"
+  // Geth returns "out of gas"/"intrinsic gas too low"/"execution reverted"
+  return (
+    message.includes('execution error') ||
+    message.includes('intrinsic gas too low') ||
+    message.includes('out of gas') ||
+    message.includes('execution reverted')
  )
 }

@@ -166,6 +228,8 @@ module.exports = {
  waitForFunds,
  waitForUnsuspend,
  addExtraGas,
+  chooseGasPriceOptions,
+  applyMinGasFeeBump,
  setIntervalAndRun,
  watchdog,
  add0xPrefix,
@@ -174,6 +238,7 @@ module.exports = {
  isSameTransactionError,
  isInsufficientBalanceError,
  isNonceError,
+  isRevertError,
  getRetrySequence,
  promiseAny,
  readAccessListFile,
--- a/oracle/src/watcher.js
+++ b/oracle/src/watcher.js
@@ -6,7 +6,11 @@ const logger = require('./services/logger')
 const { getShutdownFlag } = require('./services/shutdownState')
 const { getBlockNumber, getRequiredBlockConfirmations, getEvents } = require('./tx/web3')
 const { checkHTTPS, watchdog } = require('./utils/utils')
-const { EXIT_CODES } = require('./utils/constants')
+const {
+  EXIT_CODES,
+  BLOCK_NUMBER_PROGRESS_ITERATIONS_LIMIT,
+  MAX_HISTORY_BLOCK_TO_REPROCESS
+} = require('./utils/constants')

 if (process.argv.length < 3) {
  logger.error('Please check the number of arguments, config file was not provided')
@@ -26,17 +30,33 @@ const processAMBInformationRequests = require('./events/processAMBInformationReq

 const { getTokensState } = require('./utils/tokenState')

-const { web3, bridgeContract, eventContract, startBlock, pollingInterval, chain } = config.main
+const {
+  web3,
+  bridgeContract,
+  eventContract,
+  startBlock,
+  pollingInterval,
+  chain,
+  reprocessingOptions,
+  blockPollingLimit
+} = config.main
 const lastBlockRedisKey = `${config.id}:lastProcessedBlock`
+const lastReprocessedBlockRedisKey = `${config.id}:lastReprocessedBlock`
+const seenEventsRedisKey = `${config.id}:seenEvents`
 let lastProcessedBlock = Math.max(startBlock - 1, 0)
+let lastReprocessedBlock
+let lastSeenBlockNumber = 0
+let sameBlockNumberCounter = 0

 async function initialize() {
  try {
    const checkHttps = checkHTTPS(process.env.ORACLE_ALLOW_HTTP_FOR_RPC, logger)

-    web3.currentProvider.subProvider.urls.forEach(checkHttps(chain))
+    web3.currentProvider.urls.forEach(checkHttps(chain))

    await getLastProcessedBlock()
+    await getLastReprocessedBlock()
+    await checkConditions()
    connectWatcherToQueue({
      queueName: config.queue,
      cb: runMain
@@ -74,11 +94,34 @@ async function getLastProcessedBlock() {
  lastProcessedBlock = result ? parseInt(result, 10) : lastProcessedBlock
 }

+async function getLastReprocessedBlock() {
+  if (reprocessingOptions.enabled) {
+    const result = await redis.get(lastReprocessedBlockRedisKey)
+    if (result) {
+      lastReprocessedBlock = Math.max(parseInt(result, 10), lastProcessedBlock - MAX_HISTORY_BLOCK_TO_REPROCESS)
+    } else {
+      lastReprocessedBlock = lastProcessedBlock
+    }
+    logger.debug({ block: lastReprocessedBlock }, 'Last reprocessed block obtained')
+  } else {
+    // when reprocessing is being enabled not for the first time,
+    // we do not want to process blocks for which we didn't recorded seen events,
+    // instead, we want to start from the current block.
+    // Thus we should delete this reprocessing pointer once it is disabled.
+    await redis.del(lastReprocessedBlockRedisKey)
+  }
+}
+
 function updateLastProcessedBlock(lastBlockNumber) {
  lastProcessedBlock = lastBlockNumber
  return redis.set(lastBlockRedisKey, lastProcessedBlock)
 }

+function updateLastReprocessedBlock(lastBlockNumber) {
+  lastReprocessedBlock = lastBlockNumber
+  return redis.set(lastReprocessedBlockRedisKey, lastReprocessedBlock)
+}
+
 function processEvents(events) {
  switch (config.id) {
    case 'erc-native-signature-request':
@@ -112,11 +155,98 @@ async function checkConditions() {
  }
 }

+const eventKey = e => `${e.transactionHash}-${e.logIndex}`
+
+async function reprocessOldLogs(sendToQueue) {
+  const fromBlock = lastReprocessedBlock + 1
+  let toBlock = lastReprocessedBlock + reprocessingOptions.batchSize
+  const events = await getEvents({
+    contract: eventContract,
+    event: config.event,
+    fromBlock,
+    toBlock,
+    filter: config.eventFilter
+  })
+  const alreadySeenEvents = await getSeenEvents(fromBlock, toBlock)
+  const missingEvents = events.filter(e => !alreadySeenEvents[eventKey(e)])
+  if (missingEvents.length === 0) {
+    logger.debug('No missed events were found')
+  } else {
+    logger.info(`Found ${missingEvents.length} ${config.event} missed events`)
+    let job
+    if (config.id === 'amb-information-request') {
+      // obtain block number and events from the earliest block
+      const batchBlockNumber = missingEvents[0].blockNumber
+      const batchEvents = missingEvents.filter(event => event.blockNumber === batchBlockNumber)
+
+      // if there are some other events in the later blocks,
+      // adjust lastReprocessedBlock so that these events will be processed again on the next iteration
+      if (batchEvents.length < missingEvents.length) {
+        // pick event outside from the batch
+        toBlock = missingEvents[batchEvents.length].blockNumber - 1
+      }
+
+      job = await processAMBInformationRequests(batchEvents)
+      if (job === null) {
+        return
+      }
+    } else {
+      job = await processEvents(missingEvents)
+    }
+    logger.info('Missed events transactions to send:', job.length)
+    if (job.length) {
+      await sendToQueue(job)
+    }
+  }
+
+  await updateLastReprocessedBlock(toBlock)
+  await deleteSeenEvents(0, toBlock)
+}
+
+async function getSeenEvents(fromBlock, toBlock) {
+  const keys = await redis.zrangebyscore(seenEventsRedisKey, fromBlock, toBlock)
+  const res = {}
+  keys.forEach(k => {
+    res[k] = true
+  })
+  return res
+}
+
+function deleteSeenEvents(fromBlock, toBlock) {
+  return redis.zremrangebyscore(seenEventsRedisKey, fromBlock, toBlock)
+}
+
+function addSeenEvents(events) {
+  return redis.zadd(seenEventsRedisKey, ...events.flatMap(e => [e.blockNumber, eventKey(e)]))
+}
+
 async function getLastBlockToProcess(web3, bridgeContract) {
  const [lastBlockNumber, requiredBlockConfirmations] = await Promise.all([
    getBlockNumber(web3),
    getRequiredBlockConfirmations(bridgeContract)
  ])
+
+  if (lastBlockNumber < lastSeenBlockNumber) {
+    sameBlockNumberCounter = 0
+    logger.warn({ lastBlockNumber, lastSeenBlockNumber }, 'Received block number less than already seen block')
+    web3.currentProvider.switchToFallbackRPC()
+  } else if (lastBlockNumber === lastSeenBlockNumber) {
+    sameBlockNumberCounter++
+    if (sameBlockNumberCounter > 1) {
+      logger.info({ lastBlockNumber, sameBlockNumberCounter }, 'Received the same block number more than twice')
+      if (sameBlockNumberCounter >= BLOCK_NUMBER_PROGRESS_ITERATIONS_LIMIT) {
+        sameBlockNumberCounter = 0
+        logger.warn(
+          { lastBlockNumber, n: BLOCK_NUMBER_PROGRESS_ITERATIONS_LIMIT },
+          'Received the same block number for too many times. Probably node is not synced anymore'
+        )
+        web3.currentProvider.switchToFallbackRPC()
+      }
+    }
+  } else {
+    sameBlockNumberCounter = 0
+    lastSeenBlockNumber = lastBlockNumber
+  }
  return lastBlockNumber - requiredBlockConfirmations
 }

@@ -132,26 +262,31 @@ async function main({ sendToQueue }) {
      logger.info(`Oracle watcher was unsuspended.`)
    }

-    await checkConditions()
-
    const lastBlockToProcess = await getLastBlockToProcess(web3, bridgeContract)

+    if (reprocessingOptions.enabled) {
+      if (lastReprocessedBlock + reprocessingOptions.batchSize + reprocessingOptions.blockDelay < lastBlockToProcess) {
+        await reprocessOldLogs(sendToQueue)
+        return
+      }
+    }
+
    if (lastBlockToProcess <= lastProcessedBlock) {
      logger.debug('All blocks already processed')
      return
    }

    const fromBlock = lastProcessedBlock + 1
-    const rangeEndBlock = config.blockPollingLimit ? fromBlock + config.blockPollingLimit : lastBlockToProcess
+    const rangeEndBlock = blockPollingLimit ? fromBlock + blockPollingLimit : lastBlockToProcess
    let toBlock = Math.min(lastBlockToProcess, rangeEndBlock)

-    const events = (await getEvents({
+    let events = await getEvents({
      contract: eventContract,
      event: config.event,
      fromBlock,
      toBlock,
      filter: config.eventFilter
-    })).sort((a, b) => a.blockNumber - b.blockNumber)
+    })
    logger.info(`Found ${events.length} ${config.event} events`)

    if (events.length) {
@@ -168,9 +303,10 @@ async function main({ sendToQueue }) {
        if (batchEvents.length < events.length) {
          // pick event outside from the batch
          toBlock = events[batchEvents.length].blockNumber - 1
+          events = batchEvents
        }

-        job = await processAMBInformationRequests(batchEvents)
+        job = await processAMBInformationRequests(events)
        if (job === null) {
          return
        }
@@ -182,6 +318,9 @@ async function main({ sendToQueue }) {
      if (job.length) {
        await sendToQueue(job)
      }
+      if (reprocessingOptions.enabled) {
+        await addSeenEvents(events)
+      }
    }

    logger.debug({ lastProcessedBlock: toBlock.toString() }, 'Updating last processed block')
--- a/oracle/test/gasPrice.test.js
+++ b/oracle/test/gasPrice.test.js
@@ -71,10 +71,10 @@ describe('gasPrice', () => {
      await gasPrice.start('home')

      // when
-      await gasPrice.fetchGasPrice('standard', 1, null, null)
+      await gasPrice.fetchGasPrice('standard', 1, null, null, null)

      // then
-      expect(gasPrice.getPrice()).to.equal('101000000000')
+      expect(gasPrice.gasPriceOptions()).to.eql({ gasPrice: '101000000000' })
    })

    it('should fetch gas from supplier', async () => {
@@ -82,10 +82,10 @@ describe('gasPrice', () => {
      await gasPrice.start('home')

      // when
-      await gasPrice.fetchGasPrice('standard', 1, null, 'url')
+      await gasPrice.fetchGasPrice('standard', 1, null, null, 'url')

      // then
-      expect(gasPrice.getPrice().toString()).to.equal('103000000000')
+      expect(gasPrice.gasPriceOptions()).to.eql({ gasPrice: '103000000000' })
    })

    it('should fetch gas from contract', async () => {
@@ -101,10 +101,10 @@ describe('gasPrice', () => {
      }

      // when
-      await gasPrice.fetchGasPrice('standard', 1, bridgeContractMock, null)
+      await gasPrice.fetchGasPrice('standard', 1, null, bridgeContractMock, null)

      // then
-      expect(gasPrice.getPrice().toString()).to.equal('102000000000')
+      expect(gasPrice.gasPriceOptions()).to.eql({ gasPrice: '102000000000' })
    })

    it('should fetch the gas price from the oracle first', async () => {
@@ -120,10 +120,10 @@ describe('gasPrice', () => {
      }

      // when
-      await gasPrice.fetchGasPrice('standard', 1, bridgeContractMock, 'url')
+      await gasPrice.fetchGasPrice('standard', 1, null, bridgeContractMock, 'url')

      // then
-      expect(gasPrice.getPrice().toString()).to.equal('103000000000')
+      expect(gasPrice.gasPriceOptions()).to.eql({ gasPrice: '103000000000' })
    })

    it('log error using the logger', async () => {
@@ -131,7 +131,7 @@ describe('gasPrice', () => {
      await gasPrice.start('home')

      // when
-      await gasPrice.fetchGasPrice('standard', 1, null, null)
+      await gasPrice.fetchGasPrice('standard', 1, null, null, null)

      // then
      expect(fakeLogger.warn.calledOnce).to.equal(true) // one warning
--- a/oracle/test/utils.test.js
+++ b/oracle/test/utils.test.js
@@ -3,7 +3,13 @@ const chai = require('chai')
 const chaiAsPromised = require('chai-as-promised')
 const BigNumber = require('bignumber.js')
 const proxyquire = require('proxyquire')
-const { addExtraGas, syncForEach, promiseAny } = require('../src/utils/utils')
+const {
+  addExtraGas,
+  applyMinGasFeeBump,
+  chooseGasPriceOptions,
+  syncForEach,
+  promiseAny
+} = require('../src/utils/utils')

 chai.use(chaiAsPromised)
 chai.should()
@@ -173,4 +179,43 @@ describe('utils', () => {
      await promiseAny(array.map(f)).should.be.rejected
    })
  })
+
+  describe('applyMinGasFeeBump', () => {
+    it('should bump pre-eip1559 fee', () => {
+      const job = { gasPriceOptions: { gasPrice: '100000000000' } }
+      const newJob = applyMinGasFeeBump(job)
+      expect(newJob.gasPriceOptions.gasPrice).to.be.equal('110000000000')
+    })
+
+    it('should bump eip1559 fee', () => {
+      const job = { gasPriceOptions: { maxFeePerGas: '100000000000', maxPriorityFeePerGas: '20000000000' } }
+      const newJob = applyMinGasFeeBump(job)
+      expect(newJob.gasPriceOptions.maxFeePerGas).to.be.equal('110000000000')
+      expect(newJob.gasPriceOptions.maxPriorityFeePerGas).to.be.equal('22000000000')
+    })
+  })
+
+  describe('chooseGasPriceOptions', () => {
+    it('should choose max pre-eip1559 fee', () => {
+      const opts1 = { gasPrice: '100000000000' }
+      const opts2 = { gasPrice: '101000000000' }
+      expect(chooseGasPriceOptions(opts1, opts2).gasPrice).to.be.equal('101000000000')
+      expect(chooseGasPriceOptions(opts2, opts1).gasPrice).to.be.equal('101000000000')
+      expect(chooseGasPriceOptions(opts2, undefined).gasPrice).to.be.equal('101000000000')
+      expect(chooseGasPriceOptions(undefined, opts2).gasPrice).to.be.equal('101000000000')
+    })
+
+    it('should choose max eip1559 fee', () => {
+      const opts1 = { maxFeePerGas: '100000000000', maxPriorityFeePerGas: '21000000000' }
+      const opts2 = { maxFeePerGas: '101000000000', maxPriorityFeePerGas: '20000000000' }
+      expect(chooseGasPriceOptions(opts1, opts2).maxFeePerGas).to.be.equal('101000000000')
+      expect(chooseGasPriceOptions(opts1, opts2).maxPriorityFeePerGas).to.be.equal('21000000000')
+      expect(chooseGasPriceOptions(opts2, opts1).maxFeePerGas).to.be.equal('101000000000')
+      expect(chooseGasPriceOptions(opts2, opts1).maxPriorityFeePerGas).to.be.equal('21000000000')
+      expect(chooseGasPriceOptions(opts2, undefined).maxFeePerGas).to.be.equal('101000000000')
+      expect(chooseGasPriceOptions(opts2, undefined).maxPriorityFeePerGas).to.be.equal('20000000000')
+      expect(chooseGasPriceOptions(undefined, opts2).maxFeePerGas).to.be.equal('101000000000')
+      expect(chooseGasPriceOptions(undefined, opts2).maxPriorityFeePerGas).to.be.equal('20000000000')
+    })
+  })
 })
--- a/package.json
+++ b/package.json
@@ -45,5 +45,8 @@
    "compile:contracts": "yarn workspace tokenbridge-contracts run compile",
    "install:deploy": "cd contracts/deploy && npm install --unsafe-perm --silent",
    "postinstall": "test -n \"$NOYARNPOSTINSTALL\" || ln -sf $(pwd)/node_modules/openzeppelin-solidity/ contracts/node_modules/openzeppelin-solidity"
+  },
+  "resolutions": {
+    "**/@mycrypto/eth-scan": "3.5.3"
  }
 }
--- a/parity/chain-foreign.json
+++ b/parity/chain-foreign.json
--- a/parity/foreign_mocks/cDAIMock.sol
+++ b/parity/foreign_mocks/cDAIMock.sol
@@ -0,0 +1,33 @@
+pragma solidity 0.4.24;
+
+interface IERC20 {
+  function transferFrom(address from,address to,uint256 value) external;
+  function transfer(address to,uint256 value) external;
+}
+
+contract cDaiMock {
+  IERC20 daiToken;
+
+  event Transfer(address indexed from, address indexed to, uint amount);
+  event Mint(address minter, uint mintAmount, uint mintTokens);
+  event Redeem(address redeemer, uint redeemAmount, uint redeemTokens);
+
+
+  function mint(uint256 mintAmount) external returns (uint256) {
+    daiToken.transferFrom(msg.sender, address(this), mintAmount);
+
+    emit Mint(msg.sender, mintAmount, mintAmount);
+    emit Transfer(address(this), msg.sender, mintAmount);
+
+    return 0;
+  }
+
+  function redeemUnderlying(uint256 redeemAmount) external returns (uint256) {
+    daiToken.transfer(msg.sender, redeemAmount);
+
+    emit Transfer(msg.sender, address(this), redeemAmount);
+    emit Redeem(msg.sender, redeemAmount, redeemAmount);
+
+    return 0;
+  }
+}
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
Alexander Kolotov	5bc562e810	Merge the develop branch to the master branch, preparation to v3.4.0 This merge contains the following set of changes: * [Oracle, Improvement] Refetch old logs ranges to see if there are missed events (#627) * [Oracle, Improvement] Add support for EIP1559 gas price oracle (#631) * [Oracle, Improvement] CollectedSignatures AMB watcher for MEV bundling (#634) * [Oracle, Fix] Fix eip1559 transaction sending problems (#632)	2022-02-11 10:24:38 +03:00
Kirill Fedoseev	72f0d30b52	CollectedSignatures AMB watcher for MEV bundling (#634 )	2022-02-07 23:32:41 +03:00
Kirill Fedoseev	8ec11d0476	Fix eip1559 transaction sending problems (#632 )	2022-01-17 16:51:29 +03:00
Kirill Fedoseev	8d732adba1	Add support for EIP1559 gas price oracle (#631 )	2022-01-03 17:58:36 +03:00
Kirill Fedoseev	296e5c5a22	Refetch old logs ranges to see if there are missed events (#627 )	2022-01-03 15:32:38 +03:00
Alexander Kolotov	b17fff2b56	Merge the develop branch to the master branch, preparation to v3.3.0 This merge contains the following set of changes: * [Oracle, Improvement] Add oracle helper script for fetching interest amounts via async calls (#615) * [Monitor, Fix] Include cDAI balance in balanceDiff (#613) * [Monitor, Fix] Added logging prior the investedAmount call (#614) * [ALM, Fix] Fetch AMB signatures a bit earlier (#620)	2021-11-05 20:22:46 +03:00
Kirill Fedoseev	4eba91ef7e	Fetch AMB signatures a bit earlier (#620 )	2021-11-03 19:21:35 +03:00
Kirill Fedoseev	1e3aa53ab3	Add oracle helper script for fetching interest amounts via async calls (#615 )	2021-10-21 13:33:12 +03:00
Alexander Kolotov	a05ff51555	Added logging prior the investedAmount call (#614 )	2021-10-12 18:06:50 +03:00
Kirill Fedoseev	52e1c88b58	Include cDAI balance in balanceDiff (#613 )	2021-10-11 12:14:55 +03:00
Alexander Kolotov	d36dcadd34	Merge the develop branch to the master branch, preparation to v3.2.0 This merge contains the following set of changes: * [Oracle, Fix] Use more accurate gas estimates for very high message gas limits (#611) * [Common, Other] Final version of AMB and OB contracts security audit report by ChainSecurity (#608)	2021-10-07 21:45:51 +03:00
Kirill Fedoseev	d543dbb339	Use more accurate gas estimates for very high message gas limits (#611 )	2021-10-07 20:44:14 +03:00
Kirill Fedoseev	bd21cc163e	Merge pull request #608 from poanetwork/reports/chainsecurity-amb-6.0.0-ob-1.1.0-contracts AMB and OB contracts security audit report by ChainSecurity	2021-09-28 21:12:37 +03:00
Alexander Kolotov	4a0fc936a1	Final version of AMB and OB contracts security audit report by ChainSecurity	2021-09-28 20:39:04 +03:00
Alexander Kolotov	78564afabd	Merge the develop branch to the master branch, preparation to v3.1.0 This merge contains the following set of changes: * [Oracle, Improvement] Try to detect unsynced node state (#592) * [Oracle, Improvement] Allow to override JSON RPC error codes (#603) * [Oracle, Fix] Fix handling of Compound related Transfer events (#595) * [Oracle, Fix] Add new nonce-related error messages (#599) * [Deployment, Fix] .env template includes latest changes related to the oracle configuration (#601) * [Deployment, Fix] Improvements for the local logs configuration (#602) * [Common, Other] Update the contract's submodule to the release 6.0.0 (#600)	2021-09-20 23:56:37 +03:00
Kirill Fedoseev	70a2c30b4c	Fix imported ABI	2021-09-20 13:31:37 +03:00
Kirill Fedoseev	06a9586148	Update yarn.lock	2021-09-20 12:50:07 +03:00
Kirill Fedoseev	7379fe4190	Allow to override JSON RPC error codes (#603 )	2021-09-20 12:07:49 +03:00
Alexander Kolotov	e59766c5df	Update the contract's submodule to the release 6.0.0 (#600 )	2021-09-18 13:44:48 +03:00
Alexander Kolotov	fdb18a1a17	Improvements for the local logs configuration (#602 )	2021-09-18 13:42:29 +03:00
Alexander Kolotov	4412046f66	.env template includes latest changes related to the oracle configuration (#601 )	2021-09-18 13:41:56 +03:00
Kirill Fedoseev	0ff224ccd3	Add new nonce-related error messages (#599 )	2021-09-15 23:42:32 +03:00
Kirill Fedoseev	5cedacafe5	Fix handling of Compound related Transfer events (#595 )	2021-08-24 11:31:15 +03:00
Kirill Fedoseev	2e6179f974	Try to detect unsynced node state (#592 )	2021-08-03 23:36:50 +03:00
Alexander Kolotov	4f5e3c47be	Merge the develop branch to the master branch, preparation to v3.0.0 This merge contains the following set of changes: * [Oracle, Improvement] Async calls error codes (#587) * [Oracle, Improvement] Refactor/async call serializers (#588)	2021-07-16 17:58:21 +03:00
Kirill Fedoseev	4c06329153	Refactor/async call serializers (#588 )	2021-07-13 12:25:05 +03:00
Kirill Fedoseev	d53452675e	Async calls error codes (#587 )	2021-07-13 11:57:08 +03:00