@hula-privacy/mixer 0.3.0 → 0.4.0

package/dist/index.d.mts

@@ -109,7 +109,6 @@ interface CircuitInputs {
     publicWithdraw: string;
     recipient: string;
     mintTokenAddress: string;
-    fee: string;
     inputSpendingKeys: string[];
     inputValues: string[];
     inputSecrets: string[];
@@ -131,7 +130,6 @@ interface PublicInputs {
     publicWithdraw: bigint;
     recipient: PublicKey;
     mintTokenAddress: PublicKey;
-    fee: bigint;
 }
 /**
  * Output UTXO specification
@@ -158,8 +156,6 @@ interface TransactionRequest {
     withdrawAmount?: bigint;
     /** Recipient public key for withdrawal */
     recipient?: PublicKey;
-    /** Relayer fee */
-    fee?: bigint;
     /** Token mint address */
     mint: PublicKey;
 }
@@ -223,7 +219,6 @@ interface TransactionData {
     outputTreeIndex: number;
     publicDeposit: string;
     publicWithdraw: string;
-    fee: string;
     success: boolean;
     nullifiers: string[];
     encryptedNotes: {
@@ -319,7 +314,6 @@ declare function buildTransactionAccounts(builtTx: BuiltTransaction, payer: Publ
         depositorTokenAccount: PublicKey | null;
         depositor: PublicKey | null;
         recipientTokenAccount: PublicKey | null;
-        feeRecipientTokenAccount: PublicKey | null;
         nullifierAccount0: PublicKey | null;
         nullifierAccount1: PublicKey | null;
         tokenProgram: PublicKey;
@@ -339,7 +333,6 @@ declare function toAnchorPublicInputs(builtTx: BuiltTransaction): {
     publicWithdraw: BN;
     recipient: PublicKey;
     mintTokenAddress: PublicKey;
-    fee: BN;
 };
 
 /**
@@ -472,6 +465,15 @@ declare class HulaWallet {
      * @returns Transaction signature
      */
     withdraw(mint: PublicKey, amount: bigint, recipient: PublicKey): Promise<string>;
+    /**
+     * Merge UTXOs
+     *
+     * @param utxo1 - First UTXO to merge
+     * @param utxo2 - Second UTXO to merge
+     * @returns Transaction signature
+     *
+     */
+    mergeUTXOs(utxo1: UTXO, utxo2: UTXO): Promise<string>;
     /**
      * Build a custom transaction
      */
@@ -660,7 +662,7 @@ declare function pubkeyToBigInt(pubkey: {
 /**
  * Generate a new random spending key
  */
-declare function generateSpendingKey(): bigint;
+declare function generateSpendingKey(numberOfBits?: bigint): bigint;
 /**
  * Derive all wallet keys from spending key
  */
@@ -676,13 +678,10 @@ declare function deriveSpendingKeyFromSignature(signature: Uint8Array): bigint;
  * Encrypt a note for a recipient
  *
  * The note contains the UTXO data needed for the recipient to claim it.
- * Optimized for size:
- * - mintTokenAddress: only first 8 bytes (can match on-chain by prefix)
- * - leafIndex: omitted (recipient can query relayer with commitment)
- */
+ *
+*/
 declare function encryptNote(noteData: {
     value: bigint;
-    mintTokenAddress: bigint;
     secret: bigint;
     leafIndex?: number;
 }, recipientEncryptionPubKey: Uint8Array): EncryptedNote;
@@ -695,7 +694,6 @@ declare function encryptNote(noteData: {
  */
 declare function decryptNote(encryptedNote: EncryptedNote, encryptionSecretKey: Uint8Array): {
     value: bigint;
-    mintPrefix: string;
     secret: bigint;
 } | null;
 /**

package/dist/index.d.ts

@@ -109,7 +109,6 @@ interface CircuitInputs {
     publicWithdraw: string;
     recipient: string;
     mintTokenAddress: string;
-    fee: string;
     inputSpendingKeys: string[];
     inputValues: string[];
     inputSecrets: string[];
@@ -131,7 +130,6 @@ interface PublicInputs {
     publicWithdraw: bigint;
     recipient: PublicKey;
     mintTokenAddress: PublicKey;
-    fee: bigint;
 }
 /**
  * Output UTXO specification
@@ -158,8 +156,6 @@ interface TransactionRequest {
     withdrawAmount?: bigint;
     /** Recipient public key for withdrawal */
     recipient?: PublicKey;
-    /** Relayer fee */
-    fee?: bigint;
     /** Token mint address */
     mint: PublicKey;
 }
@@ -223,7 +219,6 @@ interface TransactionData {
     outputTreeIndex: number;
     publicDeposit: string;
     publicWithdraw: string;
-    fee: string;
     success: boolean;
     nullifiers: string[];
     encryptedNotes: {
@@ -319,7 +314,6 @@ declare function buildTransactionAccounts(builtTx: BuiltTransaction, payer: Publ
         depositorTokenAccount: PublicKey | null;
         depositor: PublicKey | null;
         recipientTokenAccount: PublicKey | null;
-        feeRecipientTokenAccount: PublicKey | null;
         nullifierAccount0: PublicKey | null;
         nullifierAccount1: PublicKey | null;
         tokenProgram: PublicKey;
@@ -339,7 +333,6 @@ declare function toAnchorPublicInputs(builtTx: BuiltTransaction): {
     publicWithdraw: BN;
     recipient: PublicKey;
     mintTokenAddress: PublicKey;
-    fee: BN;
 };
 
 /**
@@ -472,6 +465,15 @@ declare class HulaWallet {
      * @returns Transaction signature
      */
     withdraw(mint: PublicKey, amount: bigint, recipient: PublicKey): Promise<string>;
+    /**
+     * Merge UTXOs
+     *
+     * @param utxo1 - First UTXO to merge
+     * @param utxo2 - Second UTXO to merge
+     * @returns Transaction signature
+     *
+     */
+    mergeUTXOs(utxo1: UTXO, utxo2: UTXO): Promise<string>;
     /**
      * Build a custom transaction
      */
@@ -660,7 +662,7 @@ declare function pubkeyToBigInt(pubkey: {
 /**
  * Generate a new random spending key
  */
-declare function generateSpendingKey(): bigint;
+declare function generateSpendingKey(numberOfBits?: bigint): bigint;
 /**
  * Derive all wallet keys from spending key
  */
@@ -676,13 +678,10 @@ declare function deriveSpendingKeyFromSignature(signature: Uint8Array): bigint;
  * Encrypt a note for a recipient
  *
  * The note contains the UTXO data needed for the recipient to claim it.
- * Optimized for size:
- * - mintTokenAddress: only first 8 bytes (can match on-chain by prefix)
- * - leafIndex: omitted (recipient can query relayer with commitment)
- */
+ *
+*/
 declare function encryptNote(noteData: {
     value: bigint;
-    mintTokenAddress: bigint;
     secret: bigint;
     leafIndex?: number;
 }, recipientEncryptionPubKey: Uint8Array): EncryptedNote;
@@ -695,7 +694,6 @@ declare function encryptNote(noteData: {
  */
 declare function decryptNote(encryptedNote: EncryptedNote, encryptionSecretKey: Uint8Array): {
     value: bigint;
-    mintPrefix: string;
     secret: bigint;
 } | null;
 /**

package/dist/index.js

@@ -497,14 +497,6 @@ var HulaPrivacyIdl = {
           "writable": true,
           "optional": true
         },
-        {
-          "name": "fee_recipient_token_account",
-          "docs": [
-            "Fee recipient's token account (optional)"
-          ],
-          "writable": true,
-          "optional": true
-        },
         {
           "name": "nullifier_account_0",
           "docs": [
@@ -679,16 +671,11 @@ var HulaPrivacyIdl = {
     },
     {
       "code": 6017,
-      "name": "InvalidFee",
-      "msg": "Invalid fee"
-    },
-    {
-      "code": 6018,
       "name": "TreeNotFull",
       "msg": "Tree is not full yet"
     },
     {
-      "code": 6019,
+      "code": 6018,
       "name": "InvalidTreeIndex",
       "msg": "Invalid tree index"
     }
@@ -915,10 +902,6 @@ var HulaPrivacyIdl = {
           {
             "name": "mint_token_address",
             "type": "pubkey"
-          },
-          {
-            "name": "fee",
-            "type": "u64"
           }
         ]
       }
@@ -1054,9 +1037,9 @@ function bytesToHex(bytes) {
 function pubkeyToBigInt(pubkey) {
   return bytesToBigInt(pubkey.toBytes());
 }
-function generateSpendingKey() {
+function generateSpendingKey(numberOfBits = 253n) {
   const randomBytes2 = nacl.randomBytes(32);
-  return bytesToBigInt(randomBytes2) % 2n ** 253n;
+  return bytesToBigInt(randomBytes2) % 2n ** numberOfBits;
 }
 function deriveKeys(spendingKey) {
   const owner = poseidonHash([spendingKey, DOMAIN_OWNER]);
@@ -1082,17 +1065,8 @@ function deriveSpendingKeyFromSignature(signature) {
   return bytesToBigInt(hash) % FIELD_PRIME;
 }
 function encryptNote(noteData, recipientEncryptionPubKey) {
-  const mintPrefix = noteData.mintTokenAddress.toString(16).padStart(64, "0").slice(0, 16);
-  const payload = {
-    v: noteData.value.toString(),
-    // value
-    m: mintPrefix,
-    // mint (first 8 bytes as hex)
-    s: noteData.secret.toString()
-    // secret
-    // leafIndex omitted - recipient queries relayer with computed commitment
-  };
-  const message = new TextEncoder().encode(JSON.stringify(payload));
+  const payload = `${noteData.value.toString()}|${noteData.secret.toString()}`;
+  const message = new TextEncoder().encode(payload);
   const nonce = nacl.randomBytes(24);
   const ephemeralKeyPair = nacl.box.keyPair();
   const ciphertext = nacl.box(
@@ -1116,22 +1090,18 @@ function decryptNote(encryptedNote, encryptionSecretKey) {
       encryptionSecretKey
     );
     if (!decrypted) return null;
-    const noteData = JSON.parse(new TextDecoder().decode(decrypted));
-    if (noteData.v !== void 0) {
-      return {
-        value: BigInt(noteData.v),
-        mintPrefix: noteData.m,
-        // First 8 bytes as hex string
-        secret: BigInt(noteData.s)
-      };
-    } else {
-      return {
-        value: BigInt(noteData.value),
-        mintPrefix: BigInt(noteData.mintTokenAddress).toString(16).padStart(64, "0").slice(0, 16),
-        secret: BigInt(noteData.secret)
-      };
-    }
-  } catch {
+    let noteData = null;
+    const data = new TextDecoder().decode(decrypted).split("|");
+    noteData = {
+      v: BigInt(data[0]),
+      s: BigInt(data[1])
+    };
+    if (!noteData) return null;
+    return {
+      value: BigInt(noteData.v),
+      secret: BigInt(noteData.s)
+    };
+  } catch (error) {
     return null;
   }
 }
@@ -1359,7 +1329,7 @@ function computeNullifierFromKeys(keys, commitment, leafIndex) {
   return poseidonHash([keys.nullifierKey, commitment, BigInt(leafIndex)]);
 }
 function createUTXO(value, mintTokenAddress, owner, leafIndex, treeIndex = 0) {
-  const secret = generateSpendingKey();
+  const secret = generateSpendingKey(127n);
   const commitment = computeCommitment(value, mintTokenAddress, owner, secret);
   return {
     value,
@@ -1526,6 +1496,9 @@ function selectUTXOs(utxos, targetAmount, mint) {
     selected.push(utxo);
     total += utxo.value;
   }
+  if (selected.length > NUM_INPUT_UTXOS) {
+    throw new Error(`Selected ${selected.length} UTXOs, but only ${NUM_INPUT_UTXOS} are allowed. You can merge your UTXOs to reach the target amount.`);
+  }
   if (total < targetAmount) {
     throw new Error(
       `Insufficient balance. Need ${targetAmount}, have ${total}`
@@ -1791,7 +1764,6 @@ async function buildTransaction(request, walletKeys, relayerUrl) {
   const currentTreeIndex = pool.currentTreeIndex;
   const depositAmount = request.depositAmount ?? 0n;
   const withdrawAmount = request.withdrawAmount ?? 0n;
-  const fee = request.fee ?? 0n;
   const inputUtxos = request.inputUtxos ?? [];
   const outputs = request.outputs ?? [];
   if (depositAmount === 0n && inputUtxos.length === 0) {
@@ -1836,11 +1808,11 @@ async function buildTransaction(request, walletKeys, relayerUrl) {
     totalOutputValue += output.amount;
     outputIndex++;
   }
-  const totalOut = withdrawAmount + fee + totalOutputValue;
+  const totalOut = withdrawAmount + totalOutputValue;
   const changeAmount = totalAvailable - totalOut;
   if (changeAmount < 0n) {
     throw new Error(
-      `Insufficient value. Have ${totalAvailable} (inputs: ${totalInputValue}, deposit: ${depositAmount}), need ${totalOut} (outputs: ${totalOutputValue}, withdraw: ${withdrawAmount}, fee: ${fee})`
+      `Insufficient value. Have ${totalAvailable} (inputs: ${totalInputValue}, deposit: ${depositAmount}), need ${totalOut} (outputs: ${totalOutputValue}, withdraw: ${withdrawAmount})`
     );
   }
   if (changeAmount > 0n) {
@@ -1869,8 +1841,7 @@ async function buildTransaction(request, walletKeys, relayerUrl) {
     depositAmount,
     withdrawAmount,
     request.recipient ?? import_web33.PublicKey.default,
-    request.mint,
-    fee
+    request.mint
   );
   const { proof } = await generateProof(circuitInputs);
   const nullifiers = circuitInputs.nullifiers.map((n) => BigInt(n));
@@ -1881,8 +1852,7 @@ async function buildTransaction(request, walletKeys, relayerUrl) {
     publicDeposit: depositAmount,
     publicWithdraw: withdrawAmount,
     recipient: request.recipient ?? import_web33.PublicKey.default,
-    mintTokenAddress: request.mint,
-    fee
+    mintTokenAddress: request.mint
   };
   const encryptedNotes = [];
   for (let i = 0; i < outputs.length; i++) {
@@ -1892,9 +1862,7 @@ async function buildTransaction(request, walletKeys, relayerUrl) {
       const encrypted = encryptNote(
         {
           value: utxo.value,
-          mintTokenAddress: utxo.mintTokenAddress,
           secret: utxo.secret
-          // leafIndex omitted - recipient queries relayer with computed commitment
         },
         output.encryptionPubKey
       );
@@ -1907,9 +1875,7 @@ async function buildTransaction(request, walletKeys, relayerUrl) {
     const encrypted = encryptNote(
       {
         value: changeUtxo.value,
-        mintTokenAddress: changeUtxo.mintTokenAddress,
         secret: changeUtxo.secret
-        // leafIndex omitted - we already know it locally
       },
       walletKeys.encryptionKeyPair.publicKey
     );
@@ -1925,7 +1891,7 @@ async function buildTransaction(request, walletKeys, relayerUrl) {
     outputTreeIndex: currentTreeIndex
   };
 }
-function buildCircuitInputs(merkleRoot, inputUtxos, outputUtxos, walletKeys, leaves, depositAmount, withdrawAmount, recipient, mint, fee) {
+function buildCircuitInputs(merkleRoot, inputUtxos, outputUtxos, walletKeys, leaves, depositAmount, withdrawAmount, recipient, mint) {
   const inputSpendingKeys = [];
   const inputValues = [];
   const inputSecrets = [];
@@ -1970,7 +1936,6 @@ function buildCircuitInputs(merkleRoot, inputUtxos, outputUtxos, walletKeys, lea
     publicWithdraw: withdrawAmount.toString(),
     recipient: pubkeyToBigInt(recipient).toString(),
     mintTokenAddress: pubkeyToBigInt(mint).toString(),
-    fee: fee.toString(),
     inputSpendingKeys,
     inputValues,
     inputSecrets,
@@ -2038,8 +2003,6 @@ function buildTransactionAccounts(builtTx, payer, mint, depositAmount, withdrawA
       depositorTokenAccount,
       depositor,
       recipientTokenAccount,
-      feeRecipientTokenAccount: null,
-      // TODO: Add fee recipient support
       nullifierAccount0: nullifierPdas[0] ?? null,
       nullifierAccount1: nullifierPdas[1] ?? null,
       tokenProgram: TOKEN_2022_PROGRAM_ID,
@@ -2057,8 +2020,7 @@ function toAnchorPublicInputs(builtTx) {
     publicDeposit: new import_anchor.BN(builtTx.publicInputs.publicDeposit.toString()),
     publicWithdraw: new import_anchor.BN(builtTx.publicInputs.publicWithdraw.toString()),
     recipient: builtTx.publicInputs.recipient,
-    mintTokenAddress: builtTx.publicInputs.mintTokenAddress,
-    fee: new import_anchor.BN(builtTx.publicInputs.fee.toString())
+    mintTokenAddress: builtTx.publicInputs.mintTokenAddress
   };
 }
 
@@ -2450,6 +2412,69 @@ var HulaWallet = class _HulaWallet {
     }
     return signature;
   }
+  /**
+   * Merge UTXOs
+   * 
+   * @param utxo1 - First UTXO to merge
+   * @param utxo2 - Second UTXO to merge
+   * @returns Transaction signature
+   * 
+   */
+  async mergeUTXOs(utxo1, utxo2) {
+    if (!this.signer) {
+      throw new Error("No signer available. Use fromKeypair() or setSigner() to set a signer.");
+    }
+    if (utxo1.mintTokenAddress !== utxo2.mintTokenAddress) {
+      throw new Error("UTXOs have different mint token addresses");
+    }
+    const mint = new import_web34.PublicKey(
+      bigIntToBytes(utxo1.mintTokenAddress, 32)
+    );
+    const mergedUtxo = createUTXO(utxo1.value + utxo2.value, utxo1.mintTokenAddress, utxo1.owner, utxo1.leafIndex, utxo1.treeIndex);
+    const builtTx = await buildTransaction(
+      {
+        mint,
+        inputUtxos: [utxo1, utxo2],
+        outputs: [{
+          owner: this.keys.owner,
+          amount: mergedUtxo.value,
+          encryptionPubKey: this.keys.encryptionKeyPair.publicKey
+        }]
+      },
+      this.keys,
+      this.relayerUrl
+    );
+    const { accounts, preInstructions, inputTreeIndex } = buildTransactionAccounts(
+      builtTx,
+      this.signer.publicKey,
+      mint,
+      0n,
+      0n
+    );
+    const allPreInstructions = [
+      import_web34.ComputeBudgetProgram.setComputeUnitLimit({ units: COMPUTE_UNITS }),
+      import_web34.ComputeBudgetProgram.setComputeUnitPrice({ microLamports: COMPUTE_UNIT_PRICE }),
+      ...preInstructions
+    ];
+    const wallet = new import_anchor2.Wallet(this.signer);
+    const provider = new import_anchor2.AnchorProvider(this.connection, wallet, { commitment: "confirmed" });
+    const program = new import_anchor2.Program(idl_default, provider);
+    const publicInputs = toAnchorPublicInputs(builtTx);
+    const signature = await program.methods.transact(
+      inputTreeIndex,
+      Array.from(builtTx.proof),
+      publicInputs,
+      builtTx.encryptedNotes
+    ).accounts(accounts).preInstructions(allPreInstructions).signers([this.signer]).rpc();
+    for (const utxo of [utxo1, utxo2]) {
+      const serialized = this.utxos.find((u) => u.commitment === utxo.commitment.toString());
+      if (serialized) {
+        serialized.spent = true;
+        serialized.spentTx = signature;
+      }
+    }
+    return signature;
+  }
   /**
    * Build a custom transaction
    */
@@ -2501,7 +2526,7 @@ var HulaWallet = class _HulaWallet {
   }
 };
 function getKeyDerivationMessage() {
-  return new TextEncoder().encode("Hula Privacy Wallet Key Derivation v1");
+  return new TextEncoder().encode("Hula Privacy Wallet Key Derivation v1. Don't share this message with anyone and keep it secret. It's private key for your privacy wallet.");
 }
 async function initHulaSDK() {
   if (!isPoseidonInitialized()) {

package/dist/index.mjs

@@ -388,14 +388,6 @@ var HulaPrivacyIdl = {
           "writable": true,
           "optional": true
         },
-        {
-          "name": "fee_recipient_token_account",
-          "docs": [
-            "Fee recipient's token account (optional)"
-          ],
-          "writable": true,
-          "optional": true
-        },
         {
           "name": "nullifier_account_0",
           "docs": [
@@ -570,16 +562,11 @@ var HulaPrivacyIdl = {
     },
     {
       "code": 6017,
-      "name": "InvalidFee",
-      "msg": "Invalid fee"
-    },
-    {
-      "code": 6018,
       "name": "TreeNotFull",
       "msg": "Tree is not full yet"
     },
     {
-      "code": 6019,
+      "code": 6018,
       "name": "InvalidTreeIndex",
       "msg": "Invalid tree index"
     }
@@ -806,10 +793,6 @@ var HulaPrivacyIdl = {
           {
             "name": "mint_token_address",
             "type": "pubkey"
-          },
-          {
-            "name": "fee",
-            "type": "u64"
           }
         ]
       }
@@ -945,9 +928,9 @@ function bytesToHex(bytes) {
 function pubkeyToBigInt(pubkey) {
   return bytesToBigInt(pubkey.toBytes());
 }
-function generateSpendingKey() {
+function generateSpendingKey(numberOfBits = 253n) {
   const randomBytes2 = nacl.randomBytes(32);
-  return bytesToBigInt(randomBytes2) % 2n ** 253n;
+  return bytesToBigInt(randomBytes2) % 2n ** numberOfBits;
 }
 function deriveKeys(spendingKey) {
   const owner = poseidonHash([spendingKey, DOMAIN_OWNER]);
@@ -973,17 +956,8 @@ function deriveSpendingKeyFromSignature(signature) {
   return bytesToBigInt(hash) % FIELD_PRIME;
 }
 function encryptNote(noteData, recipientEncryptionPubKey) {
-  const mintPrefix = noteData.mintTokenAddress.toString(16).padStart(64, "0").slice(0, 16);
-  const payload = {
-    v: noteData.value.toString(),
-    // value
-    m: mintPrefix,
-    // mint (first 8 bytes as hex)
-    s: noteData.secret.toString()
-    // secret
-    // leafIndex omitted - recipient queries relayer with computed commitment
-  };
-  const message = new TextEncoder().encode(JSON.stringify(payload));
+  const payload = `${noteData.value.toString()}|${noteData.secret.toString()}`;
+  const message = new TextEncoder().encode(payload);
   const nonce = nacl.randomBytes(24);
   const ephemeralKeyPair = nacl.box.keyPair();
   const ciphertext = nacl.box(
@@ -1007,22 +981,18 @@ function decryptNote(encryptedNote, encryptionSecretKey) {
       encryptionSecretKey
     );
     if (!decrypted) return null;
-    const noteData = JSON.parse(new TextDecoder().decode(decrypted));
-    if (noteData.v !== void 0) {
-      return {
-        value: BigInt(noteData.v),
-        mintPrefix: noteData.m,
-        // First 8 bytes as hex string
-        secret: BigInt(noteData.s)
-      };
-    } else {
-      return {
-        value: BigInt(noteData.value),
-        mintPrefix: BigInt(noteData.mintTokenAddress).toString(16).padStart(64, "0").slice(0, 16),
-        secret: BigInt(noteData.secret)
-      };
-    }
-  } catch {
+    let noteData = null;
+    const data = new TextDecoder().decode(decrypted).split("|");
+    noteData = {
+      v: BigInt(data[0]),
+      s: BigInt(data[1])
+    };
+    if (!noteData) return null;
+    return {
+      value: BigInt(noteData.v),
+      secret: BigInt(noteData.s)
+    };
+  } catch (error) {
     return null;
   }
 }
@@ -1250,7 +1220,7 @@ function computeNullifierFromKeys(keys, commitment, leafIndex) {
   return poseidonHash([keys.nullifierKey, commitment, BigInt(leafIndex)]);
 }
 function createUTXO(value, mintTokenAddress, owner, leafIndex, treeIndex = 0) {
-  const secret = generateSpendingKey();
+  const secret = generateSpendingKey(127n);
   const commitment = computeCommitment(value, mintTokenAddress, owner, secret);
   return {
     value,
@@ -1417,6 +1387,9 @@ function selectUTXOs(utxos, targetAmount, mint) {
     selected.push(utxo);
     total += utxo.value;
   }
+  if (selected.length > NUM_INPUT_UTXOS) {
+    throw new Error(`Selected ${selected.length} UTXOs, but only ${NUM_INPUT_UTXOS} are allowed. You can merge your UTXOs to reach the target amount.`);
+  }
   if (total < targetAmount) {
     throw new Error(
       `Insufficient balance. Need ${targetAmount}, have ${total}`
@@ -1685,7 +1658,6 @@ async function buildTransaction(request, walletKeys, relayerUrl) {
   const currentTreeIndex = pool.currentTreeIndex;
   const depositAmount = request.depositAmount ?? 0n;
   const withdrawAmount = request.withdrawAmount ?? 0n;
-  const fee = request.fee ?? 0n;
   const inputUtxos = request.inputUtxos ?? [];
   const outputs = request.outputs ?? [];
   if (depositAmount === 0n && inputUtxos.length === 0) {
@@ -1730,11 +1702,11 @@ async function buildTransaction(request, walletKeys, relayerUrl) {
     totalOutputValue += output.amount;
     outputIndex++;
   }
-  const totalOut = withdrawAmount + fee + totalOutputValue;
+  const totalOut = withdrawAmount + totalOutputValue;
   const changeAmount = totalAvailable - totalOut;
   if (changeAmount < 0n) {
     throw new Error(
-      `Insufficient value. Have ${totalAvailable} (inputs: ${totalInputValue}, deposit: ${depositAmount}), need ${totalOut} (outputs: ${totalOutputValue}, withdraw: ${withdrawAmount}, fee: ${fee})`
+      `Insufficient value. Have ${totalAvailable} (inputs: ${totalInputValue}, deposit: ${depositAmount}), need ${totalOut} (outputs: ${totalOutputValue}, withdraw: ${withdrawAmount})`
     );
   }
   if (changeAmount > 0n) {
@@ -1763,8 +1735,7 @@ async function buildTransaction(request, walletKeys, relayerUrl) {
     depositAmount,
     withdrawAmount,
     request.recipient ?? PublicKey3.default,
-    request.mint,
-    fee
+    request.mint
   );
   const { proof } = await generateProof(circuitInputs);
   const nullifiers = circuitInputs.nullifiers.map((n) => BigInt(n));
@@ -1775,8 +1746,7 @@ async function buildTransaction(request, walletKeys, relayerUrl) {
     publicDeposit: depositAmount,
     publicWithdraw: withdrawAmount,
     recipient: request.recipient ?? PublicKey3.default,
-    mintTokenAddress: request.mint,
-    fee
+    mintTokenAddress: request.mint
   };
   const encryptedNotes = [];
   for (let i = 0; i < outputs.length; i++) {
@@ -1786,9 +1756,7 @@ async function buildTransaction(request, walletKeys, relayerUrl) {
       const encrypted = encryptNote(
         {
           value: utxo.value,
-          mintTokenAddress: utxo.mintTokenAddress,
           secret: utxo.secret
-          // leafIndex omitted - recipient queries relayer with computed commitment
         },
         output.encryptionPubKey
       );
@@ -1801,9 +1769,7 @@ async function buildTransaction(request, walletKeys, relayerUrl) {
     const encrypted = encryptNote(
       {
         value: changeUtxo.value,
-        mintTokenAddress: changeUtxo.mintTokenAddress,
         secret: changeUtxo.secret
-        // leafIndex omitted - we already know it locally
       },
       walletKeys.encryptionKeyPair.publicKey
     );
@@ -1819,7 +1785,7 @@ async function buildTransaction(request, walletKeys, relayerUrl) {
     outputTreeIndex: currentTreeIndex
   };
 }
-function buildCircuitInputs(merkleRoot, inputUtxos, outputUtxos, walletKeys, leaves, depositAmount, withdrawAmount, recipient, mint, fee) {
+function buildCircuitInputs(merkleRoot, inputUtxos, outputUtxos, walletKeys, leaves, depositAmount, withdrawAmount, recipient, mint) {
   const inputSpendingKeys = [];
   const inputValues = [];
   const inputSecrets = [];
@@ -1864,7 +1830,6 @@ function buildCircuitInputs(merkleRoot, inputUtxos, outputUtxos, walletKeys, lea
     publicWithdraw: withdrawAmount.toString(),
     recipient: pubkeyToBigInt(recipient).toString(),
     mintTokenAddress: pubkeyToBigInt(mint).toString(),
-    fee: fee.toString(),
     inputSpendingKeys,
     inputValues,
     inputSecrets,
@@ -1932,8 +1897,6 @@ function buildTransactionAccounts(builtTx, payer, mint, depositAmount, withdrawA
       depositorTokenAccount,
       depositor,
       recipientTokenAccount,
-      feeRecipientTokenAccount: null,
-      // TODO: Add fee recipient support
       nullifierAccount0: nullifierPdas[0] ?? null,
       nullifierAccount1: nullifierPdas[1] ?? null,
       tokenProgram: TOKEN_2022_PROGRAM_ID,
@@ -1951,8 +1914,7 @@ function toAnchorPublicInputs(builtTx) {
     publicDeposit: new BN(builtTx.publicInputs.publicDeposit.toString()),
     publicWithdraw: new BN(builtTx.publicInputs.publicWithdraw.toString()),
     recipient: builtTx.publicInputs.recipient,
-    mintTokenAddress: builtTx.publicInputs.mintTokenAddress,
-    fee: new BN(builtTx.publicInputs.fee.toString())
+    mintTokenAddress: builtTx.publicInputs.mintTokenAddress
   };
 }
 
@@ -2344,6 +2306,69 @@ var HulaWallet = class _HulaWallet {
     }
     return signature;
   }
+  /**
+   * Merge UTXOs
+   * 
+   * @param utxo1 - First UTXO to merge
+   * @param utxo2 - Second UTXO to merge
+   * @returns Transaction signature
+   * 
+   */
+  async mergeUTXOs(utxo1, utxo2) {
+    if (!this.signer) {
+      throw new Error("No signer available. Use fromKeypair() or setSigner() to set a signer.");
+    }
+    if (utxo1.mintTokenAddress !== utxo2.mintTokenAddress) {
+      throw new Error("UTXOs have different mint token addresses");
+    }
+    const mint = new PublicKey4(
+      bigIntToBytes(utxo1.mintTokenAddress, 32)
+    );
+    const mergedUtxo = createUTXO(utxo1.value + utxo2.value, utxo1.mintTokenAddress, utxo1.owner, utxo1.leafIndex, utxo1.treeIndex);
+    const builtTx = await buildTransaction(
+      {
+        mint,
+        inputUtxos: [utxo1, utxo2],
+        outputs: [{
+          owner: this.keys.owner,
+          amount: mergedUtxo.value,
+          encryptionPubKey: this.keys.encryptionKeyPair.publicKey
+        }]
+      },
+      this.keys,
+      this.relayerUrl
+    );
+    const { accounts, preInstructions, inputTreeIndex } = buildTransactionAccounts(
+      builtTx,
+      this.signer.publicKey,
+      mint,
+      0n,
+      0n
+    );
+    const allPreInstructions = [
+      ComputeBudgetProgram.setComputeUnitLimit({ units: COMPUTE_UNITS }),
+      ComputeBudgetProgram.setComputeUnitPrice({ microLamports: COMPUTE_UNIT_PRICE }),
+      ...preInstructions
+    ];
+    const wallet = new Wallet(this.signer);
+    const provider = new AnchorProvider(this.connection, wallet, { commitment: "confirmed" });
+    const program = new Program(idl_default, provider);
+    const publicInputs = toAnchorPublicInputs(builtTx);
+    const signature = await program.methods.transact(
+      inputTreeIndex,
+      Array.from(builtTx.proof),
+      publicInputs,
+      builtTx.encryptedNotes
+    ).accounts(accounts).preInstructions(allPreInstructions).signers([this.signer]).rpc();
+    for (const utxo of [utxo1, utxo2]) {
+      const serialized = this.utxos.find((u) => u.commitment === utxo.commitment.toString());
+      if (serialized) {
+        serialized.spent = true;
+        serialized.spentTx = signature;
+      }
+    }
+    return signature;
+  }
   /**
    * Build a custom transaction
    */
@@ -2395,7 +2420,7 @@ var HulaWallet = class _HulaWallet {
   }
 };
 function getKeyDerivationMessage() {
-  return new TextEncoder().encode("Hula Privacy Wallet Key Derivation v1");
+  return new TextEncoder().encode("Hula Privacy Wallet Key Derivation v1. Don't share this message with anyone and keep it secret. It's private key for your privacy wallet.");
 }
 async function initHulaSDK() {
   if (!isPoseidonInitialized()) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hula-privacy/mixer",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "Hula Privacy Protocol SDK - Complete toolkit for private transactions on Solana",
   "main": "dist/index.js",
   "module": "dist/index.mjs",

package/src/crypto.ts

@@ -127,9 +127,9 @@ export function pubkeyToBigInt(pubkey: { toBytes(): Uint8Array }): bigint {
 /**
  * Generate a new random spending key
  */
-export function generateSpendingKey(): bigint {
+export function generateSpendingKey(numberOfBits: bigint = 253n): bigint {
   const randomBytes = nacl.randomBytes(32);
-  return bytesToBigInt(randomBytes) % (2n ** 253n);
+  return bytesToBigInt(randomBytes) % (2n ** numberOfBits);
 }
 
 /**
@@ -179,31 +179,19 @@ export function deriveSpendingKeyFromSignature(signature: Uint8Array): bigint {
  * Encrypt a note for a recipient
  * 
  * The note contains the UTXO data needed for the recipient to claim it.
- * Optimized for size:
- * - mintTokenAddress: only first 8 bytes (can match on-chain by prefix)
- * - leafIndex: omitted (recipient can query relayer with commitment)
- */
+ * 
+*/
 export function encryptNote(
   noteData: {
     value: bigint;
-    mintTokenAddress: bigint;
     secret: bigint;
     leafIndex?: number; // Optional, omitted to save space
   },
   recipientEncryptionPubKey: Uint8Array
 ): EncryptedNote {
-  // Use only first 8 bytes of mintTokenAddress to save space
-  // Recipient can match this prefix against known mints
-  const mintPrefix = noteData.mintTokenAddress.toString(16).padStart(64, "0").slice(0, 16);
-  
-  const payload = {
-    v: noteData.value.toString(),      // value
-    m: mintPrefix,                      // mint (first 8 bytes as hex)
-    s: noteData.secret.toString(),      // secret
-    // leafIndex omitted - recipient queries relayer with computed commitment
-  };
+  const payload = `${noteData.value.toString()}|${noteData.secret.toString()}`;
 
-  const message = new TextEncoder().encode(JSON.stringify(payload));
+  const message = new TextEncoder().encode(payload);
   const nonce = nacl.randomBytes(24);
   const ephemeralKeyPair = nacl.box.keyPair();
 
@@ -231,7 +219,7 @@ export function encryptNote(
 export function decryptNote(
   encryptedNote: EncryptedNote,
   encryptionSecretKey: Uint8Array
-): { value: bigint; mintPrefix: string; secret: bigint } | null {
+): { value: bigint; secret: bigint } | null {
   try {
     const decrypted = nacl.box.open(
       encryptedNote.ciphertext,
@@ -242,25 +230,19 @@ export function decryptNote(
 
     if (!decrypted) return null;
 
-    const noteData = JSON.parse(new TextDecoder().decode(decrypted));
-    
-    // Handle both old format (full data) and new format (compact)
-    if (noteData.v !== undefined) {
-      // New compact format
-      return {
-        value: BigInt(noteData.v),
-        mintPrefix: noteData.m, // First 8 bytes as hex string
-        secret: BigInt(noteData.s),
-      };
-    } else {
-      // Legacy format (full mintTokenAddress)
-      return {
-        value: BigInt(noteData.value),
-        mintPrefix: BigInt(noteData.mintTokenAddress).toString(16).padStart(64, "0").slice(0, 16),
-        secret: BigInt(noteData.secret),
+    let noteData: { v: bigint; s: bigint } | null = null;
+      const data = new TextDecoder().decode(decrypted).split("|");
+      noteData = {
+        v: BigInt(data[0]),
+        s: BigInt(data[1]),
       };
-    }
-  } catch {
+    if (!noteData) return null;
+  
+    return {
+      value: BigInt(noteData.v),
+      secret: BigInt(noteData.s),
+    };
+  } catch (error) {
     return null;
   }
 }

package/src/idl.ts

@@ -383,14 +383,6 @@ const HulaPrivacyIdl = {
           "writable": true,
           "optional": true
         },
-        {
-          "name": "fee_recipient_token_account",
-          "docs": [
-            "Fee recipient's token account (optional)"
-          ],
-          "writable": true,
-          "optional": true
-        },
         {
           "name": "nullifier_account_0",
           "docs": [
@@ -565,16 +557,11 @@ const HulaPrivacyIdl = {
     },
     {
       "code": 6017,
-      "name": "InvalidFee",
-      "msg": "Invalid fee"
-    },
-    {
-      "code": 6018,
       "name": "TreeNotFull",
       "msg": "Tree is not full yet"
     },
     {
-      "code": 6019,
+      "code": 6018,
       "name": "InvalidTreeIndex",
       "msg": "Invalid tree index"
     }
@@ -801,10 +788,6 @@ const HulaPrivacyIdl = {
           {
             "name": "mint_token_address",
             "type": "pubkey"
-          },
-          {
-            "name": "fee",
-            "type": "u64"
           }
         ]
       }

package/src/transaction.ts

@@ -64,7 +64,6 @@ export async function buildTransaction(
   // Validate inputs
   const depositAmount = request.depositAmount ?? 0n;
   const withdrawAmount = request.withdrawAmount ?? 0n;
-  const fee = request.fee ?? 0n;
   const inputUtxos = request.inputUtxos ?? [];
   const outputs = request.outputs ?? [];
 
@@ -127,13 +126,13 @@ export async function buildTransaction(
   }
 
   // Calculate change
-  const totalOut = withdrawAmount + fee + totalOutputValue;
+  const totalOut = withdrawAmount + totalOutputValue;
   const changeAmount = totalAvailable - totalOut;
 
   if (changeAmount < 0n) {
     throw new Error(
       `Insufficient value. Have ${totalAvailable} (inputs: ${totalInputValue}, deposit: ${depositAmount}), ` +
-      `need ${totalOut} (outputs: ${totalOutputValue}, withdraw: ${withdrawAmount}, fee: ${fee})`
+      `need ${totalOut} (outputs: ${totalOutputValue}, withdraw: ${withdrawAmount})`
     );
   }
 
@@ -169,7 +168,6 @@ export async function buildTransaction(
     withdrawAmount,
     request.recipient ?? PublicKey.default,
     request.mint,
-    fee
   );
 
   // Generate ZK proof
@@ -185,7 +183,6 @@ export async function buildTransaction(
     publicWithdraw: withdrawAmount,
     recipient: request.recipient ?? PublicKey.default,
     mintTokenAddress: request.mint,
-    fee,
   };
 
   // Create encrypted notes for outputs with encryption keys
@@ -199,9 +196,7 @@ export async function buildTransaction(
       const encrypted = encryptNote(
         {
           value: utxo.value,
-          mintTokenAddress: utxo.mintTokenAddress,
           secret: utxo.secret,
-          // leafIndex omitted - recipient queries relayer with computed commitment
         },
         output.encryptionPubKey
       );
@@ -216,9 +211,7 @@ export async function buildTransaction(
     const encrypted = encryptNote(
       {
         value: changeUtxo.value,
-        mintTokenAddress: changeUtxo.mintTokenAddress,
         secret: changeUtxo.secret,
-        // leafIndex omitted - we already know it locally
       },
       walletKeys.encryptionKeyPair.publicKey
     );
@@ -249,7 +242,6 @@ function buildCircuitInputs(
   withdrawAmount: bigint,
   recipient: PublicKey,
   mint: PublicKey,
-  fee: bigint
 ): CircuitInputs {
   const inputSpendingKeys: string[] = [];
   const inputValues: string[] = [];
@@ -302,7 +294,6 @@ function buildCircuitInputs(
     publicWithdraw: withdrawAmount.toString(),
     recipient: pubkeyToBigInt(recipient).toString(),
     mintTokenAddress: pubkeyToBigInt(mint).toString(),
-    fee: fee.toString(),
 
     inputSpendingKeys,
     inputValues,
@@ -344,7 +335,6 @@ export function buildTransactionAccounts(
     depositorTokenAccount: PublicKey | null;
     depositor: PublicKey | null;
     recipientTokenAccount: PublicKey | null;
-    feeRecipientTokenAccount: PublicKey | null;
     nullifierAccount0: PublicKey | null;
     nullifierAccount1: PublicKey | null;
     tokenProgram: PublicKey;
@@ -422,7 +412,6 @@ export function buildTransactionAccounts(
       depositorTokenAccount,
       depositor,
       recipientTokenAccount,
-      feeRecipientTokenAccount: null, // TODO: Add fee recipient support
       nullifierAccount0: nullifierPdas[0] ?? null,
       nullifierAccount1: nullifierPdas[1] ?? null,
       tokenProgram: TOKEN_2022_PROGRAM_ID,
@@ -448,7 +437,6 @@ export function toAnchorPublicInputs(builtTx: BuiltTransaction): {
   publicWithdraw: BN;
   recipient: PublicKey;
   mintTokenAddress: PublicKey;
-  fee: BN;
 } {
   return {
     merkleRoot: builtTx.publicInputs.merkleRoot,
@@ -458,6 +446,5 @@ export function toAnchorPublicInputs(builtTx: BuiltTransaction): {
     publicWithdraw: new BN(builtTx.publicInputs.publicWithdraw.toString()),
     recipient: builtTx.publicInputs.recipient,
     mintTokenAddress: builtTx.publicInputs.mintTokenAddress,
-    fee: new BN(builtTx.publicInputs.fee.toString()),
   };
 }

package/src/types.ts

@@ -126,7 +126,6 @@ export interface CircuitInputs {
   publicWithdraw: string;
   recipient: string;
   mintTokenAddress: string;
-  fee: string;
 
   // Private inputs for input UTXOs
   inputSpendingKeys: string[];
@@ -153,7 +152,6 @@ export interface PublicInputs {
   publicWithdraw: bigint;
   recipient: PublicKey;
   mintTokenAddress: PublicKey;
-  fee: bigint;
 }
 
 /**
@@ -182,8 +180,6 @@ export interface TransactionRequest {
   withdrawAmount?: bigint;
   /** Recipient public key for withdrawal */
   recipient?: PublicKey;
-  /** Relayer fee */
-  fee?: bigint;
   /** Token mint address */
   mint: PublicKey;
 }
@@ -256,7 +252,6 @@ export interface TransactionData {
   outputTreeIndex: number;
   publicDeposit: string;
   publicWithdraw: string;
-  fee: string;
   success: boolean;
   nullifiers: string[];
   encryptedNotes: { noteIndex: number; data: string }[];

package/src/utxo.ts

@@ -13,8 +13,8 @@ import {
   hexToBytes,
   pubkeyToBigInt,
 } from "./crypto";
-import { DOMAIN_NULLIFIER } from "./constants";
-import type { UTXO, WalletKeys, SerializableUTXO, NoteData } from "./types";
+import { DOMAIN_NULLIFIER, NUM_INPUT_UTXOS } from "./constants";
+import type { UTXO, WalletKeys, SerializableUTXO } from "./types";
 import { PublicKey } from "@solana/web3.js";
 
 // ============================================================================
@@ -72,7 +72,7 @@ export function createUTXO(
   leafIndex: number,
   treeIndex: number = 0
 ): UTXO {
-  const secret = generateSpendingKey(); // Random blinding factor
+  const secret = generateSpendingKey(127n); // Random blinding factor
   const commitment = computeCommitment(value, mintTokenAddress, owner, secret);
 
   return {
@@ -350,6 +350,10 @@ export function selectUTXOs(
     total += utxo.value;
   }
 
+  if (selected.length > NUM_INPUT_UTXOS) {
+    throw new Error(`Selected ${selected.length} UTXOs, but only ${NUM_INPUT_UTXOS} are allowed. You can merge your UTXOs to reach the target amount.`);
+  }
+
   if (total < targetAmount) {
     throw new Error(
       `Insufficient balance. Need ${targetAmount}, have ${total}`
@@ -369,5 +373,3 @@ export function calculateBalance(utxos: UTXO[], mint?: bigint): bigint {
 
   return filtered.reduce((sum, u) => sum + u.value, 0n);
 }
-
-

package/src/wallet.ts

@@ -19,8 +19,10 @@ import {
   generateSpendingKey,
   deriveSpendingKeyFromSignature,
   pubkeyToBigInt,
+  bigIntToBytes,
+  bytesToHex,
 } from "./crypto";
-import { syncUTXOs, deserializeUTXO, selectUTXOs, calculateBalance } from "./utxo";
+import { syncUTXOs, deserializeUTXO, selectUTXOs, calculateBalance, createUTXO } from "./utxo";
 import { buildTransaction, buildTransactionAccounts, toAnchorPublicInputs } from "./transaction";
 import { getRelayerClient, setDefaultRelayerUrl } from "./api";
 import type {
@@ -575,6 +577,94 @@ export class HulaWallet {
     return signature;
   }
 
+
+  /**
+   * Merge UTXOs
+   * 
+   * @param utxo1 - First UTXO to merge
+   * @param utxo2 - Second UTXO to merge
+   * @returns Transaction signature
+   * 
+   */
+  async mergeUTXOs(utxo1: UTXO, utxo2: UTXO): Promise<string> {
+    if (!this.signer) {
+      throw new Error("No signer available. Use fromKeypair() or setSigner() to set a signer.");
+    }
+    if (utxo1.mintTokenAddress !== utxo2.mintTokenAddress) {
+      throw new Error("UTXOs have different mint token addresses");
+    }
+
+    const mint = new PublicKey(
+      bigIntToBytes(utxo1.mintTokenAddress, 32)
+    );
+    const mergedUtxo = createUTXO(utxo1.value + utxo2.value, utxo1.mintTokenAddress, utxo1.owner, utxo1.leafIndex, utxo1.treeIndex);
+
+    // Build the transaction with ZK proof
+    const builtTx = await buildTransaction(
+      {
+        mint,
+        inputUtxos: [utxo1, utxo2],
+        outputs: [{
+          owner: this.keys.owner,
+          amount: mergedUtxo.value,
+          encryptionPubKey: this.keys.encryptionKeyPair.publicKey,
+        }],
+      },
+      this.keys,
+      this.relayerUrl
+    );
+
+    // Build accounts and pre-instructions
+    const { accounts, preInstructions, inputTreeIndex } = buildTransactionAccounts(
+      builtTx,
+      this.signer.publicKey,
+      mint,
+      0n,
+      0n
+    );
+    // Add compute budget instructions for ZK proof verification
+    const allPreInstructions = [
+      ComputeBudgetProgram.setComputeUnitLimit({ units: COMPUTE_UNITS }),
+      ComputeBudgetProgram.setComputeUnitPrice({ microLamports: COMPUTE_UNIT_PRICE }),
+      ...preInstructions,
+    ];
+
+    // Setup Anchor program
+    const wallet = new Wallet(this.signer);
+    const provider = new AnchorProvider(this.connection, wallet, { commitment: "confirmed" });
+
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const program = new Program(HulaPrivacyIdl as any, provider);
+
+    // Convert public inputs to Anchor format
+    const publicInputs = toAnchorPublicInputs(builtTx);
+
+    // Submit the transaction
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    const signature = await (program.methods as any)
+      .transact(
+        inputTreeIndex,
+        Array.from(builtTx.proof),
+        publicInputs,
+        builtTx.encryptedNotes
+      )
+      .accounts(accounts)
+      .preInstructions(allPreInstructions)
+      .signers([this.signer])
+      .rpc();
+
+    // Mark input UTXOs as spent locally
+    for (const utxo of [utxo1, utxo2]) {
+      const serialized = this.utxos.find(u => u.commitment === utxo.commitment.toString());
+      if (serialized) {
+        serialized.spent = true;
+        serialized.spentTx = signature;
+      }
+    }
+
+    return signature;
+  }
+
   /**
    * Build a custom transaction
    */
@@ -663,7 +753,7 @@ export class HulaWallet {
  * Create a deterministic message for wallet key derivation
  */
 export function getKeyDerivationMessage(): Uint8Array {
-  return new TextEncoder().encode("Hula Privacy Wallet Key Derivation v1");
+  return new TextEncoder().encode("Hula Privacy Wallet Key Derivation v1. Don't share this message with anyone and keep it secret. It's private key for your privacy wallet.");
 }
 
 /**