solforge 0.2.7 → 0.2.9

package/server/methods/transaction/send-transaction.ts

@@ -25,51 +25,51 @@ export const sendTransaction: RpcMethodHandler = (id, params, context) => {
 			: Array.isArray(msg.accountKeys)
 				? msg.accountKeys
 				: [];
-        const staticKeys = rawKeys
-            .map((k) => {
-                try {
-                    return typeof k === "string" ? new PublicKey(k) : (k as PublicKey);
-                } catch {
-                    return undefined;
-                }
-            })
-            .filter(Boolean) as PublicKey[];
-        // Pre snapshots and balances
-        const preBalances = staticKeys.map((pk) => {
-            try {
-                return Number(context.svm.getBalance(pk));
-            } catch {
-                return 0;
-            }
-        });
-        const preAccountStates = staticKeys.map((pk) => {
-            try {
-                const addr = pk.toBase58();
-                const acc = context.svm.getAccount(pk);
-                if (!acc) return { address: addr, pre: null } as const;
-                return {
-                    address: addr,
-                    pre: {
-                        lamports: Number(acc.lamports || 0n),
-                        ownerProgram: new PublicKey(acc.owner).toBase58(),
-                        executable: !!acc.executable,
-                        rentEpoch: Number(acc.rentEpoch || 0),
-                        dataLen: acc.data?.length ?? 0,
-                        dataBase64: undefined,
-                        lastSlot: Number(context.slot),
-                    },
-                } as const;
-            } catch {
-                return { address: pk.toBase58(), pre: null } as const;
-            }
-        });
-        try {
-            if (process.env.DEBUG_TX_CAPTURE === "1") {
-                console.debug(
-                    `[tx-capture] pre snapshots: keys=${staticKeys.length} captured=${preAccountStates.length}`,
-                );
-            }
-        } catch {}
+		const staticKeys = rawKeys
+			.map((k) => {
+				try {
+					return typeof k === "string" ? new PublicKey(k) : (k as PublicKey);
+				} catch {
+					return undefined;
+				}
+			})
+			.filter(Boolean) as PublicKey[];
+		// Pre snapshots and balances
+		const preBalances = staticKeys.map((pk) => {
+			try {
+				return Number(context.svm.getBalance(pk));
+			} catch {
+				return 0;
+			}
+		});
+		const preAccountStates = staticKeys.map((pk) => {
+			try {
+				const addr = pk.toBase58();
+				const acc = context.svm.getAccount(pk);
+				if (!acc) return { address: addr, pre: null } as const;
+				return {
+					address: addr,
+					pre: {
+						lamports: Number(acc.lamports || 0n),
+						ownerProgram: new PublicKey(acc.owner).toBase58(),
+						executable: !!acc.executable,
+						rentEpoch: Number(acc.rentEpoch || 0),
+						dataLen: acc.data?.length ?? 0,
+						dataBase64: undefined,
+						lastSlot: Number(context.slot),
+					},
+				} as const;
+			} catch {
+				return { address: pk.toBase58(), pre: null } as const;
+			}
+		});
+		try {
+			if (process.env.DEBUG_TX_CAPTURE === "1") {
+				console.debug(
+					`[tx-capture] pre snapshots: keys=${staticKeys.length} captured=${preAccountStates.length}`,
+				);
+			}
+		} catch {}
 
 		// Collect SPL token accounts from instructions for pre/post token balance snapshots
 		const msgAny = msg as unknown as {
@@ -86,21 +86,44 @@ export const sendTransaction: RpcMethodHandler = (id, params, context) => {
 			TOKEN_2022_PROGRAM_ID.toBase58(),
 		]);
 		const tokenAccountSet = new Set<string>();
+		// 1) Collect from compiled ixs (best-effort)
 		for (const ci of compiled) {
 			try {
-				const pid = staticKeys[ci.programIdIndex]?.toBase58();
+				const rec = ci as Record<string, unknown>;
+				const pidIdx =
+					typeof rec.programIdIndex === "number"
+						? rec.programIdIndex
+						: undefined;
+				const pid = pidIdx != null ? staticKeys[pidIdx]?.toBase58() : undefined;
 				if (!pid || !tokenProgramIds.has(pid)) continue;
-				const accIdxs: number[] = Array.isArray(ci.accountKeyIndexes)
-					? ci.accountKeyIndexes
-					: Array.isArray(ci.accounts)
-						? ci.accounts
+				const accSrc = Array.isArray(rec.accountKeyIndexes)
+					? (rec.accountKeyIndexes as unknown[])
+					: Array.isArray(rec.accounts)
+						? (rec.accounts as unknown[])
 						: [];
+				const accIdxs: number[] = accSrc.filter(
+					(v): v is number => typeof v === "number",
+				);
 				for (const ix of accIdxs) {
 					const addr = staticKeys[ix]?.toBase58();
 					if (addr) tokenAccountSet.add(addr);
 				}
 			} catch {}
 		}
+		// 2) Also collect from all static keys that are SPL token accounts pre-send
+		for (const pk of staticKeys) {
+			try {
+				const acc = context.svm.getAccount(pk);
+				if (!acc) continue;
+				const ownerStr = new PublicKey(acc.owner).toBase58();
+				if (
+					tokenProgramIds.has(ownerStr) &&
+					(acc.data?.length ?? 0) >= ACCOUNT_SIZE
+				) {
+					tokenAccountSet.add(pk.toBase58());
+				}
+			} catch {}
+		}
 		// Pre token balances
 		const preTokenBalances: unknown[] = [];
 		const ataToInfo = new Map<
@@ -159,7 +182,7 @@ export const sendTransaction: RpcMethodHandler = (id, params, context) => {
 			} catch {}
 		}
 
-        const result = context.svm.sendTransaction(tx);
+		const result = context.svm.sendTransaction(tx);
 
 		try {
 			const rawErr = (result as { err?: unknown }).err;
@@ -175,47 +198,47 @@ export const sendTransaction: RpcMethodHandler = (id, params, context) => {
 			}
 		} catch {}
 
-        const signature = tx.signatures[0]
-            ? context.encodeBase58(tx.signatures[0])
-            : context.encodeBase58(new Uint8Array(64).fill(0));
-        context.notifySignature(signature);
-        // Snapshot post balances and capture logs for rich view
-        const postBalances = staticKeys.map((pk) => {
-            try {
-                return Number(context.svm.getBalance(pk));
-            } catch {
-                return 0;
-            }
-        });
-        const postAccountStates = staticKeys.map((pk) => {
-            try {
-                const addr = pk.toBase58();
-                const acc = context.svm.getAccount(pk);
-                if (!acc) return { address: addr, post: null } as const;
-                return {
-                    address: addr,
-                    post: {
-                        lamports: Number(acc.lamports || 0n),
-                        ownerProgram: new PublicKey(acc.owner).toBase58(),
-                        executable: !!acc.executable,
-                        rentEpoch: Number(acc.rentEpoch || 0),
-                        dataLen: acc.data?.length ?? 0,
-                        dataBase64: undefined,
-                        lastSlot: Number(context.slot),
-                    },
-                } as const;
-            } catch {
-                return { address: pk.toBase58(), post: null } as const;
-            }
-        });
-        try {
-            if (process.env.DEBUG_TX_CAPTURE === "1") {
-                console.debug(
-                    `[tx-capture] post snapshots: keys=${staticKeys.length} captured=${postAccountStates.length}`,
-                );
-            }
-        } catch {}
-		// Post token balances
+		const signature = tx.signatures[0]
+			? context.encodeBase58(tx.signatures[0])
+			: context.encodeBase58(new Uint8Array(64).fill(0));
+		context.notifySignature(signature);
+		// Snapshot post balances and capture logs for rich view
+		const postBalances = staticKeys.map((pk) => {
+			try {
+				return Number(context.svm.getBalance(pk));
+			} catch {
+				return 0;
+			}
+		});
+		const postAccountStates = staticKeys.map((pk) => {
+			try {
+				const addr = pk.toBase58();
+				const acc = context.svm.getAccount(pk);
+				if (!acc) return { address: addr, post: null } as const;
+				return {
+					address: addr,
+					post: {
+						lamports: Number(acc.lamports || 0n),
+						ownerProgram: new PublicKey(acc.owner).toBase58(),
+						executable: !!acc.executable,
+						rentEpoch: Number(acc.rentEpoch || 0),
+						dataLen: acc.data?.length ?? 0,
+						dataBase64: undefined,
+						lastSlot: Number(context.slot),
+					},
+				} as const;
+			} catch {
+				return { address: pk.toBase58(), post: null } as const;
+			}
+		});
+		try {
+			if (process.env.DEBUG_TX_CAPTURE === "1") {
+				console.debug(
+					`[tx-capture] post snapshots: keys=${staticKeys.length} captured=${postAccountStates.length}`,
+				);
+			}
+		} catch {}
+		// Post token balances (scan token accounts among static keys)
 		const postTokenBalances: unknown[] = [];
 		for (const addr of tokenAccountSet) {
 			try {
@@ -266,150 +289,172 @@ export const sendTransaction: RpcMethodHandler = (id, params, context) => {
 				}
 			} catch {}
 		}
-        let logs: string[] = [];
-        let innerInstructions: unknown[] = [];
-        let computeUnits: number | null = null;
-        let returnData: { programId: string; dataBase64: string } | null = null;
-        try {
-            const DBG = process.env.DEBUG_TX_CAPTURE === "1";
-            const r: any = result as any;
-            // Logs can be on TransactionMetadata or in meta() for failures
-            try {
-                if (typeof r?.logs === "function") logs = r.logs();
-            } catch {}
-            let metaObj: any | undefined;
-            // Success shape: methods on result
-            if (
-                typeof r?.innerInstructions === "function" ||
-                typeof r?.computeUnitsConsumed === "function" ||
-                typeof r?.returnData === "function"
-            ) {
-                metaObj = r;
-            }
-            // Failed shape: meta() returns TransactionMetadata
-            if (!metaObj && typeof r?.meta === "function") {
-                try {
-                    metaObj = r.meta();
-                    if (!logs.length && typeof metaObj?.logs === "function") {
-                        logs = metaObj.logs();
-                    }
-                } catch (e) {
-                    if (DBG)
-                        console.debug("[tx-capture] meta() threw while extracting:", e);
-                }
-            }
-            // Extract richer metadata from whichever object exposes it
-            if (metaObj) {
-                try {
-                    const inner = metaObj.innerInstructions?.();
-                    if (Array.isArray(inner)) {
-                        innerInstructions = inner.map((group: any, index: number) => {
-                            const instructions = Array.isArray(group)
-                                ? group
-                                      .map((ii: any) => {
-                                          try {
-                                              const inst = ii.instruction?.();
-                                              const accIdxs: number[] = Array.from(
-                                                  inst?.accounts?.() || [],
-                                              );
-                                              const dataBytes: Uint8Array =
-                                                  inst?.data?.() || new Uint8Array();
-                                              return {
-                                                  programIdIndex: Number(
-                                                      inst?.programIdIndex?.() ?? 0,
-                                                  ),
-                                                  accounts: accIdxs,
-                                                  data: context.encodeBase58(dataBytes),
-                                                  stackHeight: Number(ii.stackHeight?.() ?? 0),
-                                              };
-                                          } catch {
-                                              return null;
-                                          }
-                                      })
-                                      .filter(Boolean)
-                                : [];
-                            return { index, instructions };
-                        });
-                    }
-                } catch (e) {
-                    if (DBG)
-                        console.debug(
-                            "[tx-capture] innerInstructions extraction failed:",
-                            e,
-                        );
-                }
-                try {
-                    const cu = metaObj.computeUnitsConsumed?.();
-                    if (typeof cu === "bigint") computeUnits = Number(cu);
-                } catch (e) {
-                    if (DBG)
-                        console.debug(
-                            "[tx-capture] computeUnitsConsumed extraction failed:",
-                            e,
-                        );
-                }
-                try {
-                    const rd = metaObj.returnData?.();
-                    if (rd) {
-                        const pid = new PublicKey(rd.programId()).toBase58();
-                        const dataB64 = Buffer.from(rd.data()).toString("base64");
-                        returnData = { programId: pid, dataBase64: dataB64 };
-                    }
-                } catch (e) {
-                    if (DBG)
-                        console.debug(
-                            "[tx-capture] returnData extraction failed:",
-                            e,
-                        );
-                }
-            } else if (DBG) {
-                console.debug(
-                    "[tx-capture] no metadata object found on result shape",
-                );
-            }
-        } catch {}
-        try {
-            if (process.env.DEBUG_TX_CAPTURE === "1") {
-                console.debug(
-                    `[tx-capture] sendTransaction meta: logs=${logs.length} innerGroups=${Array.isArray(innerInstructions) ? innerInstructions.length : 0} computeUnits=${computeUnits} returnData=${returnData ? "yes" : "no"}`,
-                );
-            }
-        } catch {}
-        context.recordTransaction(signature, tx, {
-            logs,
-            fee: 5000,
-            blockTime: Math.floor(Date.now() / 1000),
-            preBalances,
-            postBalances,
-            preTokenBalances,
-            postTokenBalances,
-            innerInstructions,
-            computeUnits,
-            returnData,
-            accountStates: (() => {
-                try {
-                    const byAddr = new Map<string, { pre?: any; post?: any }>();
-                    for (const s of preAccountStates)
-                        byAddr.set(s.address, { pre: s.pre || null });
-                    for (const s of postAccountStates) {
-                        const e = byAddr.get(s.address) || {};
-                        e.post = s.post || null;
-                        byAddr.set(s.address, e);
-                    }
-                    return Array.from(byAddr.entries()).map(([address, v]) => ({
-                        address,
-                        pre: v.pre || null,
-                        post: v.post || null,
-                    }));
-                } catch {
-                    return [] as Array<{
-                        address: string;
-                        pre?: unknown;
-                        post?: unknown;
-                    }>;
-                }
-            })(),
-        });
+		let logs: string[] = [];
+		let innerInstructions: unknown[] = [];
+		let computeUnits: number | null = null;
+		let returnData: { programId: string; dataBase64: string } | null = null;
+		try {
+			const DBG = process.env.DEBUG_TX_CAPTURE === "1";
+			// biome-ignore lint/suspicious/noExplicitAny: Result shape depends on litesvm version; guarded access
+			const r: any = result as any;
+			// Logs can be on TransactionMetadata or in meta() for failures
+			try {
+				if (typeof r?.logs === "function") logs = r.logs();
+			} catch {}
+			let metaObj: unknown | undefined;
+			// Success shape: methods on result
+			if (
+				typeof r?.innerInstructions === "function" ||
+				typeof r?.computeUnitsConsumed === "function" ||
+				typeof r?.returnData === "function"
+			) {
+				metaObj = r;
+			}
+			// Failed shape: meta() returns TransactionMetadata
+			if (!metaObj && typeof r?.meta === "function") {
+				try {
+					metaObj = r.meta();
+					if (!logs.length && typeof metaObj?.logs === "function") {
+						logs = metaObj.logs();
+					}
+				} catch (e) {
+					if (DBG)
+						console.debug("[tx-capture] meta() threw while extracting:", e);
+				}
+			}
+			// Extract richer metadata from whichever object exposes it
+			if (metaObj) {
+				try {
+					const inner = (
+						metaObj as { innerInstructions?: () => unknown } | undefined
+					)?.innerInstructions?.();
+					if (Array.isArray(inner)) {
+						innerInstructions = inner.map((group, index: number) => {
+							const instructions = Array.isArray(group)
+								? (group as unknown[])
+										.map((ii) => {
+											try {
+												const inst = (
+													ii as { instruction?: () => unknown }
+												).instruction?.();
+												const accSrc = (
+													inst as { accounts?: () => unknown } | undefined
+												)?.accounts?.();
+												const accIdxs: number[] = Array.isArray(accSrc)
+													? (accSrc as unknown[]).filter(
+															(v): v is number => typeof v === "number",
+														)
+													: [];
+												const dataVal = (
+													inst as { data?: () => unknown } | undefined
+												)?.data?.();
+												const dataBytes: Uint8Array =
+													dataVal instanceof Uint8Array
+														? dataVal
+														: new Uint8Array();
+												return {
+													programIdIndex: Number(
+														(
+															inst as
+																| { programIdIndex?: () => unknown }
+																| undefined
+														)?.programIdIndex?.() ?? 0,
+													),
+													accounts: accIdxs,
+													data: context.encodeBase58(dataBytes),
+													stackHeight: Number(
+														(
+															ii as { stackHeight?: () => unknown }
+														).stackHeight?.() ?? 0,
+													),
+												};
+											} catch {
+												return null;
+											}
+										})
+										.filter(Boolean)
+								: [];
+							return { index, instructions };
+						});
+					}
+				} catch (e) {
+					if (DBG)
+						console.debug(
+							"[tx-capture] innerInstructions extraction failed:",
+							e,
+						);
+				}
+				try {
+					const cu = (
+						metaObj as { computeUnitsConsumed?: () => unknown } | undefined
+					)?.computeUnitsConsumed?.();
+					if (typeof cu === "bigint") computeUnits = Number(cu);
+				} catch (e) {
+					if (DBG)
+						console.debug(
+							"[tx-capture] computeUnitsConsumed extraction failed:",
+							e,
+						);
+				}
+				try {
+					const rd = (
+						metaObj as { returnData?: () => unknown } | undefined
+					)?.returnData?.();
+					if (rd) {
+						const pid = new PublicKey(rd.programId()).toBase58();
+						const dataB64 = Buffer.from(rd.data()).toString("base64");
+						returnData = { programId: pid, dataBase64: dataB64 };
+					}
+				} catch (e) {
+					if (DBG)
+						console.debug("[tx-capture] returnData extraction failed:", e);
+				}
+			} else if (DBG) {
+				console.debug("[tx-capture] no metadata object found on result shape");
+			}
+		} catch {}
+		try {
+			if (process.env.DEBUG_TX_CAPTURE === "1") {
+				console.debug(
+					`[tx-capture] sendTransaction meta: logs=${logs.length} innerGroups=${Array.isArray(innerInstructions) ? innerInstructions.length : 0} computeUnits=${computeUnits} returnData=${returnData ? "yes" : "no"}`,
+				);
+			}
+		} catch {}
+		context.recordTransaction(signature, tx, {
+			logs,
+			fee: 5000,
+			blockTime: Math.floor(Date.now() / 1000),
+			preBalances,
+			postBalances,
+			preTokenBalances,
+			postTokenBalances,
+			innerInstructions,
+			computeUnits,
+			returnData,
+			accountStates: (() => {
+				try {
+					const byAddr = new Map<string, { pre?: unknown; post?: unknown }>();
+					for (const s of preAccountStates)
+						byAddr.set(s.address, { pre: s.pre || null });
+					for (const s of postAccountStates) {
+						const e = byAddr.get(s.address) || {};
+						e.post = s.post || null;
+						byAddr.set(s.address, e);
+					}
+					return Array.from(byAddr.entries()).map(([address, v]) => ({
+						address,
+						pre: v.pre || null,
+						post: v.post || null,
+					}));
+				} catch {
+					return [] as Array<{
+						address: string;
+						pre?: unknown;
+						post?: unknown;
+					}>;
+				}
+			})(),
+		});
 
 		return context.createSuccessResponse(id, signature);
 	} catch (error: unknown) {