CipherLabs
/
blockscout
mirror of https://github.com/blockscout/blockscout
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ab-async-fetching-address-counters

Browse Source
pull/2787/head
Ayrat Badykov 5 years ago committed by GitHub
parent a32f4936c7 084a9e07a1
commit 9ad0c96566
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 125 additions and 136 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 236
      .circleci/config.yml
  2. 2
      CHANGELOG.md
  3. 23
      README.md

236
.circleci/config.yml
Unescape View File

@ -333,114 +333,114 @@ jobs:
name: Scan block_scout_web for vulnerabilities name: Scan block_scout_web for vulnerabilities
command: mix sobelow --config command: mix sobelow --config
working_directory: "apps/block_scout_web" working_directory: "apps/block_scout_web"
test_geth_http_websocket: # test_geth_http_websocket:
docker: # docker:
# Ensure .tool-versions matches # # Ensure .tool-versions matches
- image: circleci/elixir:1.9.1-node-browsers # - image: circleci/elixir:1.9.1-node-browsers
environment: # environment:
MIX_ENV: test # MIX_ENV: test
# match POSTGRES_PASSWORD for postgres image below # # match POSTGRES_PASSWORD for postgres image below
PGPASSWORD: postgres # PGPASSWORD: postgres
# match POSTGRES_USER for postgres image below # # match POSTGRES_USER for postgres image below
PGUSER: postgres # PGUSER: postgres
ETHEREUM_JSONRPC_CASE: "EthereumJSONRPC.Case.Geth.HTTPWebSocket" # ETHEREUM_JSONRPC_CASE: "EthereumJSONRPC.Case.Geth.HTTPWebSocket"
ETHEREUM_JSONRPC_WEB_SOCKET_CASE: "EthereumJSONRPC.WebSocket.Case.Geth" # ETHEREUM_JSONRPC_WEB_SOCKET_CASE: "EthereumJSONRPC.WebSocket.Case.Geth"
- image: circleci/postgres:10.3-alpine # - image: circleci/postgres:10.3-alpine
environment: # environment:
# Match apps/explorer/config/test.exs config :explorer, Explorer.Repo, database # # Match apps/explorer/config/test.exs config :explorer, Explorer.Repo, database
POSTGRES_DB: explorer_test # POSTGRES_DB: explorer_test
# match PGPASSWORD for elixir image above # # match PGPASSWORD for elixir image above
POSTGRES_PASSWORD: postgres # POSTGRES_PASSWORD: postgres
# match PGUSER for elixir image above # # match PGUSER for elixir image above
POSTGRES_USER: postgres # POSTGRES_USER: postgres
working_directory: ~/app # working_directory: ~/app
steps: # steps:
- attach_workspace: # - attach_workspace:
at: . # at: .
- run: # - run:
command: ./bin/install_chrome_headless.sh # command: ./bin/install_chrome_headless.sh
no_output_timeout: 2400 # no_output_timeout: 2400
- run: mix local.hex --force # - run: mix local.hex --force
- run: mix local.rebar --force # - run: mix local.rebar --force
- run: # - run:
name: Wait for DB # name: Wait for DB
command: dockerize -wait tcp://localhost:5432 -timeout 1m # command: dockerize -wait tcp://localhost:5432 -timeout 1m
- run: # - run:
name: mix test --exclude no_geth # name: mix test --exclude no_geth
command: | # command: |
# Don't submit coverage report for forks, but let the build succeed # # Don't submit coverage report for forks, but let the build succeed
if [[ -z "$COVERALLS_REPO_TOKEN" ]]; then # if [[ -z "$COVERALLS_REPO_TOKEN" ]]; then
mix coveralls.html --exclude no_geth --parallel --umbrella # mix coveralls.html --exclude no_geth --parallel --umbrella
else # else
mix coveralls.circle --exclude no_geth --parallel --umbrella || # mix coveralls.circle --exclude no_geth --parallel --umbrella ||
# if mix failed, then coveralls_merge won't run, so signal done here and return original exit status # # if mix failed, then coveralls_merge won't run, so signal done here and return original exit status
(retval=$? && curl -k https://coveralls.io/webhook?repo_token=$COVERALLS_REPO_TOKEN -d "payload[build_num]=$CIRCLE_WORKFLOW_WORKSPACE_ID&payload[status]=done" && return $retval) # (retval=$? && curl -k https://coveralls.io/webhook?repo_token=$COVERALLS_REPO_TOKEN -d "payload[build_num]=$CIRCLE_WORKFLOW_WORKSPACE_ID&payload[status]=done" && return $retval)
fi # fi
- store_artifacts: # - store_artifacts:
path: cover/excoveralls.html # path: cover/excoveralls.html
- store_test_results: # - store_test_results:
path: _build/test/junit # path: _build/test/junit
test_geth_mox: # test_geth_mox:
docker: # docker:
# Ensure .tool-versions matches # # Ensure .tool-versions matches
- image: circleci/elixir:1.9.1-node-browsers # - image: circleci/elixir:1.9.1-node-browsers
environment: # environment:
MIX_ENV: test # MIX_ENV: test
# match POSTGRES_PASSWORD for postgres image below # # match POSTGRES_PASSWORD for postgres image below
PGPASSWORD: postgres # PGPASSWORD: postgres
# match POSTGRES_USER for postgres image below # # match POSTGRES_USER for postgres image below
PGUSER: postgres # PGUSER: postgres
ETHEREUM_JSONRPC_CASE: "EthereumJSONRPC.Case.Geth.Mox" # ETHEREUM_JSONRPC_CASE: "EthereumJSONRPC.Case.Geth.Mox"
ETHEREUM_JSONRPC_WEB_SOCKET_CASE: "EthereumJSONRPC.WebSocket.Case.Mox" # ETHEREUM_JSONRPC_WEB_SOCKET_CASE: "EthereumJSONRPC.WebSocket.Case.Mox"
- image: circleci/postgres:10.3-alpine # - image: circleci/postgres:10.3-alpine
environment: # environment:
# Match apps/explorer/config/test.exs config :explorer, Explorer.Repo, database # # Match apps/explorer/config/test.exs config :explorer, Explorer.Repo, database
POSTGRES_DB: explorer_test # POSTGRES_DB: explorer_test
# match PGPASSWORD for elixir image above # # match PGPASSWORD for elixir image above
POSTGRES_PASSWORD: postgres # POSTGRES_PASSWORD: postgres
# match PGUSER for elixir image above # # match PGUSER for elixir image above
POSTGRES_USER: postgres # POSTGRES_USER: postgres
working_directory: ~/app # working_directory: ~/app
steps: # steps:
- attach_workspace: # - attach_workspace:
at: . # at: .
- run: # - run:
command: ./bin/install_chrome_headless.sh # command: ./bin/install_chrome_headless.sh
no_output_timeout: 2400 # no_output_timeout: 2400
- run: mix local.hex --force # - run: mix local.hex --force
- run: mix local.rebar --force # - run: mix local.rebar --force
- run: # - run:
name: Wait for DB # name: Wait for DB
command: dockerize -wait tcp://localhost:5432 -timeout 1m # command: dockerize -wait tcp://localhost:5432 -timeout 1m
- run: # - run:
name: mix test --exclude no_geth # name: mix test --exclude no_geth
command: | # command: |
# Don't submit coverage report for forks, but let the build succeed # # Don't submit coverage report for forks, but let the build succeed
if [[ -z "$COVERALLS_REPO_TOKEN" ]]; then # if [[ -z "$COVERALLS_REPO_TOKEN" ]]; then
mix coveralls.html --exclude no_geth --parallel --umbrella # mix coveralls.html --exclude no_geth --parallel --umbrella
else # else
mix coveralls.circle --exclude no_geth --parallel --umbrella || # mix coveralls.circle --exclude no_geth --parallel --umbrella ||
# if mix failed, then coveralls_merge won't run, so signal done here and return original exit status # # if mix failed, then coveralls_merge won't run, so signal done here and return original exit status
(retval=$? && curl -k https://coveralls.io/webhook?repo_token=$COVERALLS_REPO_TOKEN -d "payload[build_num]=$CIRCLE_WORKFLOW_WORKSPACE_ID&payload[status]=done" && return $retval) # (retval=$? && curl -k https://coveralls.io/webhook?repo_token=$COVERALLS_REPO_TOKEN -d "payload[build_num]=$CIRCLE_WORKFLOW_WORKSPACE_ID&payload[status]=done" && return $retval)
fi # fi
- store_artifacts: # - store_artifacts:
path: cover/excoveralls.html # path: cover/excoveralls.html
- store_test_results: # - store_test_results:
path: _build/test/junit # path: _build/test/junit
test_parity_http_websocket: test_parity_http_websocket:
docker: docker:
# Ensure .tool-versions matches # Ensure .tool-versions matches
@ -573,8 +573,8 @@ workflows:
requires: requires:
- test_parity_http_websocket - test_parity_http_websocket
- test_parity_mox - test_parity_mox
- test_geth_http_websocket # - test_geth_http_websocket
- test_geth_mox # - test_geth_mox
- credo: - credo:
requires: requires:
- build - build
@ -593,8 +593,8 @@ workflows:
- sobelow - sobelow
- test_parity_http_websocket - test_parity_http_websocket
- test_parity_mox - test_parity_mox
- test_geth_http_websocket # - test_geth_http_websocket
- test_geth_mox # - test_geth_mox
- dialyzer: - dialyzer:
requires: requires:
- build - build
@ -619,9 +619,9 @@ workflows:
- test_parity_mox: - test_parity_mox:
requires: requires:
- build - build
- test_geth_http_websocket: # - test_geth_http_websocket:
requires: # requires:
- build # - build
- test_geth_mox: # - test_geth_mox:
requires: # requires:
- build # - build

2
CHANGELOG.md
Unescape View File

@ -53,9 +53,11 @@ fixed menu hovers in dark mode desktop view
- [#2738](https://github.com/poanetwork/blockscout/pull/2738) - do not fail block `internal_transactions_indexed_at` field update - [#2738](https://github.com/poanetwork/blockscout/pull/2738) - do not fail block `internal_transactions_indexed_at` field update
### Chore ### Chore
- [#2789](https://github.com/poanetwork/blockscout/pull/2786) - remove projects table in readme, link to docs version
- [#2786](https://github.com/poanetwork/blockscout/pull/2786) - updated docs links, removed docs folder - [#2786](https://github.com/poanetwork/blockscout/pull/2786) - updated docs links, removed docs folder
- [#2752](https://github.com/poanetwork/blockscout/pull/2752) - allow enabling internal transactions for simple token transfers txs - [#2752](https://github.com/poanetwork/blockscout/pull/2752) - allow enabling internal transactions for simple token transfers txs
- [#2749](https://github.com/poanetwork/blockscout/pull/2749) - fix opt 22.1 support - [#2749](https://github.com/poanetwork/blockscout/pull/2749) - fix opt 22.1 support
- [#2744](https://github.com/poanetwork/blockscout/pull/2744) - Disable Geth tests in CI
- [#2724](https://github.com/poanetwork/blockscout/pull/2724) - fix ci by commenting a line in hackney library - [#2724](https://github.com/poanetwork/blockscout/pull/2724) - fix ci by commenting a line in hackney library
- [#2708](https://github.com/poanetwork/blockscout/pull/2708) - add log index to logs view - [#2708](https://github.com/poanetwork/blockscout/pull/2708) - add log index to logs view
- [#2723](https://github.com/poanetwork/blockscout/pull/2723) - get rid of ex_json_schema warnings - [#2723](https://github.com/poanetwork/blockscout/pull/2723) - get rid of ex_json_schema warnings

23
README.md
Unescape View File

@ -28,24 +28,11 @@ Currently available full-featured block explorers (Etherscan, Etherchain, Blockc
## Supported Projects ## Supported Projects
| **Hosted Mainnets** | **Hosted Testnets** | **Additional Chains using BlockScout** | **Additional Chains using BlockScout** | BlockScout supports a growing number of projects. Hosted instances include POA Network, xDai Chain, Ethereum Classic, Ethereum Mainnet and most Testnets.
|--------------------------------------------------------|-------------------------------------------------------|------------------------------------------------------|----------------------------------------------------------------|
| [Callisto](https://blockscout.com/callisto/mainnet) | [Goerli Testnet](https://blockscout.com/eth/goerli) | [ARTIS](https://explorer.sigma1.artis.network) | [Celo Testnet](https://alfajores-blockscout.celo-testnet.org/) | - [List of hosted mainnets, testnets, and additional chains using BlockScout](https://docs.blockscout.com/for-projects/supported-projects)
| [Ethereum Classic](https://blockscout.com/etc/mainnet) | [Kovan Testnet](https://blockscout.com/eth/kovan) | [Ether-1](https://blocks.ether1.wattpool.net/) | [Matic Testnet](https://explorer.testnet2.matic.network/) | - [Hosted instance versions](https://docs.blockscout.com/for-projects/supported-projects/hosted-instance-versions)
| [Ethereum Mainnet](https://blockscout.com/eth/mainnet) | [LUKSO L14 Testnet](https://blockscout.com/lukso/l14) | [Kotti Testnet](https://kottiexplorer.ethernode.io/) | [Mordor Testnet](https://mordorexplorer.ethernode.io/) |
| [POA Core Network](https://blockscout.com/poa/core)| [POA Sokol Testnet](https://blockscout.com/poa/sokol) | [Fuse Network](https://explorer.fuse.io/) | [Athereum Testnet](http://athexplorer.ava.network/) |
| [RSK](https://blockscout.com/rsk/mainnet) | [Rinkeby Testnet](https://blockscout.com/eth/rinkeby) | [Oasis Labs](https://blockexplorer.oasiscloud.io/) | |
| [xDai Chain](https://blockscout.com/poa/dai) | [Ropsten Testnet](https://blockscout.com/eth/ropsten) | [Petrichor](https://explorer.petrachor.com/) | |
| | | [PIRL](http://pirl.es/) | |
| | | [SafeChain](https://explorer.safechain.io) | |
| | | [SpringChain](https://explorer.springrole.com/) | |
| | | [Tenda](https://tenda.network) | |
| | | [Loom](http://plasma-blockexplorer.dappchains.com/) | |
| | | [GoJoy Chain](https://gojoychain.com/) | |
| | | [Xerom](https://blocks.xerom.org/) | |
Current BlockScout versions for hosted projects are available [on the forum](https://forum.poa.network/t/deployed-instances-on-blockscout-com/1938).
## Getting Started ## Getting Started

Write Preview
Loading…
Cancel
Save