Fix amb subsidized mode e2e test

Fix amb subsidized mode tests in oracle-e2e
Fix amb subsidized mode hash in oracle-e2e
2019-08-22 17:35:53 -03:00 · 2019-08-22 17:22:49 -03:00 · 2019-08-22 17:08:49 -03:00 · 2019-08-22 16:53:14 -03:00 · 2019-08-22 16:16:54 -03:00 · 2019-08-22 13:37:38 -03:00
185 changed files with 3573 additions and 3250 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,12 +5,6 @@ orbs:
    commands:
      install-chrome:
        steps:
-          - run:
-              name: Update dpkg
-              command: |
-                sudo apt-get clean
-                sudo apt-get update
-                sudo apt-get install dpkg
          - run: 
              name: Install Chrome
              command: |
@@ -24,7 +18,7 @@ orbs:
                export NVM_DIR="/opt/circleci/.nvm"
                [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"

-                nvm install 10.16.3 && nvm alias default 10.16.3
+                nvm install 11.4.0 && nvm alias default 11.4.0

                echo 'export NVM_DIR="/opt/circleci/.nvm"' >> $BASH_ENV
                echo ' [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"' >> $BASH_ENV
@@ -175,42 +169,17 @@ jobs:
    executor: tokenbridge-orb/machine-with-docker-caching
    steps:
      - checkout
-      - run: git submodule update --init
-      - run:
-          name: Run the scenario
-          command: deployment-e2e/molecule.sh oracle
-          no_output_timeout: 40m
+      - run: deployment/molecule/molecule.sh oracle
  deployment-ui:
    executor: tokenbridge-orb/machine-with-docker-caching
    steps:
      - checkout
-      - run: git submodule update --init
-      - run:
-          name: Run the scenario
-          command: deployment-e2e/molecule.sh ui
-          no_output_timeout: 40m
+      - run: deployment/molecule/molecule.sh ui
  deployment-monitor:
    executor: tokenbridge-orb/machine-with-docker-caching
    steps:
      - checkout
-      - run: git submodule update --init
-      - run: 
-          name: Run the scenario
-          command: deployment-e2e/molecule.sh monitor
-          no_output_timeout: 40m
-  deployment-repo:
-    executor: tokenbridge-orb/machine-with-docker-caching
-    steps:
-      - checkout
-      - run: git submodule update --init
-      - tokenbridge-orb/install-node
-      - tokenbridge-orb/install-yarn
-      - tokenbridge-orb/yarn-install-cached-on-machine
-      - run:
-          name: Run the scenario
-          command: deployment-e2e/molecule.sh repo
-          no_output_timeout: 40m
-      
+      - run: deployment/molecule/molecule.sh monitor
  ultimate:
    executor: tokenbridge-orb/machine-with-docker-caching
    parameters:
@@ -233,7 +202,7 @@ jobs:
      - run:
          name: Prepare the infrastructure
          command: e2e-commons/up.sh deploy << parameters.scenario-name >>
-          no_output_timeout: 50m
+          no_output_timeout: 30m
      - tokenbridge-orb/wait-for-oracle:
          redis-key: << parameters.redis-key >>
      - run:
@@ -271,7 +240,6 @@ workflows:
      - deployment-oracle
      - deployment-ui
      - deployment-monitor
-      - deployment-repo
      - ultimate:
          name: "ultimate: native to erc" 
          scenario-name: native-to-erc
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "contracts"]
 	path = contracts
-	url = https://github.com/poanetwork/tokenbridge-contracts.git
+	url = https://github.com/poanetwork/poa-bridge-contracts.git
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-10.16
+10.15
--- a/CONFIGURATION.md
+++ b/CONFIGURATION.md
@@ -1,71 +0,0 @@
-# Configuration
-
-## Common configuration
-
-name | description | value
--- | --- | ---
-COMMON_HOME_RPC_URL | The HTTPS URL(s) used to communicate to the RPC nodes in the Home network. Several URLs can be specified, delimited by spaces. If the connection to one of these nodes is lost the next URL is used for connection. | URL(s)
-COMMON_FOREIGN_RPC_URL | The HTTPS URL(s) used to communicate to the RPC nodes in the Foreign network. Several URLs can be specified, delimited by spaces. If the connection to one of these nodes is lost the next URL is used for connection. | URL(s)
-COMMON_HOME_BRIDGE_ADDRESS | The address of the bridge contract address in the Home network. It is used to listen to events from and send validators' transactions to the Home network. | hexidecimal beginning with "0x"
-COMMON_FOREIGN_BRIDGE_ADDRESS | The  address of the bridge contract address in the Foreign network. It is used to listen to events from and send validators' transactions to the Foreign network. | hexidecimal beginning with "0x"
-COMMON_HOME_GAS_PRICE_SUPPLIER_URL | The URL used to get a JSON response from the gas price prediction oracle for the Home network. The gas price provided by the oracle is used to send the validator's transactions to the RPC node. Since it is assumed that the Home network has a predefined gas price (e.g. the gas price in the Core of POA.Network is `1 GWei`), the gas price oracle parameter can be omitted for such networks. | URL
-COMMON_HOME_GAS_PRICE_SPEED_TYPE | Assuming the gas price oracle responds with the following JSON structure: `{"fast": 20.0, "block_time": 12.834, "health": true, "standard": 6.0, "block_number": 6470469, "instant": 71.0, "slow": 1.889}`, this parameter specifies the desirable transaction speed. The speed type can be omitted when `COMMON_HOME_GAS_PRICE_SUPPLIER_URL` is not used. | `instant` / `fast` / `standard` / `slow`
-COMMON_HOME_GAS_PRICE_FALLBACK | The gas price (in Wei) that is used if both the oracle and the fall back gas price specified in the Home Bridge contract are not available. | integer
-COMMON_HOME_GAS_PRICE_FACTOR | A value that will multiply the gas price of the oracle to convert it to gwei. If the oracle API returns gas prices in gwei then this can be set to `1`. Also, it could be used to intentionally pay more gas than suggested by the oracle to guarantee the transaction verification. E.g. `1.25` or `1.5`. | integer
-COMMON_FOREIGN_GAS_PRICE_SUPPLIER_URL | The URL used to get a JSON response from the gas price prediction oracle for the Foreign network. The provided gas price is used to send the validator's transactions to the RPC node. If the Foreign network is Ethereum Foundation mainnet, the oracle URL can be: https://gasprice.poa.network. Otherwise this parameter can be omitted. | URL
-COMMON_FOREIGN_GAS_PRICE_SPEED_TYPE | Assuming the gas price oracle responds with the following JSON structure: `{"fast": 20.0, "block_time": 12.834, "health": true, "standard": 6.0, "block_number": 6470469, "instant": 71.0, "slow": 1.889}`, this parameter specifies the desirable transaction speed. The speed type can be omitted when `COMMON_FOREIGN_GAS_PRICE_SUPPLIER_URL`is not used. | `instant` / `fast` / `standard` / `slow`
-COMMON_FOREIGN_GAS_PRICE_FALLBACK | The gas price (in Wei) used if both the oracle and fall back gas price specified in the Foreign Bridge contract are not available. | integer
-COMMON_FOREIGN_GAS_PRICE_FACTOR | A value that will multiply the gas price of the oracle to convert it to gwei. If the oracle API returns gas prices in gwei then this can be set to `1`. Also, it could be used to intentionally pay more gas than suggested by the oracle to guarantee the transaction verification. E.g. `1.25` or `1.5`. | integer
-
-
-## Oracle configuration
-
-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
-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
-ORACLE_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
-ORACLE_FOREIGN_GAS_PRICE_UPDATE_INTERVAL | The interval in milliseconds used to get the updated gas price value either from the oracle or from the Foreign Bridge contract. | integer
-ORACLE_QUEUE_URL | RabbitMQ URL used by watchers and senders to communicate to the message queue. Typically set to: `amqp://127.0.0.1`. | local URL
-ORACLE_REDIS_URL | Redis DB URL used by watchers and senders to communicate to the database. Typically set to: `redis://127.0.0.1:6379`. | local URL
-ORACLE_HOME_START_BLOCK | The block number in the Home network used to start watching for events when the bridge instance is run for the first time. Usually this is the same block where the Home Bridge contract is deployed. If a new validator instance is being deployed for an existing set of validators, the block number could be the latest block in the chain. | integer
-ORACLE_FOREIGN_START_BLOCK | The block number in the Foreign network used to start watching for events when the bridge instance runs for the first time. Usually this is the same block where the Foreign Bridge contract was deployed to. If a new validator instance is being deployed for an existing set of validators, the block number could be the latest block in the chain. | integer
-ORACLE_LOG_LEVEL | Set the level of details in the logs. | `trace` / `debug` / `info` / `warn` / `error` / `fatal`
-ORACLE_MAX_PROCESSING_TIME | The workers processes will be killed if this amount of time (in milliseconds) is elapsed before they finish processing. It is recommended to set this value to 4 times the value of the longest polling time (set with the `HOME_POLLING_INTERVAL` and `FOREIGN_POLLING_INTERVAL` variables). To disable this, set the time to 0. | integer
-ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY | The private key of the bridge validator used to sign confirmations before sending transactions to the bridge contracts. The validator account is calculated automatically from the private key. Every bridge instance (set of watchers and senders) must have its own unique private key. The specified private key is used to sign transactions on both sides of the bridge. | hexidecimal without "0x"
-ORACLE_VALIDATOR_ADDRESS | The public address of the bridge validator | hexidecimal with "0x"
-
-
-## 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_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. Currently only `classic` is implemented | classic
-
-
-## Monitor configuration
-
-name | description | value
--- | --- | ---
-MONITOR_HOME_START_BLOCK | The app will monitor transactions starting from this block. | integer
-MONITOR_FOREIGN_START_BLOCK | The app will monitor transactions starting from this block. | integer
-MONITOR_VALIDATOR_HOME_TX_LIMIT | Average gas usage of a transaction sent by a validator, it is used to estimate the number of transaction that can be paid by the validator. | integer
-MONITOR_VALIDATOR_FOREIGN_TX_LIMIT | Average gas usage of a transaction sent by a validator, it is used to estimate the number of transaction that can be paid by the validator. | integer
-MONITOR_TX_NUMBER_THRESHOLD | If estimated number of transaction is equal to or below this value, the monitor will report that the validator has less funds than it is required. | integer
-MONITOR_PORT | The port for the Monitor. | integer
--- a/Dockerfile.e2e
+++ b/Dockerfile.e2e
@@ -3,7 +3,6 @@ FROM node:10
 WORKDIR /mono
 COPY package.json .
 COPY oracle-e2e/package.json ./oracle-e2e/
-COPY monitor-e2e/package.json ./monitor-e2e/
 COPY contracts/package.json ./contracts/

 COPY yarn.lock .
--- a/README.md
+++ b/README.md
@@ -26,11 +26,10 @@ Sub-repositories maintained within this monorepo are listed below.
 | [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 |

-Additionally there are [Smart Contracts](https://github.com/poanetwork/tokenbridge-contracts) used to manage bridge validators, collect signatures, and confirm asset relay and disposal.
+Additionally there are [Smart Contracts](https://github.com/poanetwork/poa-bridge-contracts) used to manage bridge validators, collect signatures, and confirm asset relay and disposal.

 ## Available deployments

@@ -52,12 +51,11 @@ Additionally there are [Smart Contracts](https://github.com/poanetwork/tokenbrid

 ## Operational Modes

-The POA TokenBridge provides four operational modes:
+The POA TokenBridge provides three 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.

 ## Initializing the monorepository

@@ -87,14 +85,13 @@ 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).
+Additionaly there are end-to-end tests for [Oracle](oracle-e2e/README.md) and [UI](ui-e2e/README.md).

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

 ## Building, running and deploying

 Please refer to the instructions in sub-directories.
-Configuration details are available [here](./CONFIGURATION.md).

 ## Contributing

--- a/commons/constants.js
+++ b/commons/constants.js
@@ -17,11 +17,23 @@ const FEE_MANAGER_MODE = {
  UNDEFINED: 'UNDEFINED'
 }

-const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000'
+const GAS_PRICE_OPTIONS = {
+  UNDEFINED: '00',
+  GAS_PRICE: '01',
+  SPEED: '02'
+}
+
+const ORACLE_GAS_PRICE_SPEEDS = {
+  SLOW: 'slow',
+  STANDARD: 'standard',
+  FAST: 'fast',
+  INSTANT: 'instant'
+}

 module.exports = {
  BRIDGE_MODES,
  ERC_TYPES,
  FEE_MANAGER_MODE,
-  ZERO_ADDRESS
+  GAS_PRICE_OPTIONS,
+  ORACLE_GAS_PRICE_SPEEDS
 }
--- a/commons/message.js
+++ b/commons/message.js
@@ -1,3 +1,13 @@
+const web3Utils = require('web3-utils')
+const { GAS_PRICE_OPTIONS, ORACLE_GAS_PRICE_SPEEDS } = require('./constants')
+
+const gasPriceSpeedMapper = {
+  '01': ORACLE_GAS_PRICE_SPEEDS.INSTANT,
+  '02': ORACLE_GAS_PRICE_SPEEDS.FAST,
+  '03': ORACLE_GAS_PRICE_SPEEDS.STANDARD,
+  '04': ORACLE_GAS_PRICE_SPEEDS.SLOW
+}
+
 function strip0x(input) {
  return input.replace(/^0x/, '')
 }
@@ -12,11 +22,37 @@ function parseAMBMessage(message) {
  const txHash = `0x${message.slice(0, 64)}`
  const sender = `0x${message.slice(64, 104)}`
  const executor = `0x${message.slice(104, 144)}`
+  const gasLimit = web3Utils.toBN(message.slice(144, 208))
+  const dataType = message.slice(208, 210)
+  let gasPrice = null
+  let gasPriceSpeed = null
+  let dataStart = 210
+
+  switch (dataType) {
+    case GAS_PRICE_OPTIONS.GAS_PRICE:
+      gasPrice = web3Utils.toBN(message.slice(210, 274))
+      dataStart += 64
+      break
+    case GAS_PRICE_OPTIONS.SPEED:
+      gasPriceSpeed = gasPriceSpeedMapper[message.slice(210, 212)]
+      dataStart += 2
+      break
+    case GAS_PRICE_OPTIONS.UNDEFINED:
+    default:
+      break
+  }
+
+  const data = `0x${message.slice(dataStart, message.length)}`

  return {
    sender,
    executor,
-    txHash
+    txHash,
+    gasLimit,
+    dataType,
+    gasPrice,
+    gasPriceSpeed,
+    data
  }
 }

--- a/commons/test/message.test.js
+++ b/commons/test/message.test.js
@@ -1,6 +1,7 @@
-const { BN } = require('web3-utils')
+const { BN, toBN } = require('web3-utils')
 const { expect } = require('chai').use(require('bn-chai')(BN))
 const { parseAMBMessage, strip0x, addTxHashToData } = require('../message')
+const { ORACLE_GAS_PRICE_SPEEDS } = require('../constants')

 describe('strip0x', () => {
  it('should remove 0x from input', () => {
@@ -59,11 +60,66 @@ describe('parseAMBMessage', () => {
    )}${msgGasLimit}${msgDataType}${strip0x(msgData)}`

    // when
-    const { sender, executor, txHash } = parseAMBMessage(message)
+    const { sender, executor, txHash, gasLimit, dataType, gasPrice, gasPriceSpeed, data } = parseAMBMessage(message)

    // then
    expect(sender).to.be.equal(msgSender)
    expect(executor).to.be.equal(msgExecutor)
    expect(txHash).to.be.equal(msgTxHash)
+    expect(gasLimit).to.eq.BN(toBN(msgGasLimit))
+    expect(dataType).to.be.equal(msgDataType)
+    expect(gasPrice).to.be.equal(null)
+    expect(gasPriceSpeed).to.be.equal(null)
+    expect(data).to.be.equal(msgData)
+  })
+  it('should parse data type 01', () => {
+    const msgSender = '0x003667154bb32e42bb9e1e6532f19d187fa0082e'
+    const msgExecutor = '0xf4bef13f9f4f2b203faf0c3cbbaabe1afe056955'
+    const msgTxHash = '0xbdceda9d8c94838aca10c687da1411a07b1390e88239c0638cb9cc264219cc10'
+    const msgGasLimit = '000000000000000000000000000000000000000000000000000000005b877705'
+    const msgDataType = '01'
+    const msgGasPrice = '0000000000000000000000000000000000000000000000000000000165a0bc00'
+    const msgData = '0xb1591967aed668a4b27645ff40c444892d91bf5951b382995d4d4f6ee3a2ce03'
+    const message = `0x${strip0x(msgTxHash)}${strip0x(msgSender)}${strip0x(
+      msgExecutor
+    )}${msgGasLimit}${msgDataType}${msgGasPrice}${strip0x(msgData)}`
+
+    // when
+    const { sender, executor, txHash, gasLimit, dataType, gasPrice, gasPriceSpeed, data } = parseAMBMessage(message)
+
+    // then
+    expect(sender).to.be.equal(msgSender)
+    expect(executor).to.be.equal(msgExecutor)
+    expect(txHash).to.be.equal(msgTxHash)
+    expect(gasLimit).to.eq.BN(toBN(msgGasLimit))
+    expect(dataType).to.be.equal(msgDataType)
+    expect(gasPrice).to.eq.BN(toBN(msgGasPrice))
+    expect(gasPriceSpeed).to.be.equal(null)
+    expect(data).to.be.equal(msgData)
+  })
+  it('should parse data type 02', () => {
+    const msgSender = '0x003667154bb32e42bb9e1e6532f19d187fa0082e'
+    const msgExecutor = '0xf4bef13f9f4f2b203faf0c3cbbaabe1afe056955'
+    const msgTxHash = '0xbdceda9d8c94838aca10c687da1411a07b1390e88239c0638cb9cc264219cc10'
+    const msgGasLimit = '000000000000000000000000000000000000000000000000000000005b877705'
+    const msgDataType = '02'
+    const msgGasPriceSpeed = '0x03'
+    const msgData = '0xb1591967aed668a4b27645ff40c444892d91bf5951b382995d4d4f6ee3a2ce03'
+    const message = `0x${strip0x(msgTxHash)}${strip0x(msgSender)}${strip0x(
+      msgExecutor
+    )}${msgGasLimit}${msgDataType}${strip0x(msgGasPriceSpeed)}${strip0x(msgData)}`
+
+    // when
+    const { sender, executor, txHash, gasLimit, dataType, gasPrice, gasPriceSpeed, data } = parseAMBMessage(message)
+
+    // then
+    expect(sender).to.be.equal(msgSender)
+    expect(executor).to.be.equal(msgExecutor)
+    expect(txHash).to.be.equal(msgTxHash)
+    expect(gasLimit).to.eq.BN(toBN(msgGasLimit))
+    expect(dataType).to.be.equal(msgDataType)
+    expect(gasPrice).to.be.equal(null)
+    expect(gasPriceSpeed).to.be.equal(ORACLE_GAS_PRICE_SPEEDS.STANDARD)
+    expect(data).to.be.equal(msgData)
  })
 })
--- a/commons/utils.js
+++ b/commons/utils.js
@@ -205,7 +205,7 @@ const normalizeGasPrice = (oracleGasPrice, factor, limits = null) => {
 // 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 gasPriceFromOracle = async (fetchFn, options = {}) => {
  try {
    const response = await fetchFn()
    const json = await response.json()
@@ -224,7 +224,7 @@ const gasPriceFromSupplier = async (fetchFn, options = {}) => {
      options.logger.debug &&
      options.logger.debug({ oracleGasPrice, normalizedGasPrice }, 'Gas price updated using the API')

-    return normalizedGasPrice
+    return options.returnAllSpeeds ? { gasPrice: normalizedGasPrice, oracleGasPriceSpeeds: json } : normalizedGasPrice
  } catch (e) {
    options.logger && options.logger.error && options.logger.error(`Gas Price API is not available. ${e.message}`)
  }
@@ -258,7 +258,7 @@ module.exports = {
  getPastEvents,
  getDeployedAtBlock,
  normalizeGasPrice,
-  gasPriceFromSupplier,
+  gasPriceFromOracle,
  gasPriceFromContract,
  gasPriceWithinLimits
 }
--- a/2
+++ b/2
--- a/deployment-e2e/molecule.sh
+++ b/deployment-e2e/molecule.sh
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-cd $(dirname $0)
-set -e # exit when any command fails
-
-while [ "$1" != "" ]; do
-  docker-compose build && docker-compose run molecule_runner /bin/bash -c "molecule test --scenario-name $1"
-
-  shift # Shift all the parameters down by one
-done
--- a/deployment-e2e/molecule/repo/converge.yml
+++ b/deployment-e2e/molecule/repo/converge.yml
@@ -1,12 +0,0 @@
---
- name: Install Repository
-  hosts: all
-  become: true
-  tasks:
-    - import_role:
-        name: ../../../deployment/roles/common
-        tasks_from: repo
-    # Test that running the task again works
-    - import_role:
-        name: ../../../deployment/roles/common
-        tasks_from: repo
--- a/deployment-e2e/molecule/repo/molecule.yml
+++ b/deployment-e2e/molecule/repo/molecule.yml
@@ -1,30 +0,0 @@
---
-driver:
-  name: docker
-platforms:
-  - name: repo-host
-    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: ./converge.yml
-  inventory:
-    host_vars:
-      repo-host:
-        bridge_repo_branch: master
-verifier:
-  name: testinfra
-scenario:
-  name: repo
-  test_sequence:
-    - destroy
-    - create
-    - prepare
-    - converge
-    - verify
-    - destroy
--- a/deployment-e2e/molecule/repo/tests/test_existing.py
+++ b/deployment-e2e/molecule/repo/tests/test_existing.py
@@ -1,49 +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('all')
-
-
-@pytest.mark.parametrize("path", [
-    ("/home/poadocker"),
-    ("/home/poadocker/bridge"),
-    ("/home/poadocker/bridge/commons"),
-    ("/home/poadocker/bridge/e2e-commons"),
-    ("/home/poadocker/bridge/deployment"),
-    ("/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):
-    assert host.file(path).exists
-    assert host.file(path).is_directory
-
-
-@pytest.mark.parametrize("path", [
-    ("/home/poadocker/bridge/package.json"),
-    ("/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")
-])
-def test_existing_package_json(host, path):
-    assert host.file(path).exists
-    assert host.file(path).is_file
-
-
-@pytest.mark.parametrize("path", [
-    ("/home/poadocker/bridge/Dockerfile.e2e"),
-    ("/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")
-])
-def test_existing_docker_files(host, path):
-    assert host.file(path).exists
-    assert host.file(path).is_file
--- a/deployment-e2e/molecule/repo/tests/test_non_existing.py
+++ b/deployment-e2e/molecule/repo/tests/test_non_existing.py
@@ -1,23 +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('all')
-
-
-@pytest.mark.parametrize("path", [
-    ("/home/poadocker/bridge/node_modules"),
-    ("/home/poadocker/bridge/ui/node_modules"),
-    ("/home/poadocker/bridge/oracle/node_modules"),
-    ("/home/poadocker/bridge/monitor/node_modules"),
-    ("/home/poadocker/bridge/contracts/node_modules"),
-])
-def test_non_existing_node_modules(host, path):
-    assert not host.file(path).exists
-
-@pytest.mark.parametrize("path", [
-    ("/home/poadocker/bridge/.git")
-])
-def test_non_existing_git(host, path):
-    assert not host.file(path).exists
--- a/deployment-e2e/molecule/ultimate-commons/oracle-docker-compose.yml
+++ b/deployment-e2e/molecule/ultimate-commons/oracle-docker-compose.yml
@@ -1,62 +0,0 @@
---
- name: Overwrite Oracle the docker-compose
-  hosts: oracle
-  become: true
-  tasks:
-  - name: stop the service
-    shell: service poabridge stop
-  
-  - name: Slurp docker compose file
-    slurp:
-      src: "/home/poadocker/bridge/oracle/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: Add the external network used to connect to Parity nodes
-    set_fact:
-      docker_compose_parsed: "{{ docker_compose_parsed |combine({'networks': {'ultimate': {'external': 'true'}}}, recursive=True) }}"
-
-  - name: Add all Oracle containers to the network
-    set_fact:
-      docker_compose_parsed: "{{ docker_compose_parsed | combine({'services': {item: {'networks': docker_compose_parsed.services[item].networks | union(['ultimate'])}}}, recursive=True) }}"
-    with_items: "{{ docker_compose_parsed.services }}"
-  
-  - name: Expose Redis port to allow connecting from redis-cli
-    set_fact:
-      docker_compose_parsed: "{{ docker_compose_parsed | combine({'services': {'redis': {'ports': ['6379:6379']}}}, recursive=True) }}"
-
-  - name: Write new docker-compose file
-    copy:
-      content: "{{ docker_compose_parsed | to_yaml }}"
-      dest: "/home/poadocker/bridge/oracle/docker-compose.yml"
-
-  - name: Slurp docker compose extended file
-    slurp:
-      src: "/home/poadocker/bridge/oracle/docker-compose-transfer.yml"
-    register: docker_compose_extended_slurp
-  - name: Parse docker compose file
-    set_fact:
-      docker_compose_extended_parsed: "{{ docker_compose_extended_slurp['content'] | b64decode | from_yaml }}"
-
-  - name: Add the external network used to connect to Parity nodes in compose extended file
-    set_fact:
-      docker_compose_extended_parsed: "{{ docker_compose_extended_parsed |combine({'networks': {'ultimate': {'external': 'true'}}}, recursive=True) }}"
-
-  - name: Add all Oracle containers to the network in compose extended file
-    set_fact:
-      docker_compose_extended_parsed: "{{ docker_compose_extended_parsed | combine({'services': {item: {'networks': docker_compose_extended_parsed.services[item].networks | union(['ultimate'])}}}, recursive=True) }}"
-    with_items: "{{ docker_compose_extended_parsed.services }}"
-
-  - name: Expose Redis port to allow connecting from redis-cli in compose extended file
-    set_fact:
-      docker_compose_extended_parsed: "{{ docker_compose_extended_parsed | combine({'services': {'redis': {'ports': ['6379:6379']}}}, recursive=True) }}"
-
-  - name: Write new docker-compose extended file
-    copy:
-      content: "{{ docker_compose_extended_parsed | to_yaml }}"
-      dest: "/home/poadocker/bridge/oracle/docker-compose-transfer.yml"
-
-  - name: start the service
-    shell: service poabridge start
--- 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/CONFIGURATION.md
+++ b/deployment/CONFIGURATION.md
@@ -1,6 +1,6 @@
 # POA TokenBridge / Deployment Configuration

-Please see the [Configuration](../CONFIGURATION.md) for additional configuration and execution details.
+Please see the [Oracle](../oracle/README.md) for additional configuration and execution details.

 ## Prerequisites

@@ -30,7 +30,7 @@ cp hosts.yml.example hosts.yml
      hosts:
        <host_ip_A>:
          ansible_user: <user>
-          ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY: "<private_key>"
+          VALIDATOR_ADDRESS_PRIVATE_KEY: "<private_key>"
          #syslog_server_port: "<protocol>://<ip>:<port>" # When this parameter is set all bridge logs will be redirected to <ip>:<port> address.
        <host_ip_B>:
          # (...)
@@ -69,7 +69,7 @@ Example config for installing only UI:
 | `<bridge_name>` | The bridge name which tells Ansible which file to use. This is located in `group_vars/<bridge_name>.yml`. |
 | `<host_ip>` | Remote server IP address. |
 | ansible_user: `<user>` | User that will ssh into the node. This is typically `ubuntu` or `root`. |
-| ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY: `"<private_key>"` | The private key for the specified validator address. |
+| VALIDATOR_ADDRESS_PRIVATE_KEY: `"<private_key>"` | The private key for the specified validator address. |
 | syslog_server_port: `"<protocol>://<ip>:<port>"` | Optional port specification for bridge logs. This value will be provided by an administrator if required.  |

 `hosts.yml` can contain multiple bridge configurations at once.
@@ -89,6 +89,10 @@ Example config for installing only UI:

 2.1 `compose_service_user` - specifies the user created by the playbooks. This user runs the TokenBridge Oracle.

+2.2 `bridge_repo` contains the address of the TokenBridge Oracle repository. The default value is https://github.com/poanetwork/tokenbridge.
+
+2.3 `bridge_repo_branch` points to the specific branch or commit to use with the `bridge_repo`. If `bridge_repo_branch` is not specified, the default (`master`) branch is used.
+
 2.4 `bridge_path` sets the path where the TokenBridge Oracle is installed. By default, it points. to the home folder of `compose_service_user`

 2.5 `docker_compose_version` - specifies a version of docker-compose to be installed.
--- a/deployment/README.md
+++ b/deployment/README.md
@@ -16,7 +16,7 @@ Please refer to [Execution](./EXECUTION.md).

 ## Testing

-Please refer to [Deployment-E2E](../deployment-e2e/README.md).
+Please refer to [Testing](./molecule/TESTING.md).

 ## Contributing

--- a/deployment/group_vars/dai.yml
+++ b/deployment/group_vars/dai.yml
@@ -1,34 +1,35 @@
 ---
 ## General settings
-ORACLE_BRIDGE_MODE: "ERC_TO_NATIVE"
-UI_NATIVE_TOKEN_DISPLAY_NAME: "xDai"
+BRIDGE_MODE: "ERC_TO_NATIVE"
+HOME_NATIVE_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
+HOME_RPC_URL: "https://dai.poa.network"
+HOME_NAME: "xDai chain"
+HOME_WITHOUT_EVENTS: false
+HOME_BRIDGE_ADDRESS: "0x7301CFA0e1756B71869E93d4e4Dca5c7d0eb0AA6"
+HOME_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
+FOREIGN_RPC_URL: "https://mainnet.infura.io"
+FOREIGN_NAME: "Ethereum Mainnet"
+FOREIGN_WITHOUT_EVENTS: false
+FOREIGN_BRIDGE_ADDRESS: "0x4aa42145Aa6Ebf72e164C9bBC74fbD3788045016"
+ERC20_TOKEN_ADDRESS: "0x89d24a6b4ccb1b6faa2625fe562bdd9a23260359"
+FOREIGN_POLLING_INTERVAL: 5000

 ## Home Gasprice
-# COMMON_HOME_GAS_PRICE_SUPPLIER_URL: "https://localhost:8888/"
-COMMON_HOME_GAS_PRICE_SPEED_TYPE: "standard"
-COMMON_HOME_GAS_PRICE_FALLBACK: 0
-COMMON_HOME_GAS_PRICE_FACTOR: 600000
+# HOME_GAS_PRICE_ORACLE_URL: "https://localhost:8888/"
+HOME_GAS_PRICE_SPEED_TYPE: "standard"
+HOME_GAS_PRICE_FALLBACK: 0
+HOME_GAS_PRICE_UPDATE_INTERVAL: 600000

 ## 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
-ORACLE_FOREIGN_GAS_PRICE_UPDATE_INTERVAL: 600000
-COMMON_FOREIGN_GAS_PRICE_FACTOR: 1
+FOREIGN_GAS_PRICE_ORACLE_URL: "https://gasprice.poa.network/"
+FOREIGN_GAS_PRICE_SPEED_TYPE: "standard"
+FOREIGN_GAS_PRICE_FALLBACK: 10000000000
+FOREIGN_GAS_PRICE_UPDATE_INTERVAL: 600000
+FOREIGN_GAS_PRICE_FACTOR: 1

 ## UI
 UI_TITLE: "TokenBridge UI app - %c"
@@ -38,13 +39,15 @@ 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_HOME_GAS_PRICE_FALLBACK: 1000000000
+UI_FOREIGN_GAS_PRICE_FALLBACK: 10000000000

 ## Monitor
 MONITOR_PORT: 3003
-MONITOR_HOME_START_BLOCK: 759
-MONITOR_FOREIGN_START_BLOCK: 6478417
-MONITOR_VALIDATOR_HOME_TX_LIMIT: 300000
-MONITOR_VALIDATOR_FOREIGN_TX_LIMIT: 300000
-MONITOR_TX_NUMBER_THRESHOLD: 100
+MONITOR_HOME_DEPLOYMENT_BLOCK: 759
+MONITOR_FOREIGN_DEPLOYMENT_BLOCK: 6478417
+MONITOR_HOME_GAS_LIMIT: 300000
+MONITOR_FOREIGN_GAS_LIMIT: 300000
+MONITOR_HOME_GAS_PRICE_FALLBACK: 0
+MONITOR_FOREIGN_GAS_PRICE_FALLBACK: 10000000000
+MONITOR_LEFT_TX_THRESHOLD: 100
--- a/deployment/group_vars/erc-to-erc.yml
+++ b/deployment/group_vars/erc-to-erc.yml
@@ -1,6 +1,7 @@
 ---
-ORACLE_BRIDGE_MODE: "ERC_TO_ERC"
-COMMON_HOME_BRIDGE_ADDRESS: "0x1feB40aD9420b186F019A717c37f5546165d411E"
-COMMON_FOREIGN_BRIDGE_ADDRESS: "0x4a58D6d8D416a5fBCAcf3dC52eb8bE8948E25127"
+BRIDGE_MODE: "ERC_TO_ERC"
+HOME_BRIDGE_ADDRESS: "0x1feB40aD9420b186F019A717c37f5546165d411E"
+FOREIGN_BRIDGE_ADDRESS: "0x4a58D6d8D416a5fBCAcf3dC52eb8bE8948E25127"
+ERC20_TOKEN_ADDRESS: "0x3C665A31199694Bf723fD08844AD290207B5797f"
 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,7 @@
 ---
-ORACLE_BRIDGE_MODE: "ERC_TO_NATIVE"
-COMMON_HOME_BRIDGE_ADDRESS: "0x488Af810997eD1730cB3a3918cD83b3216E6eAda"
-COMMON_FOREIGN_BRIDGE_ADDRESS: "0x488Af810997eD1730cB3a3918cD83b3216E6eAda"
+BRIDGE_MODE: "ERC_TO_NATIVE"
+HOME_BRIDGE_ADDRESS: "0x488Af810997eD1730cB3a3918cD83b3216E6eAda"
+FOREIGN_BRIDGE_ADDRESS: "0x488Af810997eD1730cB3a3918cD83b3216E6eAda"
+ERC20_TOKEN_ADDRESS: "0x3C665A31199694Bf723fD08844AD290207B5797f"
 UI_PORT: 3002
 MONITOR_PORT: 3012
--- a/deployment/group_vars/example.yml
+++ b/deployment/group_vars/example.yml
@@ -1,36 +1,36 @@
 ---
 ## General settings
-ORACLE_BRIDGE_MODE: "NATIVE_TO_ERC"
-ORACLE_LOG_LEVEL: debug
-UI_NATIVE_TOKEN_DISPLAY_NAME: "POA"
+BRIDGE_MODE: "NATIVE_TO_ERC"
+HOME_NATIVE_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"
-ORACLE_HOME_RPC_POLLING_INTERVAL: 5000
+HOME_RPC_URL: "https://sokol.poa.network"
+HOME_NAME: "POA Sokol"
+HOME_WITHOUT_EVENTS: false
+HOME_BRIDGE_ADDRESS: "0x98aFdE294f1C46aA0a27Cc4049ED337F879d8976"
+HOME_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
+FOREIGN_RPC_URL: "https://sokol.poa.network"
+FOREIGN_NAME: "Kovan"
+FOREIGN_WITHOUT_EVENTS: false
+FOREIGN_BRIDGE_ADDRESS: "0x5a584f4C30B36f282848dAc9a2b20E7BEF481981"
+ERC20_TOKEN_ADDRESS: "0x6ef22442D600E1865AD8A8c254d6befCe7f4e6e4"
+FOREIGN_POLLING_INTERVAL: 1000

 ## Home Gasprice
-COMMON_HOME_GAS_PRICE_SUPPLIER_URL: "https://gasprice.poa.network/"
-COMMON_HOME_GAS_PRICE_SPEED_TYPE: "standard"
-COMMON_HOME_GAS_PRICE_FALLBACK: 1000000000      # in wei
-COMMON_HOME_GAS_PRICE_FACTOR: 1
-ORACLE_HOME_GAS_PRICE_UPDATE_INTERVAL: 600000
+HOME_GAS_PRICE_ORACLE_URL: "https://gasprice.poa.network/"
+HOME_GAS_PRICE_SPEED_TYPE: "standard"
+HOME_GAS_PRICE_FALLBACK: 1000000000      # in wei
+HOME_GAS_PRICE_UPDATE_INTERVAL: 600000
+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: 1000000000   # in wei
-COMMON_FOREIGN_GAS_PRICE_FACTOR: 1
-ORACLE_FOREIGN_GAS_PRICE_UPDATE_INTERVAL: 600000
+FOREIGN_GAS_PRICE_ORACLE_URL: "https://gasprice.poa.network/"
+FOREIGN_GAS_PRICE_SPEED_TYPE: "standard"
+FOREIGN_GAS_PRICE_FALLBACK: 1000000000   # in wei
+FOREIGN_GAS_PRICE_UPDATE_INTERVAL: 600000
+FOREIGN_GAS_PRICE_FACTOR: 1

 ## UI
 UI_TITLE: "TokenBridge UI app - %c"
@@ -40,13 +40,15 @@ 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_HOME_GAS_PRICE_FALLBACK: 1000000000
+UI_FOREIGN_GAS_PRICE_FALLBACK: 1000000000

 ## Monitor
 MONITOR_PORT: 3003
-MONITOR_HOME_START_BLOCK: 0
-MONITOR_FOREIGN_START_BLOCK: 0
-MONITOR_VALIDATOR_HOME_TX_LIMIT: 300000
-MONITOR_VALIDATOR_FOREIGN_TX_LIMIT: 300000
+MONITOR_HOME_DEPLOYMENT_BLOCK: 0
+MONITOR_FOREIGN_DEPLOYMENT_BLOCK: 0
+MONITOR_HOME_GAS_LIMIT: 300000
+MONITOR_FOREIGN_GAS_LIMIT: 300000
+MONITOR_HOME_GAS_PRICE_FALLBACK: 1000000000
+MONITOR_FOREIGN_GAS_PRICE_FALLBACK: 1000000000
 MONITOR_LEFT_TX_THRESHOLD: 100
--- a/deployment/group_vars/native-to-erc.yml
+++ b/deployment/group_vars/native-to-erc.yml
@@ -1,6 +1,7 @@
 ---
-ORACLE_BRIDGE_MODE: "NATIVE_TO_ERC"
-COMMON_HOME_BRIDGE_ADDRESS: "0x32198D570fffC7033641F8A9094FFDCaAEF42624"
-COMMON_FOREIGN_BRIDGE_ADDRESS: "0x2B6871b9B02F73fa24F4864322CdC78604207769"
+BRIDGE_MODE: "NATIVE_TO_ERC"
+HOME_BRIDGE_ADDRESS: "0x32198D570fffC7033641F8A9094FFDCaAEF42624"
+FOREIGN_BRIDGE_ADDRESS: "0x2B6871b9B02F73fa24F4864322CdC78604207769"
+ERC20_TOKEN_ADDRESS: "0xdbeE25CbE97e4A5CC6c499875774dc7067E9426B"
 UI_PORT: 3000
 MONITOR_PORT: 3010
--- a/deployment/group_vars/ultimate.yml
+++ b/deployment/group_vars/ultimate.yml
@@ -1,49 +1,56 @@
 ---
 ## General settings
-UI_NATIVE_TOKEN_DISPLAY_NAME: "POA"
-ORACLE_ALLOW_HTTP_FOR_RPC: yes
-ORACLE_LOG_LEVEL: debug
+# BRIDGE_MODE: ""
+HOME_NATIVE_NAME: "POA"
+ALLOW_HTTP: yes
+LOG_LEVEL: debug

 ## Home contract
-COMMON_HOME_RPC_URL: "https://sokol.poa.network"
-UI_HOME_NETWORK_DISPLAY_NAME: "POA Sokol"
-UI_HOME_WITHOUT_EVENTS: false
-ORACLE_HOME_RPC_POLLING_INTERVAL: 5000
+HOME_RPC_URL: "https://sokol.poa.network"
+HOME_NAME: "POA Sokol"
+HOME_WITHOUT_EVENTS: false
+# HOME_BRIDGE_ADDRESS: "0x32198D570fffC7033641F8A9094FFDCaAEF42624"
+HOME_POLLING_INTERVAL: 5000

 ## Foreign contract
-COMMON_FOREIGN_RPC_URL: "https://sokol.poa.network"
-UI_FOREIGN_NETWORK_DISPLAY_NAME: "Kovan"
-UI_FOREIGN_WITHOUT_EVENTS: false
-ORACLE_FOREIGN_RPC_POLLING_INTERVAL: 1000
+FOREIGN_RPC_URL: "https://sokol.poa.network"
+FOREIGN_NAME: "Kovan"
+FOREIGN_WITHOUT_EVENTS: false
+# FOREIGN_BRIDGE_ADDRESS: "0x2B6871b9B02F73fa24F4864322CdC78604207769"
+# ERC20_TOKEN_ADDRESS: "0xdbeE25CbE97e4A5CC6c499875774dc7067E9426B"
+FOREIGN_POLLING_INTERVAL: 1000

 ## Home Gasprice
-COMMON_HOME_GAS_PRICE_SUPPLIER_URL: "https://gasprice.poa.network/"
-COMMON_HOME_GAS_PRICE_SPEED_TYPE: "standard"
-COMMON_HOME_GAS_PRICE_FALLBACK: 1000000000      # in wei
-COMMON_HOME_GAS_PRICE_FACTOR: 1
-ORACLE_HOME_GAS_PRICE_UPDATE_INTERVAL: 600000
+HOME_GAS_PRICE_ORACLE_URL: "https://gasprice.poa.network/"
+HOME_GAS_PRICE_SPEED_TYPE: "standard"
+HOME_GAS_PRICE_FALLBACK: 1000000000      # in wei
+HOME_GAS_PRICE_UPDATE_INTERVAL: 600000
+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: 1000000000   # in wei
-COMMON_FOREIGN_GAS_PRICE_FACTOR: 1
-ORACLE_FOREIGN_GAS_PRICE_UPDATE_INTERVAL: 600000
+FOREIGN_GAS_PRICE_ORACLE_URL: "https://gasprice.poa.network/"
+FOREIGN_GAS_PRICE_SPEED_TYPE: "standard"
+FOREIGN_GAS_PRICE_FALLBACK: 1000000000   # in wei
+FOREIGN_GAS_PRICE_UPDATE_INTERVAL: 600000
+FOREIGN_GAS_PRICE_FACTOR: 1

-
-#ui
+## UI
 UI_TITLE: "TokenBridge UI app - %c"
 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: 3000
 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_HOME_GAS_PRICE_FALLBACK: 1000000000
+UI_FOREIGN_GAS_PRICE_FALLBACK: 1000000000

-#montior
-MONITOR_HOME_START_BLOCK: 0
-MONITOR_FOREIGN_START_BLOCK: 0
-MONITOR_VALIDATOR_HOME_TX_LIMIT: 300000
-MONITOR_VALIDATOR_FOREIGN_TX_LIMIT: 300000
+## Monitor
+# MONITOR_PORT: 3003
+MONITOR_HOME_DEPLOYMENT_BLOCK: 0
+MONITOR_FOREIGN_DEPLOYMENT_BLOCK: 0
+MONITOR_HOME_GAS_LIMIT: 300000
+MONITOR_FOREIGN_GAS_LIMIT: 300000
+MONITOR_HOME_GAS_PRICE_FALLBACK: 1000000000
+MONITOR_FOREIGN_GAS_PRICE_FALLBACK: 1000000000
 MONITOR_LEFT_TX_THRESHOLD: 100
--- a/deployment/group_vars/wetc.yml
+++ b/deployment/group_vars/wetc.yml
@@ -1,35 +1,36 @@
 ---
 ## General settings
-ORACLE_BRIDGE_MODE: "NATIVE_TO_ERC"
-UI_NATIVE_TOKEN_DISPLAY_NAME: "ETC"
+BRIDGE_MODE: "NATIVE_TO_ERC"
+HOME_NATIVE_NAME: "ETC"

 ## Home contract
-COMMON_HOME_RPC_URL: "https://ethereumclassic.network"
-UI_HOME_NETWORK_DISPLAY_NAME: "Ethereum Classic"
-UI_HOME_WITHOUT_EVENTS: false
-COMMON_HOME_BRIDGE_ADDRESS: "0x073081832B4Ecdce79d4D6753565c85Ba4b3BeA9"
-ORACLE_HOME_RPC_POLLING_INTERVAL: 7000
+HOME_RPC_URL: "https://ethereumclassic.network"
+HOME_NAME: "Ethereum Classic"
+HOME_WITHOUT_EVENTS: false
+HOME_BRIDGE_ADDRESS: "0x073081832B4Ecdce79d4D6753565c85Ba4b3BeA9"
+HOME_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
+FOREIGN_RPC_URL: "https://mainnet.infura.io/"
+FOREIGN_NAME: "Ethereum Mainnet"
+FOREIGN_WITHOUT_EVENTS: false
+FOREIGN_BRIDGE_ADDRESS: "0x0cB781EE62F815bdD9CD4c2210aE8600d43e7040"
+ERC20_TOKEN_ADDRESS: "0x86aaBCc646f290b9Fc9Bd05CE17C3858d1511Da1"
+FOREIGN_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
+HOME_GAS_PRICE_ORACLE_URL: "https://gasprice-etc.poa.network/"
+HOME_GAS_PRICE_SPEED_TYPE: "standard"
+HOME_GAS_PRICE_FALLBACK: 15000000000      # in wei
+HOME_GAS_PRICE_UPDATE_INTERVAL: 600000
+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
+FOREIGN_GAS_PRICE_ORACLE_URL: "https://gasprice.poa.network/"
+FOREIGN_GAS_PRICE_SPEED_TYPE: "standard"
+FOREIGN_GAS_PRICE_FALLBACK: 10000000000   # in wei
+FOREIGN_GAS_PRICE_UPDATE_INTERVAL: 600000
+FOREIGN_GAS_PRICE_FACTOR: 1

 ## UI
 UI_TITLE: "TokenBridge UI app - %c"
@@ -39,13 +40,15 @@ 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_HOME_GAS_PRICE_FALLBACK: 15000000000
+UI_FOREIGN_GAS_PRICE_FALLBACK: 10000000000

 ## Monitor
 MONITOR_PORT: 3003
-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
+MONITOR_HOME_DEPLOYMENT_BLOCK: 7703292
+MONITOR_FOREIGN_DEPLOYMENT_BLOCK: 7412459
+MONITOR_HOME_GAS_LIMIT: 300000
+MONITOR_FOREIGN_GAS_LIMIT: 300000
+MONITOR_HOME_GAS_PRICE_FALLBACK: 15000000000
+MONITOR_FOREIGN_GAS_PRICE_FALLBACK: 10000000000
+MONITOR_LEFT_TX_THRESHOLD: 100
--- a/deployment/hosts.yml.example
+++ b/deployment/hosts.yml.example
@@ -5,7 +5,7 @@ sokol-kovan:
      hosts:
        127.0.0.1:
          ansible_user: ubuntu
-          ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
+          VALIDATOR_ADDRESS_PRIVATE_KEY: "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"
          #syslog_server_port: "udp://127.0.0.1:514"
    ui:
      hosts:
--- a/deployment/molecule/Dockerfile
+++ b/deployment/molecule/Dockerfile
@@ -1,4 +1,5 @@
 FROM python:3.7-stretch
 RUN curl -fsSL https://get.docker.com | sh
 RUN pip3 install docker molecule==2.22rc1 molecule[docker] flake8
-WORKDIR mono/deployment-e2e
+WORKDIR runner
+COPY . .
--- a/deployment/molecule/TESTING.md
+++ b/deployment/molecule/TESTING.md
@@ -33,4 +33,4 @@ ui | Deploys and checks standalone UI on Ubuntu host

 ## Ultimate E2E tests

-For information on the Ultimate tests, please refer to [Ultimate](../e2e-commons/ULTIMATE.md).
+For information on the Ultimate tests, please refer to [Ultimate](../../e2e-commons/ULTIMATE.md).
--- a/deployment/molecule/docker-compose.yml
+++ b/deployment/molecule/docker-compose.yml
@@ -4,9 +4,8 @@ services:
  molecule_runner:
    build:
      context: ..
-      dockerfile: deployment-e2e/Dockerfile
+      dockerfile: molecule/Dockerfile
    restart: 'no'
    privileged: true
    volumes:
      - /var/run/docker.sock:/var/run/docker.sock
-      - ..:/mono
--- a/deployment/molecule/molecule.sh
+++ b/deployment/molecule/molecule.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+cd $(dirname $0)
+set -e # exit when any command fails
+
+CODEBASE_BRANCH=${CIRCLE_BRANCH-$(git symbolic-ref --short HEAD)}
+
+while [ "$1" != "" ]; do
+  docker-compose build && docker-compose run -e CODEBASE_BRANCH=$CODEBASE_BRANCH molecule_runner /bin/bash -c "molecule test --scenario-name $1"
+
+  shift # Shift all the parameters down by one
+done
--- a/deployment-e2e/molecule/monitor/Dockerfile.j2
+++ b/deployment-e2e/molecule/monitor/Dockerfile.j2
--- a/deployment-e2e/molecule/monitor/molecule.yml
+++ b/deployment-e2e/molecule/monitor/molecule.yml
@@ -29,10 +29,11 @@ provisioner:
      r: ["bug"]
  playbooks:
    prepare: ../prepare.yml
-    converge: ../../../deployment/site.yml
+    converge: ../../site.yml
  inventory:
    host_vars:
      monitor-host:
+        bridge_repo_branch: $CODEBASE_BRANCH
        syslog_server_port: "udp://127.0.0.1:514"
 verifier:
  name: testinfra
--- a/deployment-e2e/molecule/monitor/tests/test_monitor.py
+++ b/deployment-e2e/molecule/monitor/tests/test_monitor.py
--- a/deployment-e2e/molecule/oracle/Dockerfile.j2
+++ b/deployment-e2e/molecule/oracle/Dockerfile.j2
--- a/deployment-e2e/molecule/oracle/molecule.yml
+++ b/deployment-e2e/molecule/oracle/molecule.yml
@@ -29,12 +29,13 @@ provisioner:
      r: ["bug"]
  playbooks:
    prepare: ../prepare.yml
-    converge: ../../../deployment/site.yml
+    converge: ../../site.yml
  inventory:
    host_vars:
      oracle-host:
-        ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY: "8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9"
+        VALIDATOR_ADDRESS_PRIVATE_KEY: "8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9"
        syslog_server_port: "udp://127.0.0.1:514"
+        bridge_repo_branch: $CODEBASE_BRANCH
 verifier:
  name: testinfra
  lint:
--- a/deployment/molecule/oracle/prepare.yml
+++ b/deployment/molecule/oracle/prepare.yml
--- a/deployment-e2e/molecule/oracle/tests/test_oracle.py
+++ b/deployment-e2e/molecule/oracle/tests/test_oracle.py
--- a/deployment/molecule/prepare.yml
+++ b/deployment/molecule/prepare.yml
@@ -0,0 +1,13 @@
+---
+- name: prepare
+  hosts: all
+  tasks:
+    - name: install apt packages
+      apt:
+        name: "{{ packages }}"
+      vars:
+        packages:
+          - apt-transport-https
+          - rsyslog
+    - shell: service rsyslog start
+    - shell: groupadd docker && chgrp docker /var/run/docker.sock
--- a/deployment-e2e/molecule/tests/test_all.py
+++ b/deployment-e2e/molecule/tests/test_all.py
--- a/deployment-e2e/molecule/repo/Dockerfile.j2
+++ b/deployment-e2e/molecule/repo/Dockerfile.j2
--- a/deployment-e2e/molecule/ui/molecule.yml
+++ b/deployment-e2e/molecule/ui/molecule.yml
@@ -29,11 +29,12 @@ provisioner:
      r: ["bug"]
  playbooks:
    prepare: ../prepare.yml
-    converge: ../../../deployment/site.yml
+    converge: ../../site.yml
  inventory:
    host_vars:
      ui-host:
        syslog_server_port: "udp://127.0.0.1:514"
+        bridge_repo_branch: $CODEBASE_BRANCH
 verifier:
  name: testinfra
  lint:
--- a/deployment-e2e/molecule/ui/tests/test_ui.py
+++ b/deployment-e2e/molecule/ui/tests/test_ui.py
--- a/deployment-e2e/molecule/ultimate-commons/converge.yml
+++ b/deployment-e2e/molecule/ultimate-commons/converge.yml
@@ -1,5 +1,5 @@
 ---
- import_playbook: ../../../deployment/site.yml
+- import_playbook: ../../site.yml
 # The docker-compose files have to be modified, in order to join the docker containers over network with the parity containers
 - import_playbook: ./oracle-docker-compose.yml
 - import_playbook: ./ui-docker-compose.yml
--- a/deployment/molecule/ultimate-commons/oracle-docker-compose.yml
+++ b/deployment/molecule/ultimate-commons/oracle-docker-compose.yml
@@ -0,0 +1,36 @@
+---
+- name: Overwrite Oracle the docker-compose
+  hosts: oracle
+  become: true
+  tasks:
+  - name: stop the service
+    shell: service poabridge stop
+  
+  - name: Slurp docker compose file
+    slurp:
+      src: "/home/poadocker/bridge/oracle/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: Add the external network used to connect to Parity nodes
+    set_fact:
+      docker_compose_parsed: "{{ docker_compose_parsed |combine({'networks': {'ultimate': {'external': 'true'}}}, recursive=True) }}"
+
+  - name: Add all Oracle containers to the network
+    set_fact:
+      docker_compose_parsed: "{{ docker_compose_parsed | combine({'services': {item: {'networks': docker_compose_parsed.services[item].networks | union(['ultimate'])}}}, recursive=True) }}"
+    with_items: "{{ docker_compose_parsed.services }}"
+  
+  - name: Expose Redis port to allow connecting from redis-cli
+    set_fact:
+      docker_compose_parsed: "{{ docker_compose_parsed | combine({'services': {'redis': {'ports': ['6379:6379']}}}, recursive=True) }}"
+
+  - name: Write new docker-compose file
+    copy:
+      content: "{{ docker_compose_parsed | to_yaml }}"
+      dest: "/home/poadocker/bridge/oracle/docker-compose.yml"
+
+  - name: start the service
+    shell: service poabridge start
--- a/deployment-e2e/molecule/ultimate-commons/ui-docker-compose.yml
+++ b/deployment-e2e/molecule/ultimate-commons/ui-docker-compose.yml
--- a/deployment/molecule/ultimate-erc-to-erc/Dockerfile.j2
+++ b/deployment/molecule/ultimate-erc-to-erc/Dockerfile.j2
--- a/deployment-e2e/molecule/ultimate-erc-to-erc/molecule.yml
+++ b/deployment-e2e/molecule/ultimate-erc-to-erc/molecule.yml
@@ -32,13 +32,15 @@ provisioner:
  inventory:
    host_vars:
      oracle-erc-to-erc-host:
-        COMMON_HOME_RPC_URL: "http://parity1:8545"
-        COMMON_FOREIGN_RPC_URL: "http://parity2:8545"
-        ORACLE_VALIDATOR_ADDRESS: "0xaaB52d66283F7A1D5978bcFcB55721ACB467384b"
-        ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY: "8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9"
+        bridge_repo_branch: $CODEBASE_BRANCH
+        HOME_RPC_URL: "http://parity1:8545"
+        FOREIGN_RPC_URL: "http://parity2:8545"
+        VALIDATOR_ADDRESS: "0xaaB52d66283F7A1D5978bcFcB55721ACB467384b"
+        VALIDATOR_ADDRESS_PRIVATE_KEY: "8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9"
      ui-erc-to-erc-host:
-        COMMON_HOME_RPC_URL: "http://localhost:8541"
-        COMMON_FOREIGN_RPC_URL: "http://localhost:8542"
+        bridge_repo_branch: $CODEBASE_BRANCH
+        HOME_RPC_URL: "http://localhost:8541"
+        FOREIGN_RPC_URL: "http://localhost:8542"
 verifier:
  name: testinfra
  lint:
--- a/deployment-e2e/molecule/ultimate-erc-to-erc/Dockerfile.j2
+++ b/deployment-e2e/molecule/ultimate-erc-to-erc/Dockerfile.j2
--- a/deployment-e2e/molecule/ultimate-erc-to-native/molecule.yml
+++ b/deployment-e2e/molecule/ultimate-erc-to-native/molecule.yml
@@ -32,15 +32,15 @@ provisioner:
  inventory:
    host_vars:
      oracle-erc-to-native-host:
-        COMMON_HOME_RPC_URL: "http://parity1:8545"
-        COMMON_FOREIGN_RPC_URL: "http://parity2:8545"
-        ORACLE_VALIDATOR_ADDRESS: "0xaaB52d66283F7A1D5978bcFcB55721ACB467384b"
-        ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY: "8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9"
-        ORACLE_HOME_START_BLOCK: 1
-        ORACLE_FOREIGN_START_BLOCK: 1
+        bridge_repo_branch: $CODEBASE_BRANCH
+        HOME_RPC_URL: "http://parity1:8545"
+        FOREIGN_RPC_URL: "http://parity2:8545"
+        VALIDATOR_ADDRESS: "0xaaB52d66283F7A1D5978bcFcB55721ACB467384b"
+        VALIDATOR_ADDRESS_PRIVATE_KEY: "8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9"
      ui-erc-to-native-host:
-        COMMON_HOME_RPC_URL: "http://localhost:8541"
-        COMMON_FOREIGN_RPC_URL: "http://localhost:8542"
+        bridge_repo_branch: $CODEBASE_BRANCH
+        HOME_RPC_URL: "http://localhost:8541"
+        FOREIGN_RPC_URL: "http://localhost:8542"
 verifier:
  name: testinfra
  lint:
--- a/deployment-e2e/molecule/ultimate-erc-to-native/Dockerfile.j2
+++ b/deployment-e2e/molecule/ultimate-erc-to-native/Dockerfile.j2
--- a/deployment-e2e/molecule/ultimate-native-to-erc/molecule.yml
+++ b/deployment-e2e/molecule/ultimate-native-to-erc/molecule.yml
@@ -32,13 +32,15 @@ provisioner:
  inventory:
    host_vars:
      oracle-native-to-erc-host:
-        COMMON_HOME_RPC_URL: "http://parity1:8545"
-        COMMON_FOREIGN_RPC_URL: "http://parity2:8545"
-        ORACLE_VALIDATOR_ADDRESS: "0xaaB52d66283F7A1D5978bcFcB55721ACB467384b"
-        ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY: "8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9"
+        bridge_repo_branch: $CODEBASE_BRANCH
+        HOME_RPC_URL: "http://parity1:8545"
+        FOREIGN_RPC_URL: "http://parity2:8545"
+        VALIDATOR_ADDRESS: "0xaaB52d66283F7A1D5978bcFcB55721ACB467384b"
+        VALIDATOR_ADDRESS_PRIVATE_KEY: "8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9"
      ui-native-to-erc-host:
-        COMMON_HOME_RPC_URL: "http://localhost:8541"
-        COMMON_FOREIGN_RPC_URL: "http://localhost:8542"
+        bridge_repo_branch: $CODEBASE_BRANCH
+        HOME_RPC_URL: "http://localhost:8541"
+        FOREIGN_RPC_URL: "http://localhost:8542"
 verifier:
  name: testinfra
  lint:
--- a/deployment/roles/common/defaults/main.yml
+++ b/deployment/roles/common/defaults/main.yml
@@ -2,3 +2,5 @@
 docker_compose_version: 1.23.2
 compose_service_user: poadocker
 bridge_path: "/home/{{ compose_service_user }}/bridge"
+bridge_repo: https://github.com/poanetwork/tokenbridge.git
+bridge_repo_branch: master
--- a/deployment/roles/common/tasks/repo.yml
+++ b/deployment/roles/common/tasks/repo.yml
@@ -1,34 +1,12 @@
 ---
- name: Create archives of the monorepository
-  shell: |
-    (git ls-tree -r HEAD --name-only | sed '/^contracts$/d') | xargs tar zcfv monorepo.tar.gz --files-from -
-    cd contracts; (git ls-tree -r HEAD --name-only) | xargs tar zcfv ../contracts.tar.gz --files-from -
-  delegate_to: 127.0.0.1
-  become: false
-  args:
-    chdir: "{{ lookup('env', 'PWD') }}/.."
-
- name: Copy the archives
-  copy:
-    src: ../../../../{{ item }}
-    dest: "{{ bridge_path }}/"
-  with_items:
-    - monorepo.tar.gz
-    - contracts.tar.gz
-
- name: Untar the archives
-  shell: |
-    tar zxfv monorepo.tar.gz && rm monorepo.tar.gz
-    mkdir -p contracts && tar zxfv contracts.tar.gz -C ./contracts && rm contracts.tar.gz
+- name: Get bridge repo
+  git:
+    repo: "{{ bridge_repo }}"
+    dest: "{{ bridge_path }}"
+    force: no
+    update: no
+    version: "{{ bridge_repo_branch }}"
+- name: Initialize submodules
+  shell: git submodule update --init
  args:
    chdir: "{{ bridge_path }}"
-
- name: Remove local archives
-  shell: rm {{ item }}
-  delegate_to: 127.0.0.1
-  become: false
-  args:
-    chdir: "{{ lookup('env', 'PWD') }}/.."
-  with_items:
-    - monorepo.tar.gz
-    - contracts.tar.gz
--- a/deployment/roles/monitor/templates/.env.j2
+++ b/deployment/roles/monitor/templates/.env.j2
@@ -1,24 +1,24 @@
-COMMON_HOME_RPC_URL={{ COMMON_HOME_RPC_URL }}
-COMMON_FOREIGN_RPC_URL={{ COMMON_FOREIGN_RPC_URL }}
-COMMON_HOME_BRIDGE_ADDRESS={{ COMMON_HOME_BRIDGE_ADDRESS }}
-COMMON_FOREIGN_BRIDGE_ADDRESS={{ COMMON_FOREIGN_BRIDGE_ADDRESS }}
-MONITOR_HOME_START_BLOCK={{ MONITOR_HOME_START_BLOCK }}
-MONITOR_FOREIGN_START_BLOCK={{ MONITOR_FOREIGN_START_BLOCK }}
-MONITOR_VALIDATOR_HOME_TX_LIMIT={{ MONITOR_VALIDATOR_HOME_TX_LIMIT }}
-{% if COMMON_HOME_GAS_PRICE_SUPPLIER_URL | default('') != '' %}
-COMMON_HOME_GAS_PRICE_SUPPLIER_URL={{ COMMON_HOME_GAS_PRICE_SUPPLIER_URL }}
+HOME_RPC_URL={{ HOME_RPC_URL }}
+FOREIGN_RPC_URL={{ FOREIGN_RPC_URL }}
+HOME_BRIDGE_ADDRESS={{ HOME_BRIDGE_ADDRESS }}
+FOREIGN_BRIDGE_ADDRESS={{ FOREIGN_BRIDGE_ADDRESS }}
+HOME_DEPLOYMENT_BLOCK={{ MONITOR_HOME_DEPLOYMENT_BLOCK }}
+FOREIGN_DEPLOYMENT_BLOCK={{ MONITOR_FOREIGN_DEPLOYMENT_BLOCK }}
+HOME_GAS_LIMIT={{ MONITOR_HOME_GAS_LIMIT }}
+{% if HOME_GAS_PRICE_ORACLE_URL | default('') != '' %}
+HOME_GAS_PRICE_ORACLE_URL={{ HOME_GAS_PRICE_ORACLE_URL }}
 {% endif %}
-{% if COMMON_HOME_GAS_PRICE_SPEED_TYPE | default('') != '' %}
-COMMON_HOME_GAS_PRICE_SPEED_TYPE={{ COMMON_HOME_GAS_PRICE_SPEED_TYPE }}
+{% if HOME_GAS_PRICE_SPEED_TYPE | default('') != '' %}
+HOME_GAS_PRICE_SPEED_TYPE={{ HOME_GAS_PRICE_SPEED_TYPE }}
 {% endif %}
-COMMON_HOME_GAS_PRICE_FALLBACK={{ COMMON_HOME_GAS_PRICE_FALLBACK }}
-{% if COMMON_HOME_GAS_PRICE_FACTOR | default('') != '' %}
-COMMON_HOME_GAS_PRICE_FACTOR={{ COMMON_HOME_GAS_PRICE_FACTOR }}
+HOME_GAS_PRICE_FALLBACK={{ MONITOR_HOME_GAS_PRICE_FALLBACK }}
+{% if HOME_GAS_PRICE_FACTOR | default('') != '' %}
+HOME_GAS_PRICE_FACTOR={{ HOME_GAS_PRICE_FACTOR }}
 {% endif %}
-MONITOR_VALIDATOR_FOREIGN_TX_LIMIT={{ MONITOR_VALIDATOR_FOREIGN_TX_LIMIT }}
-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 }}
-COMMON_FOREIGN_GAS_PRICE_FACTOR={{ COMMON_FOREIGN_GAS_PRICE_FACTOR }}
-MONITOR_LEFT_TX_THRESHOLD={{ MONITOR_LEFT_TX_THRESHOLD }}
-MONITOR_PORT={{ MONITOR_PORT }}
+FOREIGN_GAS_LIMIT={{ MONITOR_FOREIGN_GAS_LIMIT }}
+FOREIGN_GAS_PRICE_ORACLE_URL={{ FOREIGN_GAS_PRICE_ORACLE_URL }}
+FOREIGN_GAS_PRICE_SPEED_TYPE={{ FOREIGN_GAS_PRICE_SPEED_TYPE }}
+FOREIGN_GAS_PRICE_FALLBACK={{ MONITOR_FOREIGN_GAS_PRICE_FALLBACK }}
+FOREIGN_GAS_PRICE_FACTOR={{ FOREIGN_GAS_PRICE_FACTOR }}
+LEFT_TX_THRESHOLD={{ MONITOR_LEFT_TX_THRESHOLD }}
+PORT={{ MONITOR_PORT }}
--- a/deployment/roles/oracle/defaults/main.yml
+++ b/deployment/roles/oracle/defaults/main.yml
@@ -1,6 +1,6 @@
 ---
 bridge_path: "/home/{{ compose_service_user }}/bridge"
-ORACLE_ALLOW_HTTP_FOR_RPC: no
-ORACLE_QUEUE_URL: amqp://rabbit
-ORACLE_REDIS_URL: redis://redis
+ALLOW_HTTP: no
+QUEUE_URL: amqp://rabbit
+REDIS_URL: redis://redis
 keyfile_path: "/root/.key"
--- a/deployment/roles/oracle/tasks/logging.yml
+++ b/deployment/roles/oracle/tasks/logging.yml
@@ -18,25 +18,6 @@
    content: "{{ docker_compose_parsed | to_yaml }}"
    dest: "{{ bridge_path }}/oracle/docker-compose.yml"

- name: Slurp docker compose extended file
-  slurp:
-    src: "{{ bridge_path }}/oracle/docker-compose-transfer.yml"
-  register: docker_compose_extended_slurp
-
- name: Parse docker compose extended file
-  set_fact:
-    docker_compose_extended_parsed: "{{ docker_compose_extended_slurp['content'] | b64decode | from_yaml }}"
-
- name: Set logger to remote server for extended file
-  set_fact:
-    docker_compose_extended_parsed: "{{ docker_compose_extended_parsed |combine({'services': {item: {'logging': {'driver': 'syslog','options': {'tag': '{{.Name}}/{{.ID}}'}}}}}, recursive=True) }}"
-  with_items: "{{ docker_compose_extended_parsed.services }}"
-
- name: Write new docker-compose-extended file
-  copy:
-    content: "{{ docker_compose_extended_parsed | to_yaml }}"
-    dest: "{{ bridge_path }}/oracle/docker-compose-transfer.yml"
-
 - name: Set the local container logs configuration file
  template:
    src: 31-oracle-docker.conf.j2
@@ -59,5 +40,5 @@
    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" ~'
+    content: ':msg, contains, "VALIDATOR_ADDRESS_PRIVATE_KEY" ~'
  notify: restart rsyslog
--- a/deployment/roles/oracle/tasks/post_config.yml
+++ b/deployment/roles/oracle/tasks/post_config.yml
@@ -5,42 +5,25 @@
  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)
+      HOME_START_BLOCK={{ (BLOCKS.stdout | from_json).homeStartBlock }}
+      FOREIGN_START_BLOCK={{ (BLOCKS.stdout | from_json).foreignStartBlock }}

 - name: Get validator address
  become_user: "{{ compose_service_user }}"
-  shell: docker-compose run -e ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY="{{ ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY }}" --entrypoint "node scripts/privateKeyToAddress.js" bridge_affirmation
+  shell: docker-compose run -e VALIDATOR_ADDRESS_PRIVATE_KEY="{{ VALIDATOR_ADDRESS_PRIVATE_KEY }}" --entrypoint "node scripts/privateKeyToAddress.js" bridge_affirmation
  args:
    chdir: "{{ bridge_path }}/oracle"
  register: VADDRESS

- name: Set ORACLE_VALIDATOR_ADDRESS variable
+- name: Set VALIDATOR_ADDRESS variable
  set_fact:
-    ORACLE_VALIDATOR_ADDRESS: "{{ VADDRESS.stdout }}"
-
- name: Get foreign erc type
-  become_user: "{{ compose_service_user }}"
-  shell: docker-compose run --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_NATIVE" or ( ORACLE_BRIDGE_MODE == "ERC_TO_ERC" and FOREIGN_ERC_TYPE != "ERC677")
+    VALIDATOR_ADDRESS: "{{ VADDRESS.stdout }}"

 - name: Install .key config
  template:
--- a/deployment/roles/oracle/templates/.env.j2
+++ b/deployment/roles/oracle/templates/.env.j2
@@ -1,56 +1,49 @@
 ## General settings
-ORACLE_BRIDGE_MODE={{ ORACLE_BRIDGE_MODE }}
-{% if ORACLE_LOG_LEVEL | default('') != '' %}
-ORACLE_LOG_LEVEL={{ ORACLE_LOG_LEVEL }}
-{% endif %}
+BRIDGE_MODE={{ BRIDGE_MODE }}

 ## 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 }}
+HOME_RPC_URL={{ HOME_RPC_URL }}
+HOME_BRIDGE_ADDRESS={{ HOME_BRIDGE_ADDRESS }}
+HOME_POLLING_INTERVAL={{ HOME_POLLING_INTERVAL }}

 ## Foreign contract
-COMMON_FOREIGN_RPC_URL={{ COMMON_FOREIGN_RPC_URL }}
-COMMON_FOREIGN_BRIDGE_ADDRESS={{ COMMON_FOREIGN_BRIDGE_ADDRESS }}
-ORACLE_FOREIGN_RPC_POLLING_INTERVAL={{ ORACLE_FOREIGN_RPC_POLLING_INTERVAL }}
+FOREIGN_RPC_URL={{ FOREIGN_RPC_URL }}
+FOREIGN_BRIDGE_ADDRESS={{ FOREIGN_BRIDGE_ADDRESS }}
+{% if ERC20_TOKEN_ADDRESS | default('') != '' %}
+ERC20_TOKEN_ADDRESS={{ ERC20_TOKEN_ADDRESS }}
+{% endif %}
+FOREIGN_POLLING_INTERVAL={{ FOREIGN_POLLING_INTERVAL }}

 ## Gasprice
-{% if COMMON_HOME_GAS_PRICE_SUPPLIER_URL | default('') != '' %}
-COMMON_HOME_GAS_PRICE_SUPPLIER_URL={{ COMMON_HOME_GAS_PRICE_SUPPLIER_URL }}
+{% if HOME_GAS_PRICE_ORACLE_URL | default('') != '' %}
+HOME_GAS_PRICE_ORACLE_URL={{ HOME_GAS_PRICE_ORACLE_URL }}
 {% endif %}
-{% if COMMON_HOME_GAS_PRICE_SPEED_TYPE | default('') != '' %}
-COMMON_HOME_GAS_PRICE_SPEED_TYPE={{ COMMON_HOME_GAS_PRICE_SPEED_TYPE }}
+{% if HOME_GAS_PRICE_SPEED_TYPE | default('') != '' %}
+HOME_GAS_PRICE_SPEED_TYPE={{ 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 }}
+HOME_GAS_PRICE_FALLBACK={{ HOME_GAS_PRICE_FALLBACK }}
+{% if HOME_GAS_PRICE_UPDATE_INTERVAL | default('') != '' %}
+HOME_GAS_PRICE_UPDATE_INTERVAL={{ HOME_GAS_PRICE_UPDATE_INTERVAL }}
 {% endif %}
-{% if COMMON_HOME_GAS_PRICE_FACTOR | default('') != '' %}
-COMMON_HOME_GAS_PRICE_FACTOR={{ COMMON_HOME_GAS_PRICE_FACTOR }}
+{% if HOME_GAS_PRICE_FACTOR | default('') != '' %}
+HOME_GAS_PRICE_FACTOR={{ 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 }}
+{% if FOREIGN_GAS_PRICE_ORACLE_URL | default('') != '' %}
+FOREIGN_GAS_PRICE_ORACLE_URL={{ FOREIGN_GAS_PRICE_ORACLE_URL }}
 {% endif %}
-{% if COMMON_FOREIGN_GAS_PRICE_SPEED_TYPE | default('') != '' %}
-COMMON_FOREIGN_GAS_PRICE_SPEED_TYPE={{ COMMON_FOREIGN_GAS_PRICE_SPEED_TYPE }}
+{% if FOREIGN_GAS_PRICE_SPEED_TYPE | default('') != '' %}
+FOREIGN_GAS_PRICE_SPEED_TYPE={{ 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 }}
+FOREIGN_GAS_PRICE_FALLBACK={{ FOREIGN_GAS_PRICE_FALLBACK }}
+{% if FOREIGN_GAS_PRICE_UPDATE_INTERVAL | default('') != '' %}
+FOREIGN_GAS_PRICE_UPDATE_INTERVAL={{ FOREIGN_GAS_PRICE_UPDATE_INTERVAL }}
 {% endif %}
-{% if COMMON_FOREIGN_GAS_PRICE_FACTOR | default('') != '' %}
-COMMON_FOREIGN_GAS_PRICE_FACTOR={{ COMMON_FOREIGN_GAS_PRICE_FACTOR }}
+{% if FOREIGN_GAS_PRICE_FACTOR | default('') != '' %}
+FOREIGN_GAS_PRICE_FACTOR={{ 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_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 %}
+ALLOW_HTTP={{ "yes" if ALLOW_HTTP else "no" }}
+QUEUE_URL={{ QUEUE_URL }}
+REDIS_URL={{ REDIS_URL }}
--- a/deployment/roles/oracle/templates/key.j2
+++ b/deployment/roles/oracle/templates/key.j2
@@ -1,3 +1,3 @@
 ## Validator-specific options                                                                                                                                                                                     
-ORACLE_VALIDATOR_ADDRESS={{ ORACLE_VALIDATOR_ADDRESS }} 
-ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY={{ ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY }} 
+VALIDATOR_ADDRESS={{ VALIDATOR_ADDRESS }} 
+VALIDATOR_ADDRESS_PRIVATE_KEY={{ VALIDATOR_ADDRESS_PRIVATE_KEY }} 
--- a/deployment/roles/oracle/templates/poabridge.j2
+++ b/deployment/roles/oracle/templates/poabridge.j2
@@ -14,9 +14,8 @@ WORKDIR="{{ '/home/' + compose_service_user | default('poadocker') + '/' + bridg

 #Getting path to private key file and variable name for parsing key file
 keyfile="{{ keyfile_path }}"
-vaddr="ORACLE_VALIDATOR_ADDRESS="
-vkey="ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY="
-composefileoverride="{{ composefileoverride | default('') }}"
+vaddr="VALIDATOR_ADDRESS="
+vkey="VALIDATOR_ADDRESS_PRIVATE_KEY="

 #Parsing file content and add key to variable
 while read -r line
@@ -34,30 +33,30 @@ done < $keyfile
 start(){
    echo "Starting bridge.."
    cd $WORKDIR
-    sudo -u "{{ compose_service_user }}" /usr/local/bin/docker-compose $composefileoverride down -v
-    sudo -u "{{ compose_service_user }}" /usr/local/bin/docker-compose $composefileoverride rm -fv
-    sudo -u "{{ compose_service_user }}" ORACLE_VALIDATOR_ADDRESS=$vaddr ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY=$vkey /usr/local/bin/docker-compose $composefileoverride up --detach
+    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 }}" VALIDATOR_ADDRESS=$vaddr VALIDATOR_ADDRESS_PRIVATE_KEY=$vkey /usr/local/bin/docker-compose  up  --detach
 }

 stop(){
    echo "Stopping bridge.."
    cd $WORKDIR
-    sudo -u "{{ compose_service_user }}" /usr/local/bin/docker-compose $composefileoverride  down -v
+    sudo -u "{{ compose_service_user }}" /usr/local/bin/docker-compose  down -v
    sleep 2
 }

 status(){
    echo "Bridge status:"
    cd $WORKDIR
-    sudo -u "{{ compose_service_user }}" /usr/local/bin/docker-compose $composefileoverride  ps
+    sudo -u "{{ compose_service_user }}" /usr/local/bin/docker-compose  ps
 }

 rebuild(){
    echo "Rebuild bridge.."
    cd $WORKDIR
-    sudo -u "{{ compose_service_user }}" /usr/local/bin/docker-compose $composefileoverride down -v
-    sudo -u "{{ compose_service_user }}" /usr/local/bin/docker-compose $composefileoverride rm -fv
-    sudo -u "{{ compose_service_user }}" ORACLE_VALIDATOR_ADDRESS=$vaddr ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY=$vkey /usr/local/bin/docker-compose $composefileoverride up --detach --force-recreate --no-deps --build
+    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 }}" VALIDATOR_ADDRESS=$vaddr VALIDATOR_ADDRESS_PRIVATE_KEY=$vkey /usr/local/bin/docker-compose  up  --detach --force-recreate --no-deps --build
 }


--- a/deployment/roles/ui/templates/.env.j2
+++ b/deployment/roles/ui/templates/.env.j2
@@ -1,42 +1,38 @@
-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 }}
+REACT_APP_HOME_BRIDGE_ADDRESS={{ HOME_BRIDGE_ADDRESS }}
+REACT_APP_FOREIGN_BRIDGE_ADDRESS={{ FOREIGN_BRIDGE_ADDRESS }}
+REACT_APP_FOREIGN_HTTP_PARITY_URL={{ FOREIGN_RPC_URL }}
+REACT_APP_HOME_HTTP_PARITY_URL={{ HOME_RPC_URL }}

-UI_NATIVE_TOKEN_DISPLAY_NAME={{ UI_NATIVE_TOKEN_DISPLAY_NAME }}
+REACT_APP_HOME_NATIVE_NAME={{ HOME_NATIVE_NAME }}

-UI_HOME_NETWORK_DISPLAY_NAME={{ UI_HOME_NETWORK_DISPLAY_NAME }}
-UI_FOREIGN_NETWORK_DISPLAY_NAME={{ UI_FOREIGN_NETWORK_DISPLAY_NAME }}
+REACT_APP_HOME_NETWORK_NAME={{ HOME_NAME }}
+REACT_APP_FOREIGN_NETWORK_NAME={{ FOREIGN_NAME }}

-UI_HOME_WITHOUT_EVENTS={{ UI_HOME_WITHOUT_EVENTS }}
-UI_FOREIGN_WITHOUT_EVENTS={{ UI_FOREIGN_WITHOUT_EVENTS }}
+REACT_APP_HOME_WITHOUT_EVENTS={{ HOME_WITHOUT_EVENTS }}
+REACT_APP_FOREIGN_WITHOUT_EVENTS={{ 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 }}
+REACT_APP_HOME_EXPLORER_TX_TEMPLATE={{ UI_HOME_EXPLORER_TX_TEMPLATE }}
+REACT_APP_FOREIGN_EXPLORER_TX_TEMPLATE={{ UI_FOREIGN_EXPLORER_TX_TEMPLATE }}
+REACT_APP_HOME_EXPLORER_ADDRESS_TEMPLATE={{ UI_HOME_EXPLORER_ADDRESS_TEMPLATE }}
+REACT_APP_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 }}
+{% if HOME_GAS_PRICE_ORACLE_URL | default('') != '' %}
+REACT_APP_HOME_GAS_PRICE_ORACLE_URL={{ HOME_GAS_PRICE_ORACLE_URL }}
+REACT_APP_HOME_GAS_PRICE_SPEED_TYPE={{ 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 }}
+REACT_APP_HOME_GAS_PRICE_FALLBACK={{ UI_HOME_GAS_PRICE_FALLBACK }}
+REACT_APP_HOME_GAS_PRICE_UPDATE_INTERVAL={{ HOME_GAS_PRICE_UPDATE_INTERVAL }}
+{% if HOME_GAS_PRICE_FACTOR | default('') != '' %}
+REACT_APP_HOME_GAS_PRICE_FACTOR={{ 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 }}
+REACT_APP_FOREIGN_GAS_PRICE_ORACLE_URL={{ FOREIGN_GAS_PRICE_ORACLE_URL }}
+REACT_APP_FOREIGN_GAS_PRICE_SPEED_TYPE={{ FOREIGN_GAS_PRICE_SPEED_TYPE }}
+REACT_APP_FOREIGN_GAS_PRICE_FALLBACK={{ UI_FOREIGN_GAS_PRICE_FALLBACK }}
+REACT_APP_FOREIGN_GAS_PRICE_UPDATE_INTERVAL={{ FOREIGN_GAS_PRICE_UPDATE_INTERVAL }}
+REACT_APP_FOREIGN_GAS_PRICE_FACTOR={{ FOREIGN_GAS_PRICE_FACTOR }}

 # Default
-UI_TITLE={{ UI_TITLE }}
-UI_DESCRIPTION={{ UI_DESCRIPTION }}
-UI_PORT={{ UI_PORT }}
-
-{% if UI_STYLES | default('') != '' %}
-UI_STYLES={{ UI_STYLES }}
-{% endif %}
+REACT_APP_TITLE={{ UI_TITLE }}
+REACT_APP_DESCRIPTION={{ UI_DESCRIPTION }}
+PORT={{ UI_PORT }}
--- a/e2e-commons/components-envs/monitor-amb.env
+++ b/e2e-commons/components-envs/monitor-amb.env
@@ -1,18 +0,0 @@
-COMMON_HOME_RPC_URL=http://parity1:8545
-COMMON_FOREIGN_RPC_URL=http://parity2:8545
-COMMON_HOME_BRIDGE_ADDRESS=0x0AEe1FCD12dDFab6265F7f8956e6E012A9Fe4Aa0
-COMMON_FOREIGN_BRIDGE_ADDRESS=0x0AEe1FCD12dDFab6265F7f8956e6E012A9Fe4Aa0
-MONITOR_HOME_START_BLOCK=0
-MONITOR_FOREIGN_START_BLOCK=0
-MONITOR_VALIDATOR_HOME_TX_LIMIT=300000
-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=3013
--- a/e2e-commons/components-envs/monitor-erc20-native.env
+++ b/e2e-commons/components-envs/monitor-erc20-native.env
@@ -1,18 +0,0 @@
-COMMON_HOME_RPC_URL=http://parity1:8545
-COMMON_FOREIGN_RPC_URL=http://parity2:8545
-COMMON_HOME_BRIDGE_ADDRESS=0x488Af810997eD1730cB3a3918cD83b3216E6eAda
-COMMON_FOREIGN_BRIDGE_ADDRESS=0x488Af810997eD1730cB3a3918cD83b3216E6eAda
-MONITOR_HOME_START_BLOCK=0
-MONITOR_FOREIGN_START_BLOCK=0
-MONITOR_VALIDATOR_HOME_TX_LIMIT=300000
-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=3012
--- a/e2e-commons/components-envs/monitor-erc20.env
+++ b/e2e-commons/components-envs/monitor-erc20.env
@@ -1,18 +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
--- a/e2e-commons/components-envs/monitor.env
+++ b/e2e-commons/components-envs/monitor.env
@@ -1,18 +0,0 @@
-COMMON_HOME_RPC_URL=http://parity1:8545
-COMMON_FOREIGN_RPC_URL=http://parity2:8545
-COMMON_HOME_BRIDGE_ADDRESS=0x32198D570fffC7033641F8A9094FFDCaAEF42624
-COMMON_FOREIGN_BRIDGE_ADDRESS=0x2B6871b9B02F73fa24F4864322CdC78604207769
-MONITOR_HOME_START_BLOCK=0
-MONITOR_FOREIGN_START_BLOCK=0
-MONITOR_VALIDATOR_HOME_TX_LIMIT=300000
-COMMON_HOME_GAS_PRICE_SUPPLIER_URL=https://gasprice.poa.network/
-COMMON_HOME_GAS_PRICE_SPEED_TYPE=standard
-COMMON_HOME_GAS_PRICE_FALLBACK=1000000000
-COMMON_HOME_GAS_PRICE_FACTOR=1
-MONITOR_VALIDATOR_FOREIGN_TX_LIMIT=300000
-COMMON_FOREIGN_GAS_PRICE_SUPPLIER_URL=https://gasprice.poa.network/
-COMMON_FOREIGN_GAS_PRICE_SPEED_TYPE=standard
-COMMON_FOREIGN_GAS_PRICE_FALLBACK=1000000000
-COMMON_FOREIGN_GAS_PRICE_FACTOR=1
-MONITOR_TX_NUMBER_THRESHOLD=100
-MONITOR_PORT=3010
--- a/e2e-commons/components-envs/oracle-amb.env
+++ b/e2e-commons/components-envs/oracle-amb.env
@@ -1,23 +0,0 @@
-
-ORACLE_BRIDGE_MODE=ARBITRARY_MESSAGE
-ORACLE_QUEUE_URL=amqp://rabbit
-ORACLE_REDIS_URL=redis://redis
-COMMON_HOME_RPC_URL=http://parity1:8545
-COMMON_FOREIGN_RPC_URL=http://parity2:8545
-COMMON_HOME_BRIDGE_ADDRESS=0x0AEe1FCD12dDFab6265F7f8956e6E012A9Fe4Aa0
-COMMON_FOREIGN_BRIDGE_ADDRESS=0x0AEe1FCD12dDFab6265F7f8956e6E012A9Fe4Aa0
-ORACLE_VALIDATOR_ADDRESS=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
-ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY=8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9
-COMMON_HOME_GAS_PRICE_SUPPLIER_URL=https://gasprice.poa.network/
-COMMON_HOME_GAS_PRICE_SPEED_TYPE=standard
-COMMON_HOME_GAS_PRICE_FALLBACK=1000000000
-ORACLE_HOME_GAS_PRICE_UPDATE_INTERVAL=600000
-COMMON_HOME_GAS_PRICE_FACTOR=1
-COMMON_FOREIGN_GAS_PRICE_SUPPLIER_URL=https://gasprice.poa.network/
-COMMON_FOREIGN_GAS_PRICE_SPEED_TYPE=standard
-COMMON_FOREIGN_GAS_PRICE_FALLBACK=10000000000
-ORACLE_FOREIGN_GAS_PRICE_UPDATE_INTERVAL=600000
-COMMON_FOREIGN_GAS_PRICE_FACTOR=1
-ORACLE_HOME_RPC_POLLING_INTERVAL=500
-ORACLE_FOREIGN_RPC_POLLING_INTERVAL=500
-ORACLE_ALLOW_HTTP_FOR_RPC=yes
--- a/e2e-commons/components-envs/oracle-erc20-native.env
+++ b/e2e-commons/components-envs/oracle-erc20-native.env
@@ -1,25 +0,0 @@
-
-ORACLE_BRIDGE_MODE=ERC_TO_NATIVE
-ORACLE_QUEUE_URL=amqp://rabbit
-ORACLE_REDIS_URL=redis://redis
-COMMON_HOME_RPC_URL=http://parity1:8545
-COMMON_FOREIGN_RPC_URL=http://parity2:8545
-COMMON_HOME_BRIDGE_ADDRESS=0x488Af810997eD1730cB3a3918cD83b3216E6eAda
-COMMON_FOREIGN_BRIDGE_ADDRESS=0x488Af810997eD1730cB3a3918cD83b3216E6eAda
-ORACLE_VALIDATOR_ADDRESS=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
-ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY=8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9
-COMMON_HOME_GAS_PRICE_SUPPLIER_URL=https://gasprice.poa.network/
-COMMON_HOME_GAS_PRICE_SPEED_TYPE=standard
-COMMON_HOME_GAS_PRICE_FALLBACK=1
-ORACLE_HOME_GAS_PRICE_UPDATE_INTERVAL=600000
-COMMON_HOME_GAS_PRICE_FACTOR=1
-COMMON_FOREIGN_GAS_PRICE_SUPPLIER_URL=https://gasprice.poa.network/
-COMMON_FOREIGN_GAS_PRICE_SPEED_TYPE=standard
-COMMON_FOREIGN_GAS_PRICE_FALLBACK=1
-ORACLE_FOREIGN_GAS_PRICE_UPDATE_INTERVAL=600000
-COMMON_FOREIGN_GAS_PRICE_FACTOR=0.1
-ORACLE_HOME_RPC_POLLING_INTERVAL=500
-ORACLE_FOREIGN_RPC_POLLING_INTERVAL=500
-ORACLE_ALLOW_HTTP_FOR_RPC=yes
-ORACLE_HOME_START_BLOCK=1
-ORACLE_FOREIGN_START_BLOCK=1
--- a/e2e-commons/components-envs/oracle-erc20.env
+++ b/e2e-commons/components-envs/oracle-erc20.env
@@ -1,23 +0,0 @@
-
-ORACLE_BRIDGE_MODE=ERC_TO_ERC
-ORACLE_QUEUE_URL=amqp://rabbit
-ORACLE_REDIS_URL=redis://redis
-COMMON_HOME_RPC_URL=http://parity1:8545
-COMMON_FOREIGN_RPC_URL=http://parity2:8545
-COMMON_HOME_BRIDGE_ADDRESS=0x1feB40aD9420b186F019A717c37f5546165d411E
-COMMON_FOREIGN_BRIDGE_ADDRESS=0x4a58D6d8D416a5fBCAcf3dC52eb8bE8948E25127
-ORACLE_VALIDATOR_ADDRESS=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
-ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY=8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9
-COMMON_HOME_GAS_PRICE_SUPPLIER_URL=https://gasprice.poa.network/
-COMMON_HOME_GAS_PRICE_SPEED_TYPE=standard
-COMMON_HOME_GAS_PRICE_FALLBACK=1
-ORACLE_HOME_GAS_PRICE_UPDATE_INTERVAL=600000
-COMMON_HOME_GAS_PRICE_FACTOR=1
-COMMON_FOREIGN_GAS_PRICE_SUPPLIER_URL=https://gasprice.poa.network/
-COMMON_FOREIGN_GAS_PRICE_SPEED_TYPE=standard
-COMMON_FOREIGN_GAS_PRICE_FALLBACK=1
-ORACLE_FOREIGN_GAS_PRICE_UPDATE_INTERVAL=600000
-COMMON_FOREIGN_GAS_PRICE_FACTOR=0.1
-ORACLE_HOME_RPC_POLLING_INTERVAL=500
-ORACLE_FOREIGN_RPC_POLLING_INTERVAL=500
-ORACLE_ALLOW_HTTP_FOR_RPC=yes
--- a/e2e-commons/components-envs/oracle.env
+++ b/e2e-commons/components-envs/oracle.env
@@ -1,23 +0,0 @@
-
-ORACLE_BRIDGE_MODE=NATIVE_TO_ERC
-ORACLE_QUEUE_URL=amqp://rabbit
-ORACLE_REDIS_URL=redis://redis
-COMMON_HOME_RPC_URL=http://parity1:8545
-COMMON_FOREIGN_RPC_URL=http://parity2:8545
-COMMON_HOME_BRIDGE_ADDRESS=0x32198D570fffC7033641F8A9094FFDCaAEF42624
-COMMON_FOREIGN_BRIDGE_ADDRESS=0x2B6871b9B02F73fa24F4864322CdC78604207769
-ORACLE_VALIDATOR_ADDRESS=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
-ORACLE_VALIDATOR_ADDRESS_PRIVATE_KEY=8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9
-COMMON_HOME_GAS_PRICE_SUPPLIER_URL=https://gasprice.poa.network/
-COMMON_HOME_GAS_PRICE_SPEED_TYPE=standard
-COMMON_HOME_GAS_PRICE_FALLBACK=1
-ORACLE_HOME_GAS_PRICE_UPDATE_INTERVAL=600000
-COMMON_HOME_GAS_PRICE_FACTOR=1
-COMMON_FOREIGN_GAS_PRICE_SUPPLIER_URL=https://gasprice.poa.network/
-COMMON_FOREIGN_GAS_PRICE_SPEED_TYPE=standard
-COMMON_FOREIGN_GAS_PRICE_FALLBACK=1
-ORACLE_FOREIGN_GAS_PRICE_UPDATE_INTERVAL=600000
-COMMON_FOREIGN_GAS_PRICE_FACTOR=0.1
-ORACLE_HOME_RPC_POLLING_INTERVAL=500
-ORACLE_FOREIGN_RPC_POLLING_INTERVAL=500
-ORACLE_ALLOW_HTTP_FOR_RPC=yes
--- a/e2e-commons/components-envs/ui-erc20-native.env
+++ b/e2e-commons/components-envs/ui-erc20-native.env
@@ -1,22 +0,0 @@
-COMMON_HOME_BRIDGE_ADDRESS=0x488Af810997eD1730cB3a3918cD83b3216E6eAda
-COMMON_FOREIGN_BRIDGE_ADDRESS=0x488Af810997eD1730cB3a3918cD83b3216E6eAda
-COMMON_FOREIGN_RPC_URL=http://localhost:8542
-COMMON_HOME_RPC_URL=http://localhost:8541
-UI_NATIVE_TOKEN_DISPLAY_NAME=POA
-UI_HOME_NETWORK_DISPLAY_NAME=Sokol
-UI_FOREIGN_NETWORK_DISPLAY_NAME=Kovan
-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
-COMMON_HOME_GAS_PRICE_SUPPLIER_URL=https://gasprice.poa.network/
-COMMON_HOME_GAS_PRICE_SPEED_TYPE=standard
-COMMON_HOME_GAS_PRICE_FALLBACK=5000000000
-UI_HOME_GAS_PRICE_UPDATE_INTERVAL=15000
-COMMON_HOME_GAS_PRICE_FACTOR=1
-COMMON_FOREIGN_GAS_PRICE_SUPPLIER_URL=https://gasprice.poa.network/
-COMMON_FOREIGN_GAS_PRICE_SPEED_TYPE=standard
-COMMON_FOREIGN_GAS_PRICE_FALLBACK=5000000000
-UI_FOREIGN_GAS_PRICE_UPDATE_INTERVAL=15000
-COMMON_FOREIGN_GAS_PRICE_FACTOR=1
-UI_PORT=3000
--- a/e2e-commons/components-envs/ui-erc20.env
+++ b/e2e-commons/components-envs/ui-erc20.env
@@ -1,22 +0,0 @@
-COMMON_HOME_BRIDGE_ADDRESS=0x1feB40aD9420b186F019A717c37f5546165d411E
-COMMON_FOREIGN_BRIDGE_ADDRESS=0x4a58D6d8D416a5fBCAcf3dC52eb8bE8948E25127
-COMMON_FOREIGN_RPC_URL=http://localhost:8542
-COMMON_HOME_RPC_URL=http://localhost:8541
-UI_NATIVE_TOKEN_DISPLAY_NAME=POA
-UI_HOME_NETWORK_DISPLAY_NAME=Sokol
-UI_FOREIGN_NETWORK_DISPLAY_NAME=Kovan
-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
-COMMON_HOME_GAS_PRICE_SUPPLIER_URL=https://gasprice.poa.network/
-COMMON_HOME_GAS_PRICE_SPEED_TYPE=standard
-COMMON_HOME_GAS_PRICE_FALLBACK=5000000000
-UI_HOME_GAS_PRICE_UPDATE_INTERVAL=15000
-COMMON_HOME_GAS_PRICE_FACTOR=1
-COMMON_FOREIGN_GAS_PRICE_SUPPLIER_URL=https://gasprice.poa.network/
-COMMON_FOREIGN_GAS_PRICE_SPEED_TYPE=standard
-COMMON_FOREIGN_GAS_PRICE_FALLBACK=5000000000
-UI_FOREIGN_GAS_PRICE_UPDATE_INTERVAL=15000
-COMMON_FOREIGN_GAS_PRICE_FACTOR=1
-UI_PORT=3000
--- a/e2e-commons/components-envs/ui.env
+++ b/e2e-commons/components-envs/ui.env
@@ -1,22 +0,0 @@
-COMMON_HOME_BRIDGE_ADDRESS=0x32198D570fffC7033641F8A9094FFDCaAEF42624
-COMMON_FOREIGN_BRIDGE_ADDRESS=0x2B6871b9B02F73fa24F4864322CdC78604207769
-COMMON_FOREIGN_RPC_URL=http://localhost:8542
-COMMON_HOME_RPC_URL=http://localhost:8541
-UI_NATIVE_TOKEN_DISPLAY_NAME=POA
-UI_HOME_NETWORK_DISPLAY_NAME=Sokol
-UI_FOREIGN_NETWORK_DISPLAY_NAME=Kovan
-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
-COMMON_HOME_GAS_PRICE_SUPPLIER_URL=https://gasprice.poa.network/
-COMMON_HOME_GAS_PRICE_SPEED_TYPE=standard
-COMMON_HOME_GAS_PRICE_FALLBACK=5000000000
-UI_HOME_GAS_PRICE_UPDATE_INTERVAL=15000
-COMMON_HOME_GAS_PRICE_FACTOR=1
-COMMON_FOREIGN_GAS_PRICE_SUPPLIER_URL=https://gasprice.poa.network/
-COMMON_FOREIGN_GAS_PRICE_SPEED_TYPE=standard
-COMMON_FOREIGN_GAS_PRICE_FALLBACK=5000000000
-UI_FOREIGN_GAS_PRICE_UPDATE_INTERVAL=15000
-COMMON_FOREIGN_GAS_PRICE_FACTOR=1
-UI_PORT=3000
--- a/e2e-commons/constants.json
+++ b/e2e-commons/constants.json
@@ -19,30 +19,26 @@
    "home": "0x32198D570fffC7033641F8A9094FFDCaAEF42624",
    "foreign": "0x2B6871b9B02F73fa24F4864322CdC78604207769",
    "foreignToken": "0xdbeE25CbE97e4A5CC6c499875774dc7067E9426B",
-    "ui": "http://localhost:3000",
-    "monitor": "http://monitor:3010"
+    "ui": "http://localhost:3000"
  },
  "ercToErcBridge": {
    "home": "0x1feB40aD9420b186F019A717c37f5546165d411E",
    "foreign": "0x4a58D6d8D416a5fBCAcf3dC52eb8bE8948E25127",
    "homeToken": "0x792455a6bCb62Ed4C4362D323E0590654CA4765c",
    "foreignToken": "0x3C665A31199694Bf723fD08844AD290207B5797f",
-    "ui": "http://localhost:3001",
-    "monitor": "http://monitor-erc20:3011"
+    "ui": "http://localhost:3001"
  },
  "ercToNativeBridge": {
    "home": "0x488Af810997eD1730cB3a3918cD83b3216E6eAda",
    "foreign": "0x488Af810997eD1730cB3a3918cD83b3216E6eAda",
    "foreignToken": "0x3C665A31199694Bf723fD08844AD290207B5797f",
-    "ui": "http://localhost:3002",
-    "monitor": "http://monitor-erc20-native:3012"
+    "ui": "http://localhost:3002"
  },
  "amb": {
    "home": "0x0AEe1FCD12dDFab6265F7f8956e6E012A9Fe4Aa0",
    "foreign": "0x0AEe1FCD12dDFab6265F7f8956e6E012A9Fe4Aa0",
-    "homeBox": "0x6C4EaAb8756d53Bf599FFe2347FAFF1123D6C8A1",
-    "foreignBox": "0x6C4EaAb8756d53Bf599FFe2347FAFF1123D6C8A1",
-    "monitor": "http://monitor-amb:3013"
+    "homeBox": "0x60a6ECE19a26476353E1Ea50fc5Db1bdBEaa74Cf",
+    "foreignBox": "0x60a6ECE19a26476353E1Ea50fc5Db1bdBEaa74Cf"
  },
  "homeRPC": {
    "URL": "http://parity1:8545",
--- a/e2e-commons/docker-compose.yml
+++ b/e2e-commons/docker-compose.yml
@@ -32,10 +32,31 @@ services:
    build:
      context: ..
      dockerfile: oracle/Dockerfile
-      args:
-        DOT_ENV_PATH: e2e-commons/components-envs/oracle.env
    environment:
    - NODE_ENV=production
+    - BRIDGE_MODE=NATIVE_TO_ERC
+    - QUEUE_URL=amqp://rabbit
+    - REDIS_URL=redis://redis
+    - HOME_RPC_URL=http://parity1:8545
+    - FOREIGN_RPC_URL=http://parity2:8545
+    - HOME_BRIDGE_ADDRESS=0x32198D570fffC7033641F8A9094FFDCaAEF42624
+    - FOREIGN_BRIDGE_ADDRESS=0x2B6871b9B02F73fa24F4864322CdC78604207769
+    - ERC20_TOKEN_ADDRESS=0xdbeE25CbE97e4A5CC6c499875774dc7067E9426B
+    - VALIDATOR_ADDRESS=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+    - VALIDATOR_ADDRESS_PRIVATE_KEY=8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9
+    - HOME_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
+    - HOME_GAS_PRICE_SPEED_TYPE=standard
+    - HOME_GAS_PRICE_FALLBACK=1
+    - HOME_GAS_PRICE_UPDATE_INTERVAL=600000
+    - HOME_GAS_PRICE_FACTOR=1
+    - FOREIGN_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
+    - FOREIGN_GAS_PRICE_SPEED_TYPE=standard
+    - FOREIGN_GAS_PRICE_FALLBACK=1
+    - FOREIGN_GAS_PRICE_UPDATE_INTERVAL=600000
+    - FOREIGN_GAS_PRICE_FACTOR=0.1
+    - HOME_POLLING_INTERVAL=500
+    - FOREIGN_POLLING_INTERVAL=500
+    - ALLOW_HTTP=yes
    command: "true"
    networks:
      - ultimate
@@ -43,10 +64,32 @@ services:
    build:
      context: ..
      dockerfile: oracle/Dockerfile
-      args:
-        DOT_ENV_PATH: e2e-commons/components-envs/oracle-erc20.env
    environment:
    - NODE_ENV=production
+    - BRIDGE_MODE=ERC_TO_ERC
+    - QUEUE_URL=amqp://rabbit
+    - REDIS_URL=redis://redis
+    - HOME_RPC_URL=http://parity1:8545
+    - FOREIGN_RPC_URL=http://parity2:8545
+    - HOME_BRIDGE_ADDRESS=0x1feB40aD9420b186F019A717c37f5546165d411E
+    - FOREIGN_BRIDGE_ADDRESS=0x4a58D6d8D416a5fBCAcf3dC52eb8bE8948E25127
+    - ERC20_TOKEN_ADDRESS=0x3C665A31199694Bf723fD08844AD290207B5797f
+    - BRIDGEABLE_TOKEN_ADDRESS=0x792455a6bCb62Ed4C4362D323E0590654CA4765c
+    - VALIDATOR_ADDRESS=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+    - VALIDATOR_ADDRESS_PRIVATE_KEY=8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9
+    - HOME_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
+    - HOME_GAS_PRICE_SPEED_TYPE=standard
+    - HOME_GAS_PRICE_FALLBACK=1
+    - HOME_GAS_PRICE_UPDATE_INTERVAL=600000
+    - HOME_GAS_PRICE_FACTOR=1
+    - FOREIGN_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
+    - FOREIGN_GAS_PRICE_SPEED_TYPE=standard
+    - FOREIGN_GAS_PRICE_FALLBACK=1
+    - FOREIGN_GAS_PRICE_UPDATE_INTERVAL=600000
+    - FOREIGN_GAS_PRICE_FACTOR=0.1
+    - HOME_POLLING_INTERVAL=500
+    - FOREIGN_POLLING_INTERVAL=500
+    - ALLOW_HTTP=yes
    command: "true"
    networks:
      - ultimate
@@ -54,10 +97,32 @@ services:
    build:
      context: ..
      dockerfile: oracle/Dockerfile
-      args:
-        DOT_ENV_PATH: e2e-commons/components-envs/oracle-erc20-native.env
    environment:
    - NODE_ENV=production
+    - BRIDGE_MODE=ERC_TO_NATIVE
+    - QUEUE_URL=amqp://rabbit
+    - REDIS_URL=redis://redis
+    - HOME_RPC_URL=http://parity1:8545
+    - FOREIGN_RPC_URL=http://parity2:8545
+    - HOME_BRIDGE_ADDRESS=0x488Af810997eD1730cB3a3918cD83b3216E6eAda
+    - FOREIGN_BRIDGE_ADDRESS=0x488Af810997eD1730cB3a3918cD83b3216E6eAda
+    - ERC20_TOKEN_ADDRESS=0x3C665A31199694Bf723fD08844AD290207B5797f
+    - BRIDGEABLE_TOKEN_ADDRESS=0x792455a6bCb62Ed4C4362D323E0590654CA4765c
+    - VALIDATOR_ADDRESS=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
+    - VALIDATOR_ADDRESS_PRIVATE_KEY=8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9
+    - HOME_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
+    - HOME_GAS_PRICE_SPEED_TYPE=standard
+    - HOME_GAS_PRICE_FALLBACK=1
+    - HOME_GAS_PRICE_UPDATE_INTERVAL=600000
+    - HOME_GAS_PRICE_FACTOR=1
+    - FOREIGN_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
+    - FOREIGN_GAS_PRICE_SPEED_TYPE=standard
+    - FOREIGN_GAS_PRICE_FALLBACK=1
+    - FOREIGN_GAS_PRICE_UPDATE_INTERVAL=600000
+    - FOREIGN_GAS_PRICE_FACTOR=0.1
+    - HOME_POLLING_INTERVAL=500
+    - FOREIGN_POLLING_INTERVAL=500
+    - ALLOW_HTTP=yes
    command: "true"
    networks:
      - ultimate
@@ -65,10 +130,29 @@ services:
    build:
      context: ..
      dockerfile: oracle/Dockerfile
-      args:
-        DOT_ENV_PATH: e2e-commons/components-envs/oracle-amb.env
    environment:
-    - NODE_ENV=production
+      - NODE_ENV=production
+      - BRIDGE_MODE=ARBITRARY_MESSAGE
+      - QUEUE_URL=amqp://rabbit
+      - REDIS_URL=redis://redis
+      - HOME_RPC_URL=http://parity1:8545
+      - FOREIGN_RPC_URL=http://parity2:8545
+      - HOME_BRIDGE_ADDRESS=0x0AEe1FCD12dDFab6265F7f8956e6E012A9Fe4Aa0
+      - FOREIGN_BRIDGE_ADDRESS=0x0AEe1FCD12dDFab6265F7f8956e6E012A9Fe4Aa0
+      - VALIDATOR_ADDRESS_PRIVATE_KEY=8e829f695aed89a154550f30262f1529582cc49dc30eff74a6b491359e0230f9
+      - HOME_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
+      - HOME_GAS_PRICE_SPEED_TYPE=standard
+      - HOME_GAS_PRICE_FALLBACK=1000000000
+      - HOME_GAS_PRICE_UPDATE_INTERVAL=600000
+      - HOME_GAS_PRICE_FACTOR=1
+      - FOREIGN_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
+      - FOREIGN_GAS_PRICE_SPEED_TYPE=standard
+      - FOREIGN_GAS_PRICE_FALLBACK=10000000000
+      - FOREIGN_GAS_PRICE_UPDATE_INTERVAL=600000
+      - FOREIGN_GAS_PRICE_FACTOR=1
+      - HOME_POLLING_INTERVAL=500
+      - FOREIGN_POLLING_INTERVAL=500
+      - ALLOW_HTTP=yes
    command: "true"
    networks:
      - ultimate
@@ -76,8 +160,29 @@ services:
    build:
      context: ..
      dockerfile: ui/Dockerfile
-      args:
-        DOT_ENV_PATH: e2e-commons/components-envs/ui.env
+    environment:
+    - REACT_APP_HOME_BRIDGE_ADDRESS=0x32198D570fffC7033641F8A9094FFDCaAEF42624
+    - REACT_APP_FOREIGN_BRIDGE_ADDRESS=0x2B6871b9B02F73fa24F4864322CdC78604207769
+    - REACT_APP_FOREIGN_HTTP_PARITY_URL=http://localhost:8542
+    - REACT_APP_HOME_HTTP_PARITY_URL=http://localhost:8541
+    - REACT_APP_HOME_NATIVE_NAME=POA
+    - REACT_APP_HOME_NETWORK_NAME=Sokol
+    - REACT_APP_FOREIGN_NETWORK_NAME=Kovan
+    - REACT_APP_HOME_EXPLORER_TX_TEMPLATE=https://blockscout.com/poa/sokol/tx//%s
+    - REACT_APP_FOREIGN_EXPLORER_TX_TEMPLATE=https://blockscout.com/eth/kovan/tx/%s
+    - REACT_APP_HOME_EXPLORER_ADDRESS_TEMPLATE=https://blockscout.com/poa/sokol/address/%s
+    - REACT_APP_FOREIGN_EXPLORER_ADDRESS_TEMPLATE=https://blockscout.com/eth/kovan/address/%s
+    - REACT_APP_HOME_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
+    - REACT_APP_HOME_GAS_PRICE_SPEED_TYPE=standard
+    - REACT_APP_HOME_GAS_PRICE_FALLBACK=5000000000
+    - REACT_APP_HOME_GAS_PRICE_UPDATE_INTERVAL=15000
+    - REACT_APP_HOME_GAS_PRICE_FACTOR=1
+    - REACT_APP_FOREIGN_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
+    - REACT_APP_FOREIGN_GAS_PRICE_SPEED_TYPE=standard
+    - REACT_APP_FOREIGN_GAS_PRICE_FALLBACK=5000000000
+    - REACT_APP_FOREIGN_GAS_PRICE_UPDATE_INTERVAL=15000
+    - REACT_APP_FOREIGN_GAS_PRICE_FACTOR=1
+    - PORT=3000
    command: "true"
    networks:
      - ultimate
@@ -85,8 +190,29 @@ services:
    build:
      context: ..
      dockerfile: ui/Dockerfile
-      args:
-        DOT_ENV_PATH: e2e-commons/components-envs/ui-erc20.env
+    environment:
+    - REACT_APP_HOME_BRIDGE_ADDRESS=0x1feB40aD9420b186F019A717c37f5546165d411E
+    - REACT_APP_FOREIGN_BRIDGE_ADDRESS=0x4a58D6d8D416a5fBCAcf3dC52eb8bE8948E25127
+    - REACT_APP_FOREIGN_HTTP_PARITY_URL=http://localhost:8542
+    - REACT_APP_HOME_HTTP_PARITY_URL=http://localhost:8541
+    - REACT_APP_HOME_NATIVE_NAME=POA
+    - REACT_APP_HOME_NETWORK_NAME=Sokol
+    - REACT_APP_FOREIGN_NETWORK_NAME=Kovan
+    - REACT_APP_HOME_EXPLORER_TX_TEMPLATE=https://blockscout.com/poa/sokol/tx//%s
+    - REACT_APP_FOREIGN_EXPLORER_TX_TEMPLATE=https://blockscout.com/eth/kovan/tx/%s
+    - REACT_APP_HOME_EXPLORER_ADDRESS_TEMPLATE=https://blockscout.com/poa/sokol/address/%s
+    - REACT_APP_FOREIGN_EXPLORER_ADDRESS_TEMPLATE=https://blockscout.com/eth/kovan/address/%s
+    - REACT_APP_HOME_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
+    - REACT_APP_HOME_GAS_PRICE_SPEED_TYPE=standard
+    - REACT_APP_HOME_GAS_PRICE_FALLBACK=5000000000
+    - REACT_APP_HOME_GAS_PRICE_UPDATE_INTERVAL=15000
+    - REACT_APP_HOME_GAS_PRICE_FACTOR=1
+    - REACT_APP_FOREIGN_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
+    - REACT_APP_FOREIGN_GAS_PRICE_SPEED_TYPE=standard
+    - REACT_APP_FOREIGN_GAS_PRICE_FALLBACK=5000000000
+    - REACT_APP_FOREIGN_GAS_PRICE_UPDATE_INTERVAL=15000
+    - REACT_APP_FOREIGN_GAS_PRICE_FACTOR=1
+    - PORT=3000
    command: "true"
    networks:
      - ultimate
@@ -94,8 +220,29 @@ services:
    build:
      context: ..
      dockerfile: ui/Dockerfile
-      args:
-        DOT_ENV_PATH: e2e-commons/components-envs/ui-erc20-native.env
+    environment:
+    - REACT_APP_HOME_BRIDGE_ADDRESS=0x488Af810997eD1730cB3a3918cD83b3216E6eAda
+    - REACT_APP_FOREIGN_BRIDGE_ADDRESS=0x488Af810997eD1730cB3a3918cD83b3216E6eAda
+    - REACT_APP_FOREIGN_HTTP_PARITY_URL=http://localhost:8542
+    - REACT_APP_HOME_HTTP_PARITY_URL=http://localhost:8541
+    - REACT_APP_HOME_NATIVE_NAME=POA
+    - REACT_APP_HOME_NETWORK_NAME=Sokol
+    - REACT_APP_FOREIGN_NETWORK_NAME=Kovan
+    - REACT_APP_HOME_EXPLORER_TX_TEMPLATE=https://blockscout.com/poa/sokol/tx//%s
+    - REACT_APP_FOREIGN_EXPLORER_TX_TEMPLATE=https://blockscout.com/eth/kovan/tx/%s
+    - REACT_APP_HOME_EXPLORER_ADDRESS_TEMPLATE=https://blockscout.com/poa/sokol/address/%s
+    - REACT_APP_FOREIGN_EXPLORER_ADDRESS_TEMPLATE=https://blockscout.com/eth/kovan/address/%s
+    - REACT_APP_HOME_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
+    - REACT_APP_HOME_GAS_PRICE_SPEED_TYPE=standard
+    - REACT_APP_HOME_GAS_PRICE_FALLBACK=5000000000
+    - REACT_APP_HOME_GAS_PRICE_UPDATE_INTERVAL=15000
+    - REACT_APP_HOME_GAS_PRICE_FACTOR=1
+    - REACT_APP_FOREIGN_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
+    - REACT_APP_FOREIGN_GAS_PRICE_SPEED_TYPE=standard
+    - REACT_APP_FOREIGN_GAS_PRICE_FALLBACK=5000000000
+    - REACT_APP_FOREIGN_GAS_PRICE_UPDATE_INTERVAL=15000
+    - REACT_APP_FOREIGN_GAS_PRICE_FACTOR=1
+    - PORT=3000
    command: "true"
    networks:
      - ultimate
@@ -103,9 +250,26 @@ services:
    build:
      context: ..
      dockerfile: monitor/Dockerfile
-      args:
-        DOT_ENV_PATH: e2e-commons/components-envs/monitor.env
-    entrypoint: yarn check-and-start
+    environment:
+    - HOME_RPC_URL=http://parity1:8545
+    - FOREIGN_RPC_URL=http://parity2:8545
+    - HOME_BRIDGE_ADDRESS=0x32198D570fffC7033641F8A9094FFDCaAEF42624
+    - FOREIGN_BRIDGE_ADDRESS=0x2B6871b9B02F73fa24F4864322CdC78604207769
+    - HOME_DEPLOYMENT_BLOCK=0
+    - FOREIGN_DEPLOYMENT_BLOCK=0
+    - HOME_GAS_LIMIT=300000
+    - HOME_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
+    - HOME_GAS_PRICE_SPEED_TYPE=standard
+    - HOME_GAS_PRICE_FALLBACK=1000000000
+    - HOME_GAS_PRICE_FACTOR=1
+    - FOREIGN_GAS_LIMIT=300000
+    - FOREIGN_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
+    - FOREIGN_GAS_PRICE_SPEED_TYPE=standard
+    - FOREIGN_GAS_PRICE_FALLBACK=1000000000
+    - FOREIGN_GAS_PRICE_FACTOR=1
+    - LEFT_TX_THRESHOLD=100
+    - PORT=3010
+    entrypoint: yarn start
    ports:
      - "3010:3010"
    networks:
@@ -114,9 +278,26 @@ services:
    build:
      context: ..
      dockerfile: monitor/Dockerfile
-      args:
-        DOT_ENV_PATH: e2e-commons/components-envs/monitor-erc20.env
-    entrypoint: yarn check-and-start
+    environment:
+    - HOME_RPC_URL=http://parity1:8545
+    - FOREIGN_RPC_URL=http://parity2:8545
+    - HOME_BRIDGE_ADDRESS=0x1feB40aD9420b186F019A717c37f5546165d411E
+    - FOREIGN_BRIDGE_ADDRESS=0x4a58D6d8D416a5fBCAcf3dC52eb8bE8948E25127
+    - HOME_DEPLOYMENT_BLOCK=0
+    - FOREIGN_DEPLOYMENT_BLOCK=0
+    - HOME_GAS_LIMIT=300000
+    - HOME_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
+    - HOME_GAS_PRICE_SPEED_TYPE=standard
+    - HOME_GAS_PRICE_FALLBACK=1000000000
+    - HOME_GAS_PRICE_FACTOR=1
+    - FOREIGN_GAS_LIMIT=300000
+    - FOREIGN_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
+    - FOREIGN_GAS_PRICE_SPEED_TYPE=standard
+    - FOREIGN_GAS_PRICE_FALLBACK=1000000000
+    - FOREIGN_GAS_PRICE_FACTOR=1
+    - LEFT_TX_THRESHOLD=100
+    - PORT=3011
+    entrypoint: yarn start
    ports:
      - "3011:3011"
    networks:
@@ -125,24 +306,30 @@ services:
    build:
      context: ..
      dockerfile: monitor/Dockerfile
-      args:
-        DOT_ENV_PATH: e2e-commons/components-envs/monitor-erc20-native.env
-    entrypoint: yarn check-and-start
+    environment:
+    - HOME_RPC_URL=http://parity1:8545
+    - FOREIGN_RPC_URL=http://parity2:8545
+    - HOME_BRIDGE_ADDRESS=0x488Af810997eD1730cB3a3918cD83b3216E6eAda
+    - FOREIGN_BRIDGE_ADDRESS=0x488Af810997eD1730cB3a3918cD83b3216E6eAda
+    - HOME_DEPLOYMENT_BLOCK=0
+    - FOREIGN_DEPLOYMENT_BLOCK=0
+    - HOME_GAS_LIMIT=300000
+    - HOME_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
+    - HOME_GAS_PRICE_SPEED_TYPE=standard
+    - HOME_GAS_PRICE_FALLBACK=1000000000
+    - HOME_GAS_PRICE_FACTOR=1
+    - FOREIGN_GAS_LIMIT=300000
+    - FOREIGN_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
+    - FOREIGN_GAS_PRICE_SPEED_TYPE=standard
+    - FOREIGN_GAS_PRICE_FALLBACK=1000000000
+    - FOREIGN_GAS_PRICE_FACTOR=1
+    - LEFT_TX_THRESHOLD=100
+    - PORT=3012
+    entrypoint: yarn start
    ports:
      - "3012:3012"
    networks:
      - ultimate
-  monitor-amb:
-    build:
-      context: ..
-      dockerfile: monitor/Dockerfile
-      args:
-        DOT_ENV_PATH: e2e-commons/components-envs/monitor-amb.env
-    entrypoint: yarn check-and-start
-    ports:
-      - "3013:3013"
-    networks:
-      - ultimate
  e2e:
    build:
      context: ..
--- a/e2e-commons/contracts-envs/amb.env
+++ b/e2e-commons/contracts-envs/amb.env
@@ -12,6 +12,7 @@ HOME_UPGRADEABLE_ADMIN=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
 HOME_MAX_AMOUNT_PER_TX=8000000
 HOME_REQUIRED_BLOCK_CONFIRMATIONS=1
 HOME_GAS_PRICE=1000000000
+HOME_AMB_SUBSIDIZED_MODE=false

 FOREIGN_RPC_URL=http://parity2:8545
 FOREIGN_BRIDGE_OWNER=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
@@ -20,6 +21,7 @@ FOREIGN_UPGRADEABLE_ADMIN=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
 FOREIGN_MAX_AMOUNT_PER_TX=8000000
 FOREIGN_REQUIRED_BLOCK_CONFIRMATIONS=1
 FOREIGN_GAS_PRICE=10000000000
+FOREIGN_AMB_SUBSIDIZED_MODE=false

 REQUIRED_NUMBER_OF_VALIDATORS=1
 VALIDATORS=0xaaB52d66283F7A1D5978bcFcB55721ACB467384b
--- a/e2e-commons/contracts-envs/erc-to-erc.env
+++ b/e2e-commons/contracts-envs/erc-to-erc.env
--- a/e2e-commons/contracts-envs/erc-to-native.env
+++ b/e2e-commons/contracts-envs/erc-to-native.env
--- a/e2e-commons/contracts-envs/native-to-erc.env
+++ b/e2e-commons/contracts-envs/native-to-erc.env
--- a/e2e-commons/scripts/deploy.sh
+++ b/e2e-commons/scripts/deploy.sh
@@ -4,7 +4,7 @@ set -e # exit when any command fails

 CONTRACTS_PATH="../../contracts"
 DEPLOY_PATH="$CONTRACTS_PATH/deploy"
-ENVS_PATH="../contracts-envs"
+ENVS_PATH="../envs"

 echo -e "\n\n############ Deploying native-to-erc ############\n"
 cp "$ENVS_PATH/native-to-erc.env" "$DEPLOY_PATH/.env"
--- a/e2e-commons/up.sh
+++ b/e2e-commons/up.sh
@@ -17,11 +17,9 @@ while [ "$1" != "" ]; do
    docker-compose run -d oracle-erc20 yarn watcher:signature-request
    docker-compose run -d oracle-erc20 yarn watcher:collected-signatures
    docker-compose run -d oracle-erc20 yarn watcher:affirmation-request
-    docker-compose run -d oracle-erc20 yarn watcher:transfer
    docker-compose run -d oracle-erc20-native yarn watcher:signature-request
    docker-compose run -d oracle-erc20-native yarn watcher:collected-signatures
    docker-compose run -d oracle-erc20-native yarn watcher:affirmation-request
-    docker-compose run -d oracle-erc20-native yarn watcher:transfer
    docker-compose run -d oracle-amb yarn watcher:signature-request
    docker-compose run -d oracle-amb yarn watcher:collected-signatures
    docker-compose run -d oracle-amb yarn watcher:affirmation-request
@@ -46,19 +44,19 @@ while [ "$1" != "" ]; do
  fi

  if [ "$1" == "monitor" ]; then
-    docker-compose up -d monitor monitor-erc20 monitor-erc20-native monitor-amb
+    docker-compose up -d monitor monitor-erc20 monitor-erc20-native
  fi

  if [ "$1" == "native-to-erc" ]; then
-    ../deployment-e2e/molecule.sh ultimate-native-to-erc
+    ../deployment/molecule/molecule.sh ultimate-native-to-erc
  fi

  if [ "$1" == "erc-to-native" ]; then
-    ../deployment-e2e/molecule.sh ultimate-erc-to-native
+    ../deployment/molecule/molecule.sh ultimate-erc-to-native
  fi

  if [ "$1" == "erc-to-erc" ]; then
-    ../deployment-e2e/molecule.sh ultimate-erc-to-erc
+    ../deployment/molecule/molecule.sh ultimate-erc-to-erc
  fi

  shift # Shift all the parameters down by one
--- a/monitor-e2e/.eslintrc
+++ b/monitor-e2e/.eslintrc
@@ -1,16 +0,0 @@
-{
-  "extends": [
-    "plugin:node/recommended",
-    "airbnb-base",
-    "../.eslintrc"
-  ],
-  "plugins": ["node"],
-  "rules": {
-    "node/no-unpublished-require": "off",
-    "node/no-extraneous-require": "off",
-    "import/no-extraneous-dependencies": "off"
-  },
-  "env": {
-    "mocha": true
-  }
-}
--- a/monitor-e2e/erc-to-erc.sh
+++ b/monitor-e2e/erc-to-erc.sh
@@ -0,0 +1,26 @@
+set -e # exit when any command fails
+
+echo "MONITOR E2E - ERC TO ERC"
+export URL=localhost:3011
+
+echo "Test case - Web Interface should return balances"
+OUTPUT=$(curl -s http://$URL/)
+grep -q home <<< "$OUTPUT"
+grep -q foreign <<< "$OUTPUT"
+(! grep -q error <<< "$OUTPUT")
+
+echo "Test case - Web Interface should return validators"
+OUTPUT=$(curl -s http://$URL/validators)
+grep -q home <<< "$OUTPUT"
+grep -q foreign <<< "$OUTPUT"
+(! grep -q error <<< "$OUTPUT")
+
+echo "Test case - Web Interface should return eventsStats"
+OUTPUT=$(curl -s http://$URL/eventsStats)
+grep -q lastChecked <<< "$OUTPUT"
+(! grep -q error <<< "$OUTPUT")
+
+echo "Test case - Web Interface should return alerts"
+OUTPUT=$(curl -s http://$URL/alerts)
+grep -q lastChecked <<< "$OUTPUT"
+(! grep -q error <<< "$OUTPUT")
--- a/monitor-e2e/erc-to-native.sh
+++ b/monitor-e2e/erc-to-native.sh
@@ -0,0 +1,26 @@
+set -e # exit when any command fails
+
+echo "MONITOR E2E - ERC TO NATIVE"
+export URL=localhost:3012
+
+echo "Test case - Web Interface should return balances"
+OUTPUT=$(curl -s http://$URL/)
+grep -q home <<< "$OUTPUT"
+grep -q foreign <<< "$OUTPUT"
+(! grep -q error <<< "$OUTPUT")
+
+echo "Test case - Web Interface should return validators"
+OUTPUT=$(curl -s http://$URL/validators)
+grep -q home <<< "$OUTPUT"
+grep -q foreign <<< "$OUTPUT"
+(! grep -q error <<< "$OUTPUT")
+
+echo "Test case - Web Interface should return eventsStats"
+OUTPUT=$(curl -s http://$URL/eventsStats)
+grep -q lastChecked <<< "$OUTPUT"
+(! grep -q error <<< "$OUTPUT")
+
+echo "Test case - Web Interface should return alerts"
+OUTPUT=$(curl -s http://$URL/alerts)
+grep -q lastChecked <<< "$OUTPUT"
+(! grep -q error <<< "$OUTPUT")
--- a/monitor-e2e/native-to-erc.sh
+++ b/monitor-e2e/native-to-erc.sh
@@ -0,0 +1,26 @@
+set -e # exit when any command fails
+
+echo "MONITOR E2E - NATIVE TO ERC"
+export URL="localhost:3010"
+
+echo "Test case - Web Interface should return balances"
+OUTPUT=$(curl -s http://$URL/)
+grep -q home <<< "$OUTPUT"
+grep -q foreign <<< "$OUTPUT"
+(! grep -q error <<< "$OUTPUT")
+
+echo "Test case - Web Interface should return validators"
+OUTPUT=$(curl -s http://$URL/validators)
+grep -q home <<< "$OUTPUT"
+grep -q foreign <<< "$OUTPUT"
+(! grep -q error <<< "$OUTPUT")
+
+echo "Test case - Web Interface should return eventsStats"
+OUTPUT=$(curl -s http://$URL/eventsStats)
+grep -q lastChecked <<< "$OUTPUT"
+(! grep -q error <<< "$OUTPUT")
+
+echo "Test case - Web Interface should return alerts"
+OUTPUT=$(curl -s http://$URL/alerts)
+grep -q lastChecked <<< "$OUTPUT"
+(! grep -q error <<< "$OUTPUT")
--- a/monitor-e2e/package.json
+++ b/monitor-e2e/package.json
@@ -1,19 +0,0 @@
-{
-  "name": "monitor-e2e",
-  "version": "0.0.1",
-  "description": "",
-  "main": "index.js",
-  "scripts": {
-    "start": "mocha --timeout 30000",
-    "lint": "eslint . --ignore-path ../.eslintignore"
-  },
-  "author": "",
-  "license": "ISC",
-  "dependencies": {},
-  "engines": {
-    "node": ">= 8.9"
-  },
-  "devDependencies": {
-    "axios": "0.19.0"
-  }
-}
--- a/monitor-e2e/periodically-check-all.sh
+++ b/monitor-e2e/periodically-check-all.sh
@@ -1,7 +0,0 @@
-while true; do
-  sleep 3
-  docker-compose -f ../e2e-commons/docker-compose.yml exec monitor yarn check-all
-  docker-compose -f ../e2e-commons/docker-compose.yml exec monitor-erc20 yarn check-all
-  docker-compose -f ../e2e-commons/docker-compose.yml exec monitor-erc20-native yarn check-all
-  docker-compose -f ../e2e-commons/docker-compose.yml exec monitor-amb yarn check-all
-done
--- a/monitor-e2e/run-tests.sh
+++ b/monitor-e2e/run-tests.sh
@@ -1,14 +1,51 @@
+#!/usr/bin/env bash
 cd $(dirname $0)
+set -e # exit when any command fails

-../e2e-commons/up.sh deploy monitor

-./wait-for-monitor.sh
-nohup ./periodically-check-all.sh < /dev/null > /dev/null 2>&1 &
-checkPID=$!
+##### Helper Functions #####

-docker-compose -f ../e2e-commons/docker-compose.yml run e2e yarn workspace monitor-e2e run start
-rc=$?
+function cleanup {
+  ../e2e-commons/down.sh
+}
+trap cleanup EXIT

-../e2e-commons/down.sh
-kill $checkPID
-exit $rc
+FILES=(getBalances.json validators.json eventsStats.json alerts.json)
+
+check_files_exist() {
+  rc=0
+  for f in "${FILES[@]}"; do
+    command="test -f responses/$f"
+    (docker-compose -f ../e2e-commons/docker-compose.yml exec monitor /bin/bash -c "$command") || rc=1
+    (docker-compose -f ../e2e-commons/docker-compose.yml exec monitor-erc20 /bin/bash -c "$command") || rc=1
+    (docker-compose -f ../e2e-commons/docker-compose.yml exec monitor-erc20-native /bin/bash -c "$command") || rc=1
+  done
+  return $rc
+}
+
+
+##### Initialization #####
+
+../e2e-commons/up.sh deploy oracle monitor
+
+
+##### Initial checks #####
+
+docker-compose -f ../e2e-commons/docker-compose.yml exec monitor /bin/bash -c "yarn check-all"
+docker-compose -f ../e2e-commons/docker-compose.yml exec monitor-erc20 /bin/bash -c "yarn check-all"
+docker-compose -f ../e2e-commons/docker-compose.yml exec monitor-erc20-native /bin/bash -c "yarn check-all"
+check_files_exist
+
+
+##### Test cases #####
+
+./native-to-erc.sh
+
+./erc-to-erc.sh
+
+./erc-to-native.sh
+
+
+##### Cleanup #####
+
+cleanup
--- a/monitor-e2e/test/amb.js
+++ b/monitor-e2e/test/amb.js
@@ -1,128 +0,0 @@
-const assert = require('assert')
-const axios = require('axios')
-const { amb, user, foreignRPC, homeRPC, validator } = require('../../e2e-commons/constants.json')
-const { waitUntil, sendAMBMessage, addValidator } = require('../utils')
-
-const baseUrl = amb.monitor
-
-describe('AMB', () => {
-  describe('balances', async () => {
-    let data
-
-    before(async () => {
-      ;({ data } = await axios.get(`${baseUrl}`))
-    })
-
-    describe('home', async () => {
-      it('should contain toForeign:', () => assert(data.home.toForeign === 0))
-      it('should contain fromForeign', () => assert(data.home.fromForeign === 0))
-    })
-
-    describe('foreign', async () => {
-      it('should contain fromHome:', () => assert(data.foreign.fromHome === 0))
-      it('should contain toHome', () => assert(data.foreign.toHome === 0))
-    })
-
-    describe('general', async () => {
-      it('should contain fromHomeToForeignDiff', () => assert(data.fromHomeToForeignDiff === 0))
-      it('should contain fromForeignToHomeDiff', () => assert(data.fromForeignToHomeDiff === 0))
-      it('should contain lastChecked', () => assert(data.lastChecked >= 0))
-      it('should contain timeDiff', () => assert(data.timeDiff >= 0))
-      it('should contain lastChecked', () => assert(data.lastChecked >= 0))
-    })
-  })
-  describe('validators', async () => {
-    let data
-
-    before(async () => {
-      ;({ data } = await axios.get(`${baseUrl}/validators`))
-    })
-
-    it('home', () => {
-      assert(typeof data.home.validators === 'object')
-      assert(data.home.validators[validator.address].balance > 0)
-      assert(data.home.validators[validator.address].leftTx > 0)
-      assert(data.home.validators[validator.address].gasPrice > 0)
-    })
-
-    it('foreign', () => {
-      assert(typeof data.foreign.validators === 'object')
-      assert(data.foreign.validators[validator.address].balance > 0)
-      assert(data.foreign.validators[validator.address].leftTx > 0)
-      assert(data.foreign.validators[validator.address].gasPrice > 0)
-    })
-
-    it('requiredSignaturesMatch', () => assert(data.requiredSignaturesMatch, 1))
-    it('validatorsMatch', () => assert(data.validatorsMatch))
-    it('lastChecked', () => assert(data.lastChecked >= 0))
-    it('timeDiff', () => assert(data.timeDiff >= 0))
-    it('homeOk', () => assert(data.homeOk))
-    it('foreignOk', () => assert(data.foreignOk))
-    it('ok', () => assert(data.ok))
-  })
-  describe('eventsStats', async () => {
-    let data
-
-    before(async () => {
-      ;({ data } = await axios.get(`${baseUrl}/eventsStats`))
-    })
-
-    it('ok', () => assert(data.ok))
-    it('lastChecked', () => assert(data.lastChecked >= 0))
-    it('timeDiff', () => assert(data.timeDiff >= 0))
-    it('home-deliveredMsgNotProcessedInForeign', () =>
-      assert(typeof data.home.deliveredMsgNotProcessedInForeign === 'object'))
-    it('home-processedMsgNotDeliveredInForeign', () =>
-      assert(typeof data.home.processedMsgNotDeliveredInForeign === 'object'))
-    it('foreign-deliveredMsgNotProcessedInHome', () =>
-      assert(typeof data.foreign.deliveredMsgNotProcessedInHome === 'object'))
-    it('foreign-processedMsgNotDeliveredInHome', () =>
-      assert(typeof data.foreign.processedMsgNotDeliveredInHome === 'object'))
-  })
-  describe('alerts', async () => {
-    let data
-
-    before(async () => {
-      ;({ data } = await axios.get(`${baseUrl}/alerts`))
-    })
-
-    it('ok', () => assert(data.ok))
-    it('lastChecked', () => assert(data.lastChecked >= 0))
-    it('timeDiff', () => assert(data.timeDiff >= 0))
-    it('executeSignatures', () => assert(typeof data.executeSignatures === 'object'))
-    it('executeAffirmations', () => assert(typeof data.executeAffirmations === 'object'))
-  })
-  describe('changing state of contracts', () => {
-    let data
-
-    before(async () => {
-      assert((await axios.get(`${baseUrl}/validators`)).data.validatorsMatch === true)
-    })
-
-    it('should change fromForeignToHomeDiff', async () => {
-      // send message
-      await sendAMBMessage(foreignRPC.URL, user, amb.foreignBox, amb.foreign, amb.homeBox)
-
-      await waitUntil(async () => {
-        ;({ data } = await axios.get(`${baseUrl}`))
-        return data.fromForeignToHomeDiff !== 0
-      })
-    })
-    it('should change fromHomeToForeignDiff', async () => {
-      // send message
-      await sendAMBMessage(homeRPC.URL, user, amb.homeBox, amb.home, amb.foreignBox)
-
-      await waitUntil(async () => {
-        ;({ data } = await axios.get(`${baseUrl}`))
-        return data.fromHomeToForeignDiff !== 0
-      })
-    })
-    it('should change validatorsMatch', async () => {
-      await addValidator(foreignRPC.URL, validator, amb.foreign)
-      await waitUntil(async () => {
-        ;({ data } = await axios.get(`${baseUrl}/validators`))
-        return data.validatorsMatch === false
-      })
-    })
-  })
-})
--- a/monitor-e2e/test/common.js
+++ b/monitor-e2e/test/common.js
@@ -1,99 +0,0 @@
-const assert = require('assert')
-const axios = require('axios')
-const { nativeToErcBridge, ercToErcBridge, ercToNativeBridge, validator } = require('../../e2e-commons/constants.json')
-
-const types = [
-  { description: 'NATIVE TO ERC', baseUrl: nativeToErcBridge.monitor },
-  { description: 'ERC TO ERC', baseUrl: ercToErcBridge.monitor },
-  { description: 'ERC TO NATIVE', baseUrl: ercToNativeBridge.monitor }
-]
-
-types.forEach(type => {
-  describe(type.description, () => {
-    describe('balances', async () => {
-      let data
-
-      before(async () => {
-        ;({ data } = await axios.get(`${type.baseUrl}`))
-      })
-
-      describe('home', async () => {
-        it('should contain deposits:', () => assert(data.home.deposits === 0))
-        it('should contain withdrawals', () => assert(data.home.withdrawals === 0))
-      })
-
-      describe('foreign', async () => {
-        it('should contain deposits:', () => assert(data.foreign.deposits === 0))
-        it('should contain withdrawals', () => assert(data.foreign.withdrawals === 0))
-      })
-
-      describe('general', async () => {
-        it('should contain balanceDiff', () => assert(data.balanceDiff === 0))
-        it('should contain depositsDiff', () => assert(data.depositsDiff === 0))
-        it('should contain withdrawalDiff', () => assert(data.withdrawalDiff === 0))
-        it('should contain timeDiff', () => assert(data.timeDiff >= 0))
-        it('should contain lastChecked', () => assert(data.lastChecked >= 0))
-      })
-    })
-
-    describe('validators', async () => {
-      let data
-
-      before(async () => {
-        ;({ data } = await axios.get(`${type.baseUrl}/validators`))
-      })
-
-      it('home', () => {
-        assert(typeof data.home.validators === 'object')
-        assert(data.home.validators[validator.address].balance > 0)
-        assert(data.home.validators[validator.address].leftTx > 0)
-        assert(data.home.validators[validator.address].gasPrice > 0)
-      })
-
-      it('foreign', () => {
-        assert(typeof data.foreign.validators === 'object')
-        assert(data.foreign.validators[validator.address].balance > 0)
-        assert(data.foreign.validators[validator.address].leftTx > 0)
-        assert(data.foreign.validators[validator.address].gasPrice > 0)
-      })
-
-      it('requiredSignaturesMatch', () => assert(data.requiredSignaturesMatch, 1))
-      it('validatorsMatch', () => assert(data.validatorsMatch))
-      it('lastChecked', () => assert(data.lastChecked >= 0))
-      it('timeDiff', () => assert(data.timeDiff >= 0))
-      it('homeOk', () => assert(data.homeOk))
-      it('foreignOk', () => assert(data.foreignOk))
-      it('ok', () => assert(data.ok))
-    })
-
-    describe('eventsStats', async () => {
-      let data
-
-      before(async () => {
-        ;({ data } = await axios.get(`${type.baseUrl}/eventsStats`))
-      })
-
-      it('ok', () => assert(data.ok))
-      it('lastChecked', () => assert(data.lastChecked >= 0))
-      it('timeDiff', () => assert(data.timeDiff >= 0))
-      it('onlyInHomeDeposits', () => assert(typeof data.onlyInHomeDeposits === 'object'))
-      it('onlyInForeignDeposits', () => assert(typeof data.onlyInForeignDeposits === 'object'))
-      it('onlyInHomeWithdrawals', () => assert(typeof data.onlyInHomeWithdrawals === 'object'))
-      it('onlyInForeignWithdrawals', () => assert(typeof data.onlyInForeignWithdrawals === 'object'))
-    })
-
-    describe('alerts', async () => {
-      let data
-
-      before(async () => {
-        ;({ data } = await axios.get(`${type.baseUrl}/alerts`))
-      })
-
-      it('ok', () => assert(data.ok))
-      it('lastChecked', () => assert(data.lastChecked >= 0))
-      it('timeDiff', () => assert(data.timeDiff >= 0))
-      it('executeSignatures', () => assert(typeof data.executeSignatures === 'object'))
-      it('executeAffirmations', () => assert(typeof data.executeAffirmations === 'object'))
-    })
-  })
-})
--- a/monitor-e2e/test/ercToErc.js
+++ b/monitor-e2e/test/ercToErc.js
@@ -1,43 +0,0 @@
-const assert = require('assert')
-const axios = require('axios')
-const { ercToErcBridge, user, foreignRPC, validator } = require('../../e2e-commons/constants.json')
-const { waitUntil, sendTokens, addValidator } = require('../utils')
-
-const baseUrl = ercToErcBridge.monitor
-
-describe('ERC TO ERC', () => {
-  let data
-
-  before(async () => {
-    ;({ data } = await axios.get(`${baseUrl}`))
-  })
-
-  it('balance', () => assert(parseInt(data.foreign.erc20Balance, 10) >= 0))
-  it('should contain totalSupply', () => assert(data.home.totalSupply === '0'))
-})
-
-describe('ERC TO ERC with changing state of contracts', () => {
-  let data
-
-  before(async () => {
-    assert((await axios.get(`${baseUrl}`)).data.balanceDiff === 0)
-    assert((await axios.get(`${baseUrl}/validators`)).data.validatorsMatch === true)
-  })
-
-  it('should change balanceDiff', async () => {
-    await sendTokens(foreignRPC.URL, user, ercToErcBridge.foreignToken, ercToErcBridge.foreign)
-
-    await waitUntil(async () => {
-      ;({ data } = await axios.get(`${baseUrl}`))
-      return data.balanceDiff !== 0
-    })
-  })
-
-  it('should change validatorsMatch', async () => {
-    await addValidator(foreignRPC.URL, validator, ercToErcBridge.foreign)
-    await waitUntil(async () => {
-      ;({ data } = await axios.get(`${baseUrl}/validators`))
-      return data.validatorsMatch === false
-    })
-  })
-})
--- a/monitor-e2e/test/ercToNative.js
+++ b/monitor-e2e/test/ercToNative.js
@@ -1,43 +0,0 @@
-const assert = require('assert')
-const axios = require('axios')
-const { ercToNativeBridge, user, foreignRPC, validator } = require('../../e2e-commons/constants.json')
-const { waitUntil, sendTokens, addValidator } = require('../utils')
-
-const baseUrl = ercToNativeBridge.monitor
-
-describe('ERC TO NATIVE', () => {
-  let data
-
-  before(async () => {
-    ;({ data } = await axios.get(`${baseUrl}`))
-  })
-
-  it('balance', () => assert(parseInt(data.foreign.erc20Balance, 10) >= 0))
-  it('should contain totalSupply', () => assert(data.home.totalSupply === '0'))
-})
-
-describe('ERC TO NATIVE with changing state of contracts', () => {
-  let data
-
-  before(async () => {
-    assert((await axios.get(`${baseUrl}`)).data.balanceDiff === 0)
-    assert((await axios.get(`${baseUrl}/validators`)).data.validatorsMatch === true)
-  })
-
-  it('should change balanceDiff', async () => {
-    await sendTokens(foreignRPC.URL, user, ercToNativeBridge.foreignToken, ercToNativeBridge.foreign)
-
-    await waitUntil(async () => {
-      ;({ data } = await axios.get(`${baseUrl}`))
-      return data.balanceDiff !== 0
-    })
-  })
-
-  it('should change validatorsMatch', async () => {
-    await addValidator(foreignRPC.URL, validator, ercToNativeBridge.foreign)
-    await waitUntil(async () => {
-      ;({ data } = await axios.get(`${baseUrl}/validators`))
-      return data.validatorsMatch === false
-    })
-  })
-})
--- a/monitor-e2e/test/nativeToErc.js
+++ b/monitor-e2e/test/nativeToErc.js
@@ -1,43 +0,0 @@
-const assert = require('assert')
-const axios = require('axios')
-const { nativeToErcBridge, user, homeRPC, foreignRPC, validator } = require('../../e2e-commons/constants.json')
-const { waitUntil, sendEther, addValidator } = require('../utils')
-
-const baseUrl = nativeToErcBridge.monitor
-
-describe('NATIVE TO ERC', () => {
-  let data
-
-  before(async () => {
-    ;({ data } = await axios.get(`${baseUrl}`))
-  })
-
-  it('balance', () => assert(parseInt(data.home.balance, 10) >= 0))
-  it('should contain totalSupply', () => assert(data.foreign.totalSupply === '0'))
-})
-
-describe('NATIVE TO ERC with changing state of contracts', () => {
-  let data
-
-  before(async () => {
-    assert((await axios.get(`${baseUrl}`)).data.balanceDiff === 0)
-    assert((await axios.get(`${baseUrl}/validators`)).data.validatorsMatch === true)
-  })
-
-  it('should change balanceDiff', async () => {
-    await sendEther(homeRPC.URL, user, nativeToErcBridge.home)
-
-    await waitUntil(async () => {
-      ;({ data } = await axios.get(`${baseUrl}`))
-      return data.balanceDiff !== 0
-    })
-  })
-
-  it('should change validatorsMatch', async () => {
-    await addValidator(foreignRPC.URL, validator, nativeToErcBridge.foreign)
-    await waitUntil(async () => {
-      ;({ data } = await axios.get(`${baseUrl}/validators`))
-      return data.validatorsMatch === false
-    })
-  })
-})
--- a/monitor-e2e/utils.js
+++ b/monitor-e2e/utils.js
@@ -1,69 +0,0 @@
-const Web3 = require('web3')
-const { ERC677_BRIDGE_TOKEN_ABI, BRIDGE_VALIDATORS_ABI, FOREIGN_NATIVE_TO_ERC_ABI, BOX_ABI } = require('../commons')
-
-const waitUntil = async (predicate, step = 100, timeout = 10000) => {
-  const stopTime = Date.now() + timeout
-  while (Date.now() <= stopTime) {
-    const result = await predicate()
-    if (result) {
-      return result
-    }
-    await new Promise(resolve => setTimeout(resolve, step)) // sleep
-  }
-  throw new Error(`waitUntil timed out after ${timeout} ms`)
-}
-
-const sendEther = async (rpcUrl, account, to) => {
-  const web3 = new Web3(new Web3.providers.HttpProvider(rpcUrl))
-  web3.eth.accounts.wallet.add(account.privateKey)
-
-  await web3.eth.sendTransaction({
-    from: account.address,
-    to,
-    gasPrice: '1',
-    gas: '50000',
-    value: '1000000000000000000'
-  })
-}
-
-const sendTokens = async (rpcUrl, account, tokenAddress, recipientAddress) => {
-  const web3 = new Web3(new Web3.providers.HttpProvider(rpcUrl))
-  web3.eth.accounts.wallet.add(account.privateKey)
-  const erc20Token = new web3.eth.Contract(ERC677_BRIDGE_TOKEN_ABI, tokenAddress)
-
-  await erc20Token.methods.transfer(recipientAddress, web3.utils.toWei('0.01')).send({
-    from: account.address,
-    gas: '1000000'
-  })
-}
-
-const sendAMBMessage = async (rpcUrl, account, boxAddress, bridgeAddress, boxOtherSideAddress) => {
-  const web3 = new Web3(new Web3.providers.HttpProvider(rpcUrl))
-  web3.eth.accounts.wallet.add(account.privateKey)
-  const homeBox = new web3.eth.Contract(BOX_ABI, boxAddress)
-
-  await homeBox.methods.setValueOnOtherNetwork(3, bridgeAddress, boxOtherSideAddress).send({
-    from: account.address,
-    gas: '400000'
-  })
-}
-
-const addValidator = async (rpcUrl, account, bridgeAddress) => {
-  const web3 = new Web3(new Web3.providers.HttpProvider(rpcUrl))
-  web3.eth.accounts.wallet.add(account.privateKey)
-  const bridgeContract = new web3.eth.Contract(FOREIGN_NATIVE_TO_ERC_ABI, bridgeAddress)
-  const foreignValidatorsAddress = await bridgeContract.methods.validatorContract().call()
-  const foreignBridgeValidators = new web3.eth.Contract(BRIDGE_VALIDATORS_ABI, foreignValidatorsAddress)
-  await foreignBridgeValidators.methods.addValidator('0xE71FBa5db00172bb0C93d649362B006300000935').send({
-    from: account.address,
-    gas: '5000000'
-  })
-}
-
-module.exports = {
-  waitUntil,
-  sendEther,
-  sendTokens,
-  addValidator,
-  sendAMBMessage
-}
--- a/monitor-e2e/wait-for-monitor.sh
+++ b/monitor-e2e/wait-for-monitor.sh
@@ -1,28 +0,0 @@
-FILES=(getBalances.json validators.json eventsStats.json alerts.json)
-
-check_files_exist() {
-  rc=0
-  for f in "${FILES[@]}"; do
-    command="test -f responses/$f"
-    (docker-compose -f ../e2e-commons/docker-compose.yml exec monitor /bin/bash -c "$command") || rc=1
-    (docker-compose -f ../e2e-commons/docker-compose.yml exec monitor-erc20 /bin/bash -c "$command") || rc=1
-    (docker-compose -f ../e2e-commons/docker-compose.yml exec monitor-erc20-native /bin/bash -c "$command") || rc=1
-    (docker-compose -f ../e2e-commons/docker-compose.yml exec monitor-amb /bin/bash -c "$command") || rc=1
-  done
-  return $rc
-}
-
-i=0
-until check_files_exist
-do
-  ((i++))
-  if [ "$i" -gt 30 ]
-  then
-    exit -1
-  fi
-
-  echo "Waiting for monitor to start..."
-  sleep 3
-done
-
-echo "Monitor started"
--- a/monitor/.env.example
+++ b/monitor/.env.example
@@ -1,21 +1,21 @@
-COMMON_HOME_RPC_URL=https://sokol.poa.network
-COMMON_FOREIGN_RPC_URL=https://kovan.infura.io/mew
-COMMON_HOME_BRIDGE_ADDRESS=0xABb4C1399DcC28FBa3Beb76CAE2b50Be3e087353
-COMMON_FOREIGN_BRIDGE_ADDRESS=0xE405F6872cE38a7a4Ff63DcF946236D458c2ca3a
-MONITOR_HOME_START_BLOCK=0
-MONITOR_FOREIGN_START_BLOCK=0
+HOME_RPC_URL=https://sokol.poa.network
+FOREIGN_RPC_URL=https://kovan.infura.io/mew
+HOME_BRIDGE_ADDRESS=0xABb4C1399DcC28FBa3Beb76CAE2b50Be3e087353
+FOREIGN_BRIDGE_ADDRESS=0xE405F6872cE38a7a4Ff63DcF946236D458c2ca3a
+HOME_DEPLOYMENT_BLOCK=0
+FOREIGN_DEPLOYMENT_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
+HOME_GAS_LIMIT=300000
+HOME_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
+HOME_GAS_PRICE_SPEED_TYPE=standard
+HOME_GAS_PRICE_FALLBACK=1000000000
+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
+FOREIGN_GAS_LIMIT=300000
+FOREIGN_GAS_PRICE_ORACLE_URL=https://gasprice.poa.network/
+FOREIGN_GAS_PRICE_SPEED_TYPE=standard
+FOREIGN_GAS_PRICE_FALLBACK=1000000000
+FOREIGN_GAS_PRICE_FACTOR=1

-MONITOR_TX_NUMBER_THRESHOLD=100
-MONITOR_PORT=3003
+LEFT_TX_THRESHOLD=100
+PORT=3003
--- a/monitor/.eslintrc
+++ b/monitor/.eslintrc
@@ -8,8 +8,5 @@
  "rules": {
    "no-use-before-define": "off",
    "node/no-unpublished-require": "off"
-  },
-  "env": {
-    "mocha": true
  }
 }
--- a/monitor/Dockerfile
+++ b/monitor/Dockerfile
@@ -15,9 +15,6 @@ RUN mv ./contracts/build ./ && rm -rf ./contracts/* ./contracts/.[!.]* && mv ./b
 COPY ./commons ./commons

 COPY ./monitor ./monitor
-ARG DOT_ENV_PATH=./monitor/.env
-COPY ${DOT_ENV_PATH} ./monitor/.env
-
 WORKDIR /mono/monitor
 CMD echo "To start the monitor run:" \
  "yarn check-and-start"
--- a/monitor/README.md
+++ b/monitor/README.md
@@ -110,8 +110,6 @@ cd monitor
 cp .env.example .env
 ```

-Please refer to [Configuration](../CONFIGURATION.md) for details on configuration parameters.
-
 ## Run web interface

 Using Yarn:
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Gerardo Nardelli	9d4dea9823	Fix amb subsidized mode e2e test	2019-08-22 17:35:53 -03:00
Gerardo Nardelli	2357d787a6	Fix amb subsidized mode tests in oracle-e2e	2019-08-22 17:22:49 -03:00
Gerardo Nardelli	065956e94e	Fix amb subsidized mode hash in oracle-e2e	2019-08-22 17:08:49 -03:00
Gerardo Nardelli	7e651a86c4	Update oracle-e2e tests box contract addresses	2019-08-22 16:53:14 -03:00
Gerardo Nardelli	411c35d873	Fix amb packSignatures method in Oracle	2019-08-22 16:16:54 -03:00
Gerardo Nardelli	3ff096ef55	Lint fixes	2019-08-22 13:37:38 -03:00
Gerardo Nardelli	7f15733ad3	Merge fix	2019-08-22 13:30:07 -03:00
Gerardo Nardelli	d22a3e8bae	Merge branch 'master' into amb-oracle # Conflicts: # .prettierrc # commons/abis.js # commons/package.json # e2e-commons/docker-compose.yml # monitor/eventsStats.js # monitor/utils/events.js # oracle/src/services/gasPrice.js # oracle/test/gasPrice.test.js # yarn.lock	2019-08-22 12:10:49 -03:00
Gerardo Nardelli	43609d739d	Pack signatures when processing amb collectedSignatures event in Oracle	2019-08-22 11:06:44 -03:00
Gerardo Nardelli	ab5166b895	Update submodule	2019-08-22 10:39:47 -03:00
Gerardo Nardelli	383e22cb58	Update amb message processing	2019-08-20 15:19:49 -03:00
Gerardo Nardelli	e1f20b8686	Update contract submodule	2019-08-20 15:19:09 -03:00
Gerardo Nardelli	4b59f18d29	Fix amb monitor	2019-07-30 10:05:44 -03:00
Gerardo Nardelli	2d42c236d7	Fix prettier	2019-07-25 15:28:36 -03:00
Gerardo Nardelli	ee4a6c8f5c	Fix amb events in monitor	2019-07-25 14:44:05 -03:00
Gerardo Nardelli	55f8443c55	Update contract submodule	2019-07-25 14:43:14 -03:00
Gerardo Nardelli	e5ce665656	Move amb message utils to commons	2019-07-25 12:36:10 -03:00
Gerardo Nardelli	751b885f73	Support amb events info in monitor	2019-07-25 11:30:59 -03:00
Gerardo Nardelli	3d0f68fad9	Support amb balances info in monitor	2019-07-24 11:50:35 -03:00
Gerardo Nardelli	08d2c46a03	Update deployment oracle template	2019-07-23 11:35:54 -03:00
Gerardo Nardelli	48620a8d01	Update submodule to latest amb contract changes	2019-07-18 15:07:29 -03:00
Gerardo Nardelli	35c2e642ee	Update amb contract submodule	2019-07-18 10:23:03 -03:00
Gerardo Nardelli	a056a75932	Update amb contract submodule	2019-07-18 09:30:40 -03:00
Gerardo Nardelli	e8a179bc19	Update contract module name	2019-07-18 09:04:10 -03:00
Gerardo Nardelli	aa32f2cc0c	Update contract submodule	2019-07-18 08:39:51 -03:00
Gerardo Nardelli	473b6a3e46	Fix commons unit test	2019-07-17 12:09:55 -03:00
Gerardo Nardelli	8cf97aea3c	Fix e2e-commons up script	2019-07-17 12:03:29 -03:00
Gerardo Nardelli	ac6775bd6e	Lint fix	2019-07-17 11:53:43 -03:00
Gerardo Nardelli	478b30b2ed	Add ARBITRARY_MESSAGE bridge mode	2019-07-17 11:49:29 -03:00
Gerardo Nardelli	70d03c1a93	Oracle amb merge fix	2019-07-17 11:47:25 -03:00
Gerardo Nardelli	0694fc24e9	Merge branch 'master' into amb-oracle # Conflicts: # oracle-e2e/deploy.js # oracle-e2e/docker-compose.yml # oracle-e2e/run-tests.sh # oracle/config/base.config.js # oracle/src/services/gasPrice.js # oracle/src/utils/utils.js # oracle/test/gasPrice.test.js	2019-07-17 10:00:10 -03:00
Gerardo Nardelli	80940a0a82	Use compiled amb contracts on oracle	2019-06-04 11:25:53 -03:00
Gerardo Nardelli	a2603701b6	Merge branch 'master' into amb-oracle # Conflicts: # oracle-e2e/run-tests.sh	2019-06-04 10:26:31 -03:00
Gerardo Nardelli	e006443f50	add amb oracle e2e tests	2019-06-03 16:56:53 -03:00
Gerardo Nardelli	0326745684	Update submodule to amb branch	2019-06-03 16:56:13 -03:00
Gerardo Nardelli	95f4a0acc6	use gas price from message on gas estimate for amb events	2019-05-27 16:28:29 -03:00
Gerardo Nardelli	7ca3b0079c	add amb base implementation on oracle	2019-05-24 15:42:26 -03:00
@@ -1 +1 @@
 .16
 .15