Merge the develop branch to the master branch, preparation to v2.3.0-rc1

.circleci/config.yml

@@ -36,20 +36,6 @@ orbs:
                 curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
                 echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
                 sudo apt-get update && sudo apt-get -y install yarn
-      yarn-install-cached-on-machine:
-        steps:
-          - restore_cache:
-              name: Restore Machine Yarn Package Cache
-              keys:
-                - yarn-machine-{{ checksum "package.json" }}-{{ checksum "yarn.lock" }}
-          - run:
-              name: Install npm dependencies using Yarn
-              command: nvm use default; yarn install --frozen-lockfile
-          - save_cache:
-              name: Save Machine Yarn Package Cache
-              key: yarn-machine-{{ checksum "package.json" }}-{{ checksum "yarn.lock" }}
-              paths:
-                - ~/.cache/yarn
       wait-for-oracle:
         parameters:
           redis-key:
@@ -73,21 +59,30 @@ orbs:
                   echo "Sleeping..."
                   sleep 3
                 done
+      init-repo:
+        steps:
+          - checkout
+          - run: git submodule update --init
     executors:
       docker-node:
         docker:
           - image: circleci/node:10.15
-      machine-with-docker-caching:
+      machine-with-dlc:
         machine:
-          image: circleci/classic:latest
+          image: ubuntu-1604:202007-01
           docker_layer_caching: true
+      classic-machine-without-dlc:
+        machine:
+          image: circleci/classic:latest
+      machine-without-dlc:
+        machine:
+          image: ubuntu-1604:202007-01
 
 jobs:
   initialize:
     executor: tokenbridge-orb/docker-node
     steps:
-      - checkout
-      - run: git submodule update --init
+      - tokenbridge-orb/init-repo
       - restore_cache:
           name: Restore Yarn Package Cache
           keys:
@@ -140,29 +135,34 @@ jobs:
       - restore_cache:
           key: initialize-{{ .Environment.CIRCLE_SHA1 }}
       - run: yarn run test
+  build-e2e-images:
+    executor: tokenbridge-orb/machine-without-dlc
+    steps:
+      - tokenbridge-orb/init-repo
+      - run:
+          command: |
+            docker login -u ${DOCKER_LOGIN} -p ${DOCKER_PASSWORD}
+            cd e2e-commons
+            docker-compose build oracle monitor ui e2e molecule_runner
+            docker-compose push oracle monitor ui e2e molecule_runner
   oracle-e2e:
-    executor: tokenbridge-orb/docker-node
+    executor: tokenbridge-orb/machine-without-dlc
     steps:
-      - checkout
-      - run: git submodule update --init
-      - setup_remote_docker:
-          docker_layer_caching: true
-      - run: yarn run oracle-e2e
+      - tokenbridge-orb/init-repo
+      - run: ./oracle-e2e/run-tests.sh
   ui-e2e:
-    executor: tokenbridge-orb/machine-with-docker-caching
+    executor: tokenbridge-orb/machine-without-dlc
     steps:
-      - checkout
       - tokenbridge-orb/install-node
       - tokenbridge-orb/install-yarn
       - tokenbridge-orb/install-chrome
-      - run: git submodule update --init
-      - tokenbridge-orb/yarn-install-cached-on-machine
+      - restore_cache:
+          key: initialize-{{ .Environment.CIRCLE_SHA1 }}
       - run: yarn run ui-e2e
   monitor-e2e:
-    executor: tokenbridge-orb/machine-with-docker-caching
+    executor: tokenbridge-orb/machine-without-dlc
     steps:
-      - checkout
-      - run: git submodule update --init
+      - tokenbridge-orb/init-repo
       - run: ./monitor-e2e/run-tests.sh
   cover:
     executor: tokenbridge-orb/docker-node
@@ -172,55 +172,47 @@ jobs:
       - run: yarn workspace ui run coverage
       - run: yarn workspace ui run coveralls
   deployment-oracle:
-    executor: tokenbridge-orb/machine-with-docker-caching
+    executor: tokenbridge-orb/machine-without-dlc
     steps:
-      - checkout
-      - run: git submodule update --init
+      - tokenbridge-orb/init-repo
       - run:
           name: Run the scenario
           command: deployment-e2e/molecule.sh oracle
           no_output_timeout: 40m
   deployment-ui:
-    executor: tokenbridge-orb/machine-with-docker-caching
+    executor: tokenbridge-orb/machine-without-dlc
     steps:
-      - checkout
-      - run: git submodule update --init
+      - tokenbridge-orb/init-repo
       - run:
           name: Run the scenario
           command: deployment-e2e/molecule.sh ui
           no_output_timeout: 40m
   deployment-monitor:
-    executor: tokenbridge-orb/machine-with-docker-caching
+    executor: tokenbridge-orb/machine-without-dlc
     steps:
-      - checkout
-      - run: git submodule update --init
+      - tokenbridge-orb/init-repo
       - run:
           name: Run the scenario
           command: deployment-e2e/molecule.sh monitor
           no_output_timeout: 40m
   deployment-repo:
-    executor: tokenbridge-orb/machine-with-docker-caching
+    executor: tokenbridge-orb/machine-without-dlc
     steps:
-      - checkout
-      - run: git submodule update --init
-      - tokenbridge-orb/install-node
-      - tokenbridge-orb/install-yarn
-      - tokenbridge-orb/yarn-install-cached-on-machine
+      - tokenbridge-orb/init-repo
       - run:
           name: Run the scenario
           command: deployment-e2e/molecule.sh repo
           no_output_timeout: 40m
   deployment-multiple:
-    executor: tokenbridge-orb/machine-with-docker-caching
+    executor: tokenbridge-orb/machine-without-dlc
     steps:
-      - checkout
-      - run: git submodule update --init
+      - tokenbridge-orb/init-repo
       - run:
           name: Run the scenario
           command: deployment-e2e/molecule.sh multiple
           no_output_timeout: 40m
   ultimate:
-    executor: tokenbridge-orb/machine-with-docker-caching
+    executor: tokenbridge-orb/classic-machine-without-dlc
     parameters:
       scenario-name:
         description: "Molecule scenario name used to create the infrastructure"
@@ -237,12 +229,11 @@ jobs:
         default: ''
         type: string
     steps:
-      - checkout
-      - run: git submodule update --init
       - tokenbridge-orb/install-node
       - tokenbridge-orb/install-chrome
       - tokenbridge-orb/install-yarn
-      - tokenbridge-orb/yarn-install-cached-on-machine
+      - restore_cache:
+          key: initialize-{{ .Environment.CIRCLE_SHA1 }}
       - run:
           name: Prepare the infrastructure
           command: e2e-commons/up.sh deploy << parameters.scenario-name >> blocks
@@ -286,35 +277,93 @@ workflows:
           filters:
             branches:
               only: master
-      - oracle-e2e
-      - ui-e2e
-      - monitor-e2e
-      - deployment-oracle
-      - deployment-ui
-      - deployment-monitor
-      - deployment-repo
-      - deployment-multiple
+      - build-e2e-images
+      - oracle-e2e:
+          requires:
+            - build-e2e-images
+      - ui-e2e:
+          requires:
+            - build-e2e-images
+            - initialize
+      - monitor-e2e:
+          requires:
+            - build-e2e-images
+      - deployment-oracle:
+          requires:
+            - build-e2e-images
+      - deployment-ui:
+          requires:
+            - build-e2e-images
+      - deployment-monitor:
+          requires:
+            - build-e2e-images
+      - deployment-repo:
+          requires:
+            - build-e2e-images
+      - deployment-multiple:
+          requires:
+            - build-e2e-images
       - ultimate:
+          requires:
+            - build-e2e-images
+            - initialize
+          filters:
+            branches:
+              only:
+                - master
+                - develop
           name: "ultimate: native to erc"
           scenario-name: native-to-erc
           redis-key: native-erc-collected-signatures:lastProcessedBlock
           ui-e2e-grep: "NATIVE TO ERC"
       - ultimate:
+          requires:
+            - build-e2e-images
+            - initialize
+          filters:
+            branches:
+              only:
+                - master
+                - develop
           name: "ultimate: erc to native"
           scenario-name: erc-to-native
           redis-key: erc-native-collected-signatures:lastProcessedBlock
           ui-e2e-grep: "ERC TO NATIVE"
       - ultimate:
+          requires:
+            - build-e2e-images
+            - initialize
+          filters:
+            branches:
+              only:
+                - master
+                - develop
           name: "ultimate: erc to erc"
           scenario-name: erc-to-erc
           redis-key: erc-erc-collected-signatures:lastProcessedBlock
           ui-e2e-grep: "ERC TO ERC"
       - ultimate:
+          requires:
+            - build-e2e-images
+            - initialize
+          filters:
+            branches:
+              only:
+                - master
+                - develop
           name: "ultimate: amb"
           scenario-name: amb
           redis-key: amb-collected-signatures:lastProcessedBlock
           oracle-e2e-script: "amb"
       - ultimate:
+          requires:
+            - build-e2e-images
+            - initialize
+          filters:
+            branches:
+              only:
+                - master
+                - develop
           name: "ultimate: amb stake erc to erc"
           scenario-name: ultimate-amb-stake-erc-to-erc
           redis-key: amb-collected-signatures:lastProcessedBlock

CONFIGURATION.md

@@ -36,6 +36,7 @@ ORACLE_LOG_LEVEL | Set the level of details in the logs. | `trace` / `debug` / `
 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"
+ORACLE_TX_REDUNDANCY | If set to `true`, instructs oracle to send `eth_sendRawTransaction` requests through all available RPC urls defined in `COMMON_HOME_RPC_URL` and `COMMON_FOREIGN_RPC_URL` variables instead of using first available one
 
 
 ## UI configuration

Dockerfile.e2e

@@ -1,15 +1,31 @@
-FROM node:10
+FROM node:8 as contracts
+
+WORKDIR /mono
+
+COPY contracts/package.json contracts/package-lock.json ./contracts/
+
+WORKDIR /mono/contracts
+RUN npm install --only=prod
+
+COPY ./contracts/truffle-config.js ./
+COPY ./contracts/contracts ./contracts
+RUN npm run compile
+
+FROM node:8
 
 WORKDIR /mono
 COPY package.json .
+COPY --from=contracts /mono/contracts/build ./contracts/build
 COPY oracle-e2e/package.json ./oracle-e2e/
 COPY monitor-e2e/package.json ./monitor-e2e/
-COPY contracts/package.json ./contracts/
 
 COPY yarn.lock .
-RUN yarn install --frozen-lockfile
-COPY ./contracts ./contracts
+RUN NOYARNPOSTINSTALL=1 yarn install --frozen-lockfile --production
+
+COPY ./contracts/deploy ./contracts/deploy
 RUN yarn install:deploy
-RUN yarn compile:contracts
 
-COPY . .
+COPY commons/ ./commons/
+COPY oracle-e2e/ ./oracle-e2e/
+COPY monitor-e2e/ ./monitor-e2e/
+COPY e2e-commons/ ./e2e-commons/

alm/.gitignore

@@ -1,5 +1,7 @@
 # See https://help.github.com/articles/ignoring-files/ for more about ignoring files.
 
+src/snapshots/*.json
+
 # dependencies
 /node_modules
 /.pnp

alm/Dockerfile

@@ -1,20 +1,29 @@
+FROM node:8 as contracts
+
+WORKDIR /mono
+
+COPY contracts/package.json contracts/package-lock.json ./contracts/
+
+WORKDIR /mono/contracts
+RUN npm install --only=prod
+
+COPY ./contracts/truffle-config.js ./
+COPY ./contracts/contracts ./contracts
+RUN npm run compile
+
 FROM node:12 as alm-builder
 
 WORKDIR /mono
 COPY package.json .
-COPY contracts/package.json ./contracts/
+COPY --from=contracts /mono/contracts/build ./contracts/build
 COPY commons/package.json ./commons/
 COPY alm/package.json ./alm/
 COPY yarn.lock .
-RUN yarn install --production --frozen-lockfile
-
-COPY ./contracts ./contracts
-RUN yarn run compile:contracts
-RUN mv ./contracts/build ./ && rm -rf ./contracts/* ./contracts/.[!.]* && mv ./build ./contracts/
+RUN NOYARNPOSTINSTALL=1 yarn install --frozen-lockfile --production
 
 COPY ./commons ./commons
-
 COPY ./alm ./alm
+
 ARG DOT_ENV_PATH=./alm/.env
 COPY ${DOT_ENV_PATH} ./alm/.env