@apibara/protocol 2.1.0-beta.52 → 2.1.0-beta.54

package/dist/index.cjs

@@ -6,7 +6,7 @@ const assert = require('node:assert');
 const consola = require('consola');
 const niceGrpc = require('nice-grpc');
 require('protobufjs/minimal.js');
-const rpc_index = require('./shared/protocol.54f17699.cjs');
+const rpc_index = require('./shared/protocol.a44ea889.cjs');
 require('viem');
 require('long');
 

package/dist/index.d.cts

@@ -1,7 +1,7 @@
 import { s as stream } from './shared/protocol.0e734e33.cjs';
 export { B as Bytes, b as BytesFromUint8Array, w as Client, u as ClientCallOptions, x as CreateClientOptions, C as Cursor, e as CursorFromBytes, c as CursorProto, q as Data, g as DataFinality, h as DataProduction, D as DnaStreamClient, a as DnaStreamDefinition, k as Duration, j as DurationCodec, F as Finalize, G as GrpcClient, H as Heartbeat, I as Invalidate, R as ResponseWithoutData, S as StatusRequest, f as StatusResponse, o as StdErr, m as StdOut, t as StreamConfig, A as StreamDataIterable, v as StreamDataOptions, l as StreamDataRequest, r as StreamDataResponse, p as SystemMessage, T as TimeoutError, z as createAuthenticatedClient, y as createClient, d as createCursor, i as isCursor, n as normalizeCursor } from './shared/protocol.0e734e33.cjs';
 import _m0 from 'protobufjs/minimal.js';
-export { i as rpc } from './shared/protocol.7aa4aab6.cjs';
+export { i as rpc } from './shared/protocol.5dc2fc0d.cjs';
 export { ClientError, Metadata, ServerError, Status } from 'nice-grpc';
 import './codec.cjs';
 import 'nice-grpc-common';

package/dist/index.d.mts

@@ -1,7 +1,7 @@
 import { s as stream } from './shared/protocol.21e66b9e.mjs';
 export { B as Bytes, b as BytesFromUint8Array, w as Client, u as ClientCallOptions, x as CreateClientOptions, C as Cursor, e as CursorFromBytes, c as CursorProto, q as Data, g as DataFinality, h as DataProduction, D as DnaStreamClient, a as DnaStreamDefinition, k as Duration, j as DurationCodec, F as Finalize, G as GrpcClient, H as Heartbeat, I as Invalidate, R as ResponseWithoutData, S as StatusRequest, f as StatusResponse, o as StdErr, m as StdOut, t as StreamConfig, A as StreamDataIterable, v as StreamDataOptions, l as StreamDataRequest, r as StreamDataResponse, p as SystemMessage, T as TimeoutError, z as createAuthenticatedClient, y as createClient, d as createCursor, i as isCursor, n as normalizeCursor } from './shared/protocol.21e66b9e.mjs';
 import _m0 from 'protobufjs/minimal.js';
-export { i as rpc } from './shared/protocol.6ab8d6dd.mjs';
+export { i as rpc } from './shared/protocol.1a69a01d.mjs';
 export { ClientError, Metadata, ServerError, Status } from 'nice-grpc';
 import './codec.mjs';
 import 'nice-grpc-common';

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { s as stream } from './shared/protocol.8fb09325.js';
 export { B as Bytes, b as BytesFromUint8Array, w as Client, u as ClientCallOptions, x as CreateClientOptions, C as Cursor, e as CursorFromBytes, c as CursorProto, q as Data, g as DataFinality, h as DataProduction, D as DnaStreamClient, a as DnaStreamDefinition, k as Duration, j as DurationCodec, F as Finalize, G as GrpcClient, H as Heartbeat, I as Invalidate, R as ResponseWithoutData, S as StatusRequest, f as StatusResponse, o as StdErr, m as StdOut, t as StreamConfig, A as StreamDataIterable, v as StreamDataOptions, l as StreamDataRequest, r as StreamDataResponse, p as SystemMessage, T as TimeoutError, z as createAuthenticatedClient, y as createClient, d as createCursor, i as isCursor, n as normalizeCursor } from './shared/protocol.8fb09325.js';
 import _m0 from 'protobufjs/minimal.js';
-export { i as rpc } from './shared/protocol.8407f25e.js';
+export { i as rpc } from './shared/protocol.1b2e5598.js';
 export { ClientError, Metadata, ServerError, Status } from 'nice-grpc';
 import './codec.js';
 import 'nice-grpc-common';

package/dist/index.mjs

@@ -6,7 +6,7 @@ import consola from 'consola';
 import { createChannel, createClient as createClient$1, Metadata } from 'nice-grpc';
 export { ClientError, Metadata, ServerError, Status } from 'nice-grpc';
 import 'protobufjs/minimal.js';
-export { i as rpc } from './shared/protocol.bde61588.mjs';
+export { i as rpc } from './shared/protocol.e329df99.mjs';
 import 'viem';
 import 'long';
 

package/dist/rpc/index.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-const rpc_index = require('../shared/protocol.54f17699.cjs');
+const rpc_index = require('../shared/protocol.a44ea889.cjs');
 require('viem');
 
 

package/dist/rpc/index.d.cts

@@ -1,4 +1,4 @@
-export { B as BlockInfo, c as FetchBlockByNumberArgs, d as FetchBlockByNumberResult, F as FetchBlockRangeArgs, b as FetchBlockRangeResult, a as FetchBlockResult, e as FetchCursorArgs, f as RpcClient, h as RpcDataStream, R as RpcStreamConfig, V as ValidateFilterResult, g as createRpcClient } from '../shared/protocol.7aa4aab6.cjs';
+export { B as BlockInfo, c as FetchBlockByHashArgs, d as FetchBlockByHashResult, F as FetchBlockRangeArgs, b as FetchBlockRangeResult, a as FetchBlockResult, e as FetchCursorArgs, f as FetchCursorRangeArgs, g as RpcClient, j as RpcDataStream, R as RpcStreamConfig, V as ValidateFilterResult, h as createRpcClient } from '../shared/protocol.5dc2fc0d.cjs';
 import '../shared/protocol.0e734e33.cjs';
 import '../codec.cjs';
 import 'nice-grpc-common';

package/dist/rpc/index.d.mts

@@ -1,4 +1,4 @@
-export { B as BlockInfo, c as FetchBlockByNumberArgs, d as FetchBlockByNumberResult, F as FetchBlockRangeArgs, b as FetchBlockRangeResult, a as FetchBlockResult, e as FetchCursorArgs, f as RpcClient, h as RpcDataStream, R as RpcStreamConfig, V as ValidateFilterResult, g as createRpcClient } from '../shared/protocol.6ab8d6dd.mjs';
+export { B as BlockInfo, c as FetchBlockByHashArgs, d as FetchBlockByHashResult, F as FetchBlockRangeArgs, b as FetchBlockRangeResult, a as FetchBlockResult, e as FetchCursorArgs, f as FetchCursorRangeArgs, g as RpcClient, j as RpcDataStream, R as RpcStreamConfig, V as ValidateFilterResult, h as createRpcClient } from '../shared/protocol.1a69a01d.mjs';
 import '../shared/protocol.21e66b9e.mjs';
 import '../codec.mjs';
 import 'nice-grpc-common';

package/dist/rpc/index.d.ts

@@ -1,4 +1,4 @@
-export { B as BlockInfo, c as FetchBlockByNumberArgs, d as FetchBlockByNumberResult, F as FetchBlockRangeArgs, b as FetchBlockRangeResult, a as FetchBlockResult, e as FetchCursorArgs, f as RpcClient, h as RpcDataStream, R as RpcStreamConfig, V as ValidateFilterResult, g as createRpcClient } from '../shared/protocol.8407f25e.js';
+export { B as BlockInfo, c as FetchBlockByHashArgs, d as FetchBlockByHashResult, F as FetchBlockRangeArgs, b as FetchBlockRangeResult, a as FetchBlockResult, e as FetchCursorArgs, f as FetchCursorRangeArgs, g as RpcClient, j as RpcDataStream, R as RpcStreamConfig, V as ValidateFilterResult, h as createRpcClient } from '../shared/protocol.1b2e5598.js';
 import '../shared/protocol.8fb09325.js';
 import '../codec.js';
 import 'nice-grpc-common';

package/dist/rpc/index.mjs

@@ -1,3 +1,3 @@
-export { a as RpcClient, b as RpcDataStream, R as RpcStreamConfig, c as createRpcClient } from '../shared/protocol.bde61588.mjs';
+export { a as RpcClient, b as RpcDataStream, R as RpcStreamConfig, c as createRpcClient } from '../shared/protocol.e329df99.mjs';
 import 'viem';
 //# sourceMappingURL=index.mjs.map

package/dist/shared/{protocol.6ab8d6dd.d.mts → protocol.1a69a01d.d.mts}

@@ -2,7 +2,7 @@ import { C as Cursor, B as Bytes, w as Client, S as StatusRequest, u as ClientCa
 
 type FetchBlockRangeArgs<TFilter> = {
     startBlock: bigint;
-    finalizedBlock: bigint;
+    maxBlock: bigint;
     force: boolean;
     filter: TFilter;
 };
@@ -21,19 +21,18 @@ type BlockInfo = {
     blockHash: Bytes;
     parentBlockHash: Bytes;
 };
-type FetchBlockByNumberArgs<TFilter> = {
-    blockNumber: bigint;
-    expectedParentBlockHash: Bytes;
+type FetchBlockByHashArgs<TFilter> = {
+    blockHash: Bytes;
     isAtHead: boolean;
     filter: TFilter;
 };
-type FetchBlockByNumberResult<TBlock> = {
-    status: "success";
+type FetchBlockByHashResult<TBlock> = {
     data: FetchBlockResult<TBlock>;
     blockInfo: BlockInfo;
-} | {
-    status: "reorg";
-    blockInfo: BlockInfo;
+};
+type FetchCursorRangeArgs = {
+    startBlockNumber: bigint;
+    endBlockNumber: bigint;
 };
 type FetchCursorArgs = {
     blockTag: "latest" | "finalized";
@@ -58,10 +57,11 @@ type ValidateFilterResult = {
 declare abstract class RpcStreamConfig<TFilter, TBlock> {
     abstract headRefreshIntervalMs(): number;
     abstract finalizedRefreshIntervalMs(): number;
+    abstract fetchCursorRange(args: FetchCursorRangeArgs): Promise<BlockInfo[]>;
     abstract fetchCursor(args: FetchCursorArgs): Promise<BlockInfo | null>;
     abstract validateFilter(filter: TFilter): ValidateFilterResult;
     abstract fetchBlockRange(args: FetchBlockRangeArgs<TFilter>): Promise<FetchBlockRangeResult<TBlock>>;
-    abstract fetchBlockByNumber(args: FetchBlockByNumberArgs<TFilter>): Promise<FetchBlockByNumberResult<TBlock>>;
+    abstract fetchBlockByHash(args: FetchBlockByHashArgs<TFilter>): Promise<FetchBlockByHashResult<TBlock>>;
 }
 
 declare class RpcClient<TFilter, TBlock> implements Client<TFilter, TBlock> {
@@ -83,12 +83,13 @@ declare class RpcDataStream<TFilter, TBlock> {
 }
 
 type index_BlockInfo = BlockInfo;
-type index_FetchBlockByNumberArgs<TFilter> = FetchBlockByNumberArgs<TFilter>;
-type index_FetchBlockByNumberResult<TBlock> = FetchBlockByNumberResult<TBlock>;
+type index_FetchBlockByHashArgs<TFilter> = FetchBlockByHashArgs<TFilter>;
+type index_FetchBlockByHashResult<TBlock> = FetchBlockByHashResult<TBlock>;
 type index_FetchBlockRangeArgs<TFilter> = FetchBlockRangeArgs<TFilter>;
 type index_FetchBlockRangeResult<TBlock> = FetchBlockRangeResult<TBlock>;
 type index_FetchBlockResult<TBlock> = FetchBlockResult<TBlock>;
 type index_FetchCursorArgs = FetchCursorArgs;
+type index_FetchCursorRangeArgs = FetchCursorRangeArgs;
 type index_RpcClient<TFilter, TBlock> = RpcClient<TFilter, TBlock>;
 declare const index_RpcClient: typeof RpcClient;
 type index_RpcDataStream<TFilter, TBlock> = RpcDataStream<TFilter, TBlock>;
@@ -98,7 +99,7 @@ declare const index_RpcStreamConfig: typeof RpcStreamConfig;
 type index_ValidateFilterResult = ValidateFilterResult;
 declare const index_createRpcClient: typeof createRpcClient;
 declare namespace index {
-  export { type index_BlockInfo as BlockInfo, type index_FetchBlockByNumberArgs as FetchBlockByNumberArgs, type index_FetchBlockByNumberResult as FetchBlockByNumberResult, type index_FetchBlockRangeArgs as FetchBlockRangeArgs, type index_FetchBlockRangeResult as FetchBlockRangeResult, type index_FetchBlockResult as FetchBlockResult, type index_FetchCursorArgs as FetchCursorArgs, index_RpcClient as RpcClient, index_RpcDataStream as RpcDataStream, index_RpcStreamConfig as RpcStreamConfig, type index_ValidateFilterResult as ValidateFilterResult, index_createRpcClient as createRpcClient };
+  export { type index_BlockInfo as BlockInfo, type index_FetchBlockByHashArgs as FetchBlockByHashArgs, type index_FetchBlockByHashResult as FetchBlockByHashResult, type index_FetchBlockRangeArgs as FetchBlockRangeArgs, type index_FetchBlockRangeResult as FetchBlockRangeResult, type index_FetchBlockResult as FetchBlockResult, type index_FetchCursorArgs as FetchCursorArgs, type index_FetchCursorRangeArgs as FetchCursorRangeArgs, index_RpcClient as RpcClient, index_RpcDataStream as RpcDataStream, index_RpcStreamConfig as RpcStreamConfig, type index_ValidateFilterResult as ValidateFilterResult, index_createRpcClient as createRpcClient };
 }
 
-export { type BlockInfo as B, type FetchBlockRangeArgs as F, RpcStreamConfig as R, type ValidateFilterResult as V, type FetchBlockResult as a, type FetchBlockRangeResult as b, type FetchBlockByNumberArgs as c, type FetchBlockByNumberResult as d, type FetchCursorArgs as e, RpcClient as f, createRpcClient as g, RpcDataStream as h, index as i };
+export { type BlockInfo as B, type FetchBlockRangeArgs as F, RpcStreamConfig as R, type ValidateFilterResult as V, type FetchBlockResult as a, type FetchBlockRangeResult as b, type FetchBlockByHashArgs as c, type FetchBlockByHashResult as d, type FetchCursorArgs as e, type FetchCursorRangeArgs as f, RpcClient as g, createRpcClient as h, index as i, RpcDataStream as j };

package/dist/shared/{protocol.8407f25e.d.ts → protocol.1b2e5598.d.ts}

@@ -2,7 +2,7 @@ import { C as Cursor, B as Bytes, w as Client, S as StatusRequest, u as ClientCa
 
 type FetchBlockRangeArgs<TFilter> = {
     startBlock: bigint;
-    finalizedBlock: bigint;
+    maxBlock: bigint;
     force: boolean;
     filter: TFilter;
 };
@@ -21,19 +21,18 @@ type BlockInfo = {
     blockHash: Bytes;
     parentBlockHash: Bytes;
 };
-type FetchBlockByNumberArgs<TFilter> = {
-    blockNumber: bigint;
-    expectedParentBlockHash: Bytes;
+type FetchBlockByHashArgs<TFilter> = {
+    blockHash: Bytes;
     isAtHead: boolean;
     filter: TFilter;
 };
-type FetchBlockByNumberResult<TBlock> = {
-    status: "success";
+type FetchBlockByHashResult<TBlock> = {
     data: FetchBlockResult<TBlock>;
     blockInfo: BlockInfo;
-} | {
-    status: "reorg";
-    blockInfo: BlockInfo;
+};
+type FetchCursorRangeArgs = {
+    startBlockNumber: bigint;
+    endBlockNumber: bigint;
 };
 type FetchCursorArgs = {
     blockTag: "latest" | "finalized";
@@ -58,10 +57,11 @@ type ValidateFilterResult = {
 declare abstract class RpcStreamConfig<TFilter, TBlock> {
     abstract headRefreshIntervalMs(): number;
     abstract finalizedRefreshIntervalMs(): number;
+    abstract fetchCursorRange(args: FetchCursorRangeArgs): Promise<BlockInfo[]>;
     abstract fetchCursor(args: FetchCursorArgs): Promise<BlockInfo | null>;
     abstract validateFilter(filter: TFilter): ValidateFilterResult;
     abstract fetchBlockRange(args: FetchBlockRangeArgs<TFilter>): Promise<FetchBlockRangeResult<TBlock>>;
-    abstract fetchBlockByNumber(args: FetchBlockByNumberArgs<TFilter>): Promise<FetchBlockByNumberResult<TBlock>>;
+    abstract fetchBlockByHash(args: FetchBlockByHashArgs<TFilter>): Promise<FetchBlockByHashResult<TBlock>>;
 }
 
 declare class RpcClient<TFilter, TBlock> implements Client<TFilter, TBlock> {
@@ -83,12 +83,13 @@ declare class RpcDataStream<TFilter, TBlock> {
 }
 
 type index_BlockInfo = BlockInfo;
-type index_FetchBlockByNumberArgs<TFilter> = FetchBlockByNumberArgs<TFilter>;
-type index_FetchBlockByNumberResult<TBlock> = FetchBlockByNumberResult<TBlock>;
+type index_FetchBlockByHashArgs<TFilter> = FetchBlockByHashArgs<TFilter>;
+type index_FetchBlockByHashResult<TBlock> = FetchBlockByHashResult<TBlock>;
 type index_FetchBlockRangeArgs<TFilter> = FetchBlockRangeArgs<TFilter>;
 type index_FetchBlockRangeResult<TBlock> = FetchBlockRangeResult<TBlock>;
 type index_FetchBlockResult<TBlock> = FetchBlockResult<TBlock>;
 type index_FetchCursorArgs = FetchCursorArgs;
+type index_FetchCursorRangeArgs = FetchCursorRangeArgs;
 type index_RpcClient<TFilter, TBlock> = RpcClient<TFilter, TBlock>;
 declare const index_RpcClient: typeof RpcClient;
 type index_RpcDataStream<TFilter, TBlock> = RpcDataStream<TFilter, TBlock>;
@@ -98,7 +99,7 @@ declare const index_RpcStreamConfig: typeof RpcStreamConfig;
 type index_ValidateFilterResult = ValidateFilterResult;
 declare const index_createRpcClient: typeof createRpcClient;
 declare namespace index {
-  export { type index_BlockInfo as BlockInfo, type index_FetchBlockByNumberArgs as FetchBlockByNumberArgs, type index_FetchBlockByNumberResult as FetchBlockByNumberResult, type index_FetchBlockRangeArgs as FetchBlockRangeArgs, type index_FetchBlockRangeResult as FetchBlockRangeResult, type index_FetchBlockResult as FetchBlockResult, type index_FetchCursorArgs as FetchCursorArgs, index_RpcClient as RpcClient, index_RpcDataStream as RpcDataStream, index_RpcStreamConfig as RpcStreamConfig, type index_ValidateFilterResult as ValidateFilterResult, index_createRpcClient as createRpcClient };
+  export { type index_BlockInfo as BlockInfo, type index_FetchBlockByHashArgs as FetchBlockByHashArgs, type index_FetchBlockByHashResult as FetchBlockByHashResult, type index_FetchBlockRangeArgs as FetchBlockRangeArgs, type index_FetchBlockRangeResult as FetchBlockRangeResult, type index_FetchBlockResult as FetchBlockResult, type index_FetchCursorArgs as FetchCursorArgs, type index_FetchCursorRangeArgs as FetchCursorRangeArgs, index_RpcClient as RpcClient, index_RpcDataStream as RpcDataStream, index_RpcStreamConfig as RpcStreamConfig, type index_ValidateFilterResult as ValidateFilterResult, index_createRpcClient as createRpcClient };
 }
 
-export { type BlockInfo as B, type FetchBlockRangeArgs as F, RpcStreamConfig as R, type ValidateFilterResult as V, type FetchBlockResult as a, type FetchBlockRangeResult as b, type FetchBlockByNumberArgs as c, type FetchBlockByNumberResult as d, type FetchCursorArgs as e, RpcClient as f, createRpcClient as g, RpcDataStream as h, index as i };
+export { type BlockInfo as B, type FetchBlockRangeArgs as F, RpcStreamConfig as R, type ValidateFilterResult as V, type FetchBlockResult as a, type FetchBlockRangeResult as b, type FetchBlockByHashArgs as c, type FetchBlockByHashResult as d, type FetchCursorArgs as e, type FetchCursorRangeArgs as f, RpcClient as g, createRpcClient as h, index as i, RpcDataStream as j };

package/dist/shared/{protocol.7aa4aab6.d.cts → protocol.5dc2fc0d.d.cts}

@@ -2,7 +2,7 @@ import { C as Cursor, B as Bytes, w as Client, S as StatusRequest, u as ClientCa
 
 type FetchBlockRangeArgs<TFilter> = {
     startBlock: bigint;
-    finalizedBlock: bigint;
+    maxBlock: bigint;
     force: boolean;
     filter: TFilter;
 };
@@ -21,19 +21,18 @@ type BlockInfo = {
     blockHash: Bytes;
     parentBlockHash: Bytes;
 };
-type FetchBlockByNumberArgs<TFilter> = {
-    blockNumber: bigint;
-    expectedParentBlockHash: Bytes;
+type FetchBlockByHashArgs<TFilter> = {
+    blockHash: Bytes;
     isAtHead: boolean;
     filter: TFilter;
 };
-type FetchBlockByNumberResult<TBlock> = {
-    status: "success";
+type FetchBlockByHashResult<TBlock> = {
     data: FetchBlockResult<TBlock>;
     blockInfo: BlockInfo;
-} | {
-    status: "reorg";
-    blockInfo: BlockInfo;
+};
+type FetchCursorRangeArgs = {
+    startBlockNumber: bigint;
+    endBlockNumber: bigint;
 };
 type FetchCursorArgs = {
     blockTag: "latest" | "finalized";
@@ -58,10 +57,11 @@ type ValidateFilterResult = {
 declare abstract class RpcStreamConfig<TFilter, TBlock> {
     abstract headRefreshIntervalMs(): number;
     abstract finalizedRefreshIntervalMs(): number;
+    abstract fetchCursorRange(args: FetchCursorRangeArgs): Promise<BlockInfo[]>;
     abstract fetchCursor(args: FetchCursorArgs): Promise<BlockInfo | null>;
     abstract validateFilter(filter: TFilter): ValidateFilterResult;
     abstract fetchBlockRange(args: FetchBlockRangeArgs<TFilter>): Promise<FetchBlockRangeResult<TBlock>>;
-    abstract fetchBlockByNumber(args: FetchBlockByNumberArgs<TFilter>): Promise<FetchBlockByNumberResult<TBlock>>;
+    abstract fetchBlockByHash(args: FetchBlockByHashArgs<TFilter>): Promise<FetchBlockByHashResult<TBlock>>;
 }
 
 declare class RpcClient<TFilter, TBlock> implements Client<TFilter, TBlock> {
@@ -83,12 +83,13 @@ declare class RpcDataStream<TFilter, TBlock> {
 }
 
 type index_BlockInfo = BlockInfo;
-type index_FetchBlockByNumberArgs<TFilter> = FetchBlockByNumberArgs<TFilter>;
-type index_FetchBlockByNumberResult<TBlock> = FetchBlockByNumberResult<TBlock>;
+type index_FetchBlockByHashArgs<TFilter> = FetchBlockByHashArgs<TFilter>;
+type index_FetchBlockByHashResult<TBlock> = FetchBlockByHashResult<TBlock>;
 type index_FetchBlockRangeArgs<TFilter> = FetchBlockRangeArgs<TFilter>;
 type index_FetchBlockRangeResult<TBlock> = FetchBlockRangeResult<TBlock>;
 type index_FetchBlockResult<TBlock> = FetchBlockResult<TBlock>;
 type index_FetchCursorArgs = FetchCursorArgs;
+type index_FetchCursorRangeArgs = FetchCursorRangeArgs;
 type index_RpcClient<TFilter, TBlock> = RpcClient<TFilter, TBlock>;
 declare const index_RpcClient: typeof RpcClient;
 type index_RpcDataStream<TFilter, TBlock> = RpcDataStream<TFilter, TBlock>;
@@ -98,7 +99,7 @@ declare const index_RpcStreamConfig: typeof RpcStreamConfig;
 type index_ValidateFilterResult = ValidateFilterResult;
 declare const index_createRpcClient: typeof createRpcClient;
 declare namespace index {
-  export { type index_BlockInfo as BlockInfo, type index_FetchBlockByNumberArgs as FetchBlockByNumberArgs, type index_FetchBlockByNumberResult as FetchBlockByNumberResult, type index_FetchBlockRangeArgs as FetchBlockRangeArgs, type index_FetchBlockRangeResult as FetchBlockRangeResult, type index_FetchBlockResult as FetchBlockResult, type index_FetchCursorArgs as FetchCursorArgs, index_RpcClient as RpcClient, index_RpcDataStream as RpcDataStream, index_RpcStreamConfig as RpcStreamConfig, type index_ValidateFilterResult as ValidateFilterResult, index_createRpcClient as createRpcClient };
+  export { type index_BlockInfo as BlockInfo, type index_FetchBlockByHashArgs as FetchBlockByHashArgs, type index_FetchBlockByHashResult as FetchBlockByHashResult, type index_FetchBlockRangeArgs as FetchBlockRangeArgs, type index_FetchBlockRangeResult as FetchBlockRangeResult, type index_FetchBlockResult as FetchBlockResult, type index_FetchCursorArgs as FetchCursorArgs, type index_FetchCursorRangeArgs as FetchCursorRangeArgs, index_RpcClient as RpcClient, index_RpcDataStream as RpcDataStream, index_RpcStreamConfig as RpcStreamConfig, type index_ValidateFilterResult as ValidateFilterResult, index_createRpcClient as createRpcClient };
 }
 
-export { type BlockInfo as B, type FetchBlockRangeArgs as F, RpcStreamConfig as R, type ValidateFilterResult as V, type FetchBlockResult as a, type FetchBlockRangeResult as b, type FetchBlockByNumberArgs as c, type FetchBlockByNumberResult as d, type FetchCursorArgs as e, RpcClient as f, createRpcClient as g, RpcDataStream as h, index as i };
+export { type BlockInfo as B, type FetchBlockRangeArgs as F, RpcStreamConfig as R, type ValidateFilterResult as V, type FetchBlockResult as a, type FetchBlockRangeResult as b, type FetchBlockByHashArgs as c, type FetchBlockByHashResult as d, type FetchCursorArgs as e, type FetchCursorRangeArgs as f, RpcClient as g, createRpcClient as h, index as i, RpcDataStream as j };

package/dist/shared/{protocol.54f17699.cjs → protocol.a44ea889.cjs}

@@ -30,14 +30,20 @@ var __privateSet = (obj, member, value, setter) => {
   setter ? setter.call(obj, value) : member.set(obj, value);
   return value;
 };
-var _finalized, _head, _canonical;
+var _finalized, _head, _canonical, _batchSize;
 class ChainTracker {
-  constructor({ head, finalized }) {
+  constructor({
+    head,
+    finalized,
+    batchSize
+  }) {
     __privateAdd(this, _finalized, void 0);
     __privateAdd(this, _head, void 0);
     __privateAdd(this, _canonical, void 0);
+    __privateAdd(this, _batchSize, void 0);
     __privateSet(this, _finalized, finalized);
     __privateSet(this, _head, head);
+    __privateSet(this, _batchSize, batchSize);
     __privateSet(this, _canonical, /* @__PURE__ */ new Map([
       [finalized.blockNumber, finalized],
       [head.blockNumber, head]
@@ -87,7 +93,8 @@ class ChainTracker {
   }
   async updateHead({
     newHead,
-    fetchCursorByHash
+    fetchCursorByHash,
+    fetchCursorRange
   }) {
     if (newHead.blockNumber === __privateGet(this, _head).blockNumber && newHead.blockHash === __privateGet(this, _head).blockHash) {
       return { status: "unchanged" };
@@ -137,46 +144,43 @@ class ChainTracker {
       }
       throw new Error("Cannot reconcile new head with canonical chain.");
     }
-    let current = newHead;
-    let reorgDetected = false;
-    const blocksToApply = [newHead];
+    let currentBlockNumber = __privateGet(this, _head).blockNumber + 1n;
     while (true) {
-      const parent = await fetchCursorByHash(current.parentBlockHash);
-      if (!parent) {
-        throw new Error(
-          "Cannot reconcile new head with canonical chain: failed to fetch parent"
-        );
+      let endBlockNumber = currentBlockNumber + __privateGet(this, _batchSize);
+      if (endBlockNumber > newHead.blockNumber) {
+        endBlockNumber = newHead.blockNumber;
       }
-      if (parent.blockNumber === __privateGet(this, _head).blockNumber) {
-        if (parent.blockHash === __privateGet(this, _head).blockHash) {
-          break;
-        }
-        const headParent = __privateGet(this, _canonical).get(__privateGet(this, _head).blockNumber - 1n);
-        if (!headParent) {
+      const missing = await fetchCursorRange({
+        startBlockNumber: currentBlockNumber,
+        endBlockNumber
+      });
+      for (const block of missing) {
+        const canonicalParent = __privateGet(this, _canonical).get(block.blockNumber - 1n);
+        if (!canonicalParent || canonicalParent.blockHash !== block.parentBlockHash) {
           throw new Error(
-            "Cannot reconcile new head with canonical chain: missing parent in canonical chain"
+            "Chain reorganization detected. Recovery not implemented"
           );
         }
-        __privateGet(this, _canonical).delete(__privateGet(this, _head).blockNumber);
-        __privateSet(this, _head, headParent);
-        reorgDetected = true;
+        __privateGet(this, _canonical).set(block.blockNumber, block);
       }
-      blocksToApply.push(parent);
-      current = parent;
-    }
-    for (const block of blocksToApply.reverse()) {
-      __privateGet(this, _canonical).set(block.blockNumber, block);
+      if (endBlockNumber === newHead.blockNumber) {
+        break;
+      }
+      currentBlockNumber = endBlockNumber + 1n;
     }
-    const previousHead = __privateGet(this, _head);
     __privateSet(this, _head, newHead);
-    if (reorgDetected) {
-      return {
-        status: "reorg",
-        cursor: blockInfoToCursor(previousHead)
-      };
-    }
     return { status: "success" };
   }
+  isCanonical({ orderKey, uniqueKey }) {
+    if (!uniqueKey) {
+      return true;
+    }
+    const block = __privateGet(this, _canonical).get(orderKey);
+    if (!block) {
+      return true;
+    }
+    return block.blockHash === uniqueKey;
+  }
   async initializeStartingCursor({
     cursor,
     fetchCursor
@@ -230,11 +234,13 @@ class ChainTracker {
 _finalized = new WeakMap();
 _head = new WeakMap();
 _canonical = new WeakMap();
+_batchSize = new WeakMap();
 function createChainTracker({
   head,
-  finalized
+  finalized,
+  batchSize
 }) {
-  return new ChainTracker({ finalized, head });
+  return new ChainTracker({ finalized, head, batchSize });
 }
 
 var __defProp = Object.defineProperty;
@@ -275,7 +281,8 @@ class RpcDataStream {
     }
     const chainTracker = createChainTracker({
       head,
-      finalized
+      finalized,
+      batchSize: 20n
     });
     let cursor;
     if (this.request.startingCursor) {
@@ -295,7 +302,9 @@ class RpcDataStream {
       cursor,
       lastHeartbeat: Date.now(),
       lastFinalizedRefresh: Date.now(),
+      lastHeadRefresh: Date.now(),
       lastBackfillMessage: Date.now(),
+      lastEmptyBlockNumber: void 0,
       chainTracker,
       config: this.config,
       heartbeatIntervalMs: this.heartbeatIntervalMs,
@@ -332,7 +341,7 @@ async function* dataStreamLoop(state) {
       if (isAtHead(state)) {
         yield* waitForHeadChange(state);
       } else {
-        yield* produceNextBlock(state);
+        yield* produceLiveBlocks(state);
       }
     }
   }
@@ -343,7 +352,7 @@ async function* backfillFinalizedBlocks(state) {
   const force = shouldForceBackfill(state);
   const filterData = await config.fetchBlockRange({
     startBlock: cursor.orderKey + 1n,
-    finalizedBlock: finalized.orderKey,
+    maxBlock: finalized.orderKey,
     force,
     filter
   });
@@ -372,43 +381,79 @@ async function* backfillFinalizedBlocks(state) {
     state.cursor = { orderKey: filterData.endBlock };
   }
 }
-async function* produceNextBlock(state) {
-  const currentBlockHash = state.cursor.uniqueKey;
-  if (currentBlockHash === void 0) {
-    throw new Error("Live production phase without cursor's hash.");
-  }
-  const result = await state.config.fetchBlockByNumber({
-    blockNumber: state.cursor.orderKey + 1n,
-    isAtHead: isAtHead(state),
-    expectedParentBlockHash: currentBlockHash,
-    filter: state.filter
-  });
-  if (result.status === "reorg") {
-    throw new Error("Reorg not implemented");
+async function* produceLiveBlocks(state) {
+  const { config, cursor, chainTracker, filter } = state;
+  if (shouldRefreshHead(state)) {
+    const maybeNewHead = await config.fetchCursor({ blockTag: "latest" });
+    if (maybeNewHead === null) {
+      throw new Error("Failed to fetch the latest block");
+    }
+    const result = await chainTracker.updateHead({
+      newHead: maybeNewHead,
+      fetchCursorByHash: (blockHash) => config.fetchCursor({ blockHash }),
+      fetchCursorRange: (args) => config.fetchCursorRange(args)
+    });
+    state.lastHeadRefresh = Date.now();
+    if (result.status === "reorg") {
+      const { cursor: cursor2 } = result;
+      if (cursor2.orderKey < state.cursor.orderKey || state.lastEmptyBlockNumber !== void 0 && cursor2.orderKey < state.lastEmptyBlockNumber) {
+        state.cursor = cursor2;
+        yield {
+          _tag: "invalidate",
+          invalidate: { cursor: cursor2 }
+        };
+        return;
+      }
+    }
   }
-  const { data, blockInfo } = result;
-  state.cursor = {
-    orderKey: blockInfo.blockNumber,
-    uniqueKey: blockInfo.blockHash
-  };
-  const { status: headUpdateStatus } = state.chainTracker.addToCanonicalChain({
-    blockInfo
+  const head = chainTracker.head();
+  const filterData = await config.fetchBlockRange({
+    startBlock: cursor.orderKey + 1n,
+    maxBlock: head.orderKey,
+    force: false,
+    filter
   });
-  if (headUpdateStatus !== "success") {
-    throw new Error("Failed to update head. Would cause reorg.");
+  if (filterData.data.length === 0 && head.uniqueKey !== void 0) {
+    if (state.lastEmptyBlockNumber === void 0 || head.orderKey > state.lastEmptyBlockNumber) {
+      const { data } = await config.fetchBlockByHash({
+        blockHash: head.uniqueKey,
+        isAtHead: true,
+        filter
+      });
+      yield {
+        _tag: "data",
+        data: {
+          cursor: data.cursor,
+          endCursor: data.endCursor,
+          data: [data.block],
+          finality: "accepted",
+          production: "live"
+        }
+      };
+      state.lastEmptyBlockNumber = head.orderKey;
+    }
   }
-  if (data.block !== null) {
-    state.lastHeartbeat = Date.now();
-    const production = isAtHead(state) ? "live" : "backfill";
-    yield {
-      _tag: "data",
-      data: {
-        cursor: data.cursor,
-        endCursor: data.endCursor,
-        data: [data.block],
-        finality: "accepted",
-        production
-      }
+  for (const { cursor: cursor2, endCursor, block } of filterData.data) {
+    if (!chainTracker.isCanonical(endCursor)) {
+      throw new Error("Trying to process non-canonical block");
+    }
+    if (block !== null) {
+      state.lastHeartbeat = Date.now();
+      const production = isAtHead(state) ? "live" : "backfill";
+      yield {
+        _tag: "data",
+        data: {
+          cursor: cursor2,
+          endCursor,
+          data: [block],
+          finality: "accepted",
+          production
+        }
+      };
+    }
+    state.cursor = {
+      orderKey: endCursor.orderKey,
+      uniqueKey: endCursor.uniqueKey
     };
   }
 }
@@ -427,7 +472,8 @@ async function* waitForHeadChange(state) {
     }
     const result = await chainTracker.updateHead({
       newHead: maybeNewHead,
-      fetchCursorByHash: (blockHash) => config.fetchCursor({ blockHash })
+      fetchCursorByHash: (blockHash) => config.fetchCursor({ blockHash }),
+      fetchCursorRange: (args) => config.fetchCursorRange(args)
     });
     switch (result.status) {
       case "unchanged": {
@@ -480,6 +526,11 @@ function shouldRefreshFinalized(state) {
   const now = Date.now();
   return now - lastFinalizedRefresh >= config.finalizedRefreshIntervalMs();
 }
+function shouldRefreshHead(state) {
+  const { lastHeadRefresh, config } = state;
+  const now = Date.now();
+  return now - lastHeadRefresh >= config.headRefreshIntervalMs();
+}
 function isAtHead(state) {
   const head = state.chainTracker.head();
   return state.cursor.orderKey === head.orderKey;
@@ -533,4 +584,4 @@ exports.RpcDataStream = RpcDataStream;
 exports.RpcStreamConfig = RpcStreamConfig;
 exports.createRpcClient = createRpcClient;
 exports.index = index;
-//# sourceMappingURL=protocol.54f17699.cjs.map
+//# sourceMappingURL=protocol.a44ea889.cjs.map