Merge the develop branch to the master branch, preparation to v3.0.0-rc0

This merge contains the following set of changes:
  * [Oracle, Improvement] Oracle watcher for AMB async calls (#509), 
  * [Common, Other] Update the contract's submodule to the release 6.0.0-rc0 (#562)

.github/workflows/main.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/setup-node@v1
         with:
-          node-version: 10
+          node-version: 12
       - uses: actions/checkout@v2
         with:
           submodules: true
@@ -48,7 +48,7 @@ jobs:
     steps:
       - uses: actions/setup-node@v1
         with:
-          node-version: 10
+          node-version: 12
       - uses: actions/checkout@v2
         with:
           submodules: true
@@ -70,7 +70,7 @@ jobs:
       - name: Evaluate e2e docker images tags
         run: |
           git submodule status > submodule.status
-          echo "E2E_TAG=${{ hashFiles('yarn.lock', 'package.json', 'submodule.status', 'Dockerfile.e2e', 'commons', 'oracle-e2e', 'monitor-e2e') }}" >> $GITHUB_ENV
+          echo "E2E_TAG=${{ hashFiles('yarn.lock', 'package.json', 'submodule.status', 'Dockerfile.e2e', 'commons', 'oracle-e2e', 'monitor-e2e', 'e2e-commons') }}" >> $GITHUB_ENV
           echo "ORACLE_TAG=${{ hashFiles('yarn.lock', 'package.json', 'submodule.status', 'commons', 'oracle') }}" >> $GITHUB_ENV
           echo "MONITOR_TAG=${{ hashFiles('yarn.lock', 'package.json', 'submodule.status', 'commons', 'monitor') }}" >> $GITHUB_ENV
           echo "ALM_TAG=${{ hashFiles('yarn.lock', 'package.json', 'submodule.status', 'commons', 'alm') }}" >> $GITHUB_ENV
@@ -81,8 +81,8 @@ jobs:
           }
           updated=()
           if ! check_if_image_exists e2e ${E2E_TAG};         then updated+=("e2e"); fi
-          if ! check_if_image_exists oracle ${ORACLE_TAG};   then updated+=("oracle"); fi
-          if ! check_if_image_exists monitor ${MONITOR_TAG}; then updated+=("monitor"); fi
+          if ! check_if_image_exists oracle ${ORACLE_TAG};   then updated+=("oracle-amb"); fi
+          if ! check_if_image_exists monitor ${MONITOR_TAG}; then updated+=("monitor-amb"); fi
           if ! check_if_image_exists alm ${ALM_TAG};         then updated+=("alm"); fi
           if [ ${#updated[@]} -gt 0 ]; then
             echo "Updated services: ${updated[@]}"
@@ -133,7 +133,7 @@ jobs:
       - name: Evaluate e2e docker images tags
         run: |
           git submodule status > submodule.status
-          echo "E2E_TAG=${{ hashFiles('yarn.lock', 'package.json', 'submodule.status', 'Dockerfile.e2e', 'commons', 'oracle-e2e', 'monitor-e2e') }}" >> $GITHUB_ENV
+          echo "E2E_TAG=${{ hashFiles('yarn.lock', 'package.json', 'submodule.status', 'Dockerfile.e2e', 'commons', 'oracle-e2e', 'monitor-e2e', 'e2e-commons') }}" >> $GITHUB_ENV
           echo "ORACLE_TAG=${{ hashFiles('yarn.lock', 'package.json', 'submodule.status', 'commons', 'oracle') }}" >> $GITHUB_ENV
           echo "MONITOR_TAG=${{ hashFiles('yarn.lock', 'package.json', 'submodule.status', 'commons', 'monitor') }}" >> $GITHUB_ENV
           echo "ALM_TAG=${{ hashFiles('yarn.lock', 'package.json', 'submodule.status', 'commons', 'alm') }}" >> $GITHUB_ENV
@@ -176,15 +176,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        task: [amb, erc-to-erc, erc-to-native, native-to-erc]
+        task: [amb, erc-to-native]
     steps:
       - uses: actions/checkout@v2
         with:
           submodules: true
       - name: Evaluate e2e docker images tags
         run: |
           git submodule status > submodule.status
-          echo "E2E_TAG=${{ hashFiles('yarn.lock', 'package.json', 'submodule.status', 'Dockerfile.e2e', 'commons', 'oracle-e2e', 'monitor-e2e') }}" >> $GITHUB_ENV
+          echo "E2E_TAG=${{ hashFiles('yarn.lock', 'package.json', 'submodule.status', 'Dockerfile.e2e', 'commons', 'oracle-e2e', 'monitor-e2e', 'e2e-commons') }}" >> $GITHUB_ENV
           echo "ORACLE_TAG=${{ hashFiles('yarn.lock', 'package.json', 'submodule.status', 'commons', 'oracle') }}" >> $GITHUB_ENV
           echo "MONITOR_TAG=${{ hashFiles('yarn.lock', 'package.json', 'submodule.status', 'commons', 'monitor') }}" >> $GITHUB_ENV
           echo "ALM_TAG=${{ hashFiles('yarn.lock', 'package.json', 'submodule.status', 'commons', 'alm') }}" >> $GITHUB_ENV
@@ -202,7 +202,7 @@ jobs:
         run: ${{ steps.cache-repo.outputs.cache-hit }} && e2e-commons/up.sh deploy blocks
       - name: Pull e2e oracle image
         run: |
-         docker-compose -f ./e2e-commons/docker-compose.yml pull oracle
+         docker-compose -f ./e2e-commons/docker-compose.yml pull oracle-amb
          docker tag ${DOCKER_IMAGE_BASE}/tokenbridge-e2e-oracle:${ORACLE_TAG} poanetwork/tokenbridge-oracle:latest
       - name: Deploy oracle
         run: deployment-e2e/molecule.sh ultimate-${{ matrix.task }}

.nvmrc

@@ -1 +1 @@
-10.22
+12.22

CONFIGURATION.md

@@ -22,7 +22,7 @@ COMMON_FOREIGN_GAS_PRICE_FACTOR | A value that will multiply the gas price of th
 
 name | description | value
 --- | --- | ---
-ORACLE_BRIDGE_MODE | The bridge mode. The bridge starts listening to a different set of events based on this parameter. | NATIVE_TO_ERC / ERC_TO_ERC / ERC_TO_NATIVE / ARBITRARY_MESSAGE
+ORACLE_BRIDGE_MODE | The bridge mode. The bridge starts listening to a different set of events based on this parameter. | ERC_TO_NATIVE / ARBITRARY_MESSAGE
 ORACLE_ALLOW_HTTP_FOR_RPC | **Only use in test environments - must be omitted in production environments.**. If this parameter is specified and set to `yes`, RPC URLs can be specified in form of HTTP links. A warning that the connection is insecure will be written to the logs. | `yes` / `no`
 ORACLE_HOME_RPC_POLLING_INTERVAL | The interval in milliseconds used to request the RPC node in the Home network for new blocks. The interval should match the average production time for a new block. | integer
 ORACLE_FOREIGN_RPC_POLLING_INTERVAL | The interval in milliseconds used to request the RPC node in the Foreign network for new blocks. The interval should match the average production time for a new block. | integer
@@ -47,6 +47,7 @@ ORACLE_FOREIGN_TX_RESEND_INTERVAL | Interval in milliseconds for automatic resen
 ORACLE_SHUTDOWN_SERVICE_URL | Optional external URL to some other service/monitor/configuration manager that controls the remote shutdown process. GET request should return `application/json` message with the following schema: `{ shutdown: true/false }`. | URL
 ORACLE_SHUTDOWN_SERVICE_POLLING_INTERVAL | Optional interval in milliseconds used to request the side RPC node or external shutdown service. Default is 120000. | integer
 ORACLE_SIDE_RPC_URL | Optional HTTPS URL(s) for communication with the external shutdown service or side RPC nodes, used for shutdown manager activities. 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)
+ORACLE_FOREIGN_ARCHIVE_RPC_URL | Optional HTTPS URL(s) for communication with the archive nodes on the foreign network. Only used in AMB bridge mode for async information request processing. 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)
 ORACLE_SHUTDOWN_CONTRACT_ADDRESS | Optional contract address in the side chain accessible through `ORACLE_SIDE_RPC_URL`, where the method passed in `ORACLE_SHUTDOWN_CONTRACT_METHOD` is implemented. | `address`
 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`

Dockerfile.e2e

@@ -1,4 +1,4 @@
-FROM node:10 as contracts
+FROM node:12 as contracts
 
 WORKDIR /mono
 
@@ -11,7 +11,7 @@ COPY ./contracts/truffle-config.js ./
 COPY ./contracts/contracts ./contracts
 RUN npm run compile
 
-FROM node:10
+FROM node:12
 
 WORKDIR /mono
 COPY package.json .

README.md

@@ -54,8 +54,6 @@ Additionally there are [Smart Contracts](https://github.com/poanetwork/tokenbrid
 
 The POA TokenBridge provides four operational modes:
 
-- [x] `Native-to-ERC20` **Coins** on a Home network can be converted to ERC20-compatible **tokens** on a Foreign network. Coins are locked on the Home side and the corresponding amount of ERC20 tokens are minted on the Foreign side. When the operation is reversed, tokens are burnt on the Foreign side and unlocked in the Home network. **More Information: [POA-to-POA20 Bridge](https://medium.com/poa-network/introducing-poa-bridge-and-poa20-55d8b78058ac)**
-- [x] `ERC20-to-ERC20` ERC20-compatible tokens on the Foreign network are locked and minted as ERC20-compatible tokens (ERC677 tokens) on the Home network. When transferred from Home to Foreign, they are burnt on the Home side and unlocked in the Foreign network. This can be considered a form of atomic swap when a user swaps the token "X" in network "A" to the token "Y" in network "B". **More Information: [ERC20-to-ERC20](https://medium.com/poa-network/introducing-the-erc20-to-erc20-tokenbridge-ce266cc1a2d0)**
 - [x] `ERC20-to-Native`: Pre-existing **tokens** in the Foreign network are locked and **coins** are minted in the `Home` network. In this mode, the Home network consensus engine invokes [Parity's Block Reward contract](https://wiki.parity.io/Block-Reward-Contract.html) to mint coins per the bridge contract request. **More Information: [xDai Chain](https://medium.com/poa-network/poa-network-partners-with-makerdao-on-xdai-chain-the-first-ever-usd-stable-blockchain-65a078c41e6a)**
 - [x] `Arbitrary-Message`: Transfer arbitrary data between two networks as so the data could be interpreted as an arbitrary contract method invocation.
 

alm-e2e/package.json

@@ -19,6 +19,6 @@
     "eslint-plugin-jest": "^23.18.0"
   },
   "engines": {
-    "node": ">= 10.18"
+    "node": ">= 12.22"
   }
 }

alm-e2e/src/test.js

@@ -6,8 +6,8 @@ jest.setTimeout(60000)
 const statusText = 'Success'
 const statusSelector = 'label[data-id="status"]'
 
-const homeToForeignTxURL = 'http://localhost:3004/77/0x58e7d63368335b9591d4dbb43889084f698fcee93ab7656fd7a39d8c66bc4b60'
-const foreignToHomeTxURL = 'http://localhost:3004/42/0x592bf28fc896419d2838f71cd0388775814b692688f1ecd5b1519081566b994a'
+const homeToForeignTxURL = 'http://localhost:3004/77/0xbc83d43bdc675a615a2b820e43e52d25857aa5fdd77acf2dd92cd247af2c693c'
+const foreignToHomeTxURL = 'http://localhost:3004/42/0x09dfb947dbd17e27bcc117773b6e133829f7cef9646199a93ef019c4f7c0fec6'
 
 describe('ALM', () => {
   let browser

alm/Dockerfile

@@ -1,4 +1,4 @@
-FROM node:10 as contracts
+FROM node:12 as contracts
 
 WORKDIR /mono
 

commons/abis.js

@@ -1,57 +1,17 @@
-const HOME_NATIVE_TO_ERC_ABI = require('../contracts/build/contracts/HomeBridgeNativeToErc').abi
-const FOREIGN_NATIVE_TO_ERC_ABI = require('../contracts/build/contracts/ForeignBridgeNativeToErc').abi
-const HOME_ERC_TO_ERC_ABI = require('../contracts/build/contracts/HomeBridgeErcToErc').abi
-const FOREIGN_ERC_TO_ERC_ABI = require('../contracts/build/contracts/ForeignBridgeErc677ToErc677').abi
 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 ERC20_ABI = require('../contracts/build/contracts/ERC20').abi
-const ERC677_ABI = require('../contracts/build/contracts/ERC677').abi
-const ERC677_BRIDGE_TOKEN_ABI = require('../contracts/build/contracts/ERC677BridgeToken').abi
-const BLOCK_REWARD_ABI = require('../contracts/build/contracts/BlockReward').abi
+const BLOCK_REWARD_ABI = require('../contracts/build/contracts/BlockRewardMock').abi
 const BRIDGE_VALIDATORS_ABI = require('../contracts/build/contracts/BridgeValidators').abi
 const REWARDABLE_VALIDATORS_ABI = require('../contracts/build/contracts/RewardableValidators').abi
 const HOME_AMB_ABI = require('../contracts/build/contracts/HomeAMB').abi
 const FOREIGN_AMB_ABI = require('../contracts/build/contracts/ForeignAMB').abi
 const BOX_ABI = require('../contracts/build/contracts/Box').abi
 const HOME_AMB_ERC_TO_ERC_ABI = require('../contracts/build/contracts/HomeAMBErc677ToErc677').abi
 const FOREIGN_AMB_ERC_TO_ERC_ABI = require('../contracts/build/contracts/ForeignAMBErc677ToErc677').abi
-const HOME_STAKE_ERC_TO_ERC_ABI = require('../contracts/build/contracts/HomeStakeTokenMediator').abi
-const FOREIGN_STAKE_ERC_TO_ERC_ABI = require('../contracts/build/contracts/ForeignStakeTokenMediator').abi
 
-const { HOME_V1_ABI, FOREIGN_V1_ABI } = require('./v1Abis')
 const { BRIDGE_MODES } = require('./constants')
 
-const ERC20_BYTES32_ABI = [
-  {
-    constant: true,
-    inputs: [],
-    name: 'name',
-    outputs: [
-      {
-        name: '',
-        type: 'bytes32'
-      }
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function'
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: 'symbol',
-    outputs: [
-      {
-        name: '',
-        type: 'bytes32'
-      }
-    ],
-    payable: false,
-    stateMutability: 'view',
-    type: 'function'
-  }
-]
-
 const OLD_AMB_USER_REQUEST_FOR_SIGNATURE_ABI = [
   {
     anonymous: false,
@@ -85,27 +45,15 @@ const OLD_AMB_USER_REQUEST_FOR_AFFIRMATION_ABI = [
 function getBridgeABIs(bridgeMode) {
   let HOME_ABI = null
   let FOREIGN_ABI = null
-  if (bridgeMode === BRIDGE_MODES.NATIVE_TO_ERC) {
-    HOME_ABI = HOME_NATIVE_TO_ERC_ABI
-    FOREIGN_ABI = FOREIGN_NATIVE_TO_ERC_ABI
-  } else if (bridgeMode === BRIDGE_MODES.ERC_TO_ERC) {
-    HOME_ABI = HOME_ERC_TO_ERC_ABI
-    FOREIGN_ABI = FOREIGN_ERC_TO_ERC_ABI
-  } else if (bridgeMode === BRIDGE_MODES.ERC_TO_NATIVE) {
+  if (bridgeMode === BRIDGE_MODES.ERC_TO_NATIVE) {
     HOME_ABI = HOME_ERC_TO_NATIVE_ABI
     FOREIGN_ABI = FOREIGN_ERC_TO_NATIVE_ABI
-  } else if (bridgeMode === BRIDGE_MODES.NATIVE_TO_ERC_V1) {
-    HOME_ABI = HOME_V1_ABI
-    FOREIGN_ABI = FOREIGN_V1_ABI
   } else if (bridgeMode === BRIDGE_MODES.ARBITRARY_MESSAGE) {
     HOME_ABI = HOME_AMB_ABI
     FOREIGN_ABI = FOREIGN_AMB_ABI
   } else if (bridgeMode === BRIDGE_MODES.AMB_ERC_TO_ERC) {
     HOME_ABI = HOME_AMB_ERC_TO_ERC_ABI
     FOREIGN_ABI = FOREIGN_AMB_ERC_TO_ERC_ABI
-  } else if (bridgeMode === BRIDGE_MODES.STAKE_AMB_ERC_TO_ERC) {
-    HOME_ABI = HOME_STAKE_ERC_TO_ERC_ABI
-    FOREIGN_ABI = FOREIGN_STAKE_ERC_TO_ERC_ABI
   } else {
     throw new Error(`Unrecognized bridge mode: ${bridgeMode}`)
   }
@@ -115,26 +63,15 @@ function getBridgeABIs(bridgeMode) {
 
 module.exports = {
   getBridgeABIs,
-  HOME_NATIVE_TO_ERC_ABI,
-  FOREIGN_NATIVE_TO_ERC_ABI,
-  HOME_ERC_TO_ERC_ABI,
-  FOREIGN_ERC_TO_ERC_ABI,
   HOME_ERC_TO_NATIVE_ABI,
   FOREIGN_ERC_TO_NATIVE_ABI,
   ERC20_ABI,
-  ERC677_ABI,
-  ERC677_BRIDGE_TOKEN_ABI,
   BLOCK_REWARD_ABI,
   BRIDGE_VALIDATORS_ABI,
   REWARDABLE_VALIDATORS_ABI,
-  HOME_V1_ABI,
-  FOREIGN_V1_ABI,
-  ERC20_BYTES32_ABI,
   HOME_AMB_ABI,
   FOREIGN_AMB_ABI,
   OLD_AMB_USER_REQUEST_FOR_AFFIRMATION_ABI,
   OLD_AMB_USER_REQUEST_FOR_SIGNATURE_ABI,
-  BOX_ABI,
-  HOME_STAKE_ERC_TO_ERC_ABI,
-  FOREIGN_STAKE_ERC_TO_ERC_ABI
+  BOX_ABI
 }

commons/constants.js

@@ -1,30 +1,12 @@
 const BRIDGE_MODES = {
-  NATIVE_TO_ERC: 'NATIVE_TO_ERC',
-  ERC_TO_ERC: 'ERC_TO_ERC',
   ERC_TO_NATIVE: 'ERC_TO_NATIVE',
-  NATIVE_TO_ERC_V1: 'NATIVE_TO_ERC_V1',
   ARBITRARY_MESSAGE: 'ARBITRARY_MESSAGE',
-  AMB_ERC_TO_ERC: 'AMB_ERC_TO_ERC',
-  STAKE_AMB_ERC_TO_ERC: 'STAKE_AMB_ERC_TO_ERC'
-}
-
-const ERC_TYPES = {
-  ERC20: 'ERC20',
-  ERC677: 'ERC677'
-}
-
-const FEE_MANAGER_MODE = {
-  ONE_DIRECTION: 'ONE_DIRECTION',
-  BOTH_DIRECTIONS: 'BOTH_DIRECTIONS',
-  ONE_DIRECTION_STAKE: 'ONE_DIRECTION_STAKE',
-  UNDEFINED: 'UNDEFINED'
+  AMB_ERC_TO_ERC: 'AMB_ERC_TO_ERC'
 }
 
 const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'
 
 module.exports = {
   BRIDGE_MODES,
-  ERC_TYPES,
-  FEE_MANAGER_MODE,
   ZERO_ADDRESS
 }

commons/package.json

@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "gas-price-oracle": "^0.1.5",
-    "web3-utils": "1.0.0-beta.34"
+    "web3-utils": "^1.3.0"
   },
   "devDependencies": {
     "bn-chai": "^1.0.1",

commons/test/constants.test.js

@@ -1,12 +1,8 @@
 const { expect } = require('chai')
-const { BRIDGE_MODES, ERC_TYPES } = require('../constants')
+const { BRIDGE_MODES } = require('../constants')
 
 describe('constants', () => {
   it('should contain correct number of bridge types', () => {
-    expect(Object.keys(BRIDGE_MODES).length).to.be.equal(7)
-  })
-
-  it('should contain correct number of erc types', () => {
-    expect(Object.keys(ERC_TYPES).length).to.be.equal(2)
+    expect(Object.keys(BRIDGE_MODES).length).to.be.equal(3)
   })
 })