@apibara/plugin-drizzle 2.0.0-beta.38 → 2.0.0-beta.40

package/dist/index.cjs

@@ -4,6 +4,7 @@ const indexer = require('@apibara/indexer');
 const plugins = require('@apibara/indexer/plugins');
 const internal = require('@apibara/indexer/internal');
 const plugins$1 = require('@apibara/indexer/internal/plugins');
+const protocol = require('@apibara/protocol');
 const drizzleOrm = require('drizzle-orm');
 const pgCore = require('drizzle-orm/pg-core');
 
@@ -41,7 +42,7 @@ const SCHEMA_VERSION_TABLE_NAME = "__indexer_schema_version";
 const checkpoints = pgCore.pgTable(CHECKPOINTS_TABLE_NAME, {
   id: pgCore.text("id").notNull().primaryKey(),
   orderKey: pgCore.integer("order_key").notNull(),
-  uniqueKey: pgCore.text("unique_key").$type().notNull().default(void 0)
+  uniqueKey: pgCore.text("unique_key")
 });
 const filters = pgCore.pgTable(
   FILTERS_TABLE_NAME,
@@ -87,7 +88,7 @@ async function initializePersistentState(tx) {
         CREATE TABLE IF NOT EXISTS ${CHECKPOINTS_TABLE_NAME} (
           id TEXT PRIMARY KEY,
           order_key INTEGER NOT NULL,
-          unique_key TEXT NOT NULL DEFAULT ''
+          unique_key TEXT
         );
       `);
       await tx.execute(`
@@ -163,10 +164,10 @@ async function getState(props) {
   const { tx, indexerId } = props;
   try {
     const checkpointRows = await tx.select().from(checkpoints).where(drizzleOrm.eq(checkpoints.id, indexerId));
-    const cursor = checkpointRows[0] ? {
+    const cursor = checkpointRows[0] ? protocol.normalizeCursor({
       orderKey: BigInt(checkpointRows[0].orderKey),
       uniqueKey: checkpointRows[0].uniqueKey
-    } : void 0;
+    }) : void 0;
     const filterRows = await tx.select().from(filters).where(drizzleOrm.and(drizzleOrm.eq(filters.id, indexerId), drizzleOrm.isNull(filters.toBlock)));
     const filter = filterRows[0] ? deserialize(filterRows[0].filter) : void 0;
     return { cursor, filter };

package/dist/index.mjs

@@ -2,6 +2,7 @@ import { useIndexerContext } from '@apibara/indexer';
 import { defineIndexerPlugin } from '@apibara/indexer/plugins';
 import { generateIndexerId } from '@apibara/indexer/internal';
 import { useInternalContext } from '@apibara/indexer/internal/plugins';
+import { normalizeCursor } from '@apibara/protocol';
 import { eq, and, isNull, gt, lt, sql } from 'drizzle-orm';
 import { pgTable, text, integer, primaryKey, serial, char, jsonb } from 'drizzle-orm/pg-core';
 
@@ -39,7 +40,7 @@ const SCHEMA_VERSION_TABLE_NAME = "__indexer_schema_version";
 const checkpoints = pgTable(CHECKPOINTS_TABLE_NAME, {
   id: text("id").notNull().primaryKey(),
   orderKey: integer("order_key").notNull(),
-  uniqueKey: text("unique_key").$type().notNull().default(void 0)
+  uniqueKey: text("unique_key")
 });
 const filters = pgTable(
   FILTERS_TABLE_NAME,
@@ -85,7 +86,7 @@ async function initializePersistentState(tx) {
         CREATE TABLE IF NOT EXISTS ${CHECKPOINTS_TABLE_NAME} (
           id TEXT PRIMARY KEY,
           order_key INTEGER NOT NULL,
-          unique_key TEXT NOT NULL DEFAULT ''
+          unique_key TEXT
         );
       `);
       await tx.execute(`
@@ -161,10 +162,10 @@ async function getState(props) {
   const { tx, indexerId } = props;
   try {
     const checkpointRows = await tx.select().from(checkpoints).where(eq(checkpoints.id, indexerId));
-    const cursor = checkpointRows[0] ? {
+    const cursor = checkpointRows[0] ? normalizeCursor({
       orderKey: BigInt(checkpointRows[0].orderKey),
       uniqueKey: checkpointRows[0].uniqueKey
-    } : void 0;
+    }) : void 0;
     const filterRows = await tx.select().from(filters).where(and(eq(filters.id, indexerId), isNull(filters.toBlock)));
     const filter = filterRows[0] ? deserialize(filterRows[0].filter) : void 0;
     return { cursor, filter };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apibara/plugin-drizzle",
-  "version": "2.0.0-beta.38",
+  "version": "2.0.0-beta.40",
   "type": "module",
   "files": [
     "dist",
@@ -39,8 +39,8 @@
     "vitest": "^1.6.0"
   },
   "dependencies": {
-    "@apibara/indexer": "2.0.0-beta.39",
-    "@apibara/protocol": "2.0.0-beta.39",
+    "@apibara/indexer": "2.0.0-beta.40",
+    "@apibara/protocol": "2.0.0-beta.40",
     "postgres-range": "^1.1.4"
   }
 }

package/src/persistence.ts

@@ -1,4 +1,4 @@
-import type { Cursor } from "@apibara/protocol";
+import { type Cursor, normalizeCursor } from "@apibara/protocol";
 import { and, eq, gt, isNull, lt } from "drizzle-orm";
 import type {
   ExtractTablesWithRelations,
@@ -15,10 +15,7 @@ const SCHEMA_VERSION_TABLE_NAME = "__indexer_schema_version";
 export const checkpoints = pgTable(CHECKPOINTS_TABLE_NAME, {
   id: text("id").notNull().primaryKey(),
   orderKey: integer("order_key").notNull(),
-  uniqueKey: text("unique_key")
-    .$type<`0x${string}` | undefined>()
-    .notNull()
-    .default(undefined),
+  uniqueKey: text("unique_key"),
 });
 
 export const filters = pgTable(
@@ -87,7 +84,7 @@ export async function initializePersistentState<
         CREATE TABLE IF NOT EXISTS ${CHECKPOINTS_TABLE_NAME} (
           id TEXT PRIMARY KEY,
           order_key INTEGER NOT NULL,
-          unique_key TEXT NOT NULL DEFAULT ''
+          unique_key TEXT
         );
       `);
 
@@ -212,10 +209,10 @@ export async function getState<
       .where(eq(checkpoints.id, indexerId));
 
     const cursor = checkpointRows[0]
-      ? {
+      ? normalizeCursor({
           orderKey: BigInt(checkpointRows[0].orderKey),
           uniqueKey: checkpointRows[0].uniqueKey,
-        }
+        })
       : undefined;
 
     const filterRows = await tx