solforge 0.2.6 → 0.2.7

package/src/db/schema/tx-account-states.ts

@@ -0,0 +1,21 @@
+import { index, primaryKey, sqliteTable, text } from "drizzle-orm/sqlite-core";
+
+export const txAccountStates = sqliteTable(
+  "tx_account_states",
+  {
+    signature: text("signature").notNull(),
+    address: text("address").notNull(),
+    // JSON blobs capturing minimal account snapshot
+    // { lamports, ownerProgram, executable, rentEpoch, dataLen, dataBase64? }
+    preJson: text("pre_json"),
+    postJson: text("post_json"),
+  },
+  (t) => ({
+    pk: primaryKey({ columns: [t.signature, t.address], name: "pk_tx_account_states" }),
+    addrIdx: index("idx_tx_account_states_address").on(t.address),
+  }),
+);
+
+export type TxAccountStateRow = typeof txAccountStates.$inferSelect;
+export type NewTxAccountStateRow = typeof txAccountStates.$inferInsert;
+

package/src/db/tx-store.ts

@@ -4,27 +4,36 @@ import { accounts } from "./schema/accounts";
 import { addressSignatures } from "./schema/address-signatures";
 import { transactions } from "./schema/transactions";
 import { txAccounts } from "./schema/tx-accounts";
+import { txAccountStates } from "./schema/tx-account-states";
 
 export type InsertTxBundle = {
-	signature: string;
-	slot: number;
-	blockTime?: number;
-	version: 0 | "legacy";
-	fee: number;
-	err: unknown | null;
-	rawBase64: string;
-	preBalances: number[];
-	postBalances: number[];
-	logs: string[];
-	accounts: Array<{
-		address: string;
-		index: number;
-		signer: boolean;
-		writable: boolean;
-		programIdIndex?: number;
-	}>;
-	preTokenBalances?: unknown[];
-	postTokenBalances?: unknown[];
+    signature: string;
+    slot: number;
+    blockTime?: number;
+    version: 0 | "legacy";
+    fee: number;
+    err: unknown | null;
+    rawBase64: string;
+    preBalances: number[];
+    postBalances: number[];
+    logs: string[];
+    innerInstructions?: unknown[];
+    computeUnits?: number | bigint | null;
+    returnData?: { programId: string; dataBase64: string } | null;
+    accounts: Array<{
+        address: string;
+        index: number;
+        signer: boolean;
+        writable: boolean;
+        programIdIndex?: number;
+    }>;
+    preTokenBalances?: unknown[];
+    postTokenBalances?: unknown[];
+    accountStates?: Array<{
+        address: string;
+        pre?: Partial<AccountSnapshot> | null;
+        post?: Partial<AccountSnapshot> | null;
+    }>;
 };
 
 export type AccountSnapshot = {
@@ -39,57 +48,81 @@ export type AccountSnapshot = {
 };
 
 export class TxStore {
-	async insertTransactionBundle(bundle: InsertTxBundle): Promise<void> {
-		const errJson = bundle.err ? JSON.stringify(bundle.err) : null;
-		await db.transaction(async (tx) => {
-			await tx
-				.insert(transactions)
-				.values({
-					signature: bundle.signature,
-					slot: bundle.slot,
-					blockTime: bundle.blockTime ?? null,
-					version: String(bundle.version),
-					errJson,
-					fee: bundle.fee,
-					rawBase64: bundle.rawBase64,
-					preBalancesJson: JSON.stringify(bundle.preBalances ?? []),
-					postBalancesJson: JSON.stringify(bundle.postBalances ?? []),
-					logsJson: JSON.stringify(bundle.logs ?? []),
-					preTokenBalancesJson: JSON.stringify(bundle.preTokenBalances ?? []),
-					postTokenBalancesJson: JSON.stringify(bundle.postTokenBalances ?? []),
-				})
-				.onConflictDoNothing();
-
-			if (Array.isArray(bundle.accounts) && bundle.accounts.length > 0) {
-				await tx
-					.insert(txAccounts)
-					.values(
-						bundle.accounts.map((a) => ({
-							signature: bundle.signature,
-							accountIndex: a.index,
-							address: a.address,
-							signer: a.signer ? 1 : 0,
-							writable: a.writable ? 1 : 0,
-							programIdIndex: a.programIdIndex ?? null,
-						})),
-					)
-					.onConflictDoNothing();
-
-				await tx
-					.insert(addressSignatures)
-					.values(
-						bundle.accounts.map((a) => ({
-							address: a.address,
-							signature: bundle.signature,
-							slot: bundle.slot,
-							err: errJson ? 1 : 0,
-							blockTime: bundle.blockTime ?? null,
-						})),
-					)
-					.onConflictDoNothing();
-			}
-		});
-	}
+    async insertTransactionBundle(bundle: InsertTxBundle): Promise<void> {
+        const errJson = bundle.err ? JSON.stringify(bundle.err) : null;
+        await db.transaction(async (tx) => {
+            await tx
+                .insert(transactions)
+                .values({
+                    signature: bundle.signature,
+                    slot: bundle.slot,
+                    blockTime: bundle.blockTime ?? null,
+                    version: String(bundle.version),
+                    errJson,
+                    fee: bundle.fee,
+                    rawBase64: bundle.rawBase64,
+                    preBalancesJson: JSON.stringify(bundle.preBalances ?? []),
+                    postBalancesJson: JSON.stringify(bundle.postBalances ?? []),
+                    logsJson: JSON.stringify(bundle.logs ?? []),
+                    preTokenBalancesJson: JSON.stringify(bundle.preTokenBalances ?? []),
+                    postTokenBalancesJson: JSON.stringify(bundle.postTokenBalances ?? []),
+                    innerInstructionsJson: JSON.stringify(bundle.innerInstructions ?? []),
+                    computeUnits:
+                        bundle.computeUnits == null
+                            ? null
+                            : Number(bundle.computeUnits),
+                    returnDataProgramId: bundle.returnData?.programId ?? null,
+                    returnDataBase64: bundle.returnData?.dataBase64 ?? null,
+                })
+                .onConflictDoNothing();
+
+            if (Array.isArray(bundle.accounts) && bundle.accounts.length > 0) {
+                await tx
+                    .insert(txAccounts)
+                    .values(
+                        bundle.accounts.map((a) => ({
+                            signature: bundle.signature,
+                            accountIndex: a.index,
+                            address: a.address,
+                            signer: a.signer ? 1 : 0,
+                            writable: a.writable ? 1 : 0,
+                            programIdIndex: a.programIdIndex ?? null,
+                        })),
+                    )
+                    .onConflictDoNothing();
+
+                await tx
+                    .insert(addressSignatures)
+                    .values(
+                        bundle.accounts.map((a) => ({
+                            address: a.address,
+                            signature: bundle.signature,
+                            slot: bundle.slot,
+                            err: errJson ? 1 : 0,
+                            blockTime: bundle.blockTime ?? null,
+                        })),
+                    )
+                    .onConflictDoNothing();
+            }
+
+            if (
+                Array.isArray(bundle.accountStates) &&
+                bundle.accountStates.length > 0
+            ) {
+                await tx
+                    .insert(txAccountStates)
+                    .values(
+                        bundle.accountStates.map((s) => ({
+                            signature: bundle.signature,
+                            address: s.address,
+                            preJson: s.pre ? JSON.stringify(s.pre) : null,
+                            postJson: s.post ? JSON.stringify(s.post) : null,
+                        })),
+                    )
+                    .onConflictDoNothing();
+            }
+        });
+    }
 
 	async upsertAccounts(snapshots: AccountSnapshot[]): Promise<void> {
 		if (!Array.isArray(snapshots) || snapshots.length === 0) return;

package/src/migrations-bundled.ts

@@ -10,8 +10,14 @@ import mig0000 from "../drizzle/0000_friendly_millenium_guard.sql" with {
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-expect-error - Bun import attributes
 import mig0001 from "../drizzle/0001_stale_sentinels.sql" with { type: "file" };
+// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+// @ts-expect-error - Bun import attributes
+import mig0002 from "../drizzle/0002_graceful_caretaker.sql" with {
+    type: "file",
+};
 
 export const bundledMigrations: Array<{ name: string; path: string }> = [
-	{ name: "0000_friendly_millenium_guard.sql", path: mig0000 },
-	{ name: "0001_stale_sentinels.sql", path: mig0001 },
+    { name: "0000_friendly_millenium_guard.sql", path: mig0000 },
+    { name: "0001_stale_sentinels.sql", path: mig0001 },
+    { name: "0002_graceful_caretaker.sql", path: mig0002 },
 ];