Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add startingBlock option #138

Merged
merged 2 commits into from
Jan 20, 2025
Merged

Add startingBlock option #138

merged 2 commits into from
Jan 20, 2025

Conversation

fracek
Copy link
Contributor

@fracek fracek commented Jan 20, 2025

This is a shortcut for the most common case (specifying only the starting block without the hash).

Copy link

coderabbitai bot commented Jan 20, 2025

📝 Walkthrough

Walkthrough

This pull request introduces a new JSON configuration for the @apibara/indexer package, replacing the startingCursor configuration with a startingBlock option across multiple files. The changes affect example indexers for EVM and StarkNet, as well as the core indexer type definitions, enhancing the clarity and safety of cursor-related properties. The modifications ensure that only one of the properties can be set at a time, streamlining the initialization process for indexing events from the Ethereum blockchain.

Changes

File Change Summary
change/@apibara-indexer-*.json Added new prerelease configuration with startingBlock option
examples/cli/indexers/1-evm.indexer.ts Replaced startingCursor with startingBlock: 215_30_000n
examples/cli/indexers/2-starknet.indexer.ts Replaced startingCursor with startingBlock: 10_30_000n
examples/cli/indexers/3-starknet-factory.indexer.ts Removed startingCursor, added startingBlock: 800_000n
packages/indexer/src/indexer.ts Added IndexerStartingCursor type, updated IndexerConfig and IndexerWithStreamConfig interfaces

Possibly related PRs

Poem

🐰 A Rabbit's Ode to Indexing Delight 🚀
From cursor old to block anew,
We leap and bound with indexing view.
Starting points now crystal clear,
Streams flow smoothly, have no fear!
Code evolves, a rabbit's might! 🌟


📜 Recent review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between d89e293 and 9653510.

📒 Files selected for processing (5)
  • change/@apibara-indexer-00f20a26-f27d-40f3-a4f5-9ae56b471507.json (1 hunks)
  • examples/cli/indexers/1-evm.indexer.ts (1 hunks)
  • examples/cli/indexers/2-starknet.indexer.ts (1 hunks)
  • examples/cli/indexers/3-starknet-factory.indexer.ts (1 hunks)
  • packages/indexer/src/indexer.ts (3 hunks)
🚧 Files skipped from review as they are similar to previous changes (4)
  • examples/cli/indexers/1-evm.indexer.ts
  • examples/cli/indexers/2-starknet.indexer.ts
  • examples/cli/indexers/3-starknet-factory.indexer.ts
  • change/@apibara-indexer-00f20a26-f27d-40f3-a4f5-9ae56b471507.json
⏰ Context from checks skipped due to timeout of 90000ms (1)
  • GitHub Check: test
🔇 Additional comments (3)
packages/indexer/src/indexer.ts (3)

66-78: Well-designed type definition!

The IndexerStartingCursor type effectively uses TypeScript's discriminated unions to ensure that startingCursor and startingBlock cannot be set simultaneously, preventing potential ambiguity in the configuration.


Line range hint 80-107: Clean type composition!

The integration of IndexerStartingCursor with IndexerConfig and IndexerWithStreamConfig is well-structured and maintains type safety throughout the configuration chain.


223-239: Cursor initialization looks good!

The implementation correctly handles the priority between startingCursor and startingBlock, and properly uses the initialized cursor in the request. This addresses the issues raised in previous reviews.

✨ Finishing Touches
  • 📝 Generate Docstrings (Beta)

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

❤️ Share
🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Generate unit testing code for this file.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai generate unit testing code for this file.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and generate unit testing code.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate docstrings to generate docstrings for this PR. (Beta)
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Copy link

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 1

📜 Review details

Configuration used: CodeRabbit UI
Review profile: CHILL
Plan: Pro

📥 Commits

Reviewing files that changed from the base of the PR and between 2093bc4 and d89e293.

📒 Files selected for processing (5)
  • change/@apibara-indexer-00f20a26-f27d-40f3-a4f5-9ae56b471507.json (1 hunks)
  • examples/cli/indexers/1-evm.indexer.ts (1 hunks)
  • examples/cli/indexers/2-starknet.indexer.ts (1 hunks)
  • examples/cli/indexers/3-starknet-factory.indexer.ts (1 hunks)
  • packages/indexer/src/indexer.ts (3 hunks)
✅ Files skipped from review due to trivial changes (1)
  • change/@apibara-indexer-00f20a26-f27d-40f3-a4f5-9ae56b471507.json
⏰ Context from checks skipped due to timeout of 90000ms (1)
  • GitHub Check: test
🔇 Additional comments (4)
packages/indexer/src/indexer.ts (1)

66-78: LGTM! Well-designed type safety.

The union type IndexerStartingCursor effectively ensures that only one of startingCursor or startingBlock can be set at a time, preventing potential configuration conflicts.

examples/cli/indexers/1-evm.indexer.ts (1)

41-41: LGTM! Consistent with the new API.

The migration from startingCursor to startingBlock is correct and maintains the same starting point.

examples/cli/indexers/2-starknet.indexer.ts (1)

36-36: LGTM! Consistent with the new API.

The migration from startingCursor to startingBlock is correct and maintains the same starting point.

examples/cli/indexers/3-starknet-factory.indexer.ts (1)

17-17: Verify factory pattern compatibility with the new startingBlock option.

While the migration to startingBlock is correct, please ensure that the factory pattern's cursor handling (especially in the factory function) works correctly with the new block-based initialization.

Run this script to check for potential issues:

✅ Verification successful

Factory pattern is compatible with startingBlock option

The verification confirms that the factory pattern's cursor handling works correctly with the block-based initialization. The startingBlock value is properly converted to a cursor's orderKey, and the factory mode correctly maintains cursor state persistence, as evidenced by the test coverage.

🏁 Scripts executed

The following scripts were executed for the analysis:

Script:

#!/bin/bash
# Description: Check if the factory pattern handles both cursor types consistently

# Search for cursor handling in factory functions
ast-grep --pattern 'factory($$$) {
  $$$
  cursor
  $$$
}'

# Search for cursor usage in factory-related code
rg -A 5 'factory.*cursor|cursor.*factory'

Length of output: 676


Script:

#!/bin/bash
# Find factory implementation and block handling
ast-grep --pattern 'factory($$$) {
  $$$
}'

# Search for startingBlock usage in factory context
rg -A 5 'startingBlock.*factory|factory.*startingBlock'

# Find cursor initialization patterns
rg -A 10 'new\s+Indexer.*factory|factory.*Indexer'

Length of output: 156


Script:

#!/bin/bash
# Find factory-related files
fd -t f factory

# Find indexer initialization patterns
rg -l "class.*Indexer|interface.*Indexer"

# Search for startingBlock usage
rg -A 5 "startingBlock.*=|startingBlock.*\("

# Look for cursor handling in indexer files
rg -A 5 "cursor.*=|getCursor|setCursor"

Length of output: 20759

Comment on lines +223 to +231
// Give priority to startingCursor over startingBlock.
let startingCursor: Cursor | undefined;
if (indexer.options.startingCursor) {
startingCursor = indexer.options.startingCursor;
} else if (indexer.options.startingBlock !== undefined) {
startingCursor = {
orderKey: indexer.options.startingBlock,
};
}
Copy link

Choose a reason for hiding this comment

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

⚠️ Potential issue

Fix inconsistent cursor initialization.

There's a bug where startingCursor is initialized but not used in the request. The request uses indexer.options.startingCursor directly, which could lead to unexpected behavior.

Apply this diff to fix the issue:

    let startingCursor: Cursor | undefined;
    if (indexer.options.startingCursor) {
      startingCursor = indexer.options.startingCursor;
    } else if (indexer.options.startingBlock !== undefined) {
      startingCursor = {
        orderKey: indexer.options.startingBlock,
      };
    }

    const request = indexer.streamConfig.Request.make({
      filter: isFactoryMode
        ? [indexer.options.filter, {} as TFilter]
        : [indexer.options.filter],
      finality: indexer.options.finality,
-     startingCursor: indexer.options.startingCursor,
+     startingCursor,
    });

Also applies to: 233-239

@fracek fracek merged commit 069644d into apibara:main Jan 20, 2025
2 checks passed
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.

1 participant