nulltrace-sdk 1.0.1 → 1.0.3

package/dist/index.cjs

@@ -390,13 +390,12 @@ var NullTrace = class _NullTrace {
           toAddress: owner,
           lamports: amountLamports.sub(feeLamports),
           outputStateTreeInfo: tree
-        })
-      );
-      ixs.push(
-        import_web3.SystemProgram.transfer({
-          fromPubkey: owner,
-          toPubkey: OPERATOR_PUBLIC_KEY,
-          lamports: feeLamports
+        }),
+        await import_stateless.LightSystemProgram.compress({
+          payer: owner,
+          toAddress: OPERATOR_PUBLIC_KEY,
+          lamports: feeLamports,
+          outputStateTreeInfo: tree
         })
       );
     } else {
@@ -421,8 +420,8 @@ var NullTrace = class _NullTrace {
           payer: owner,
           owner,
           source: sourceAta,
-          toAddress: owner,
-          amount: amountLamports.sub(feeLamports),
+          toAddress: [owner, OPERATOR_PUBLIC_KEY],
+          amount: [amountLamports.sub(feeLamports), feeLamports],
           mint: mintPk,
           outputStateTreeInfo: tree,
           tokenPoolInfo: {
@@ -435,14 +434,6 @@ var NullTrace = class _NullTrace {
           }
         })
       );
-      const operatorAta = await (0, import_spl_token.getAssociatedTokenAddress)(mintPk, OPERATOR_PUBLIC_KEY, false, tokenProgram);
-      const operatorInfo = await this.connection.getAccountInfo(operatorAta);
-      if (!operatorInfo) {
-        ixs.push((0, import_spl_token.createAssociatedTokenAccountInstruction)(owner, operatorAta, OPERATOR_PUBLIC_KEY, mintPk, tokenProgram));
-      }
-      ixs.push(
-        (0, import_spl_token.createTransferCheckedInstruction)(sourceAta, mintPk, operatorAta, owner, feeLamports, decimals, [], tokenProgram)
-      );
     }
     const adl = await this._getAlt();
     const txs = await _packTransactions(this.connection, owner, ixs, adl);
@@ -558,14 +549,15 @@ var NullTrace = class _NullTrace {
           throw new Error("Insufficient balance");
         const compressIx = await import_stateless.LightSystemProgram.compress({
           payer: owner,
-          toAddress: OPERATOR_PUBLIC_KEY,
+          toAddress: recipientPk,
           lamports: (0, import_stateless.bn)(deficit.toString()).sub(fee),
           outputStateTreeInfo: tree
         });
-        const feeIx = import_web3.SystemProgram.transfer({
-          fromPubkey: owner,
-          toPubkey: OPERATOR_PUBLIC_KEY,
-          lamports: fee
+        const feeIx = await import_stateless.LightSystemProgram.compress({
+          payer: owner,
+          toAddress: OPERATOR_PUBLIC_KEY,
+          lamports: fee,
+          outputStateTreeInfo: tree
         });
         const msg = new import_web3.TransactionMessage({
           payerKey: owner,
@@ -614,8 +606,8 @@ var NullTrace = class _NullTrace {
           payer: owner,
           owner,
           source: sourceAta,
-          toAddress: recipientPk,
-          amount: (0, import_stateless.bn)(deficit.toString()).sub(fee),
+          toAddress: [recipientPk, OPERATOR_PUBLIC_KEY],
+          amount: [(0, import_stateless.bn)(deficit.toString()).sub(fee), fee],
           mint: new import_web3.PublicKey(mint),
           outputStateTreeInfo: tree,
           tokenPoolInfo: {
@@ -628,21 +620,6 @@ var NullTrace = class _NullTrace {
           }
         });
         instructions.push(compressInstruction);
-        const operatorTokenAccount = await (0, import_spl_token.getAssociatedTokenAddress)(new import_web3.PublicKey(mint), OPERATOR_PUBLIC_KEY, false, tokenProgram);
-        const operatorPoolInfo = await this.connection.getAccountInfo(operatorTokenAccount);
-        if (!operatorPoolInfo) {
-          instructions.push((0, import_spl_token.createAssociatedTokenAccountInstruction)(owner, operatorTokenAccount, OPERATOR_PUBLIC_KEY, new import_web3.PublicKey(mint), tokenProgram));
-        }
-        instructions.push((0, import_spl_token.createTransferCheckedInstruction)(
-          new import_web3.PublicKey(sourceAta),
-          new import_web3.PublicKey(mint),
-          new import_web3.PublicKey(operatorTokenAccount),
-          owner,
-          fee,
-          decimals,
-          [],
-          tokenProgram
-        ));
         let tx = new import_web3.VersionedTransaction(new import_web3.TransactionMessage({
           payerKey: owner,
           recentBlockhash: blockhash,
@@ -763,22 +740,16 @@ var NullTrace = class _NullTrace {
         const compressIx = await import_stateless.LightSystemProgram.compress({
           payer: owner,
           toAddress: OPERATOR_PUBLIC_KEY,
-          lamports: (0, import_stateless.bn)(deficit.toString()).sub(fee),
+          lamports: (0, import_stateless.bn)(deficit.toString()),
           outputStateTreeInfo: tree
         });
-        const feeIx = import_web3.SystemProgram.transfer({
-          fromPubkey: owner,
-          toPubkey: OPERATOR_PUBLIC_KEY,
-          lamports: fee
-        });
         const msg = new import_web3.TransactionMessage({
           payerKey: owner,
           recentBlockhash: blockhash,
           instructions: [
             import_web3.ComputeBudgetProgram.setComputeUnitLimit({ units: COMPUTE_UNITS }),
             import_web3.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: COMPUTE_PRICE }),
-            compressIx,
-            feeIx
+            compressIx
           ]
         }).compileToV0Message([adl]);
         preTransactions.push(new import_web3.VersionedTransaction(msg));
@@ -819,7 +790,7 @@ var NullTrace = class _NullTrace {
           owner,
           source: sourceAta,
           toAddress: OPERATOR_PUBLIC_KEY,
-          amount: (0, import_stateless.bn)(deficit.toString()).sub(fee),
+          amount: (0, import_stateless.bn)(deficit.toString()),
           mint: new import_web3.PublicKey(fromMint),
           outputStateTreeInfo: tree,
           tokenPoolInfo: {
@@ -832,21 +803,6 @@ var NullTrace = class _NullTrace {
           }
         });
         instructions.push(compressInstruction);
-        const operatorTokenAccount = await (0, import_spl_token.getAssociatedTokenAddress)(new import_web3.PublicKey(fromMint), OPERATOR_PUBLIC_KEY, false, tokenProgram);
-        const operatorPoolInfo = await this.connection.getAccountInfo(operatorTokenAccount);
-        if (!operatorPoolInfo) {
-          instructions.push((0, import_spl_token.createAssociatedTokenAccountInstruction)(owner, operatorTokenAccount, OPERATOR_PUBLIC_KEY, new import_web3.PublicKey(fromMint), tokenProgram));
-        }
-        instructions.push((0, import_spl_token.createTransferCheckedInstruction)(
-          new import_web3.PublicKey(sourceAta),
-          new import_web3.PublicKey(fromMint),
-          new import_web3.PublicKey(operatorTokenAccount),
-          owner,
-          fee,
-          decimals,
-          [],
-          tokenProgram
-        ));
         let tx = new import_web3.VersionedTransaction(new import_web3.TransactionMessage({
           payerKey: owner,
           recentBlockhash: blockhash,

package/dist/index.mjs

@@ -4,8 +4,7 @@ import {
   PublicKey,
   TransactionMessage,
   ComputeBudgetProgram,
-  Keypair,
-  SystemProgram
+  Keypair
 } from "@solana/web3.js";
 import {
   TOKEN_PROGRAM_ID,
@@ -380,13 +379,12 @@ var NullTrace = class _NullTrace {
           toAddress: owner,
           lamports: amountLamports.sub(feeLamports),
           outputStateTreeInfo: tree
-        })
-      );
-      ixs.push(
-        SystemProgram.transfer({
-          fromPubkey: owner,
-          toPubkey: OPERATOR_PUBLIC_KEY,
-          lamports: feeLamports
+        }),
+        await LightSystemProgram.compress({
+          payer: owner,
+          toAddress: OPERATOR_PUBLIC_KEY,
+          lamports: feeLamports,
+          outputStateTreeInfo: tree
         })
       );
     } else {
@@ -411,8 +409,8 @@ var NullTrace = class _NullTrace {
           payer: owner,
           owner,
           source: sourceAta,
-          toAddress: owner,
-          amount: amountLamports.sub(feeLamports),
+          toAddress: [owner, OPERATOR_PUBLIC_KEY],
+          amount: [amountLamports.sub(feeLamports), feeLamports],
           mint: mintPk,
           outputStateTreeInfo: tree,
           tokenPoolInfo: {
@@ -425,14 +423,6 @@ var NullTrace = class _NullTrace {
           }
         })
       );
-      const operatorAta = await getAssociatedTokenAddress(mintPk, OPERATOR_PUBLIC_KEY, false, tokenProgram);
-      const operatorInfo = await this.connection.getAccountInfo(operatorAta);
-      if (!operatorInfo) {
-        ixs.push(createAssociatedTokenAccountInstruction(owner, operatorAta, OPERATOR_PUBLIC_KEY, mintPk, tokenProgram));
-      }
-      ixs.push(
-        createTransferCheckedInstruction(sourceAta, mintPk, operatorAta, owner, feeLamports, decimals, [], tokenProgram)
-      );
     }
     const adl = await this._getAlt();
     const txs = await _packTransactions(this.connection, owner, ixs, adl);
@@ -548,14 +538,15 @@ var NullTrace = class _NullTrace {
           throw new Error("Insufficient balance");
         const compressIx = await LightSystemProgram.compress({
           payer: owner,
-          toAddress: OPERATOR_PUBLIC_KEY,
+          toAddress: recipientPk,
           lamports: bn(deficit.toString()).sub(fee),
           outputStateTreeInfo: tree
         });
-        const feeIx = SystemProgram.transfer({
-          fromPubkey: owner,
-          toPubkey: OPERATOR_PUBLIC_KEY,
-          lamports: fee
+        const feeIx = await LightSystemProgram.compress({
+          payer: owner,
+          toAddress: OPERATOR_PUBLIC_KEY,
+          lamports: fee,
+          outputStateTreeInfo: tree
         });
         const msg = new TransactionMessage({
           payerKey: owner,
@@ -604,8 +595,8 @@ var NullTrace = class _NullTrace {
           payer: owner,
           owner,
           source: sourceAta,
-          toAddress: recipientPk,
-          amount: bn(deficit.toString()).sub(fee),
+          toAddress: [recipientPk, OPERATOR_PUBLIC_KEY],
+          amount: [bn(deficit.toString()).sub(fee), fee],
           mint: new PublicKey(mint),
           outputStateTreeInfo: tree,
           tokenPoolInfo: {
@@ -618,21 +609,6 @@ var NullTrace = class _NullTrace {
           }
         });
         instructions.push(compressInstruction);
-        const operatorTokenAccount = await getAssociatedTokenAddress(new PublicKey(mint), OPERATOR_PUBLIC_KEY, false, tokenProgram);
-        const operatorPoolInfo = await this.connection.getAccountInfo(operatorTokenAccount);
-        if (!operatorPoolInfo) {
-          instructions.push(createAssociatedTokenAccountInstruction(owner, operatorTokenAccount, OPERATOR_PUBLIC_KEY, new PublicKey(mint), tokenProgram));
-        }
-        instructions.push(createTransferCheckedInstruction(
-          new PublicKey(sourceAta),
-          new PublicKey(mint),
-          new PublicKey(operatorTokenAccount),
-          owner,
-          fee,
-          decimals,
-          [],
-          tokenProgram
-        ));
         let tx = new VersionedTransaction(new TransactionMessage({
           payerKey: owner,
           recentBlockhash: blockhash,
@@ -753,22 +729,16 @@ var NullTrace = class _NullTrace {
         const compressIx = await LightSystemProgram.compress({
           payer: owner,
           toAddress: OPERATOR_PUBLIC_KEY,
-          lamports: bn(deficit.toString()).sub(fee),
+          lamports: bn(deficit.toString()),
           outputStateTreeInfo: tree
         });
-        const feeIx = SystemProgram.transfer({
-          fromPubkey: owner,
-          toPubkey: OPERATOR_PUBLIC_KEY,
-          lamports: fee
-        });
         const msg = new TransactionMessage({
           payerKey: owner,
           recentBlockhash: blockhash,
           instructions: [
             ComputeBudgetProgram.setComputeUnitLimit({ units: COMPUTE_UNITS }),
             ComputeBudgetProgram.setComputeUnitPrice({ microLamports: COMPUTE_PRICE }),
-            compressIx,
-            feeIx
+            compressIx
           ]
         }).compileToV0Message([adl]);
         preTransactions.push(new VersionedTransaction(msg));
@@ -809,7 +779,7 @@ var NullTrace = class _NullTrace {
           owner,
           source: sourceAta,
           toAddress: OPERATOR_PUBLIC_KEY,
-          amount: bn(deficit.toString()).sub(fee),
+          amount: bn(deficit.toString()),
           mint: new PublicKey(fromMint),
           outputStateTreeInfo: tree,
           tokenPoolInfo: {
@@ -822,21 +792,6 @@ var NullTrace = class _NullTrace {
           }
         });
         instructions.push(compressInstruction);
-        const operatorTokenAccount = await getAssociatedTokenAddress(new PublicKey(fromMint), OPERATOR_PUBLIC_KEY, false, tokenProgram);
-        const operatorPoolInfo = await this.connection.getAccountInfo(operatorTokenAccount);
-        if (!operatorPoolInfo) {
-          instructions.push(createAssociatedTokenAccountInstruction(owner, operatorTokenAccount, OPERATOR_PUBLIC_KEY, new PublicKey(fromMint), tokenProgram));
-        }
-        instructions.push(createTransferCheckedInstruction(
-          new PublicKey(sourceAta),
-          new PublicKey(fromMint),
-          new PublicKey(operatorTokenAccount),
-          owner,
-          fee,
-          decimals,
-          [],
-          tokenProgram
-        ));
         let tx = new VersionedTransaction(new TransactionMessage({
           payerKey: owner,
           recentBlockhash: blockhash,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nulltrace-sdk",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "NullTrace SDK - Privacy-focused Solana transactions powered by ZK compression",
   "author": "NullTrace",
   "license": "MIT",
@@ -50,7 +50,7 @@
   ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/NullTraceBot/null-trace-local/tree/main/sdk",
+    "url": "https://github.com/NullTraceBot/null-trace-local",
     "directory": "sdk"
   },
   "homepage": "https://nulltrace.app"