Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
ericlee42 committed Feb 12, 2024
1 parent d7e8171 commit b7ad189
Show file tree
Hide file tree
Showing 8 changed files with 102 additions and 26 deletions.
55 changes: 55 additions & 0 deletions .github/workflows/metis-docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: metis-docker
on:
workflow_dispatch:
push:
branches:
- metis

env:
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}

jobs:
docker_build_push:
runs-on: ubuntu-latest
steps:
- name: checkout repo
uses: actions/checkout@v4

- name: Login to Github Registry
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Set up QEMU
uses: docker/setup-qemu-action@v3

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Docker meta
id: docker-meta
uses: docker/metadata-action@v5
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
tags: |
type=sha,enable=true,prefix=,suffix=,format=short
- name: Build and push
id: docker-build-push
uses: docker/build-push-action@v5
with:
file: docker/Dockerfile
push: true
tags: ${{ steps.docker-meta.outputs.tags }}
cache-from: type=gha
cache-to: type=gha,mode=max
platforms: linux/amd64
build-args: |
RELEASE_VERSION=5.3.3
BLOCKSCOUT_VERSION=v5.3.3-beta
DISABLE_READ_API=false
DISABLE_WEBAPP=false
DISABLE_WRITE_API=false
2 changes: 1 addition & 1 deletion apps/block_scout_web/assets/js/lib/csv_download.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const DATE_FORMAT = 'YYYY-MM-DD'
const $button = $('#export-csv-button')

// eslint-disable-next-line
const _instance1 = generateDatePicker('.js-datepicker-from', moment().add(-1, 'months').toDate())
const _instance1 = generateDatePicker('.js-datepicker-from', moment().add(-7, 'days').toDate())
// eslint-disable-next-line
const _instance2 = generateDatePicker('.js-datepicker-to', new Date())

Expand Down
41 changes: 41 additions & 0 deletions apps/block_scout_web/assets/static/images/metis_logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ defmodule BlockScoutWeb.API.RPC.LogsController do
render(conn, :error, error: "Invalid #{param} format")

{:error, :not_found} ->
render(conn, :error, error: "No logs found", data: [])
render(conn, :error, error: "No records found", data: [])
end
end

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@ defmodule BlockScoutWeb.API.RPC.LogsControllerTest do

assert response["result"] == []
assert response["status"] == "0"
assert response["message"] == "No logs found"
assert response["message"] == "No records found"
assert :ok = ExJsonSchema.Validator.validate(getlogs_schema(), response)
end

Expand Down
2 changes: 1 addition & 1 deletion apps/explorer/lib/explorer/chain/csv_export/helper.ex
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ defmodule Explorer.Chain.CSVExport.Helper do
where: 3
]

@limit 10_000
@limit 1_000
@page_size 150
@default_paging_options %PagingOptions{page_size: @page_size}

Expand Down
22 changes: 0 additions & 22 deletions config/config.exs
Original file line number Diff line number Diff line change
Expand Up @@ -17,28 +17,6 @@ config :logger,
backends: [
# all applications and all levels
:console,
# all applications, but only errors
{LoggerFileBackend, :error},
# only :ecto, but all levels
{LoggerFileBackend, :ecto},
# only :block_scout_web, but all levels
{LoggerFileBackend, :block_scout_web},
# only :ethereum_jsonrpc, but all levels
{LoggerFileBackend, :ethereum_jsonrpc},
# only :explorer, but all levels
{LoggerFileBackend, :explorer},
# only :indexer, but all levels
{LoggerFileBackend, :indexer},
{LoggerFileBackend, :indexer_token_balances},
{LoggerFileBackend, :token_instances},
{LoggerFileBackend, :reading_token_functions},
{LoggerFileBackend, :pending_transactions_to_refetch},
{LoggerFileBackend, :empty_blocks_to_refetch},
{LoggerFileBackend, :withdrawal},
{LoggerFileBackend, :api},
{LoggerFileBackend, :block_import_timings},
{LoggerFileBackend, :account},
{LoggerFileBackend, :api_v2},
LoggerJSON
]

Expand Down
2 changes: 2 additions & 0 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -81,3 +81,5 @@ COPY --from=builder /opt/release/blockscout .
COPY --from=builder /app/apps/explorer/node_modules ./node_modules
COPY --from=builder /app/config/config_helper.exs ./config/config_helper.exs
COPY --from=builder /app/config/config_helper.exs /app/releases/${RELEASE_VERSION}/config_helper.exs
ADD https://truststore.pki.rds.amazonaws.com/global/global-bundle.pem .

0 comments on commit b7ad189

Please sign in to comment.