Move EVM event routing, decoding, and query construction to Rust

[DZakh]

Summary

Moves the EVM fetch pipeline's per-log work — routing, decoding, and query construction — from ReScript into the Rust napi clients (EvmHypersyncClient, EvmRpcClient). The clients receive the chain's full registrations once at construction; each query then crosses the boundary as just {block range, registration indexes, addressesByContractName}, and comes back as final items carrying onEventRegistrationIndex.

Key Changes

Registrations as data across the boundary

• Internal.onEventRegistration gains index: int — its position in the chain's onEventRegistrations array, assigned when registration finishes.
• The full per-(event, chain) registration (OnEventRegistration in Rust, mirroring the ReScript name) is passed to the clients at construction: decode metadata (sighash/topicCount/params), routing identity (index/contractName/isWildcard), and fetch state (resolvedWhere topic selections with the contract-addresses marker as Option, selected block/transaction field lists).

Rust owns routing + decoding (decode.rs)

• DecoderCore builds a router per (topic0, topicCount) key: variant_idx_by_contract_name + wildcard_variant_idx, with duplicate/wildcard-collision validation at construction mirroring the JS-side registration checks.
• Each log routes via the partition's address → contract-name index (contract's own variant wins, wildcard fallback), decodes with only the routed variant's param names, and returns flat params + the registration index. Unrouted logs are dropped before the boundary.
• The RPC client normalizes log addresses (lowercase/checksum per config) so they match the routing index and the JS Address.t directly.

Rust owns query construction (new selection.rs, shared by both clients)

• Log selections: address-free pooling with topic0 compression, per-contract address scoping (one contract's query can't fetch a sibling's logs), wildcard-by-address marker expansion into padded address topics — in registration order so query bytes stay stable for HyperSync query caching.
• HyperSync field selection: union over the selection's registrations with the transactionIndex exclusion, plus the forced required fields.
• The routing index is derived internally from addressesByContractName, so routing and query building can never disagree on address casing.
• Both clients expose buildLogSelections for tests and debugging.

Items carry an index, not the registration object

• Internal.item's Event variant carries onEventRegistrationIndex instead of the registration, so Rust-built items are final and fully serializable. Consumers resolve through the chain's registrations array — stored on ChainState.t and mirrored in a per-chain registry in Internal (getItemOnEventRegistration) for consumers without a chain state at hand (ecosystem toRawEvent/toEventLogger, FetchState's address filter, ChainFetching, EventProcessing, batch materialization).
• Simulate appends its synthetic registrations into the run's registrationsByChainId chain arrays (the same arrays chain-state startup installs), keeping item indexes valid across startup.

Deleted from ReScript

• The EVM half of EventRouter (getEvmEventId, fromEvmEventModsOrThrow), both sources' getSelectionConfig machinery (bucketing, materialization, WeakMap memoization), HyperSync.makeRequestBody, LogSelection's query-building half, and Rpc.GetLogs' topic-query types. What remains JS-side is what genuinely can't move: parseWhereOrThrow (runs user callbacks), FetchState's partition/address bookkeeping, and handler dispatch.

Bug fix: indexed dynamic-type event filters

• Tuple/array where values were passed through raw (latent — they only crossed napi at query time and never in tests; passing registrations at construction surfaced it as a startup failure). They're now encoded as keccak256 of their ABI encoding, matching what the chain stores in the topic, with a directly-passed tuple tried as one value before falling back to an OR-list interpretation.

Behavior notes

• A non-wildcard event whose params failed to decode previously raised a fatal "parsed as undefined" error in HyperSyncSource; that state is now unrepresentable (routing success implies a decode attempt, and genuine decode errors still propagate).
• Unrouted RPC logs no longer contribute opportunistic (blockNumber, blockHash) pairs to reorg detection; boundary blocks are still recorded.
• Mock registrations in tests need hex-decodable sighashes since the clients validate them at construction.

Tests

• Rust: 416 unit tests including new coverage for the selection builder (ownership scoping, wildcard pooling, marker expansion, field-selection union/exclusion, selection subsetting) and the router (duplicate/collision, per-variant naming).
• ReScript: full test_codegen suite green (706 passed / 0 failed — including 3 createTestIndexer tests that the filter-encoding fix repaired), plus fuel/svm scenarios and live HyperSync integration suites. JS selection-shape tests were rewritten against the real buildLogSelections napi path rather than deleted.

🤖 Generated with Claude Code

https://claude.ai/code/session_0145w9f63kqQmFf7mWMDWmQc

---

Generated by Claude Code

Summary by CodeRabbit

• New Features
  • Added registration-based event filtering and routing for EVM RPC and HyperSync sources.
  • Added support for selecting and decoding events by registration index and contract address.
  • Added indexed topic encoding for complex ABI values, including arrays and tuples.
  • Added APIs to build log selections for selected registrations and addresses.
• Bug Fixes
  • Improved handling of identical event signatures across different contracts.
  • Unmatched logs are now excluded instead of returning incomplete decoded data.
• Refactor
  • Event results now consistently include the matched registration index and decoded parameters.

[coderabbitai]

📝 Walkthrough

Walkthrough

This change replaces EVM event-parameter inputs with indexed event registrations, adds native indexed-topic encoding, derives RPC and HyperSync selections from registrations, and routes decoded logs to registration indexes with non-optional parameters.

Changes

EVM event routing and fetching

Layer / File(s)	Summary
Registration contracts and decoder routing packages/cli/src/evm_hypersync_source/decode.rs, packages/cli/src/evm_hypersync_source/types.rs, packages/envio/src/ChainState.res, packages/envio/src/Internal.res	Registrations now carry indexes and fetch metadata; decoder variants route by contract or wildcard and return the matched registration index with decoded parameters.
Topic selection and indexed ABI encoding packages/cli/src/evm_hypersync_source/selection.rs, packages/cli/src/evm/topic_filter.rs, packages/envio/src/EventConfigBuilder.res	Selections are expanded from registrations, contract addresses become topic filters, and indexed scalar, tuple, array, and nested values are encoded into event topics.
Rust RPC and HyperSync clients packages/cli/src/evm_hypersync_source/*, packages/cli/src/evm_rpc_source/mod.rs, packages/envio/src/sources/HyperSyncClient.res	Client construction, pagination, log fetching, query shapes, and event item outputs now use registration indexes and address-to-contract mappings.
EVM source integration packages/envio/src/sources/EvmChain.res, packages/envio/src/sources/HyperSyncSource.res, packages/envio/src/sources/RpcSource.res, packages/envio/src/sources/EvmRpcClient.res	Sources pass registrations into native clients and map returned routed items directly to chain-owned registrations and decoded parameters.
Runtime registration ownership packages/envio/src/HandlerRegister.res, packages/envio/src/SimulateItems.res, scenarios/test_codegen/test/helpers/MockIndexer.res	Chain, simulated, and mocked events share indexed registration objects through construction and dispatch.
Validation and regression coverage scenarios/test_codegen/test/*, scenarios/fuel_test/*	Tests cover selection expansion, registration routing, indexed topic encoding, source behavior, and updated client contracts.

Estimated code review effort: 5 (Critical) | ~120 minutes

Possibly related PRs

• enviodev/hyperindex#1349: Related address-to-contract ownership mapping and routing changes.
• enviodev/hyperindex#1360: Related Rust decoder and RPC integration changes.
• enviodev/hyperindex#1372: Related per-contract RPC log filtering changes.

🚥 Pre-merge checks | ✅ 5

✅ Passed checks (5 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	Title clearly summarizes the main Rust migration of EVM routing, decoding, and query construction.
Docstring Coverage	✅ Passed	No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check	✅ Passed	Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check	✅ Passed	Check skipped because no linked issues were found for this pull request.

✨ Finishing Touches

📝 Generate docstrings

• Create stacked PR
• Commit on current branch

---

_{Comment @coderabbitai help to get the list of available commands.}

[coderabbitai]

Actionable comments posted: 8

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)

packages/envio/src/sources/SvmHyperSyncSource.res (1)

288-289: 📐 Maintainability & Code Quality | 🟡 Minor | ⚡ Quick win

Update the stale routing comment.

Line 289 still says registrations become each item's onEventRegistration; emitted items now carry only onEventRegistrationIndex.

As per coding guidelines, comments describing the old shape must be dropped or rewritten during refactoring.

Also applies to: 524-524

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@packages/envio/src/sources/SvmHyperSyncSource.res` around lines 288 - 289,
Update the routing comments near the definitions/registrations logic and the
corresponding later occurrence to describe that emitted items carry
onEventRegistrationIndex, not the full onEventRegistration object; remove any
stale references to registrations being attached directly to decoded items.

Source: Coding guidelines

🧹 Nitpick comments (8)

scenarios/fuel_test/src/Indexer.res (1)

70-70: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick win

Remove the redundant generated doc comment.

onInstructionOptions already communicates this; fix the generator template so the comment does not propagate.

As per coding guidelines, comments must not restate what the code already says.

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@scenarios/fuel_test/src/Indexer.res` at line 70, Remove the redundant
generated comment preceding onInstructionOptions in the generator template,
ensuring generated Indexer.res files no longer emit it while retaining the
onInstructionOptions declaration and its meaningful documentation.

Source: Coding guidelines

scenarios/test_codegen/test/lib_tests/FetchState_test.res (1)

82-85: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick win

Add the required explicit Utils.magic type annotation.

Proposed fix

 onEventRegistrationIndex: Internal.addOnEventRegistration(
   ~chainId,
-  Utils.magic("Mock onEventRegistration in fetchstate test"),
+  "Mock onEventRegistration in fetchstate test"->(
+    Utils.magic: string => Internal.onEventRegistration
+  ),
 ),

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@scenarios/test_codegen/test/lib_tests/FetchState_test.res` around lines 82 -
85, Add the required explicit type annotation to the Utils.magic call passed as
the onEventRegistration argument in Internal.addOnEventRegistration, using the
expected on-event registration callback type.

Source: Coding guidelines

scenarios/test_codegen/test/HyperSyncSource_test.res (2)

10-11: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick win

Remove this helper-description comment.

The helper name and signature already describe the behavior.

As per coding guidelines, **/*.res comments must not restate what a function does.

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@scenarios/test_codegen/test/HyperSyncSource_test.res` around lines 10 - 11,
Remove the helper-description comment above buildLogSelections in
HyperSyncSource_test.res; the function name and signature already document its
behavior, and comments in .res files must not restate function functionality.

Source: Coding guidelines

---

31-51: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick win

Assert the three address-map cases as one value.

Combine the three buildLogSelections results into a tuple/record and make one t.expect(...).toEqual(...) assertion.

As per coding guidelines, **/*_test.res files must “use single assert to check the whole value instead of multiple asserts.”

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@scenarios/test_codegen/test/HyperSyncSource_test.res` around lines 31 - 51,
Combine the three buildLogSelections calls in the test into a single tuple or
record value, then use one t.expect(...).toEqual(...) assertion with the
corresponding expected tuple or record. Preserve the existing inputs and
expected results while removing the three separate assertions.

Source: Coding guidelines

scenarios/test_codegen/test/lib_tests/SameSignatureEventDecode_test.res (1)

61-64: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick win

Remove the routing-path narration.

The test name and whole-value assertion already show this behavior; this comment restates the implementation path rather than a non-obvious constraint.

As per coding guidelines, **/*.res files should default to no comments and must not narrate the refactor itself.

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@scenarios/test_codegen/test/lib_tests/SameSignatureEventDecode_test.res`
around lines 61 - 64, Remove the implementation-focused comment above the test
in SameSignatureEventDecode_test.res; the test name and assertions already
document the expected behavior, and .res files should avoid explanatory
narration.

Source: Coding guidelines

scenarios/test_codegen/test/helpers/NativeDecoder.res (1)

5-8: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick win

Remove the function-description comment.

It restates what decodeLogs does and what it returns; the signature and call site already communicate that.

As per coding guidelines, **/*.res comments must not restate what a function does.

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@scenarios/test_codegen/test/helpers/NativeDecoder.res` around lines 5 - 8,
Remove the multi-line function-description comment immediately preceding
decodeLogs in NativeDecoder.res, leaving the function implementation unchanged.

Source: Coding guidelines

packages/envio/src/sources/EvmRpcClient.res (1)

42-43: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick win

Remove the caller-oriented comment.

The method name and signature are self-explanatory; “for tests and debugging” only describes its callers.

As per coding guidelines, comments must not restate which callers use a value.

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@packages/envio/src/sources/EvmRpcClient.res` around lines 42 - 43, Remove the
caller-oriented comment above the query log-selection method, including
references to tests, debugging, or what a partition would fetch; retain the
method and its signature unchanged.

Source: Coding guidelines

packages/envio/src/sources/HyperSyncClient.res (1)

315-317: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick win

Drop the refactor and caller narration.

These comments only say that Rust derives values and that the API serves tests/debugging; the types already communicate the contract.

As per coding guidelines, comments must not narrate refactors or state which callers use a value.

Also applies to: 368-369

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@packages/envio/src/sources/HyperSyncClient.res` around lines 315 - 317, The
comments around the per-query input and the corresponding section near the later
referenced lines are unnecessary caller/refactor narration; remove them while
preserving the surrounding code and type-defined contract.

Source: Coding guidelines

🤖 Prompt for all review comments with AI agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@packages/cli/src/evm_hypersync_source/decode.rs`:
- Around line 86-91: In from_registrations, validate each
OnEventRegistration.index equals its zero-based position while iterating
registrations, returning an error for sparse, negative, or reordered indexes
before populating events. Update multi-registration decoder fixtures to use
distinct sequential indexes matching their array positions.

In `@packages/cli/src/evm_hypersync_source/mod.rs`:
- Line 198: Canonicalize contract address keys before routing lookups so casing
differences cannot cause missed events. Update the builder that populates
`built.contract_name_by_address` to normalize each address consistently with
`encode_address(..., should_checksum)`/`normalized_address()`, or change the map
to use parsed 20-byte addresses and matching lookup keys; ensure both Hypersync
and RPC paths use the same representation.

In `@packages/cli/src/evm_rpc_source/mod.rs`:
- Around line 492-501: Update the routing logic in route_and_decode_napi’s
caller to distinguish decoding outcomes: propagate Err rather than converting it
with .ok(), while treating only Ok(None) as an unrouted log to skip. Preserve
the existing Option flow for successfully decoded results and ensure ABI/topic
decoding failures are returned to the caller.

In `@packages/envio/src/EventConfigBuilder.res`:
- Around line 287-305: Update the filter normalization logic in the event filter
callback to treat ABI array types like tuples: detect array ABI types, first
attempt to encode the entire raw value as one ABI value, and return it as a
single-element list when successful; on failure, normalize it as an OR-list and
encode each item. Preserve the existing behavior for non-array, non-tuple types.

In `@packages/envio/src/TopicFilter.res`:
- Around line 20-24: Replace Viem.encodeAbiParametersUnsafe in fromAbiValue with
the Solidity indexed-event encoding routine so dynamic arrays and tuples with
dynamic members are hashed without standard ABI head/length encoding; preserve
the keccak256 result and add Solidity-derived test vectors covering indexed
arrays and dynamic-member tuples.

In `@scenarios/test_codegen/test/helpers/NativeDecoder.res`:
- Around line 45-50: Correct the map inversion in the contractNameByAddress
iteration: use the address key as the Address value and the contract name value
as the contract-name key when populating addressesByContractName. Update the
callback in the relevant NativeDecoder helper so Address.unsafeFromString
receives the map key, not the contract name.

In `@scenarios/test_codegen/test/lib_tests/FetchState_onBlock_test.res`:
- Around line 79-82: Replace the inline Utils.magic-based registration in the
mockEvent setup with a single hoisted index created from baseEventConfig via
Internal.addOnEventRegistration, then reuse that index for every mockEvent
instead of mutating the chain registry per event. Ensure any remaining
Utils.magic cast declares explicit input and output types.

In `@scenarios/test_codegen/test/lib_tests/SameSignatureEventDecode_test.res`:
- Around line 82-83: Annotate both Utils.magic casts in the
SameSignatureEventDecode test with explicit source and destination types,
including typed record shapes for the from/to/value and src/dst/wad parameter
objects, so the expected parameters use typed casts rather than bare Utils.magic
calls.

---

Outside diff comments:
In `@packages/envio/src/sources/SvmHyperSyncSource.res`:
- Around line 288-289: Update the routing comments near the
definitions/registrations logic and the corresponding later occurrence to
describe that emitted items carry onEventRegistrationIndex, not the full
onEventRegistration object; remove any stale references to registrations being
attached directly to decoded items.

---

Nitpick comments:
In `@packages/envio/src/sources/EvmRpcClient.res`:
- Around line 42-43: Remove the caller-oriented comment above the query
log-selection method, including references to tests, debugging, or what a
partition would fetch; retain the method and its signature unchanged.

In `@packages/envio/src/sources/HyperSyncClient.res`:
- Around line 315-317: The comments around the per-query input and the
corresponding section near the later referenced lines are unnecessary
caller/refactor narration; remove them while preserving the surrounding code and
type-defined contract.

In `@scenarios/fuel_test/src/Indexer.res`:
- Line 70: Remove the redundant generated comment preceding onInstructionOptions
in the generator template, ensuring generated Indexer.res files no longer emit
it while retaining the onInstructionOptions declaration and its meaningful
documentation.

In `@scenarios/test_codegen/test/helpers/NativeDecoder.res`:
- Around line 5-8: Remove the multi-line function-description comment
immediately preceding decodeLogs in NativeDecoder.res, leaving the function
implementation unchanged.

In `@scenarios/test_codegen/test/HyperSyncSource_test.res`:
- Around line 10-11: Remove the helper-description comment above
buildLogSelections in HyperSyncSource_test.res; the function name and signature
already document its behavior, and comments in .res files must not restate
function functionality.
- Around line 31-51: Combine the three buildLogSelections calls in the test into
a single tuple or record value, then use one t.expect(...).toEqual(...)
assertion with the corresponding expected tuple or record. Preserve the existing
inputs and expected results while removing the three separate assertions.

In `@scenarios/test_codegen/test/lib_tests/FetchState_test.res`:
- Around line 82-85: Add the required explicit type annotation to the
Utils.magic call passed as the onEventRegistration argument in
Internal.addOnEventRegistration, using the expected on-event registration
callback type.

In `@scenarios/test_codegen/test/lib_tests/SameSignatureEventDecode_test.res`:
- Around line 61-64: Remove the implementation-focused comment above the test in
SameSignatureEventDecode_test.res; the test name and assertions already document
the expected behavior, and .res files should avoid explanatory narration.

🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

• Push a commit to this branch (recommended)
• Create a new PR with the fixes

---

ℹ️ Review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 08157830-3fa3-4eed-b08c-553efd8f5456

📥 Commits

Reviewing files that changed from the base of the PR and between 12c9fa4 and 7aebdde.

📒 Files selected for processing (56)

• packages/cli/src/evm_hypersync_source/decode.rs
• packages/cli/src/evm_hypersync_source/mod.rs
• packages/cli/src/evm_hypersync_source/selection.rs
• packages/cli/src/evm_hypersync_source/types.rs
• packages/cli/src/evm_rpc_source/mod.rs
• packages/envio/src/ChainFetching.res
• packages/envio/src/ChainState.res
• packages/envio/src/ChainState.resi
• packages/envio/src/EventConfigBuilder.res
• packages/envio/src/EventProcessing.res
• packages/envio/src/FetchState.res
• packages/envio/src/HandlerRegister.res
• packages/envio/src/Internal.res
• packages/envio/src/LogSelection.res
• packages/envio/src/RawEvent.res
• packages/envio/src/SimulateItems.res
• packages/envio/src/TestIndexer.res
• packages/envio/src/TopicFilter.res
• packages/envio/src/bindings/Viem.res
• packages/envio/src/sources/EventRouter.res
• packages/envio/src/sources/Evm.res
• packages/envio/src/sources/EvmChain.res
• packages/envio/src/sources/EvmRpcClient.res
• packages/envio/src/sources/Fuel.res
• packages/envio/src/sources/HyperFuelSource.res
• packages/envio/src/sources/HyperSync.res
• packages/envio/src/sources/HyperSync.resi
• packages/envio/src/sources/HyperSyncClient.res
• packages/envio/src/sources/HyperSyncSource.res
• packages/envio/src/sources/Rpc.res
• packages/envio/src/sources/RpcSource.res
• packages/envio/src/sources/Svm.res
• packages/envio/src/sources/SvmHyperSyncSource.res
• scenarios/fuel_test/src/Indexer.res
• scenarios/fuel_test/test/HyperFuelSource_test.res
• scenarios/test_codegen/test/ClientAddressFilter_test.res
• scenarios/test_codegen/test/HyperSyncClient_test.res
• scenarios/test_codegen/test/HyperSyncSource_test.res
• scenarios/test_codegen/test/HyperSync_test.res
• scenarios/test_codegen/test/IndexerState_test.res
• scenarios/test_codegen/test/RpcSource_test.res
• scenarios/test_codegen/test/SourceBlockHashes_test.res
• scenarios/test_codegen/test/__mocks__/MockEvents.res
• scenarios/test_codegen/test/helpers/MockIndexer.res
• scenarios/test_codegen/test/helpers/NativeDecoder.res
• scenarios/test_codegen/test/lib_tests/ChainState_materialize_test.res
• scenarios/test_codegen/test/lib_tests/CrossChainState_test.res
• scenarios/test_codegen/test/lib_tests/EventRouter_test.res
• scenarios/test_codegen/test/lib_tests/EvmRpcClient_test.res
• scenarios/test_codegen/test/lib_tests/FetchState_onBlock_test.res
• scenarios/test_codegen/test/lib_tests/FetchState_test.res
• scenarios/test_codegen/test/lib_tests/HyperSyncDecoder_test.res
• scenarios/test_codegen/test/lib_tests/PgStorage_test.res
• scenarios/test_codegen/test/lib_tests/RenamedEventDecode_test.res
• scenarios/test_codegen/test/lib_tests/SameSignatureEventDecode_test.res
• scenarios/test_codegen/test/rollback/ChainMocking.res

💤 Files with no reviewable changes (4)

• packages/envio/src/sources/EventRouter.res
• scenarios/test_codegen/test/lib_tests/EventRouter_test.res
• packages/envio/src/LogSelection.res
• packages/envio/src/sources/Rpc.res

[coderabbitai]

🗄️ Data Integrity & Integration | 🟠 Major | ⚡ Quick win

Validate that registration indexes match their array positions.

These indexes are later used directly by Array.getUnsafe. Sparse, negative, or reordered values can resolve the wrong handler or produce undefined. Enforce index == position while constructing the shared decoder.

Proposed fix

-        for ep in registrations {
+        for (expected_index, ep) in registrations.iter().enumerate() {
+            anyhow::ensure!(
+                ep.index == expected_index as i64,
+                "Registration index {} must match its array position {} for event {}",
+                ep.index,
+                expected_index,
+                ep.event_name,
+            );

Update multi-registration decoder fixtures to use distinct sequential indexes.

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change

	pub(crate) fn from_registrations(
	registrations: &[OnEventRegistration],
	checksum_addresses: bool,
	) -> Result<Self> {
	let mut events: HashMap<MetaKey, RegisteredEvent> = HashMap::new();
	for ep in event_params {
	for ep in registrations {
	pub(crate) fn from_registrations(
	registrations: &[OnEventRegistration],
	checksum_addresses: bool,
	) -> Result<Self> {
	let mut events: HashMap<MetaKey, RegisteredEvent> = HashMap::new();
	for (expected_index, ep) in registrations.iter().enumerate() {
	anyhow::ensure!(
	ep.index == expected_index as i64,
	"Registration index {} must match its array position {} for event {}",
	ep.index,
	expected_index,
	ep.event_name,
	);

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@packages/cli/src/evm_hypersync_source/decode.rs` around lines 86 - 91, In
from_registrations, validate each OnEventRegistration.index equals its
zero-based position while iterating registrations, returning an error for
sparse, negative, or reordered indexes before populating events. Update
multi-registration decoder fixtures to use distinct sequential indexes matching
their array positions.

[coderabbitai]

🗄️ Data Integrity & Integration | 🟠 Major | ⚡ Quick win

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
# Verify every routing-map construction and normalized-address lookup.
rg -n -C4 \
  'contract_name_by_address|encode_address|normalized_address|route_and_decode' \
  packages/cli/src/evm_hypersync_source \
  packages/cli/src/evm_rpc_source

Repository: enviodev/hyperindex

Length of output: 20734

---

🏁 Script executed:

#!/bin/bash
set -euo pipefail

# Inspect selection-building and lookup paths around address normalization.
sed -n '1,240p' packages/cli/src/evm_hypersync_source/selection.rs
printf '\n--- mod.rs relevant lookup ---\n'
sed -n '470,540p' packages/cli/src/evm_hypersync_source/mod.rs
printf '\n--- rpc source relevant lookup ---\n'
sed -n '470,510p' packages/cli/src/evm_rpc_source/mod.rs

Repository: enviodev/hyperindex

Length of output: 13873

---

🏁 Script executed:

#!/bin/bash
set -euo pipefail

rg -n -C3 'addresses_by_contract_name|contract_name_by_address' packages/cli/src packages/cli/lib.rs packages/cli/commands.rs

Repository: enviodev/hyperindex

Length of output: 14372

---

Canonicalize the routing map before lookup.

contract_name_by_address stores the caller’s raw address strings, but both Hypersync and RPC look up logs with encode_address(..., should_checksum)/normalized_address(). Any casing mismatch will miss the map and silently drop routed events. Normalize the keys when building contract_name_by_address or store parsed 20-byte addresses instead.

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@packages/cli/src/evm_hypersync_source/mod.rs` at line 198, Canonicalize
contract address keys before routing lookups so casing differences cannot cause
missed events. Update the builder that populates
`built.contract_name_by_address` to normalize each address consistently with
`encode_address(..., should_checksum)`/`normalized_address()`, or change the map
to use parsed 20-byte addresses and matching lookup keys; ensure both Hypersync
and RPC paths use the same representation.

[coderabbitai]

🗄️ Data Integrity & Integration | 🟠 Major | ⚡ Quick win

Do not silently discard decoding failures.

.ok().flatten()? treats genuine ABI/topic decoding errors as unrouted logs, silently losing events and diverging from HyperSync behavior. Drop only Ok(None) and propagate Err.

Proposed fix

-                    let routed = decoder
-                        .route_and_decode_napi(
-                            &raw.to_decoder_log(),
-                            contract_name_by_address.get(&address).map(String::as_str),
-                        )
-                        .ok()
-                        .flatten()?;
+                    let routed = match decoder.route_and_decode_napi(
+                        &raw.to_decoder_log(),
+                        contract_name_by_address.get(&address).map(String::as_str),
+                    ) {
+                        Ok(Some(routed)) => routed,
+                        Ok(None) => return None,
+                        Err(error) => return Some(Err(error.context("decode event params"))),
+                    };

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change

	// Decode failures are skipped like unrouted logs (matching
	// the pre-routing behavior where undecodable params made
	// the JS side drop the item).
	let routed = decoder
	.route_and_decode_napi(
	&raw.to_decoder_log(),
	contract_name_by_address.get(&address).map(String::as_str),
	)
	.ok()
	.flatten()?;
	// Decode failures are skipped like unrouted logs (matching
	// the pre-routing behavior where undecodable params made
	// the JS side drop the item).
	let routed = match decoder.route_and_decode_napi(
	&raw.to_decoder_log(),
	contract_name_by_address.get(&address).map(String::as_str),
	) {
	Ok(Some(routed)) => routed,
	Ok(None) => return None,
	Err(error) => return Some(Err(error.context("decode event params"))),
	};

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@packages/cli/src/evm_rpc_source/mod.rs` around lines 492 - 501, Update the
routing logic in route_and_decode_napi’s caller to distinguish decoding
outcomes: propagate Err rather than converting it with .ok(), while treating
only Ok(None) as an unrouted log to skip. Preserve the existing Option flow for
successfully decoded results and ensure ABI/topic decoding failures are returned
to the caller.

[coderabbitai]

🎯 Functional Correctness | 🟠 Major | ⚡ Quick win

Invert the address map in the correct direction.

contractNameByAddress is keyed by address, but these bindings treat its key as a contract name. This attempts to parse names such as TokenA as addresses and prevents the mock query from selecting the intended log.

Proposed fix

-  contractNameByAddress->Dict.forEachWithKey((contractName, address) => {
+  contractNameByAddress->Dict.forEachWithKey((address, contractName) => {
     addressesByContractName->Utils.Dict.push(
       contractName,
       address->Address.unsafeFromString,

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change

	contractNameByAddress->Dict.forEachWithKey((contractName, address) => {
	addressesByContractName->Utils.Dict.push(
	contractName,
	address->Address.unsafeFromString,
	)
	})
	contractNameByAddress->Dict.forEachWithKey((address, contractName) => {
	addressesByContractName->Utils.Dict.push(
	contractName,
	address->Address.unsafeFromString,
	)
	})

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@scenarios/test_codegen/test/helpers/NativeDecoder.res` around lines 45 - 50,
Correct the map inversion in the contractNameByAddress iteration: use the
address key as the Address value and the contract name value as the
contract-name key when populating addressesByContractName. Update the callback
in the relevant NativeDecoder helper so Address.unsafeFromString receives the
map key, not the contract name.

[coderabbitai]

🩺 Stability & Availability | 🟡 Minor | ⚡ Quick win

Register the typed fixture once and reuse its index.

Each mockEvent currently mutates the chain registry and stores a string disguised as a registration. Hoist one index using baseEventConfig to avoid test-order pollution and invalid downstream resolution.

Proposed fix

 let baseEventConfig = (MockIndexer.evmOnEventRegistration(
   ~id="0",
   ~contractName="Gravatar",
 ) :> Internal.onEventRegistration)
+
+let mockEventRegistrationIndex =
+  Internal.addOnEventRegistration(~chainId, baseEventConfig)

 let mockEvent = (~blockNumber, ~logIndex=0): Internal.item => Internal.Event({
   chain: ChainMap.Chain.makeUnsafe(~chainId),
   blockNumber,
-  onEventRegistrationIndex: Internal.addOnEventRegistration(
-    ~chainId,
-    Utils.magic("Mock onEventRegistration in fetchstate test"),
-  ),
+  onEventRegistrationIndex: mockEventRegistrationIndex,

As per coding guidelines, Utils.magic casts must include explicit input and output types.

📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change

	onEventRegistrationIndex: Internal.addOnEventRegistration(
	~chainId,
	Utils.magic("Mock onEventRegistration in fetchstate test"),
	),
	let baseEventConfig = (MockIndexer.evmOnEventRegistration(
	~id="0",
	~contractName="Gravatar",
	) :> Internal.onEventRegistration)
	let mockEventRegistrationIndex =
	Internal.addOnEventRegistration(~chainId, baseEventConfig)
	let mockEvent = (~blockNumber, ~logIndex=0): Internal.item => Internal.Event({
	chain: ChainMap.Chain.makeUnsafe(~chainId),
	blockNumber,
	onEventRegistrationIndex: mockEventRegistrationIndex,

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@scenarios/test_codegen/test/lib_tests/FetchState_onBlock_test.res` around
lines 79 - 82, Replace the inline Utils.magic-based registration in the
mockEvent setup with a single hoisted index created from baseEventConfig via
Internal.addOnEventRegistration, then reuse that index for every mockEvent
instead of mutating the chain registry per event. Ensure any remaining
Utils.magic cast declares explicit input and output types.

Source: Coding guidelines

[coderabbitai]

📐 Maintainability & Code Quality | 🟡 Minor | ⚡ Quick win

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
set -euo pipefail

# Inspect the target file and nearby type definitions/usages.
git ls-files 'scenarios/test_codegen/test/lib_tests/SameSignatureEventDecode_test.res' \
  'scenarios/test_codegen/test/lib_tests/*' \
  | sed -n '1,120p'

echo
echo '--- file outline ---'
ast-grep outline scenarios/test_codegen/test/lib_tests/SameSignatureEventDecode_test.res --view expanded || true

echo
echo '--- target lines ---'
cat -n scenarios/test_codegen/test/lib_tests/SameSignatureEventDecode_test.res | sed -n '70,95p'

echo
echo '--- Utils.magic usage in same area ---'
rg -n "Utils\.magic" scenarios/test_codegen/test/lib_tests -n -A 2 -B 2 || true

Repository: enviodev/hyperindex

Length of output: 32073

---

🏁 Script executed:

#!/bin/bash
set -euo pipefail

echo '--- top of file ---'
cat -n scenarios/test_codegen/test/lib_tests/SameSignatureEventDecode_test.res | sed -n '1,70p'

echo
echo '--- decodeAs helper and nearby declarations ---'
cat -n scenarios/test_codegen/test/lib_tests/SameSignatureEventDecode_test.res | sed -n '1,90p'

Repository: enviodev/hyperindex

Length of output: 7044

---

🏁 Script executed:

#!/bin/bash
set -euo pipefail

echo '--- event params type usages ---'
rg -n "eventParams|Internal\.eventParams|params\)->\(Utils\.magic|Utils\.magic: .*eventParams" scenarios/test_codegen/test/lib_tests -A 1 -B 1 || true

echo
echo '--- similar decode test for same pattern ---'
cat -n scenarios/test_codegen/test/lib_tests/HyperSyncDecoder_test.res | sed -n '110,130p'

Repository: enviodev/hyperindex

Length of output: 1784

---

Annotate both Utils.magic casts on lines 82-83. Use explicit source and destination types here; the expected params should be cast with typed Utils.magic instead of bare casts.

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@scenarios/test_codegen/test/lib_tests/SameSignatureEventDecode_test.res`
around lines 82 - 83, Annotate both Utils.magic casts in the
SameSignatureEventDecode test with explicit source and destination types,
including typed record shapes for the from/to/value and src/dst/wad parameter
objects, so the expected parameters use typed casts rather than bare Utils.magic
calls.

Source: Coding guidelines

[DZakh]

Let's not have a test-specific code. Replace it with an end-to-end test

[coderabbitai]

♻️ Duplicate comments (1)

packages/envio/src/EventConfigBuilder.res (1)

242-262: 🎯 Functional Correctness | 🟠 Major | ⚡ Quick win

Handle ABI arrays as composite filter values.

isTuple does not recognize types such as uint256[]. A single filter value like [1n, 2n] is therefore split into separate OR values, and each scalar is passed to the encoder for an array ABI type. Detect array types as well and apply the whole-value-first fallback.

Proposed fix

-  let isTuple = p.abiType->String.startsWith("(")
+  let isComposite =
+    p.abiType->String.startsWith("(") || p.abiType->String.endsWith("]")
...
-      if isTuple {
+      if isComposite {

🤖 Prompt for AI Agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@packages/envio/src/EventConfigBuilder.res` around lines 242 - 262, Update
buildTopicGetter to treat ABI array types as composite values alongside tuples:
detect array ABI types in addition to types beginning with "(" and apply the
existing whole-value-first encoder fallback for them. This must preserve single
array filters such as [1n, 2n] as one encoded value, while still normalizing and
mapping genuine OR-lists when whole-value encoding fails.

🤖 Prompt for all review comments with AI agents

Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Duplicate comments:
In `@packages/envio/src/EventConfigBuilder.res`:
- Around line 242-262: Update buildTopicGetter to treat ABI array types as
composite values alongside tuples: detect array ABI types in addition to types
beginning with "(" and apply the existing whole-value-first encoder fallback for
them. This must preserve single array filters such as [1n, 2n] as one encoded
value, while still normalizing and mapping genuine OR-lists when whole-value
encoding fails.

---

ℹ️ Review info

⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Run ID: 93160e60-a485-458b-8f44-57cc3429c3a6

📥 Commits

Reviewing files that changed from the base of the PR and between 7aebdde and b406069.

📒 Files selected for processing (32)

• packages/cli/src/evm/mod.rs
• packages/cli/src/evm/topic_filter.rs
• packages/envio/src/ChainFetching.res
• packages/envio/src/ChainState.res
• packages/envio/src/Core.res
• packages/envio/src/EventConfigBuilder.res
• packages/envio/src/EventProcessing.res
• packages/envio/src/FetchState.res
• packages/envio/src/Internal.res
• packages/envio/src/RawEvent.res
• packages/envio/src/SimulateDeadInputTracker.res
• packages/envio/src/SimulateItems.res
• packages/envio/src/TopicFilter.res
• packages/envio/src/bindings/Viem.res
• packages/envio/src/sources/EvmChain.res
• packages/envio/src/sources/HyperSyncSource.res
• packages/envio/src/sources/RpcSource.res
• packages/envio/src/sources/SimulateSource.res
• packages/envio/src/sources/SvmHyperSyncSource.res
• scenarios/test_codegen/test/ClientAddressFilter_test.res
• scenarios/test_codegen/test/EventFilters_test.res
• scenarios/test_codegen/test/IndexerState_test.res
• scenarios/test_codegen/test/SvmHyperSyncSource_test.res
• scenarios/test_codegen/test/__mocks__/MockEvents.res
• scenarios/test_codegen/test/helpers/MockIndexer.res
• scenarios/test_codegen/test/lib_tests/ChainState_materialize_test.res
• scenarios/test_codegen/test/lib_tests/CrossChainState_test.res
• scenarios/test_codegen/test/lib_tests/FetchState_onBlock_test.res
• scenarios/test_codegen/test/lib_tests/FetchState_test.res
• scenarios/test_codegen/test/lib_tests/HyperSyncDecoder_test.res
• scenarios/test_codegen/test/lib_tests/PgStorage_test.res
• scenarios/test_codegen/test/rollback/ChainMocking.res

💤 Files with no reviewable changes (3)

• packages/envio/src/sources/EvmChain.res
• packages/envio/src/TopicFilter.res
• packages/envio/src/bindings/Viem.res

🚧 Files skipped from review as they are similar to previous changes (6)

• packages/envio/src/RawEvent.res
• packages/envio/src/FetchState.res
• packages/envio/src/SimulateItems.res
• packages/envio/src/sources/HyperSyncSource.res
• scenarios/test_codegen/test/lib_tests/HyperSyncDecoder_test.res
• packages/envio/src/sources/RpcSource.res