Merge branch 'master' of https://github.com/blockscout/blockscout int…

…o sync-01-08 # Conflicts: # apps/block_scout_web/lib/block_scout_web/templates/transaction/overview.html.eex # apps/explorer/lib/explorer/chain/transaction.ex
aurora-is-near · Jan 9, 2024 · bcaced7 · bcaced7
2 parents 5e2eb36 + 61d7275
commit bcaced7
Show file tree

Hide file tree

Showing 314 changed files with 8,561 additions and 4,831 deletions.
diff --git a/.dialyzer-ignore b/.dialyzer-ignore
@@ -13,16 +13,14 @@ lib/block_scout_web/schema/types.ex:31
 lib/phoenix/router.ex:324
 lib/phoenix/router.ex:402
 lib/explorer/smart_contract/reader.ex:435
-lib/explorer/exchange_rates/source.ex:139
-lib/explorer/exchange_rates/source.ex:142
 lib/indexer/fetcher/polygon_edge.ex:737
-lib/indexer/fetcher/polygon_edge/deposit_execute.ex:140
-lib/indexer/fetcher/polygon_edge/deposit_execute.ex:184
-lib/indexer/fetcher/polygon_edge/withdrawal.ex:160
-lib/indexer/fetcher/polygon_edge/withdrawal.ex:204
+lib/indexer/fetcher/polygon_edge/deposit_execute.ex:146
+lib/indexer/fetcher/polygon_edge/deposit_execute.ex:190
+lib/indexer/fetcher/polygon_edge/withdrawal.ex:166
+lib/indexer/fetcher/polygon_edge/withdrawal.ex:210
 lib/indexer/fetcher/zkevm/transaction_batch.ex:116
 lib/indexer/fetcher/zkevm/transaction_batch.ex:156
 lib/indexer/fetcher/zkevm/transaction_batch.ex:252
 lib/block_scout_web/views/api/v2/transaction_view.ex:431
 lib/block_scout_web/views/api/v2/transaction_view.ex:472
-lib/explorer/chain/transaction.ex:167
+lib/explorer/chain/transaction.ex:170
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -24,8 +24,8 @@ body:
       description: How the application has been deployed.
       options:
           - Docker-compose
+          - Helm charts (k8s)
           - Manual from the source code
-          - Helm charts
           - Docker
     validations:
       required: true
@@ -65,7 +65,7 @@ body:
     attributes:
       label: Backend version
       description: The release version of the backend or branch/commit.
-      placeholder: v5.3.2
+      placeholder: v6.0.0
     validations:
       required: true
 

diff --git a/.github/workflows/config.yml b/.github/workflows/config.yml
@@ -4,21 +4,22 @@ on:
   push:
     branches:
       - master
-      - production-core-stg
-      - production-eth-stg-experimental
-      - production-eth-goerli-stg
-      - production-eth-sepolia-stg
-      - production-fuse-stg
-      - production-optimism-stg
-      - production-immutable-stg
-      - production-iota-stg
-      - production-lukso-stg
-      - production-rsk-stg
-      - production-sokol-stg
-      - production-suave-stg
-      - production-xdai-stg
-      - production-zkevm-stg
-      - production-zksync-stg
+      - v6.0.0-dev
+      - production-core
+      - production-eth-experimental
+      - production-eth-goerli
+      - production-eth-sepolia
+      - production-fuse
+      - production-optimism
+      - production-immutable
+      - production-iota
+      - production-lukso
+      - production-rsk
+      - production-sokol
+      - production-suave
+      - production-xdai
+      - production-zkevm
+      - production-zksync
       - staging-l2
     paths-ignore:
       - 'CHANGELOG.md'
@@ -28,7 +29,9 @@ on:
   pull_request:
     branches:
       - master
-      - production-optimism-stg
+      - v6.0.0-dev
+      - production-optimism
+      - production-zksync
 
 env:
   MIX_ENV: test
@@ -72,7 +75,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-
 
@@ -130,7 +133,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -154,7 +157,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -183,7 +186,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -227,7 +230,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -253,7 +256,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -282,7 +285,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -330,7 +333,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -376,7 +379,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -438,7 +441,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -498,7 +501,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -569,7 +572,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 
@@ -637,7 +640,7 @@ jobs:
           path: |
             deps
             _build
-          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_27-${{ hashFiles('mix.lock') }}
+          key: ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-mixlockhash_33-${{ hashFiles('mix.lock') }}
           restore-keys: |
             ${{ runner.os }}-${{ env.ELIXIR_VERSION }}-${{ env.OTP_VERSION }}-${{ env.MIX_ENV }}-deps-"
 

diff --git a/.github/workflows/prerelease-main.yml → .github/workflows/prerelease.yml b/.github/workflows/prerelease-main.yml → .github/workflows/prerelease.yml
@@ -1,4 +1,4 @@
-name: Pre-release main
+name: Pre-release master
 
 on:
   workflow_dispatch:
@@ -16,7 +16,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.2
+      RELEASE_VERSION: 6.0.0
     steps:
       - name: Check out the repo
         uses: actions/checkout@v4
@@ -61,5 +61,5 @@ jobs:
             AMPLITUDE_URL=
             AMPLITUDE_API_KEY=
             CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
-            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta
+            BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-alpha
             RELEASE_VERSION=${{ env.RELEASE_VERSION }}
diff --git a/.github/workflows/publish-docker-image-every-push.yml b/.github/workflows/publish-docker-image-every-push.yml
@@ -11,7 +11,7 @@ on:
 env:
   OTP_VERSION: '25.2.1'
   ELIXIR_VERSION: '1.14.5'
-  RELEASE_VERSION: 5.3.2
+  RELEASE_VERSION: 6.0.0
 
 jobs:
   push_to_registry:

diff --git a/.github/workflows/publish-docker-image-for-core.yml b/.github/workflows/publish-docker-image-for-core.yml
@@ -9,13 +9,13 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - production-core-stg
+      - production-core
 jobs:
   push_to_registry:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.2
+      RELEASE_VERSION: 6.0.0
       DOCKER_CHAIN_NAME: poa
     steps:
       - name: Check out the repo

diff --git a/.github/workflows/publish-docker-image-for-eth-goerli.yml b/.github/workflows/publish-docker-image-for-eth-goerli.yml
@@ -9,13 +9,13 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - production-eth-goerli-stg
+      - production-eth-goerli
 jobs:
   push_to_registry:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.2
+      RELEASE_VERSION: 6.0.0
       DOCKER_CHAIN_NAME: eth-goerli
     steps:
       - name: Check out the repo

diff --git a/.github/workflows/publish-docker-image-for-eth-sepolia.yml b/.github/workflows/publish-docker-image-for-eth-sepolia.yml
@@ -9,13 +9,13 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - production-eth-sepolia-stg
+      - production-eth-sepolia
 jobs:
   push_to_registry:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.2
+      RELEASE_VERSION: 6.0.0
       DOCKER_CHAIN_NAME: eth-sepolia
     steps:
       - name: Check out the repo

diff --git a/.github/workflows/publish-docker-image-for-eth.yml b/.github/workflows/publish-docker-image-for-eth.yml
@@ -9,13 +9,13 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - production-eth-stg-experimental
+      - production-eth-experimental
 jobs:
   push_to_registry:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.2
+      RELEASE_VERSION: 6.0.0
       DOCKER_CHAIN_NAME: mainnet
     steps:
       - name: Check out the repo

diff --git a/.github/workflows/publish-docker-image-for-fuse.yml b/.github/workflows/publish-docker-image-for-fuse.yml
@@ -9,13 +9,13 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - production-fuse-stg
+      - production-fuse
 jobs:
   push_to_registry:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.2
+      RELEASE_VERSION: 6.0.0
       DOCKER_CHAIN_NAME: fuse
     steps:
       - name: Check out the repo

diff --git a/.github/workflows/publish-docker-image-for-immutable.yml b/.github/workflows/publish-docker-image-for-immutable.yml
@@ -9,13 +9,13 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - production-immutable-stg
+      - production-immutable
 jobs:
   push_to_registry:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.2
+      RELEASE_VERSION: 6.0.0
       DOCKER_CHAIN_NAME: immutable
     steps:
       - name: Check out the repo

diff --git a/.github/workflows/publish-docker-image-for-l2-staging.yml b/.github/workflows/publish-docker-image-for-l2-staging.yml
@@ -15,7 +15,7 @@ jobs:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.2
+      RELEASE_VERSION: 6.0.0
       DOCKER_CHAIN_NAME: optimism-l2-advanced
     steps:
       - name: Check out the repo

diff --git a/.github/workflows/publish-docker-image-for-lukso.yml b/.github/workflows/publish-docker-image-for-lukso.yml
@@ -9,13 +9,13 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - production-lukso-stg
+      - production-lukso
 jobs:
   push_to_registry:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.2
+      RELEASE_VERSION: 6.0.0
       DOCKER_CHAIN_NAME: lukso
     steps:
       - name: Check out the repo

diff --git a/.github/workflows/publish-docker-image-for-optimism.yml b/.github/workflows/publish-docker-image-for-optimism.yml
@@ -9,13 +9,13 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - production-optimism-stg
+      - production-optimism
 jobs:
   push_to_registry:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.2
+      RELEASE_VERSION: 6.0.0
       DOCKER_CHAIN_NAME: optimism
     steps:
       - name: Check out the repo

diff --git a/.github/workflows/publish-docker-image-for-polygon-edge.yml b/.github/workflows/publish-docker-image-for-polygon-edge.yml
@@ -9,13 +9,13 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - production-polygon-edge-stg
+      - production-polygon-edge
 jobs:
   push_to_registry:
     name: Push Docker image to Docker Hub
     runs-on: ubuntu-latest
     env:
-      RELEASE_VERSION: 5.3.2
+      RELEASE_VERSION: 6.0.0
       DOCKER_CHAIN_NAME: polygon-edge
     steps:
       - name: Check out the repo