Bump molecule version

Playbook improvements
Allow to store validator keystore file in the docker swarm secret
2021-11-08 11:49:25 +03:00 · 2021-11-07 19:57:18 +03:00 · 2021-11-07 12:48:12 +03:00 · 2021-11-03 19:21:35 +03:00 · 2021-10-21 13:33:12 +03:00 · 2021-10-12 18:06:50 +03:00
472 changed files with 11228 additions and 20163 deletions
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -15,7 +15,7 @@ jobs:
    steps:
      - uses: actions/setup-node@v1
        with:
-          node-version: 10
+          node-version: 12
      - uses: actions/checkout@v2
        with:
          submodules: true
@@ -48,7 +48,7 @@ jobs:
    steps:
      - uses: actions/setup-node@v1
        with:
-          node-version: 10
+          node-version: 12
      - uses: actions/checkout@v2
        with:
          submodules: true
@@ -61,31 +61,6 @@ jobs:
          key: ${{ needs.initialize.outputs.cache_key }}
      - name: yarn run ${{ matrix.task }}
        run: ${{ steps.cache-repo.outputs.cache-hit }} && yarn run ${{ matrix.task }}
-  ui-coverage:
-    runs-on: ubuntu-latest
-    needs:
-      - initialize
-    if: github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/tags')
-    steps:
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 10
-      - uses: actions/checkout@v2
-        with:
-          submodules: true
-      - uses: actions/cache@v2
-        id: cache-repo
-        with:
-          path: |
-            **/node_modules
-            contracts/build
-          key: ${{ needs.initialize.outputs.cache_key }}
-      - name: yarn workspace ui run coverage
-        run: ${{ steps.cache-repo.outputs.cache-hit }} && yarn workspace ui run coverage
-      - uses: coverallsapp/github-action@master
-        with:
-          github-token: ${{ github.token }}
-          path-to-lcov: ./ui/coverage/lcov.info
  build-e2e-images:
    runs-on: ubuntu-latest
    steps:
@@ -95,21 +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') }}" >> $GITHUB_ENV
+          echo "E2E_TAG=${{ hashFiles('yarn.lock', 'package.json', 'submodule.status', 'Dockerfile.e2e', 'commons', 'oracle-e2e', 'monitor-e2e', 'e2e-commons') }}" >> $GITHUB_ENV
          echo "ORACLE_TAG=${{ hashFiles('yarn.lock', 'package.json', 'submodule.status', 'commons', 'oracle') }}" >> $GITHUB_ENV
          echo "MONITOR_TAG=${{ hashFiles('yarn.lock', 'package.json', 'submodule.status', 'commons', 'monitor') }}" >> $GITHUB_ENV
-          echo "UI_TAG=${{ hashFiles('yarn.lock', 'package.json', 'submodule.status', 'commons', 'ui') }}" >> $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 -H 'Authorization: bearer ${{ github.token }}' "https://${DOCKER_REGISTRY}/v2/${DOCKER_REPO}/tokenbridge-e2e-$1/manifests/$2" > /dev/null
+            curl -fsSlL "https://${{ github.actor }}:${{ github.token }}@${DOCKER_REGISTRY}/v2/${DOCKER_REPO}/tokenbridge-e2e-$1/manifests/$2" > /dev/null
          }
          updated=()
          if ! check_if_image_exists e2e ${E2E_TAG};         then updated+=("e2e"); fi
-          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 ui ${UI_TAG};           then updated+=("ui"); fi
+          if ! check_if_image_exists oracle ${ORACLE_TAG};   then updated+=("oracle-amb"); fi
+          if ! check_if_image_exists monitor ${MONITOR_TAG}; then updated+=("monitor-amb"); fi
          if ! check_if_image_exists alm ${ALM_TAG};         then updated+=("alm"); fi
          if [ ${#updated[@]} -gt 0 ]; then
            echo "Updated services: ${updated[@]}"
@@ -131,7 +104,7 @@ jobs:
      - name: Rebuild and push molecule runner e2e image
        run: |
          function check_if_image_exists() {
-            curl -fsSlL -H 'Authorization: bearer ${{ github.token }}' "https://${DOCKER_REGISTRY}/v2/${DOCKER_REPO}/tokenbridge-e2e-$1/manifests/$2" > /dev/null
+            curl -fsSlL "https://${{ github.actor }}:${{ github.token }}@${DOCKER_REGISTRY}/v2/${DOCKER_REPO}/tokenbridge-e2e-$1/manifests/$2" > /dev/null
          }
          if check_if_image_exists molecule_runner ${MOLECULE_RUNNER_TAG}; then
            echo "Image already exists"
@@ -149,12 +122,10 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        task: [oracle-e2e, monitor-e2e, alm-e2e, 'ui-e2e:ci']
+        task: [oracle-e2e, monitor-e2e, alm-e2e]
        include:
          - task: alm-e2e
            use-cache: true
-          - task: 'ui-e2e:ci'
-            use-cache: true
    steps:
      - uses: actions/checkout@v2
        with:
@@ -162,10 +133,9 @@ jobs:
      - name: Evaluate e2e docker images tags
        run: |
          git submodule status > submodule.status
-          echo "E2E_TAG=${{ hashFiles('yarn.lock', 'package.json', 'submodule.status', 'Dockerfile.e2e', 'commons', 'oracle-e2e', 'monitor-e2e') }}" >> $GITHUB_ENV
+          echo "E2E_TAG=${{ hashFiles('yarn.lock', 'package.json', 'submodule.status', 'Dockerfile.e2e', 'commons', 'oracle-e2e', 'monitor-e2e', 'e2e-commons') }}" >> $GITHUB_ENV
          echo "ORACLE_TAG=${{ hashFiles('yarn.lock', 'package.json', 'submodule.status', 'commons', 'oracle') }}" >> $GITHUB_ENV
          echo "MONITOR_TAG=${{ hashFiles('yarn.lock', 'package.json', 'submodule.status', 'commons', 'monitor') }}" >> $GITHUB_ENV
-          echo "UI_TAG=${{ hashFiles('yarn.lock', 'package.json', 'submodule.status', 'commons', 'ui') }}" >> $GITHUB_ENV
          echo "ALM_TAG=${{ hashFiles('yarn.lock', 'package.json', 'submodule.status', 'commons', 'alm') }}" >> $GITHUB_ENV
      - if: ${{ matrix.use-cache }}
        uses: actions/cache@v2
@@ -179,6 +149,12 @@ 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:
@@ -187,7 +163,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        task: [oracle, ui, monitor, multiple, repo]
+        task: [oracle, monitor, multiple, repo]
    steps:
      - uses: actions/checkout@v2
        with:
@@ -206,20 +182,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        task: [amb, erc-to-erc, erc-to-native, native-to-erc, amb-stake-erc-to-erc]
-        include:
-          - task: erc-to-erc
-            ui-e2e-grep: 'ERC TO ERC'
-            ui-config: 'e2e-commons/components-envs/ui-erc20.env'
-          - task: erc-to-native
-            ui-e2e-grep: 'ERC TO NATIVE'
-            ui-config: 'e2e-commons/components-envs/ui-erc20-native.env'
-          - task: native-to-erc
-            ui-e2e-grep: 'NATIVE TO ERC'
-            ui-config: 'e2e-commons/components-envs/ui.env'
-          - task: amb-stake-erc-to-erc
-            ui-e2e-grep: 'AMB-STAKE-ERC-TO-ERC'
-            ui-config: 'e2e-commons/components-envs/ui-amb-stake-erc20-erc20.env'
+        task: [amb, erc-to-native]
    steps:
      - uses: actions/checkout@v2
        with:
@@ -227,10 +190,9 @@ jobs:
      - name: Evaluate e2e docker images tags
        run: |
          git submodule status > submodule.status
-          echo "E2E_TAG=${{ hashFiles('yarn.lock', 'package.json', 'submodule.status', 'Dockerfile.e2e', 'commons', 'oracle-e2e', 'monitor-e2e') }}" >> $GITHUB_ENV
+          echo "E2E_TAG=${{ hashFiles('yarn.lock', 'package.json', 'submodule.status', 'Dockerfile.e2e', 'commons', 'oracle-e2e', 'monitor-e2e', 'e2e-commons') }}" >> $GITHUB_ENV
          echo "ORACLE_TAG=${{ hashFiles('yarn.lock', 'package.json', 'submodule.status', 'commons', 'oracle') }}" >> $GITHUB_ENV
          echo "MONITOR_TAG=${{ hashFiles('yarn.lock', 'package.json', 'submodule.status', 'commons', 'monitor') }}" >> $GITHUB_ENV
-          echo "UI_TAG=${{ hashFiles('yarn.lock', 'package.json', 'submodule.status', 'commons', 'ui') }}" >> $GITHUB_ENV
          echo "ALM_TAG=${{ hashFiles('yarn.lock', 'package.json', 'submodule.status', 'commons', 'alm') }}" >> $GITHUB_ENV
          echo "MOLECULE_RUNNER_TAG=${{ hashFiles('./deployment-e2e/Dockerfile') }}" >> $GITHUB_ENV
      - uses: actions/cache@v2
@@ -243,29 +205,23 @@ 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 blocks
+        run: ${{ steps.cache-repo.outputs.cache-hit }} && e2e-commons/up.sh deploy generate-amb-tx blocks
      - name: Pull e2e oracle image
        run: |
-         docker-compose -f ./e2e-commons/docker-compose.yml pull oracle
+         docker-compose -f ./e2e-commons/docker-compose.yml pull oracle-amb
         docker tag ${DOCKER_IMAGE_BASE}/tokenbridge-e2e-oracle:${ORACLE_TAG} poanetwork/tokenbridge-oracle:latest
-      - if: ${{ matrix.ui-e2e-grep }}
-        name: Pull e2e ui image
-        run: |
-          docker-compose -f ./e2e-commons/docker-compose.yml pull ui
-          docker build \
-            --build-arg DOCKER_IMAGE_BASE=${DOCKER_IMAGE_BASE} \
-            --build-arg UI_TAG=${UI_TAG} \
-            --build-arg DOT_ENV_PATH=${{ matrix.ui-config }} \
-            -f ./e2e-commons/Dockerfile.ui \
-            -t ui_ui:latest \
-            .
-      - name: Deploy oracle and ui
+      - name: Deploy oracle
        run: deployment-e2e/molecule.sh ultimate-${{ matrix.task }}
      - name: Reset docker socket permissions
        run: sudo chown -R $USER:docker /var/run/docker.sock
-      - name: Run ui e2e tests
-        if: ${{ matrix.ui-e2e-grep }}
-        run: cd ui-e2e && xvfb-run yarn mocha -g "${{ matrix.ui-e2e-grep }}" -b ./test.js
      - name: Run oracle e2e tests
-        if: ${{ !matrix.ui-e2e-grep }}
-        run: docker-compose -f ./e2e-commons/docker-compose.yml run e2e yarn workspace oracle-e2e run ${{ matrix.task }}
+        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
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-10.22
+12.22
--- a/CONFIGURATION.md
+++ b/CONFIGURATION.md
@@ -22,7 +22,7 @@ COMMON_FOREIGN_GAS_PRICE_FACTOR | A value that will multiply the gas price of th

 name | description | value
 --- | --- | ---
-ORACLE_BRIDGE_MODE | The bridge mode. The bridge starts listening to a different set of events based on this parameter. | NATIVE_TO_ERC / ERC_TO_ERC / ERC_TO_NATIVE / ARBITRARY_MESSAGE
+ORACLE_BRIDGE_MODE | The bridge mode. The bridge starts listening to a different set of events based on this parameter. | ERC_TO_NATIVE / ARBITRARY_MESSAGE
 ORACLE_ALLOW_HTTP_FOR_RPC | **Only use in test environments - must be omitted in production environments.**. If this parameter is specified and set to `yes`, RPC URLs can be specified in form of HTTP links. A warning that the connection is insecure will be written to the logs. | `yes` / `no`
 ORACLE_HOME_RPC_POLLING_INTERVAL | The interval in milliseconds used to request the RPC node in the Home network for new blocks. The interval should match the average production time for a new block. | integer
 ORACLE_FOREIGN_RPC_POLLING_INTERVAL | The interval in milliseconds used to request the RPC node in the Foreign network for new blocks. The interval should match the average production time for a new block. | integer
@@ -44,29 +44,17 @@ ORACLE_ALWAYS_RELAY_SIGNATURES | If set to `true`, the oracle will always relay
 ORACLE_RPC_REQUEST_TIMEOUT | Timeout in milliseconds for a single RPC request. Default value is `ORACLE_*_RPC_POLLING_INTERVAL * 2`. | integer
 ORACLE_HOME_TX_RESEND_INTERVAL | Interval in milliseconds for automatic resending of stuck transactions for Home sender service. Defaults to 20 minutes. | integer  
 ORACLE_FOREIGN_TX_RESEND_INTERVAL | Interval in milliseconds for automatic resending of stuck transactions for Foreign sender service. Defaults to 20 minutes. | integer  
-
-
-## UI configuration
-
-name | description | value
--- | --- | ---
-UI_TITLE | The title for the bridge UI page. `%c` will be replaced by the name of the network. | string
-UI_OG_TITLE | The meta title for the deployed bridge page. | string
-UI_DESCRIPTION | The meta description for the deployed bridge page. | string
-UI_NATIVE_TOKEN_DISPLAY_NAME | name of the home native coin | string
-UI_HOME_NETWORK_DISPLAY_NAME | name to be displayed for home network | string
-UI_FOREIGN_NETWORK_DISPLAY_NAME | name to be displayed for foreign network | string
-UI_HOME_WITHOUT_EVENTS | `true` if home network doesn't support events | true/false
-UI_FOREIGN_WITHOUT_EVENTS | `true` if foreign network doesn't support events | true/false
-UI_HOME_EXPLORER_TX_TEMPLATE | template link to transaction on home explorer. `%s` will be replaced by transaction hash | URL template
-UI_FOREIGN_EXPLORER_TX_TEMPLATE | template link to transaction on foreign explorer. `%s` will be replaced by transaction hash | URL template
-UI_HOME_EXPLORER_ADDRESS_TEMPLATE | template link to address on home explorer. `%s` will be replaced by address | URL template
-UI_FOREIGN_EXPLORER_ADDRESS_TEMPLATE | template link to address on foreign explorer. `%s` will be replaced by address | URL template
-UI_HOME_GAS_PRICE_UPDATE_INTERVAL | An interval in milliseconds used to get the updated gas price value either from the oracle or from the Home Bridge contract. | integer
-UI_FOREIGN_GAS_PRICE_UPDATE_INTERVAL | An interval in milliseconds used to get the updated gas price value either from the oracle or from the Foreign Bridge contract. | integer
-UI_PORT | The port for the UI app. | integer
-UI_STYLES | The set of styles to render the bridge UI page. | core/classic/stake
-UI_PUBLIC_URL | The public url for the deployed bridge page | string
+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
@@ -86,5 +74,3 @@ MONITOR_HOME_TO_FOREIGN_BLOCK_LIST | File with a list of addresses, separated by
 MONITOR_HOME_TO_FOREIGN_CHECK_SENDER | If set to `true`, instructs the oracle to do an extra check for transaction origin in the block/allowance list. `false` by default. | `true` / `false`
 MONITOR_HOME_VALIDATORS_BALANCE_ENABLE | If set, defines the list of home validator addresses for which balance should be checked. | `string`
 MONITOR_FOREIGN_VALIDATORS_BALANCE_ENABLE | If set, defines the list of foreign validator addresses for which balance should be checked. | `string`
-MONITOR_HOME_EXPLORER_API | The HTTPS URL of the Home network explorer API. If set, may be used as a fallback in case of the RPC node failure. | URL
-MONITOR_FOREIGN_EXPLORER_API | The HTTPS URL of the Foreign network explorer API. If set, may be used as a fallback in case of the RPC node failure. | URL
--- a/Dockerfile.e2e
+++ b/Dockerfile.e2e
@@ -1,4 +1,4 @@
-FROM node:10 as contracts
+FROM node:12 as contracts

 WORKDIR /mono

@@ -11,7 +11,7 @@ COPY ./contracts/truffle-config.js ./
 COPY ./contracts/contracts ./contracts
 RUN npm run compile

-FROM node:10
+FROM node:12

 WORKDIR /mono
 COPY package.json .
@@ -19,6 +19,7 @@ COPY --from=contracts /mono/contracts/build ./contracts/build
 COPY commons/package.json ./commons/
 COPY oracle-e2e/package.json ./oracle-e2e/
 COPY monitor-e2e/package.json ./monitor-e2e/
+COPY oracle/src/utils/constants.js ./oracle/src/utils/constants.js

 COPY yarn.lock .
 RUN NOYARNPOSTINSTALL=1 yarn install --frozen-lockfile --production
--- a/README.md
+++ b/README.md
@@ -20,12 +20,10 @@ Sub-repositories maintained within this monorepo are listed below.
 | Sub-repository | Description |
 | --- | --- |
 | [Oracle](oracle/README.md) | Oracle responsible for listening to bridge related events and authorizing asset transfers. |
-| [UI](ui/README.md) | DApp interface to transfer tokens and coins between chains. |
 | [Monitor](monitor/README.md) | Tool for checking balances and unprocessed events in bridged networks. |
 | [Deployment](deployment/README.md) | Ansible playbooks for deploying cross-chain bridges. |
 | [Oracle-E2E](oracle-e2e/README.md) | End to end tests for the Oracle |
 | [Monitor-E2E](monitor-e2e/README.md) | End to end tests for the Monitor |
-| [UI-E2E](ui-e2e/README.md) | End to end tests for the UI |
 | [Deployment-E2E](deployment-e2e/README.md) | End to end tests for the Deployment |
 | [Commons](commons/README.md) | Interfaces, constants and utilities shared between the sub-repositories |
 | [E2E-Commons](e2e-commons/README.md) | Common utilities and configuration used in end to end tests |
@@ -56,8 +54,6 @@ Additionally there are [Smart Contracts](https://github.com/poanetwork/tokenbrid

 The POA TokenBridge provides four operational modes:

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

@@ -68,7 +64,7 @@ Clone the repository:
 git clone https://github.com/poanetwork/tokenbridge
 ```

-If there is no need to build docker images for the TokenBridge components (oracle, monitor, UI), initialize submodules, install dependencies, compile the Smart Contracts:
+If there is no need to build docker images for the TokenBridge components (oracle, monitor), initialize submodules, install dependencies, compile the Smart Contracts:
 ```
 yarn initialize
 ```
@@ -91,7 +87,7 @@ Running tests for all projects:
 yarn test
 ```

-Additionally there are end-to-end tests for [Oracle](oracle-e2e/README.md) and [UI](ui-e2e/README.md).
+Additionally there are end-to-end tests for [Oracle](oracle-e2e/README.md) and [Monitor](monitor-e2e/README.md).

 For details on building, running and developing please refer to respective READMEs in sub-repositories.

--- a/alm-e2e/package.json
+++ b/alm-e2e/package.json
@@ -19,6 +19,6 @@
    "eslint-plugin-jest": "^23.18.0"
  },
  "engines": {
-    "node": ">= 10.18"
+    "node": ">= 12.22"
  }
 }
--- a/alm-e2e/run-tests.sh
+++ b/alm-e2e/run-tests.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 cd $(dirname $0)

-../e2e-commons/up.sh deploy blocks alm alm-e2e
+../e2e-commons/up.sh deploy generate-amb-tx 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
--- a/alm-e2e/src/test.js
+++ b/alm-e2e/src/test.js
@@ -6,8 +6,8 @@ jest.setTimeout(60000)
 const statusText = 'Success'
 const statusSelector = 'label[data-id="status"]'

-const homeToForeignTxURL = 'http://localhost:3004/77/0x58e7d63368335b9591d4dbb43889084f698fcee93ab7656fd7a39d8c66bc4b60'
-const foreignToHomeTxURL = 'http://localhost:3004/42/0x592bf28fc896419d2838f71cd0388775814b692688f1ecd5b1519081566b994a'
+const homeToForeignTxURL = 'http://localhost:3004/77/0x295efbe6ae98937ef35d939376c9bd752b4dc6f6899a9d5ddd6a57cea3d76c89'
+const foreignToHomeTxURL = 'http://localhost:3004/42/0x7262f7dbe6c30599edded2137fbbe93c271b37f5c54dd27f713f0cf510e3b4dd'

 describe('ALM', () => {
  let browser
--- a/alm/Dockerfile
+++ b/alm/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:10 as contracts
+FROM node:12 as contracts

 WORKDIR /mono

--- a/alm/src/abis/ForeignAMB.ts
+++ b/alm/src/abis/ForeignAMB.ts
@@ -123,6 +123,24 @@ 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: [
--- a/alm/src/components/ExecutionConfirmation.tsx
+++ b/alm/src/components/ExecutionConfirmation.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import React, { useEffect, useState } 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,6 +9,7 @@ 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;
@@ -33,6 +34,8 @@ export const ExecutionConfirmation = ({
  executionEventsFetched,
  setPendingExecution
 }: ExecutionConfirmationParams) => {
+  const { foreign } = useStateProvider()
+  const [safeExecutionAvailable, setSafeExecutionAvailable] = useState(false)
  const availableManualExecution =
    !isHome &&
    (executionData.status === VALIDATOR_CONFIRMATION_STATUS.WAITING ||
@@ -48,6 +51,22 @@ 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:
@@ -105,6 +124,7 @@ export const ExecutionConfirmation = ({
            {availableManualExecution && (
              <td>
                <ManualExecutionButton
+                  safeExecutionAvailable={safeExecutionAvailable}
                  messageData={messageData}
                  setExecutionData={setExecutionData}
                  signatureCollected={signatureCollected as string[]}
--- a/alm/src/components/ManualExecutionButton.tsx
+++ b/alm/src/components/ManualExecutionButton.tsx
@@ -15,16 +15,19 @@ import { signatureToVRS, packSignatures } from '../utils/signatures'
 import { getSuccessExecutionData } from '../utils/getFinalizationEvent'
 import { TransactionReceipt } from 'web3-eth'

-const StyledButton = styled.button`
+const ActionButton = 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[]
@@ -32,6 +35,7 @@ interface ManualExecutionButtonParams {
 }

 export const ManualExecutionButton = ({
+  safeExecutionAvailable,
  messageData,
  setExecutionData,
  signatureCollected,
@@ -40,6 +44,8 @@ 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(
    () => {
@@ -72,7 +78,11 @@ export const ManualExecutionButton = ({
      const signatures = packSignatures(signatureCollected.map(signatureToVRS))
      const messageId = messageData.slice(0, 66)
      const bridge = foreign.bridgeContract
-      const data = bridge.methods.executeSignatures(messageData, signatures).encodeABI()
+      const executeMethod =
+        safeExecutionAvailable && !allowFailures
+          ? bridge.methods.safeExecuteSignaturesWithAutoGasLimit
+          : bridge.methods.executeSignatures
+      const data = executeMethod(messageData, signatures).encodeABI()
      setManualExecution(false)

      library.eth
@@ -132,15 +142,35 @@ export const ManualExecutionButton = ({
      messageData,
      signatureCollected,
      setExecutionData,
-      setPendingExecution
+      setPendingExecution,
+      safeExecutionAvailable,
+      allowFailures
    ]
  )

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

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

  // get transactions from success signatures
--- a/audit/chainsecurity/FT-AMB-6.0.0-and-OmniBridge-1.1.0-contracts-security-assessment-report.pdf
+++ b/audit/chainsecurity/FT-AMB-6.0.0-and-OmniBridge-1.1.0-contracts-security-assessment-report.pdf
--- a/audit/chainsecurity/FT-OmniBridge-contracts-1.0.0-rc2-security-assessment-report.pdf
+++ b/audit/chainsecurity/FT-OmniBridge-contracts-1.0.0-rc2-security-assessment-report.pdf
--- a/commons/abis.js
+++ b/commons/abis.js
@@ -1,13 +1,7 @@
-const HOME_NATIVE_TO_ERC_ABI = require('../contracts/build/contracts/HomeBridgeNativeToErc').abi
-const FOREIGN_NATIVE_TO_ERC_ABI = require('../contracts/build/contracts/ForeignBridgeNativeToErc').abi
-const HOME_ERC_TO_ERC_ABI = require('../contracts/build/contracts/HomeBridgeErcToErc').abi
-const FOREIGN_ERC_TO_ERC_ABI = require('../contracts/build/contracts/ForeignBridgeErc677ToErc677').abi
 const HOME_ERC_TO_NATIVE_ABI = require('../contracts/build/contracts/HomeBridgeErcToNative').abi
-const FOREIGN_ERC_TO_NATIVE_ABI = require('../contracts/build/contracts/ForeignBridgeErcToNative').abi
+const FOREIGN_ERC_TO_NATIVE_ABI = require('../contracts/build/contracts/XDaiForeignBridge.json').abi
 const ERC20_ABI = require('../contracts/build/contracts/ERC20').abi
-const ERC677_ABI = require('../contracts/build/contracts/ERC677').abi
-const ERC677_BRIDGE_TOKEN_ABI = require('../contracts/build/contracts/ERC677BridgeToken').abi
-const BLOCK_REWARD_ABI = require('../contracts/build/contracts/BlockReward').abi
+const BLOCK_REWARD_ABI = require('../contracts/build/contracts/BlockRewardMock').abi
 const BRIDGE_VALIDATORS_ABI = require('../contracts/build/contracts/BridgeValidators').abi
 const REWARDABLE_VALIDATORS_ABI = require('../contracts/build/contracts/RewardableValidators').abi
 const HOME_AMB_ABI = require('../contracts/build/contracts/HomeAMB').abi
@@ -15,52 +9,13 @@ 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,
    inputs: [
-      {
-        indexed: true,
-        name: 'messageId',
-        type: 'bytes32'
-      },
      {
        indexed: false,
        name: 'encodedData',
@@ -76,11 +31,6 @@ const OLD_AMB_USER_REQUEST_FOR_AFFIRMATION_ABI = [
  {
    anonymous: false,
    inputs: [
-      {
-        indexed: true,
-        name: 'messageId',
-        type: 'bytes32'
-      },
      {
        indexed: false,
        name: 'encodedData',
@@ -95,27 +45,15 @@ const OLD_AMB_USER_REQUEST_FOR_AFFIRMATION_ABI = [
 function getBridgeABIs(bridgeMode) {
  let HOME_ABI = null
  let FOREIGN_ABI = null
-  if (bridgeMode === BRIDGE_MODES.NATIVE_TO_ERC) {
-    HOME_ABI = HOME_NATIVE_TO_ERC_ABI
-    FOREIGN_ABI = FOREIGN_NATIVE_TO_ERC_ABI
-  } else if (bridgeMode === BRIDGE_MODES.ERC_TO_ERC) {
-    HOME_ABI = HOME_ERC_TO_ERC_ABI
-    FOREIGN_ABI = FOREIGN_ERC_TO_ERC_ABI
-  } else if (bridgeMode === BRIDGE_MODES.ERC_TO_NATIVE) {
+  if (bridgeMode === BRIDGE_MODES.ERC_TO_NATIVE) {
    HOME_ABI = HOME_ERC_TO_NATIVE_ABI
    FOREIGN_ABI = FOREIGN_ERC_TO_NATIVE_ABI
-  } else if (bridgeMode === BRIDGE_MODES.NATIVE_TO_ERC_V1) {
-    HOME_ABI = HOME_V1_ABI
-    FOREIGN_ABI = FOREIGN_V1_ABI
  } else if (bridgeMode === BRIDGE_MODES.ARBITRARY_MESSAGE) {
    HOME_ABI = HOME_AMB_ABI
    FOREIGN_ABI = FOREIGN_AMB_ABI
  } else if (bridgeMode === BRIDGE_MODES.AMB_ERC_TO_ERC) {
    HOME_ABI = HOME_AMB_ERC_TO_ERC_ABI
    FOREIGN_ABI = FOREIGN_AMB_ERC_TO_ERC_ABI
-  } else if (bridgeMode === BRIDGE_MODES.STAKE_AMB_ERC_TO_ERC) {
-    HOME_ABI = HOME_STAKE_ERC_TO_ERC_ABI
-    FOREIGN_ABI = FOREIGN_STAKE_ERC_TO_ERC_ABI
  } else {
    throw new Error(`Unrecognized bridge mode: ${bridgeMode}`)
  }
@@ -125,26 +63,15 @@ function getBridgeABIs(bridgeMode) {

 module.exports = {
  getBridgeABIs,
-  HOME_NATIVE_TO_ERC_ABI,
-  FOREIGN_NATIVE_TO_ERC_ABI,
-  HOME_ERC_TO_ERC_ABI,
-  FOREIGN_ERC_TO_ERC_ABI,
  HOME_ERC_TO_NATIVE_ABI,
  FOREIGN_ERC_TO_NATIVE_ABI,
  ERC20_ABI,
-  ERC677_ABI,
-  ERC677_BRIDGE_TOKEN_ABI,
  BLOCK_REWARD_ABI,
  BRIDGE_VALIDATORS_ABI,
  REWARDABLE_VALIDATORS_ABI,
-  HOME_V1_ABI,
-  FOREIGN_V1_ABI,
-  ERC20_BYTES32_ABI,
  HOME_AMB_ABI,
  FOREIGN_AMB_ABI,
  OLD_AMB_USER_REQUEST_FOR_AFFIRMATION_ABI,
  OLD_AMB_USER_REQUEST_FOR_SIGNATURE_ABI,
-  BOX_ABI,
-  HOME_STAKE_ERC_TO_ERC_ABI,
-  FOREIGN_STAKE_ERC_TO_ERC_ABI
+  BOX_ABI
 }
--- a/commons/constants.js
+++ b/commons/constants.js
@@ -1,30 +1,12 @@
 const BRIDGE_MODES = {
-  NATIVE_TO_ERC: 'NATIVE_TO_ERC',
-  ERC_TO_ERC: 'ERC_TO_ERC',
  ERC_TO_NATIVE: 'ERC_TO_NATIVE',
-  NATIVE_TO_ERC_V1: 'NATIVE_TO_ERC_V1',
  ARBITRARY_MESSAGE: 'ARBITRARY_MESSAGE',
-  AMB_ERC_TO_ERC: 'AMB_ERC_TO_ERC',
-  STAKE_AMB_ERC_TO_ERC: 'STAKE_AMB_ERC_TO_ERC'
-}
-
-const ERC_TYPES = {
-  ERC20: 'ERC20',
-  ERC677: 'ERC677'
-}
-
-const FEE_MANAGER_MODE = {
-  ONE_DIRECTION: 'ONE_DIRECTION',
-  BOTH_DIRECTIONS: 'BOTH_DIRECTIONS',
-  ONE_DIRECTION_STAKE: 'ONE_DIRECTION_STAKE',
-  UNDEFINED: 'UNDEFINED'
+  AMB_ERC_TO_ERC: 'AMB_ERC_TO_ERC'
 }

 const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'

 module.exports = {
  BRIDGE_MODES,
-  ERC_TYPES,
-  FEE_MANAGER_MODE,
  ZERO_ADDRESS
 }
--- a/commons/message.js
+++ b/commons/message.js
@@ -1,3 +1,5 @@
+const { soliditySha3 } = require('web3-utils')
+
 function strip0x(input) {
  return input.replace(/^0x/, '')
 }
@@ -39,8 +41,35 @@ 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
+  normalizeAMBMessageEvent,
+  ambInformationSignatures,
+  normalizeAMBInfoRequest
 }
--- a/commons/package.json
+++ b/commons/package.json
@@ -9,7 +9,8 @@
  },
  "dependencies": {
    "gas-price-oracle": "^0.1.5",
-    "web3-utils": "1.0.0-beta.34"
+    "web3-utils": "^1.3.0",
+    "node-fetch": "^2.1.2"
  },
  "devDependencies": {
    "bn-chai": "^1.0.1",
--- a/commons/test/constants.test.js
+++ b/commons/test/constants.test.js
@@ -1,12 +1,8 @@
 const { expect } = require('chai')
-const { BRIDGE_MODES, ERC_TYPES } = require('../constants')
+const { BRIDGE_MODES } = require('../constants')

 describe('constants', () => {
  it('should contain correct number of bridge types', () => {
-    expect(Object.keys(BRIDGE_MODES).length).to.be.equal(7)
-  })
-
-  it('should contain correct number of erc types', () => {
-    expect(Object.keys(ERC_TYPES).length).to.be.equal(2)
+    expect(Object.keys(BRIDGE_MODES).length).to.be.equal(3)
  })
 })
--- a/commons/test/getTokenType.js
+++ b/commons/test/getTokenType.js
@@ -1,159 +0,0 @@
-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)
-  })
-})
--- a/commons/utils.js
+++ b/commons/utils.js
@@ -1,22 +1,17 @@
-const { toWei, toBN } = require('web3-utils')
+const { toWei, toBN, BN } = require('web3-utils')
 const { GasPriceOracle } = require('gas-price-oracle')
-const { BRIDGE_MODES, FEE_MANAGER_MODE, ERC_TYPES } = require('./constants')
+const fetch = require('node-fetch')
+const { BRIDGE_MODES } = 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:
@@ -24,80 +19,9 @@ 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) {
-  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 bridgeModeHash = await contract.methods.getBridgeMode().call()
+  return decodeBridgeMode(bridgeModeHash)
 }

 const parseValidatorEvent = event => {
@@ -150,11 +74,8 @@ const tryCall = async (method, fallbackValue) => {

 const getDeployedAtBlock = async contract => tryCall(contract.methods.deployedAtBlock(), 0)

-const getPastEvents = async (
-  contract,
-  { event = 'allEvents', fromBlock = toBN(0), toBlock = 'latest', options = {} }
-) => {
-  let events
+const getPastEventsOrSplit = async (contract, { event, fromBlock, toBlock, options }) => {
+  let events = []
  try {
    events = await contract.getPastEvents(event, {
      ...options,
@@ -162,19 +83,19 @@ const getPastEvents = async (
      toBlock
    })
  } catch (e) {
-    if (e.message.includes('query returned more than') && toBlock !== 'latest') {
+    if (e.message.includes('query returned more than') || e.message.toLowerCase().includes('timeout')) {
      const middle = toBN(fromBlock)
        .add(toBN(toBlock))
        .divRound(toBN(2))
      const middlePlusOne = middle.add(toBN(1))

-      const firstHalfEvents = await getPastEvents(contract, {
+      const firstHalfEvents = await getPastEventsOrSplit(contract, {
        options,
        event,
        fromBlock,
        toBlock: middle
      })
-      const secondHalfEvents = await getPastEvents(contract, {
+      const secondHalfEvents = await getPastEventsOrSplit(contract, {
        options,
        event,
        fromBlock: middlePlusOne,
@@ -188,6 +109,31 @@ const getPastEvents = async (
  return events
 }

+const getPastEvents = async (
+  contract,
+  { event = 'allEvents', fromBlock = toBN(0), toBlock = 'latest', options = {} }
+) => {
+  if (toBlock === 'latest') {
+    return contract.getPastEvents(event, {
+      ...options,
+      fromBlock,
+      toBlock
+    })
+  }
+
+  const batchSize = 1000000
+  const to = toBN(toBlock)
+  const events = []
+
+  for (let from = toBN(fromBlock); from.lte(to); from = from.addn(batchSize + 1)) {
+    const opts = { event, fromBlock: from, toBlock: BN.min(to, from.addn(batchSize)), options }
+    const batch = await getPastEventsOrSplit(contract, opts)
+    events.push(batch)
+  }
+
+  return [].concat(...events)
+}
+
 const getValidatorList = async (address, eth, options) => {
  options.logger && options.logger.debug && options.logger.debug('getting validatorList')

@@ -233,17 +179,16 @@ const normalizeGasPrice = (oracleGasPrice, factor, limits = null) => {
  return toBN(toWei(gasPrice.toFixed(2).toString(), 'gwei'))
 }

-// 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 = {}) => {
+const gasPriceFromSupplier = async (url, options = {}) => {
  try {
    let json
-    if (fetchFn) {
-      const response = await fetchFn()
+    if (url === 'gas-price-oracle') {
+      json = await gasPriceOracle.fetchGasPricesOffChain()
+    } else if (url) {
+      const response = await fetch(url, { timeout: 2000 })
      json = await response.json()
    } else {
-      json = await gasPriceOracle.fetchGasPricesOffChain()
+      return null
    }
    const oracleGasPrice = json[options.speedType]

@@ -284,10 +229,7 @@ const gasPriceFromContract = async (bridgeContract, options = {}) => {

 module.exports = {
  decodeBridgeMode,
-  decodeFeeManagerMode,
  getBridgeMode,
-  getTokenType,
-  getUnit,
  parseValidatorEvent,
  processValidatorsEvents,
  getValidatorList,
@@ -296,7 +238,5 @@ module.exports = {
  normalizeGasPrice,
  gasPriceFromSupplier,
  gasPriceFromContract,
-  gasPriceWithinLimits,
-  isErcToErcMode,
-  isMediatorMode
+  gasPriceWithinLimits
 }
--- a/commons/v1Abis.js
+++ b/commons/v1Abis.js
@@ -1,191 +0,0 @@
-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
-}
--- a/2
+++ b/2
--- a/deployment-e2e/Dockerfile
+++ b/deployment-e2e/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.7-stretch
+FROM python:3.7
 RUN curl -fsSL https://get.docker.com | sh
-RUN pip3 install docker molecule==2.22rc1 molecule[docker] flake8
+RUN pip3 install docker molecule[docker,ansible] pytest pytest-testinfra flake8
 WORKDIR mono/deployment-e2e
--- a/deployment-e2e/README.md
+++ b/deployment-e2e/README.md
@@ -16,7 +16,7 @@ Alternatively, if there are no changes except the playbooks, you can use the `ma
 ./molecule.sh <scenario_name>
 ```

-In this case `master` branch will be used as a codebase for Monitor, UI, Oracle and Contracts deployed by your local playbook.
+In this case `master` branch will be used as a codebase for Monitor, Oracle and Contracts deployed by your local playbook.

 ## Run the tests

@@ -29,7 +29,6 @@ Available scenarios:
 Scenario | Description
 --- | ---
 oracle | Deploys and checks standalone Oracle on Ubuntu host
-ui | Deploys and checks standalone UI on Ubuntu host

 ## Ultimate E2E tests

--- a/deployment-e2e/molecule/monitor/molecule.yml
+++ b/deployment-e2e/molecule/monitor/molecule.yml
@@ -3,12 +3,6 @@ dependency:
  name: galaxy
 driver:
  name: docker
-lint:
-  name: yamllint
-  enabled: True
-  options:
-    config-data:
-      ignore: ../../hosts.yml
 platforms:
  - name: monitor-host
    groups:
@@ -22,11 +16,6 @@ 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
@@ -37,14 +26,11 @@ 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
--- a/deployment-e2e/molecule/multiple/molecule.yml
+++ b/deployment-e2e/molecule/multiple/molecule.yml
@@ -3,12 +3,6 @@ dependency:
  name: galaxy
 driver:
  name: docker
-lint:
-  name: yamllint
-  enabled: True
-  options:
-    config-data:
-      ignore: ../../hosts.yml
 platforms:
  - name: multiple-host
    groups:
@@ -16,7 +10,6 @@ platforms:
    children:
      - oracle
      - monitor
-      - ui
    image: ubuntu:16.04
    privileged: true
    network_mode: host
@@ -24,30 +17,22 @@ 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: "8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9"
+        ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY: "6c48435bd464a53ed66ed62127c4dba8af75cf1a99a8ebe2680599948fbfbc6d"
        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
--- a/deployment-e2e/molecule/multiple/tests/test_multiple.py
+++ b/deployment-e2e/molecule/multiple/tests/test_multiple.py
@@ -8,7 +8,6 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(

@pytest.mark.parametrize("service", [
    ("poabridge"),
-    ("tokenbridge-ui"),
    ("tokenbridge-monitor")
 ])
 def test_services(host, service):
@@ -24,7 +23,7 @@ def test_services(host, service):
    ("oracle_bridge_affirmation_1"),
    ("oracle_bridge_senderhome_1"),
    ("oracle_bridge_senderforeign_1"),
-    ("ui_ui_1"),
+    ("oracle_bridge_shutdown_1"),
    ("monitor_monitor_1")
 ])
 def test_docker_containers(host, name):
--- a/deployment-e2e/molecule/oracle/molecule.yml
+++ b/deployment-e2e/molecule/oracle/molecule.yml
@@ -3,18 +3,12 @@ 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
+      - oracle_swarm
    image: ubuntu:16.04
    privileged: true
    network_mode: host
@@ -22,29 +16,22 @@ 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_ADDRESS_PRIVATE_KEY: "8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9"
+        ORACLE_VALIDATOR_KEYSTORE_PATH: "../../../e2e-commons/keystore.json"
+        ORACLE_VALIDATOR_KEYSTORE_PASSWORD: "12345678"
        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
--- a/deployment-e2e/molecule/oracle/tests/test_oracle.py
+++ b/deployment-e2e/molecule/oracle/tests/test_oracle.py
@@ -3,21 +3,21 @@ import pytest
 import testinfra.utils.ansible_runner

 testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
-    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('oracle')
+    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('oracle_swarm')


@pytest.mark.parametrize("name", [
-    ("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_rabbit"),
+    ("oracle_redis"),
+    ("oracle_bridge_request"),
+    ("oracle_bridge_collected"),
+    ("oracle_bridge_affirmation"),
+    ("oracle_bridge_senderhome"),
+    ("oracle_bridge_senderforeign"),
+    ("oracle_bridge_shutdown"),
 ])
 def test_docker_containers(host, name):
-    container = host.docker(name)
-    assert container.is_running
+    assert host.docker(name) is not None


@pytest.mark.parametrize("service", [
--- a/deployment-e2e/molecule/repo/tests/test_existing.py
+++ b/deployment-e2e/molecule/repo/tests/test_existing.py
@@ -15,7 +15,6 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
    ("/home/poadocker/bridge/contracts"),
    ("/home/poadocker/bridge/oracle"),
    ("/home/poadocker/bridge/monitor"),
-    ("/home/poadocker/bridge/ui"),
    ("/home/poadocker/bridge/parity")
 ])
 def test_existing_folders(host, path):
@@ -28,8 +27,7 @@ def test_existing_folders(host, path):
    ("/home/poadocker/bridge/commons/package.json"),
    ("/home/poadocker/bridge/contracts/package.json"),
    ("/home/poadocker/bridge/oracle/package.json"),
-    ("/home/poadocker/bridge/monitor/package.json"),
-    ("/home/poadocker/bridge/ui/package.json")
+    ("/home/poadocker/bridge/monitor/package.json")
 ])
 def test_existing_package_json(host, path):
    assert host.file(path).exists
@@ -41,8 +39,7 @@ def test_existing_package_json(host, path):
    ("/home/poadocker/bridge/contracts/Dockerfile"),
    ("/home/poadocker/bridge/parity/Dockerfile"),
    ("/home/poadocker/bridge/oracle/Dockerfile"),
-    ("/home/poadocker/bridge/monitor/Dockerfile"),
-    ("/home/poadocker/bridge/ui/Dockerfile")
+    ("/home/poadocker/bridge/monitor/Dockerfile")
 ])
 def test_existing_docker_files(host, path):
    assert host.file(path).exists
--- a/deployment-e2e/molecule/ui/Dockerfile.j2
+++ b/deployment-e2e/molecule/ui/Dockerfile.j2
@@ -1,14 +0,0 @@
-# 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
--- a/deployment-e2e/molecule/ui/molecule.yml
+++ b/deployment-e2e/molecule/ui/molecule.yml
@@ -1,55 +0,0 @@
---
-dependency:
-  name: galaxy
-driver:
-  name: docker
-lint:
-  name: yamllint
-  enabled: True
-  options:
-    config-data:
-      ignore: ../../hosts.yml
-platforms:
-  - name: ui-host
-    groups:
-      - example
-    children:
-      - ui
-    image: ubuntu:16.04
-    privileged: true
-    network_mode: host
-    volumes:
-      - /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:
-      ui-host:
-        syslog_server_port: "udp://127.0.0.1:514"
-verifier:
-  name: testinfra
-  lint:
-    name: flake8
-  additional_files_or_dirs:
-    - ../../tests/*
-scenario:
-  name: ui
-  test_sequence:
-    - lint
-    - cleanup
-    - destroy
-    - dependency
-    - syntax
-    - create
-    - prepare
-    - converge
-    - verify
-    - destroy
--- a/deployment-e2e/molecule/ui/tests/test_ui.py
+++ b/deployment-e2e/molecule/ui/tests/test_ui.py
@@ -1,48 +0,0 @@
-import os
-import pytest
-import testinfra.utils.ansible_runner
-
-testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
-    os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('ui')
-
-
-@pytest.mark.parametrize("name", [
-    ("ui_ui_1")
-])
-def test_docker_containers(host, name):
-    container = host.docker(name)
-    assert container.is_running
-
-
-@pytest.mark.parametrize("service", [
-    ("tokenbridge-ui"),
-    ("rsyslog")
-])
-def test_services(host, service):
-    assert host.service(service).is_enabled
-    assert host.service(service).is_running
-
-
-@pytest.mark.parametrize("filename", [
-    ("/etc/rsyslog.d/32-ui-docker.conf"),
-    ("/etc/rsyslog.d/37-ui-remote-logging.conf")
-])
-def test_logging(host, filename):
-    assert host.file(filename).exists
-    assert host.file(filename).mode == 0o0644
-
-
-def test_index_page_title(host):
-    assert host.run_test(
-        'curl -s http://localhost:3001 | '
-        'grep "<title>" | '
-        'grep -q "TokenBridge UI app"'
-    )
-
-
-def test_index_page_error(host):
-    assert host.run_expect(
-        [1],
-        'curl -s http://localhost:3001 | '
-        'grep -i -q "error"'
-    )
--- a/deployment-e2e/molecule/ultimate-amb-stake-erc-to-erc/Dockerfile.j2
+++ b/deployment-e2e/molecule/ultimate-amb-stake-erc-to-erc/Dockerfile.j2
@@ -1,14 +0,0 @@
-# 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
--- a/deployment-e2e/molecule/ultimate-amb-stake-erc-to-erc/molecule.yml
+++ b/deployment-e2e/molecule/ultimate-amb-stake-erc-to-erc/molecule.yml
@@ -1,52 +0,0 @@
---
-driver:
-  name: docker
-platforms:
-  - name: oracle-amb-host
-    groups:
-      - ultimate
-      - amb
-    children:
-      - oracle
-    image: ubuntu:16.04
-    privileged: true
-    network_mode: host
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-  - name: ui-amb-stake-erc-to-erc-host
-    groups:
-      - ultimate
-      - amb-stake-erc-to-erc
-    children:
-      - ui
-    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-amb-host:
-        ORACLE_VALIDATOR_ADDRESS: "0xaaB52d66283F7A1D5978bcFcB55721ACB467384b"
-        ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY: "8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9"
-      ui-amb-stake-erc-to-erc-host:
-        COMMON_HOME_RPC_URL: "http://localhost:8541"
-        COMMON_FOREIGN_RPC_URL: "http://localhost:8542"
-verifier:
-  name: testinfra
-  lint:
-    name: flake8
-scenario:
-  name: ultimate-amb-stake-erc-to-erc
-  test_sequence:
-    - cleanup
-    - destroy
-    - syntax
-    - create
-    - prepare
-    - converge
--- a/deployment-e2e/molecule/ultimate-amb/molecule.yml
+++ b/deployment-e2e/molecule/ultimate-amb/molecule.yml
@@ -25,8 +25,6 @@ provisioner:
        ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY: "8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9"
 verifier:
  name: testinfra
-  lint:
-    name: flake8
 scenario:
  name: ultimate-amb
  test_sequence:
--- a/deployment-e2e/molecule/ultimate-commons/oracle-docker-compose.yml
+++ b/deployment-e2e/molecule/ultimate-commons/oracle-docker-compose.yml
@@ -9,12 +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
--- a/deployment-e2e/molecule/ultimate-erc-to-erc/Dockerfile.j2
+++ b/deployment-e2e/molecule/ultimate-erc-to-erc/Dockerfile.j2
@@ -1,14 +0,0 @@
-# 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
--- a/deployment-e2e/molecule/ultimate-erc-to-erc/molecule.yml
+++ b/deployment-e2e/molecule/ultimate-erc-to-erc/molecule.yml
@@ -1,52 +0,0 @@
---
-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
-  - name: ui-erc-to-erc-host
-    groups:
-      - ultimate
-      - erc-to-erc
-    children:
-      - ui
-    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"
-      ui-erc-to-erc-host:
-        COMMON_HOME_RPC_URL: "http://localhost:8541"
-        COMMON_FOREIGN_RPC_URL: "http://localhost:8542"
-verifier:
-  name: testinfra
-  lint:
-    name: flake8
-scenario:
-  name: ultimate-erc-to-erc
-  test_sequence:
-    - cleanup
-    - destroy
-    - syntax
-    - create
-    - prepare
-    - converge
--- a/deployment-e2e/molecule/ultimate-erc-to-native/molecule.yml
+++ b/deployment-e2e/molecule/ultimate-erc-to-native/molecule.yml
@@ -13,17 +13,6 @@ platforms:
    network_mode: host
    volumes:
      - /var/run/docker.sock:/var/run/docker.sock
-  - name: ui-erc-to-native-host
-    groups:
-      - ultimate
-      - erc-to-native
-    children:
-      - ui
-    image: ubuntu:16.04
-    privileged: true
-    network_mode: host
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
 provisioner:
  name: ansible
  playbooks:
@@ -36,13 +25,8 @@ provisioner:
        ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY: "8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9"
        ORACLE_HOME_START_BLOCK: 1
        ORACLE_FOREIGN_START_BLOCK: 1
-      ui-erc-to-native-host:
-        COMMON_HOME_RPC_URL: "http://localhost:8541"
-        COMMON_FOREIGN_RPC_URL: "http://localhost:8542"
 verifier:
  name: testinfra
-  lint:
-    name: flake8
 scenario:
  name: ultimate-erc-to-native
  test_sequence:
--- a/deployment-e2e/molecule/ultimate-native-to-erc/Dockerfile.j2
+++ b/deployment-e2e/molecule/ultimate-native-to-erc/Dockerfile.j2
@@ -1,14 +0,0 @@
-# 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
--- a/deployment-e2e/molecule/ultimate-native-to-erc/molecule.yml
+++ b/deployment-e2e/molecule/ultimate-native-to-erc/molecule.yml
@@ -1,52 +0,0 @@
---
-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
-  - name: ui-native-to-erc-host
-    groups:
-      - ultimate
-      - native-to-erc
-    children:
-      - ui
-    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"
-      ui-native-to-erc-host:
-        COMMON_HOME_RPC_URL: "http://localhost:8541"
-        COMMON_FOREIGN_RPC_URL: "http://localhost:8542"
-verifier:
-  name: testinfra
-  lint:
-    name: flake8
-scenario:
-  name: ultimate-native-to-erc
-  test_sequence:
-    - cleanup
-    - destroy
-    - syntax
-    - create
-    - prepare
-    - converge
--- a/deployment/CONFIGURATION.md
+++ b/deployment/CONFIGURATION.md
@@ -34,14 +34,6 @@ cp hosts.yml.example hosts.yml
          #syslog_server_port: "<protocol>://<ip>:<port>" # When this parameter is set all bridge logs will be redirected to <ip>:<port> address.
        <host_ip_B>:
          # (...)
-    ui:
-      hosts:
-        <host_ip_B>:
-          ansible_user: <user>
-          #syslog_server_port: "<protocol>://<ip>:<port>"
-        <host_ip_C>:
-          ansible_user: <user>
-          #syslog_server_port: "<protocol>://<ip>:<port>"
    monitor:
      hosts:
        <host_ip_B>:
@@ -50,18 +42,7 @@ cp hosts.yml.example hosts.yml
          #monitor_cron_schedule: "*/4 * * * *" # When this parameter is set, it will overwrite default schedule for performing checks
 ```

-The config above would install the Oracle on `<host_ip_A>`, UI on `<host_ip_C>`, and both Oracle, UI and Monitor on `<host_ip_B>`.
-
-Example config for installing only UI:
-```yaml
-<bridge_name>:
-  children:
-    oracle:
-      hosts:
-    ui:
-      hosts:
-        <host_ip>:
-          ansible_user: <user>
+The config above would install the Oracle on `<host_ip_A>`, and both Oracle and Monitor on `<host_ip_B>`.
 ```

 | Value | Description |
--- a/deployment/EXECUTION.md
+++ b/deployment/EXECUTION.md
@@ -44,7 +44,6 @@ The deployed components have the following services:
 Component | Service Name
 --- | ---
 Oracle | poabridge
-UI | tokenbridge-ui
 Monitor | tokenbridge-monitor

 Use the default `SysVinit` commands to `start`, `stop`, `restart`, and `rebuild` the service and to check the `status` of the service. 
--- a/deployment/group_vars/amb-stake-erc-to-erc.yml
+++ b/deployment/group_vars/amb-stake-erc-to-erc.yml
@@ -1,4 +0,0 @@
---
-COMMON_HOME_BRIDGE_ADDRESS: "0xc26Aa60Ff574f157616D3aEE70e08aAC129E1dFC"
-COMMON_FOREIGN_BRIDGE_ADDRESS: "0xc26Aa60Ff574f157616D3aEE70e08aAC129E1dFC"
-UI_PORT: 3003
--- a/deployment/group_vars/amb.yml
+++ b/deployment/group_vars/amb.yml
@@ -1,5 +1,5 @@
 ---
 ORACLE_BRIDGE_MODE: "ARBITRARY_MESSAGE"
-COMMON_HOME_BRIDGE_ADDRESS: "0x0AEe1FCD12dDFab6265F7f8956e6E012A9Fe4Aa0"
-COMMON_FOREIGN_BRIDGE_ADDRESS: "0x0AEe1FCD12dDFab6265F7f8956e6E012A9Fe4Aa0"
+COMMON_HOME_BRIDGE_ADDRESS: "0x8397be90BCF57b0B71219f555Fe121b22e5a994C"
+COMMON_FOREIGN_BRIDGE_ADDRESS: "0x1feB40aD9420b186F019A717c37f5546165d411E"
 MONITOR_PORT: 3013
--- a/deployment/group_vars/dai.yml
+++ b/deployment/group_vars/dai.yml
@@ -1,19 +1,14 @@
 ---
 ## General settings
 ORACLE_BRIDGE_MODE: "ERC_TO_NATIVE"
-UI_NATIVE_TOKEN_DISPLAY_NAME: "xDai"

 ## Home contract
 COMMON_HOME_RPC_URL: "https://dai.poa.network"
-UI_HOME_NETWORK_DISPLAY_NAME: "xDai chain"
-UI_HOME_WITHOUT_EVENTS: false
 COMMON_HOME_BRIDGE_ADDRESS: "0x7301CFA0e1756B71869E93d4e4Dca5c7d0eb0AA6"
 ORACLE_HOME_RPC_POLLING_INTERVAL: 5000

 ## Foreign contract
 COMMON_FOREIGN_RPC_URL: "https://mainnet.infura.io"
-UI_FOREIGN_NETWORK_DISPLAY_NAME: "Ethereum Mainnet"
-UI_FOREIGN_WITHOUT_EVENTS: false
 COMMON_FOREIGN_BRIDGE_ADDRESS: "0x4aa42145Aa6Ebf72e164C9bBC74fbD3788045016"
 ORACLE_FOREIGN_RPC_POLLING_INTERVAL: 5000

@@ -30,20 +25,6 @@ COMMON_FOREIGN_GAS_PRICE_FALLBACK: 10000000000
 ORACLE_FOREIGN_GAS_PRICE_UPDATE_INTERVAL: 600000
 COMMON_FOREIGN_GAS_PRICE_FACTOR: 1

-## UI
-UI_TITLE: "TokenBridge UI app - %c"
-UI_OG_TITLE: "POA Bridge UI"
-UI_DESCRIPTION: "The TokenBridge serves as a method of transferring MakerDAO stable tokens between the Ethereum network to xDai chain in a quick and cost-efficient manner."
-UI_PORT: 3001
-UI_HOME_EXPLORER_TX_TEMPLATE: https://blockscout.com/poa/dai/tx/%s
-UI_FOREIGN_EXPLORER_TX_TEMPLATE: https://blockscout.com/eth/mainnet/tx/%s
-UI_HOME_EXPLORER_ADDRESS_TEMPLATE: https://blockscout.com/poa/dai/address/%s
-UI_FOREIGN_EXPLORER_ADDRESS_TEMPLATE: https://blockscout.com/eth/mainnet/address/%s
-UI_HOME_GAS_PRICE_UPDATE_INTERVAL: 600000
-UI_FOREIGN_GAS_PRICE_UPDATE_INTERVAL: 600000
-UI_STYLES: "core"
-UI_PUBLIC_URL: "https://dai-bridge.poa.network"
-
 ## Monitor
 MONITOR_BRIDGE_NAME: "xdai"
 MONITOR_PORT: 3003
--- a/deployment/group_vars/erc-to-erc.yml
+++ b/deployment/group_vars/erc-to-erc.yml
@@ -1,6 +0,0 @@
---
-ORACLE_BRIDGE_MODE: "ERC_TO_ERC"
-COMMON_HOME_BRIDGE_ADDRESS: "0x1feB40aD9420b186F019A717c37f5546165d411E"
-COMMON_FOREIGN_BRIDGE_ADDRESS: "0x4a58D6d8D416a5fBCAcf3dC52eb8bE8948E25127"
-UI_PORT: 3001
-MONITOR_PORT: 3011
--- a/deployment/group_vars/erc-to-native.yml
+++ b/deployment/group_vars/erc-to-native.yml
@@ -1,6 +1,5 @@
 ---
 ORACLE_BRIDGE_MODE: "ERC_TO_NATIVE"
-COMMON_HOME_BRIDGE_ADDRESS: "0x488Af810997eD1730cB3a3918cD83b3216E6eAda"
-COMMON_FOREIGN_BRIDGE_ADDRESS: "0x488Af810997eD1730cB3a3918cD83b3216E6eAda"
-UI_PORT: 3002
+COMMON_HOME_BRIDGE_ADDRESS: "0x5118AC62AE912Dd5B51EEfF7338c4fcb0248Ba8c"
+COMMON_FOREIGN_BRIDGE_ADDRESS: "0x32198D570fffC7033641F8A9094FFDCaAEF42624"
 MONITOR_PORT: 3012
--- a/deployment/group_vars/example.yml
+++ b/deployment/group_vars/example.yml
@@ -1,22 +1,17 @@
 ---
 ## General settings
-ORACLE_BRIDGE_MODE: "NATIVE_TO_ERC"
+ORACLE_BRIDGE_MODE: "ARBITRARY_MESSAGE"
 ORACLE_LOG_LEVEL: debug
-UI_NATIVE_TOKEN_DISPLAY_NAME: "POA"

 ## Home contract
 COMMON_HOME_RPC_URL: "https://sokol.poa.network"
-UI_HOME_NETWORK_DISPLAY_NAME: "POA Sokol"
-UI_HOME_WITHOUT_EVENTS: false
-COMMON_HOME_BRIDGE_ADDRESS: "0x98aFdE294f1C46aA0a27Cc4049ED337F879d8976"
+COMMON_HOME_BRIDGE_ADDRESS: "0x59ba90A588ce732AB33FD32Aab1b58c21400A0f6"
 ORACLE_HOME_RPC_POLLING_INTERVAL: 5000

 ## Foreign contract
-COMMON_FOREIGN_RPC_URL: "https://sokol.poa.network"
-UI_FOREIGN_NETWORK_DISPLAY_NAME: "Kovan"
-UI_FOREIGN_WITHOUT_EVENTS: false
-COMMON_FOREIGN_BRIDGE_ADDRESS: "0x5a584f4C30B36f282848dAc9a2b20E7BEF481981"
-ORACLE_FOREIGN_RPC_POLLING_INTERVAL: 1000
+COMMON_FOREIGN_RPC_URL: "https://kovan.infura.io/v3/5d7bd94c50ed43fab1cb8e74f58678b0"
+COMMON_FOREIGN_BRIDGE_ADDRESS: "0xdA4a49a00F4fF4A5988b9AceE95f99e3b2c208b6"
+ORACLE_FOREIGN_RPC_POLLING_INTERVAL: 5000

 ## Home Gasprice
 COMMON_HOME_GAS_PRICE_SUPPLIER_URL: "https://gasprice.poa.network/"
@@ -32,26 +27,12 @@ COMMON_FOREIGN_GAS_PRICE_FALLBACK: 1000000000   # in wei
 COMMON_FOREIGN_GAS_PRICE_FACTOR: 1
 ORACLE_FOREIGN_GAS_PRICE_UPDATE_INTERVAL: 600000

-## UI
-UI_TITLE: "TokenBridge UI app - %c"
-UI_OG_TITLE: "POA Bridge UI"
-UI_DESCRIPTION: "The POA cross-chain bridge serves as a method of transferring POA native tokens from the POA Network to the Ethereum network in a quick and cost-efficient manner."
-UI_PORT: 3001
-UI_HOME_EXPLORER_TX_TEMPLATE: https://blockscout.com/poa/sokol/tx/%s
-UI_FOREIGN_EXPLORER_TX_TEMPLATE: https://blockscout.com/eth/kovan/tx/%s
-UI_HOME_EXPLORER_ADDRESS_TEMPLATE: https://blockscout.com/poa/sokol/address/%s
-UI_FOREIGN_EXPLORER_ADDRESS_TEMPLATE: https://blockscout.com/eth/kovan/address/%s
-UI_HOME_GAS_PRICE_UPDATE_INTERVAL: 600000
-UI_FOREIGN_GAS_PRICE_UPDATE_INTERVAL: 600000
-UI_STYLES: "core"
-UI_PUBLIC_URL: "http://localhost:3001"
-
 ## Monitor
 MONITOR_BRIDGE_NAME: "bridge"
 MONITOR_PORT: 3003
 MONITOR_CACHE_EVENTS: "false"
-MONITOR_HOME_START_BLOCK: 0
-MONITOR_FOREIGN_START_BLOCK: 0
+MONITOR_HOME_START_BLOCK: 20821049
+MONITOR_FOREIGN_START_BLOCK: 24773297
 MONITOR_VALIDATOR_HOME_TX_LIMIT: 300000
 MONITOR_VALIDATOR_FOREIGN_TX_LIMIT: 300000
 MONITOR_TX_NUMBER_THRESHOLD: 100
--- a/deployment/group_vars/native-to-erc.yml
+++ b/deployment/group_vars/native-to-erc.yml
@@ -1,6 +0,0 @@
---
-ORACLE_BRIDGE_MODE: "NATIVE_TO_ERC"
-COMMON_HOME_BRIDGE_ADDRESS: "0x32198D570fffC7033641F8A9094FFDCaAEF42624"
-COMMON_FOREIGN_BRIDGE_ADDRESS: "0x2B6871b9B02F73fa24F4864322CdC78604207769"
-UI_PORT: 3000
-MONITOR_PORT: 3010
--- a/deployment/group_vars/ultimate.yml
+++ b/deployment/group_vars/ultimate.yml
@@ -1,19 +1,14 @@
 ---
 ## General settings
-UI_NATIVE_TOKEN_DISPLAY_NAME: "POA"
 ORACLE_ALLOW_HTTP_FOR_RPC: yes
 ORACLE_LOG_LEVEL: debug

 ## Home contract
 COMMON_HOME_RPC_URL: "http://parity1:8545"
-UI_HOME_NETWORK_DISPLAY_NAME: "POA Sokol"
-UI_HOME_WITHOUT_EVENTS: false
 ORACLE_HOME_RPC_POLLING_INTERVAL: 5000

 ## Foreign contract
 COMMON_FOREIGN_RPC_URL: "http://parity2:8545"
-UI_FOREIGN_NETWORK_DISPLAY_NAME: "Kovan"
-UI_FOREIGN_WITHOUT_EVENTS: false
 ORACLE_FOREIGN_RPC_POLLING_INTERVAL: 1000

 ## Home Gasprice
@@ -30,20 +25,6 @@ COMMON_FOREIGN_GAS_PRICE_FALLBACK: 1000000000   # in wei
 COMMON_FOREIGN_GAS_PRICE_FACTOR: 1
 ORACLE_FOREIGN_GAS_PRICE_UPDATE_INTERVAL: 600000

-
-#ui
-UI_TITLE: "TokenBridge UI app - %c"
-UI_OG_TITLE: "POA Bridge UI"
-UI_DESCRIPTION: "The POA cross-chain bridge serves as a method of transferring POA native tokens from the POA Network to the Ethereum network in a quick and cost-efficient manner."
-UI_HOME_EXPLORER_TX_TEMPLATE: https://blockscout.com/poa/sokol/tx/%s
-UI_FOREIGN_EXPLORER_TX_TEMPLATE: https://blockscout.com/eth/kovan/tx/%s
-UI_HOME_EXPLORER_ADDRESS_TEMPLATE: https://blockscout.com/poa/sokol/address/%s
-UI_FOREIGN_EXPLORER_ADDRESS_TEMPLATE: https://blockscout.com/eth/kovan/address/%s
-UI_HOME_GAS_PRICE_UPDATE_INTERVAL: 600000
-UI_FOREIGN_GAS_PRICE_UPDATE_INTERVAL: 600000
-UI_STYLES: "core"
-UI_PUBLIC_URL: "http://localhost"
-
 #monitor
 MONITOR_BRIDGE_NAME: "bridge"
 MONITOR_CACHE_EVENTS: "true"
--- a/deployment/group_vars/wetc.yml
+++ b/deployment/group_vars/wetc.yml
@@ -1,56 +0,0 @@
---
-## General settings
-ORACLE_BRIDGE_MODE: "NATIVE_TO_ERC"
-UI_NATIVE_TOKEN_DISPLAY_NAME: "ETC"
-
-## Home contract
-COMMON_HOME_RPC_URL: "https://www.ethercluster.com/etc"
-UI_HOME_NETWORK_DISPLAY_NAME: "Ethereum Classic"
-UI_HOME_WITHOUT_EVENTS: false
-COMMON_HOME_BRIDGE_ADDRESS: "0x073081832B4Ecdce79d4D6753565c85Ba4b3BeA9"
-ORACLE_HOME_RPC_POLLING_INTERVAL: 7000
-
-## Foreign contract
-COMMON_FOREIGN_RPC_URL: "https://mainnet.infura.io/"
-UI_FOREIGN_NETWORK_DISPLAY_NAME: "Ethereum Mainnet"
-UI_FOREIGN_WITHOUT_EVENTS: false
-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
-
-## UI
-UI_TITLE: "TokenBridge UI app - %c"
-UI_OG_TITLE: "POA Bridge UI"
-UI_DESCRIPTION: "The TokenBridge serves as a method of transferring native tokens from the Ethereum Classic Network to the Ethereum network in a quick and cost-efficient manner."
-UI_PORT: 3001
-UI_HOME_EXPLORER_TX_TEMPLATE: https://blockscout.com/etc/mainnet/tx/%s
-UI_FOREIGN_EXPLORER_TX_TEMPLATE: https://blockscout.com/eth/mainnet/tx/%s
-UI_HOME_EXPLORER_ADDRESS_TEMPLATE: https://blockscout.com/etc/mainnet/address/%s
-UI_FOREIGN_EXPLORER_ADDRESS_TEMPLATE: https://blockscout.com/eth/mainnet/address/%s
-UI_HOME_GAS_PRICE_UPDATE_INTERVAL: 600000
-UI_FOREIGN_GAS_PRICE_UPDATE_INTERVAL: 600000
-UI_STYLES: "classic"
-UI_PUBLIC_URL: "https://wetc.app"
-
-## 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
--- a/deployment/hosts.yml.example
+++ b/deployment/hosts.yml.example
@@ -7,10 +7,12 @@ sokol-kovan:
          ansible_user: ubuntu
          ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
          #syslog_server_port: "udp://127.0.0.1:514"
-    ui:
+    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:
--- a/deployment/requirements.txt
+++ b/deployment/requirements.txt
@@ -1,4 +0,0 @@
-# pre-release because it contains "CI Fixes for ansible 2.8"
-molecule==2.22rc1
-docker
-flake8
--- a/deployment/roles/common/files/daemon.json
+++ b/deployment/roles/common/files/daemon.json
@@ -1,4 +1,4 @@
 {
-    "live-restore": true,
+    "live-restore": false,
    "no-new-privileges": true
 }
--- a/deployment/roles/common/tasks/dependencies.yml
+++ b/deployment/roles/common/tasks/dependencies.yml
@@ -31,6 +31,7 @@
    owner: "root"
    group: "root"
    mode: "0755"
+  when: skip_compose is undefined

 - name: Upgrade pip version
  shell: pip3 install --upgrade pip==19.3.1
@@ -45,6 +46,9 @@
    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
--- a/deployment/roles/common/templates/docker-logs.j2
+++ b/deployment/roles/common/templates/docker-logs.j2
@@ -1,6 +1,6 @@
 /var/log/docker/*/docker.log {
  rotate 5
-  size 1G
+  size 100M
  compress
  missingok
  delaycompress
@@ -8,7 +8,7 @@
 }
 /var/log/docker/*.log {
  rotate 5
-  size 1G
+  size 100M
  compress
  missingok
  delaycompress
--- a/deployment/roles/oracle/tasks/logging.yml
+++ b/deployment/roles/oracle/tasks/logging.yml
@@ -3,11 +3,11 @@
  with_items:
    - docker-compose
    - docker-compose-transfer
-    - docker-compose-erc-native
+    - docker-compose-amb
  loop_control:
    loop_var: file

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

+- name: Set the redis container local logs configuration file
+  template:
+    src: 32-redis-docker.conf.j2
+    dest: /etc/rsyslog.d/32-redis-docker.conf
+    owner: root
+    group: root
+    mode: 0644
+
+- name: Set the rabbit MQ container local logs configuration file
+  template:
+    src: 33-rabbit-docker.conf.j2
+    dest: /etc/rsyslog.d/33-rabbit-docker.conf
+    owner: root
+    group: root
+    mode: 0644
+
 - name: Set the log configuration file to send container logs to remote server
  template:
    src: 36-oracle-remote-logging.conf.j2
--- a/deployment/roles/oracle/tasks/post_config.yml
+++ b/deployment/roles/oracle/tasks/post_config.yml
@@ -27,25 +27,14 @@
  set_fact:
    ORACLE_VALIDATOR_ADDRESS: "{{ VADDRESS.stdout }}"

- 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: 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"
+  set_fact: composefileoverride="-f docker-compose-transfer.yml"
  when: ORACLE_BRIDGE_MODE == "ERC_TO_NATIVE"

+- name: Extend docker compose file for amb
+  set_fact: composefileoverride="-f docker-compose-amb.yml"
+  when: ORACLE_BRIDGE_MODE == "ARBITRARY_MESSAGE"
+
 - name: Install .key config
  template:
    src: key.j2
--- a/deployment/roles/oracle/tasks/pre_config.yml
+++ b/deployment/roles/oracle/tasks/pre_config.yml
@@ -20,4 +20,4 @@
  with_items:
    - docker-compose.yml
    - docker-compose-transfer.yml
-    - docker-compose-erc-native.yml
+    - docker-compose-amb.yml
--- a/deployment/roles/oracle/templates/.env.j2
+++ b/deployment/roles/oracle/templates/.env.j2
@@ -11,9 +11,16 @@ ORACLE_HOME_RPC_POLLING_INTERVAL={{ ORACLE_HOME_RPC_POLLING_INTERVAL }}

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

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

 {% if ORACLE_HOME_START_BLOCK | default('') != '' %}
--- a/deployment/roles/oracle/templates/32-redis-docker.conf.j2
+++ b/deployment/roles/oracle/templates/32-redis-docker.conf.j2
@@ -0,0 +1,11 @@
+$FileCreateMode 0644
+template(name="DockerLogFileName_Redis" type="list") {
+   constant(value="/var/log/docker/")
+   property(name="syslogtag" securepath="replace" regex.type="ERE" regex.submatch="1" regex.expression="oracle_(.*redis.*)\\/[a-zA-Z0-9]+\\[")
+   constant(value="/docker.log")
+}
+
+if $programname contains 'oracle' and $programname contains 'redis' then \
+  ?DockerLogFileName_Redis
+
+$FileCreateMode 0600
--- a/deployment/roles/oracle/templates/33-rabbit-docker.conf.j2
+++ b/deployment/roles/oracle/templates/33-rabbit-docker.conf.j2
@@ -0,0 +1,11 @@
+$FileCreateMode 0644
+template(name="DockerLogFileName_Rabbit" type="list") {
+   constant(value="/var/log/docker/")
+   property(name="syslogtag" securepath="replace" regex.type="ERE" regex.submatch="1" regex.expression="oracle_(.*rabbit.*)\\/[a-zA-Z0-9]+\\[")
+   constant(value="/docker.log")
+}
+
+if $programname contains 'oracle' and $programname contains 'rabbit' then \
+  ?DockerLogFileName_Rabbit
+
+$FileCreateMode 0600
--- a/deployment/roles/oracle_swarm/defaults/main.yml
+++ b/deployment/roles/oracle_swarm/defaults/main.yml
@@ -0,0 +1,9 @@
+---
+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
--- a/deployment/roles/oracle_swarm/meta/main.yml
+++ b/deployment/roles/oracle_swarm/meta/main.yml
@@ -0,0 +1,3 @@
+---
+dependencies:
+  - { role: common, skip_repo: true, skip_compose: true }
--- a/deployment/roles/oracle_swarm/tasks/jumpbox.yml
+++ b/deployment/roles/oracle_swarm/tasks/jumpbox.yml
@@ -0,0 +1,8 @@
+---
+- 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
--- a/deployment/roles/oracle_swarm/tasks/logging.yml
+++ b/deployment/roles/oracle_swarm/tasks/logging.yml
@@ -0,0 +1,41 @@
+---
+- 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
--- a/deployment/roles/oracle_swarm/tasks/main.yml
+++ b/deployment/roles/oracle_swarm/tasks/main.yml
@@ -2,4 +2,5 @@
 - include_tasks: pre_config.yml
 - include_tasks: logging.yml
 - include_tasks: jumpbox.yml
+- include_tasks: post_config.yml
 - include_tasks: servinstall.yml
--- a/deployment/roles/oracle_swarm/tasks/post_config.yml
+++ b/deployment/roles/oracle_swarm/tasks/post_config.yml
@@ -0,0 +1,46 @@
+---
+- 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
--- a/deployment/roles/oracle_swarm/tasks/pre_config.yml
+++ b/deployment/roles/oracle_swarm/tasks/pre_config.yml
@@ -0,0 +1,47 @@
+---
+- 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'
--- a/deployment/roles/oracle_swarm/tasks/servinstall.yml
+++ b/deployment/roles/oracle_swarm/tasks/servinstall.yml
@@ -0,0 +1,19 @@
+# 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
--- a/deployment/roles/oracle_swarm/templates/.env.j2
+++ b/deployment/roles/oracle_swarm/templates/.env.j2
@@ -0,0 +1,86 @@
+## 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 %}
--- a/deployment/roles/oracle_swarm/templates/31-oracle-docker.conf.j2
+++ b/deployment/roles/oracle_swarm/templates/31-oracle-docker.conf.j2
@@ -0,0 +1,11 @@
+$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
--- a/deployment/roles/oracle_swarm/templates/32-redis-docker.conf.j2
+++ b/deployment/roles/oracle_swarm/templates/32-redis-docker.conf.j2
@@ -0,0 +1,11 @@
+$FileCreateMode 0644
+template(name="DockerLogFileName_Redis" type="list") {
+   constant(value="/var/log/docker/")
+   property(name="syslogtag" securepath="replace" regex.type="ERE" regex.submatch="1" regex.expression="oracle_(.*redis.*)\\/[a-zA-Z0-9]+\\[")
+   constant(value="/docker.log")
+}
+
+if $programname contains 'oracle' and $programname contains 'redis' then \
+  ?DockerLogFileName_Redis
+
+$FileCreateMode 0600
--- a/deployment/roles/oracle_swarm/templates/33-rabbit-docker.conf.j2
+++ b/deployment/roles/oracle_swarm/templates/33-rabbit-docker.conf.j2
@@ -0,0 +1,11 @@
+$FileCreateMode 0644
+template(name="DockerLogFileName_Rabbit" type="list") {
+   constant(value="/var/log/docker/")
+   property(name="syslogtag" securepath="replace" regex.type="ERE" regex.submatch="1" regex.expression="oracle_(.*rabbit.*)\\/[a-zA-Z0-9]+\\[")
+   constant(value="/docker.log")
+}
+
+if $programname contains 'oracle' and $programname contains 'rabbit' then \
+  ?DockerLogFileName_Rabbit
+
+$FileCreateMode 0600
--- a/deployment/roles/oracle_swarm/templates/36-oracle-remote-logging.conf.j2
+++ b/deployment/roles/oracle_swarm/templates/36-oracle-remote-logging.conf.j2
@@ -1,4 +1,4 @@
-if $programname startswith 'ui_' then {
+if $programname startswith 'oracle_bridge_' then {
 action(
   type="omfwd"
   protocol="{{ syslog_server_port.split(":")[0] }}"
--- a/deployment/roles/oracle_swarm/templates/docker-compose.yml.j2
+++ b/deployment/roles/oracle_swarm/templates/docker-compose.yml.j2
@@ -0,0 +1,144 @@
+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
--- a/deployment/roles/oracle_swarm/templates/key.j2
+++ b/deployment/roles/oracle_swarm/templates/key.j2
@@ -0,0 +1,2 @@
+## Validator-specific options
+ORACLE_VALIDATOR_KEYSTORE_PASSWORD={{ ORACLE_VALIDATOR_KEYSTORE_PASSWORD }}
--- a/deployment/roles/oracle_swarm/templates/poabridge.j2
+++ b/deployment/roles/oracle_swarm/templates/poabridge.j2
@@ -0,0 +1,66 @@
+#! /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
--- a/deployment/roles/ui/meta/main.yml
+++ b/deployment/roles/ui/meta/main.yml
@@ -1,3 +0,0 @@
---
-dependencies:
-  - role: common
--- a/deployment/roles/ui/tasks/jumpbox.yml
+++ b/deployment/roles/ui/tasks/jumpbox.yml
@@ -1,6 +0,0 @@
---
- name: Build the containers
-  shell: docker-compose build
-  args:
-    chdir: "{{ bridge_path }}/ui"
-  when: skip_build is undefined
--- a/deployment/roles/ui/tasks/logging.yml
+++ b/deployment/roles/ui/tasks/logging.yml
@@ -1,41 +0,0 @@
---
- name: Slurp docker compose file
-  slurp:
-    src: "{{ bridge_path }}/ui/docker-compose.yml"
-  register: docker_compose_slurp
-
- name: Parse docker compose file
-  set_fact:
-    docker_compose_parsed: "{{ docker_compose_slurp['content'] | b64decode | from_yaml }}"
-
- name: Set logger to remote server
-  set_fact:
-    docker_compose_parsed: "{{ docker_compose_parsed |combine({'services': {item: {'logging': {'driver': 'syslog','options': {'tag': '{{.Name}}/{{.ID}}'}}}}}, recursive=True) }}"
-  with_items: "{{ docker_compose_parsed.services }}"
-
- name: Write new docker-compose file
-  copy:
-    content: "{{ docker_compose_parsed | to_yaml }}"
-    dest: "{{ bridge_path }}/ui/docker-compose.yml"
-
- name: Set the local container logs configuration file
-  template:
-    src: 32-ui-docker.conf.j2
-    dest: /etc/rsyslog.d/32-ui-docker.conf
-    owner: root
-    group: root
-    mode: 0644
-
- name: Set the log configuration file to send container logs to remote server
-  template:
-    src: 37-ui-remote-logging.conf.j2
-    dest: /etc/rsyslog.d/37-ui-remote-logging.conf
-    owner: root
-    group: root
-    mode: 0644
-  when: syslog_server_port is defined
-
- name: restart rsyslog
-  service:
-    name: rsyslog
-    state: restarted
--- a/deployment/roles/ui/tasks/pre_config.yml
+++ b/deployment/roles/ui/tasks/pre_config.yml
@@ -1,7 +0,0 @@
---
- name: Install .env config
-  template:
-    src: .env.j2
-    dest: "{{ bridge_path }}/ui/.env"
-    owner: "{{ compose_service_user }}"
-    mode: '0640'
--- a/deployment/roles/ui/tasks/servinstall.yml
+++ b/deployment/roles/ui/tasks/servinstall.yml
@@ -1,20 +0,0 @@
-# This role creates a tokenbridge-ui service which is designed to manage docker-compose ui deployment.
-# /etc/init.d/tokenbridge-ui start, status, stop, restart - does what the services usually do in such cases.
-# /etc/init.d/tokenbridge-ui rebuild - builds a new ui deployment from scratch.
---
- name: "Set the service"
-  template:
-    src: tokenbridge-ui.j2
-    dest: "/etc/init.d/tokenbridge-ui"
-    owner: root
-    mode: 755
-
- name: "Enable the service"
-  service:
-    name: "tokenbridge-ui"
-    state: started
-    enabled: yes
-    use: service
-
- name: Start the service
-  shell: service tokenbridge-ui start
--- a/deployment/roles/ui/templates/.env.j2
+++ b/deployment/roles/ui/templates/.env.j2
@@ -1,42 +0,0 @@
-COMMON_HOME_BRIDGE_ADDRESS={{ COMMON_HOME_BRIDGE_ADDRESS }}
-COMMON_FOREIGN_BRIDGE_ADDRESS={{ COMMON_FOREIGN_BRIDGE_ADDRESS }}
-COMMON_FOREIGN_RPC_URL={{ COMMON_FOREIGN_RPC_URL }}
-COMMON_HOME_RPC_URL={{ COMMON_HOME_RPC_URL }}
-
-UI_NATIVE_TOKEN_DISPLAY_NAME={{ UI_NATIVE_TOKEN_DISPLAY_NAME }}
-
-UI_HOME_NETWORK_DISPLAY_NAME={{ UI_HOME_NETWORK_DISPLAY_NAME }}
-UI_FOREIGN_NETWORK_DISPLAY_NAME={{ UI_FOREIGN_NETWORK_DISPLAY_NAME }}
-
-UI_HOME_WITHOUT_EVENTS={{ UI_HOME_WITHOUT_EVENTS }}
-UI_FOREIGN_WITHOUT_EVENTS={{ UI_FOREIGN_WITHOUT_EVENTS }}
-
-UI_HOME_EXPLORER_TX_TEMPLATE={{ UI_HOME_EXPLORER_TX_TEMPLATE }}
-UI_FOREIGN_EXPLORER_TX_TEMPLATE={{ UI_FOREIGN_EXPLORER_TX_TEMPLATE }}
-UI_HOME_EXPLORER_ADDRESS_TEMPLATE={{ UI_HOME_EXPLORER_ADDRESS_TEMPLATE }}
-UI_FOREIGN_EXPLORER_ADDRESS_TEMPLATE={{ UI_FOREIGN_EXPLORER_ADDRESS_TEMPLATE }}
-
-{% if COMMON_HOME_GAS_PRICE_SUPPLIER_URL | default('') != '' %}
-COMMON_HOME_GAS_PRICE_SUPPLIER_URL={{ COMMON_HOME_GAS_PRICE_SUPPLIER_URL }}
-COMMON_HOME_GAS_PRICE_SPEED_TYPE={{ COMMON_HOME_GAS_PRICE_SPEED_TYPE }}
-{% endif %}
-COMMON_HOME_GAS_PRICE_FALLBACK={{ COMMON_HOME_GAS_PRICE_FALLBACK }}
-UI_HOME_GAS_PRICE_UPDATE_INTERVAL={{ UI_HOME_GAS_PRICE_UPDATE_INTERVAL }}
-{% if COMMON_HOME_GAS_PRICE_FACTOR | default('') != '' %}
-COMMON_HOME_GAS_PRICE_FACTOR={{ COMMON_HOME_GAS_PRICE_FACTOR }}
-{% endif %}
-
-COMMON_FOREIGN_GAS_PRICE_SUPPLIER_URL={{ COMMON_FOREIGN_GAS_PRICE_SUPPLIER_URL }}
-COMMON_FOREIGN_GAS_PRICE_SPEED_TYPE={{ COMMON_FOREIGN_GAS_PRICE_SPEED_TYPE }}
-COMMON_FOREIGN_GAS_PRICE_FALLBACK={{ COMMON_FOREIGN_GAS_PRICE_FALLBACK }}
-UI_FOREIGN_GAS_PRICE_UPDATE_INTERVAL={{ UI_FOREIGN_GAS_PRICE_UPDATE_INTERVAL }}
-COMMON_FOREIGN_GAS_PRICE_FACTOR={{ COMMON_FOREIGN_GAS_PRICE_FACTOR }}
-
-# Default
-UI_TITLE={{ UI_TITLE }}
-UI_OG_TITLE={{ UI_OG_TITLE }}
-UI_DESCRIPTION={{ UI_DESCRIPTION }}
-UI_PORT={{ UI_PORT }}
-UI_PUBLIC_URL={{ UI_PUBLIC_URL }}
-
-UI_STYLES={{ UI_STYLES }}
--- a/deployment/roles/ui/templates/32-ui-docker.conf.j2
+++ b/deployment/roles/ui/templates/32-ui-docker.conf.j2
@@ -1,11 +0,0 @@
-$FileCreateMode 0644
-template(name="DockerLogFileName_UI" type="list") {
-   constant(value="/var/log/docker/")
-   property(name="syslogtag" securepath="replace" regex.type="ERE" regex.submatch="1" regex.expression="ui_(.*)\\/[a-zA-Z0-9]+\\[")
-   constant(value="/docker.log")
-}
-
-if $programname startswith 'ui_' then \
-  ?DockerLogFileName_UI
-
-$FileCreateMode 0600
--- a/deployment/roles/ui/templates/tokenbridge-ui.j2
+++ b/deployment/roles/ui/templates/tokenbridge-ui.j2
@@ -1,76 +0,0 @@
-#! /bin/bash
-
-### BEGIN INIT INFO
-# Provides:          tokenbridge-ui
-# 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 + '/ui' if bridge_path[:1] != "/" else bridge_path + '/ui' }}"
-
-start(){
-    echo "Starting TokenBridge UI.."
-    cd $WORKDIR
-    sudo -u "{{ compose_service_user }}" /usr/local/bin/docker-compose  down -v
-    sudo -u "{{ compose_service_user }}" /usr/local/bin/docker-compose  rm -fv
-    sudo -u "{{ compose_service_user }}" /usr/local/bin/docker-compose  up  --detach
-}
-
-stop(){
-    echo "Stopping TokenBridge UI.."
-    cd $WORKDIR
-    sudo -u "{{ compose_service_user }}" /usr/local/bin/docker-compose  down -v
-    sleep 2
-}
-
-status(){
-    echo "TokenBridge UI status:"
-    cd $WORKDIR
-    sudo -u "{{ compose_service_user }}" /usr/local/bin/docker-compose  ps
-}
-
-rebuild(){
-    echo "Rebuild TokenBridge UI.."
-    cd $WORKDIR
-    sudo -u "{{ compose_service_user }}" /usr/local/bin/docker-compose  down -v
-    sudo -u "{{ compose_service_user }}" /usr/local/bin/docker-compose  rm -fv
-    sudo -u "{{ compose_service_user }}" /usr/local/bin/docker-compose  up  --detach --force-recreate --no-deps --build
-}
-
-
-case "$1" in
-
-  start)
-      start
-    ;;
-
-  stop)
-      stop
-    ;;
-
-  status)
-      status
-    ;;
-
-  restart)
-    echo "Restarting TokenBridge UI.."
-    stop
-    start
-    ;;
-
-  rebuild)
-    rebuild
-    ;;
-
-  *)
-    echo $"Usage: $0 {start|stop|restart|rebuild|status}"
-    exit 1
-    ;;
-
-esac
-
-exit 0
--- a/deployment/site.yml
+++ b/deployment/site.yml
@@ -4,11 +4,11 @@
  become: true
  roles:
    - { role: oracle }
- name: Install UI
-  hosts: ui
+- name: Install Oracle as a Docker Swarm service
+  hosts: oracle_swarm
  become: true
  roles:
-    - { role: ui }
+    - { role: oracle_swarm }
 - name: Install Monitor
  hosts: monitor
  become: true
--- a/e2e-commons/Dockerfile.ui
+++ b/e2e-commons/Dockerfile.ui
@@ -1,7 +0,0 @@
-ARG DOCKER_IMAGE_BASE
-ARG UI_TAG
-FROM ${DOCKER_IMAGE_BASE}/tokenbridge-e2e-ui:${UI_TAG}
-
-ARG DOT_ENV_PATH
-
-COPY ${DOT_ENV_PATH} ./.env
--- a/e2e-commons/README.md
+++ b/e2e-commons/README.md
@@ -24,14 +24,10 @@ Shut down and cleans up containers, networks, services, running scripts:
 | oracle | Launches Oracle containers |
 | oracle-validator-2 | Launches Oracle containers for second validator |
 | oracle-validator-3 | Launches Oracle containers for third validator |
-| ui | Launches UI containers |
 | 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-amb-stake-erc-to-erc | Creates infrastructure for ultimate e2e testing, for stake token bridge |

 #### Ultimate e2e testing

--- a/e2e-commons/ULTIMATE.md
+++ b/e2e-commons/ULTIMATE.md
@@ -4,7 +4,7 @@ Documentation regarding the Ultimate end-to-end tests.

 ## Overview

-The ultimate e2e test scenario covers native-to-erc type of bridge.
+The ultimate e2e test scenario covers erc-to-native and amb types of bridges.
 It runs the e2e tests on components deployed using the deployment playbooks.


@@ -15,13 +15,15 @@ It runs the e2e tests on components deployed using the deployment playbooks.
 Run the Parity nodes, deploy the bridge contracts, deploy Oracle using the deployment playbook.

 ```bash
-./up.sh deploy native-to-erc blocks
+./e2e-commons/up.sh deploy blocks
+./deployment-e2e/molecule.sh ultimate-erc-to-native
 ```

 ### 2. Run the E2E tests

-```
-cd ui-e2e; yarn mocha -g "NATIVE_TO_ERC" -b ./test.js
+```bash
+cd e2e-commons
+docker-compose run -e ULTIMATE=true e2e yarn workspace oracle-e2e run erc-to-native
 ```

 ## Diagram
--- a/e2e-commons/access-lists/block_list.txt
+++ b/e2e-commons/access-lists/block_list.txt
@@ -1,2 +1,2 @@
 0xc9e38bfdB9c635F0796ad83CC8705dc379F41c04
-0x612E8bd50A7b1F009F43f2b8679E9B8eD91eb5CE
+0xF9698Eb93702dfdd0e2d802088d4c21822a8A977
--- a/e2e-commons/build.sh
+++ b/e2e-commons/build.sh
@@ -5,11 +5,11 @@ set -e # exit when any command fails
 docker-compose build e2e
 while [ "$1" != "" ]; do
  if [ "$1" == "oracle" ]; then
-    docker-compose build oracle
+    docker-compose build oracle-amb
+  elif [ "$1" == "alm-e2e" ]; then
+    docker-compose build oracle-amb
  elif [ "$1" == "monitor" ]; then
-    docker-compose build monitor
-  elif [ "$1" == "ui" ]; then
-    docker-compose build ui
+    docker-compose build monitor-amb
  elif [ "$1" == "alm" ]; then
    docker-compose build alm
  fi
--- a/e2e-commons/components-envs/alm.env
+++ b/e2e-commons/components-envs/alm.env
@@ -1,5 +1,5 @@
-COMMON_HOME_BRIDGE_ADDRESS=0x0AEe1FCD12dDFab6265F7f8956e6E012A9Fe4Aa0
-COMMON_FOREIGN_BRIDGE_ADDRESS=0x0AEe1FCD12dDFab6265F7f8956e6E012A9Fe4Aa0
+COMMON_HOME_BRIDGE_ADDRESS=0x8397be90BCF57b0B71219f555Fe121b22e5a994C
+COMMON_FOREIGN_BRIDGE_ADDRESS=0x1feB40aD9420b186F019A717c37f5546165d411E

 COMMON_HOME_RPC_URL=http://localhost:8541
 COMMON_FOREIGN_RPC_URL=http://localhost:8542
--- a/e2e-commons/components-envs/monitor-amb.env
+++ b/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=0x0AEe1FCD12dDFab6265F7f8956e6E012A9Fe4Aa0
-COMMON_FOREIGN_BRIDGE_ADDRESS=0x0AEe1FCD12dDFab6265F7f8956e6E012A9Fe4Aa0
+COMMON_HOME_BRIDGE_ADDRESS=0x8397be90BCF57b0B71219f555Fe121b22e5a994C
+COMMON_FOREIGN_BRIDGE_ADDRESS=0x1feB40aD9420b186F019A717c37f5546165d411E
 MONITOR_HOME_START_BLOCK=0
 MONITOR_FOREIGN_START_BLOCK=0
 MONITOR_VALIDATOR_HOME_TX_LIMIT=300000
--- a/e2e-commons/components-envs/monitor-erc20-native.env
+++ b/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=0x488Af810997eD1730cB3a3918cD83b3216E6eAda
-COMMON_FOREIGN_BRIDGE_ADDRESS=0x488Af810997eD1730cB3a3918cD83b3216E6eAda
+COMMON_HOME_BRIDGE_ADDRESS=0x5118AC62AE912Dd5B51EEfF7338c4fcb0248Ba8c
+COMMON_FOREIGN_BRIDGE_ADDRESS=0x32198D570fffC7033641F8A9094FFDCaAEF42624
 MONITOR_HOME_START_BLOCK=0
 MONITOR_FOREIGN_START_BLOCK=0
 MONITOR_VALIDATOR_HOME_TX_LIMIT=300000
--- a/e2e-commons/components-envs/monitor-erc20.env
+++ b/e2e-commons/components-envs/monitor-erc20.env
@@ -1,20 +0,0 @@
-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
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Kirill Fedoseev	052c0738c2	Bump molecule version	2021-11-08 11:49:25 +03:00
Kirill Fedoseev	03dfaa9bb5	Playbook improvements	2021-11-07 19:57:18 +03:00
Kirill Fedoseev	e899b15808	Allow to store validator keystore file in the docker swarm secret	2021-11-07 12:48:12 +03:00
Kirill Fedoseev	4eba91ef7e	Fetch AMB signatures a bit earlier (#620 )	2021-11-03 19:21:35 +03:00
Kirill Fedoseev	1e3aa53ab3	Add oracle helper script for fetching interest amounts via async calls (#615 )	2021-10-21 13:33:12 +03:00
Alexander Kolotov	a05ff51555	Added logging prior the investedAmount call (#614 )	2021-10-12 18:06:50 +03:00
Kirill Fedoseev	52e1c88b58	Include cDAI balance in balanceDiff (#613 )	2021-10-11 12:14:55 +03:00
Alexander Kolotov	d36dcadd34	Merge the develop branch to the master branch, preparation to v3.2.0 This merge contains the following set of changes: * [Oracle, Fix] Use more accurate gas estimates for very high message gas limits (#611) * [Common, Other] Final version of AMB and OB contracts security audit report by ChainSecurity (#608)	2021-10-07 21:45:51 +03:00
Kirill Fedoseev	d543dbb339	Use more accurate gas estimates for very high message gas limits (#611 )	2021-10-07 20:44:14 +03:00
Kirill Fedoseev	bd21cc163e	Merge pull request #608 from poanetwork/reports/chainsecurity-amb-6.0.0-ob-1.1.0-contracts AMB and OB contracts security audit report by ChainSecurity	2021-09-28 21:12:37 +03:00
Alexander Kolotov	4a0fc936a1	Final version of AMB and OB contracts security audit report by ChainSecurity	2021-09-28 20:39:04 +03:00
Alexander Kolotov	78564afabd	Merge the develop branch to the master branch, preparation to v3.1.0 This merge contains the following set of changes: * [Oracle, Improvement] Try to detect unsynced node state (#592) * [Oracle, Improvement] Allow to override JSON RPC error codes (#603) * [Oracle, Fix] Fix handling of Compound related Transfer events (#595) * [Oracle, Fix] Add new nonce-related error messages (#599) * [Deployment, Fix] .env template includes latest changes related to the oracle configuration (#601) * [Deployment, Fix] Improvements for the local logs configuration (#602) * [Common, Other] Update the contract's submodule to the release 6.0.0 (#600)	2021-09-20 23:56:37 +03:00
Kirill Fedoseev	70a2c30b4c	Fix imported ABI	2021-09-20 13:31:37 +03:00
Kirill Fedoseev	06a9586148	Update yarn.lock	2021-09-20 12:50:07 +03:00
Kirill Fedoseev	7379fe4190	Allow to override JSON RPC error codes (#603 )	2021-09-20 12:07:49 +03:00
Alexander Kolotov	e59766c5df	Update the contract's submodule to the release 6.0.0 (#600 )	2021-09-18 13:44:48 +03:00
Alexander Kolotov	fdb18a1a17	Improvements for the local logs configuration (#602 )	2021-09-18 13:42:29 +03:00
Alexander Kolotov	4412046f66	.env template includes latest changes related to the oracle configuration (#601 )	2021-09-18 13:41:56 +03:00
Kirill Fedoseev	0ff224ccd3	Add new nonce-related error messages (#599 )	2021-09-15 23:42:32 +03:00
Kirill Fedoseev	5cedacafe5	Fix handling of Compound related Transfer events (#595 )	2021-08-24 11:31:15 +03:00
Kirill Fedoseev	2e6179f974	Try to detect unsynced node state (#592 )	2021-08-03 23:36:50 +03:00
Alexander Kolotov	4f5e3c47be	Merge the develop branch to the master branch, preparation to v3.0.0 This merge contains the following set of changes: * [Oracle, Improvement] Async calls error codes (#587) * [Oracle, Improvement] Refactor/async call serializers (#588)	2021-07-16 17:58:21 +03:00
Kirill Fedoseev	4c06329153	Refactor/async call serializers (#588 )	2021-07-13 12:25:05 +03:00
Kirill Fedoseev	d53452675e	Async calls error codes (#587 )	2021-07-13 11:57:08 +03:00
Alexander Kolotov	c92f80c484	Merge the develop branch to the master branch, preparation to v3.0.0-rc1 This merge contains the following set of changes: * [Monitor, Improvement] Add statistics about used AMB information requests (#577) * [ALM, Improvement] Add safe-execute button in ALM (#580), closes #573, closes #551 * [Oracle, Improvement] Improve confirm-relay feature (#582), closes #569 * [Monitor, Fix] Prune print of long error messages about missing file (#579), closes #578 * [Oracle, Fix] Use safe approach for eth_getLogs requests (#581) * [Oracle, Fix] Fix logging in gas price service (#583), closes #552 * [Oracle, Fix] Fix oracle error patterns and oracle e2e tests (#585) * [Common, Other] Fix dependencies versions and update example.yml (#566) * [Common, Other] Upload services logs in e2e and ultimate tests (#568) * [Oracle, Other] added example of emergency shutdown controller contract (#572) * [Oracle, Other] Refactor oracle configuration (#584)	2021-07-10 10:10:22 +03:00
Kirill Fedoseev	5e95b5d8c5	Fix oracle error patterns and oracle e2e tests (#585 )	2021-07-08 16:42:56 +03:00
Kirill Fedoseev	6e1f57493a	Refactor oracle configuration (#584 )	2021-07-08 09:38:55 +03:00
Kirill Fedoseev	8ed6550635	Improve confirm-relay feature (#582 )	2021-07-07 16:21:01 +03:00
Kirill Fedoseev	c8eb0f1ed8	Fix logging in gas price service (#583 )	2021-07-05 13:50:18 +03:00
Kirill Fedoseev	3e5e50c06e	Use safe approach for eth_getLogs requests (#581 )	2021-06-30 12:28:03 +03:00
Kirill Fedoseev	92e1b597c4	Add safe-execute button in ALM (#580 )	2021-06-18 09:43:18 +03:00
Kirill Fedoseev	8b1a97e673	Prune print of long error messages about missing file (#579 )	2021-06-12 00:24:20 +03:00
Kirill Fedoseev	3cf184c391	Add statistics about used AMB information requests (#577 )	2021-05-26 08:58:20 -06:00
Alexander Kolotov	8f72516374	added example of emergency shutdown controller contract (#572 )	2021-05-16 15:42:36 -06:00
Kirill Fedoseev	98155e3075	Upload services logs in e2e and ultimate tests (#568 )	2021-05-15 10:29:20 -06:00
Kirill Fedoseev	0d724147bd	Fix dependencies versions and update example.yml (#566 )	2021-05-10 14:36:57 -06:00
Alexander Kolotov	3b959776f3	Merge the develop branch to the master branch, preparation to v3.0.0-rc0 This merge contains the following set of changes: * [Oracle, Improvement] Oracle watcher for AMB async calls (#509), * [Common, Other] Update the contract's submodule to the release 6.0.0-rc0 (#562)	2021-05-09 07:59:36 -06:00
Kirill Fedoseev	ffbca8b941	Oracle watcher for AMB async calls (#509 )	2021-05-09 07:34:19 -06:00
Alexander Kolotov	38f1bae8f5	Update the contract's submodule to the release 6.0.0-rc0 (#562 )	2021-05-08 09:50:46 -06:00
Alexander Kolotov	9da1d7ab0a	Merge the develop branch to the master branch, preparation to v2.7.0-rc2 This merge contains the following set of changes: * [Monitor, Improvement] Include stats about failed and pending messages in mediators monitor endpoint (#544), closes #522 * [Oracle, Fix] Fix remote shutdown sender behaviour (#550) * [Oracle, Fix] Force update of gas price when getting underprice tx error (#554), closes #545 * [Oracle, Fix] Add oracle configuration option for max block range length (#557) * [Monitor, Fix] Limit block range of logs request (#543), closes #537 * [Monitor, Fix] Add missing cache file save (#549) * [UI, Other] Remove UI from monorepo (#553) * [Common, Other] Update the contract's submodule to the release 5.7.0-rc0 (#548) * [Common, Other] Final version of the FT OB contract security audit report by ChainSecurity (#559)	2021-05-04 07:42:06 -06:00
Alexander Kolotov	78bcd7568b	Final version of the FT OB contract security audit report by ChainSecurity (#559 )	2021-05-04 07:25:02 -06:00
Kirill Fedoseev	429312500a	Add oracle configuration option for max block range length (#557 )	2021-04-26 10:47:38 -06:00
Kirill Fedoseev	59e0bf7565	Force update of gas price when getting underprice tx error (#554 )	2021-04-18 12:30:40 -06:00
Kirill Fedoseev	ab51370d5a	Remove UI from monorepo (#553 )	2021-04-16 03:31:12 -06:00
Kirill Fedoseev	9dfb0510c4	Fix remote shutdown sender behaviour (#550 )	2021-04-14 14:35:43 -06:00
Kirill Fedoseev	f65e8f9244	Add missing cache file save (#549 )	2021-04-14 08:55:13 -06:00
Alexander Kolotov	5c8b595382	Update the contract's submodule to the release 5.7.0-rc0 (#548 )	2021-04-13 14:50:52 -06:00
Kirill Fedoseev	71bf9d5583	Limit block range of logs request (#543 )	2021-04-13 08:05:01 -06:00
Kirill Fedoseev	329ded4beb	Include stats about failed and pending messages in mediators monitor endpoint (#544 )	2021-04-13 07:59:49 -06:00
Alexander Kolotov	dc70247e2c	Merge the develop branch to the master branch, preparation to v2.7.0-rc1	2021-04-13 04:09:38 -06:00
Kirill Fedoseev	f95beee5dc	Add oracle service for remote shutdown (#531 )	2021-04-12 14:38:42 -06:00
@@ -1 +1 @@
 .22
 .22