Skip to content

Commit

Permalink
upgrade base blockscout version to 5.3.1-beta
Browse files Browse the repository at this point in the history
  • Loading branch information
galxy25 committed Nov 2, 2023
1 parent 57e0dfc commit 08eadb9
Show file tree
Hide file tree
Showing 8 changed files with 75 additions and 42 deletions.
22 changes: 15 additions & 7 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ POSTGRES_MAX_NUM_CONNECTIONS=200
# Used by the blockscout makefile targets
IMAGE_NAME=kava-blockscout
LOCAL_IMAGE_TAG=local
PRODUCTION_IMAGE_TAG=v5.1.5
PRODUCTION_IMAGE_TAG=v5.3.1

# Used by the blockscout docker file
BLOCKSCOUT_VERSION=v5.1.5
BLOCKSCOUT_VERSION=v5.3.1

# Used by the blockscout docker compose service
BLOCKSCOUT_HOST_PORT=4000
Expand All @@ -38,14 +38,15 @@ PORT=4000
DATABASE_URL=postgres://blockscout_user:blockscout_password123@postgres:5432/blockscout_testing?ssl=false
ECTO_USE_SSL=false
SECRET_KEY_BASE=56NtB48ear7+wMSf0IQuWDAAazhpb31qyc7GiyspBP2vh7t5zlCsF5QDv76chXeN
INDEXER_DISABLE_PENDING_TRANSACTIONS_FETCHER=true
ETHEREUM_JSONRPC_VARIANT=geth
ETHEREUM_JSONRPC_HTTP_URL=http://kava:8545
ETHEREUM_JSONRPC_TRACE_URL=http://kava:8545
# uncomment below to have blockscout index public testnet
# ETHEREUM_JSONRPC_HTTP_URL=https://evm.data-testnet.kava.io
# ETHEREUM_JSONRPC_WS_URL=wss://wevm.data-testnet.kava.io
# uncomment below to have blockscout index mainnet
# ETHEREUM_JSONRPC_HTTP_URL=https://evm.data.kava.io
# ETHEREUM_JSONRPC_HTTP_URL=https://evm.data.infra.kava.io
# ETHEREUM_JSONRPC_TRACE_URL=https://evm.data.infra.kava.io
# ETHEREUM_JSONRPC_WS_URL=wss://wevm.data.kava.io

NETWORK= "Kava Ethereum Co-Chain"
Expand All @@ -59,10 +60,17 @@ BLOCKSCOUT_VERSION=v5.1.5-kava
INDEXER_CATCHUP_BLOCKS_BATCH_SIZE=1
INDEXER_CATCHUP_BLOCKS_CONCURRENCY=1
INDEXER_INTERNAL_TRANSACTIONS_CONCURRENCY=1
INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER=true
INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER=false
INDEXER_BLOCK_REWARD_CONCURRENCY=1
INDEXER_RECEIPTS_CONCURRENCY=1
INDEXER_COIN_BALANCES_CONCURRENCY=1
INDEXER_CATCHUP_BLOCK_INTERVAL=5s
# The block number, where import of blocks by catchup fetcher begins from.
FIRST_BLOCK=0
DISABLE_REALTIME_INDEXER=false
# Uncomment below to have indexer start and stop
# at a certain block range for indexing blocks
# FIRST_BLOCK=7069475
# LAST_BLOCK=7069485
# Uncomment below to have indexer start and stop
# at a certain block range for indexing internal transactions
# TRACE_FIRST_BLOCK=7069475
# TRACE_LAST_BLOCK=7069485
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ artifacts
# data generated by execution of tool(s)
tools/*.bytecode
tools/*.address_hash

postgres-data/
37 changes: 20 additions & 17 deletions DEVELOPMENT.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions blockscout/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Raw version representing v5.1.5-beta
ARG BLOCKSCOUT_VERSION=5.1.5
# Raw version representing v5.3.1-beta
ARG BLOCKSCOUT_VERSION=5.3.1

#
# The backend-builder uses the official exlixir docker image that contains
Expand Down
2 changes: 1 addition & 1 deletion blockscout/blockscout-base
Submodule blockscout-base updated 549 files
13 changes: 0 additions & 13 deletions blockscout/patches/0003-parse-database-url-password-period.patch

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ index 374b4a6091..78bbdf3522 100644
#, elixir-autogen, elixir-format
msgid "Version"
-msgstr ""
+msgstr "v5.1.5-kava-bc38c81"
+msgstr "v5.3.1-kava-232b6090d7"

#: lib/block_scout_web/templates/address_contract_verification/new.html.eex:33
#, elixir-autogen, elixir-format
33 changes: 33 additions & 0 deletions devdocs/UPGRADING_BASE_BLOCKSCOUT_VERSION.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# UPGRADING_BASE_BLOCKSCOUT_VERSION

## Building

Checkout a branch from the current version of this repo, then cd into the blockscout source code dir and checkout the tag you wish to update

```bash
cd $repo_dir
cd blockscout/blockscout-base/
git checkout v5.3.1-beta
```

Test custom kava patches locally will apply to avoid long dev cycles building production container

```bash
cd $repo_dir
cd blockscout/blockscout-base/
git apply ../patches/*.patch
```

if all patches apply with no error message, move on, else modify / delete / integrate patches with latest updated blockscout source code as needed

## Publishing Official Versions

Update values of `PRODUCTION_IMAGE_TAG`` and`BLOCKSCOUT_VERSION` in `.env` file

Open a PR

Example PR

Once PR is approved, merge and new containers will be published

Deploy to production by updating [value for image tag](https://github.com/Kava-Labs/infrastructure/blob/master/terraform/product/production/us-east-1/blockscout-mainnet/service/terragrunt.hcl#L56) and running `terragrunt apply`

0 comments on commit 08eadb9

Please sign in to comment.