diff --git a/.env b/.env index 56e4038..984c158 100644 --- a/.env +++ b/.env @@ -60,6 +60,7 @@ BLOCKSCOUT_VERSION=v5.1.5-kava INDEXER_CATCHUP_BLOCKS_BATCH_SIZE=1 INDEXER_CATCHUP_BLOCKS_CONCURRENCY=1 INDEXER_INTERNAL_TRANSACTIONS_CONCURRENCY=1 +INDEXER_INTERNAL_TRANSACTIONS_BATCH_SIZE=1 INDEXER_DISABLE_INTERNAL_TRANSACTIONS_FETCHER=false INDEXER_BLOCK_REWARD_CONCURRENCY=1 INDEXER_RECEIPTS_CONCURRENCY=1 diff --git a/DEVELOPMENT.md b/DEVELOPMENT.md index 9937842..af00095 100644 --- a/DEVELOPMENT.md +++ b/DEVELOPMENT.md @@ -202,8 +202,19 @@ cd /apps/indexer mix deps.get # compile sources for just this app mix compile + +# run the entire blockscout system +mix run + +# run just a specific app +mix run indexer ``` + +Note that you should only run the above commands in the docker container, running them on your host may lead to conflicts in library binaries being different when installed on the host machine and the docker linux environment (if such an issue does occur, blowing away the `/_build` and `deps` in `blockscout-base/` should resolve such conflicts) + +Since all dependencies and compiled artifacts are saved to the host, restarting the dev container and re-attaching vs code to it will not require re-fetching deps (unless the dependency list has changed) or re-compiling (unless the source code has changed from the last time it was compiled) + #### Indexer status To see how far back the block explorer has indexed blocks, connect to the database and query to see what is the earliest block it has indexed, if these values change that means earlier and earlier blocks are being indexed (`refetch_needed` indicates whether the indexing was successful) @@ -288,7 +299,7 @@ count 1808591 ``` -Query for blockscout database state for a given transaction (removing the `0x` prefix from the transaciton of interest) +Query for blockscout database state for a given transaction (removing the `0x` prefix from the transaction of interest) ```sql select * from transactions where hash = decode('080a9c8c6bde6320dac69dd8639172aca893d357904f7a1ad37debf17bfec79f','hex'); diff --git a/Makefile b/Makefile index f388b41..3d7eea4 100644 --- a/Makefile +++ b/Makefile @@ -26,6 +26,7 @@ local: cd blockscout && \ docker build ./ -f local.Dockerfile -t ${IMAGE_NAME}:${LOCAL_IMAGE_TAG} --build-arg BLOCKSCOUT_VERSION=${BLOCKSCOUT_DOCKER_VERSION} + .PHONY: build-db-exporter # build the exporter image build-db-exporter: @@ -82,6 +83,7 @@ restart-postgres: .PHONY: reset # wipe state and restart the service and all it's dependencies reset: + rm -rf postgres-data && \ docker compose up -d --build --remove-orphans --renew-anon-volumes --force-recreate # wipe just the database state and restart just the database diff --git a/blockscout/patches/0004-loosen-internal-tx-call-validation-constraints.patch b/blockscout/patches/0004-loosen-internal-tx-call-validation-constraints.patch new file mode 100644 index 0000000..dce64b5 --- /dev/null +++ b/blockscout/patches/0004-loosen-internal-tx-call-validation-constraints.patch @@ -0,0 +1,31 @@ +diff --git a/apps/explorer/lib/explorer/chain/internal_transaction.ex b/apps/explorer/lib/explorer/chain/internal_transaction.ex +index c86bfa699f..1b2d0cbac6 100644 +--- a/apps/explorer/lib/explorer/chain/internal_transaction.ex ++++ b/apps/explorer/lib/explorer/chain/internal_transaction.ex +@@ -3,6 +3,8 @@ defmodule Explorer.Chain.InternalTransaction do + + use Explorer.Schema + ++ require Logger ++ + alias Explorer.Chain.{Address, Block, Data, Gas, Hash, PendingBlockOperation, Transaction, Wei} + alias Explorer.Chain.InternalTransaction.{Action, CallType, Result, Type} + +@@ -502,7 +504,16 @@ defmodule Explorer.Chain.InternalTransaction do + # Validates that :call `type` changeset either has an `error` or both `gas_used` and `output` + defp validate_call_error_or_result(changeset) do + case get_field(changeset, :error) do +- nil -> validate_required(changeset, [:gas_used, :output], message: "can't be blank for successful call") ++ nil -> ++ if get_field(changeset, :gas_used) == nil && get_field(changeset, :output) == nil do ++ changeset |> ++ IO.inspect() |> ++ Ecto.Changeset.change( ++ error: "execution reverted" ++ ) ++ else ++ validate_required(changeset, [:gas_used, :output], message: "can't be blank for successful call") ++ end + _ -> validate_disallowed(changeset, [:output], message: "can't be present for failed call") + end + end