Skip to content

Sync upstream v11.0.3 (merge conflicts)#69

Open
JOY (JOY) wants to merge 10 commits into
mainfrom
sync-upstream-v11.0.3
Open

Sync upstream v11.0.3 (merge conflicts)#69
JOY (JOY) wants to merge 10 commits into
mainfrom
sync-upstream-v11.0.3

Conversation

@JOY
Copy link
Copy Markdown

Upstream Sync - v11.0.3

Auto-merge with upstream v11.0.3 failed. Version/workflow conflicts were auto-resolved,
but the following files have code conflicts that need manual resolution:

apps/indexer/test/indexer/fetcher/internal_transaction_test.exs

To resolve:

  1. Check out this branch locally
  2. Resolve remaining conflicts
  3. Push and merge this PR
  4. Then create tag v11.0.3 to trigger Docker build

Upstream release notes

@chatgpt-codex-connector
Copy link
Copy Markdown

You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard.

Copy link
Copy Markdown

@gemini-code-assist gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request updates the project to version 11.0.3 and introduces a priority system for pending block and transaction operations to optimize internal transaction fetching. It includes logic to force contract creator searches when internal transactions are disabled and enhances database migrations with foreign key existence checks and improved table locking. Significant feedback was provided regarding critical issues: unresolved merge conflict markers were found in the test files, a potential SQL injection vulnerability exists in the database migrator due to string interpolation, and the switch to unsupervised tasks in the contract creator fetcher should be reverted to maintain system reliability.

end
end

<<<<<<< HEAD
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

critical

This file contains unresolved merge conflict markers (<<<<<<< HEAD). These must be resolved before the pull request can be merged.

Comment on lines +167 to +173
Repo.query("""
SELECT EXISTS (
SELECT 1
FROM pg_constraint
WHERE conname = '#{foreign_key_name}'
);
""")
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

security-high high

The SQL query uses string interpolation for the foreign_key_name variable. This is a security risk as it could allow SQL injection if the input is not properly sanitized. Even if the current callers use hardcoded strings, it is a best practice to use parameterized queries to prevent future vulnerabilities.

      Repo.query(
        """
        SELECT EXISTS (
          SELECT 1
          FROM pg_constraint
          WHERE conname = $1
        );
        """,
        [foreign_key_name]
      )

:ets.insert(@table_name, {address_cache_name(address_hash), :in_progress})

Task.Supervisor.start_child(Indexer.TaskSupervisor, fn ->
Task.start(fn ->
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

The code was changed from using Task.Supervisor.start_child/2 to Task.start/1. This means the background task is no longer supervised by Indexer.TaskSupervisor. Unsupervised tasks are harder to monitor and won't be automatically restarted or cleaned up properly if the supervision tree is affected. It is recommended to keep using the supervisor for better reliability.

    Task.Supervisor.start_child(Indexer.TaskSupervisor, fn ->

@JOY JOY (JOY) force-pushed the sync-upstream-v11.0.3 branch from 3cb83ad to 05c7439 Compare May 21, 2026 16:34
@JOY JOY (JOY) force-pushed the sync-upstream-v11.0.3 branch from 05c7439 to 7d78f8e Compare May 21, 2026 21:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants