Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/blockscout/blockscout int…
Browse files Browse the repository at this point in the history
…o update-02.08

# Conflicts:
#	apps/explorer/lib/explorer/chain/transaction.ex
  • Loading branch information
pustovalov committed Aug 2, 2023
2 parents 2caa9d3 + 1e2b7eb commit 33f6b01
Show file tree
Hide file tree
Showing 167 changed files with 4,293 additions and 2,973 deletions.
3 changes: 1 addition & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,9 @@ jobs:

- run: mix compile

# Ensure NIF is compiled for libsecp256k1
- run:
command: make
working_directory: "deps/libsecp256k1"
working_directory: "deps/ex_secp256k1"

# `deps` needs to be cached with `_build` because `_build` will symlink into `deps`

Expand Down
2 changes: 1 addition & 1 deletion .dialyzer-ignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
:0: Unknown type 'Elixir.Map':t/0
:0: Unknown type 'Elixir.Hash':t/0
:0: Unknown type 'Elixir.Address':t/0
lib/ethereum_jsonrpc/rolling_window.ex:173
lib/ethereum_jsonrpc/rolling_window.ex:171
lib/explorer/smart_contract/solidity/publisher_worker.ex:1
lib/explorer/smart_contract/vyper/publisher_worker.ex:1
lib/explorer/smart_contract/solidity/publisher_worker.ex:6
Expand Down
8 changes: 1 addition & 7 deletions .github/workflows/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,10 @@ on:
push:
branches:
- master
- va-bedrock-optimism
- production-optimism-stg
- production-eth-stg-experimental
- production-base-goerli-stg
- production-eth-goerli-stg
- production-xdai-stg
- production-gc-chiado-stg
- production-polygon-supernets-stg
- production-core-stg
- production-sokol-stg
- production-rsk-stg
Expand All @@ -19,7 +16,6 @@ on:
pull_request:
branches:
- master
- va-bedrock-optimism

env:
MIX_ENV: test
Expand Down Expand Up @@ -62,8 +58,6 @@ jobs:
mix local.rebar --force
mix deps.get
mix deps.compile
cd deps/libsecp256k1
make
- name: Restore Explorer NPM Cache
uses: actions/cache@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-docker-image-every-push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
env:
OTP_VERSION: '25.2.1'
ELIXIR_VERSION: '1.14.3'
RELEASE_VERSION: 5.2.0
RELEASE_VERSION: 5.2.1

jobs:
push_to_registry:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-docker-image-for-core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
name: Push Docker image to Docker Hub
runs-on: ubuntu-latest
env:
RELEASE_VERSION: 5.2.0
RELEASE_VERSION: 5.2.1
DOCKER_CHAIN_NAME: poa
steps:
- name: Check out the repo
Expand All @@ -41,7 +41,7 @@ jobs:
context: .
file: ./docker/Dockerfile
push: true
tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-prerelease-${{ env.SHORT_SHA }}
tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
build-args: |
CACHE_EXCHANGE_RATES_PERIOD=
DISABLE_READ_API=false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ name: Publish Docker image for specific chain branches
on:
push:
branches:
- production-base-goerli-stg
- production-eth-goerli-stg
jobs:
push_to_registry:
name: Push Docker image to Docker Hub
runs-on: ubuntu-latest
env:
RELEASE_VERSION: 5.2.0
DOCKER_CHAIN_NAME: base-goerli
RELEASE_VERSION: 5.2.1
DOCKER_CHAIN_NAME: eth-goerli
steps:
- name: Check out the repo
uses: actions/checkout@v3
Expand All @@ -41,7 +41,7 @@ jobs:
context: .
file: ./docker/Dockerfile
push: true
tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-prerelease-${{ env.SHORT_SHA }}
tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
build-args: |
CACHE_EXCHANGE_RATES_PERIOD=
DISABLE_READ_API=false
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-docker-image-for-eth.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
name: Push Docker image to Docker Hub
runs-on: ubuntu-latest
env:
RELEASE_VERSION: 5.2.0
RELEASE_VERSION: 5.2.1
DOCKER_CHAIN_NAME: mainnet
steps:
- name: Check out the repo
Expand All @@ -41,7 +41,7 @@ jobs:
context: .
file: ./docker/Dockerfile
push: true
tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-prerelease-${{ env.SHORT_SHA }}-experimental
tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}-experimental
build-args: |
CACHE_EXCHANGE_RATES_PERIOD=
DISABLE_READ_API=false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ name: Publish Docker image for specific chain branches
on:
push:
branches:
- production-gc-chiado-stg
- production-immutable-stg
env:
OTP_VERSION: '24.3.4.1'
ELIXIR_VERSION: '1.13.4'
Expand All @@ -17,8 +17,8 @@ jobs:
name: Push Docker image to Docker Hub
runs-on: ubuntu-latest
env:
RELEASE_VERSION: 5.2.0
DOCKER_CHAIN_NAME: xdai-chiado
RELEASE_VERSION: 5.2.1
DOCKER_CHAIN_NAME: immutable
steps:
- name: Check out the repo
uses: actions/checkout@v3
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
context: .
file: ./docker/Dockerfile
push: true
tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-prerelease-${{ env.SHORT_SHA }}
tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
build-args: |
CACHE_EXCHANGE_RATES_PERIOD=
DISABLE_READ_API=false
Expand All @@ -59,6 +59,5 @@ jobs:
CACHE_TOTAL_GAS_USAGE_COUNTER_ENABLED=
ADMIN_PANEL_ENABLED=false
CACHE_ADDRESS_WITH_BALANCES_UPDATE_INTERVAL=
SENTRY_DSN_CLIENT_GNOSIS=${{ secrets.SENTRY_DSN_CLIENT_GNOSIS }}
BLOCKSCOUT_VERSION=v${{ env.RELEASE_VERSION }}-beta.+commit.${{ env.SHORT_SHA }}
RELEASE_VERSION=${{ env.RELEASE_VERSION }}
4 changes: 2 additions & 2 deletions .github/workflows/publish-docker-image-for-l2-staging.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
name: Push Docker image to Docker Hub
runs-on: ubuntu-latest
env:
RELEASE_VERSION: 5.2.0
RELEASE_VERSION: 5.2.1
DOCKER_CHAIN_NAME: optimism-l2-advanced
steps:
- name: Check out the repo
Expand All @@ -41,7 +41,7 @@ jobs:
context: .
file: ./docker/Dockerfile
push: true
tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-prerelease-${{ env.SHORT_SHA }}
tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
build-args: |
CACHE_EXCHANGE_RATES_PERIOD=
DISABLE_READ_API=false
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-docker-image-for-lukso.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
name: Push Docker image to Docker Hub
runs-on: ubuntu-latest
env:
RELEASE_VERSION: 5.2.0
RELEASE_VERSION: 5.2.1
DOCKER_CHAIN_NAME: lukso
steps:
- name: Check out the repo
Expand All @@ -41,7 +41,7 @@ jobs:
context: .
file: ./docker/Dockerfile
push: true
tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-prerelease-${{ env.SHORT_SHA }}
tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
build-args: |
CACHE_EXCHANGE_RATES_PERIOD=
DISABLE_READ_API=false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-docker-image-for-optimism.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
name: Push Docker image to Docker Hub
runs-on: ubuntu-latest
env:
RELEASE_VERSION: 5.2.0
RELEASE_VERSION: 5.2.1
DOCKER_CHAIN_NAME: optimism
steps:
- name: Check out the repo
Expand Down
64 changes: 0 additions & 64 deletions .github/workflows/publish-docker-image-for-polygon-supernets.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/publish-docker-image-for-rsk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
name: Push Docker image to Docker Hub
runs-on: ubuntu-latest
env:
RELEASE_VERSION: 5.2.0
RELEASE_VERSION: 5.2.1
DOCKER_CHAIN_NAME: rsk
steps:
- name: Check out the repo
Expand All @@ -41,7 +41,7 @@ jobs:
context: .
file: ./docker/Dockerfile
push: true
tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-prerelease-${{ env.SHORT_SHA }}
tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
build-args: |
CACHE_EXCHANGE_RATES_PERIOD=
DISABLE_READ_API=false
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish-docker-image-for-xdai.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
name: Push Docker image to Docker Hub
runs-on: ubuntu-latest
env:
RELEASE_VERSION: 5.2.0
RELEASE_VERSION: 5.2.1
DOCKER_CHAIN_NAME: xdai
steps:
- name: Check out the repo
Expand Down Expand Up @@ -50,7 +50,7 @@ jobs:
context: .
file: ./docker/Dockerfile
push: true
tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-prerelease-${{ env.SHORT_SHA }}
tags: blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:latest, blockscout/blockscout-${{ env.DOCKER_CHAIN_NAME }}:${{ env.RELEASE_VERSION }}-postrelease-${{ env.SHORT_SHA }}
build-args: |
CACHE_EXCHANGE_RATES_PERIOD=
DISABLE_READ_API=false
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/publish-docker-image-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
name: Push Docker image to Docker Hub
runs-on: ubuntu-latest
env:
RELEASE_VERSION: 5.2.0
RELEASE_VERSION: 5.2.1
steps:
- name: Check out the repo
uses: actions/checkout@v3
Expand Down Expand Up @@ -80,7 +80,6 @@ jobs:
production-eth-goerli-stg
production-lukso-stg
production-xdai-stg
production-gc-chiado-stg
production-polygon-supernets-stg
production-rsk-stg
steps:
Expand Down
4 changes: 2 additions & 2 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
elixir 1.14.5-otp-25
erlang 25.3
nodejs 18.13.0
erlang 25.3.2.3
nodejs 18.16.1
Loading

0 comments on commit 33f6b01

Please sign in to comment.