@5ive-tech/sdk 1.1.12 → 1.1.14

package/dist/testing/TestDiscovery.d.ts

@@ -45,6 +45,7 @@ export interface DiscoveredTest {
  * Discover tests from directory
  */
 export declare class TestDiscovery {
+    private static normalizeJsonTestCases;
     /**
      * Discover all tests in a directory
      */

package/dist/testing/TestDiscovery.js

@@ -12,6 +12,16 @@ import { FiveSDK } from '../FiveSDK.js';
  * Discover tests from directory
  */
 export class TestDiscovery {
+    static normalizeJsonTestCases(data) {
+        const testCases = data.tests || data.testCases || [];
+        if (Array.isArray(testCases)) {
+            return testCases;
+        }
+        if (testCases && typeof testCases === 'object') {
+            return null;
+        }
+        return [];
+    }
     /**
      * Discover all tests in a directory
      */
@@ -66,7 +76,10 @@ export class TestDiscovery {
                 try {
                     const content = await readFile(file, 'utf8');
                     const data = JSON.parse(content);
-                    const testCases = data.tests || data.testCases || [];
+                    const testCases = this.normalizeJsonTestCases(data);
+                    if (testCases === null) {
+                        continue;
+                    }
                     for (const testCase of testCases) {
                         tests.push({
                             name: testCase.name,
@@ -98,7 +111,10 @@ export class TestDiscovery {
             try {
                 const content = await readFile(file, 'utf8');
                 const data = JSON.parse(content);
-                const testCases = data.tests || data.testCases || [];
+                const testCases = this.normalizeJsonTestCases(data);
+                if (testCases === null) {
+                    return [];
+                }
                 return testCases.map((testCase) => ({
                     name: testCase.name,
                     path: file,

package/dist/testing/TestRunner.js

@@ -211,10 +211,13 @@ export class FiveTestRunner {
                 try {
                     const content = await readFile(test.path, 'utf8');
                     const data = JSON.parse(content);
+                    const testCases = Array.isArray(data.tests || data.testCases)
+                        ? (data.tests || data.testCases)
+                        : [];
                     suites.push({
                         name: data.name || basename(test.path, '.test.json'),
                         description: data.description,
-                        testCases: data.tests || data.testCases || []
+                        testCases
                     });
                     loadedJsonSuites.add(test.path);
                 }

package/dist/types.d.ts

@@ -2,6 +2,7 @@
  * Type definitions for Five SDK.
  */
 export interface ProjectConfig {
+    schemaVersion: number;
     name: string;
     version: string;
     description?: string;
@@ -26,13 +27,21 @@ export interface ProjectConfig {
 export interface ProjectOptimizations {
     enableCompression?: boolean;
     enableConstraintOptimization?: boolean;
-    optimizationLevel?: 'production' | 'development';
+    optimizationLevel?: 'production';
 }
 export interface ProjectDependency {
-    name: string;
-    version: string;
-    type: 'five' | 'wasm' | 'solana';
+    alias: string;
+    package: string;
+    version?: string;
+    source: 'bundled' | 'path' | 'namespace' | 'address' | 'moat';
+    link: 'inline' | 'external';
     path?: string;
+    namespace?: string;
+    address?: string;
+    moatAccount?: string;
+    module?: string;
+    pin?: string;
+    cluster?: string;
 }
 export type CompilationTarget = 'vm' | 'solana' | 'debug' | 'test' | 'deployment';
 export interface CompilationOptions {
@@ -45,7 +54,7 @@ export interface CompilationOptions {
     /** Enable optimizations */
     optimize?: boolean;
     /** Optimization level */
-    optimizationLevel?: 'production' | 'development';
+    optimizationLevel?: 'production';
     /** Target environment */
     target?: CompilationTarget;
     /** Include debug info in bytecode */
@@ -214,6 +223,7 @@ export interface CLIError extends Error {
     category: string;
     details?: any;
 }
+/** @deprecated Use ProgramIdResolver with explicit config or cluster config instead. */
 export declare const FIVE_VM_PROGRAM_ID = "4Qxf3pbCse2veUgZVMiAm3nWqJrYo2pT4suxHKMJdK1d";
 export interface FiveSDKConfig {
     network?: string;
@@ -244,6 +254,7 @@ export interface DeploymentOptions {
     space?: number;
     programId?: string;
     scriptAccount?: any;
+    scriptSeed?: string;
     extraLamports?: number;
     debug?: boolean;
     permissions?: number;

package/dist/types.js

@@ -2,6 +2,7 @@
  * Type definitions for Five SDK.
  */
 // ==================== Legacy SDK Types (for compatibility) ====================
+/** @deprecated Use ProgramIdResolver with explicit config or cluster config instead. */
 export const FIVE_VM_PROGRAM_ID = "4Qxf3pbCse2veUgZVMiAm3nWqJrYo2pT4suxHKMJdK1d";
 export class FiveSDKError extends Error {
     constructor(message, code, details) {

package/dist/utils/abi.js

@@ -13,19 +13,42 @@ export function normalizeAbiFunctions(abiFunctions) {
         }));
     return functionsArray
         .map((func, idx) => {
-        const parameters = Array.isArray(func.parameters) ? func.parameters : [];
+        const rawParameters = Array.isArray(func.parameters) ? func.parameters : [];
+        const normalizedParameters = rawParameters.map((param, paramIdx) => ({
+            name: param.name ?? `param${paramIdx}`,
+            type: param.type ?? param.param_type ?? param.paramType ?? '',
+            param_type: param.param_type ?? param.paramType,
+            optional: param.optional ?? false,
+            is_account: param.is_account ?? param.isAccount ?? false,
+            isAccount: param.isAccount ?? param.is_account ?? false,
+            attributes: Array.isArray(param.attributes) ? [...param.attributes] : [],
+        }));
+        const existingParameterNames = new Set(normalizedParameters.map((param) => param.name));
+        const accountParameters = Array.isArray(func.accounts)
+            ? func.accounts
+                .map((account, accountIdx) => {
+                const attributes = [];
+                if (account?.writable)
+                    attributes.push('mut');
+                if (account?.signer)
+                    attributes.push('signer');
+                return {
+                    name: account?.name ?? `account${accountIdx}`,
+                    type: 'pubkey',
+                    param_type: 'pubkey',
+                    optional: false,
+                    is_account: true,
+                    isAccount: true,
+                    attributes,
+                };
+            })
+                .filter((param) => !existingParameterNames.has(param.name))
+            : [];
+        const parameters = [...accountParameters, ...normalizedParameters];
         return {
             name: func.name ?? `function_${func.index ?? idx}`,
             index: typeof func.index === 'number' ? func.index : idx,
-            parameters: parameters.map((param, paramIdx) => ({
-                name: param.name ?? `param${paramIdx}`,
-                type: param.type ?? param.param_type ?? param.paramType ?? '',
-                param_type: param.param_type ?? param.paramType,
-                optional: param.optional ?? false,
-                is_account: param.is_account ?? param.isAccount ?? false,
-                isAccount: param.isAccount ?? param.is_account ?? false,
-                attributes: Array.isArray(param.attributes) ? [...param.attributes] : [],
-            })),
+            parameters,
             returnType: func.returnType ?? func.return_type,
             accounts: func.accounts ?? [],
             visibility: func.visibility ??

package/dist/utils/transaction.d.ts

@@ -19,6 +19,22 @@ export declare function confirmTransactionRobust(connection: any, signature: str
     err?: any;
     error?: string;
 }>;
+export declare function sendAndConfirmRawTransactionRobust(connection: any, serializedTx: Uint8Array | Buffer, options?: {
+    commitment?: string;
+    timeoutMs?: number;
+    debug?: boolean;
+    maxRetries?: number;
+    skipPreflight?: boolean;
+    preflightCommitment?: string;
+    resendIntervalMs?: number;
+    blockhash?: string;
+    lastValidBlockHeight?: number;
+}): Promise<{
+    success: boolean;
+    signature?: string;
+    err?: any;
+    error?: string;
+}>;
 export declare function getAccountInfoWithRetry(connection: any, pubkey: any, options?: {
     commitment?: string;
     retries?: number;

package/dist/utils/transaction.js

@@ -40,12 +40,13 @@ export async function pollForConfirmation(connection, signature, commitment = "c
     }
     while (Date.now() - startTime < timeoutMs) {
         try {
-            const confirmationStatus = await connection.getSignatureStatus(signature);
+            const confirmationStatus = await connection.getSignatureStatuses([signature], { searchTransactionHistory: true });
+            const statusValue = confirmationStatus?.value?.[0];
             if (debug && (Date.now() - startTime) % 10000 < 1000) {
-                console.log(`[FiveSDK] Confirmation status: ${JSON.stringify(confirmationStatus.value)}`);
+                console.log(`[FiveSDK] Confirmation status: ${JSON.stringify(statusValue)}`);
             }
-            if (confirmationStatus.value) {
-                const transactionError = confirmationStatus.value.err;
+            if (statusValue) {
+                const transactionError = statusValue.err;
                 if (transactionError) {
                     if (debug) {
                         console.log(`[FiveSDK] Transaction error: ${JSON.stringify(transactionError)}`);
@@ -56,7 +57,7 @@ export async function pollForConfirmation(connection, signature, commitment = "c
                         error: JSON.stringify(transactionError),
                     };
                 }
-                if (statusMeetsCommitment(confirmationStatus.value.confirmationStatus, confirmationStatus.value.confirmations, targetCommitment)) {
+                if (statusMeetsCommitment(statusValue.confirmationStatus, statusValue.confirmations, targetCommitment)) {
                     const succeeded = true;
                     if (debug) {
                         console.log(`[FiveSDK] Transaction confirmed after ${Date.now() - startTime}ms${succeeded ? '' : ' (with error)'}`);
@@ -112,6 +113,81 @@ export async function confirmTransactionRobust(connection, signature, options =
     }
     return pollForConfirmation(connection, signature, commitment, timeoutMs, debug);
 }
+export async function sendAndConfirmRawTransactionRobust(connection, serializedTx, options = {}) {
+    const commitment = options.commitment || SDK_COMMITMENTS.CONFIRM;
+    const timeoutMs = options.timeoutMs || 120000;
+    const debug = options.debug || false;
+    const resendIntervalMs = options.resendIntervalMs || 1500;
+    const targetCommitment = normalizeCommitment(commitment);
+    const skipPreflight = options.skipPreflight ?? true;
+    const signature = await connection.sendRawTransaction(serializedTx, {
+        skipPreflight,
+        preflightCommitment: options.preflightCommitment || "confirmed",
+        maxRetries: options.maxRetries || 3,
+    });
+    const startTime = Date.now();
+    let lastResendAt = startTime;
+    while (Date.now() - startTime < timeoutMs) {
+        try {
+            const statuses = await connection.getSignatureStatuses([signature], { searchTransactionHistory: true });
+            const status = statuses?.value?.[0];
+            if (status?.err) {
+                return { success: false, signature, err: status.err, error: JSON.stringify(status.err) };
+            }
+            if (status &&
+                statusMeetsCommitment(status.confirmationStatus, status.confirmations, targetCommitment)) {
+                return { success: true, signature };
+            }
+            if (Date.now() - lastResendAt >= resendIntervalMs) {
+                try {
+                    await connection.sendRawTransaction(serializedTx, {
+                        skipPreflight,
+                        preflightCommitment: options.preflightCommitment || "confirmed",
+                        maxRetries: 0,
+                    });
+                    if (debug) {
+                        console.log(`[FiveSDK] Rebroadcasting transaction ${signature}`);
+                    }
+                }
+                catch (error) {
+                    const message = error instanceof Error ? error.message : String(error);
+                    if (debug &&
+                        !/already processed|already received|blockhash not found|too old|duplicate/i.test(message)) {
+                        console.log(`[FiveSDK] Rebroadcast error: ${message}`);
+                    }
+                }
+                lastResendAt = Date.now();
+            }
+        }
+        catch (error) {
+            if (debug) {
+                console.log(`[FiveSDK] send/confirm polling error: ${error instanceof Error ? error.message : String(error)}`);
+            }
+        }
+        if (typeof options.lastValidBlockHeight === "number" &&
+            typeof connection.getBlockHeight === "function") {
+            try {
+                const currentBlockHeight = await connection.getBlockHeight("confirmed");
+                if (currentBlockHeight > options.lastValidBlockHeight) {
+                    return {
+                        success: false,
+                        signature,
+                        error: `Transaction expired before confirmation. Signature: ${signature}`,
+                    };
+                }
+            }
+            catch {
+                // Ignore block height lookup failures and keep polling.
+            }
+        }
+        await sleep(DEFAULT_POLL_INTERVAL_MS);
+    }
+    return {
+        success: false,
+        signature,
+        error: `Transaction confirmation timeout after ${Date.now() - startTime}ms. Signature: ${signature}`,
+    };
+}
 export async function getAccountInfoWithRetry(connection, pubkey, options = {}) {
     const commitment = options.commitment || SDK_COMMITMENTS.READ;
     const retries = options.retries ?? 2;

package/dist/wasm/compiler/CompilationLogic.js

@@ -18,7 +18,7 @@ export async function compile(ctx, source, options) {
         const comprehensiveMetrics = options?.comprehensiveMetrics || Boolean(options?.metricsOutput);
         const compilationOptions = new WasmCompilationOptions()
             .with_mode(options?.target || "deployment")
-            .with_optimization_level(options?.optimizationLevel || "production")
+            .with_optimization_level("production")
             .with_v2_preview(true)
             .with_constraint_cache(false)
             .with_enhanced_errors(true)
@@ -110,7 +110,7 @@ export async function compileFile(ctx, options) {
             const comprehensiveMetrics = options.comprehensiveMetrics || Boolean(options.metricsOutput);
             const compilationOptions = new WasmCompilationOptions()
                 .with_mode(options.target || "deployment")
-                .with_optimization_level(options.optimizationLevel || "production")
+                .with_optimization_level("production")
                 .with_v2_preview(true)
                 .with_constraint_cache(options.enable_constraint_cache !== false)
                 .with_enhanced_errors(true)
@@ -260,7 +260,7 @@ export async function compileWithDiscovery(ctx, entryPoint, options) {
         const comprehensiveMetrics = options?.comprehensiveMetrics || false;
         const compilationOptions = new WasmCompilationOptions()
             .with_mode(options?.target || "deployment")
-            .with_optimization_level(options?.optimizationLevel || "production")
+            .with_optimization_level("production")
             .with_v2_preview(true)
             .with_constraint_cache(false)
             .with_enhanced_errors(true)

package/dist/wasm/vm.d.ts

@@ -7,8 +7,8 @@ export declare class FiveVM {
     initialize(): Promise<void>;
     private isWasmOnlyExecution;
     private hasFiveMagic;
-    private looksLikeScriptHeader;
-    private looksLikeOptimizedHeader;
+    private looksLikeScriptAccountHeader;
+    private looksLikeScriptBytecodeHeaderV1;
     execute(options: VMExecutionOptions): Promise<VMExecutionResult>;
     private parseVMResult;
     executeFunction(bytecode: Uint8Array, functionIndex: number, parameters: Array<{

package/dist/wasm/vm.js

@@ -1,11 +1,10 @@
 // Five VM WASM integration.
+import { SCRIPT_ACCOUNT_HEADER_LEN, SCRIPT_BYTECODE_HEADER_V1_LEN, } from '../constants/headers.js';
 import { getWasmModule } from './loader.js';
 let FiveVMWasm;
 let WasmAccount;
 let ParameterEncoder;
 let wrap_with_script_header;
-const SCRIPT_HEADER_LEN = 64; // ScriptHeader::LEN
-const OPTIMIZED_HEADER_LEN = 7; // OptimizedHeader V2 size
 const FIVE_MAGIC = [0x35, 0x49, 0x56, 0x45];
 export class FiveVM {
     constructor(logger) {
@@ -46,21 +45,21 @@ export class FiveVM {
             return false;
         return FIVE_MAGIC.every((byte, index) => data[index] === byte);
     }
-    looksLikeScriptHeader(data) {
-        if (data.length < SCRIPT_HEADER_LEN)
+    looksLikeScriptAccountHeader(data) {
+        if (data.length < SCRIPT_ACCOUNT_HEADER_LEN)
             return false;
         if (!this.hasFiveMagic(data))
             return false;
         const encodedLen = data[4] + (data[5] << 8) + (data[6] << 16);
-        const payloadLen = data.length - SCRIPT_HEADER_LEN;
+        const payloadLen = data.length - SCRIPT_ACCOUNT_HEADER_LEN;
         return encodedLen === payloadLen;
     }
-    looksLikeOptimizedHeader(data) {
-        if (data.length < OPTIMIZED_HEADER_LEN)
+    looksLikeScriptBytecodeHeaderV1(data) {
+        if (data.length < SCRIPT_BYTECODE_HEADER_V1_LEN)
             return false;
         if (!this.hasFiveMagic(data))
             return false;
-        return !this.looksLikeScriptHeader(data);
+        return !this.looksLikeScriptAccountHeader(data);
     }
     async execute(options) {
         if (!this.initialized)
@@ -70,9 +69,9 @@ export class FiveVM {
         const startTime = Date.now();
         try {
             let scriptData;
-            const hasScriptHeader = this.looksLikeScriptHeader(options.bytecode);
-            const hasOptimizedHeader = this.looksLikeOptimizedHeader(options.bytecode);
-            if (hasScriptHeader || hasOptimizedHeader) {
+            const hasScriptAccountHeader = this.looksLikeScriptAccountHeader(options.bytecode);
+            const hasScriptBytecodeHeaderV1 = this.looksLikeScriptBytecodeHeaderV1(options.bytecode);
+            if (hasScriptAccountHeader || hasScriptBytecodeHeaderV1) {
                 scriptData = options.bytecode;
             }
             else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@5ive-tech/sdk",
-  "version": "1.1.12",
+  "version": "1.1.14",
   "description": "Client-agnostic TypeScript SDK for Five VM scripts on Solana",
   "type": "module",
   "main": "dist/index.js",