Merge pull request #99 from Cerebellum-Network/release/0.17.0

Release v0.17.0
Cerebellum-Network · Aug 1, 2022 · 5ad7bca · 5ad7bca
2 parents 3de20dd + f266b6a
commit 5ad7bca
Show file tree

Hide file tree

Showing 27 changed files with 840 additions and 522 deletions.
diff --git a/.env.dev b/.env.dev
@@ -9,7 +9,7 @@ REACT_APP_SUPPORT_URL="https://t.me/ceretroubleshooting"
 ## These are only required if using Sentry for error logging
 REACT_APP_SENTRY_DSN_URL="https://[email protected]/5987177"
 SENTRY_AUTH_TOKEN="db67ae12222811ecabd2564b6436d30d"
-REACT_APP_SENTRY_RELEASE="0.16.0"
+REACT_APP_SENTRY_RELEASE="0.17.0"
 
 REACT_APP_MAINTENANCE=false
 REACT_APP_CONNECT_WITH_SUBSTRATE_WALLET_ENABLED=true

diff --git a/.env.prod b/.env.prod
@@ -9,7 +9,7 @@ REACT_APP_SUPPORT_URL="https://t.me/ceretroubleshooting"
 ## These are only required if using Sentry for error logging
 REACT_APP_SENTRY_DSN_URL="https://[email protected]/5987177"
 SENTRY_AUTH_TOKEN="db67ae12222811ecabd2564b6436d30d"
-REACT_APP_SENTRY_RELEASE="0.16.0"
+REACT_APP_SENTRY_RELEASE="0.17.0"
 
 REACT_APP_MAINTENANCE=false
 REACT_APP_CONNECT_WITH_SUBSTRATE_WALLET_ENABLED=true

diff --git a/.env.stage b/.env.stage
@@ -9,7 +9,7 @@ REACT_APP_SUPPORT_URL="https://t.me/ceretroubleshooting"
 ## These are only required if using Sentry for error logging
 REACT_APP_SENTRY_DSN_URL="https://[email protected]/5987177"
 SENTRY_AUTH_TOKEN="db67ae12222811ecabd2564b6436d30d"
-REACT_APP_SENTRY_RELEASE="0.16.0"
+REACT_APP_SENTRY_RELEASE="0.17.0"
 
 REACT_APP_MAINTENANCE=false
 REACT_APP_CONNECT_WITH_SUBSTRATE_WALLET_ENABLED=true

diff --git a/.github/workflows/dev.yaml b/.github/workflows/dev.yaml
@@ -6,63 +6,18 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
-    runs-on: [self-hosted, cere-network-large-workers]
-    container:
-      image: node:14-buster
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install system packages
-        run: |
-          apt update
-          apt install -y python3
-      - name: Restore cache
-        uses: actions/cache@v2
-        with:
-          path: 'node_modules'
-          key: ${{ runner.os }}-modules-${{ hashFiles('yarn.lock') }}
-      - name: Install packages
-        run: |
-          cp .env.dev .env
-          sh ./scripts/copy-dev-config.sh
-          yarn install
-      - name: Build
-        env: 
-          CI: false
-        run: yarn build
-      - name: Prepare artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: build
-          path: build
-
-  deploy:
-    runs-on: [self-hosted, cere-network-large-workers]
-    needs: build
-    container:
-      image: ubuntu:20.04
-    steps:
-      - name: Restore build
-        uses: actions/download-artifact@v2
-        with:
-          name: build
-          path: build
-      - name: Install aws-cli
-        env:
-          DEBIAN_FRONTEND: noninteractive
-        run: |
-          apt update
-          apt install -y awscli
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v1
-        with:
-          aws-access-key-id: ${{ secrets.DEV_NETWORK_AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.DEV_NETWORK_AWS_SECRET_ACCESS_KEY }}
-          aws-region: ${{ secrets.AWS_REGION }}
-      - name: Deploy
-        env:
-          S3_BUCKET: ${{ secrets.S3_BUCKET_NAME_DEV }}
-          CF_DISTRIBUTION_ID: ${{ secrets.CF_DISTRIBUTION_ID_DEV }}
-        run: |
-          aws s3 sync --metadata-directive="REPLACE" build/ s3://${S3_BUCKET}
-          aws cloudfront create-invalidation --distribution-id ${CF_DISTRIBUTION_ID} --paths "/*"
+  build-and-deploy:
+    uses: Cerebellum-Network/reusable-workflows/.github/workflows/build-and-upload-static.yaml@master
+    with:
+      runs-on: '["self-hosted", "cere-network-large-workers"]'
+      build_container: 'node:14-buster'
+      deploy_container: 'ubuntu:20.04'
+      install_packages_command: 'cp .env.dev .env; sh ./scripts/copy-dev-config.sh; yarn install'
+      build_command: 'yarn build'
+      path_to_static_files_to_upload: 'build'
+    secrets:
+      NETWORK_AWS_ACCESS_KEY_ID: ${{ secrets.DEV_NETWORK_AWS_ACCESS_KEY_ID }}
+      NETWORK_AWS_SECRET_ACCESS_KEY: ${{ secrets.DEV_NETWORK_AWS_SECRET_ACCESS_KEY }}
+      AWS_REGION: ${{ secrets.AWS_REGION }}
+      S3_BUCKET_NAME: ${{ secrets.S3_BUCKET_NAME_DEV }}
+      CF_DISTRIBUTION_ID: ${{ secrets.CF_DISTRIBUTION_ID_DEV }}
diff --git a/.github/workflows/prod.yaml b/.github/workflows/prod.yaml
@@ -5,63 +5,18 @@ on:
       - master-cere
 
 jobs:
-  build:
-    runs-on: [self-hosted, cere-network-large-workers]
-    container:
-      image: node:14-buster
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install system packages
-        run: |
-          apt update
-          apt install -y python3
-      - name: Restore cache
-        uses: actions/cache@v2
-        with:
-          path: 'node_modules'
-          key: ${{ runner.os }}-modules-${{ hashFiles('yarn.lock') }}
-      - name: Install packages
-        run: |
-          cp .env.prod .env
-          sh ./scripts/copy-prod-config.sh
-          yarn install
-      - name: Build
-        env: 
-          CI: false
-        run: yarn build
-      - name: Prepare artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: build
-          path: build
-
-  deploy:
-    runs-on: [self-hosted, cere-network-large-workers]
-    needs: build
-    container:
-      image: ubuntu:20.04
-    steps:
-      - name: Restore build
-        uses: actions/download-artifact@v2
-        with:
-          name: build
-          path: build
-      - name: Install aws-cli
-        env:
-          DEBIAN_FRONTEND: noninteractive
-        run: |
-          apt update
-          apt install -y awscli
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v1
-        with:
-          aws-access-key-id: ${{ secrets.PRD_NETWORK_AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.PRD_NETWORK_AWS_SECRET_ACCESS_KEY }}
-          aws-region: ${{ secrets.AWS_REGION }}
-      - name: Deploy
-        env:
-          S3_BUCKET: ${{ secrets.S3_BUCKET_NAME_PRD }}
-          CF_DISTRIBUTION_ID: ${{ secrets.CF_DISTRIBUTION_ID_PRD }}
-        run: |
-          aws s3 sync --metadata-directive="REPLACE" build/ s3://${S3_BUCKET}
-          aws cloudfront create-invalidation --distribution-id ${CF_DISTRIBUTION_ID} --paths "/*"
+  build-and-deploy:
+    uses: Cerebellum-Network/reusable-workflows/.github/workflows/build-and-upload-static.yaml@master
+    with:
+      runs-on: '["self-hosted", "cere-network-large-workers"]'
+      build_container: 'node:14-buster'
+      deploy_container: 'ubuntu:20.04'
+      install_packages_command: 'cp .env.prod .env; sh ./scripts/copy-prod-config.sh; yarn install'
+      build_command: 'yarn build'
+      path_to_static_files_to_upload: 'build'
+    secrets:
+      NETWORK_AWS_ACCESS_KEY_ID: ${{ secrets.PRD_NETWORK_AWS_ACCESS_KEY_ID }}
+      NETWORK_AWS_SECRET_ACCESS_KEY: ${{ secrets.PRD_NETWORK_AWS_SECRET_ACCESS_KEY }}
+      AWS_REGION: ${{ secrets.AWS_REGION }}
+      S3_BUCKET_NAME: ${{ secrets.S3_BUCKET_NAME_PRD }}
+      CF_DISTRIBUTION_ID: ${{ secrets.CF_DISTRIBUTION_ID_PRD }}
diff --git a/.github/workflows/stage.yaml b/.github/workflows/stage.yaml
@@ -6,63 +6,18 @@ on:
       - 'hotfix/**'
 
 jobs:
-  build:
-    runs-on: [self-hosted, cere-network-large-workers]
-    container:
-      image: node:14-buster
-    steps:
-      - uses: actions/checkout@v3
-      - name: Install system packages
-        run: |
-          apt update
-          apt install -y python3
-      - name: Restore cache
-        uses: actions/cache@v2
-        with:
-          path: 'node_modules'
-          key: ${{ runner.os }}-modules-${{ hashFiles('yarn.lock') }}
-      - name: Install packages
-        run: |
-          cp .env.stage .env
-          sh ./scripts/copy-stage-config.sh
-          yarn install
-      - name: Build
-        env: 
-          CI: false
-        run: yarn build
-      - name: Prepare artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: build
-          path: build
-
-  deploy:
-    runs-on: [self-hosted, cere-network-large-workers]
-    needs: build
-    container:
-      image: ubuntu:20.04
-    steps:
-      - name: Restore build
-        uses: actions/download-artifact@v2
-        with:
-          name: build
-          path: build
-      - name: Install aws-cli
-        env:
-          DEBIAN_FRONTEND: noninteractive
-        run: |
-          apt update
-          apt install -y awscli
-      - name: Configure AWS Credentials
-        uses: aws-actions/configure-aws-credentials@v1
-        with:
-          aws-access-key-id: ${{ secrets.STG_NETWORK_AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.STG_NETWORK_AWS_SECRET_ACCESS_KEY }}
-          aws-region: ${{ secrets.AWS_REGION }}
-      - name: Deploy
-        env:
-          S3_BUCKET: ${{ secrets.S3_BUCKET_NAME_STG }}
-          CF_DISTRIBUTION_ID: ${{ secrets.CF_DISTRIBUTION_ID_STG }}
-        run: |
-          aws s3 sync --metadata-directive="REPLACE" build/ s3://${S3_BUCKET}
-          aws cloudfront create-invalidation --distribution-id ${CF_DISTRIBUTION_ID} --paths "/*"
+  build-and-deploy:
+    uses: Cerebellum-Network/reusable-workflows/.github/workflows/build-and-upload-static.yaml@master
+    with:
+      runs-on: '["self-hosted", "cere-network-large-workers"]'
+      build_container: 'node:14-buster'
+      deploy_container: 'ubuntu:20.04'
+      install_packages_command: 'cp .env.stage .env; sh ./scripts/copy-stage-config.sh; yarn install'
+      build_command: 'yarn build'
+      path_to_static_files_to_upload: 'build'
+    secrets:
+      NETWORK_AWS_ACCESS_KEY_ID: ${{ secrets.STG_NETWORK_AWS_ACCESS_KEY_ID }}
+      NETWORK_AWS_SECRET_ACCESS_KEY: ${{ secrets.STG_NETWORK_AWS_SECRET_ACCESS_KEY }}
+      AWS_REGION: ${{ secrets.AWS_REGION }}
+      S3_BUCKET_NAME: ${{ secrets.S3_BUCKET_NAME_STG }}
+      CF_DISTRIBUTION_ID: ${{ secrets.CF_DISTRIBUTION_ID_STG }}
diff --git a/.gitignore b/.gitignore
@@ -24,6 +24,7 @@ yarn-error.log*
 
 .env
 .vscode
+.idea
 
 # runtime config
 public/chainbridge-runtime-config.js
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,11 +2,18 @@
 
 ## vNext
 
-- ...
+...
+
+## v0.17.0
+
+- Implemented transfer tx links to source, destination chains during tokens transfer
+- Replaced account address with its name on the select account dropdown
+- Updated Cere Blockchain public URLs
 
 ## v0.16.0
 
 - Rename ERC20 to ERC-20
+- Migrated to GitHub actions
 
 ## v0.15.0
 

diff --git a/config/chainbridge-runtime-config.cere.dev.js b/config/chainbridge-runtime-config.cere.dev.js
@@ -18,6 +18,7 @@ window.__RUNTIME_CONFIG__ = {
         erc20HandlerAddress: "0x53cc2228587EAca7CcE3189f24BC9bd490E43C48",
         rpcUrl:
           "https://polygon-mumbai.infura.io/v3/178b87e860404572bc217ca53fe594bd",
+        blockExplorer: "https://mumbai.polygonscan.com/tx",
         type: "Ethereum",
         nativeTokenSymbol: "MATIC",
         defaultGasPrice: 800,
@@ -51,7 +52,10 @@ window.__RUNTIME_CONFIG__ = {
         networkId: 2,
         name: "Cere Devnet",
         decimals: cereTokenDecimals,
-        rpcUrl: "wss://rpc.v2.devnet.cere.network/ws",
+        rpcUrl: "wss://rpc.devnet.cere.network/ws",
+        blockExplorer:
+          "https://explorer.cere.network/?rpc=wss%3A%2F%2Farchive.devnet.cere.network%2Fws#/explorer/query",
+        rpcFallbackUrls: ["wss://archive.devnet.cere.network/ws"],
         type: "Substrate",
         nativeTokenSymbol: "CERE",
         availableAsHomeNetwork: true,
@@ -89,6 +93,7 @@ window.__RUNTIME_CONFIG__ = {
         name: "Ethereum Goerli",
         decimals: cereTokenDecimals,
         rpcUrl: "https://goerli.infura.io/v3/0aca1499facc499bb195d2d437f78603",
+        blockExplorer: "https://goerli.etherscan.io/tx",
         bridgeAddress: "0xa806cA3bD88F790744462cBC34c40EDd5b8dc2Dd",
         erc20HandlerAddress: "0xf934Bfc8B5241b6C9e0DfC9A329AD687e79c5498",
         type: "Ethereum",

diff --git a/config/chainbridge-runtime-config.cere.prod.js b/config/chainbridge-runtime-config.cere.prod.js
@@ -18,6 +18,7 @@ window.__RUNTIME_CONFIG__ = {
         erc20HandlerAddress: "0x8fe028Eb002bbc3ec45c5dF8acfFf67eC95B6f88",
         rpcUrl:
           "https://polygon-mainnet.infura.io/v3/0aca1499facc499bb195d2d437f78603",
+        blockExplorer: "https://polygonscan.com/tx",
         type: "Ethereum",
         nativeTokenSymbol: "MATIC",
         defaultGasPrice: 800,
@@ -51,8 +52,10 @@ window.__RUNTIME_CONFIG__ = {
         networkId: 2,
         name: "Cere Mainnet",
         decimals: cereTokenDecimals,
-        rpcUrl: "wss://rpc.v2.mainnet.cere.network/ws",
-        rpcFallbackUrls: ["wss://archive.v2.mainnet.cere.network/ws"],
+        rpcUrl: "wss://rpc.mainnet.cere.network/ws",
+        blockExplorer:
+          "https://explorer.cere.network/?rpc=wss%3A%2F%2Farchive.mainnet.cere.network%2Fws#/explorer/query",
+        rpcFallbackUrls: ["wss://archive.mainnet.cere.network/ws"],
         type: "Substrate",
         nativeTokenSymbol: "CERE",
         availableAsHomeNetwork: true,
@@ -92,6 +95,7 @@ window.__RUNTIME_CONFIG__ = {
         bridgeAddress: "0xCaF65AB2eC9B39403966991eb34B1e8B9E44C041",
         erc20HandlerAddress: "0x8fe028Eb002bbc3ec45c5dF8acfFf67eC95B6f88",
         rpcUrl: "https://mainnet.infura.io/v3/0aca1499facc499bb195d2d437f78603",
+        blockExplorer: "https://etherscan.io/tx",
         type: "Ethereum",
         nativeTokenSymbol: "ETH",
         defaultGasPrice: 400,

diff --git a/config/chainbridge-runtime-config.cere.stage.js b/config/chainbridge-runtime-config.cere.stage.js
@@ -18,6 +18,7 @@ window.__RUNTIME_CONFIG__ = {
         erc20HandlerAddress: "0x8Ee8876d13e79b846fb6c3e5Ffe226a2e111387a",
         rpcUrl:
           "https://polygon-mumbai.infura.io/v3/178b87e860404572bc217ca53fe594bd",
+        blockExplorer: "https://mumbai.polygonscan.com/tx",
         type: "Ethereum",
         nativeTokenSymbol: "MATIC",
         defaultGasPrice: 800,
@@ -51,8 +52,10 @@ window.__RUNTIME_CONFIG__ = {
         networkId: 2,
         name: "Cere Testnet",
         decimals: cereTokenDecimals,
-        rpcUrl: "wss://rpc.v2.testnet.cere.network/ws",
-        rpcFallbackUrls: ["wss://archive.v2.testnet.cere.network/ws"],
+        rpcUrl: "wss://rpc.testnet.cere.network/ws",
+        blockExplorer:
+          "https://explorer.cere.network/?rpc=wss%3A%2F%2Farchive.testnet.cere.network%2Fws#/explorer/query",
+        rpcFallbackUrls: ["wss://archive.testnet.cere.network/ws"],
         type: "Substrate",
         nativeTokenSymbol: "CERE",
         availableAsHomeNetwork: true,
@@ -90,6 +93,7 @@ window.__RUNTIME_CONFIG__ = {
         name: "Ethereum Goerli",
         decimals: cereTokenDecimals,
         rpcUrl: "https://goerli.infura.io/v3/0aca1499facc499bb195d2d437f78603",
+        blockExplorer: "https://goerli.etherscan.io/tx",
         bridgeAddress: "0x4E297d17A3d945Ed96dBbD205317501e92d8D6E8",
         erc20HandlerAddress: "0x92c1576845703089CF6c0788379ED81f75F45dd5",
         type: "Ethereum",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@Cerebellum-Network/chainbridge-ui",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "private": true,
   "dependencies": {
     "@babel/core": "^7.12.3",
@@ -10,6 +10,8 @@
     "@chainsafe/common-components": "1.0.26",
     "@chainsafe/common-theme": "1.0.10",
     "@chainsafe/web3-context": "1.2.0",
+    "@material-ui/core": "^4.12.4",
+    "@material-ui/icons": "^4.11.3",
     "@material-ui/styles": "4.10.0",
     "@polkadot/api": "4.2.1",
     "@polkadot/extension-dapp": "0.37.1",