@smithii_io/mixoor 0.0.3 → 0.0.5

package/dist/test/_setup.js

@@ -112,7 +112,7 @@ const depositSolPoolForAuthority = async (client, amount, merkleTree) => {
   merkleTree.insert(commitment);
   const newRoot = merkleTree.root();
   console.log("New merkle root after deposit:", newRoot);
-  const createIx = await src.getDepositInstructionAsync({
+  const depositIx = await src.getDepositInstructionAsync({
     depositor: authority,
     pool,
     amount,
@@ -122,7 +122,7 @@ const depositSolPoolForAuthority = async (client, amount, merkleTree) => {
   });
   await kit.pipe(
     await createDefaultTransaction(client, authority),
-    (tx) => kit.appendTransactionMessageInstruction(createIx, tx),
+    (tx) => kit.appendTransactionMessageInstruction(depositIx, tx),
     (tx) => signAndSendTransaction(client, tx)
   );
   return {

package/dist/test/_setup.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../test/_setup.ts"],"names":["createSolanaRpc","createSolanaRpcSubscriptions","generateKeyPairSigner","airdropFactory","lamports","path","os","fs","createKeyPairSignerFromBytes","pipe","createTransactionMessage","setTransactionMessageFeePayerSigner","setTransactionMessageLifetimeUsingBlockhash","signTransactionMessageWithSigners","assertIsSendableTransaction","getSignatureFromTransaction","assertIsTransactionWithBlockhashLifetime","sendAndConfirmTransactionFactory","getInitializePoolInstructionAsync","WRAPPED_SOL_MINT_TOKEN_PROGRAM","AssetType","appendTransactionMessageInstruction","findPoolAddress","randomBytes","generateCommitment","getDepositInstructionAsync","getTransferInstructionAsync","appendTransactionMessageInstructions","getSetComputeUnitLimitInstruction"],"mappings":"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","file":"_setup.js","sourcesContent":["import { getSetComputeUnitLimitInstruction } from '@solana-program/compute-budget';\nimport {\n  Address,\n  airdropFactory,\n  appendTransactionMessageInstruction,\n  appendTransactionMessageInstructions,\n  assertIsSendableTransaction,\n  assertIsTransactionWithBlockhashLifetime,\n  Commitment,\n  createKeyPairSignerFromBytes,\n  createSolanaRpc,\n  createSolanaRpcSubscriptions,\n  createTransactionMessage,\n  generateKeyPairSigner,\n  getSignatureFromTransaction,\n  KeyPairSigner,\n  lamports,\n  pipe,\n  Rpc,\n  RpcSubscriptions,\n  sendAndConfirmTransactionFactory,\n  setTransactionMessageFeePayerSigner,\n  setTransactionMessageLifetimeUsingBlockhash,\n  signTransactionMessageWithSigners,\n  SolanaRpcApi,\n  SolanaRpcSubscriptionsApi,\n  TransactionMessage,\n  TransactionMessageWithFeePayer,\n  TransactionSigner,\n} from '@solana/kit';\n\nimport fs from 'fs';\nimport os from 'os';\nimport path from 'path';\n\nimport { randomBytes } from 'crypto';\nimport {\n  AssetType,\n  findPoolAddress,\n  generateCommitment,\n  getDepositInstructionAsync,\n  getInitializePoolInstructionAsync,\n  getTransferInstructionAsync,\n  ProofData,\n} from '../src';\nimport { WRAPPED_SOL_MINT_TOKEN_PROGRAM } from './_constants';\n\nexport type Client = {\n  rpc: Rpc<SolanaRpcApi>;\n  rpcSubscriptions: RpcSubscriptions<SolanaRpcSubscriptionsApi>;\n};\n\nexport const createDefaultSolanaClient = (): Client => {\n  const rpc = createSolanaRpc('http://127.0.0.1:8899');\n  const rpcSubscriptions = createSolanaRpcSubscriptions('ws://127.0.0.1:8900');\n  return { rpc, rpcSubscriptions };\n};\n\nexport const createDevnetClient = (): Client => {\n  const rpc = createSolanaRpc('https://api.devnet.solana.com');\n  const rpcSubscriptions = createSolanaRpcSubscriptions(\n    'wss://api.devnet.solana.com/'\n  );\n\n  return { rpc, rpcSubscriptions };\n};\n\nexport const generateKeyPairSignerWithSol = async (\n  client: Client,\n  putativeLamports: bigint = 1_000_000_000n\n) => {\n  const signer = await generateKeyPairSigner();\n  await airdropFactory(client)({\n    recipientAddress: signer.address,\n    lamports: lamports(putativeLamports),\n    commitment: 'confirmed',\n  });\n  return signer;\n};\n\nexport const airdropSolToAddress = async (\n  client: Client,\n  receiver: Address, // 5 sol\n  putativeLamports: bigint = 5_000_000_000n // 5 sol\n) => {\n  await airdropFactory(client)({\n    recipientAddress: receiver,\n    lamports: lamports(putativeLamports),\n    commitment: 'confirmed',\n  });\n};\n\nexport async function loadKeypairFromFile(\n  filePath: string\n): Promise<KeyPairSigner<string>> {\n  // This is here so you can also load the default keypair from the file system.\n  const resolvedPath = path.resolve(\n    filePath.startsWith('~') ? filePath.replace('~', os.homedir()) : filePath\n  );\n  const loadedKeyBytes = Uint8Array.from(\n    JSON.parse(fs.readFileSync(resolvedPath, 'utf8'))\n  );\n  // Here you can also set the second parameter to true in case you need to extract your private key.\n  const keypairSigner = await createKeyPairSignerFromBytes(loadedKeyBytes);\n  return keypairSigner;\n}\n\nexport const createDefaultTransaction = async (\n  client: Client,\n  feePayer: TransactionSigner\n) => {\n  const { value: latestBlockhash } = await client.rpc\n    .getLatestBlockhash()\n    .send();\n  return pipe(\n    createTransactionMessage({ version: 0 }),\n    (tx) => setTransactionMessageFeePayerSigner(feePayer, tx),\n    (tx) => setTransactionMessageLifetimeUsingBlockhash(latestBlockhash, tx)\n  );\n};\n\nexport const signAndSendTransaction = async (\n  client: Client,\n  transactionMessage: TransactionMessage & TransactionMessageWithFeePayer,\n  //  & TransactionMessageWithLifetime,\n  commitment: Commitment = 'finalized'\n) => {\n  const signedTransaction =\n    await signTransactionMessageWithSigners(transactionMessage);\n  assertIsSendableTransaction(signedTransaction);\n\n  const signature = getSignatureFromTransaction(signedTransaction);\n\n  assertIsTransactionWithBlockhashLifetime(signedTransaction);\n  await sendAndConfirmTransactionFactory(client)(signedTransaction, {\n    commitment,\n    skipPreflight: true,\n  });\n\n  console.log('\\n[DEBUG;] le signature ->', signature); // ! debug\n  return signature;\n};\n\nexport const getBalance = async (client: Client, address: Address) =>\n  (await client.rpc.getBalance(address, { commitment: 'confirmed' }).send())\n    .value;\n\nexport async function loadDefaultKeypair(): Promise<KeyPairSigner<string>> {\n  return await loadKeypairFromFile('~/.config/solana/id.json');\n}\n\nexport async function loadReceiverKeypair(): Promise<KeyPairSigner<string>> {\n  return await loadKeypairFromFile('~/.config/solana/id-new.json');\n}\n\nexport async function loadRelayerKeypair(): Promise<KeyPairSigner<string>> {\n  return await loadKeypairFromFile('~/.config/solana/relayer.json');\n}\n\nexport const getTokenBalance = async (client: Client, tokenAccount: Address) =>\n  (\n    await client.rpc\n      .getTokenAccountBalance(tokenAccount, { commitment: 'confirmed' })\n      .send()\n  ).value;\n\n// -------------------------------------------------- instructions\n\nexport const createSolPoolForAuthority = async (\n  client: Client\n  // merkleTree?: Address\n): Promise<{ authority: Address }> => {\n  const [authority] = await Promise.all([loadDefaultKeypair()]);\n\n  const createIx = await getInitializePoolInstructionAsync({\n    authority,\n    mint: WRAPPED_SOL_MINT_TOKEN_PROGRAM,\n    // feeCollector: FEE_COLLECTOR_ADDRESS,\n    assetType: AssetType.Sol, //! since we are using wrapped sol mint, can we get rid of this\n  });\n\n  await pipe(\n    await createDefaultTransaction(client, authority),\n    (tx) => appendTransactionMessageInstruction(createIx, tx),\n    (tx) => signAndSendTransaction(client, tx)\n  );\n\n  return { authority: authority.address };\n};\n\nexport const depositSolPoolForAuthority = async (\n  client: Client,\n  amount: bigint,\n  merkleTree: import('../src').MerkleTree\n): Promise<{\n  depositor: Address;\n  commitment: Uint8Array;\n  secret: Uint8Array;\n  nullifier: Uint8Array;\n}> => {\n  const [authority] = await Promise.all([loadDefaultKeypair()]);\n\n  // find pool address\n  const [pool] = await findPoolAddress({\n    mint: WRAPPED_SOL_MINT_TOKEN_PROGRAM,\n  });\n\n  // generate commitment\n  const secret = randomBytes(32);\n  const nullifier = randomBytes(32);\n  const commitment = await generateCommitment(secret, nullifier, amount, pool);\n\n  console.log('commitment ', commitment); // ! debug\n\n  // Insert commitment into merkle tree and compute new root\n  merkleTree.insert(commitment);\n  const newRoot = merkleTree.root();\n  console.log('New merkle root after deposit:', newRoot);\n\n  // ! NOTE, DURING INITIALIZATION,\n  const createIx = await getDepositInstructionAsync({\n    depositor: authority,\n    pool,\n    amount,\n    commitment,\n    newRoot,\n    mint: WRAPPED_SOL_MINT_TOKEN_PROGRAM,\n  });\n\n  await pipe(\n    await createDefaultTransaction(client, authority),\n    (tx) => appendTransactionMessageInstruction(createIx, tx),\n    (tx) => signAndSendTransaction(client, tx)\n  );\n\n  return {\n    depositor: authority.address,\n    commitment,\n    secret,\n    nullifier,\n  };\n};\n\nexport const transferForAuthority = async (\n  client: Client,\n  ixArgs: {\n    relayerFee: number;\n    recipientAmount: number;\n    nullifierHash: Uint8Array;\n    proofData: ProofData;\n    publicInputs: Uint8Array[];\n    mint: Address;\n  }\n): Promise<{\n  relayer: Address;\n}> => {\n  const [relayer, recipient] = await Promise.all([\n    loadRelayerKeypair(),\n    loadReceiverKeypair(),\n  ]);\n\n  // airdrop relayer\n  await airdropSolToAddress(client, relayer.address);\n\n  const {\n    relayerFee,\n    recipientAmount,\n    nullifierHash,\n    // root,\n    mint,\n    publicInputs,\n    proofData: { proofA, proofB, proofC },\n  } = ixArgs;\n\n  // find pool address\n  const [pool] = await findPoolAddress({\n    mint,\n  });\n\n  // TEMPORARY: The autogenerated client hasn't been regenerated yet\n  // The Rust program expects: relayer_fee (6th), recipient_amount (7th)\n  // But the old client has: amount (6th), fee (7th)\n  // So we swap them here until the client is regenerated\n  const transferIx = await getTransferInstructionAsync({\n    relayer,\n    pool,\n    recipient: recipient.address,\n    proofA,\n    proofB,\n    proofC,\n    // root,\n    nullifierHash,\n    publicInputs,\n    // recipientArg: recipient.address,\n    amount: BigInt(relayerFee), // OLD 'amount' param → NEW 'relayer_fee'\n    fee: BigInt(recipientAmount),\n    mint,\n  });\n\n  await pipe(\n    await createDefaultTransaction(client, relayer),\n    (tx) => appendTransactionMessageInstruction(transferIx, tx),\n    (tx) =>\n      appendTransactionMessageInstructions(\n        [getSetComputeUnitLimitInstruction({ units: 1_400_000 })],\n        tx\n      ),\n    (tx) => signAndSendTransaction(client, tx)\n  );\n\n  // todo: return the address of the pool\n  // todo: what to return\n  return { relayer: relayer.address };\n};\n"]}
+{"version":3,"sources":["../../test/_setup.ts"],"names":["createSolanaRpc","createSolanaRpcSubscriptions","generateKeyPairSigner","airdropFactory","lamports","path","os","fs","createKeyPairSignerFromBytes","pipe","createTransactionMessage","setTransactionMessageFeePayerSigner","setTransactionMessageLifetimeUsingBlockhash","signTransactionMessageWithSigners","assertIsSendableTransaction","getSignatureFromTransaction","assertIsTransactionWithBlockhashLifetime","sendAndConfirmTransactionFactory","getInitializePoolInstructionAsync","WRAPPED_SOL_MINT_TOKEN_PROGRAM","AssetType","appendTransactionMessageInstruction","findPoolAddress","randomBytes","generateCommitment","getDepositInstructionAsync","getTransferInstructionAsync","appendTransactionMessageInstructions","getSetComputeUnitLimitInstruction"],"mappings":"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","file":"_setup.js","sourcesContent":["import { getSetComputeUnitLimitInstruction } from '@solana-program/compute-budget';\nimport {\n  Address,\n  airdropFactory,\n  appendTransactionMessageInstruction,\n  appendTransactionMessageInstructions,\n  assertIsSendableTransaction,\n  assertIsTransactionWithBlockhashLifetime,\n  Commitment,\n  createKeyPairSignerFromBytes,\n  createSolanaRpc,\n  createSolanaRpcSubscriptions,\n  createTransactionMessage,\n  generateKeyPairSigner,\n  getSignatureFromTransaction,\n  KeyPairSigner,\n  lamports,\n  pipe,\n  Rpc,\n  RpcSubscriptions,\n  sendAndConfirmTransactionFactory,\n  setTransactionMessageFeePayerSigner,\n  setTransactionMessageLifetimeUsingBlockhash,\n  signTransactionMessageWithSigners,\n  SolanaRpcApi,\n  SolanaRpcSubscriptionsApi,\n  TransactionMessage,\n  TransactionMessageWithFeePayer,\n  TransactionSigner,\n} from '@solana/kit';\n\nimport fs from 'fs';\nimport os from 'os';\nimport path from 'path';\n\nimport { randomBytes } from 'crypto';\nimport {\n  AssetType,\n  findPoolAddress,\n  generateCommitment,\n  getDepositInstructionAsync,\n  getInitializePoolInstructionAsync,\n  getTransferInstructionAsync,\n  MerkleTree,\n  ProofData,\n} from '../src';\nimport { WRAPPED_SOL_MINT_TOKEN_PROGRAM } from './_constants';\n\nexport type Client = {\n  rpc: Rpc<SolanaRpcApi>;\n  rpcSubscriptions: RpcSubscriptions<SolanaRpcSubscriptionsApi>;\n};\n\nexport const createDefaultSolanaClient = (): Client => {\n  const rpc = createSolanaRpc('http://127.0.0.1:8899');\n  const rpcSubscriptions = createSolanaRpcSubscriptions('ws://127.0.0.1:8900');\n  return { rpc, rpcSubscriptions };\n};\n\nexport const createDevnetClient = (): Client => {\n  const rpc = createSolanaRpc('https://api.devnet.solana.com');\n  const rpcSubscriptions = createSolanaRpcSubscriptions(\n    'wss://api.devnet.solana.com/'\n  );\n\n  return { rpc, rpcSubscriptions };\n};\n\nexport const generateKeyPairSignerWithSol = async (\n  client: Client,\n  putativeLamports: bigint = 1_000_000_000n\n) => {\n  const signer = await generateKeyPairSigner();\n  await airdropFactory(client)({\n    recipientAddress: signer.address,\n    lamports: lamports(putativeLamports),\n    commitment: 'confirmed',\n  });\n  return signer;\n};\n\nexport const airdropSolToAddress = async (\n  client: Client,\n  receiver: Address, // 5 sol\n  putativeLamports: bigint = 5_000_000_000n // 5 sol\n) => {\n  await airdropFactory(client)({\n    recipientAddress: receiver,\n    lamports: lamports(putativeLamports),\n    commitment: 'confirmed',\n  });\n};\n\nexport async function loadKeypairFromFile(\n  filePath: string\n): Promise<KeyPairSigner<string>> {\n  // This is here so you can also load the default keypair from the file system.\n  const resolvedPath = path.resolve(\n    filePath.startsWith('~') ? filePath.replace('~', os.homedir()) : filePath\n  );\n  const loadedKeyBytes = Uint8Array.from(\n    JSON.parse(fs.readFileSync(resolvedPath, 'utf8'))\n  );\n  // Here you can also set the second parameter to true in case you need to extract your private key.\n  const keypairSigner = await createKeyPairSignerFromBytes(loadedKeyBytes);\n  return keypairSigner;\n}\n\nexport const createDefaultTransaction = async (\n  client: Client,\n  feePayer: TransactionSigner\n) => {\n  const { value: latestBlockhash } = await client.rpc\n    .getLatestBlockhash()\n    .send();\n  return pipe(\n    createTransactionMessage({ version: 0 }),\n    (tx) => setTransactionMessageFeePayerSigner(feePayer, tx),\n    (tx) => setTransactionMessageLifetimeUsingBlockhash(latestBlockhash, tx)\n  );\n};\n\nexport const signAndSendTransaction = async (\n  client: Client,\n  transactionMessage: TransactionMessage & TransactionMessageWithFeePayer,\n  //  & TransactionMessageWithLifetime,\n  commitment: Commitment = 'finalized'\n) => {\n  const signedTransaction =\n    await signTransactionMessageWithSigners(transactionMessage);\n  assertIsSendableTransaction(signedTransaction);\n\n  const signature = getSignatureFromTransaction(signedTransaction);\n\n  assertIsTransactionWithBlockhashLifetime(signedTransaction);\n  await sendAndConfirmTransactionFactory(client)(signedTransaction, {\n    commitment,\n    skipPreflight: true,\n  });\n\n  console.log('\\n[DEBUG;] le signature ->', signature); // ! debug\n  return signature;\n};\n\nexport const getBalance = async (client: Client, address: Address) =>\n  (await client.rpc.getBalance(address, { commitment: 'confirmed' }).send())\n    .value;\n\nexport async function loadDefaultKeypair(): Promise<KeyPairSigner<string>> {\n  return await loadKeypairFromFile('~/.config/solana/id.json');\n}\n\nexport async function loadReceiverKeypair(): Promise<KeyPairSigner<string>> {\n  return await loadKeypairFromFile('~/.config/solana/id-new.json');\n}\n\nexport async function loadRelayerKeypair(): Promise<KeyPairSigner<string>> {\n  return await loadKeypairFromFile('~/.config/solana/relayer.json');\n}\n\nexport const getTokenBalance = async (client: Client, tokenAccount: Address) =>\n  (\n    await client.rpc\n      .getTokenAccountBalance(tokenAccount, { commitment: 'confirmed' })\n      .send()\n  ).value;\n\n// -------------------------------------------------- instructions\n\nexport const createSolPoolForAuthority = async (\n  client: Client\n  // merkleTree?: Address\n): Promise<{ authority: Address }> => {\n  const [authority] = await Promise.all([loadDefaultKeypair()]);\n\n  const createIx = await getInitializePoolInstructionAsync({\n    authority,\n    mint: WRAPPED_SOL_MINT_TOKEN_PROGRAM,\n    // feeCollector: FEE_COLLECTOR_ADDRESS,\n    assetType: AssetType.Sol, //! since we are using wrapped sol mint, can we get rid of this\n  });\n\n  await pipe(\n    await createDefaultTransaction(client, authority),\n    (tx) => appendTransactionMessageInstruction(createIx, tx),\n    (tx) => signAndSendTransaction(client, tx)\n  );\n\n  return { authority: authority.address };\n};\n\nexport const depositSolPoolForAuthority = async (\n  client: Client,\n  amount: bigint,\n  merkleTree: MerkleTree\n): Promise<{\n  depositor: Address;\n  commitment: Uint8Array;\n  secret: Uint8Array;\n  nullifier: Uint8Array;\n}> => {\n  const [authority] = await Promise.all([loadDefaultKeypair()]);\n\n  // find pool address\n  const [pool] = await findPoolAddress({\n    mint: WRAPPED_SOL_MINT_TOKEN_PROGRAM,\n  });\n\n  // generate commitment\n  const secret = randomBytes(32);\n  const nullifier = randomBytes(32);\n  const commitment = await generateCommitment(secret, nullifier, amount, pool);\n\n  console.log('commitment ', commitment); // ! debug\n\n  // Insert commitment into merkle tree and compute new root\n  merkleTree.insert(commitment);\n  const newRoot = merkleTree.root();\n  console.log('New merkle root after deposit:', newRoot);\n\n  // ! NOTE, DURING INITIALIZATION,\n  const depositIx = await getDepositInstructionAsync({\n    depositor: authority,\n    pool,\n    amount,\n    commitment,\n    newRoot,\n    mint: WRAPPED_SOL_MINT_TOKEN_PROGRAM,\n  });\n\n  await pipe(\n    await createDefaultTransaction(client, authority),\n    (tx) => appendTransactionMessageInstruction(depositIx, tx),\n    (tx) => signAndSendTransaction(client, tx)\n  );\n\n  return {\n    depositor: authority.address,\n    commitment,\n    secret,\n    nullifier,\n  };\n};\n\nexport const transferForAuthority = async (\n  client: Client,\n  ixArgs: {\n    relayerFee: number;\n    recipientAmount: number;\n    nullifierHash: Uint8Array;\n    proofData: ProofData;\n    publicInputs: Uint8Array[];\n    mint: Address;\n  }\n): Promise<{\n  relayer: Address;\n}> => {\n  const [relayer, recipient] = await Promise.all([\n    loadRelayerKeypair(),\n    loadReceiverKeypair(),\n  ]);\n\n  // airdrop relayer\n  await airdropSolToAddress(client, relayer.address);\n\n  const {\n    relayerFee,\n    recipientAmount,\n    nullifierHash,\n    // root,\n    mint,\n    publicInputs,\n    proofData: { proofA, proofB, proofC },\n  } = ixArgs;\n\n  // find pool address\n  const [pool] = await findPoolAddress({\n    mint,\n  });\n\n  // TEMPORARY: The autogenerated client hasn't been regenerated yet\n  // The Rust program expects: relayer_fee (6th), recipient_amount (7th)\n  // But the old client has: amount (6th), fee (7th)\n  // So we swap them here until the client is regenerated\n  const transferIx = await getTransferInstructionAsync({\n    relayer,\n    pool,\n    recipient: recipient.address,\n    proofA,\n    proofB,\n    proofC,\n    // root,\n    nullifierHash,\n    publicInputs,\n    // recipientArg: recipient.address,\n    amount: BigInt(relayerFee), // OLD 'amount' param → NEW 'relayer_fee'\n    fee: BigInt(recipientAmount),\n    mint,\n  });\n\n  await pipe(\n    await createDefaultTransaction(client, relayer),\n    (tx) => appendTransactionMessageInstruction(transferIx, tx),\n    (tx) =>\n      appendTransactionMessageInstructions(\n        [getSetComputeUnitLimitInstruction({ units: 1_400_000 })],\n        tx\n      ),\n    (tx) => signAndSendTransaction(client, tx)\n  );\n\n  // todo: return the address of the pool\n  // todo: what to return\n  return { relayer: relayer.address };\n};\n"]}

package/dist/types/src/utils/circuit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"circuit.d.ts","sourceRoot":"","sources":["../../../../src/utils/circuit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAqB,MAAM,aAAa,CAAC;AA+BzD,wBAAsB,YAAY,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAgB5E;AAED,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,UAAU,EACrB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,UAAU,CAAC,CAiCrB;AAED,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,UAAU,EACrB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,UAAU,CAAC,CAGrB;AAED,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,UAAU,CAAC;IACnB,SAAS,EAAE,UAAU,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,UAAU,EAAE,CAAC;IAC3B,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,SAAS,EAAE,UAAU,CAAC;IACtB,OAAO,EAAE,UAAU,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,UAAU,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,UAAU,CAAC;IACpB,OAAO,EAAE,UAAU,CAAC;IACpB,OAAO,EAAE,UAAU,CAAC;CACrB;AAuDD,MAAM,MAAM,SAAS,GAAG;IACtB,MAAM,EAAE,UAAU,CAAC;IACnB,MAAM,EAAE,UAAU,CAAC;IACnB,MAAM,EAAE,UAAU,CAAC;CACpB,CAAC;AAEF,wBAAsB,aAAa,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC;IAC9D,SAAS,EAAE,SAAS,CAAC;IACrB,YAAY,EAAE,UAAU,EAAE,CAAC;CAC5B,CAAC,CAqFD"}
+{"version":3,"file":"circuit.d.ts","sourceRoot":"","sources":["../../../../src/utils/circuit.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAqB,MAAM,aAAa,CAAC;AA+BzD,wBAAsB,YAAY,CAAC,MAAM,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAgB5E;AAED,wBAAsB,kBAAkB,CACtC,MAAM,EAAE,UAAU,EAClB,SAAS,EAAE,UAAU,EACrB,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,UAAU,CAAC,CAiCrB;AAED,wBAAsB,iBAAiB,CACrC,SAAS,EAAE,UAAU,EACrB,MAAM,EAAE,OAAO,GACd,OAAO,CAAC,UAAU,CAAC,CAGrB;AAED,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,UAAU,CAAC;IACnB,SAAS,EAAE,UAAU,CAAC;IACtB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,UAAU,EAAE,CAAC;IAC3B,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,SAAS,EAAE,UAAU,CAAC;IACtB,OAAO,EAAE,UAAU,CAAC;IACpB,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,UAAU,CAAC;IACjB,WAAW,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,UAAU,CAAC;IACpB,OAAO,EAAE,UAAU,CAAC;IACpB,OAAO,EAAE,UAAU,CAAC;CACrB;AAuDD,MAAM,MAAM,SAAS,GAAG;IACtB,MAAM,EAAE,UAAU,CAAC;IACnB,MAAM,EAAE,UAAU,CAAC;IACnB,MAAM,EAAE,UAAU,CAAC;CACpB,CAAC;AAEF,wBAAsB,aAAa,CAAC,KAAK,EAAE,UAAU,GAAG,OAAO,CAAC;IAC9D,SAAS,EAAE,SAAS,CAAC;IACrB,YAAY,EAAE,UAAU,EAAE,CAAC;CAC5B,CAAC,CAkFD"}

package/dist/types/src/utils/pda.d.ts

@@ -11,7 +11,7 @@ export declare function findPoolAddress(seeds: PoolSeeds, config?: {
 export type MerkleTreeSeeds = {
     /** The prefix string SEED. */
     seed?: string;
-    /** The mint address */
+    /** The pool address */
     pool: Address;
 };
 export declare function findMerkleTreeAddress(seeds: MerkleTreeSeeds, config?: {
@@ -20,10 +20,19 @@ export declare function findMerkleTreeAddress(seeds: MerkleTreeSeeds, config?: {
 export type VaultSeeds = {
     /** The prefix string SEED. */
     seed?: string;
-    /** The mint address */
+    /** The pool address */
     pool: Address;
 };
 export declare function findVaultAddress(seeds: MerkleTreeSeeds, config?: {
     programAddress?: Address | undefined;
 }): Promise<ProgramDerivedAddress>;
+export type NullifierSeeds = {
+    /** The prefix string SEED. */
+    seed?: string;
+    /** The nullifier hash */
+    nullifierHash: Uint8Array;
+};
+export declare function findNullifierAddress(seeds: NullifierSeeds, config?: {
+    programAddress?: Address | undefined;
+}): Promise<ProgramDerivedAddress>;
 //# sourceMappingURL=pda.d.ts.map

package/dist/types/src/utils/pda.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pda.d.ts","sourceRoot":"","sources":["../../../../src/utils/pda.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EAGP,qBAAqB,EACtB,MAAM,aAAa,CAAC;AAGrB,MAAM,MAAM,SAAS,GAAG;IACtB,8BAA8B;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,uBAAuB;IACvB,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AAEF,wBAAsB,eAAe,CACnC,KAAK,EAAE,SAAS,EAChB,MAAM,GAAE;IAAE,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CAAO,GACpD,OAAO,CAAC,qBAAqB,CAAC,CAOhC;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,8BAA8B;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,uBAAuB;IACvB,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AAEF,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,eAAe,EACtB,MAAM,GAAE;IAAE,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CAAO,GACpD,OAAO,CAAC,qBAAqB,CAAC,CAOhC;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,8BAA8B;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,uBAAuB;IACvB,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AAEF,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,eAAe,EACtB,MAAM,GAAE;IAAE,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CAAO,GACpD,OAAO,CAAC,qBAAqB,CAAC,CAOhC"}
+{"version":3,"file":"pda.d.ts","sourceRoot":"","sources":["../../../../src/utils/pda.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,OAAO,EAGP,qBAAqB,EACtB,MAAM,aAAa,CAAC;AAGrB,MAAM,MAAM,SAAS,GAAG;IACtB,8BAA8B;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,uBAAuB;IACvB,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AAEF,wBAAsB,eAAe,CACnC,KAAK,EAAE,SAAS,EAChB,MAAM,GAAE;IAAE,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CAAO,GACpD,OAAO,CAAC,qBAAqB,CAAC,CAOhC;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,8BAA8B;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,uBAAuB;IACvB,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AAEF,wBAAsB,qBAAqB,CACzC,KAAK,EAAE,eAAe,EACtB,MAAM,GAAE;IAAE,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CAAO,GACpD,OAAO,CAAC,qBAAqB,CAAC,CAOhC;AAED,MAAM,MAAM,UAAU,GAAG;IACvB,8BAA8B;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,uBAAuB;IACvB,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AAEF,wBAAsB,gBAAgB,CACpC,KAAK,EAAE,eAAe,EACtB,MAAM,GAAE;IAAE,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CAAO,GACpD,OAAO,CAAC,qBAAqB,CAAC,CAOhC;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,8BAA8B;IAC9B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,yBAAyB;IACzB,aAAa,EAAE,UAAU,CAAC;CAC3B,CAAC;AAEF,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,cAAc,EACrB,MAAM,GAAE;IAAE,cAAc,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;CAAO,GACpD,OAAO,CAAC,qBAAqB,CAAC,CAOhC"}

package/dist/types/test/_setup.d.ts

@@ -1,5 +1,5 @@
 import { Address, Commitment, KeyPairSigner, Rpc, RpcSubscriptions, SolanaRpcApi, SolanaRpcSubscriptionsApi, TransactionMessage, TransactionMessageWithFeePayer, TransactionSigner } from '@solana/kit';
-import { ProofData } from '../src';
+import { MerkleTree, ProofData } from '../src';
 export type Client = {
     rpc: Rpc<SolanaRpcApi>;
     rpcSubscriptions: RpcSubscriptions<SolanaRpcSubscriptionsApi>;
@@ -30,7 +30,7 @@ export declare const getTokenBalance: (client: Client, tokenAccount: Address) =>
 export declare const createSolPoolForAuthority: (client: Client) => Promise<{
     authority: Address;
 }>;
-export declare const depositSolPoolForAuthority: (client: Client, amount: bigint, merkleTree: import("../src").MerkleTree) => Promise<{
+export declare const depositSolPoolForAuthority: (client: Client, amount: bigint, merkleTree: MerkleTree) => Promise<{
     depositor: Address;
     commitment: Uint8Array;
     secret: Uint8Array;

package/dist/types/test/_setup.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"_setup.d.ts","sourceRoot":"","sources":["../../../test/_setup.ts"],"names":[],"mappings":"AACA,OAAO,EACL,OAAO,EAMP,UAAU,EAOV,aAAa,EAGb,GAAG,EACH,gBAAgB,EAKhB,YAAY,EACZ,yBAAyB,EACzB,kBAAkB,EAClB,8BAA8B,EAC9B,iBAAiB,EAClB,MAAM,aAAa,CAAC;AAOrB,OAAO,EAOL,SAAS,EACV,MAAM,QAAQ,CAAC;AAGhB,MAAM,MAAM,MAAM,GAAG;IACnB,GAAG,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;IACvB,gBAAgB,EAAE,gBAAgB,CAAC,yBAAyB,CAAC,CAAC;CAC/D,CAAC;AAEF,eAAO,MAAM,yBAAyB,QAAO,MAI5C,CAAC;AAEF,eAAO,MAAM,kBAAkB,QAAO,MAOrC,CAAC;AAEF,eAAO,MAAM,4BAA4B,GACvC,QAAQ,MAAM,EACd,mBAAkB,MAAuB,mCAS1C,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAC9B,QAAQ,MAAM,EACd,UAAU,OAAO,EAAE,QAAQ;AAC3B,mBAAkB,MAAuB,kBAO1C,CAAC;AAEF,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAWhC;AAED,eAAO,MAAM,wBAAwB,GACnC,QAAQ,MAAM,EACd,UAAU,iBAAiB;;;;;gLAU5B,CAAC;AAEF,eAAO,MAAM,sBAAsB,GACjC,QAAQ,MAAM,EACd,oBAAoB,kBAAkB,GAAG,8BAA8B,EAEvE,aAAY,UAAwB,6CAgBrC,CAAC;AAEF,eAAO,MAAM,UAAU,GAAU,QAAQ,MAAM,EAAE,SAAS,OAAO,4CAEvD,CAAC;AAEX,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAEzE;AAED,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAE1E;AAED,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAEzE;AAED,eAAO,MAAM,eAAe,GAAU,QAAQ,MAAM,EAAE,cAAc,OAAO;;;;;GAKlE,CAAC;AAIV,eAAO,MAAM,yBAAyB,GACpC,QAAQ,MAAM,KAEb,OAAO,CAAC;IAAE,SAAS,EAAE,OAAO,CAAA;CAAE,CAiBhC,CAAC;AAEF,eAAO,MAAM,0BAA0B,GACrC,QAAQ,MAAM,EACd,QAAQ,MAAM,EACd,YAAY,OAAO,QAAQ,EAAE,UAAU,KACtC,OAAO,CAAC;IACT,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,UAAU,CAAC;IACvB,MAAM,EAAE,UAAU,CAAC;IACnB,SAAS,EAAE,UAAU,CAAC;CACvB,CA0CA,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAC/B,QAAQ,MAAM,EACd,QAAQ;IACN,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,UAAU,CAAC;IAC1B,SAAS,EAAE,SAAS,CAAC;IACrB,YAAY,EAAE,UAAU,EAAE,CAAC;IAC3B,IAAI,EAAE,OAAO,CAAC;CACf,KACA,OAAO,CAAC;IACT,OAAO,EAAE,OAAO,CAAC;CAClB,CA0DA,CAAC"}
+{"version":3,"file":"_setup.d.ts","sourceRoot":"","sources":["../../../test/_setup.ts"],"names":[],"mappings":"AACA,OAAO,EACL,OAAO,EAMP,UAAU,EAOV,aAAa,EAGb,GAAG,EACH,gBAAgB,EAKhB,YAAY,EACZ,yBAAyB,EACzB,kBAAkB,EAClB,8BAA8B,EAC9B,iBAAiB,EAClB,MAAM,aAAa,CAAC;AAOrB,OAAO,EAOL,UAAU,EACV,SAAS,EACV,MAAM,QAAQ,CAAC;AAGhB,MAAM,MAAM,MAAM,GAAG;IACnB,GAAG,EAAE,GAAG,CAAC,YAAY,CAAC,CAAC;IACvB,gBAAgB,EAAE,gBAAgB,CAAC,yBAAyB,CAAC,CAAC;CAC/D,CAAC;AAEF,eAAO,MAAM,yBAAyB,QAAO,MAI5C,CAAC;AAEF,eAAO,MAAM,kBAAkB,QAAO,MAOrC,CAAC;AAEF,eAAO,MAAM,4BAA4B,GACvC,QAAQ,MAAM,EACd,mBAAkB,MAAuB,mCAS1C,CAAC;AAEF,eAAO,MAAM,mBAAmB,GAC9B,QAAQ,MAAM,EACd,UAAU,OAAO,EAAE,QAAQ;AAC3B,mBAAkB,MAAuB,kBAO1C,CAAC;AAEF,wBAAsB,mBAAmB,CACvC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAWhC;AAED,eAAO,MAAM,wBAAwB,GACnC,QAAQ,MAAM,EACd,UAAU,iBAAiB;;;;;gLAU5B,CAAC;AAEF,eAAO,MAAM,sBAAsB,GACjC,QAAQ,MAAM,EACd,oBAAoB,kBAAkB,GAAG,8BAA8B,EAEvE,aAAY,UAAwB,6CAgBrC,CAAC;AAEF,eAAO,MAAM,UAAU,GAAU,QAAQ,MAAM,EAAE,SAAS,OAAO,4CAEvD,CAAC;AAEX,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAEzE;AAED,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAE1E;AAED,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAEzE;AAED,eAAO,MAAM,eAAe,GAAU,QAAQ,MAAM,EAAE,cAAc,OAAO;;;;;GAKlE,CAAC;AAIV,eAAO,MAAM,yBAAyB,GACpC,QAAQ,MAAM,KAEb,OAAO,CAAC;IAAE,SAAS,EAAE,OAAO,CAAA;CAAE,CAiBhC,CAAC;AAEF,eAAO,MAAM,0BAA0B,GACrC,QAAQ,MAAM,EACd,QAAQ,MAAM,EACd,YAAY,UAAU,KACrB,OAAO,CAAC;IACT,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,UAAU,CAAC;IACvB,MAAM,EAAE,UAAU,CAAC;IACnB,SAAS,EAAE,UAAU,CAAC;CACvB,CA0CA,CAAC;AAEF,eAAO,MAAM,oBAAoB,GAC/B,QAAQ,MAAM,EACd,QAAQ;IACN,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,aAAa,EAAE,UAAU,CAAC;IAC1B,SAAS,EAAE,SAAS,CAAC;IACrB,YAAY,EAAE,UAAU,EAAE,CAAC;IAC3B,IAAI,EAAE,OAAO,CAAC;CACf,KACA,OAAO,CAAC;IACT,OAAO,EAAE,OAAO,CAAC;CAClB,CA0DA,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@smithii_io/mixoor",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "JavaScript client for the Mixoor program",
   "sideEffects": false,
   "module": "./dist/src/index.mjs",
@@ -15,9 +15,11 @@
     }
   },
   "files": [
-    "dist"
+    "dist",
+    "circuits"
   ],
   "scripts": {
+    "copy-circuits": "./copy-circuits.sh",
     "build": "rimraf dist && tsup && tsc -p ./tsconfig.declarations.json",
     "build:docs": "typedoc",
     "test": "ava",
@@ -26,7 +28,7 @@
     "lint:fix": "eslint --fix --ext js,ts,tsx src",
     "format": "prettier --check src test",
     "format:fix": "prettier --write src test",
-    "prepublishOnly": "pnpm build"
+    "prepublishOnly": "pnpm copy-circuits && pnpm build"
   },
   "publishConfig": {
     "access": "public",