chore: sync xrplevm with upstream master + fix token_balance compile error#3
Open
JordiParraCrespo wants to merge 760 commits into
Open
chore: sync xrplevm with upstream master + fix token_balance compile error#3JordiParraCrespo wants to merge 760 commits into
JordiParraCrespo wants to merge 760 commits into
Conversation
Co-authored-by: Victor Baranov <baranov.viktor.27@gmail.com>
…ut#13669) Co-authored-by: Victor Baranov <baranov.viktor.27@gmail.com>
Co-authored-by: Victor Baranov <baranov.viktor.27@gmail.com>
Co-authored-by: Victor Baranov <baranov.viktor.27@gmail.com>
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Maksym Zub <kroistsmeh@gmail.com>
…#14129) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…14102) Co-authored-by: glencorse033 <glencorse033@users.noreply.github.com> Co-authored-by: Maxim Filonov <53992153+sl1depengwyn@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
blockscout#14131) Co-authored-by: glencorse033 <glencorse033@users.noreply.github.com> Co-authored-by: Victor Baranov <baranov.viktor.27@gmail.com>
Co-authored-by: Victor Baranov <baranov.viktor.27@gmail.com>
The upstream-master merge re-introduced public format_and_filter_address_params/1 and format_and_filter_token_balance_params/1 in token_balance/helper.ex, which collided with the fork's private defp versions (and an orphaned @timeout), breaking compilation on Elixir 1.19.4. After upstream blockscout#13923 moved the import logic into Current/Historical (each with its own import_token_balances/1 calling the public Helper.format_and_filter_*), Helper.import_token_balances/1 and its private helpers became dead code. Remove them so the module compiles. Note: this drops the native-XRP (0xeeee...) coin-balance-via-token-balances optimization, which the blockscout#13923 refactor had already orphaned. Re-port into Current/Historical import_token_balances/1 if still desired.
The Block schema only compiles in blob_gas_used/excess_blob_gas when built with CHAIN_TYPE=ethereum, while runtime reads CHAIN_TYPE from common-blockscout.env. Building without the arg produced a schema mismatch that made the blocks on_conflict upsert fail (cannot update non-updatable field :blob_gas_used) and silently halted block indexing. Pass CHAIN_TYPE (default ethereum) as a build arg wherever the backend image is built (docker-compose.yml backend + nft_media_handler, no-services.yml).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
14 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Syncs the backend
xrplevmfork with upstream Blockscoutmaster(the localMerge branch 'master' ... into xrplevmthat was not yet onorigin/xrplevm) and fixes a compile error that merge introduced.Compile fix
The upstream-master merge re-introduced public
format_and_filter_address_params/1andformat_and_filter_token_balance_params/1inapps/indexer/lib/indexer/fetcher/token_balance/helper.ex, colliding with the fork's privatedefpversions and leaving an orphaned@timeoutreference. This fails to compile on the Dockerfile's Elixir 1.19.4:Upstream blockscout#13923 ("Move current token balances into a separate fetcher") moved the import logic into
Current/Historical, each with its ownimport_token_balances/1calling the publicHelper.format_and_filter_*. That leftHelper.import_token_balances/1and its private helpers as dead code. This PR removes that dead block so the module compiles.0xeeee…) coin-balance-via-token-balances optimization, which the blockscout#13923 refactor had already orphaned (it was unreachable/non-functional). If still desired, it should be re-ported into theCurrent/Historicalimport_token_balances/1flow.Verification
docker-compose/docker-compose.local-build.yml(Elixir 1.19.4,RELEASE_VERSION 10.0.6).CHAIN_ID 1449000); serves the v2 API on:4000(verified end-to-end with the blockscout-frontendchain/xrplevmbuild).