@xandeum/web3.js 1.3.6 → 1.3.7

package/src/move.ts

@@ -1,8 +1,8 @@
-import { Transaction, TransactionInstruction, PublicKey, SystemProgram } from '@solana/web3.js'
+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.
@@ -40,16 +40,11 @@ export async function move (
     rest
   ])
 
-  // wrap_storage_tx: [0u8, inner_data.len() as u32 LE, inner_data]
-  const innerLen = Buffer.alloc(4)
-  innerLen.writeUInt32LE(innerData.length)
-
-  const instructionData = Buffer.concat([
-    Buffer.from([0]),
-    innerLen,
-    innerData
-  ])
+  const instructionData = buildInstructionData(innerData)
   let feeDistributorPda = getFeeDistributorPda()
+  const payerAta = getAssociatedTokenAddressWithProgramIds(wallet)
+  const feeAta = getAssociatedTokenAddressWithProgramIds(feeDistributorPda.pda)
+
   const instruction = new TransactionInstruction({
     keys: [
       {
@@ -63,7 +58,17 @@ export async function move (
         isWritable: true
       },
       {
-        pubkey: SystemProgram.programId,
+        pubkey: payerAta.ata,
+        isSigner: false,
+        isWritable: true
+      },
+      {
+        pubkey: feeAta.ata,
+        isSigner: false,
+        isWritable: true
+      },
+      {
+        pubkey: TOKEN_PROGRAM_ID,
         isSigner: false,
         isWritable: false
       }

package/src/peek.ts

@@ -1,8 +1,8 @@
-import { Transaction, TransactionInstruction, PublicKey, SystemProgram } from '@solana/web3.js'
+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.
@@ -38,16 +38,11 @@ export async function peek (
     rest
   ])
 
-  // wrap_storage_tx: [0u8, inner_data.len() as u32 LE, inner_data]
-  const innerLen = Buffer.alloc(4)
-  innerLen.writeUInt32LE(innerData.length)
-
-  const instructionData = Buffer.concat([
-    Buffer.from([0]),
-    innerLen,
-    innerData
-  ])
+  const instructionData = buildInstructionData(innerData)
   let feeDistributorPda = getFeeDistributorPda()
+  const payerAta = getAssociatedTokenAddressWithProgramIds(wallet)
+  const feeAta = getAssociatedTokenAddressWithProgramIds(feeDistributorPda.pda)
+
   const instruction = new TransactionInstruction({
     keys: [
       {
@@ -61,7 +56,17 @@ export async function peek (
         isWritable: true
       },
       {
-        pubkey: SystemProgram.programId,
+        pubkey: payerAta.ata,
+        isSigner: false,
+        isWritable: true
+      },
+      {
+        pubkey: feeAta.ata,
+        isSigner: false,
+        isWritable: true
+      },
+      {
+        pubkey: TOKEN_PROGRAM_ID,
         isSigner: false,
         isWritable: false
       }

package/src/poke.ts

@@ -1,11 +1,11 @@
-import { Transaction, TransactionInstruction, PublicKey, SystemProgram } from '@solana/web3.js'
+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.
@@ -40,16 +40,11 @@ export async function poke (
     pathBuffer
   ])
 
-  // wrap_storage_tx: [0u8, inner_data.len() as u32 LE, inner_data]
-  const innerLen = Buffer.alloc(4)
-  innerLen.writeUInt32LE(innerData.length)
-
-  const instructionData = Buffer.concat([
-    Buffer.from([0]),
-    innerLen,
-    innerData
-  ])
+  const instructionData = buildInstructionData(innerData)
   let feeDistributorPda = getFeeDistributorPda()
+  const payerAta = getAssociatedTokenAddressWithProgramIds(wallet)
+  const feeAta = getAssociatedTokenAddressWithProgramIds(feeDistributorPda.pda)
+
   const instruction = new TransactionInstruction({
     keys: [
       {
@@ -68,7 +63,17 @@ export async function poke (
         isWritable: true
       },
       {
-        pubkey: SystemProgram.programId,
+        pubkey: payerAta.ata,
+        isSigner: false,
+        isWritable: true
+      },
+      {
+        pubkey: feeAta.ata,
+        isSigner: false,
+        isWritable: true
+      },
+      {
+        pubkey: TOKEN_PROGRAM_ID,
         isSigner: false,
         isWritable: false
       }

package/src/removeDirectory.ts

@@ -1,8 +1,9 @@
-import { Transaction, TransactionInstruction, PublicKey, SystemProgram } from '@solana/web3.js'
+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`).
@@ -27,16 +28,11 @@ export async function removeDirectory (
     Buffer.from(`${path}`, 'utf-8')
   ])
 
-  // wrap_storage_tx: [0u8, inner_data.len() as u32 LE, inner_data]
-  const innerLen = Buffer.alloc(4)
-  innerLen.writeUInt32LE(innerData.length)
-
-  const instructionData = Buffer.concat([
-    Buffer.from([0]),
-    innerLen,
-    innerData
-  ])
+  const instructionData = buildInstructionData(innerData)
   let feeDistributorPda = getFeeDistributorPda()
+  const payerAta = getAssociatedTokenAddressWithProgramIds(wallet)
+  const feeAta = getAssociatedTokenAddressWithProgramIds(feeDistributorPda.pda)
+
   const instruction = new TransactionInstruction({
     keys: [
       {
@@ -50,7 +46,17 @@ export async function removeDirectory (
         isWritable: true
       },
       {
-        pubkey: SystemProgram.programId,
+        pubkey: payerAta.ata,
+        isSigner: false,
+        isWritable: true
+      },
+      {
+        pubkey: feeAta.ata,
+        isSigner: false,
+        isWritable: true
+      },
+      {
+        pubkey: TOKEN_PROGRAM_ID,
         isSigner: false,
         isWritable: false
       }

package/src/removeFile.ts

@@ -1,8 +1,9 @@
-import { Transaction, TransactionInstruction, PublicKey, SystemProgram } from '@solana/web3.js'
+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.
@@ -28,16 +29,11 @@ export async function removeFile (
     Buffer.from(`${path}`, 'utf-8')
   ])
 
-  // wrap_storage_tx: [0u8, inner_data.len() as u32 LE, inner_data]
-  const innerLen = Buffer.alloc(4)
-  innerLen.writeUInt32LE(innerData.length)
-
-  const instructionData = Buffer.concat([
-    Buffer.from([0]),
-    innerLen,
-    innerData
-  ])
+  const instructionData = buildInstructionData(innerData)
   let feeDistributorPda = getFeeDistributorPda()
+  const payerAta = getAssociatedTokenAddressWithProgramIds(wallet)
+  const feeAta = getAssociatedTokenAddressWithProgramIds(feeDistributorPda.pda)
+
   const instruction = new TransactionInstruction({
     keys: [
       {
@@ -51,7 +47,17 @@ export async function removeFile (
         isWritable: true
       },
       {
-        pubkey: SystemProgram.programId,
+        pubkey: payerAta.ata,
+        isSigner: false,
+        isWritable: true
+      },
+      {
+        pubkey: feeAta.ata,
+        isSigner: false,
+        isWritable: true
+      },
+      {
+        pubkey: TOKEN_PROGRAM_ID,
         isSigner: false,
         isWritable: false
       }

package/src/renamePath.ts

@@ -1,8 +1,9 @@
-import { Transaction, TransactionInstruction, PublicKey, SystemProgram } from '@solana/web3.js'
+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`).
@@ -34,16 +35,11 @@ export async function renamePath (
     rest
   ])
 
-  // wrap_storage_tx: [0u8, inner_data.len() as u32 LE, inner_data]
-  const innerLen = Buffer.alloc(4)
-  innerLen.writeUInt32LE(innerData.length)
-
-  const instructionData = Buffer.concat([
-    Buffer.from([0]),
-    innerLen,
-    innerData
-  ])
+  const instructionData = buildInstructionData(innerData)
   let feeDistributorPda = getFeeDistributorPda()
+  const payerAta = getAssociatedTokenAddressWithProgramIds(wallet)
+  const feeAta = getAssociatedTokenAddressWithProgramIds(feeDistributorPda.pda)
+
   const instruction = new TransactionInstruction({
     keys: [
       {
@@ -57,7 +53,17 @@ export async function renamePath (
         isWritable: true
       },
       {
-        pubkey: SystemProgram.programId,
+        pubkey: payerAta.ata,
+        isSigner: false,
+        isWritable: true
+      },
+      {
+        pubkey: feeAta.ata,
+        isSigner: false,
+        isWritable: true
+      },
+      {
+        pubkey: TOKEN_PROGRAM_ID,
         isSigner: false,
         isWritable: false
       }