@apibara/indexer 2.0.0-beta.35 → 2.0.0-beta.36

package/dist/index.cjs

@@ -110,10 +110,18 @@ async function run(client, indexer, runOptions = {}) {
     const middleware = await registerMiddleware(indexer);
     await indexer.hooks.callHook("run:before");
     const isFactoryMode = indexer.options.factory !== void 0;
+    let startingCursor;
+    if (indexer.options.startingCursor) {
+      startingCursor = indexer.options.startingCursor;
+    } else if (indexer.options.startingBlock !== void 0) {
+      startingCursor = {
+        orderKey: indexer.options.startingBlock
+      };
+    }
     const request = indexer.streamConfig.Request.make({
       filter: isFactoryMode ? [indexer.options.filter, {}] : [indexer.options.filter],
       finality: indexer.options.finality,
-      startingCursor: indexer.options.startingCursor
+      startingCursor
     });
     const options = {};
     await indexer.hooks.callHook("connect:before", { request, options });

package/dist/index.d.cts

@@ -1,3 +1,3 @@
-export { c as Indexer, b as IndexerConfig, e as IndexerHooks, I as IndexerWithStreamConfig, R as ReconnectOptions, h as RunOptions, U as UseMiddlewareFunction, g as createIndexer, f as defineIndexer, i as run, r as runWithReconnect, u as useIndexerContext } from './shared/indexer.8939ecc8.cjs';
+export { c as Indexer, b as IndexerConfig, e as IndexerHooks, f as IndexerStartingCursor, I as IndexerWithStreamConfig, R as ReconnectOptions, i as RunOptions, U as UseMiddlewareFunction, h as createIndexer, g as defineIndexer, j as run, r as runWithReconnect, u as useIndexerContext } from './shared/indexer.0a872656.cjs';
 import '@apibara/protocol';
 import 'hookable';

package/dist/index.d.mts

@@ -1,3 +1,3 @@
-export { c as Indexer, b as IndexerConfig, e as IndexerHooks, I as IndexerWithStreamConfig, R as ReconnectOptions, h as RunOptions, U as UseMiddlewareFunction, g as createIndexer, f as defineIndexer, i as run, r as runWithReconnect, u as useIndexerContext } from './shared/indexer.8939ecc8.mjs';
+export { c as Indexer, b as IndexerConfig, e as IndexerHooks, f as IndexerStartingCursor, I as IndexerWithStreamConfig, R as ReconnectOptions, i as RunOptions, U as UseMiddlewareFunction, h as createIndexer, g as defineIndexer, j as run, r as runWithReconnect, u as useIndexerContext } from './shared/indexer.0a872656.mjs';
 import '@apibara/protocol';
 import 'hookable';

package/dist/index.d.ts

@@ -1,3 +1,3 @@
-export { c as Indexer, b as IndexerConfig, e as IndexerHooks, I as IndexerWithStreamConfig, R as ReconnectOptions, h as RunOptions, U as UseMiddlewareFunction, g as createIndexer, f as defineIndexer, i as run, r as runWithReconnect, u as useIndexerContext } from './shared/indexer.8939ecc8.js';
+export { c as Indexer, b as IndexerConfig, e as IndexerHooks, f as IndexerStartingCursor, I as IndexerWithStreamConfig, R as ReconnectOptions, i as RunOptions, U as UseMiddlewareFunction, h as createIndexer, g as defineIndexer, j as run, r as runWithReconnect, u as useIndexerContext } from './shared/indexer.0a872656.js';
 import '@apibara/protocol';
 import 'hookable';

package/dist/index.mjs

@@ -103,10 +103,18 @@ async function run(client, indexer, runOptions = {}) {
     const middleware = await registerMiddleware(indexer);
     await indexer.hooks.callHook("run:before");
     const isFactoryMode = indexer.options.factory !== void 0;
+    let startingCursor;
+    if (indexer.options.startingCursor) {
+      startingCursor = indexer.options.startingCursor;
+    } else if (indexer.options.startingBlock !== void 0) {
+      startingCursor = {
+        orderKey: indexer.options.startingBlock
+      };
+    }
     const request = indexer.streamConfig.Request.make({
       filter: isFactoryMode ? [indexer.options.filter, {}] : [indexer.options.filter],
       finality: indexer.options.finality,
-      startingCursor: indexer.options.startingCursor
+      startingCursor
     });
     const options = {};
     await indexer.hooks.callHook("connect:before", { request, options });

package/dist/internal/testing.d.cts

@@ -1,4 +1,4 @@
-import { a as IndexerPlugin, b as IndexerConfig, c as Indexer } from '../shared/indexer.8939ecc8.cjs';
+import { a as IndexerPlugin, b as IndexerConfig, c as Indexer } from '../shared/indexer.0a872656.cjs';
 import { MockStreamResponse, MockFilter, MockBlock } from '@apibara/protocol/testing';
 import '@apibara/protocol';
 import 'hookable';

package/dist/internal/testing.d.mts

@@ -1,4 +1,4 @@
-import { a as IndexerPlugin, b as IndexerConfig, c as Indexer } from '../shared/indexer.8939ecc8.mjs';
+import { a as IndexerPlugin, b as IndexerConfig, c as Indexer } from '../shared/indexer.0a872656.mjs';
 import { MockStreamResponse, MockFilter, MockBlock } from '@apibara/protocol/testing';
 import '@apibara/protocol';
 import 'hookable';

package/dist/internal/testing.d.ts

@@ -1,4 +1,4 @@
-import { a as IndexerPlugin, b as IndexerConfig, c as Indexer } from '../shared/indexer.8939ecc8.js';
+import { a as IndexerPlugin, b as IndexerConfig, c as Indexer } from '../shared/indexer.0a872656.js';
 import { MockStreamResponse, MockFilter, MockBlock } from '@apibara/protocol/testing';
 import '@apibara/protocol';
 import 'hookable';

package/dist/plugins/index.d.cts

@@ -1,5 +1,5 @@
-import { a as IndexerPlugin } from '../shared/indexer.8939ecc8.cjs';
-export { d as defineIndexerPlugin } from '../shared/indexer.8939ecc8.cjs';
+import { a as IndexerPlugin } from '../shared/indexer.0a872656.cjs';
+export { d as defineIndexerPlugin } from '../shared/indexer.0a872656.cjs';
 import { ConsolaReporter, ConsolaInstance } from 'consola';
 export { ConsolaInstance, ConsolaReporter } from 'consola';
 import '@apibara/protocol';

package/dist/plugins/index.d.mts

@@ -1,5 +1,5 @@
-import { a as IndexerPlugin } from '../shared/indexer.8939ecc8.mjs';
-export { d as defineIndexerPlugin } from '../shared/indexer.8939ecc8.mjs';
+import { a as IndexerPlugin } from '../shared/indexer.0a872656.mjs';
+export { d as defineIndexerPlugin } from '../shared/indexer.0a872656.mjs';
 import { ConsolaReporter, ConsolaInstance } from 'consola';
 export { ConsolaInstance, ConsolaReporter } from 'consola';
 import '@apibara/protocol';

package/dist/plugins/index.d.ts

@@ -1,5 +1,5 @@
-import { a as IndexerPlugin } from '../shared/indexer.8939ecc8.js';
-export { d as defineIndexerPlugin } from '../shared/indexer.8939ecc8.js';
+import { a as IndexerPlugin } from '../shared/indexer.0a872656.js';
+export { d as defineIndexerPlugin } from '../shared/indexer.0a872656.js';
 import { ConsolaReporter, ConsolaInstance } from 'consola';
 export { ConsolaInstance, ConsolaReporter } from 'consola';
 import '@apibara/protocol';

package/dist/shared/{indexer.8939ecc8.d.cts → indexer.0a872656.d.cts}

@@ -45,11 +45,20 @@ interface IndexerHooks<TFilter, TBlock> {
         message: SystemMessage;
     }) => void;
 }
-interface IndexerConfig<TFilter, TBlock> {
+type IndexerStartingCursor = {
+    startingCursor?: never;
+    startingBlock: bigint;
+} | {
+    startingCursor: Cursor;
+    startingBlock?: never;
+} | {
+    startingCursor?: never;
+    startingBlock?: never;
+};
+type IndexerConfig<TFilter, TBlock> = {
     streamUrl: string;
     filter: TFilter;
     finality?: DataFinality;
-    startingCursor?: Cursor;
     factory?: ({ block, context, }: {
         block: TBlock;
         context: IndexerContext;
@@ -66,10 +75,10 @@ interface IndexerConfig<TFilter, TBlock> {
     hooks?: NestedHooks<IndexerHooks<TFilter, TBlock>>;
     plugins?: ReadonlyArray<IndexerPlugin<TFilter, TBlock>>;
     debug?: boolean;
-}
-interface IndexerWithStreamConfig<TFilter, TBlock> extends IndexerConfig<TFilter, TBlock> {
+} & IndexerStartingCursor;
+type IndexerWithStreamConfig<TFilter, TBlock> = IndexerConfig<TFilter, TBlock> & {
     streamConfig: StreamConfig<TFilter, TBlock>;
-}
+};
 declare function defineIndexer<TFilter, TBlock>(streamConfig: StreamConfig<TFilter, TBlock>): (config: IndexerConfig<TFilter, TBlock>) => IndexerWithStreamConfig<TFilter, TBlock>;
 interface Indexer<TFilter, TBlock> {
     streamConfig: StreamConfig<TFilter, TBlock>;
@@ -88,4 +97,4 @@ interface RunOptions {
 }
 declare function run<TFilter, TBlock>(client: Client<TFilter, TBlock>, indexer: Indexer<TFilter, TBlock>, runOptions?: RunOptions): Promise<void>;
 
-export { type IndexerWithStreamConfig as I, type ReconnectOptions as R, type UseMiddlewareFunction as U, type IndexerPlugin as a, type IndexerConfig as b, type Indexer as c, defineIndexerPlugin as d, type IndexerHooks as e, defineIndexer as f, createIndexer as g, type RunOptions as h, run as i, runWithReconnect as r, useIndexerContext as u };
+export { type IndexerWithStreamConfig as I, type ReconnectOptions as R, type UseMiddlewareFunction as U, type IndexerPlugin as a, type IndexerConfig as b, type Indexer as c, defineIndexerPlugin as d, type IndexerHooks as e, type IndexerStartingCursor as f, defineIndexer as g, createIndexer as h, type RunOptions as i, run as j, runWithReconnect as r, useIndexerContext as u };

package/dist/shared/{indexer.8939ecc8.d.mts → indexer.0a872656.d.mts}

@@ -45,11 +45,20 @@ interface IndexerHooks<TFilter, TBlock> {
         message: SystemMessage;
     }) => void;
 }
-interface IndexerConfig<TFilter, TBlock> {
+type IndexerStartingCursor = {
+    startingCursor?: never;
+    startingBlock: bigint;
+} | {
+    startingCursor: Cursor;
+    startingBlock?: never;
+} | {
+    startingCursor?: never;
+    startingBlock?: never;
+};
+type IndexerConfig<TFilter, TBlock> = {
     streamUrl: string;
     filter: TFilter;
     finality?: DataFinality;
-    startingCursor?: Cursor;
     factory?: ({ block, context, }: {
         block: TBlock;
         context: IndexerContext;
@@ -66,10 +75,10 @@ interface IndexerConfig<TFilter, TBlock> {
     hooks?: NestedHooks<IndexerHooks<TFilter, TBlock>>;
     plugins?: ReadonlyArray<IndexerPlugin<TFilter, TBlock>>;
     debug?: boolean;
-}
-interface IndexerWithStreamConfig<TFilter, TBlock> extends IndexerConfig<TFilter, TBlock> {
+} & IndexerStartingCursor;
+type IndexerWithStreamConfig<TFilter, TBlock> = IndexerConfig<TFilter, TBlock> & {
     streamConfig: StreamConfig<TFilter, TBlock>;
-}
+};
 declare function defineIndexer<TFilter, TBlock>(streamConfig: StreamConfig<TFilter, TBlock>): (config: IndexerConfig<TFilter, TBlock>) => IndexerWithStreamConfig<TFilter, TBlock>;
 interface Indexer<TFilter, TBlock> {
     streamConfig: StreamConfig<TFilter, TBlock>;
@@ -88,4 +97,4 @@ interface RunOptions {
 }
 declare function run<TFilter, TBlock>(client: Client<TFilter, TBlock>, indexer: Indexer<TFilter, TBlock>, runOptions?: RunOptions): Promise<void>;
 
-export { type IndexerWithStreamConfig as I, type ReconnectOptions as R, type UseMiddlewareFunction as U, type IndexerPlugin as a, type IndexerConfig as b, type Indexer as c, defineIndexerPlugin as d, type IndexerHooks as e, defineIndexer as f, createIndexer as g, type RunOptions as h, run as i, runWithReconnect as r, useIndexerContext as u };
+export { type IndexerWithStreamConfig as I, type ReconnectOptions as R, type UseMiddlewareFunction as U, type IndexerPlugin as a, type IndexerConfig as b, type Indexer as c, defineIndexerPlugin as d, type IndexerHooks as e, type IndexerStartingCursor as f, defineIndexer as g, createIndexer as h, type RunOptions as i, run as j, runWithReconnect as r, useIndexerContext as u };

package/dist/shared/{indexer.8939ecc8.d.ts → indexer.0a872656.d.ts}

@@ -45,11 +45,20 @@ interface IndexerHooks<TFilter, TBlock> {
         message: SystemMessage;
     }) => void;
 }
-interface IndexerConfig<TFilter, TBlock> {
+type IndexerStartingCursor = {
+    startingCursor?: never;
+    startingBlock: bigint;
+} | {
+    startingCursor: Cursor;
+    startingBlock?: never;
+} | {
+    startingCursor?: never;
+    startingBlock?: never;
+};
+type IndexerConfig<TFilter, TBlock> = {
     streamUrl: string;
     filter: TFilter;
     finality?: DataFinality;
-    startingCursor?: Cursor;
     factory?: ({ block, context, }: {
         block: TBlock;
         context: IndexerContext;
@@ -66,10 +75,10 @@ interface IndexerConfig<TFilter, TBlock> {
     hooks?: NestedHooks<IndexerHooks<TFilter, TBlock>>;
     plugins?: ReadonlyArray<IndexerPlugin<TFilter, TBlock>>;
     debug?: boolean;
-}
-interface IndexerWithStreamConfig<TFilter, TBlock> extends IndexerConfig<TFilter, TBlock> {
+} & IndexerStartingCursor;
+type IndexerWithStreamConfig<TFilter, TBlock> = IndexerConfig<TFilter, TBlock> & {
     streamConfig: StreamConfig<TFilter, TBlock>;
-}
+};
 declare function defineIndexer<TFilter, TBlock>(streamConfig: StreamConfig<TFilter, TBlock>): (config: IndexerConfig<TFilter, TBlock>) => IndexerWithStreamConfig<TFilter, TBlock>;
 interface Indexer<TFilter, TBlock> {
     streamConfig: StreamConfig<TFilter, TBlock>;
@@ -88,4 +97,4 @@ interface RunOptions {
 }
 declare function run<TFilter, TBlock>(client: Client<TFilter, TBlock>, indexer: Indexer<TFilter, TBlock>, runOptions?: RunOptions): Promise<void>;
 
-export { type IndexerWithStreamConfig as I, type ReconnectOptions as R, type UseMiddlewareFunction as U, type IndexerPlugin as a, type IndexerConfig as b, type Indexer as c, defineIndexerPlugin as d, type IndexerHooks as e, defineIndexer as f, createIndexer as g, type RunOptions as h, run as i, runWithReconnect as r, useIndexerContext as u };
+export { type IndexerWithStreamConfig as I, type ReconnectOptions as R, type UseMiddlewareFunction as U, type IndexerPlugin as a, type IndexerConfig as b, type Indexer as c, defineIndexerPlugin as d, type IndexerHooks as e, type IndexerStartingCursor as f, defineIndexer as g, createIndexer as h, type RunOptions as i, run as j, runWithReconnect as r, useIndexerContext as u };

package/dist/testing/index.d.cts

@@ -1,4 +1,4 @@
-import { I as IndexerWithStreamConfig } from '../shared/indexer.8939ecc8.cjs';
+import { I as IndexerWithStreamConfig } from '../shared/indexer.0a872656.cjs';
 import '@apibara/protocol';
 import 'hookable';
 

package/dist/testing/index.d.mts

@@ -1,4 +1,4 @@
-import { I as IndexerWithStreamConfig } from '../shared/indexer.8939ecc8.mjs';
+import { I as IndexerWithStreamConfig } from '../shared/indexer.0a872656.mjs';
 import '@apibara/protocol';
 import 'hookable';
 

package/dist/testing/index.d.ts

@@ -1,4 +1,4 @@
-import { I as IndexerWithStreamConfig } from '../shared/indexer.8939ecc8.js';
+import { I as IndexerWithStreamConfig } from '../shared/indexer.0a872656.js';
 import '@apibara/protocol';
 import 'hookable';
 

package/dist/vcr/index.d.cts

@@ -1,5 +1,5 @@
 import { Cursor, StreamDataResponse, Client } from '@apibara/protocol';
-import { c as Indexer } from '../shared/indexer.8939ecc8.cjs';
+import { c as Indexer } from '../shared/indexer.0a872656.cjs';
 import 'hookable';
 
 type VcrConfig = {

package/dist/vcr/index.d.mts

@@ -1,5 +1,5 @@
 import { Cursor, StreamDataResponse, Client } from '@apibara/protocol';
-import { c as Indexer } from '../shared/indexer.8939ecc8.mjs';
+import { c as Indexer } from '../shared/indexer.0a872656.mjs';
 import 'hookable';
 
 type VcrConfig = {

package/dist/vcr/index.d.ts

@@ -1,5 +1,5 @@
 import { Cursor, StreamDataResponse, Client } from '@apibara/protocol';
-import { c as Indexer } from '../shared/indexer.8939ecc8.js';
+import { c as Indexer } from '../shared/indexer.0a872656.js';
 import 'hookable';
 
 type VcrConfig = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apibara/indexer",
-  "version": "2.0.0-beta.35",
+  "version": "2.0.0-beta.36",
   "type": "module",
   "files": [
     "dist",
@@ -58,7 +58,7 @@
     "vitest": "^1.6.0"
   },
   "dependencies": {
-    "@apibara/protocol": "2.0.0-beta.35",
+    "@apibara/protocol": "2.0.0-beta.36",
     "@opentelemetry/api": "^1.9.0",
     "ci-info": "^4.1.0",
     "consola": "^3.2.3",

package/src/indexer.ts

@@ -63,11 +63,24 @@ export interface IndexerHooks<TFilter, TBlock> {
   "message:systemMessage": ({ message }: { message: SystemMessage }) => void;
 }
 
-export interface IndexerConfig<TFilter, TBlock> {
+export type IndexerStartingCursor =
+  | {
+      startingCursor?: never;
+      startingBlock: bigint;
+    }
+  | {
+      startingCursor: Cursor;
+      startingBlock?: never;
+    }
+  | {
+      startingCursor?: never;
+      startingBlock?: never;
+    };
+
+export type IndexerConfig<TFilter, TBlock> = {
   streamUrl: string;
   filter: TFilter;
   finality?: DataFinality;
-  startingCursor?: Cursor;
   factory?: ({
     block,
     context,
@@ -84,12 +97,14 @@ export interface IndexerConfig<TFilter, TBlock> {
   hooks?: NestedHooks<IndexerHooks<TFilter, TBlock>>;
   plugins?: ReadonlyArray<IndexerPlugin<TFilter, TBlock>>;
   debug?: boolean;
-}
+} & IndexerStartingCursor;
 
-export interface IndexerWithStreamConfig<TFilter, TBlock>
-  extends IndexerConfig<TFilter, TBlock> {
+export type IndexerWithStreamConfig<TFilter, TBlock> = IndexerConfig<
+  TFilter,
+  TBlock
+> & {
   streamConfig: StreamConfig<TFilter, TBlock>;
-}
+};
 
 export function defineIndexer<TFilter, TBlock>(
   streamConfig: StreamConfig<TFilter, TBlock>,
@@ -203,16 +218,25 @@ export async function run<TFilter, TBlock>(
 
     await indexer.hooks.callHook("run:before");
 
-    // Check if the it's factory mode or not
     const isFactoryMode = indexer.options.factory !== undefined;
 
-    // if factory mode we add a empty filter
+    // 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,
+      };
+    }
+
+    // if factory mode we add a empty filter at the end of the filter array.
     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,
     });
 
     const options: StreamDataOptions = {};
@@ -225,7 +249,6 @@ export async function run<TFilter, TBlock>(
       mainFilter = request.filter[1];
     }
 
-    // create stream
     let stream: AsyncIterator<
       StreamDataResponse<TBlock>,
       StreamDataResponse<TBlock>