@xandeum/web3.js 1.3.6 → 1.3.7

package/dist/armageddon.js

@@ -42,8 +42,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.armageddon = armageddon;
 var web3_js_1 = require("@solana/web3.js");
 var bn_js_1 = __importDefault(require("bn.js"));
-var const_js_1 = require("./const.js");
-var helpers_js_1 = require("./helpers.js");
+var const_1 = require("./const");
+var helpers_1 = require("./helpers");
 /**
  * Constructs a Solana transaction that triggers the "armageddon" instruction
  * on the specified file system (fsid).
@@ -54,20 +54,16 @@ var helpers_js_1 = require("./helpers.js");
  */
 function armageddon(fsid, wallet) {
     return __awaiter(this, void 0, void 0, function () {
-        var innerData, innerLen, instructionData, feeDistributorPda, instruction, tx;
+        var innerData, instructionData, feeDistributorPda, payerAta, feeAta, instruction, tx;
         return __generator(this, function (_a) {
             innerData = Buffer.concat([
                 Buffer.from([1]),
                 Buffer.from(new bn_js_1.default(fsid).toArray('le', 8))
             ]);
-            innerLen = Buffer.alloc(4);
-            innerLen.writeUInt32LE(innerData.length);
-            instructionData = Buffer.concat([
-                Buffer.from([0]),
-                innerLen,
-                innerData
-            ]);
-            feeDistributorPda = (0, helpers_js_1.getFeeDistributorPda)();
+            instructionData = (0, helpers_1.buildInstructionData)(innerData);
+            feeDistributorPda = (0, helpers_1.getFeeDistributorPda)();
+            payerAta = (0, helpers_1.getAssociatedTokenAddressWithProgramIds)(wallet);
+            feeAta = (0, helpers_1.getAssociatedTokenAddressWithProgramIds)(feeDistributorPda.pda);
             instruction = new web3_js_1.TransactionInstruction({
                 keys: [
                     {
@@ -81,12 +77,22 @@ function armageddon(fsid, wallet) {
                         isWritable: true
                     },
                     {
-                        pubkey: web3_js_1.SystemProgram.programId,
+                        pubkey: payerAta.ata,
+                        isSigner: false,
+                        isWritable: true
+                    },
+                    {
+                        pubkey: feeAta.ata,
+                        isSigner: false,
+                        isWritable: true
+                    },
+                    {
+                        pubkey: const_1.TOKEN_PROGRAM_ID,
                         isSigner: false,
                         isWritable: false
                     }
                 ],
-                programId: new web3_js_1.PublicKey(const_js_1.programId),
+                programId: new web3_js_1.PublicKey(const_1.programId),
                 data: instructionData
             });
             tx = new web3_js_1.Transaction().add(instruction);

package/dist/assignCoowner.js

@@ -43,7 +43,7 @@ exports.assignCoowner = assignCoowner;
 var web3_js_1 = require("@solana/web3.js");
 var const_1 = require("./const");
 var bn_js_1 = __importDefault(require("bn.js"));
-var helpers_js_1 = require("./helpers.js");
+var helpers_1 = require("./helpers");
 /**
  * Constructs a Solana transaction to assign a co-owner to a file or directory
  * identified by a file system ID (`fsid`).
@@ -56,7 +56,7 @@ var helpers_js_1 = require("./helpers.js");
  */
 function assignCoowner(fsid, path, coowner, wallet) {
     return __awaiter(this, void 0, void 0, function () {
-        var rest, innerData, innerLen, instructionData, feeDistributorPda, instruction, tx;
+        var rest, innerData, instructionData, feeDistributorPda, payerAta, feeAta, instruction, tx;
         return __generator(this, function (_a) {
             rest = Buffer.from("".concat(path, "\0").concat(coowner.toString()), 'utf-8');
             innerData = Buffer.concat([
@@ -64,14 +64,10 @@ function assignCoowner(fsid, path, coowner, wallet) {
                 Buffer.from(new bn_js_1.default(fsid).toArray('le', 8)),
                 rest
             ]);
-            innerLen = Buffer.alloc(4);
-            innerLen.writeUInt32LE(innerData.length);
-            instructionData = Buffer.concat([
-                Buffer.from([0]),
-                innerLen,
-                innerData
-            ]);
-            feeDistributorPda = (0, helpers_js_1.getFeeDistributorPda)();
+            instructionData = (0, helpers_1.buildInstructionData)(innerData);
+            feeDistributorPda = (0, helpers_1.getFeeDistributorPda)();
+            payerAta = (0, helpers_1.getAssociatedTokenAddressWithProgramIds)(wallet);
+            feeAta = (0, helpers_1.getAssociatedTokenAddressWithProgramIds)(feeDistributorPda.pda);
             instruction = new web3_js_1.TransactionInstruction({
                 keys: [
                     {
@@ -85,7 +81,17 @@ function assignCoowner(fsid, path, coowner, wallet) {
                         isWritable: true
                     },
                     {
-                        pubkey: web3_js_1.SystemProgram.programId,
+                        pubkey: payerAta.ata,
+                        isSigner: false,
+                        isWritable: true
+                    },
+                    {
+                        pubkey: feeAta.ata,
+                        isSigner: false,
+                        isWritable: true
+                    },
+                    {
+                        pubkey: const_1.TOKEN_PROGRAM_ID,
                         isSigner: false,
                         isWritable: false
                     }

package/dist/bigbang.d.ts

@@ -1,9 +1,9 @@
 import { Transaction, PublicKey } from '@solana/web3.js';
 /**
- * Constructs a Solana transaction that triggers the "bigbang" instruction and create new file system.
+ * Constructs a Solana transaction that triggers the "bigbang" instruction and creates a new file system.
  *
+ * @param replicaCount - The number of replicas for the new file system. Must be 2 or greater. The total number of copies will be replicaCount + 1 (one original plus the replicas).
  * @param wallet - The public key of the wallet that will sign and authorize the transaction.
- * @param replica_count - A stringified integer representing the number of replicas for the new file system. Must be 2 or greater. The total number of copies will be replica_count + 1 (one original plus the replicas).
  * @returns A Promise that resolves to a Solana `Transaction` object containing the bigbang instruction.
  */
-export declare function bigbang(replica_count: string, wallet: PublicKey): Promise<Transaction>;
+export declare function bigbang(replicaCount: number, wallet: PublicKey): Promise<Transaction>;

package/dist/bigbang.js

@@ -35,61 +35,59 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bigbang = bigbang;
 var web3_js_1 = require("@solana/web3.js");
-var bn_js_1 = __importDefault(require("bn.js"));
 var const_1 = require("./const");
 var helpers_1 = require("./helpers");
 /**
- * Constructs a Solana transaction that triggers the "bigbang" instruction and create new file system.
+ * Constructs a Solana transaction that triggers the "bigbang" instruction and creates a new file system.
  *
+ * @param replicaCount - The number of replicas for the new file system. Must be 2 or greater. The total number of copies will be replicaCount + 1 (one original plus the replicas).
  * @param wallet - The public key of the wallet that will sign and authorize the transaction.
- * @param replica_count - A stringified integer representing the number of replicas for the new file system. Must be 2 or greater. The total number of copies will be replica_count + 1 (one original plus the replicas).
  * @returns A Promise that resolves to a Solana `Transaction` object containing the bigbang instruction.
  */
-function bigbang(replica_count, wallet) {
+function bigbang(replicaCount, wallet) {
     return __awaiter(this, void 0, void 0, function () {
-        var innerData, innerLen, instructionData, feeDistributorPda, instruction, tx;
+        var feeDistributorPda, payerAta, feeAta, innerData, instructionData, instruction;
         return __generator(this, function (_a) {
-            innerData = Buffer.concat([
-                Buffer.from([0]),
-                Buffer.from(new bn_js_1.default(replica_count).toArray('le', 8))
-            ]);
-            innerLen = Buffer.alloc(4);
-            innerLen.writeUInt32LE(innerData.length);
-            instructionData = Buffer.concat([
-                Buffer.from([0]),
-                innerLen,
-                innerData
-            ]);
             feeDistributorPda = (0, helpers_1.getFeeDistributorPda)();
+            payerAta = (0, helpers_1.getAssociatedTokenAddressWithProgramIds)(wallet);
+            feeAta = (0, helpers_1.getAssociatedTokenAddressWithProgramIds)(feeDistributorPda.pda);
+            innerData = Buffer.concat([Buffer.from([0]), (0, helpers_1.u64ToLeBytes)(replicaCount)]);
+            instructionData = (0, helpers_1.buildInstructionData)(innerData);
             instruction = new web3_js_1.TransactionInstruction({
                 keys: [
                     {
                         pubkey: wallet,
                         isSigner: true,
-                        isWritable: true
+                        isWritable: true,
                     },
                     {
                         pubkey: feeDistributorPda.pda,
                         isSigner: false,
-                        isWritable: true
+                        isWritable: true,
+                    },
+                    {
+                        pubkey: payerAta.ata,
+                        isSigner: false,
+                        isWritable: true,
                     },
                     {
-                        pubkey: web3_js_1.SystemProgram.programId,
+                        pubkey: feeAta.ata,
                         isSigner: false,
-                        isWritable: false
-                    }
+                        isWritable: true,
+                    },
+                    {
+                        pubkey: const_1.TOKEN_PROGRAM_ID,
+                        isSigner: false,
+                        isWritable: false,
+                    },
                 ],
                 programId: new web3_js_1.PublicKey(const_1.programId),
-                data: instructionData
+                data: instructionData,
             });
-            tx = new web3_js_1.Transaction().add(instruction);
-            return [2 /*return*/, tx];
+            return [2 /*return*/, new web3_js_1.Transaction().add(instruction)];
         });
     });
 }

package/dist/const.d.ts

@@ -1 +1,5 @@
-export declare const programId = "EaLDF7m76kzvrpeADHVHPLfk5qpPaPxYUYqYApByLp1S";
+import { PublicKey } from '@solana/web3.js';
+export declare const programId = "GH4eE2Wuzd2cFHQgXDp4avGLA3cEiNwEBVhkGkP8Vrs3";
+export declare const TOKEN_PROGRAM_ID: PublicKey;
+export declare const ATA_PROGRAM_ID: PublicKey;
+export declare const TOKEN_MINT_ADDRESS: PublicKey;

package/dist/const.js

@@ -1,4 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.programId = void 0;
-exports.programId = "EaLDF7m76kzvrpeADHVHPLfk5qpPaPxYUYqYApByLp1S";
+exports.TOKEN_MINT_ADDRESS = exports.ATA_PROGRAM_ID = exports.TOKEN_PROGRAM_ID = exports.programId = void 0;
+var web3_js_1 = require("@solana/web3.js");
+exports.programId = "GH4eE2Wuzd2cFHQgXDp4avGLA3cEiNwEBVhkGkP8Vrs3";
+exports.TOKEN_PROGRAM_ID = new web3_js_1.PublicKey("651cCwrKdzgNUBo3sUBGCahtsxzfC7yTaNounG3q3iDF");
+exports.ATA_PROGRAM_ID = new web3_js_1.PublicKey("7aRtRTerxiPxr6fpUBfs2j2ehRANmpSLRWgNPyYitaxi");
+exports.TOKEN_MINT_ADDRESS = new web3_js_1.PublicKey("BPbgHqagPnds7Rs5j7NvL8DjsJAZz1XSCQFW1mU2wigR");

package/dist/copyPath.js

@@ -44,7 +44,7 @@ var web3_js_1 = require("@solana/web3.js");
 var bn_js_1 = __importDefault(require("bn.js"));
 var const_1 = require("./const");
 var sanitizePath_1 = require("./sanitizePath");
-var helpers_js_1 = require("./helpers.js");
+var helpers_1 = require("./helpers");
 /**
  * Constructs a Solana transaction to copy a file or directory from one  path to another.
  *
@@ -58,7 +58,7 @@ var helpers_js_1 = require("./helpers.js");
  */
 function copyPath(fsid, srcPath, destPath, wallet) {
     return __awaiter(this, void 0, void 0, function () {
-        var rest, innerData, innerLen, instructionData, feeDistributorPda, instruction, tx;
+        var rest, innerData, instructionData, feeDistributorPda, payerAta, feeAta, instruction, tx;
         return __generator(this, function (_a) {
             // Validate path: only letters, numbers, and /
             (0, sanitizePath_1.sanitizePath)(srcPath);
@@ -69,14 +69,10 @@ function copyPath(fsid, srcPath, destPath, wallet) {
                 Buffer.from(new bn_js_1.default(fsid).toArray('le', 8)),
                 rest
             ]);
-            innerLen = Buffer.alloc(4);
-            innerLen.writeUInt32LE(innerData.length);
-            instructionData = Buffer.concat([
-                Buffer.from([0]),
-                innerLen,
-                innerData
-            ]);
-            feeDistributorPda = (0, helpers_js_1.getFeeDistributorPda)();
+            instructionData = (0, helpers_1.buildInstructionData)(innerData);
+            feeDistributorPda = (0, helpers_1.getFeeDistributorPda)();
+            payerAta = (0, helpers_1.getAssociatedTokenAddressWithProgramIds)(wallet);
+            feeAta = (0, helpers_1.getAssociatedTokenAddressWithProgramIds)(feeDistributorPda.pda);
             instruction = new web3_js_1.TransactionInstruction({
                 keys: [
                     {
@@ -90,7 +86,17 @@ function copyPath(fsid, srcPath, destPath, wallet) {
                         isWritable: true
                     },
                     {
-                        pubkey: web3_js_1.SystemProgram.programId,
+                        pubkey: payerAta.ata,
+                        isSigner: false,
+                        isWritable: true
+                    },
+                    {
+                        pubkey: feeAta.ata,
+                        isSigner: false,
+                        isWritable: true
+                    },
+                    {
+                        pubkey: const_1.TOKEN_PROGRAM_ID,
                         isSigner: false,
                         isWritable: false
                     }

package/dist/createDirectory.d.ts

@@ -5,7 +5,7 @@ import { Transaction, PublicKey } from '@solana/web3.js';
  * @param fsid - A numeric filesystem identifier used to scope the directory creation.
  * @param path - The parent path where the directory should be created (e.g., `/documents`).
  * @param name - The name of the new directory (e.g., `reports`).
- * @param wallet - The signer’s public key that authorizes the transaction.
+ * @param wallet - The signer's public key that authorizes the transaction.
  * @returns A Promise that resolves to a Solana `Transaction` object containing the createDirectory instruction.
  * @throws Will throw an error if `path` or `name` contains invalid characters.@throws Will throw if the combined path is invalid (non-alphanumeric or unsupported characters).
  */

package/dist/createDirectory.js

@@ -44,20 +44,20 @@ var web3_js_1 = require("@solana/web3.js");
 var bn_js_1 = __importDefault(require("bn.js"));
 var const_1 = require("./const");
 var sanitizePath_1 = require("./sanitizePath");
-var helpers_js_1 = require("./helpers.js");
+var helpers_1 = require("./helpers");
 /**
  * Constructs a Solana transaction to create a new directory within a  file system.
  *
  * @param fsid - A numeric filesystem identifier used to scope the directory creation.
  * @param path - The parent path where the directory should be created (e.g., `/documents`).
  * @param name - The name of the new directory (e.g., `reports`).
- * @param wallet - The signer’s public key that authorizes the transaction.
+ * @param wallet - The signer's public key that authorizes the transaction.
  * @returns A Promise that resolves to a Solana `Transaction` object containing the createDirectory instruction.
  * @throws Will throw an error if `path` or `name` contains invalid characters.@throws Will throw if the combined path is invalid (non-alphanumeric or unsupported characters).
  */
 function createDirectory(fsid, path, name, wallet) {
     return __awaiter(this, void 0, void 0, function () {
-        var combinedPath, rest, innerData, innerLen, instructionData, feeDistributorPda, instruction, tx;
+        var combinedPath, rest, innerData, instructionData, feeDistributorPda, payerAta, feeAta, instruction, tx;
         return __generator(this, function (_a) {
             combinedPath = path.endsWith('/') ? "".concat(path).concat(name) : "".concat(path, "/").concat(name);
             (0, sanitizePath_1.sanitizePath)(combinedPath);
@@ -67,14 +67,10 @@ function createDirectory(fsid, path, name, wallet) {
                 Buffer.from(new bn_js_1.default(fsid).toArray('le', 8)),
                 rest
             ]);
-            innerLen = Buffer.alloc(4);
-            innerLen.writeUInt32LE(innerData.length);
-            instructionData = Buffer.concat([
-                Buffer.from([0]),
-                innerLen,
-                innerData
-            ]);
-            feeDistributorPda = (0, helpers_js_1.getFeeDistributorPda)();
+            instructionData = (0, helpers_1.buildInstructionData)(innerData);
+            feeDistributorPda = (0, helpers_1.getFeeDistributorPda)();
+            payerAta = (0, helpers_1.getAssociatedTokenAddressWithProgramIds)(wallet);
+            feeAta = (0, helpers_1.getAssociatedTokenAddressWithProgramIds)(feeDistributorPda.pda);
             instruction = new web3_js_1.TransactionInstruction({
                 keys: [
                     {
@@ -88,7 +84,17 @@ function createDirectory(fsid, path, name, wallet) {
                         isWritable: true
                     },
                     {
-                        pubkey: web3_js_1.SystemProgram.programId,
+                        pubkey: payerAta.ata,
+                        isSigner: false,
+                        isWritable: true
+                    },
+                    {
+                        pubkey: feeAta.ata,
+                        isSigner: false,
+                        isWritable: true
+                    },
+                    {
+                        pubkey: const_1.TOKEN_PROGRAM_ID,
                         isSigner: false,
                         isWritable: false
                     }

package/dist/createFile.js

@@ -44,7 +44,7 @@ var web3_js_1 = require("@solana/web3.js");
 var bn_js_1 = __importDefault(require("bn.js"));
 var const_1 = require("./const");
 var sanitizePath_1 = require("./sanitizePath");
-var helpers_js_1 = require("./helpers.js");
+var helpers_1 = require("./helpers");
 /**
  * Constructs a Solana transaction to create a new file
  * within a file system, identified by a file system ID (`fsid`).
@@ -58,7 +58,7 @@ var helpers_js_1 = require("./helpers.js");
  */
 function createFile(fsid, path, name, wallet) {
     return __awaiter(this, void 0, void 0, function () {
-        var combinedPath, rest, innerData, innerLen, instructionData, feeDistributorPda, instruction, tx;
+        var combinedPath, rest, innerData, instructionData, feeDistributorPda, payerAta, feeAta, instruction, tx;
         return __generator(this, function (_a) {
             combinedPath = path.endsWith('/') ? "".concat(path).concat(name) : "".concat(path, "/").concat(name);
             (0, sanitizePath_1.sanitizePath)(combinedPath);
@@ -68,14 +68,10 @@ function createFile(fsid, path, name, wallet) {
                 Buffer.from(new bn_js_1.default(fsid).toArray('le', 8)),
                 rest
             ]);
-            innerLen = Buffer.alloc(4);
-            innerLen.writeUInt32LE(innerData.length);
-            instructionData = Buffer.concat([
-                Buffer.from([0]),
-                innerLen,
-                innerData
-            ]);
-            feeDistributorPda = (0, helpers_js_1.getFeeDistributorPda)();
+            instructionData = (0, helpers_1.buildInstructionData)(innerData);
+            feeDistributorPda = (0, helpers_1.getFeeDistributorPda)();
+            payerAta = (0, helpers_1.getAssociatedTokenAddressWithProgramIds)(wallet);
+            feeAta = (0, helpers_1.getAssociatedTokenAddressWithProgramIds)(feeDistributorPda.pda);
             instruction = new web3_js_1.TransactionInstruction({
                 keys: [
                     {
@@ -89,7 +85,17 @@ function createFile(fsid, path, name, wallet) {
                         isWritable: true
                     },
                     {
-                        pubkey: web3_js_1.SystemProgram.programId,
+                        pubkey: payerAta.ata,
+                        isSigner: false,
+                        isWritable: true
+                    },
+                    {
+                        pubkey: feeAta.ata,
+                        isSigner: false,
+                        isWritable: true
+                    },
+                    {
+                        pubkey: const_1.TOKEN_PROGRAM_ID,
                         isSigner: false,
                         isWritable: false
                     }

package/dist/helpers.d.ts

@@ -50,6 +50,32 @@ export declare function getCurrentYuga(): number;
  * console.log('Bump seed:', bump)
  * ```
  */
+/**
+ * Derives the Associated Token Address (ATA) for a given wallet using custom program IDs.
+ *
+ * @param walletAddress - The public key of the wallet
+ * @returns An object containing the ATA public key and bump seed
+ */
+export declare function getAssociatedTokenAddressWithProgramIds(walletAddress: PublicKey): {
+    ata: PublicKey;
+    bump: number;
+};
+/**
+ * Converts a u64 value to little-endian bytes.
+ *
+ * @param value - The value to convert (number)
+ * @returns A Buffer containing the 8-byte little-endian representation
+ */
+export declare function u64ToLeBytes(value: number): Buffer;
+/**
+ * Builds the instruction data buffer for a given inner data payload.
+ * Allocates a fixed 33-byte buffer, sets the first byte to 0,
+ * and copies the inner data starting at offset 1.
+ *
+ * @param innerData - The inner data buffer to embed in the instruction
+ * @returns A 33-byte Buffer containing the instruction data
+ */
+export declare function buildInstructionData(innerData: Buffer): Buffer;
 export declare function getFeeDistributorPda(): {
     pda: PublicKey;
     bump: number;

package/dist/helpers.js

@@ -6,6 +6,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.YUGA_START_TIMESTAMP = exports.YUGA_DURATION_SECONDS = exports.PULSES_PER_YUGA = exports.PULSE_DURATION_SECONDS = exports.FEE_DISTRIBUTOR_SEED = void 0;
 exports.getYugaFromTimestamp = getYugaFromTimestamp;
 exports.getCurrentYuga = getCurrentYuga;
+exports.getAssociatedTokenAddressWithProgramIds = getAssociatedTokenAddressWithProgramIds;
+exports.u64ToLeBytes = u64ToLeBytes;
+exports.buildInstructionData = buildInstructionData;
 exports.getFeeDistributorPda = getFeeDistributorPda;
 var web3_js_1 = require("@solana/web3.js");
 var const_1 = require("./const");
@@ -69,6 +72,47 @@ function getCurrentYuga() {
  * console.log('Bump seed:', bump)
  * ```
  */
+/**
+ * Derives the Associated Token Address (ATA) for a given wallet using custom program IDs.
+ *
+ * @param walletAddress - The public key of the wallet
+ * @returns An object containing the ATA public key and bump seed
+ */
+function getAssociatedTokenAddressWithProgramIds(walletAddress) {
+    var _a = web3_js_1.PublicKey.findProgramAddressSync([
+        walletAddress.toBuffer(),
+        const_1.TOKEN_PROGRAM_ID.toBuffer(),
+        const_1.TOKEN_MINT_ADDRESS.toBuffer(),
+    ], const_1.ATA_PROGRAM_ID), ata = _a[0], bump = _a[1];
+    return { ata: ata, bump: bump };
+}
+/**
+ * Converts a u64 value to little-endian bytes.
+ *
+ * @param value - The value to convert (number)
+ * @returns A Buffer containing the 8-byte little-endian representation
+ */
+function u64ToLeBytes(value) {
+    var bn = new bn_js_1.default(value);
+    if (bn.isNeg() || bn.byteLength() > 8) {
+        throw new Error("u64 out of range: ".concat(value));
+    }
+    return Buffer.from(bn.toArray('le', 8));
+}
+/**
+ * Builds the instruction data buffer for a given inner data payload.
+ * Allocates a fixed 33-byte buffer, sets the first byte to 0,
+ * and copies the inner data starting at offset 1.
+ *
+ * @param innerData - The inner data buffer to embed in the instruction
+ * @returns A 33-byte Buffer containing the instruction data
+ */
+function buildInstructionData(innerData) {
+    var instructionData = Buffer.alloc(33, 0);
+    instructionData[0] = 0;
+    innerData.copy(instructionData, 1);
+    return instructionData;
+}
 function getFeeDistributorPda() {
     var yuga = getCurrentYuga();
     var yugaBuffer = Buffer.from(new bn_js_1.default(yuga).toArray('le', 8));

package/dist/move.js

@@ -59,7 +59,7 @@ var helpers_1 = require("./helpers");
  */
 function move(fsid, srcPath, destPath, name, wallet) {
     return __awaiter(this, void 0, void 0, function () {
-        var rest, innerData, innerLen, instructionData, feeDistributorPda, instruction, tx;
+        var rest, innerData, instructionData, feeDistributorPda, payerAta, feeAta, instruction, tx;
         return __generator(this, function (_a) {
             // Validate path: only letters, numbers, and /
             (0, sanitizePath_1.sanitizePath)(srcPath);
@@ -71,14 +71,10 @@ function move(fsid, srcPath, destPath, name, wallet) {
                 Buffer.from(new bn_js_1.default(fsid).toArray('le', 8)),
                 rest
             ]);
-            innerLen = Buffer.alloc(4);
-            innerLen.writeUInt32LE(innerData.length);
-            instructionData = Buffer.concat([
-                Buffer.from([0]),
-                innerLen,
-                innerData
-            ]);
+            instructionData = (0, helpers_1.buildInstructionData)(innerData);
             feeDistributorPda = (0, helpers_1.getFeeDistributorPda)();
+            payerAta = (0, helpers_1.getAssociatedTokenAddressWithProgramIds)(wallet);
+            feeAta = (0, helpers_1.getAssociatedTokenAddressWithProgramIds)(feeDistributorPda.pda);
             instruction = new web3_js_1.TransactionInstruction({
                 keys: [
                     {
@@ -92,7 +88,17 @@ function move(fsid, srcPath, destPath, name, wallet) {
                         isWritable: true
                     },
                     {
-                        pubkey: web3_js_1.SystemProgram.programId,
+                        pubkey: payerAta.ata,
+                        isSigner: false,
+                        isWritable: true
+                    },
+                    {
+                        pubkey: feeAta.ata,
+                        isSigner: false,
+                        isWritable: true
+                    },
+                    {
+                        pubkey: const_1.TOKEN_PROGRAM_ID,
                         isSigner: false,
                         isWritable: false
                     }

package/dist/peek.js

@@ -60,7 +60,7 @@ var helpers_1 = require("./helpers");
  */
 function peek(fsid, path, startPosition, endPosition, wallet) {
     return __awaiter(this, void 0, void 0, function () {
-        var rest, innerData, innerLen, instructionData, feeDistributorPda, instruction, tx;
+        var rest, innerData, instructionData, feeDistributorPda, payerAta, feeAta, instruction, tx;
         return __generator(this, function (_a) {
             (0, sanitizePath_1.sanitizePath)(path);
             rest = Buffer.from("".concat(path), 'utf-8');
@@ -71,14 +71,10 @@ function peek(fsid, path, startPosition, endPosition, wallet) {
                 Buffer.from(new bn_js_1.default(endPosition).toArray('le', 8)),
                 rest
             ]);
-            innerLen = Buffer.alloc(4);
-            innerLen.writeUInt32LE(innerData.length);
-            instructionData = Buffer.concat([
-                Buffer.from([0]),
-                innerLen,
-                innerData
-            ]);
+            instructionData = (0, helpers_1.buildInstructionData)(innerData);
             feeDistributorPda = (0, helpers_1.getFeeDistributorPda)();
+            payerAta = (0, helpers_1.getAssociatedTokenAddressWithProgramIds)(wallet);
+            feeAta = (0, helpers_1.getAssociatedTokenAddressWithProgramIds)(feeDistributorPda.pda);
             instruction = new web3_js_1.TransactionInstruction({
                 keys: [
                     {
@@ -92,7 +88,17 @@ function peek(fsid, path, startPosition, endPosition, wallet) {
                         isWritable: true
                     },
                     {
-                        pubkey: web3_js_1.SystemProgram.programId,
+                        pubkey: payerAta.ata,
+                        isSigner: false,
+                        isWritable: true
+                    },
+                    {
+                        pubkey: feeAta.ata,
+                        isSigner: false,
+                        isWritable: true
+                    },
+                    {
+                        pubkey: const_1.TOKEN_PROGRAM_ID,
                         isSigner: false,
                         isWritable: false
                     }

package/dist/poke.d.ts

@@ -1,6 +1,6 @@
 import { Transaction, PublicKey } from '@solana/web3.js';
 /**
- * Constructs a Solana transaction to perform a poke\operation, which writes data
+ * Constructs a Solana transaction to perform a poke operation, which writes data
  * to a file at the specified path and byte position.
  *
  * @param fsid - A stringified integer representing the file system ID where the file resides.