@xandeum/web3.js 1.3.5 → 1.3.7

package/src/move.ts

@@ -1,8 +1,8 @@
 import { Transaction, TransactionInstruction, PublicKey } from '@solana/web3.js'
 import BN from 'bn.js'
-import { programId } from './const'
+import { programId, TOKEN_PROGRAM_ID } from './const'
 import { sanitizePath } from './sanitizePath'
-import { getFeeDistributorPda } from './helpers'
+import { getFeeDistributorPda, getAssociatedTokenAddressWithProgramIds, buildInstructionData } from './helpers'
 
 /**
  * Constructs a Solana transaction to copy a file or directory from one  path to another.
@@ -33,13 +33,18 @@ export async function move (
 
   const rest = Buffer.from(`${srcPath}\0${destPath}\0${name}`, 'utf-8')
 
-  const instructionData = Buffer.concat([
-    Buffer.from(Int8Array.from([0]).buffer),
-    Buffer.from(Int8Array.from([13]).buffer),
-    Buffer.from(Uint8Array.of(...new BN(fsid).toArray('le', 8))),
+  // inner_data: [13u8 (operation), fsid as u64 LE, paths]
+  const innerData = Buffer.concat([
+    Buffer.from([13]),
+    Buffer.from(new BN(fsid).toArray('le', 8)),
     rest
   ])
+
+  const instructionData = buildInstructionData(innerData)
   let feeDistributorPda = getFeeDistributorPda()
+  const payerAta = getAssociatedTokenAddressWithProgramIds(wallet)
+  const feeAta = getAssociatedTokenAddressWithProgramIds(feeDistributorPda.pda)
+
   const instruction = new TransactionInstruction({
     keys: [
       {
@@ -51,6 +56,21 @@ export async function move (
         pubkey: feeDistributorPda.pda,
         isSigner: false,
         isWritable: true
+      },
+      {
+        pubkey: payerAta.ata,
+        isSigner: false,
+        isWritable: true
+      },
+      {
+        pubkey: feeAta.ata,
+        isSigner: false,
+        isWritable: true
+      },
+      {
+        pubkey: TOKEN_PROGRAM_ID,
+        isSigner: false,
+        isWritable: false
       }
     ],
     programId: new PublicKey(programId),

package/src/peek.ts

@@ -1,8 +1,8 @@
 import { Transaction, TransactionInstruction, PublicKey } from '@solana/web3.js'
 import BN from 'bn.js'
-import { programId } from './const'
+import { programId, TOKEN_PROGRAM_ID } from './const'
 import { sanitizePath } from './sanitizePath'
-import { getFeeDistributorPda } from './helpers'
+import { getFeeDistributorPda, getAssociatedTokenAddressWithProgramIds, buildInstructionData } from './helpers'
 
 /**
  * Constructs a Solana transaction to perform a "peek" operation on a file within a file system.
@@ -28,15 +28,21 @@ export async function peek (
   sanitizePath(path)
 
   const rest = Buffer.from(`${path}`, 'utf-8')
-  const instructionData = Buffer.concat([
-    Buffer.from(Int8Array.from([0]).buffer),
-    Buffer.from(Int8Array.from([3]).buffer),
-    Buffer.from(Uint8Array.of(...new BN(fsid).toArray('le', 8))),
-    Buffer.from(Uint8Array.of(...new BN(startPosition).toArray('le', 8))),
-    Buffer.from(Uint8Array.of(...new BN(endPosition).toArray('le', 8))),
+
+  // inner_data: [3u8 (operation), fsid as u64 LE, startPosition as u64 LE, endPosition as u64 LE, path]
+  const innerData = Buffer.concat([
+    Buffer.from([3]),
+    Buffer.from(new BN(fsid).toArray('le', 8)),
+    Buffer.from(new BN(startPosition).toArray('le', 8)),
+    Buffer.from(new BN(endPosition).toArray('le', 8)),
     rest
   ])
+
+  const instructionData = buildInstructionData(innerData)
   let feeDistributorPda = getFeeDistributorPda()
+  const payerAta = getAssociatedTokenAddressWithProgramIds(wallet)
+  const feeAta = getAssociatedTokenAddressWithProgramIds(feeDistributorPda.pda)
+
   const instruction = new TransactionInstruction({
     keys: [
       {
@@ -48,6 +54,21 @@ export async function peek (
         pubkey: feeDistributorPda.pda,
         isSigner: false,
         isWritable: true
+      },
+      {
+        pubkey: payerAta.ata,
+        isSigner: false,
+        isWritable: true
+      },
+      {
+        pubkey: feeAta.ata,
+        isSigner: false,
+        isWritable: true
+      },
+      {
+        pubkey: TOKEN_PROGRAM_ID,
+        isSigner: false,
+        isWritable: false
       }
     ],
     programId: new PublicKey(programId),

package/src/poke.ts

@@ -1,11 +1,11 @@
 import { Transaction, TransactionInstruction, PublicKey } from '@solana/web3.js'
 import BN from 'bn.js'
-import { programId } from './const'
+import { programId, TOKEN_PROGRAM_ID } from './const'
 import { sanitizePath } from './sanitizePath'
-import { getFeeDistributorPda } from './helpers'
+import { getFeeDistributorPda, getAssociatedTokenAddressWithProgramIds, buildInstructionData } from './helpers'
 
 /**
- * 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.
@@ -29,16 +29,22 @@ export async function poke (
   // Encode the path as UTF-8
   const pathBuffer = Buffer.from(path, 'utf-8')
   // Encode the path length as an 8-byte little-endian unsigned integer
-  const pathLengthBuffer = Buffer.from(Uint8Array.of(...new BN(pathBuffer.length).toArray('le', 8)))
-  const instructionData = Buffer.concat([
-    Buffer.from(Int8Array.from([0]).buffer),
-    Buffer.from(Int8Array.from([4]).buffer),
-    Buffer.from(Uint8Array.of(...new BN(fsid).toArray('le', 8))),
-    Buffer.from(Uint8Array.of(...new BN(position).toArray('le', 8))),
+  const pathLengthBuffer = Buffer.from(new BN(pathBuffer.length).toArray('le', 8))
+
+  // inner_data: [4u8 (operation), fsid as u64 LE, position as u64 LE, pathLength as u64 LE, path]
+  const innerData = Buffer.concat([
+    Buffer.from([4]),
+    Buffer.from(new BN(fsid).toArray('le', 8)),
+    Buffer.from(new BN(position).toArray('le', 8)),
     pathLengthBuffer,
     pathBuffer
   ])
+
+  const instructionData = buildInstructionData(innerData)
   let feeDistributorPda = getFeeDistributorPda()
+  const payerAta = getAssociatedTokenAddressWithProgramIds(wallet)
+  const feeAta = getAssociatedTokenAddressWithProgramIds(feeDistributorPda.pda)
+
   const instruction = new TransactionInstruction({
     keys: [
       {
@@ -55,6 +61,21 @@ export async function poke (
         pubkey: feeDistributorPda.pda,
         isSigner: false,
         isWritable: true
+      },
+      {
+        pubkey: payerAta.ata,
+        isSigner: false,
+        isWritable: true
+      },
+      {
+        pubkey: feeAta.ata,
+        isSigner: false,
+        isWritable: true
+      },
+      {
+        pubkey: TOKEN_PROGRAM_ID,
+        isSigner: false,
+        isWritable: false
       }
     ],
     programId: new PublicKey(programId),

package/src/removeDirectory.ts

@@ -1,8 +1,9 @@
 import { Transaction, TransactionInstruction, PublicKey } from '@solana/web3.js'
 import BN from 'bn.js'
-import { programId } from './const'
+import { programId, TOKEN_PROGRAM_ID } from './const'
 import { sanitizePath } from './sanitizePath'
-import { getFeeDistributorPda } from './helpers'
+import { getFeeDistributorPda, getAssociatedTokenAddressWithProgramIds, buildInstructionData } from './helpers'
+
 /**
  * Constructs a Solana transaction to perform a "remove directory" operation
  * in a  file system, identified by a file system ID (`fsid`).
@@ -20,13 +21,18 @@ export async function removeDirectory (
   wallet: PublicKey
 ): Promise<Transaction> {
   sanitizePath(path)
-  const instructionData = Buffer.concat([
-    Buffer.from(Int8Array.from([0]).buffer),
-    Buffer.from(Int8Array.from([7]).buffer),
-    Buffer.from(Uint8Array.of(...new BN(fsid).toArray('le', 8))),
+  // inner_data: [7u8 (operation), fsid as u64 LE, path]
+  const innerData = Buffer.concat([
+    Buffer.from([7]),
+    Buffer.from(new BN(fsid).toArray('le', 8)),
     Buffer.from(`${path}`, 'utf-8')
   ])
+
+  const instructionData = buildInstructionData(innerData)
   let feeDistributorPda = getFeeDistributorPda()
+  const payerAta = getAssociatedTokenAddressWithProgramIds(wallet)
+  const feeAta = getAssociatedTokenAddressWithProgramIds(feeDistributorPda.pda)
+
   const instruction = new TransactionInstruction({
     keys: [
       {
@@ -38,6 +44,21 @@ export async function removeDirectory (
         pubkey: feeDistributorPda.pda,
         isSigner: false,
         isWritable: true
+      },
+      {
+        pubkey: payerAta.ata,
+        isSigner: false,
+        isWritable: true
+      },
+      {
+        pubkey: feeAta.ata,
+        isSigner: false,
+        isWritable: true
+      },
+      {
+        pubkey: TOKEN_PROGRAM_ID,
+        isSigner: false,
+        isWritable: false
       }
     ],
     programId: new PublicKey(programId),

package/src/removeFile.ts

@@ -1,8 +1,9 @@
 import { Transaction, TransactionInstruction, PublicKey } from '@solana/web3.js'
 import BN from 'bn.js'
-import { programId } from './const'
+import { programId, TOKEN_PROGRAM_ID } from './const'
 import { sanitizePath } from './sanitizePath'
-import { getFeeDistributorPda } from './helpers'
+import { getFeeDistributorPda, getAssociatedTokenAddressWithProgramIds, buildInstructionData } from './helpers'
+
 /**
  * Constructs a Solana transaction to remove a file from a  file system,
  * identified by a file system ID (`fsid`) and a UTF-8 encoded file path.
@@ -21,13 +22,18 @@ export async function removeFile (
 ): Promise<Transaction> {
   sanitizePath(path)
 
-  const instructionData = Buffer.concat([
-    Buffer.from(Int8Array.from([0]).buffer),
-    Buffer.from(Int8Array.from([5]).buffer),
-    Buffer.from(Uint8Array.of(...new BN(fsid).toArray('le', 8))),
+  // inner_data: [5u8 (operation), fsid as u64 LE, path]
+  const innerData = Buffer.concat([
+    Buffer.from([5]),
+    Buffer.from(new BN(fsid).toArray('le', 8)),
     Buffer.from(`${path}`, 'utf-8')
   ])
+
+  const instructionData = buildInstructionData(innerData)
   let feeDistributorPda = getFeeDistributorPda()
+  const payerAta = getAssociatedTokenAddressWithProgramIds(wallet)
+  const feeAta = getAssociatedTokenAddressWithProgramIds(feeDistributorPda.pda)
+
   const instruction = new TransactionInstruction({
     keys: [
       {
@@ -39,6 +45,21 @@ export async function removeFile (
         pubkey: feeDistributorPda.pda,
         isSigner: false,
         isWritable: true
+      },
+      {
+        pubkey: payerAta.ata,
+        isSigner: false,
+        isWritable: true
+      },
+      {
+        pubkey: feeAta.ata,
+        isSigner: false,
+        isWritable: true
+      },
+      {
+        pubkey: TOKEN_PROGRAM_ID,
+        isSigner: false,
+        isWritable: false
       }
     ],
     programId: new PublicKey(programId),

package/src/renamePath.ts

@@ -1,8 +1,9 @@
 import { Transaction, TransactionInstruction, PublicKey } from '@solana/web3.js'
 import BN from 'bn.js'
-import { programId } from './const'
+import { programId, TOKEN_PROGRAM_ID } from './const'
 import { sanitizePath } from './sanitizePath'
-import { getFeeDistributorPda } from './helpers'
+import { getFeeDistributorPda, getAssociatedTokenAddressWithProgramIds, buildInstructionData } from './helpers'
+
 /**
  * Constructs a Solana transaction to rename (or move) a file or directory
  * within a file system, based on a provided file system ID (`fsid`).
@@ -27,13 +28,18 @@ export async function renamePath (
 
   const rest = Buffer.from(`${oldPath}\0${name}`, 'utf-8')
 
-  const instructionData = Buffer.concat([
-    Buffer.from(Int8Array.from([0]).buffer),
-    Buffer.from(Int8Array.from([8]).buffer),
-    Buffer.from(Uint8Array.of(...new BN(fsid).toArray('le', 8))),
+  // inner_data: [8u8 (operation), fsid as u64 LE, paths]
+  const innerData = Buffer.concat([
+    Buffer.from([8]),
+    Buffer.from(new BN(fsid).toArray('le', 8)),
     rest
   ])
+
+  const instructionData = buildInstructionData(innerData)
   let feeDistributorPda = getFeeDistributorPda()
+  const payerAta = getAssociatedTokenAddressWithProgramIds(wallet)
+  const feeAta = getAssociatedTokenAddressWithProgramIds(feeDistributorPda.pda)
+
   const instruction = new TransactionInstruction({
     keys: [
       {
@@ -45,6 +51,21 @@ export async function renamePath (
         pubkey: feeDistributorPda.pda,
         isSigner: false,
         isWritable: true
+      },
+      {
+        pubkey: payerAta.ata,
+        isSigner: false,
+        isWritable: true
+      },
+      {
+        pubkey: feeAta.ata,
+        isSigner: false,
+        isWritable: true
+      },
+      {
+        pubkey: TOKEN_PROGRAM_ID,
+        isSigner: false,
+        isWritable: false
       }
     ],
     programId: new PublicKey(programId),