@5ive-tech/sdk 1.1.12 → 1.1.13

package/dist/FiveSDK.d.ts

@@ -172,6 +172,8 @@ export declare class FiveSDK {
             isWritable: boolean;
             isSystemAccount?: boolean;
         }>;
+        feeShardIndex?: number;
+        payerAccount?: string;
     }): Promise<SerializedExecution>;
     static getVMState(connection: any, fiveVMProgramId?: string): Promise<{
         authority: string;

package/dist/modules/deploy.js

@@ -16,6 +16,10 @@ const FEE_VAULT_NAMESPACE_SEED = Buffer.from([
     0xff, 0x66, 0x69, 0x76, 0x65, 0x5f, 0x76, 0x6d, 0x5f, 0x66, 0x65, 0x65,
     0x5f, 0x76, 0x61, 0x75, 0x6c, 0x74, 0x5f, 0x76, 0x31,
 ]);
+function clampShardCount(rawCount) {
+    const normalized = rawCount > 0 ? rawCount : DEFAULT_FEE_VAULT_SHARD_COUNT;
+    return Math.max(1, Math.min(DEFAULT_FEE_VAULT_SHARD_COUNT, normalized));
+}
 async function readVMStateFeeConfig(connection, vmStateAddress) {
     if (!connection) {
         return { shardCount: DEFAULT_FEE_VAULT_SHARD_COUNT };
@@ -37,7 +41,7 @@ async function readVMStateFeeConfig(connection, vmStateAddress) {
         const view = new DataView(data.buffer, data.byteOffset, data.byteLength);
         const deployFeeLamports = view.getUint32(40, true);
         const shardCountRaw = data.length > 50 ? data[50] : 0;
-        const shardCount = shardCountRaw > 0 ? shardCountRaw : DEFAULT_FEE_VAULT_SHARD_COUNT;
+        const shardCount = clampShardCount(shardCountRaw);
         return { deployFeeLamports, shardCount };
     }
     catch {
@@ -55,7 +59,8 @@ function createInitFeeVaultInstructionData(shardIndex, bump) {
 async function initProgramFeeVaultShards(connection, programId, vmStateAccount, shardCount, payer, options = {}) {
     const { PublicKey, Transaction, TransactionInstruction, SystemProgram } = await import("@solana/web3.js");
     const signatures = [];
-    for (let shardIndex = 0; shardIndex < shardCount; shardIndex++) {
+    const effectiveShardCount = clampShardCount(shardCount);
+    for (let shardIndex = 0; shardIndex < effectiveShardCount; shardIndex++) {
         const vault = await deriveProgramFeeVault(programId, shardIndex);
         const tx = new Transaction().add(new TransactionInstruction({
             programId: new PublicKey(programId),

package/dist/modules/execute.js

@@ -23,6 +23,10 @@ const FEE_VAULT_NAMESPACE_SEED = Buffer.from([
 ]);
 const EXECUTE_FEE_HEADER_A = 0xff;
 const EXECUTE_FEE_HEADER_B = 0x53;
+function clampShardCount(rawCount) {
+    const normalized = rawCount > 0 ? rawCount : DEFAULT_FEE_VAULT_SHARD_COUNT;
+    return Math.max(1, Math.min(DEFAULT_FEE_VAULT_SHARD_COUNT, normalized));
+}
 async function deriveProgramFeeVault(programId, shardIndex) {
     const { PublicKey } = await import("@solana/web3.js");
     const [pda, bump] = PublicKey.findProgramAddressSync([FEE_VAULT_NAMESPACE_SEED, Buffer.from([shardIndex])], new PublicKey(programId));
@@ -43,8 +47,7 @@ async function readVMStateShardCount(connection, vmStateAddress) {
         const data = new Uint8Array(info.data);
         if (data.length <= 50)
             return DEFAULT_FEE_VAULT_SHARD_COUNT;
-        const shardCount = data[50];
-        return shardCount > 0 ? shardCount : DEFAULT_FEE_VAULT_SHARD_COUNT;
+        return clampShardCount(data[50]);
     }
     catch {
         return DEFAULT_FEE_VAULT_SHARD_COUNT;
@@ -278,7 +281,10 @@ export async function generateExecuteInstruction(scriptAccount, functionName, pa
         { pubkey: vmState, isSigner: false, isWritable: false },
     ];
     const abiAccountMetadata = new Map();
-    if (funcDef && funcDef.parameters) {
+    const hasFullParameterList = !!funcDef &&
+        Array.isArray(funcDef.parameters) &&
+        parameters.length === funcDef.parameters.length;
+    if (funcDef && funcDef.parameters && hasFullParameterList) {
         // First pass: detect if there's an @init constraint and find the payer
         let hasInit = false;
         let payerPubkey;
@@ -325,9 +331,11 @@ export async function generateExecuteInstruction(scriptAccount, functionName, pa
         // Check both derived ABI metadata and passed-in metadata (from FunctionBuilder)
         const abiMetadata = abiAccountMetadata.get(acc);
         const passedMetadata = options.accountMetadata?.get(acc);
-        const metadata = abiMetadata || passedMetadata;
+        const metadata = passedMetadata || abiMetadata;
         const isSigner = metadata ? metadata.isSigner : false;
-        const isWritable = metadata ? metadata.isWritable : true;
+        const isWritable = metadata
+            ? (metadata.isSystemAccount ? false : metadata.isWritable)
+            : true;
         return {
             pubkey: acc,
             isSigner,

package/dist/program/FunctionBuilder.d.ts

@@ -29,6 +29,7 @@ export declare class FunctionBuilder {
     private accountsMap;
     private argsMap;
     private resolvedAccounts;
+    private vmPayerAccount?;
     constructor(functionDef: FunctionDefinition, scriptAccount: string, abi: ScriptABI, options: FiveProgramOptions);
     /**
      * Specify accounts for this function call
@@ -47,6 +48,13 @@ export declare class FunctionBuilder {
      * @returns this for method chaining
      */
     args(args: Record<string, any>): this;
+    /**
+     * Override the VM execute-fee payer account for this instruction.
+     * This is distinct from the outer transaction fee payer.
+     */
+    payer(payer: string | {
+        toBase58(): string;
+    }): this;
     /**
      * Build and return serialized instruction data
      * This is the main method that orchestrates parameter resolution and instruction generation

package/dist/program/FunctionBuilder.js

@@ -62,6 +62,15 @@ export class FunctionBuilder {
         }
         return this;
     }
+    /**
+     * Override the VM execute-fee payer account for this instruction.
+     * This is distinct from the outer transaction fee payer.
+     */
+    payer(payer) {
+        this.vmPayerAccount =
+            typeof payer === 'string' ? payer : payer.toBase58();
+        return this;
+    }
     /**
      * Build and return serialized instruction data
      * This is the main method that orchestrates parameter resolution and instruction generation
@@ -93,7 +102,7 @@ export class FunctionBuilder {
         // Now validate that all required parameters are provided (including auto-injected ones)
         this.validateParameters();
         // Merge parameters in ABI order (accounts first, then data)
-        const { mergedParams, accountPubkeys } = this.mergeParameters();
+        const { mergedParams, argParams, accountPubkeys } = this.mergeParameters();
         // Append system accounts to the account list (they go at the end)
         const allAccountPubkeys = [...accountPubkeys, ...systemAccountsList];
         // Build account metadata from ABI attributes
@@ -105,7 +114,7 @@ export class FunctionBuilder {
         }
         // Call existing SDK method to generate instruction
         // This reuses the proven parameter encoding logic
-        const instruction = await this.generateInstructionData(mergedParams, allAccountPubkeys, accountMetadata);
+        const instruction = await this.generateInstructionData(mergedParams, argParams, allAccountPubkeys, accountMetadata);
         if (this.options.debug) {
             console.log(`[FunctionBuilder] Generated instruction:`, instruction);
         }
@@ -178,6 +187,7 @@ export class FunctionBuilder {
      */
     mergeParameters() {
         const mergedParams = [];
+        const argParams = [];
         const accountPubkeys = [];
         for (const param of this.functionDef.parameters) {
             if (param.is_account) {
@@ -196,9 +206,10 @@ export class FunctionBuilder {
                     throw new Error(`Missing argument '${param.name}'`);
                 }
                 mergedParams.push(value);
+                argParams.push(value);
             }
         }
-        return { mergedParams, accountPubkeys };
+        return { mergedParams, argParams, accountPubkeys };
     }
     /**
      * Build account metadata (isSigner, isWritable) from ABI attributes
@@ -279,14 +290,14 @@ export class FunctionBuilder {
      * @param accountMetadata - Account metadata (isSigner, isWritable)
      * @returns SerializedInstruction
      */
-    async generateInstructionData(mergedParams, accountList, accountMetadata) {
+    async generateInstructionData(mergedParams, argParams, accountList, accountMetadata) {
         // Account list is already passed in
         // Dynamically import FiveSDK to avoid circular dependencies
         const { FiveSDK } = await import('../FiveSDK.js');
         // Call the SDK's generateExecuteInstruction method.
         // This handles fixed-size typed execute encoding and parameter validation.
         const executionResult = await FiveSDK.generateExecuteInstruction(this.scriptAccount, this.functionDef.index, // Use function index directly
-        mergedParams, // All parameters in merged order
+        argParams, // Current VM contract encodes non-account args only
         accountList, // Account pubkey list
         undefined, // No connection needed - we have ABI
         {
@@ -295,6 +306,8 @@ export class FunctionBuilder {
             fiveVMProgramId: this.options.fiveVMProgramId,
             vmStateAccount: this.options.vmStateAccount,
             adminAccount: this.options.feeReceiverAccount,
+            payerAccount: this.vmPayerAccount ||
+                this.options.provider?.publicKey?.toBase58?.(),
             accountMetadata: accountMetadata, // Pass account metadata for correct isWritable flags
         });
         // Map SDK's instruction format (with 'accounts') to SerializedInstruction format (with 'keys')

package/package.json

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