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)

Author: akolotov

.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"

CONFIGURATION.md

@@ -52,6 +52,7 @@ 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`
 
 
 ## Monitor configuration

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

contracts

@@ -1,14 +1,14 @@
 /var/log/docker/*/docker.log {
   rotate 5
-  size 1G
+  size 100M
   compress
   missingok
   delaycompress
   copytruncate
 }
 /var/log/docker/*.log {
   rotate 5
-  size 1G
+  size 100M
   compress
   missingok
   delaycompress

deployment/roles/common/templates/docker-logs.j2

@@ -7,14 +7,30 @@
   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
     owner: root
     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

deployment/roles/oracle/tasks/logging.yml

@@ -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('') != '' %}

deployment/roles/oracle/templates/.env.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

deployment/roles/oracle/templates/32-redis-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

deployment/roles/oracle/templates/33-rabbit-docker.conf.j2

@@ -38,7 +38,7 @@
   "ercToNativeBridge": {
     "home": "0x5118AC62AE912Dd5B51EEfF7338c4fcb0248Ba8c",
     "foreign": "0x32198D570fffC7033641F8A9094FFDCaAEF42624",
-    "foreignToken": "0x7cc4b1851c35959d34e635a470f6b5c43ba3c9c9",
+    "foreignToken": "0x6B175474E89094C44Da98b954EedeAC495271d0F",
     "monitor": "http://monitor-erc20-native:3012/bridge"
   },
   "amb": {

e2e-commons/constants.json

@@ -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"

e2e-commons/contracts-envs/erc-to-native.env

@@ -46,24 +46,6 @@ 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
@@ -85,29 +67,16 @@ async function main(bridgeMode, eventsInfo) {
     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)

monitor/getBalances.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
     )
 

monitor/utils/events.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 => {