Remove deprecated CHAI swap worker

.github/workflows/main.yml

@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: 10
       - uses: actions/checkout@v2
         with:
           submodules: true
@@ -48,7 +48,7 @@ jobs:
     steps:
       - uses: actions/setup-node@v1
         with:
-          node-version: 12
+          node-version: 10
       - uses: actions/checkout@v2
         with:
           submodules: true
@@ -70,19 +70,19 @@ 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', 'e2e-commons') }}" >> $GITHUB_ENV
+          echo "E2E_TAG=${{ hashFiles('yarn.lock', 'package.json', 'submodule.status', 'Dockerfile.e2e', 'commons', 'oracle-e2e', 'monitor-e2e') }}" >> $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
       - name: Rebuild and push updated images
         run: |
           function check_if_image_exists() {
-            curl -fsSlL "https://${{ github.actor }}:${{ github.token }}@${DOCKER_REGISTRY}/v2/${DOCKER_REPO}/tokenbridge-e2e-$1/manifests/$2" > /dev/null
+            curl -fsSlL -H 'Authorization: bearer ${{ github.token }}' "https://${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
-          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 oracle ${ORACLE_TAG};   then updated+=("oracle"); fi
+          if ! check_if_image_exists monitor ${MONITOR_TAG}; then updated+=("monitor"); fi
           if ! check_if_image_exists alm ${ALM_TAG};         then updated+=("alm"); fi
           if [ ${#updated[@]} -gt 0 ]; then
             echo "Updated services: ${updated[@]}"
@@ -104,7 +104,7 @@ jobs:
       - name: Rebuild and push molecule runner e2e image
         run: |
           function check_if_image_exists() {
-            curl -fsSlL "https://${{ github.actor }}:${{ github.token }}@${DOCKER_REGISTRY}/v2/${DOCKER_REPO}/tokenbridge-e2e-$1/manifests/$2" > /dev/null
+            curl -fsSlL -H 'Authorization: bearer ${{ github.token }}' "https://${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"
@@ -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', 'e2e-commons') }}" >> $GITHUB_ENV
+          echo "E2E_TAG=${{ hashFiles('yarn.lock', 'package.json', 'submodule.status', 'Dockerfile.e2e', 'commons', 'oracle-e2e', 'monitor-e2e') }}" >> $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
@@ -149,12 +149,6 @@ jobs:
         run: docker login ${DOCKER_REGISTRY} -u ${{ github.actor }} -p ${{ github.token }}
       - name: yarn run ${{ matrix.task }}
         run: ${{ !matrix.use-cache || steps.cache-repo.outputs.cache-hit }} && yarn run ${{ matrix.task }}
-      - name: Upload logs
-        if: always()
-        uses: actions/upload-artifact@v2
-        with:
-          name: logs-${{ matrix.task }}
-          path: e2e-commons/logs
   deployment:
     runs-on: ubuntu-latest
     needs:
@@ -182,7 +176,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        task: [amb, erc-to-native]
+        task: [amb, erc-to-erc, erc-to-native, native-to-erc]
     steps:
       - uses: actions/checkout@v2
         with:
@@ -190,7 +184,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', 'e2e-commons') }}" >> $GITHUB_ENV
+          echo "E2E_TAG=${{ hashFiles('yarn.lock', 'package.json', 'submodule.status', 'Dockerfile.e2e', 'commons', 'oracle-e2e', 'monitor-e2e') }}" >> $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
@@ -205,10 +199,10 @@ jobs:
       - name: Login to docker registry
         run: docker login ${DOCKER_REGISTRY} -u ${{ github.actor }} -p ${{ github.token }}
       - name: Deploy contracts
-        run: ${{ steps.cache-repo.outputs.cache-hit }} && e2e-commons/up.sh deploy generate-amb-tx blocks
+        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-amb
+         docker-compose -f ./e2e-commons/docker-compose.yml pull oracle
          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 }}
@@ -216,12 +210,3 @@ jobs:
         run: sudo chown -R $USER:docker /var/run/docker.sock
       - name: Run oracle e2e tests
         run: docker-compose -f ./e2e-commons/docker-compose.yml run -e ULTIMATE=true e2e yarn workspace oracle-e2e run ${{ matrix.task }}
-      - name: Save logs
-        if: always()
-        run: e2e-commons/down.sh
-      - name: Upload logs
-        if: always()
-        uses: actions/upload-artifact@v2
-        with:
-          name: logs-ultimate-${{ matrix.task }}
-          path: e2e-commons/logs

.nvmrc

@@ -1 +1 @@
-12.22
+10.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. | 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. | NATIVE_TO_ERC / ERC_TO_ERC / 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,14 +47,10 @@ 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`
 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_VALIDATOR_KEYSTORE_PATH | Path to the keystore v3 json file with the encrypted validator key. | `string`  
-ORACLE_VALIDATOR_KEYSTORE_PASSWORD | Password from the provided keystore file, oracle won't startup properly, if the provided password is invalid | `string`
 
 
 ## Monitor configuration

Dockerfile.e2e

@@ -1,4 +1,4 @@
-FROM node:12 as contracts
+FROM node:10 as contracts
 
 WORKDIR /mono
 
@@ -11,7 +11,7 @@ COPY ./contracts/truffle-config.js ./
 COPY ./contracts/contracts ./contracts
 RUN npm run compile
 
-FROM node:12
+FROM node:10
 
 WORKDIR /mono
 COPY package.json .
@@ -19,7 +19,6 @@ 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

README.md

@@ -54,6 +54,8 @@ 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": ">= 12.22"
+    "node": ">= 10.18"
   }
 }

alm-e2e/run-tests.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 cd $(dirname $0)
 
-../e2e-commons/up.sh deploy generate-amb-tx blocks alm alm-e2e
+../e2e-commons/up.sh deploy blocks alm alm-e2e
 
 # run oracle amb e2e tests to generate transactions for alm
 docker-compose -f ../e2e-commons/docker-compose.yml run e2e yarn workspace oracle-e2e run alm

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/0x295efbe6ae98937ef35d939376c9bd752b4dc6f6899a9d5ddd6a57cea3d76c89'
-const foreignToHomeTxURL = 'http://localhost:3004/42/0x7262f7dbe6c30599edded2137fbbe93c271b37f5c54dd27f713f0cf510e3b4dd'
+const homeToForeignTxURL = 'http://localhost:3004/77/0x58e7d63368335b9591d4dbb43889084f698fcee93ab7656fd7a39d8c66bc4b60'
+const foreignToHomeTxURL = 'http://localhost:3004/42/0x592bf28fc896419d2838f71cd0388775814b692688f1ecd5b1519081566b994a'
 
 describe('ALM', () => {
   let browser

alm/Dockerfile

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

alm/src/abis/ForeignAMB.ts

@@ -123,24 +123,6 @@ const abi: AbiItem[] = [
     stateMutability: 'nonpayable',
     type: 'function'
   },
-  {
-    constant: false,
-    inputs: [
-      {
-        name: '_data',
-        type: 'bytes'
-      },
-      {
-        name: '_signatures',
-        type: 'bytes'
-      }
-    ],
-    name: 'safeExecuteSignaturesWithAutoGasLimit',
-    outputs: [],
-    payable: false,
-    stateMutability: 'nonpayable',
-    type: 'function'
-  },
   {
     constant: true,
     inputs: [

alm/src/components/ExecutionConfirmation.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react'
+import React from 'react'
 import { formatTimestamp, formatTxHash, getExplorerTxUrl } from '../utils/networks'
 import { useWindowWidth } from '@react-hook/window-size'
 import { SEARCHING_TX, VALIDATOR_CONFIRMATION_STATUS, ALM_HOME_TO_FOREIGN_MANUAL_EXECUTION } from '../config/constants'
@@ -9,7 +9,6 @@ import { GreyLabel, RedLabel, SuccessLabel } from './commons/Labels'
 import { ExplorerTxLink } from './commons/ExplorerTxLink'
 import { Thead, AgeTd, StatusTd } from './commons/Table'
 import { ManualExecutionButton } from './ManualExecutionButton'
-import { useStateProvider } from '../state/StateProvider'
 
 const StyledExecutionConfirmation = styled.div`
   margin-top: 30px;
@@ -34,8 +33,6 @@ export const ExecutionConfirmation = ({
   executionEventsFetched,
   setPendingExecution
 }: ExecutionConfirmationParams) => {
-  const { foreign } = useStateProvider()
-  const [safeExecutionAvailable, setSafeExecutionAvailable] = useState(false)
   const availableManualExecution =
     !isHome &&
     (executionData.status === VALIDATOR_CONFIRMATION_STATUS.WAITING ||
@@ -51,22 +48,6 @@ export const ExecutionConfirmation = ({
   const formattedValidator =
     windowWidth < 850 && executionData.validator ? formatTxHash(executionData.validator) : executionData.validator
 
-  useEffect(
-    () => {
-      if (!availableManualExecution || !foreign.bridgeContract) return
-
-      const p = foreign.bridgeContract.methods.getBridgeInterfacesVersion().call()
-      p.then(({ major, minor }: any) => {
-        major = parseInt(major, 10)
-        minor = parseInt(minor, 10)
-        if (major < 5 || (major === 5 && minor < 7)) return
-
-        setSafeExecutionAvailable(true)
-      })
-    },
-    [availableManualExecution, foreign.bridgeContract]
-  )
-
   const getExecutionStatusElement = (validatorStatus = '') => {
     switch (validatorStatus) {
       case VALIDATOR_CONFIRMATION_STATUS.SUCCESS:
@@ -124,7 +105,6 @@ export const ExecutionConfirmation = ({
             {availableManualExecution && (
               <td>
                 <ManualExecutionButton
-                  safeExecutionAvailable={safeExecutionAvailable}
                   messageData={messageData}
                   setExecutionData={setExecutionData}
                   signatureCollected={signatureCollected as string[]}

alm/src/components/ManualExecutionButton.tsx

@@ -15,19 +15,16 @@ import { signatureToVRS, packSignatures } from '../utils/signatures'
 import { getSuccessExecutionData } from '../utils/getFinalizationEvent'
 import { TransactionReceipt } from 'web3-eth'
 
-const ActionButton = styled.button`
+const StyledButton = styled.button`
   color: var(--button-color);
   border-color: var(--font-color);
   margin-top: 10px;
-  min-width: 120px;
-  padding: 1rem;
   &:focus {
     outline: var(--button-color);
   }
 `
 
 interface ManualExecutionButtonParams {
-  safeExecutionAvailable: boolean
   messageData: string
   setExecutionData: Function
   signatureCollected: string[]
@@ -35,7 +32,6 @@ interface ManualExecutionButtonParams {
 }
 
 export const ManualExecutionButton = ({
-  safeExecutionAvailable,
   messageData,
   setExecutionData,
   signatureCollected,
@@ -44,8 +40,6 @@ export const ManualExecutionButton = ({
   const { foreign, setError } = useStateProvider()
   const { library, activate, account, active } = useWeb3React()
   const [manualExecution, setManualExecution] = useState(false)
-  const [allowFailures, setAllowFailures] = useState(false)
-  const notReady = !foreign.bridgeContract || !signatureCollected || !signatureCollected.length
 
   useEffect(
     () => {
@@ -78,11 +72,7 @@ export const ManualExecutionButton = ({
       const signatures = packSignatures(signatureCollected.map(signatureToVRS))
       const messageId = messageData.slice(0, 66)
       const bridge = foreign.bridgeContract
-      const executeMethod =
-        safeExecutionAvailable && !allowFailures
-          ? bridge.methods.safeExecuteSignaturesWithAutoGasLimit
-          : bridge.methods.executeSignatures
-      const data = executeMethod(messageData, signatures).encodeABI()
+      const data = bridge.methods.executeSignatures(messageData, signatures).encodeABI()
       setManualExecution(false)
 
       library.eth
@@ -142,35 +132,15 @@ export const ManualExecutionButton = ({
       messageData,
       signatureCollected,
       setExecutionData,
-      setPendingExecution,
-      safeExecutionAvailable,
-      allowFailures
+      setPendingExecution
     ]
   )
 
   return (
-    <div>
-      <div className="is-center">
-        <ActionButton disabled={notReady} className="button outline" onClick={() => setManualExecution(true)}>
-          Execute
-        </ActionButton>
-      </div>
-      {safeExecutionAvailable && (
-        <div
-          title="Allow executed message to fail and record its failure on-chain without reverting the whole transaction.
-          Use fixed gas limit for execution."
-          className="is-center"
-          style={{ paddingTop: 10 }}
-        >
-          <input
-            type="checkbox"
-            id="allow-failures"
-            checked={allowFailures}
-            onChange={e => setAllowFailures(e.target.checked)}
-          />
-          <label htmlFor="allow-failures">Unsafe mode</label>
-        </div>
-      )}
+    <div className="is-center">
+      <StyledButton className="button outline" onClick={() => setManualExecution(true)}>
+        Execute
+      </StyledButton>
     </div>
   )
 }

alm/src/utils/getConfirmationsForTx.ts

@@ -86,14 +86,6 @@ 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(
@@ -123,6 +115,15 @@ 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

commons/abis.js

@@ -1,7 +1,13 @@
+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/XDaiForeignBridge.json').abi
+const FOREIGN_ERC_TO_NATIVE_ABI = require('../contracts/build/contracts/ForeignBridgeErcToNative').abi
 const ERC20_ABI = require('../contracts/build/contracts/ERC20').abi
-const BLOCK_REWARD_ABI = require('../contracts/build/contracts/BlockRewardMock').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 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
@@ -9,9 +15,43 @@ 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,
@@ -45,15 +85,27 @@ const OLD_AMB_USER_REQUEST_FOR_AFFIRMATION_ABI = [
 function getBridgeABIs(bridgeMode) {
   let HOME_ABI = null
   let FOREIGN_ABI = null
-  if (bridgeMode === BRIDGE_MODES.ERC_TO_NATIVE) {
+  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) {
     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}`)
   }
@@ -63,15 +115,26 @@ 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
+  BOX_ABI,
+  HOME_STAKE_ERC_TO_ERC_ABI,
+  FOREIGN_STAKE_ERC_TO_ERC_ABI
 }

commons/constants.js

@@ -1,12 +1,30 @@
 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'
+  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'
 }
 
 const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'
 
 module.exports = {
   BRIDGE_MODES,
+  ERC_TYPES,
+  FEE_MANAGER_MODE,
   ZERO_ADDRESS
 }

commons/message.js

@@ -1,5 +1,3 @@
-const { soliditySha3 } = require('web3-utils')
-
 function strip0x(input) {
   return input.replace(/^0x/, '')
 }
@@ -41,35 +39,8 @@ const normalizeAMBMessageEvent = e => {
   return parseAMBMessage(msgData)
 }
 
-const ambInformationSignatures = [
-  'eth_call(address,bytes)',
-  'eth_call(address,bytes,uint256)',
-  'eth_call(address,address,uint256,bytes)',
-  'eth_blockNumber()',
-  'eth_getBlockByNumber()',
-  'eth_getBlockByNumber(uint256)',
-  'eth_getBlockByHash(bytes32)',
-  'eth_getBalance(address)',
-  'eth_getBalance(address,uint256)',
-  'eth_getTransactionCount(address)',
-  'eth_getTransactionCount(address,uint256)',
-  'eth_getTransactionByHash(bytes32)',
-  'eth_getTransactionReceipt(bytes32)',
-  'eth_getStorageAt(address,bytes32)',
-  'eth_getStorageAt(address,bytes32,uint256)'
-]
-const ambInformationSelectors = Object.fromEntries(ambInformationSignatures.map(sig => [soliditySha3(sig), sig]))
-const normalizeAMBInfoRequest = e => ({
-  messageId: e.returnValues.messageId,
-  sender: e.returnValues.sender,
-  requestSelector: ambInformationSelectors[e.returnValues.requestSelector] || 'unknown',
-  data: e.returnValues.data
-})
-
 module.exports = {
   strip0x,
   parseAMBMessage,
-  normalizeAMBMessageEvent,
-  ambInformationSignatures,
-  normalizeAMBInfoRequest
+  normalizeAMBMessageEvent
 }

commons/package.json

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

commons/test/constants.test.js

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

commons/test/getTokenType.js

@@ -0,0 +1,159 @@
+const { expect } = require('chai')
+const { getTokenType, ERC_TYPES } = require('..')
+
+describe('getTokenType', () => {
+  it('should return ERC677 if bridgeContract is equal to bridgeAddress', async () => {
+    // Given
+    const bridgeAddress = '0xCecBE80Ed3548dE11D7d2D922a36576eA40C4c26'
+    const contract = {
+      methods: {
+        bridgeContract: () => {
+          return {
+            call: () => Promise.resolve(bridgeAddress)
+          }
+        }
+      }
+    }
+
+    // When
+    const type = await getTokenType(contract, bridgeAddress)
+
+    // Then
+    expect(type).to.equal(ERC_TYPES.ERC677)
+  })
+
+  it('should return ERC20 if bridgeContract is not equal to bridgeAddress', async () => {
+    // Given
+    const bridgeAddress = '0xCecBE80Ed3548dE11D7d2D922a36576eA40C4c26'
+    const contract = {
+      methods: {
+        bridgeContract: () => {
+          return {
+            call: () => Promise.resolve('0xBFCb120F7B1de491262CA4D9D8Eba70438b6896E')
+          }
+        }
+      }
+    }
+
+    // When
+    const type = await getTokenType(contract, bridgeAddress)
+
+    // Then
+    expect(type).to.equal(ERC_TYPES.ERC20)
+  })
+
+  it('should return ERC20 if bridgeContract is not present', async () => {
+    // Given
+    const bridgeAddress = '0xCecBE80Ed3548dE11D7d2D922a36576eA40C4c26'
+    const contract = {
+      methods: {
+        bridgeContract: () => {
+          return {
+            call: () => Promise.reject()
+          }
+        }
+      }
+    }
+
+    // When
+    const type = await getTokenType(contract, bridgeAddress)
+
+    // Then
+    expect(type).to.equal(ERC_TYPES.ERC20)
+  })
+
+  it('should return ERC20 if bridgeContract and isBridge are not present', async () => {
+    // Given
+    const bridgeAddress = '0xCecBE80Ed3548dE11D7d2D922a36576eA40C4c26'
+    const contract = {
+      methods: {
+        bridgeContract: () => {
+          return {
+            call: () => Promise.reject()
+          }
+        },
+        isBridge: () => {
+          return {
+            call: () => Promise.reject()
+          }
+        }
+      }
+    }
+
+    // When
+    const type = await getTokenType(contract, bridgeAddress)
+
+    // Then
+    expect(type).to.equal(ERC_TYPES.ERC20)
+  })
+
+  it('should return ERC677 if isBridge returns true', async () => {
+    // Given
+    const bridgeAddress = '0xCecBE80Ed3548dE11D7d2D922a36576eA40C4c26'
+    const contract = {
+      methods: {
+        bridgeContract: () => {
+          return {
+            call: () => Promise.reject()
+          }
+        },
+        isBridge: () => {
+          return {
+            call: () => Promise.resolve(true)
+          }
+        }
+      }
+    }
+
+    // When
+    const type = await getTokenType(contract, bridgeAddress)
+
+    // Then
+    expect(type).to.equal(ERC_TYPES.ERC677)
+  })
+
+  it('should return ERC677 if isBridge returns true and bridgeContract not present', async () => {
+    // Given
+    const bridgeAddress = '0xCecBE80Ed3548dE11D7d2D922a36576eA40C4c26'
+    const contract = {
+      methods: {
+        isBridge: () => {
+          return {
+            call: () => Promise.resolve(true)
+          }
+        }
+      }
+    }
+
+    // When
+    const type = await getTokenType(contract, bridgeAddress)
+
+    // Then
+    expect(type).to.equal(ERC_TYPES.ERC677)
+  })
+
+  it('should return ERC20 if isBridge returns false', async () => {
+    // Given
+    const bridgeAddress = '0xCecBE80Ed3548dE11D7d2D922a36576eA40C4c26'
+    const contract = {
+      methods: {
+        bridgeContract: () => {
+          return {
+            call: () => Promise.reject()
+          }
+        },
+        isBridge: () => {
+          return {
+            call: () => Promise.resolve(false)
+          }
+        }
+      }
+    }
+
+    // When
+    const type = await getTokenType(contract, bridgeAddress)
+
+    // Then
+    expect(type).to.equal(ERC_TYPES.ERC20)
+  })
+})

commons/utils.js

@@ -1,17 +1,22 @@
 const { toWei, toBN, BN } = require('web3-utils')
 const { GasPriceOracle } = require('gas-price-oracle')
-const fetch = require('node-fetch')
-const { BRIDGE_MODES } = require('./constants')
+const { BRIDGE_MODES, FEE_MANAGER_MODE, ERC_TYPES } = require('./constants')
 const { REWARDABLE_VALIDATORS_ABI } = require('./abis')
 
 const gasPriceOracle = new GasPriceOracle()
 
 function decodeBridgeMode(bridgeModeHash) {
   switch (bridgeModeHash) {
+    case '0x92a8d7fe':
+      return BRIDGE_MODES.NATIVE_TO_ERC
+    case '0xba4690f5':
+      return BRIDGE_MODES.ERC_TO_ERC
     case '0x18762d46':
       return BRIDGE_MODES.ERC_TO_NATIVE
     case '0x2544fbb9':
       return BRIDGE_MODES.ARBITRARY_MESSAGE
+    case '0x16ea01e9':
+      return BRIDGE_MODES.STAKE_AMB_ERC_TO_ERC
     case '0x76595b56':
       return BRIDGE_MODES.AMB_ERC_TO_ERC
     default:
@@ -19,9 +24,80 @@ function decodeBridgeMode(bridgeModeHash) {
   }
 }
 
+const decodeFeeManagerMode = managerModeHash => {
+  switch (managerModeHash) {
+    case '0xf2aed8f7':
+      return FEE_MANAGER_MODE.ONE_DIRECTION
+    case '0xd7de965f':
+      return FEE_MANAGER_MODE.BOTH_DIRECTIONS
+    default:
+      throw new Error(`Unrecognized fee manager mode hash: '${managerModeHash}'`)
+  }
+}
+
 async function getBridgeMode(contract) {
-  const bridgeModeHash = await contract.methods.getBridgeMode().call()
-  return decodeBridgeMode(bridgeModeHash)
+  try {
+    const bridgeModeHash = await contract.methods.getBridgeMode().call()
+    return decodeBridgeMode(bridgeModeHash)
+  } catch (e) {
+    return BRIDGE_MODES.NATIVE_TO_ERC_V1
+  }
+}
+
+const getTokenType = async (bridgeTokenContract, bridgeAddress) => {
+  try {
+    const resultBridgeAddress = await bridgeTokenContract.methods.bridgeContract().call()
+    if (resultBridgeAddress === bridgeAddress) {
+      return ERC_TYPES.ERC677
+    } else {
+      return ERC_TYPES.ERC20
+    }
+  } catch (e) {
+    try {
+      const isBridge = await bridgeTokenContract.methods.isBridge(bridgeAddress).call()
+      if (isBridge) {
+        return ERC_TYPES.ERC677
+      } else {
+        return ERC_TYPES.ERC20
+      }
+    } catch (e) {
+      return ERC_TYPES.ERC20
+    }
+  }
+}
+
+const isErcToErcMode = bridgeMode => {
+  return (
+    bridgeMode === BRIDGE_MODES.ERC_TO_ERC ||
+    bridgeMode === BRIDGE_MODES.AMB_ERC_TO_ERC ||
+    bridgeMode === BRIDGE_MODES.STAKE_AMB_ERC_TO_ERC
+  )
+}
+
+const isMediatorMode = bridgeMode => {
+  return bridgeMode === BRIDGE_MODES.AMB_ERC_TO_ERC || bridgeMode === BRIDGE_MODES.STAKE_AMB_ERC_TO_ERC
+}
+
+const getUnit = bridgeMode => {
+  let unitHome = null
+  let unitForeign = null
+  if (bridgeMode === BRIDGE_MODES.NATIVE_TO_ERC) {
+    unitHome = 'Native coins'
+    unitForeign = 'Tokens'
+  } else if (bridgeMode === BRIDGE_MODES.ERC_TO_ERC) {
+    unitHome = 'Tokens'
+    unitForeign = 'Tokens'
+  } else if (bridgeMode === BRIDGE_MODES.ERC_TO_NATIVE) {
+    unitHome = 'Native coins'
+    unitForeign = 'Tokens'
+  } else if (bridgeMode === BRIDGE_MODES.STAKE_AMB_ERC_TO_ERC) {
+    unitHome = 'Tokens'
+    unitForeign = 'Tokens'
+  } else {
+    throw new Error(`Unrecognized bridge mode: ${bridgeMode}`)
+  }
+
+  return { unitHome, unitForeign }
 }
 
 const parseValidatorEvent = event => {
@@ -179,16 +255,17 @@ const normalizeGasPrice = (oracleGasPrice, factor, limits = null) => {
   return toBN(toWei(gasPrice.toFixed(2).toString(), 'gwei'))
 }
 
-const gasPriceFromSupplier = async (url, options = {}) => {
+// fetchFn has to be supplied (instead of just url to oracle),
+// because this utility function is shared between Browser and Node,
+// we use built-in 'fetch' on browser side, and `node-fetch` package in Node.
+const gasPriceFromSupplier = async (fetchFn, options = {}) => {
   try {
     let json
-    if (url === 'gas-price-oracle') {
-      json = await gasPriceOracle.fetchGasPricesOffChain()
-    } else if (url) {
-      const response = await fetch(url, { timeout: 2000 })
+    if (fetchFn) {
+      const response = await fetchFn()
       json = await response.json()
     } else {
-      return null
+      json = await gasPriceOracle.fetchGasPricesOffChain()
     }
     const oracleGasPrice = json[options.speedType]
 
@@ -229,7 +306,10 @@ const gasPriceFromContract = async (bridgeContract, options = {}) => {
 
 module.exports = {
   decodeBridgeMode,
+  decodeFeeManagerMode,
   getBridgeMode,
+  getTokenType,
+  getUnit,
   parseValidatorEvent,
   processValidatorsEvents,
   getValidatorList,
@@ -238,5 +318,7 @@ module.exports = {
   normalizeGasPrice,
   gasPriceFromSupplier,
   gasPriceFromContract,
-  gasPriceWithinLimits
+  gasPriceWithinLimits,
+  isErcToErcMode,
+  isMediatorMode
 }

commons/v1Abis.js

@@ -0,0 +1,191 @@
+const homeV1Abi = [
+  {
+    constant: true,
+    inputs: [],
+    name: 'validatorContract',
+    outputs: [
+      {
+        name: '',
+        type: 'address'
+      }
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function'
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: false,
+        name: 'recipient',
+        type: 'address'
+      },
+      {
+        indexed: false,
+        name: 'value',
+        type: 'uint256'
+      }
+    ],
+    name: 'Deposit',
+    type: 'event'
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: false,
+        name: 'recipient',
+        type: 'address'
+      },
+      {
+        indexed: false,
+        name: 'value',
+        type: 'uint256'
+      },
+      {
+        indexed: false,
+        name: 'transactionHash',
+        type: 'bytes32'
+      }
+    ],
+    name: 'Withdraw',
+    type: 'event'
+  },
+  {
+    constant: true,
+    inputs: [],
+    name: 'deployedAtBlock',
+    outputs: [
+      {
+        name: '',
+        type: 'uint256'
+      }
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function'
+  },
+  {
+    constant: true,
+    inputs: [],
+    name: 'requiredBlockConfirmations',
+    outputs: [
+      {
+        name: '',
+        type: 'uint256'
+      }
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function'
+  }
+]
+
+const foreignViAbi = [
+  {
+    constant: true,
+    inputs: [],
+    name: 'validatorContract',
+    outputs: [
+      {
+        name: '',
+        type: 'address'
+      }
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function'
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: false,
+        name: 'recipient',
+        type: 'address'
+      },
+      {
+        indexed: false,
+        name: 'value',
+        type: 'uint256'
+      },
+      {
+        indexed: false,
+        name: 'transactionHash',
+        type: 'bytes32'
+      }
+    ],
+    name: 'Deposit',
+    type: 'event'
+  },
+  {
+    anonymous: false,
+    inputs: [
+      {
+        indexed: false,
+        name: 'recipient',
+        type: 'address'
+      },
+      {
+        indexed: false,
+        name: 'value',
+        type: 'uint256'
+      },
+      {
+        indexed: false,
+        name: 'homeGasPrice',
+        type: 'uint256'
+      }
+    ],
+    name: 'Withdraw',
+    type: 'event'
+  },
+  {
+    constant: true,
+    inputs: [],
+    name: 'deployedAtBlock',
+    outputs: [
+      {
+        name: '',
+        type: 'uint256'
+      }
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function'
+  },
+  {
+    constant: true,
+    inputs: [],
+    name: 'erc677token',
+    outputs: [
+      {
+        name: '',
+        type: 'address'
+      }
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function'
+  },
+  {
+    constant: true,
+    inputs: [],
+    name: 'requiredBlockConfirmations',
+    outputs: [
+      {
+        name: '',
+        type: 'uint256'
+      }
+    ],
+    payable: false,
+    stateMutability: 'view',
+    type: 'function'
+  }
+]
+
+module.exports = {
+  HOME_V1_ABI: homeV1Abi,
+  FOREIGN_V1_ABI: foreignViAbi
+}

deployment-e2e/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.7
+FROM python:3.7-stretch
 RUN curl -fsSL https://get.docker.com | sh
-RUN pip3 install docker molecule[docker,ansible] pytest pytest-testinfra flake8
+RUN pip3 install docker molecule==2.22rc1 molecule[docker] flake8
 WORKDIR mono/deployment-e2e

deployment-e2e/molecule/monitor/molecule.yml

@@ -3,6 +3,12 @@ dependency:
   name: galaxy
 driver:
   name: docker
+lint:
+  name: yamllint
+  enabled: True
+  options:
+    config-data:
+      ignore: ../../hosts.yml
 platforms:
   - name: monitor-host
     groups:
@@ -16,6 +22,11 @@ platforms:
       - /var/run/docker.sock:/var/run/docker.sock
 provisioner:
   name: ansible
+  lint:
+    name: ansible-lint
+    enabled: True
+    options:
+      r: ["bug"]
   playbooks:
     prepare: ../prepare.yml
     converge: ./converge.yml
@@ -26,11 +37,14 @@ provisioner:
         syslog_server_port: "udp://127.0.0.1:514"
 verifier:
   name: testinfra
+  lint:
+    name: flake8
   additional_files_or_dirs:
     - ../../tests/*
 scenario:
   name: monitor
   test_sequence:
+    - lint
     - cleanup
     - destroy
     - dependency

deployment-e2e/molecule/multiple/molecule.yml

@@ -3,6 +3,12 @@ dependency:
   name: galaxy
 driver:
   name: docker
+lint:
+  name: yamllint
+  enabled: True
+  options:
+    config-data:
+      ignore: ../../hosts.yml
 platforms:
   - name: multiple-host
     groups:
@@ -17,22 +23,30 @@ platforms:
       - /var/run/docker.sock:/var/run/docker.sock
 provisioner:
   name: ansible
+  lint:
+    name: ansible-lint
+    enabled: True
+    options:
+      r: ["bug"]
   playbooks:
     prepare: ../prepare.yml
     converge: ../monitor/converge.yml
   inventory:
     host_vars:
       multiple-host:
-        ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY: "6c48435bd464a53ed66ed62127c4dba8af75cf1a99a8ebe2680599948fbfbc6d"
+        ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY: "8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9"
         MONITOR_PORT: 3003
         syslog_server_port: "udp://127.0.0.1:514"
 verifier:
   name: testinfra
+  lint:
+    name: flake8
   additional_files_or_dirs:
     - ../../tests/*
 scenario:
   name: multiple
   test_sequence:
+    - lint
     - cleanup
     - destroy
     - dependency

deployment-e2e/molecule/oracle/molecule.yml

@@ -3,12 +3,18 @@ dependency:
   name: galaxy
 driver:
   name: docker
+lint:
+  name: yamllint
+  enabled: True
+  options:
+    config-data:
+      ignore: ../../hosts.yml
 platforms:
   - name: oracle-host
     groups:
       - example
     children:
-      - oracle_swarm
+      - oracle
     image: ubuntu:16.04
     privileged: true
     network_mode: host
@@ -16,22 +22,29 @@ platforms:
       - /var/run/docker.sock:/var/run/docker.sock
 provisioner:
   name: ansible
+  lint:
+    name: ansible-lint
+    enabled: True
+    options:
+      r: ["bug"]
   playbooks:
     prepare: ../prepare.yml
     converge: ../../../deployment/site.yml
   inventory:
     host_vars:
       oracle-host:
-        ORACLE_VALIDATOR_KEYSTORE_PATH: "../../../e2e-commons/keystore.json"
-        ORACLE_VALIDATOR_KEYSTORE_PASSWORD: "12345678"
+        ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY: "8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9"
         syslog_server_port: "udp://127.0.0.1:514"
 verifier:
   name: testinfra
+  lint:
+    name: flake8
   additional_files_or_dirs:
     - ../../tests/*
 scenario:
   name: oracle
   test_sequence:
+    - lint
     - cleanup
     - destroy
     - dependency

deployment-e2e/molecule/oracle/tests/test_oracle.py

@@ -3,21 +3,22 @@ import pytest
 import testinfra.utils.ansible_runner
 
 testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
-    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('oracle_swarm')
+    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('oracle')
 
 
 @pytest.mark.parametrize("name", [
-    ("oracle_rabbit"),
-    ("oracle_redis"),
-    ("oracle_bridge_request"),
-    ("oracle_bridge_collected"),
-    ("oracle_bridge_affirmation"),
-    ("oracle_bridge_senderhome"),
-    ("oracle_bridge_senderforeign"),
-    ("oracle_bridge_shutdown"),
+    ("oracle_rabbit_1"),
+    ("oracle_redis_1"),
+    ("oracle_bridge_request_1"),
+    ("oracle_bridge_collected_1"),
+    ("oracle_bridge_affirmation_1"),
+    ("oracle_bridge_senderhome_1"),
+    ("oracle_bridge_senderforeign_1"),
+    ("oracle_bridge_shutdown_1"),
 ])
 def test_docker_containers(host, name):
-    assert host.docker(name) is not None
+    container = host.docker(name)
+    assert container.is_running
 
 
 @pytest.mark.parametrize("service", [

deployment-e2e/molecule/ultimate-amb/molecule.yml

@@ -7,7 +7,7 @@ platforms:
       - ultimate
       - amb
     children:
-      - oracle_swarm
+      - oracle
     image: ubuntu:16.04
     privileged: true
     network_mode: host
@@ -21,10 +21,12 @@ provisioner:
   inventory:
     host_vars:
       oracle-amb-host:
-        ORACLE_VALIDATOR_KEYSTORE_PATH: "../../../e2e-commons/keystore_ultimate.json"
-        ORACLE_VALIDATOR_KEYSTORE_PASSWORD: "12345678"
+        ORACLE_VALIDATOR_ADDRESS: "0xaaB52d66283F7A1D5978bcFcB55721ACB467384b"
+        ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY: "8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9"
 verifier:
   name: testinfra
+  lint:
+    name: flake8
 scenario:
   name: ultimate-amb
   test_sequence:

deployment-e2e/molecule/ultimate-commons/oracle-docker-compose.yml

@@ -9,17 +9,15 @@
       - oracle_net_db_bridge_request
       - oracle_net_db_bridge_collected
       - oracle_net_db_bridge_affirmation
-      - oracle_net_db_bridge_information
       - oracle_net_db_bridge_transfer
       - oracle_net_db_bridge_senderhome
       - oracle_net_db_bridge_senderforeign
-      - oracle_net_db_bridge_shutdown
       - oracle_net_rabbit_bridge_request
       - oracle_net_rabbit_bridge_collected
       - oracle_net_rabbit_bridge_affirmation
-      - oracle_net_rabbit_bridge_information
       - oracle_net_rabbit_bridge_transfer
       - oracle_net_rabbit_bridge_senderhome
       - oracle_net_rabbit_bridge_senderforeign
+      - oracle_net_rabbit_bridge_convert_to_chai_worker
     delegate_to: 127.0.0.1
     become: false

deployment-e2e/molecule/ultimate-erc-to-erc/Dockerfile.j2

@@ -0,0 +1,14 @@
+# Molecule managed
+
+{% if item.registry is defined %}
+FROM {{ item.registry.url }}/{{ item.image }}
+{% else %}
+FROM {{ item.image }}
+{% endif %}
+
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+    elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
+    elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
+    elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \
+    elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python sudo bash ca-certificates && xbps-remove -O; fi

deployment-e2e/molecule/ultimate-erc-to-erc/molecule.yml

@@ -0,0 +1,38 @@
+---
+driver:
+  name: docker
+platforms:
+  - name: oracle-erc-to-erc-host
+    groups:
+      - ultimate
+      - erc-to-erc
+    children:
+      - oracle
+    image: ubuntu:16.04
+    privileged: true
+    network_mode: host
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+provisioner:
+  name: ansible
+  playbooks:
+    prepare: ../prepare.yml
+    converge: ../ultimate-commons/converge.yml
+  inventory:
+    host_vars:
+      oracle-erc-to-erc-host:
+        ORACLE_VALIDATOR_ADDRESS: "0xaaB52d66283F7A1D5978bcFcB55721ACB467384b"
+        ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY: "8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9"
+verifier:
+  name: testinfra
+  lint:
+    name: flake8
+scenario:
+  name: ultimate-erc-to-erc
+  test_sequence:
+    - cleanup
+    - destroy
+    - syntax
+    - create
+    - prepare
+    - converge

deployment-e2e/molecule/ultimate-erc-to-native/molecule.yml

@@ -27,6 +27,8 @@ provisioner:
         ORACLE_FOREIGN_START_BLOCK: 1
 verifier:
   name: testinfra
+  lint:
+    name: flake8
 scenario:
   name: ultimate-erc-to-native
   test_sequence:

deployment-e2e/molecule/ultimate-native-to-erc/Dockerfile.j2

@@ -0,0 +1,14 @@
+# Molecule managed
+
+{% if item.registry is defined %}
+FROM {{ item.registry.url }}/{{ item.image }}
+{% else %}
+FROM {{ item.image }}
+{% endif %}
+
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+    elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
+    elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
+    elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \
+    elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python sudo bash ca-certificates && xbps-remove -O; fi

deployment-e2e/molecule/ultimate-native-to-erc/molecule.yml

@@ -0,0 +1,38 @@
+---
+driver:
+  name: docker
+platforms:
+  - name: oracle-native-to-erc-host
+    groups:
+      - ultimate
+      - native-to-erc
+    children:
+      - oracle
+    image: ubuntu:16.04
+    privileged: true
+    network_mode: host
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+provisioner:
+  name: ansible
+  playbooks:
+    prepare: ../prepare.yml
+    converge: ../ultimate-commons/converge.yml
+  inventory:
+    host_vars:
+      oracle-native-to-erc-host:
+        ORACLE_VALIDATOR_ADDRESS: "0xaaB52d66283F7A1D5978bcFcB55721ACB467384b"
+        ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY: "8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9"
+verifier:
+  name: testinfra
+  lint:
+    name: flake8
+scenario:
+  name: ultimate-native-to-erc
+  test_sequence:
+    - cleanup
+    - destroy
+    - syntax
+    - create
+    - prepare
+    - converge

deployment/group_vars/amb.yml

@@ -1,5 +1,5 @@
 ---
 ORACLE_BRIDGE_MODE: "ARBITRARY_MESSAGE"
-COMMON_HOME_BRIDGE_ADDRESS: "0x8397be90BCF57b0B71219f555Fe121b22e5a994C"
-COMMON_FOREIGN_BRIDGE_ADDRESS: "0x1feB40aD9420b186F019A717c37f5546165d411E"
+COMMON_HOME_BRIDGE_ADDRESS: "0x0AEe1FCD12dDFab6265F7f8956e6E012A9Fe4Aa0"
+COMMON_FOREIGN_BRIDGE_ADDRESS: "0x0AEe1FCD12dDFab6265F7f8956e6E012A9Fe4Aa0"
 MONITOR_PORT: 3013

deployment/group_vars/erc-to-erc.yml

@@ -0,0 +1,5 @@
+---
+ORACLE_BRIDGE_MODE: "ERC_TO_ERC"
+COMMON_HOME_BRIDGE_ADDRESS: "0x1feB40aD9420b186F019A717c37f5546165d411E"
+COMMON_FOREIGN_BRIDGE_ADDRESS: "0x4a58D6d8D416a5fBCAcf3dC52eb8bE8948E25127"
+MONITOR_PORT: 3011

deployment/group_vars/erc-to-native.yml

@@ -1,5 +1,5 @@
 ---
 ORACLE_BRIDGE_MODE: "ERC_TO_NATIVE"
-COMMON_HOME_BRIDGE_ADDRESS: "0x5118AC62AE912Dd5B51EEfF7338c4fcb0248Ba8c"
-COMMON_FOREIGN_BRIDGE_ADDRESS: "0x32198D570fffC7033641F8A9094FFDCaAEF42624"
+COMMON_HOME_BRIDGE_ADDRESS: "0x488Af810997eD1730cB3a3918cD83b3216E6eAda"
+COMMON_FOREIGN_BRIDGE_ADDRESS: "0x488Af810997eD1730cB3a3918cD83b3216E6eAda"
 MONITOR_PORT: 3012

deployment/group_vars/example.yml

@@ -1,17 +1,17 @@
 ---
 ## General settings
-ORACLE_BRIDGE_MODE: "ARBITRARY_MESSAGE"
+ORACLE_BRIDGE_MODE: "NATIVE_TO_ERC"
 ORACLE_LOG_LEVEL: debug
 
 ## Home contract
 COMMON_HOME_RPC_URL: "https://sokol.poa.network"
-COMMON_HOME_BRIDGE_ADDRESS: "0x59ba90A588ce732AB33FD32Aab1b58c21400A0f6"
+COMMON_HOME_BRIDGE_ADDRESS: "0x98aFdE294f1C46aA0a27Cc4049ED337F879d8976"
 ORACLE_HOME_RPC_POLLING_INTERVAL: 5000
 
 ## Foreign contract
-COMMON_FOREIGN_RPC_URL: "https://kovan.infura.io/v3/5d7bd94c50ed43fab1cb8e74f58678b0"
-COMMON_FOREIGN_BRIDGE_ADDRESS: "0xdA4a49a00F4fF4A5988b9AceE95f99e3b2c208b6"
-ORACLE_FOREIGN_RPC_POLLING_INTERVAL: 5000
+COMMON_FOREIGN_RPC_URL: "https://sokol.poa.network"
+COMMON_FOREIGN_BRIDGE_ADDRESS: "0x5a584f4C30B36f282848dAc9a2b20E7BEF481981"
+ORACLE_FOREIGN_RPC_POLLING_INTERVAL: 1000
 
 ## Home Gasprice
 COMMON_HOME_GAS_PRICE_SUPPLIER_URL: "https://gasprice.poa.network/"
@@ -31,8 +31,8 @@ ORACLE_FOREIGN_GAS_PRICE_UPDATE_INTERVAL: 600000
 MONITOR_BRIDGE_NAME: "bridge"
 MONITOR_PORT: 3003
 MONITOR_CACHE_EVENTS: "false"
-MONITOR_HOME_START_BLOCK: 20821049
-MONITOR_FOREIGN_START_BLOCK: 24773297
+MONITOR_HOME_START_BLOCK: 0
+MONITOR_FOREIGN_START_BLOCK: 0
 MONITOR_VALIDATOR_HOME_TX_LIMIT: 300000
 MONITOR_VALIDATOR_FOREIGN_TX_LIMIT: 300000
 MONITOR_TX_NUMBER_THRESHOLD: 100

deployment/group_vars/native-to-erc.yml

@@ -0,0 +1,5 @@
+---
+ORACLE_BRIDGE_MODE: "NATIVE_TO_ERC"
+COMMON_HOME_BRIDGE_ADDRESS: "0x32198D570fffC7033641F8A9094FFDCaAEF42624"
+COMMON_FOREIGN_BRIDGE_ADDRESS: "0x2B6871b9B02F73fa24F4864322CdC78604207769"
+MONITOR_PORT: 3010

deployment/group_vars/wetc.yml

@@ -0,0 +1,37 @@
+---
+## General settings
+ORACLE_BRIDGE_MODE: "NATIVE_TO_ERC"
+
+## Home contract
+COMMON_HOME_RPC_URL: "https://www.ethercluster.com/etc"
+COMMON_HOME_BRIDGE_ADDRESS: "0x073081832B4Ecdce79d4D6753565c85Ba4b3BeA9"
+ORACLE_HOME_RPC_POLLING_INTERVAL: 7000
+
+## Foreign contract
+COMMON_FOREIGN_RPC_URL: "https://mainnet.infura.io/"
+COMMON_FOREIGN_BRIDGE_ADDRESS: "0x0cB781EE62F815bdD9CD4c2210aE8600d43e7040"
+ORACLE_FOREIGN_RPC_POLLING_INTERVAL: 7000
+
+## Home Gasprice
+COMMON_HOME_GAS_PRICE_SUPPLIER_URL: "https://gasprice-etc.poa.network/"
+COMMON_HOME_GAS_PRICE_SPEED_TYPE: "standard"
+COMMON_HOME_GAS_PRICE_FALLBACK: 15000000000      # in wei
+ORACLE_HOME_GAS_PRICE_UPDATE_INTERVAL: 600000
+COMMON_HOME_GAS_PRICE_FACTOR: 1
+
+## Foreign Gasprice
+COMMON_FOREIGN_GAS_PRICE_SUPPLIER_URL: "https://gasprice.poa.network/"
+COMMON_FOREIGN_GAS_PRICE_SPEED_TYPE: "standard"
+COMMON_FOREIGN_GAS_PRICE_FALLBACK: 10000000000   # in wei
+ORACLE_FOREIGN_GAS_PRICE_UPDATE_INTERVAL: 600000
+COMMON_FOREIGN_GAS_PRICE_FACTOR: 1
+
+## Monitor
+MONITOR_BRIDGE_NAME: "wetc"
+MONITOR_PORT: 3003
+MONITOR_CACHE_EVENTS: "true"
+MONITOR_HOME_START_BLOCK: 7703292
+MONITOR_FOREIGN_START_BLOCK: 7412459
+MONITOR_VALIDATOR_HOME_TX_LIMIT: 300000
+MONITOR_VALIDATOR_FOREIGN_TX_LIMIT: 300000
+MONITOR_TX_NUMBER_THRESHOLD: 100

deployment/hosts.yml.example

@@ -7,13 +7,6 @@ sokol-kovan:
           ansible_user: ubuntu
           ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
           #syslog_server_port: "udp://127.0.0.1:514"
-    oracle_swarm:
-      hosts:
-        127.0.0.1:
-          ansible_user: ubuntu
-          ORACLE_VALIDATOR_KEYSTORE_PATH: "/path/to/keystore.json"
-          ORACLE_VALIDATOR_KEYSTORE_PASSWORD: "12345678"
-          #syslog_server_port: "udp://127.0.0.1:514"
     monitor:
       hosts:
         127.0.0.1:

deployment/requirements.txt

@@ -0,0 +1,4 @@
+# pre-release because it contains "CI Fixes for ansible 2.8"
+molecule==2.22rc1
+docker
+flake8

deployment/roles/common/files/daemon.json

@@ -1,4 +1,4 @@
 {
-    "live-restore": false,
+    "live-restore": true,
     "no-new-privileges": true
 }

deployment/roles/common/tasks/dependencies.yml

@@ -31,7 +31,6 @@
     owner: "root"
     group: "root"
     mode: "0755"
-  when: skip_compose is undefined
 
 - name: Upgrade pip version
   shell: pip3 install --upgrade pip==19.3.1
@@ -46,9 +45,6 @@
     group: docker
     createhome: yes
 
-- name: reset ssh connection to allow user changes to affect ansible user
-  meta: reset_connection
-
 - name: Install auditd
   apt:
     name: auditd

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

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

deployment/roles/oracle/tasks/logging.yml

@@ -3,11 +3,11 @@
   with_items:
     - docker-compose
     - docker-compose-transfer
-    - docker-compose-amb
+    - docker-compose-erc-native
   loop_control:
     loop_var: file
 
-- name: Set the oracle's containers local logs configuration file
+- name: Set the local container logs configuration file
   template:
     src: 31-oracle-docker.conf.j2
     dest: /etc/rsyslog.d/31-oracle-docker.conf
@@ -15,22 +15,6 @@
     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/post_config.yml

@@ -27,13 +27,24 @@
   set_fact:
     ORACLE_VALIDATOR_ADDRESS: "{{ VADDRESS.stdout }}"
 
-- name: Extend docker compose file for erc to native
-  set_fact: composefileoverride="-f docker-compose-transfer.yml"
-  when: ORACLE_BRIDGE_MODE == "ERC_TO_NATIVE"
+- name: Get foreign erc type
+  become_user: "{{ compose_service_user }}"
+  shell: docker-compose run --rm --entrypoint "node scripts/initialChecks.js" bridge_affirmation
+  args:
+    chdir: "{{ bridge_path }}/oracle"
+  register: ERCTYPE
 
-- name: Extend docker compose file for amb
-  set_fact: composefileoverride="-f docker-compose-amb.yml"
-  when: ORACLE_BRIDGE_MODE == "ARBITRARY_MESSAGE"
+- name: Set FOREIGN_ERC_TYPE variable
+  set_fact:
+    FOREIGN_ERC_TYPE: "{{ (ERCTYPE.stdout).foreignERC | default('') }}"
+
+- name: Extend docker compose file
+  set_fact: composefileoverride="-f docker-compose-transfer.yml"
+  when: ORACLE_BRIDGE_MODE == "ERC_TO_ERC" and FOREIGN_ERC_TYPE != "ERC677"
+
+- name: Extend docker compose file for erc to native
+  set_fact: composefileoverride="-f docker-compose-erc-native.yml"
+  when: ORACLE_BRIDGE_MODE == "ERC_TO_NATIVE"
 
 - name: Install .key config
   template:

deployment/roles/oracle/tasks/pre_config.yml

@@ -20,4 +20,4 @@
   with_items:
     - docker-compose.yml
     - docker-compose-transfer.yml
-    - docker-compose-amb.yml
+    - docker-compose-erc-native.yml

deployment/roles/oracle/templates/.env.j2

@@ -11,16 +11,9 @@ 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 }}
@@ -54,28 +47,8 @@ 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_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 }}
+{% if ORACLE_TX_REDUNDANCY | default('') != '' %}
+ORACLE_TX_REDUNDANCY={{ ORACLE_TX_REDUNDANCY }}
 {% endif %}
 
 {% if ORACLE_HOME_START_BLOCK | default('') != '' %}

deployment/roles/oracle/templates/32-redis-docker.conf.j2

@@ -1,11 +0,0 @@
-$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/33-rabbit-docker.conf.j2

@@ -1,11 +0,0 @@
-$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_swarm/defaults/main.yml

@@ -1,9 +0,0 @@
----
-bridge_path: "/home/{{ compose_service_user }}/bridge"
-bridge_data_path: "/home/{{ compose_service_user }}/bridge_data"
-ORACLE_ALLOW_HTTP_FOR_RPC: no
-ORACLE_QUEUE_URL: amqp://rabbit
-ORACLE_REDIS_URL: redis://redis
-keyfile_path: "/root/.key"
-keystore_path: "/root/.keystore.json"
-oracle_image: poanetwork/tokenbridge-oracle:latest

deployment/roles/oracle_swarm/meta/main.yml

@@ -1,3 +0,0 @@
----
-dependencies:
-  - { role: common, skip_repo: true, skip_compose: true }

deployment/roles/oracle_swarm/tasks/jumpbox.yml

@@ -1,8 +0,0 @@
----
-- name: Pull the containers images
-  community.docker.docker_image:
-    name: "{{ oracle_image }}"
-    source: pull
-  when: skip_pull is undefined
-  vars:
-    ansible_python_interpreter: /usr/bin/python3

deployment/roles/oracle_swarm/tasks/logging.yml

@@ -1,41 +0,0 @@
----
-- 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
-    dest: /etc/rsyslog.d/36-oracle-remote-logging.conf
-    owner: root
-    group: root
-    mode: 0644
-  when: syslog_server_port is defined
-
-- name: Discarding unwanted messages in rsyslog
-  blockinfile:
-    path: /etc/rsyslog.conf
-    insertbefore: "# Where to place spool and state files"
-    marker: "#{mark} add string to discarding unwanted messages"
-    content: ':msg, contains, "ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY" ~'
-  notify: restart rsyslog

deployment/roles/oracle_swarm/tasks/main.yml

@@ -1,6 +0,0 @@
----
-- include_tasks: pre_config.yml
-- include_tasks: logging.yml
-- include_tasks: jumpbox.yml
-- include_tasks: post_config.yml
-- include_tasks: servinstall.yml

deployment/roles/oracle_swarm/tasks/post_config.yml

@@ -1,46 +0,0 @@
----
-- name: Get blocks
-  become_user: "{{ compose_service_user }}"
-  shell: docker run --env-file .env --rm {{ oracle_image }} scripts/getValidatorStartBlocks.js
-  args:
-    chdir: "{{ bridge_path }}/oracle"
-  register: BLOCKS
-  when: (ORACLE_HOME_START_BLOCK is not defined) or (ORACLE_FOREIGN_START_BLOCK is not defined)
-
-- name: Write blocks
-  blockinfile:
-    path: "{{ bridge_path }}/oracle/.env"
-    marker: "## {mark} Calculated by scripts/getValidatorStartBlocks.js"
-    block: |
-      ORACLE_HOME_START_BLOCK={{ (BLOCKS.stdout | from_json).homeStartBlock }}
-      ORACLE_FOREIGN_START_BLOCK={{ (BLOCKS.stdout | from_json).foreignStartBlock }}
-  when: (ORACLE_HOME_START_BLOCK is not defined) or (ORACLE_FOREIGN_START_BLOCK is not defined)
-
-- name: Copy keystore file
-  copy:
-    src: "{{ ORACLE_VALIDATOR_KEYSTORE_PATH }}"
-    dest: "{{ keystore_path }}"
-    owner: root
-    group: root
-    mode: 0600
-
-- name: Create swarm secret
-  community.docker.docker_secret:
-    name: oracle_keystore
-    state: present
-    data_src: "{{ keystore_path }}"
-  vars:
-    ansible_python_interpreter: /usr/bin/python3
-
-- name: Remove unencrypted keystore file
-  file:
-    path: "{{ keystore_path }}"
-    state: absent
-
-- name: Install .key config
-  template:
-    src: key.j2
-    dest: "{{ keyfile_path }}"
-    owner: root
-    group: root
-    mode: 0600

deployment/roles/oracle_swarm/tasks/pre_config.yml

@@ -1,47 +0,0 @@
----
-- name: Init docker swarm
-  community.docker.docker_swarm:
-    state: present
-    autolock_managers: yes
-    listen_addr: 127.0.0.1:2377
-  vars:
-    ansible_python_interpreter: /usr/bin/python3
-
-- name: Get unlock token
-  community.docker.docker_swarm_info:
-    unlock_key: yes
-  register: result
-  vars:
-    ansible_python_interpreter: /usr/bin/python3
-
-- name: Print unlock token
-  debug:
-    var: result.swarm_unlock_key
-
-- name: Create oracle directory
-  file:
-    path: "{{ bridge_path }}/oracle"
-    state: directory
-    mode: '0755'
-
-- name: Create rabbitmq directory
-  file:
-    path: "{{ bridge_data_path }}/{{ item }}"
-    state: directory
-    mode: '0775'
-  loop:
-    - rabbitmq
-    - redis
-
-- name: Install .env config
-  template:
-    src: .env.j2
-    dest: "{{ bridge_path }}/oracle/.env"
-    owner: "{{ compose_service_user }}"
-    mode: '0640'
-
-- name: Install docker-compose file
-  template:
-    src: docker-compose.yml.j2
-    dest: "{{ bridge_path }}/oracle/docker-compose.yml"
-    mode: '0755'

deployment/roles/oracle_swarm/tasks/servinstall.yml

@@ -1,19 +0,0 @@
-# This role creates a poabridge service which is designed to manage docker-compose bridge deployment.
-# /etc/init.d/poabridge start, status, stop, restart - does what the services usually do in such cases.
----
-- name: "Set poabridge service"
-  template:
-    src: poabridge.j2
-    dest: "/etc/init.d/poabridge"
-    owner: root
-    mode: 755
-
-- name: "Enable the service"
-  service:
-    name: "poabridge"
-    state: started
-    enabled: yes
-    use: service
-
-- name: Start the service
-  shell: service poabridge start

deployment/roles/oracle_swarm/templates/.env.j2

@@ -1,86 +0,0 @@
-## General settings
-ORACLE_BRIDGE_MODE={{ ORACLE_BRIDGE_MODE }}
-{% if ORACLE_LOG_LEVEL | default('') != '' %}
-ORACLE_LOG_LEVEL={{ ORACLE_LOG_LEVEL }}
-{% endif %}
-
-## Home contract
-COMMON_HOME_RPC_URL={{ COMMON_HOME_RPC_URL }}
-COMMON_HOME_BRIDGE_ADDRESS={{ COMMON_HOME_BRIDGE_ADDRESS }}
-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 }}
-{% endif %}
-{% if COMMON_HOME_GAS_PRICE_SPEED_TYPE | default('') != '' %}
-COMMON_HOME_GAS_PRICE_SPEED_TYPE={{ COMMON_HOME_GAS_PRICE_SPEED_TYPE }}
-{% endif %}
-COMMON_HOME_GAS_PRICE_FALLBACK={{ COMMON_HOME_GAS_PRICE_FALLBACK }}
-{% if ORACLE_HOME_GAS_PRICE_UPDATE_INTERVAL | default('') != '' %}
-ORACLE_HOME_GAS_PRICE_UPDATE_INTERVAL={{ ORACLE_HOME_GAS_PRICE_UPDATE_INTERVAL }}
-{% endif %}
-{% if COMMON_HOME_GAS_PRICE_FACTOR | default('') != '' %}
-COMMON_HOME_GAS_PRICE_FACTOR={{ COMMON_HOME_GAS_PRICE_FACTOR }}
-{% endif %}
-
-{% if COMMON_FOREIGN_GAS_PRICE_SUPPLIER_URL | default('') != '' %}
-COMMON_FOREIGN_GAS_PRICE_SUPPLIER_URL={{ COMMON_FOREIGN_GAS_PRICE_SUPPLIER_URL }}
-{% endif %}
-{% if COMMON_FOREIGN_GAS_PRICE_SPEED_TYPE | default('') != '' %}
-COMMON_FOREIGN_GAS_PRICE_SPEED_TYPE={{ COMMON_FOREIGN_GAS_PRICE_SPEED_TYPE }}
-{% endif %}
-COMMON_FOREIGN_GAS_PRICE_FALLBACK={{ COMMON_FOREIGN_GAS_PRICE_FALLBACK }}
-{% if ORACLE_FOREIGN_GAS_PRICE_UPDATE_INTERVAL | default('') != '' %}
-ORACLE_FOREIGN_GAS_PRICE_UPDATE_INTERVAL={{ ORACLE_FOREIGN_GAS_PRICE_UPDATE_INTERVAL }}
-{% endif %}
-{% if COMMON_FOREIGN_GAS_PRICE_FACTOR | default('') != '' %}
-COMMON_FOREIGN_GAS_PRICE_FACTOR={{ COMMON_FOREIGN_GAS_PRICE_FACTOR }}
-{% endif %}
-
-## Transport configuration
-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_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('') != '' %}
-ORACLE_HOME_START_BLOCK={{ ORACLE_HOME_START_BLOCK }}
-{% endif %}
-{% if ORACLE_FOREIGN_START_BLOCK | default('') != '' %}
-ORACLE_FOREIGN_START_BLOCK={{ ORACLE_FOREIGN_START_BLOCK }}
-{% endif %}

deployment/roles/oracle_swarm/templates/31-oracle-docker.conf.j2

@@ -1,11 +0,0 @@
-$FileCreateMode 0644
-template(name="DockerLogFileName_Oracle" type="list") {
-   constant(value="/var/log/docker/")
-   property(name="syslogtag" securepath="replace" regex.type="ERE" regex.submatch="1" regex.expression="bridge_(.*)\\/[a-zA-Z0-9]+\\[")
-   constant(value="/docker.log")
-}
-
-if $programname startswith 'oracle_bridge_' then \
-  ?DockerLogFileName_Oracle
-
-$FileCreateMode 0600

deployment/roles/oracle_swarm/templates/32-redis-docker.conf.j2

@@ -1,11 +0,0 @@
-$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_swarm/templates/33-rabbit-docker.conf.j2

@@ -1,11 +0,0 @@
-$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_swarm/templates/36-oracle-remote-logging.conf.j2

@@ -1,15 +0,0 @@
-if $programname startswith 'oracle_bridge_' then {
-action(
-   type="omfwd"
-   protocol="{{ syslog_server_port.split(":")[0] }}"
-   target="{{ (syslog_server_port.split(":")[1])[2:] }}"
-   port="{{ syslog_server_port.split(":")[2] }}"
-   template="RemoteForwardFormat"
-   queue.SpoolDirectory="/var/spool/rsyslog"
-   queue.FileName="remote"
-   queue.MaxDiskSpace="1g"
-   queue.SaveOnShutdown="on"
-   queue.Type="LinkedList"
-   ResendLastMSGOnReconnect="on"
-   )
-}

deployment/roles/oracle_swarm/templates/docker-compose.yml.j2

@@ -1,144 +0,0 @@
-version: '3.9'
-x-deploy: &x-deploy
-  resources:
-    limits:
-      cpus: '0.3'
-      memory: 500M
-    reservations:
-      memory: 100M
-x-keystore-access: &x-keystore-access
-  environment:
-    ORACLE_VALIDATOR_KEYSTORE_PATH: /run/secrets/oracle_keystore
-    ORACLE_VALIDATOR_KEYSTORE_PASSWORD:
-  secrets:
-    - oracle_keystore
-x-logging: &x-logging
-  driver: 'syslog'
-  options: {tag: '{{ '{{.Name}}/{{.ID}}' }}' }
-services:
-  rabbit:
-    image: rabbitmq:3
-    hostname: rabbit
-    deploy: *x-deploy
-    logging: *x-logging
-    environment: [ 'RABBITMQ_NODENAME=node@rabbit' ]
-    networks:
-      - net_rabbit_bridge_request
-      - net_rabbit_bridge_collected
-      - net_rabbit_bridge_affirmation
-      - net_rabbit_bridge_senderhome
-      - net_rabbit_bridge_senderforeign
-    volumes: [ '{{ bridge_data_path }}/rabbitmq:/var/lib/rabbitmq/mnesia' ]
-  redis:
-    image: redis:4
-    hostname: redis
-    deploy: *x-deploy
-    logging: *x-logging
-    command: [ redis-server, --appendonly, 'yes' ]
-    networks:
-      - net_db_bridge_request
-      - net_db_bridge_collected
-      - net_db_bridge_affirmation
-      - net_db_bridge_senderhome
-      - net_db_bridge_senderforeign
-      - net_db_bridge_shutdown
-    volumes: [ '{{ bridge_data_path }}/redis:/data' ]
-  bridge_request:
-    image: {{ oracle_image }}
-    deploy: *x-deploy
-    logging: *x-logging
-    env_file: ./.env
-    <<: *x-keystore-access
-    entrypoint: yarn watcher:signature-request
-    networks:
-      - net_db_bridge_request
-      - net_rabbit_bridge_request
-  bridge_collected:
-    image: {{ oracle_image }}
-    deploy: *x-deploy
-    env_file: ./.env
-    entrypoint: yarn watcher:collected-signatures
-    networks:
-      - net_db_bridge_collected
-      - net_rabbit_bridge_collected
-  bridge_affirmation:
-    image: {{ oracle_image }}
-    deploy: *x-deploy
-    logging: *x-logging
-    env_file: ./.env
-    entrypoint: yarn watcher:affirmation-request
-    networks:
-      - net_db_bridge_affirmation
-      - net_rabbit_bridge_affirmation
-  bridge_senderhome:
-    image: {{ oracle_image }}
-    deploy: *x-deploy
-    env_file: ./.env
-    <<: *x-keystore-access
-    entrypoint: yarn sender:home
-    networks:
-      - net_db_bridge_senderhome
-      - net_rabbit_bridge_senderhome
-  bridge_senderforeign:
-    image: {{ oracle_image }}
-    deploy: *x-deploy
-    logging: *x-logging
-    env_file: ./.env
-    <<: *x-keystore-access
-    entrypoint: yarn sender:foreign
-    networks:
-      - net_db_bridge_senderforeign
-      - net_rabbit_bridge_senderforeign
-  bridge_shutdown:
-    image: {{ oracle_image }}
-    deploy: *x-deploy
-    env_file: ./.env
-    entrypoint: yarn manager:shutdown
-    networks:
-      - net_db_bridge_shutdown
-{% if ORACLE_BRIDGE_MODE == "ERC_TO_NATIVE" %}
-  bridge_transfer:
-    image: {{ oracle_image }}
-    deploy: *x-deploy
-    logging: *x-logging
-    env_file: ./.env
-    entrypoint: yarn watcher:transfer
-    networks:
-      - net_db_bridge_transfer
-      - net_rabbit_bridge_transfer
-{% endif %}
-{% if ORACLE_BRIDGE_MODE == "ARBITRARY_MESSAGE" %}
-  bridge_information:
-    image: {{ oracle_image }}
-    deploy: *x-deploy
-    logging: *x-logging
-    env_file: ./.env
-    entrypoint: yarn watcher:information-request
-    networks:
-      - net_db_bridge_information
-      - net_rabbit_bridge_information
-{% endif %}
-networks:
-  net_db_bridge_request:
-  net_db_bridge_collected:
-  net_db_bridge_affirmation:
-  net_db_bridge_senderhome:
-  net_db_bridge_senderforeign:
-  net_db_bridge_shutdown:
-{% if ORACLE_BRIDGE_MODE == "ERC_TO_NATIVE" %}
-  net_db_bridge_transfer:
-  net_rabbit_bridge_transfer:
-{% endif %}
-{% if ORACLE_BRIDGE_MODE == "ARBITRARY_MESSAGE" %}
-  net_db_bridge_information:
-  net_rabbit_bridge_information:
-{% endif %}
-  net_rabbit_bridge_request:
-  net_rabbit_bridge_collected:
-  net_rabbit_bridge_affirmation:
-  net_rabbit_bridge_senderhome:
-  net_rabbit_bridge_senderforeign:
-
-secrets:
-  oracle_keystore:
-    external: true

deployment/roles/oracle_swarm/templates/key.j2

@@ -1,2 +0,0 @@
-## Validator-specific options
-ORACLE_VALIDATOR_KEYSTORE_PASSWORD={{ ORACLE_VALIDATOR_KEYSTORE_PASSWORD }}

deployment/roles/oracle_swarm/templates/poabridge.j2

@@ -1,66 +0,0 @@
-#! /bin/bash
-
-### BEGIN INIT INFO
-# Provides:          poabridge
-# Required-Start:    $remote_fs $syslog
-# Required-Stop:     $remote_fs $syslog
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Start daemon at boot time
-# Description:       Enable service provided by daemon.
-### END INIT INFO
-
-WORKDIR="{{ '/home/' + compose_service_user | default('poadocker') + '/' + bridge_path + '/oracle' if bridge_path[:1] != "/" else bridge_path + '/oracle' }}"
-
-#Getting path to private key file and variable name for parsing key file
-source {{ keyfile_path }}
-
-start(){
-    echo "Starting bridge.."
-    cd $WORKDIR
-    sudo -u "{{ compose_service_user }}" docker stack rm oracle
-    sudo -u "{{ compose_service_user }}" "ORACLE_VALIDATOR_KEYSTORE_PASSWORD=$ORACLE_VALIDATOR_KEYSTORE_PASSWORD" docker stack deploy oracle -c docker-compose.yml
-}
-
-stop(){
-    echo "Stopping bridge.."
-    cd $WORKDIR
-    sudo -u "{{ compose_service_user }}" docker stack rm oracle
-    sleep 2
-}
-
-status(){
-    echo "Bridge status:"
-    cd $WORKDIR
-    sudo -u "{{ compose_service_user }}" docker service ls
-}
-
-
-case "$1" in
-
-  start)
-      start
-    ;;
-
-  stop)
-      stop
-    ;;
-
-  status)
-      status
-    ;;
-
-  restart)
-    echo "Restarting bridge.."
-    stop
-    start
-    ;;
-
-  *)
-    echo $"Usage: $0 {start|stop|restart|status}"
-    exit 1
-    ;;
-
-esac
-
-exit 0

deployment/site.yml

@@ -4,11 +4,6 @@
   become: true
   roles:
     - { role: oracle }
-- name: Install Oracle as a Docker Swarm service
-  hosts: oracle_swarm
-  become: true
-  roles:
-    - { role: oracle_swarm }
 - name: Install Monitor
   hosts: monitor
   become: true

e2e-commons/README.md

@@ -26,7 +26,9 @@ Shut down and cleans up containers, networks, services, running scripts:
 | oracle-validator-3 | Launches Oracle containers for third validator |
 | blocks | Auto mines blocks |
 | monitor | Launches Monitor containers |
+| native-to-erc | Creates infrastructure for ultimate e2e testing, for native-to-erc type of bridge |
 | erc-to-native | Creates infrastructure for ultimate e2e testing, for erc-to-native type of bridge |
+| erc-to-erc | Creates infrastructure for ultimate e2e testing, for erc-to-erc type of bridge |
 | amb | Creates infrastructure for ultimate e2e testing, for arbitrary message type of bridge |
 
 #### Ultimate e2e testing

e2e-commons/ULTIMATE.md

@@ -4,7 +4,7 @@ Documentation regarding the Ultimate end-to-end tests.
 
 ## Overview
 
-The ultimate e2e test scenario covers erc-to-native and amb types of bridges.
+The ultimate e2e test scenario covers native-to-erc type of bridge.
 It runs the e2e tests on components deployed using the deployment playbooks.
 
 
@@ -16,14 +16,14 @@ Run the Parity nodes, deploy the bridge contracts, deploy Oracle using the deplo
 
 ```bash
 ./e2e-commons/up.sh deploy blocks
-./deployment-e2e/molecule.sh ultimate-erc-to-native
+./deployment-e2e/molecule.sh ultimate-native-to-erc
 ```
 
 ### 2. Run the E2E tests
 
 ```bash
 cd e2e-commons
-docker-compose run -e ULTIMATE=true e2e yarn workspace oracle-e2e run erc-to-native
+docker-compose run -e ULTIMATE=true e2e yarn workspace oracle-e2e run native-to-erc
 ```
 
 ## Diagram

e2e-commons/access-lists/block_list.txt

@@ -1,2 +1,2 @@
 0xc9e38bfdB9c635F0796ad83CC8705dc379F41c04
-0xF9698Eb93702dfdd0e2d802088d4c21822a8A977
+0x6f359aC418a5f7538F7755A33C9c7dDf38785524

e2e-commons/build.sh

@@ -5,11 +5,9 @@ set -e # exit when any command fails
 docker-compose build e2e
 while [ "$1" != "" ]; do
   if [ "$1" == "oracle" ]; then
-    docker-compose build oracle-amb
-  elif [ "$1" == "alm-e2e" ]; then
-    docker-compose build oracle-amb
+    docker-compose build oracle
   elif [ "$1" == "monitor" ]; then
-    docker-compose build monitor-amb
+    docker-compose build monitor
   elif [ "$1" == "alm" ]; then
     docker-compose build alm
   fi

e2e-commons/components-envs/alm.env

@@ -1,5 +1,5 @@
-COMMON_HOME_BRIDGE_ADDRESS=0x8397be90BCF57b0B71219f555Fe121b22e5a994C
-COMMON_FOREIGN_BRIDGE_ADDRESS=0x1feB40aD9420b186F019A717c37f5546165d411E
+COMMON_HOME_BRIDGE_ADDRESS=0x0AEe1FCD12dDFab6265F7f8956e6E012A9Fe4Aa0
+COMMON_FOREIGN_BRIDGE_ADDRESS=0x0AEe1FCD12dDFab6265F7f8956e6E012A9Fe4Aa0
 
 COMMON_HOME_RPC_URL=http://localhost:8541
 COMMON_FOREIGN_RPC_URL=http://localhost:8542

e2e-commons/components-envs/monitor-amb.env

@@ -1,7 +1,7 @@
 COMMON_HOME_RPC_URL=http://parity1:8545
 COMMON_FOREIGN_RPC_URL=http://parity2:8545
-COMMON_HOME_BRIDGE_ADDRESS=0x8397be90BCF57b0B71219f555Fe121b22e5a994C
-COMMON_FOREIGN_BRIDGE_ADDRESS=0x1feB40aD9420b186F019A717c37f5546165d411E
+COMMON_HOME_BRIDGE_ADDRESS=0x0AEe1FCD12dDFab6265F7f8956e6E012A9Fe4Aa0
+COMMON_FOREIGN_BRIDGE_ADDRESS=0x0AEe1FCD12dDFab6265F7f8956e6E012A9Fe4Aa0
 MONITOR_HOME_START_BLOCK=0
 MONITOR_FOREIGN_START_BLOCK=0
 MONITOR_VALIDATOR_HOME_TX_LIMIT=300000

e2e-commons/components-envs/monitor-erc20-native.env

@@ -1,7 +1,7 @@
 COMMON_HOME_RPC_URL=http://parity1:8545
 COMMON_FOREIGN_RPC_URL=http://parity2:8545
-COMMON_HOME_BRIDGE_ADDRESS=0x5118AC62AE912Dd5B51EEfF7338c4fcb0248Ba8c
-COMMON_FOREIGN_BRIDGE_ADDRESS=0x32198D570fffC7033641F8A9094FFDCaAEF42624
+COMMON_HOME_BRIDGE_ADDRESS=0x488Af810997eD1730cB3a3918cD83b3216E6eAda
+COMMON_FOREIGN_BRIDGE_ADDRESS=0x488Af810997eD1730cB3a3918cD83b3216E6eAda
 MONITOR_HOME_START_BLOCK=0
 MONITOR_FOREIGN_START_BLOCK=0
 MONITOR_VALIDATOR_HOME_TX_LIMIT=300000

e2e-commons/components-envs/monitor-erc20.env

@@ -0,0 +1,20 @@
+COMMON_HOME_RPC_URL=http://parity1:8545
+COMMON_FOREIGN_RPC_URL=http://parity2:8545
+COMMON_HOME_BRIDGE_ADDRESS=0x1feB40aD9420b186F019A717c37f5546165d411E
+COMMON_FOREIGN_BRIDGE_ADDRESS=0x4a58D6d8D416a5fBCAcf3dC52eb8bE8948E25127
+MONITOR_HOME_START_BLOCK=0
+MONITOR_FOREIGN_START_BLOCK=0
+MONITOR_VALIDATOR_HOME_TX_LIMIT=300000
+COMMON_HOME_GAS_PRICE_SUPPLIER_URL=https://gasprice.poa.network/
+COMMON_HOME_GAS_PRICE_SPEED_TYPE=standard
+COMMON_HOME_GAS_PRICE_FALLBACK=1000000000
+COMMON_HOME_GAS_PRICE_FACTOR=1
+MONITOR_VALIDATOR_FOREIGN_TX_LIMIT=300000
+COMMON_FOREIGN_GAS_PRICE_SUPPLIER_URL=https://gasprice.poa.network/
+COMMON_FOREIGN_GAS_PRICE_SPEED_TYPE=standard
+COMMON_FOREIGN_GAS_PRICE_FALLBACK=1000000000
+COMMON_FOREIGN_GAS_PRICE_FACTOR=1
+MONITOR_TX_NUMBER_THRESHOLD=100
+MONITOR_PORT=3011
+MONITOR_BRIDGE_NAME=bridge
+MONITOR_CACHE_EVENTS=false

e2e-commons/components-envs/monitor.env

@@ -0,0 +1,20 @@
+COMMON_HOME_RPC_URL=http://parity1:8545
+COMMON_FOREIGN_RPC_URL=http://parity2:8545
+COMMON_HOME_BRIDGE_ADDRESS=0x32198D570fffC7033641F8A9094FFDCaAEF42624
+COMMON_FOREIGN_BRIDGE_ADDRESS=0x2B6871b9B02F73fa24F4864322CdC78604207769
+MONITOR_HOME_START_BLOCK=0
+MONITOR_FOREIGN_START_BLOCK=0
+MONITOR_VALIDATOR_HOME_TX_LIMIT=300000
+COMMON_HOME_GAS_PRICE_SUPPLIER_URL=https://gasprice.poa.network/
+COMMON_HOME_GAS_PRICE_SPEED_TYPE=standard
+COMMON_HOME_GAS_PRICE_FALLBACK=1000000000
+COMMON_HOME_GAS_PRICE_FACTOR=1
+MONITOR_VALIDATOR_FOREIGN_TX_LIMIT=300000
+COMMON_FOREIGN_GAS_PRICE_SUPPLIER_URL=https://gasprice.poa.network/
+COMMON_FOREIGN_GAS_PRICE_SPEED_TYPE=standard
+COMMON_FOREIGN_GAS_PRICE_FALLBACK=1000000000
+COMMON_FOREIGN_GAS_PRICE_FACTOR=1
+MONITOR_TX_NUMBER_THRESHOLD=100
+MONITOR_PORT=3010
+MONITOR_BRIDGE_NAME=bridge
+MONITOR_CACHE_EVENTS=false

e2e-commons/components-envs/oracle-amb.env

@@ -4,14 +4,16 @@ ORACLE_QUEUE_URL=amqp://rabbit
 ORACLE_REDIS_URL=redis://redis
 COMMON_HOME_RPC_URL=http://parity1:8545
 COMMON_FOREIGN_RPC_URL=http://parity2:8545
-COMMON_HOME_BRIDGE_ADDRESS=0x8397be90BCF57b0B71219f555Fe121b22e5a994C
-COMMON_FOREIGN_BRIDGE_ADDRESS=0x1feB40aD9420b186F019A717c37f5546165d411E
-COMMON_HOME_GAS_PRICE_SUPPLIER_URL=
+COMMON_HOME_BRIDGE_ADDRESS=0x0AEe1FCD12dDFab6265F7f8956e6E012A9Fe4Aa0
+COMMON_FOREIGN_BRIDGE_ADDRESS=0x0AEe1FCD12dDFab6265F7f8956e6E012A9Fe4Aa0
+ORACLE_VALIDATOR_ADDRESS=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY=8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9
+COMMON_HOME_GAS_PRICE_SUPPLIER_URL=https://gasprice.poa.network/
 COMMON_HOME_GAS_PRICE_SPEED_TYPE=standard
 COMMON_HOME_GAS_PRICE_FALLBACK=1000000000
 ORACLE_HOME_GAS_PRICE_UPDATE_INTERVAL=600000
 COMMON_HOME_GAS_PRICE_FACTOR=1
-COMMON_FOREIGN_GAS_PRICE_SUPPLIER_URL=
+COMMON_FOREIGN_GAS_PRICE_SUPPLIER_URL=https://gasprice.poa.network/
 COMMON_FOREIGN_GAS_PRICE_SPEED_TYPE=standard
 COMMON_FOREIGN_GAS_PRICE_FALLBACK=10000000000
 ORACLE_FOREIGN_GAS_PRICE_UPDATE_INTERVAL=600000
@@ -22,4 +24,3 @@ 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_FOREIGN_ARCHIVE_RPC_URL=http://parity2:8545

e2e-commons/components-envs/oracle-erc20-native.env

@@ -4,8 +4,10 @@ ORACLE_QUEUE_URL=amqp://rabbit
 ORACLE_REDIS_URL=redis://redis
 COMMON_HOME_RPC_URL=http://parity1:8545
 COMMON_FOREIGN_RPC_URL=http://parity2:8545
-COMMON_HOME_BRIDGE_ADDRESS=0x5118AC62AE912Dd5B51EEfF7338c4fcb0248Ba8c
-COMMON_FOREIGN_BRIDGE_ADDRESS=0x32198D570fffC7033641F8A9094FFDCaAEF42624
+COMMON_HOME_BRIDGE_ADDRESS=0x488Af810997eD1730cB3a3918cD83b3216E6eAda
+COMMON_FOREIGN_BRIDGE_ADDRESS=0x488Af810997eD1730cB3a3918cD83b3216E6eAda
+ORACLE_VALIDATOR_ADDRESS=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY=8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9
 COMMON_HOME_GAS_PRICE_SUPPLIER_URL=https://gasprice.poa.network/
 COMMON_HOME_GAS_PRICE_SPEED_TYPE=standard
 COMMON_HOME_GAS_PRICE_FALLBACK=1

e2e-commons/components-envs/oracle-erc20.env

@@ -0,0 +1,25 @@
+
+ORACLE_BRIDGE_MODE=ERC_TO_ERC
+ORACLE_QUEUE_URL=amqp://rabbit
+ORACLE_REDIS_URL=redis://redis
+COMMON_HOME_RPC_URL=http://parity1:8545
+COMMON_FOREIGN_RPC_URL=http://parity2:8545
+COMMON_HOME_BRIDGE_ADDRESS=0x1feB40aD9420b186F019A717c37f5546165d411E
+COMMON_FOREIGN_BRIDGE_ADDRESS=0x4a58D6d8D416a5fBCAcf3dC52eb8bE8948E25127
+ORACLE_VALIDATOR_ADDRESS=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY=8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9
+COMMON_HOME_GAS_PRICE_SUPPLIER_URL=https://gasprice.poa.network/
+COMMON_HOME_GAS_PRICE_SPEED_TYPE=standard
+COMMON_HOME_GAS_PRICE_FALLBACK=1
+ORACLE_HOME_GAS_PRICE_UPDATE_INTERVAL=600000
+COMMON_HOME_GAS_PRICE_FACTOR=1
+COMMON_FOREIGN_GAS_PRICE_SUPPLIER_URL=https://gasprice.poa.network/
+COMMON_FOREIGN_GAS_PRICE_SPEED_TYPE=standard
+COMMON_FOREIGN_GAS_PRICE_FALLBACK=1
+ORACLE_FOREIGN_GAS_PRICE_UPDATE_INTERVAL=600000
+COMMON_FOREIGN_GAS_PRICE_FACTOR=0.1
+ORACLE_HOME_RPC_POLLING_INTERVAL=500
+ORACLE_FOREIGN_RPC_POLLING_INTERVAL=500
+ORACLE_ALLOW_HTTP_FOR_RPC=yes
+ORACLE_HOME_START_BLOCK=1
+ORACLE_FOREIGN_START_BLOCK=1

e2e-commons/components-envs/oracle.env

@@ -0,0 +1,25 @@
+
+ORACLE_BRIDGE_MODE=NATIVE_TO_ERC
+ORACLE_QUEUE_URL=amqp://rabbit
+ORACLE_REDIS_URL=redis://redis
+COMMON_HOME_RPC_URL=http://parity1:8545
+COMMON_FOREIGN_RPC_URL=http://parity2:8545
+COMMON_HOME_BRIDGE_ADDRESS=0x32198D570fffC7033641F8A9094FFDCaAEF42624
+COMMON_FOREIGN_BRIDGE_ADDRESS=0x2B6871b9B02F73fa24F4864322CdC78604207769
+ORACLE_VALIDATOR_ADDRESS=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY=8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9
+COMMON_HOME_GAS_PRICE_SUPPLIER_URL=https://gasprice.poa.network/
+COMMON_HOME_GAS_PRICE_SPEED_TYPE=standard
+COMMON_HOME_GAS_PRICE_FALLBACK=1
+ORACLE_HOME_GAS_PRICE_UPDATE_INTERVAL=600000
+COMMON_HOME_GAS_PRICE_FACTOR=1
+COMMON_FOREIGN_GAS_PRICE_SUPPLIER_URL=https://gasprice.poa.network/
+COMMON_FOREIGN_GAS_PRICE_SPEED_TYPE=standard
+COMMON_FOREIGN_GAS_PRICE_FALLBACK=1
+ORACLE_FOREIGN_GAS_PRICE_UPDATE_INTERVAL=600000
+COMMON_FOREIGN_GAS_PRICE_FACTOR=0.1
+ORACLE_HOME_RPC_POLLING_INTERVAL=500
+ORACLE_FOREIGN_RPC_POLLING_INTERVAL=500
+ORACLE_ALLOW_HTTP_FOR_RPC=yes
+ORACLE_HOME_START_BLOCK=1
+ORACLE_FOREIGN_START_BLOCK=1

e2e-commons/constants.json

@@ -35,26 +35,34 @@
     "address": "0xB4579fd5AfEaB60B03Db3F408AAdD315035943f7",
     "privateKey": "0xd6143d390d8b28c33601bb0fe29392fb1c35c24ccfe8722c09c2bdd6ada2699f"
   },
+  "nativeToErcBridge": {
+    "home": "0x32198D570fffC7033641F8A9094FFDCaAEF42624",
+    "foreign": "0x2B6871b9B02F73fa24F4864322CdC78604207769",
+    "foreignToken": "0xdbeE25CbE97e4A5CC6c499875774dc7067E9426B",
+    "monitor": "http://monitor:3010/bridge"
+  },
+  "ercToErcBridge": {
+    "home": "0x1feB40aD9420b186F019A717c37f5546165d411E",
+    "foreign": "0x4a58D6d8D416a5fBCAcf3dC52eb8bE8948E25127",
+    "homeToken": "0x792455a6bCb62Ed4C4362D323E0590654CA4765c",
+    "foreignToken": "0x3C665A31199694Bf723fD08844AD290207B5797f",
+    "monitor": "http://monitor-erc20:3011/bridge"
+  },
   "ercToNativeBridge": {
-    "home": "0x5118AC62AE912Dd5B51EEfF7338c4fcb0248Ba8c",
-    "foreign": "0x32198D570fffC7033641F8A9094FFDCaAEF42624",
-    "foreignToken": "0x6B175474E89094C44Da98b954EedeAC495271d0F",
+    "home": "0x488Af810997eD1730cB3a3918cD83b3216E6eAda",
+    "foreign": "0x488Af810997eD1730cB3a3918cD83b3216E6eAda",
+    "foreignToken": "0x7cc4b1851c35959d34e635a470f6b5c43ba3c9c9",
+    "chaiToken": "0x06af07097c9eeb7fd685c692751d5c66db49c215",
     "monitor": "http://monitor-erc20-native:3012/bridge"
   },
   "amb": {
-    "home": "0x8397be90BCF57b0B71219f555Fe121b22e5a994C",
-    "foreign": "0x1feB40aD9420b186F019A717c37f5546165d411E",
-    "homeBox": "0xb008E9076fCbDB2C3AF84225Bc07Eb35B2bE5ECD",
-    "foreignBox": "0x4a58D6d8D416a5fBCAcf3dC52eb8bE8948E25127",
-    "blockedHomeBox": "0xF9698Eb93702dfdd0e2d802088d4c21822a8A977",
+    "home": "0x0AEe1FCD12dDFab6265F7f8956e6E012A9Fe4Aa0",
+    "foreign": "0x0AEe1FCD12dDFab6265F7f8956e6E012A9Fe4Aa0",
+    "homeBox": "0x6C4EaAb8756d53Bf599FFe2347FAFF1123D6C8A1",
+    "foreignBox": "0x6C4EaAb8756d53Bf599FFe2347FAFF1123D6C8A1",
+    "blockedHomeBox": "0x6f359aC418a5f7538F7755A33C9c7dDf38785524",
     "monitor": "http://monitor-amb:3013/bridge"
   },
-  "amb2": {
-    "home": "0x5A42E119990c3F3A80Fea20aAF4c3Ff4DB240Cc9",
-    "foreign": "0x897527391ad3837604973d78D3514f44c36AB9FC",
-    "homeBox": "0xb008E9076fCbDB2C3AF84225Bc07Eb35B2bE5ECD",
-    "foreignBox": "0x4a58D6d8D416a5fBCAcf3dC52eb8bE8948E25127"
-  },
   "homeRPC": {
     "URL": "http://parity1:8545",
     "ID": "77"

e2e-commons/contracts-envs/amb.env

@@ -9,7 +9,7 @@ HOME_RPC_URL=http://parity1:8545
 HOME_BRIDGE_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
 HOME_VALIDATORS_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
 HOME_UPGRADEABLE_ADMIN=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
-HOME_MAX_AMOUNT_PER_TX=2000000
+HOME_MAX_AMOUNT_PER_TX=8000000
 HOME_REQUIRED_BLOCK_CONFIRMATIONS=1
 HOME_GAS_PRICE=1000000000
 
@@ -17,7 +17,7 @@ FOREIGN_RPC_URL=http://parity2:8545
 FOREIGN_BRIDGE_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
 FOREIGN_VALIDATORS_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
 FOREIGN_UPGRADEABLE_ADMIN=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
-FOREIGN_MAX_AMOUNT_PER_TX=2000000
+FOREIGN_MAX_AMOUNT_PER_TX=8000000
 FOREIGN_REQUIRED_BLOCK_CONFIRMATIONS=1
 FOREIGN_GAS_PRICE=10000000000
 

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

@@ -0,0 +1,40 @@
+BRIDGE_MODE=ERC_TO_ERC
+DEPLOYMENT_ACCOUNT_PRIVATE_KEY=8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9
+HOME_DEPLOYMENT_GAS_PRICE=10000000000
+FOREIGN_DEPLOYMENT_GAS_PRICE=10000000000
+GET_RECEIPT_INTERVAL_IN_MILLISECONDS=50
+DEPLOYMENT_GAS_LIMIT_EXTRA=0.2
+DEPLOY_REWARDABLE_TOKEN=false
+
+BRIDGEABLE_TOKEN_NAME="Your New Bridged Token"
+BRIDGEABLE_TOKEN_SYMBOL="TEST"
+BRIDGEABLE_TOKEN_DECIMALS="18"
+
+HOME_RPC_URL=http://parity1:8545
+HOME_BRIDGE_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+HOME_VALIDATORS_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+HOME_UPGRADEABLE_ADMIN=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+HOME_DAILY_LIMIT=30000000000000000000000000
+HOME_MAX_AMOUNT_PER_TX=1500000000000000000000000
+HOME_MIN_AMOUNT_PER_TX=10000000000000000
+HOME_REQUIRED_BLOCK_CONFIRMATIONS=1
+HOME_GAS_PRICE=1000000000
+HOME_REWARDABLE=false
+
+FOREIGN_RPC_URL=http://parity2:8545
+FOREIGN_BRIDGE_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+FOREIGN_VALIDATORS_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+FOREIGN_UPGRADEABLE_ADMIN=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+FOREIGN_DAILY_LIMIT=15000000000000000000000000
+FOREIGN_MAX_AMOUNT_PER_TX=750000000000000000000000
+FOREIGN_MIN_AMOUNT_PER_TX=10000000000000000
+FOREIGN_REQUIRED_BLOCK_CONFIRMATIONS=1
+FOREIGN_GAS_PRICE=10000000000
+FOREIGN_REWARDABLE=false
+ERC20_TOKEN_ADDRESS=0x3C665A31199694Bf723fD08844AD290207B5797f
+
+REQUIRED_NUMBER_OF_VALIDATORS=1
+VALIDATORS="0xaaB52d66283F7A1D5978bcFcB55721ACB467384b 0xdCC784657C78054aa61FbcFFd2605F32374816A4 0xDcef88209a20D52165230104B245803C3269454d"
+BLOCK_REWARD_ADDRESS=0x0000000000000000000000000000000000000000
+DPOS_STAKING_ADDRESS=0x0000000000000000000000000000000000000000
+ERC20_EXTENDED_BY_ERC677=false

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

@@ -31,8 +31,8 @@ FOREIGN_REQUIRED_BLOCK_CONFIRMATIONS=1
 FOREIGN_GAS_PRICE=10000000000
 FOREIGN_REWARDABLE=false
 
-BLOCK_REWARD_ADDRESS=0xdbeE25CbE97e4A5CC6c499875774dc7067E9426B
-ERC20_TOKEN_ADDRESS=0x6B175474E89094C44Da98b954EedeAC495271d0F
+BLOCK_REWARD_ADDRESS=0xF9698Eb93702dfdd0e2d802088d4c21822a8A977
+ERC20_TOKEN_ADDRESS=0x7cc4b1851c35959d34e635a470f6b5c43ba3c9c9
 
 REQUIRED_NUMBER_OF_VALIDATORS=1
 VALIDATORS="0xaaB52d66283F7A1D5978bcFcB55721ACB467384b 0xdCC784657C78054aa61FbcFFd2605F32374816A4 0xDcef88209a20D52165230104B245803C3269454d"

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

@@ -0,0 +1,38 @@
+BRIDGE_MODE=NATIVE_TO_ERC
+DEPLOYMENT_ACCOUNT_ADDRESS=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+DEPLOYMENT_ACCOUNT_PRIVATE_KEY=8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9
+HOME_DEPLOYMENT_GAS_PRICE=10000000000
+FOREIGN_DEPLOYMENT_GAS_PRICE=10000000000
+GET_RECEIPT_INTERVAL_IN_MILLISECONDS=50
+DEPLOYMENT_GAS_LIMIT_EXTRA=0.2
+DEPLOY_REWARDABLE_TOKEN=false
+
+BRIDGEABLE_TOKEN_NAME="Your New Bridged Token"
+BRIDGEABLE_TOKEN_SYMBOL="TEST"
+BRIDGEABLE_TOKEN_DECIMALS="18"
+
+HOME_RPC_URL=http://parity1:8545
+HOME_BRIDGE_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+HOME_VALIDATORS_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+HOME_UPGRADEABLE_ADMIN=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+HOME_DAILY_LIMIT=30000000000000000000000000
+HOME_MAX_AMOUNT_PER_TX=1500000000000000000000000
+HOME_MIN_AMOUNT_PER_TX=10000000000000000
+HOME_REQUIRED_BLOCK_CONFIRMATIONS=1
+HOME_GAS_PRICE=1000000000
+HOME_REWARDABLE=false
+
+FOREIGN_RPC_URL=http://parity2:8545
+FOREIGN_BRIDGE_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+FOREIGN_VALIDATORS_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+FOREIGN_UPGRADEABLE_ADMIN=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+FOREIGN_DAILY_LIMIT=15000000000000000000000000
+FOREIGN_MAX_AMOUNT_PER_TX=750000000000000000000000
+FOREIGN_MIN_AMOUNT_PER_TX=10000000000000000
+FOREIGN_REQUIRED_BLOCK_CONFIRMATIONS=1
+FOREIGN_GAS_PRICE=10000000000
+FOREIGN_REWARDABLE=false
+
+REQUIRED_NUMBER_OF_VALIDATORS=1
+VALIDATORS="0xaaB52d66283F7A1D5978bcFcB55721ACB467384b 0xdCC784657C78054aa61FbcFFd2605F32374816A4 0xDcef88209a20D52165230104B245803C3269454d"
+BLOCK_REWARD_ADDRESS=0x0000000000000000000000000000000000000000

e2e-commons/docker-compose.yml

@@ -27,6 +27,25 @@ services:
     image: "rabbitmq:3-management"
     networks:
       - ultimate
+  oracle:
+    image: ${DOCKER_IMAGE_BASE:-tokenbridge}/tokenbridge-e2e-oracle:${ORACLE_TAG:-local}
+    build:
+      context: ..
+      dockerfile: oracle/Dockerfile
+    env_file: ../e2e-commons/components-envs/oracle.env
+    environment:
+    - NODE_ENV=production
+    command: "true"
+    networks:
+      - ultimate
+  oracle-erc20:
+    image: ${DOCKER_IMAGE_BASE:-tokenbridge}/tokenbridge-e2e-oracle:${ORACLE_TAG:-local}
+    env_file: ../e2e-commons/components-envs/oracle-erc20.env
+    environment:
+    - NODE_ENV=production
+    command: "true"
+    networks:
+      - ultimate
   oracle-erc20-native:
     image: ${DOCKER_IMAGE_BASE:-tokenbridge}/tokenbridge-e2e-oracle:${ORACLE_TAG:-local}
     env_file: ../e2e-commons/components-envs/oracle-erc20-native.env
@@ -40,9 +59,6 @@ services:
       - ultimate
   oracle-amb:
     image: ${DOCKER_IMAGE_BASE:-tokenbridge}/tokenbridge-e2e-oracle:${ORACLE_TAG:-local}
-    build:
-      context: ..
-      dockerfile: oracle/Dockerfile
     env_file: ../e2e-commons/components-envs/oracle-amb.env
     environment:
     - NODE_ENV=production
@@ -62,6 +78,25 @@ services:
     command: "true"
     networks:
       - ultimate
+  monitor:
+    image: ${DOCKER_IMAGE_BASE:-tokenbridge}/tokenbridge-e2e-monitor:${MONITOR_TAG:-local}
+    build:
+      context: ..
+      dockerfile: monitor/Dockerfile
+    env_file: ../e2e-commons/components-envs/monitor.env
+    entrypoint: yarn check-and-start
+    ports:
+      - "3010:3010"
+    networks:
+      - ultimate
+  monitor-erc20:
+    image: ${DOCKER_IMAGE_BASE:-tokenbridge}/tokenbridge-e2e-monitor:${MONITOR_TAG:-local}
+    env_file: ../e2e-commons/components-envs/monitor-erc20.env
+    entrypoint: yarn check-and-start
+    ports:
+      - "3011:3011"
+    networks:
+      - ultimate
   monitor-erc20-native:
     image: ${DOCKER_IMAGE_BASE:-tokenbridge}/tokenbridge-e2e-monitor:${MONITOR_TAG:-local}
     env_file: ../e2e-commons/components-envs/monitor-erc20-native.env
@@ -72,9 +107,6 @@ services:
       - ultimate
   monitor-amb:
     image: ${DOCKER_IMAGE_BASE:-tokenbridge}/tokenbridge-e2e-monitor:${MONITOR_TAG:-local}
-    build:
-      context: ..
-      dockerfile: monitor/Dockerfile
     env_file: ../e2e-commons/components-envs/monitor-amb.env
     entrypoint: yarn check-and-start
     ports:

e2e-commons/down.sh

@@ -1,37 +1,10 @@
 #!/usr/bin/env bash
 cd $(dirname $0)
 
-if [ $CI ]; then
-  rm -rf logs || true
-
-  mkdir ./logs
-
-  for project in "" validator{1,2,3}; do
-    for container in $(docker-compose -p "$project" ps | tail -n +3 | awk '{print $1}') ; do
-      if [[ -z "$project" ]]; then
-        path="./logs/$container.log"
-      else
-        mkdir -p "./logs/$project"
-        path="./logs/$project/$container.log"
-      fi
-      docker logs "$container" > "$path" 2>&1
-    done
-  done
-
-  touch ../oracle/.env
-  for file in ../oracle/docker-compose-{amb,transfer}.yml; do
-    for container in $(docker-compose -f "$file" ps | tail -n +3 | awk '{print $1}') ; do
-      mkdir -p "./logs/oracle"
-      docker logs "$container" > "./logs/oracle/$container.log" 2>&1
-    done
-  done
-
-  exit $rc;
-fi
+if [ $CI ]; then exit $rc; fi
 
 ps | grep node | grep -v grep | grep -v yarn | awk '{print "kill " $1}' | /bin/bash
 docker-compose down
-docker-compose -p validator1 down
 docker-compose -p validator2 down
 docker-compose -p validator3 down
 docker network rm ultimate || true

e2e-commons/keystore.json

@@ -1 +0,0 @@
-[{"version":3,"id":"e7e64a1b-5e61-4c17-a473-963d2bbb59e5","address":"d138a69eb2da1c3518e792737c820b23cce62e4b","crypto":{"ciphertext":"f6ddf0b2638fb9fd5777de2aa07937b5ee9bc17acc74c8e6e6580e2dfd0d3de6","cipherparams":{"iv":"bcdbc5af4582887e5cdcf264e8d5b80d"},"cipher":"aes-128-ctr","kdf":"scrypt","kdfparams":{"dklen":32,"salt":"f9e621918990e64e278e0fb8cf0343219e1cceaea8547d50fae452ad8f42f231","n":8192,"r":8,"p":1},"mac":"34149cd0b3ddea52588825d403fb75cfb8b864b616d455f75f2de001cc2601ed"}}]

e2e-commons/pull.sh

@@ -5,11 +5,9 @@ set -e # exit when any command fails
 docker-compose pull e2e
 while [ "$1" != "" ]; do
   if [ "$1" == "oracle" ]; then
-    docker-compose pull oracle-amb
-  elif [ "$1" == "alm-e2e" ]; then
-    docker-compose pull oracle-amb
+    docker-compose pull oracle
   elif [ "$1" == "monitor" ]; then
-    docker-compose pull monitor-amb
+    docker-compose pull monitor
   elif [ "$1" == "alm" ]; then
     docker-compose pull alm
   fi

e2e-commons/scripts/deploy.sh

@@ -9,13 +9,26 @@ ENVS_PATH="../contracts-envs"
 # mock bridge validators contract with the one with deterministic isValidatorDuty
 mv "$CONTRACTS_PATH/build/contracts/BridgeValidatorsDeterministic.json" "$CONTRACTS_PATH/build/contracts/BridgeValidators.json"
 
+echo -e "\n\n############ Deploying native-to-erc ############\n"
+cp "$ENVS_PATH/native-to-erc.env" "$DEPLOY_PATH/.env"
+cd "$DEPLOY_PATH"
+node deploy.js
+cd - > /dev/null
+
+echo -e "\n\n############ Deploying erc20 and erc-to-erc ############\n"
+node deployERC20.js
+cp "$ENVS_PATH/erc-to-erc.env" "$DEPLOY_PATH/.env"
+cd "$DEPLOY_PATH"
+node deploy.js
+cd - > /dev/null
+
 echo -e "\n\n############ Deploying block reward ############\n"
-cp "$ENVS_PATH/erc-to-native.env" "$DEPLOY_PATH/.env"
 cd "$DEPLOY_PATH"
 node src/utils/deployBlockReward.js
 cd - > /dev/null
 
 echo -e "\n\n############ Deploying erc-to-native ############\n"
+cp "$ENVS_PATH/erc-to-native.env" "$DEPLOY_PATH/.env"
 cd "$DEPLOY_PATH"
 node deploy.js
 cd - > /dev/null
@@ -35,9 +48,3 @@ echo -e "\n\n############ Deploying one more test contract for amb ############\
 cd "$DEPLOY_PATH"
 node src/utils/deployTestBox.js
 cd - > /dev/null
-
-echo -e "\n\n############ Deploying one more amb without oracle for confirm relay tests ############\n"
-cp "$ENVS_PATH/amb.env" "$DEPLOY_PATH/.env"
-cd "$DEPLOY_PATH"
-node deploy.js
-cd - > /dev/null

e2e-commons/scripts/deployBridgeTokenRewardable.js

@@ -0,0 +1,43 @@
+const path = require('path')
+const { user } = require('../constants.json')
+const contractsPath = '../../contracts'
+require('dotenv').config({
+  path: path.join(__dirname, contractsPath, '/deploy/.env')
+})
+
+const { deployContract, sendRawTxHome, privateKeyToAddress } = require(`${contractsPath}/deploy/src/deploymentUtils`)
+const { web3Home, deploymentPrivateKey } = require(`${contractsPath}/deploy/src/web3`)
+const ERC677BridgeTokenRewardable = require(`${contractsPath}/build/contracts/ERC677BridgeTokenRewardable.json`)
+
+const { DEPLOYMENT_ACCOUNT_PRIVATE_KEY } = process.env
+const DEPLOYMENT_ACCOUNT_ADDRESS = privateKeyToAddress(DEPLOYMENT_ACCOUNT_PRIVATE_KEY)
+
+async function deployBridgeTokenRewardable() {
+  try {
+    let homeNonce = await web3Home.eth.getTransactionCount(DEPLOYMENT_ACCOUNT_ADDRESS)
+    console.log('\n[Home] Deploying ERC677BridgeTokenRewardable Test token')
+    const stakeToken = await deployContract(ERC677BridgeTokenRewardable, ['STAKE', 'STAKE', '18', '77'], {
+      from: DEPLOYMENT_ACCOUNT_ADDRESS,
+      network: 'home',
+      nonce: homeNonce
+    })
+    homeNonce++
+    console.log('[Home] Stake Token: ', stakeToken.options.address)
+
+    const mintData = await stakeToken.methods
+      .mint(user.address, '500000000000000000000')
+      .encodeABI({ from: DEPLOYMENT_ACCOUNT_ADDRESS })
+    await sendRawTxHome({
+      data: mintData,
+      nonce: homeNonce,
+      to: stakeToken.options.address,
+      privateKey: deploymentPrivateKey,
+      url: process.env.HOME_RPC_URL
+    })
+  } catch (e) {
+    console.log(e)
+    throw e
+  }
+}
+
+deployBridgeTokenRewardable()

e2e-commons/scripts/deployERC20.js

@@ -0,0 +1,51 @@
+/* eslint import/no-unresolved: 0  node/no-missing-require: 0 */
+const path = require('path')
+const {user} = require('../constants.json')
+const contractsPath = '../../contracts';
+require('dotenv').config({
+  path: path.join(__dirname, contractsPath, '/deploy/.env')
+})
+
+const {
+  deployContract,
+  sendRawTxForeign,
+  privateKeyToAddress
+} = require(`${contractsPath}/deploy/src/deploymentUtils`)
+const {
+  web3Foreign,
+  deploymentPrivateKey
+} = require(`${contractsPath}/deploy/src/web3`)
+const POA20 = require(`${contractsPath}/build/contracts/ERC677BridgeToken.json`)
+
+const { DEPLOYMENT_ACCOUNT_PRIVATE_KEY } = process.env
+const DEPLOYMENT_ACCOUNT_ADDRESS = privateKeyToAddress(DEPLOYMENT_ACCOUNT_PRIVATE_KEY)
+
+async function deployErc20() {
+  try {
+    let foreignNonce = await web3Foreign.eth.getTransactionCount(DEPLOYMENT_ACCOUNT_ADDRESS)
+    console.log('\n[Foreign] Deploying POA20 Test token')
+    const poa20foreign = await deployContract(POA20, ['POA ERC20 Test', 'POA20', 18], {
+      from: DEPLOYMENT_ACCOUNT_ADDRESS,
+      network: 'foreign',
+      nonce: foreignNonce
+    })
+    foreignNonce++
+    console.log('[Foreign] POA20 Test: ', poa20foreign.options.address)
+
+    const mintData = await poa20foreign.methods
+      .mint(user.address, '500000000000000000000')
+      .encodeABI({ from: DEPLOYMENT_ACCOUNT_ADDRESS })
+    await sendRawTxForeign({
+      data: mintData,
+      nonce: foreignNonce,
+      to: poa20foreign.options.address,
+      privateKey: deploymentPrivateKey,
+      url: process.env.FOREIGN_RPC_URL
+    })
+  } catch (e) {
+    console.log(e)
+    throw e;
+  }
+}
+
+deployErc20()

e2e-commons/scripts/deployMultiBridgeToken.js

@@ -0,0 +1,43 @@
+const path = require('path')
+const { user } = require('../constants.json')
+const contractsPath = '../../contracts'
+require('dotenv').config({
+  path: path.join(__dirname, contractsPath, '/deploy/.env')
+})
+
+const { deployContract, sendRawTxForeign, privateKeyToAddress } = require(`${contractsPath}/deploy/src/deploymentUtils`)
+const { web3Foreign, deploymentPrivateKey } = require(`${contractsPath}/deploy/src/web3`)
+const ERC677MultiBridgeToken = require(`${contractsPath}/build/contracts/ERC677MultiBridgeToken.json`)
+
+const { DEPLOYMENT_ACCOUNT_PRIVATE_KEY } = process.env
+const DEPLOYMENT_ACCOUNT_ADDRESS = privateKeyToAddress(DEPLOYMENT_ACCOUNT_PRIVATE_KEY)
+
+async function deployMultiBridgeToken() {
+  try {
+    let foreignNonce = await web3Foreign.eth.getTransactionCount(DEPLOYMENT_ACCOUNT_ADDRESS)
+    console.log('\n[Foreign] Deploying ERC677MultiBridgeToken Test token')
+    const stakeToken = await deployContract(ERC677MultiBridgeToken, ['STAKE', 'STAKE', '18', '42'], {
+      from: DEPLOYMENT_ACCOUNT_ADDRESS,
+      network: 'foreign',
+      nonce: foreignNonce
+    })
+    foreignNonce++
+    console.log('[Foreign] Stake Token: ', stakeToken.options.address)
+
+    const mintData = await stakeToken.methods
+      .mint(user.address, '500000000000000000000')
+      .encodeABI({ from: DEPLOYMENT_ACCOUNT_ADDRESS })
+    await sendRawTxForeign({
+      data: mintData,
+      nonce: foreignNonce,
+      to: stakeToken.options.address,
+      privateKey: deploymentPrivateKey,
+      url: process.env.FOREIGN_RPC_URL
+    })
+  } catch (e) {
+    console.log(e)
+    throw e
+  }
+}
+
+deployMultiBridgeToken()

e2e-commons/up.sh

@@ -15,46 +15,64 @@ docker network create --driver bridge ultimate || true
 docker-compose up -d parity1 parity2 e2e
 
 startValidator () {
-    db_env="-e ORACLE_QUEUE_URL=amqp://$3 -e ORACLE_REDIS_URL=redis://$2"
-
-    docker-compose $1 run -d --name $2 redis
-    docker-compose $1 run -d --name $3 rabbit
-
+    docker-compose $1 run -d --name $4 redis
+    docker-compose $1 run -d --name $5 rabbit
+    if [[ -z "$MODE" || "$MODE" == native-to-erc ]]; then
+      docker-compose $1 run $2 $3 -d oracle yarn watcher:signature-request
+      docker-compose $1 run $2 $3 -d oracle yarn watcher:collected-signatures
+      docker-compose $1 run $2 $3 -d oracle yarn watcher:affirmation-request
+    fi
+    if [[ -z "$MODE" || "$MODE" == erc-to-erc ]]; then
+      docker-compose $1 run $2 $3 -d oracle-erc20 yarn watcher:signature-request
+      docker-compose $1 run $2 $3 -d oracle-erc20 yarn watcher:collected-signatures
+      docker-compose $1 run $2 $3 -d oracle-erc20 yarn watcher:affirmation-request
+      docker-compose $1 run $2 $3 -d oracle-erc20 yarn watcher:transfer
+    fi
     if [[ -z "$MODE" || "$MODE" == erc-to-native ]]; then
-      docker-compose $1 run $oraclePK $db_env -d oracle-erc20-native yarn watcher:signature-request
-      docker-compose $1 run $oracleAddr $db_env -d oracle-erc20-native yarn watcher:collected-signatures
-      docker-compose $1 run $oracleAddr $db_env -d oracle-erc20-native yarn watcher:affirmation-request
-      docker-compose $1 run $oracleAddr $db_env -d oracle-erc20-native yarn watcher:transfer
+      docker-compose $1 run $2 $3 -d oracle-erc20-native yarn watcher:signature-request
+      docker-compose $1 run $2 $3 -d oracle-erc20-native yarn watcher:collected-signatures
+      docker-compose $1 run $2 $3 -d oracle-erc20-native yarn watcher:affirmation-request
+      docker-compose $1 run $2 $3 -d oracle-erc20-native yarn watcher:transfer
+      docker-compose $1 run $2 $3 -d oracle-erc20-native yarn worker:convert-to-chai
     fi
     if [[ -z "$MODE" || "$MODE" == amb ]]; then
-      docker-compose $1 run $oraclePK $db_env -d oracle-amb yarn watcher:signature-request
-      docker-compose $1 run $oracleAddr $db_env -d oracle-amb yarn watcher:collected-signatures
-      docker-compose $1 run $oracleAddr $db_env -d oracle-amb yarn watcher:affirmation-request
-      docker-compose $1 run $oracleAddr $db_env -d oracle-amb yarn watcher:information-request
+      docker-compose $1 run $2 $3 -d oracle-amb yarn watcher:signature-request
+      docker-compose $1 run $2 $3 -d oracle-amb yarn watcher:collected-signatures
+      docker-compose $1 run $2 $3 -d oracle-amb yarn watcher:affirmation-request
     fi
+    docker-compose $1 run $2 $3 -d oracle-erc20-native yarn sender:home
+    docker-compose $1 run $2 $3 -d oracle-erc20-native yarn sender:foreign
+    docker-compose $1 run $2 $3 -d oracle yarn manager:shutdown
+}
 
-    docker-compose $1 run $oraclePK $db_env -d oracle-amb yarn sender:home
-    docker-compose $1 run $oraclePK $db_env -d oracle-amb yarn sender:foreign
-    docker-compose $1 run $oracleAddr $db_env -d oracle-amb yarn manager:shutdown
+startAMBValidator () {
+    docker-compose $1 run -d --name $4 redis
+    docker-compose $1 run -d --name $5 rabbit
+    docker-compose $1 run $2 $3 -d oracle-amb yarn watcher:signature-request
+    docker-compose $1 run $2 $3 -d oracle-amb yarn watcher:collected-signatures
+    docker-compose $1 run $2 $3 -d oracle-amb yarn watcher:affirmation-request
+    docker-compose $1 run $2 $3 -d oracle-amb yarn sender:home
+    docker-compose $1 run $2 $3 -d oracle-amb yarn sender:foreign
+    docker-compose $1 run $2 $3 -d oracle-amb yarn manager:shutdown
 }
 
 while [ "$1" != "" ]; do
   if [ "$1" == "oracle" ]; then
-    oracleAddr="-e ORACLE_VALIDATOR_ADDRESS=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b"
-    oraclePK="-e ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY=8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9"
-    startValidator "-p validator1" redis rabbit
+    startValidator "" "" "" "redis" "rabbit"
   fi
 
   if [ "$1" == "oracle-validator-2" ]; then
-    oracleAddr="-e ORACLE_VALIDATOR_ADDRESS=0xdCC784657C78054aa61FbcFFd2605F32374816A4"
-    oraclePK="-e ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY=5a5c3645d0f04e9eb4f27f94ed4c244a225587405b8838e7456f7781ce3a9513"
-    startValidator "-p validator2" redis2 rabbit2
+    oracle2name="-p validator2"
+    oracle2Values="-e ORACLE_VALIDATOR_ADDRESS=0xdCC784657C78054aa61FbcFFd2605F32374816A4 -e ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY=5a5c3645d0f04e9eb4f27f94ed4c244a225587405b8838e7456f7781ce3a9513"
+    oracle2comp="-e ORACLE_QUEUE_URL=amqp://rabbit2 -e ORACLE_REDIS_URL=redis://redis2"
+    startValidator "$oracle2name" "$oracle2Values" "$oracle2comp" "redis2" "rabbit2"
   fi
 
   if [ "$1" == "oracle-validator-3" ]; then
-    oracleAddr="-e ORACLE_VALIDATOR_ADDRESS=0xDcef88209a20D52165230104B245803C3269454d"
-    oraclePK="-e ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY=f877f62a1c19f852cff1d29f0fb1ecac18821c0080d4cc0520c60c098293dca1"
-    startValidator "-p validator3" redis3 rabbit3
+    oracle3name="-p validator3"
+    oracle3Values="-e ORACLE_VALIDATOR_ADDRESS=0xDcef88209a20D52165230104B245803C3269454d -e ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY=f877f62a1c19f852cff1d29f0fb1ecac18821c0080d4cc0520c60c098293dca1"
+    oracle3comp="-e ORACLE_QUEUE_URL=amqp://rabbit3 -e ORACLE_REDIS_URL=redis://redis3"
+    startValidator "$oracle3name" "$oracle3Values" "$oracle3comp" "redis3" "rabbit3"
   fi
 
   if [ "$1" == "alm" ]; then
@@ -76,50 +94,33 @@ while [ "$1" != "" ]; do
       amb)
         docker-compose up -d monitor-amb
         ;;
+      native-to-erc)
+        docker-compose up -d monitor
+        ;;
+      erc-to-erc)
+        docker-compose up -d monitor-erc20
+        ;;
       erc-to-native)
         docker-compose up -d monitor-erc20-native
         ;;
       *)
-        docker-compose up -d monitor-erc20-native monitor-amb
+        docker-compose up -d monitor monitor-erc20 monitor-erc20-native monitor-amb
         ;;
     esac
   fi
 
   if [ "$1" == "alm-e2e" ]; then
-    MODE=amb
+    startAMBValidator "" "" "" "redis" "rabbit"
 
-    oracleAddr="-e ORACLE_VALIDATOR_ADDRESS=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b"
-    oraclePK="-e ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY=8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9"
-    startValidator "-p validator1" redis rabbit
+    oracle2name="-p validator2"
+    oracle2Values="-e ORACLE_VALIDATOR_ADDRESS=0xdCC784657C78054aa61FbcFFd2605F32374816A4 -e ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY=5a5c3645d0f04e9eb4f27f94ed4c244a225587405b8838e7456f7781ce3a9513"
+    oracle2comp="-e ORACLE_QUEUE_URL=amqp://rabbit2 -e ORACLE_REDIS_URL=redis://redis2"
+    startAMBValidator "$oracle2name" "$oracle2Values" "$oracle2comp" "redis2" "rabbit2"
 
-    oracleAddr="-e ORACLE_VALIDATOR_ADDRESS=0xdCC784657C78054aa61FbcFFd2605F32374816A4"
-    oraclePK="-e ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY=5a5c3645d0f04e9eb4f27f94ed4c244a225587405b8838e7456f7781ce3a9513"
-    startValidator "-p validator2" redis2 rabbit2
-
-    oracleAddr="-e ORACLE_VALIDATOR_ADDRESS=0xDcef88209a20D52165230104B245803C3269454d"
-    oraclePK="-e ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY=f877f62a1c19f852cff1d29f0fb1ecac18821c0080d4cc0520c60c098293dca1"
-    startValidator "-p validator3" redis3 rabbit3
-  fi
-
-  if [ "$1" == "generate-amb-tx" ]; then
-    docker-compose run e2e yarn workspace oracle-e2e run generate-amb-tx
-  fi
-
-  if [ "$1" == "manual-amb-relay" ]; then
-    oraclePK="-e ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY=8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9"
-    env="-e COMMON_HOME_BRIDGE_ADDRESS=0x5A42E119990c3F3A80Fea20aAF4c3Ff4DB240Cc9 -e COMMON_FOREIGN_BRIDGE_ADDRESS=0x897527391ad3837604973d78D3514f44c36AB9FC"
-    # these tx hash are hardcoded and need to be updated manually
-    # once e2e environment setup process is changed
-    echo '0xea625a823bc5018dc3a4efe349f623e5ebb8c987b55f44d50d6556f42af9a400' > txHashes.txt
-    docker-compose -p validator1 run -v $(pwd)/txHashes.txt:/tmp/txHashes.txt $oraclePK $env oracle-amb yarn confirm:affirmation-request \
-      /tmp/txHashes.txt \
-      0x031c42e44485002c9215a5b1b75e9516131485ce29884a58765bf7a0038538f9
-    docker-compose -p validator1 run $oraclePK $env oracle-amb yarn confirm:signature-request \
-      0x1506a18af91afe732167ccbc178b55fc2547da4a814d13c015b6f496cf171754 | tee .tmp.log
-    tx_hash=$(cat .tmp.log | grep generatedTransactionHash | jq -r .generatedTransactionHash)
-    rm .tmp.log
-    rm txHashes.txt
-    docker-compose -p validator1 run $oraclePK $env oracle-amb yarn confirm:collected-signatures $tx_hash
+    oracle3name="-p validator3"
+    oracle3Values="-e ORACLE_VALIDATOR_ADDRESS=0xDcef88209a20D52165230104B245803C3269454d -e ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY=f877f62a1c19f852cff1d29f0fb1ecac18821c0080d4cc0520c60c098293dca1"
+    oracle3comp="-e ORACLE_QUEUE_URL=amqp://rabbit3 -e ORACLE_REDIS_URL=redis://redis3"
+    startAMBValidator "$oracle3name" "$oracle3Values" "$oracle3comp" "redis3" "rabbit3"
   fi
 
   shift # Shift all the parameters down by one

monitor-e2e/package.json

@@ -4,7 +4,7 @@
   "description": "",
   "main": "index.js",
   "scripts": {
-    "start": "mocha --timeout 120000 --exit",
+    "start": "mocha --timeout 120000",
     "lint": "eslint . --ignore-path ../.eslintignore"
   },
   "author": "",
@@ -14,7 +14,7 @@
     "axios": "0.19.0"
   },
   "engines": {
-    "node": ">= 12.22"
+    "node": ">= 10.18"
   },
   "devDependencies": {}
 }

monitor-e2e/periodically-check-all.sh

@@ -1,9 +1,15 @@
 while true; do
-  docker-compose -f ../e2e-commons/docker-compose.yml exec -T monitor-erc20-native yarn check-all
+  docker-compose -f ../e2e-commons/docker-compose.yml exec -T monitor yarn check-all
   pid1=$!
-  docker-compose -f ../e2e-commons/docker-compose.yml exec -T monitor-amb yarn check-all
+  docker-compose -f ../e2e-commons/docker-compose.yml exec -T monitor-erc20 yarn check-all
   pid2=$!
+  docker-compose -f ../e2e-commons/docker-compose.yml exec -T monitor-erc20-native yarn check-all
+  pid3=$!
+  docker-compose -f ../e2e-commons/docker-compose.yml exec -T monitor-amb yarn check-all
+  pid4=$!
 
   wait $pid1
   wait $pid2
+  wait $pid3
+  wait $pid4
 done

monitor-e2e/run-tests.sh

@@ -5,6 +5,12 @@ case "$mode" in
   amb)
     script=./test/amb.js
     ;;
+  native-to-erc)
+    script=./test/nativeToErc.js
+    ;;
+  erc-to-erc)
+    script=./test/ercToErc.js
+    ;;
   erc-to-native)
     script=./test/ercToNative.js
     ;;