@smithii_io/mixoor 0.0.8 → 0.0.10

package/dist/src/index.mjs

@@ -357,6 +357,7 @@ var MIXOOR_ERROR__INVALID_MERKLE_TREE = 6009;
 var MIXOOR_ERROR__POSEIDON_HASH_ERROR = 6010;
 var MIXOOR_ERROR__MERKLE_TREE_FULL = 6011;
 var MIXOOR_ERROR__INVALID_MERKLE_PROOF = 6012;
+var MIXOOR_ERROR__PUBLIC_INPUT_MISMATCH = 6013;
 var mixoorErrorMessages;
 if (process.env.NODE_ENV !== "production") {
   mixoorErrorMessages = {
@@ -372,6 +373,7 @@ if (process.env.NODE_ENV !== "production") {
     [MIXOOR_ERROR__MISSING_TOKEN_ACCOUNT]: `Missing token account`,
     [MIXOOR_ERROR__OVERFLOW]: `Overflow`,
     [MIXOOR_ERROR__POSEIDON_HASH_ERROR]: `Poseidon hash error`,
+    [MIXOOR_ERROR__PUBLIC_INPUT_MISMATCH]: `Public input does not match instruction parameter`,
     [MIXOOR_ERROR__UNKNOWN_ROOT]: `Unknown merkle root`
   };
 }
@@ -822,8 +824,8 @@ function getTransferInstructionDataEncoder() {
         getArrayEncoder(fixEncoderSize(getBytesEncoder(), 32), { size: 7 })
       ],
       ["nullifierHash", fixEncoderSize(getBytesEncoder(), 32)],
-      ["amount", getU64Encoder()],
-      ["fee", getU64Encoder()]
+      ["relayerFee", getU64Encoder()],
+      ["recipientAmount", getU64Encoder()]
     ]),
     (value) => ({ ...value, discriminator: TRANSFER_DISCRIMINATOR })
   );
@@ -839,8 +841,8 @@ function getTransferInstructionDataDecoder() {
       getArrayDecoder(fixDecoderSize(getBytesDecoder(), 32), { size: 7 })
     ],
     ["nullifierHash", fixDecoderSize(getBytesDecoder(), 32)],
-    ["amount", getU64Decoder()],
-    ["fee", getU64Decoder()]
+    ["relayerFee", getU64Decoder()],
+    ["recipientAmount", getU64Decoder()]
   ]);
 }
 function getTransferInstructionDataCodec() {
@@ -896,6 +898,7 @@ async function getTransferInstructionAsync(input, config) {
         getBytesEncoder().encode(
           new Uint8Array([110, 117, 108, 108, 105, 102, 105, 101, 114])
         ),
+        getAddressEncoder().encode(expectAddress(accounts.pool.value)),
         fixEncoderSize(getBytesEncoder(), 32).encode(
           expectSome(args.nullifierHash)
         )
@@ -1167,8 +1170,13 @@ async function generateProof(input) {
     pathIndices: input.pathIndices,
     amount: BigInt(input.amount).toString()
   };
-  const __filename = fileURLToPath(import.meta.url);
-  const __dirname = path.dirname(__filename);
+  let __dirname;
+  if (typeof __filename !== "undefined") {
+    __dirname = path.dirname(__filename);
+  } else {
+    const __filename_esm = fileURLToPath(import.meta.url);
+    __dirname = path.dirname(__filename_esm);
+  }
   const packageRoot = path.join(__dirname, "../..");
   const wasmPath = path.join(
     packageRoot,
@@ -1193,14 +1201,6 @@ async function generateProof(input) {
   const publicInputs = publicSignals.map(
     (signal) => publicSignalToBytes(signal)
   );
-  console.log(
-    "DEBUG: Generated Public Inputs (Keys: root, nullifierHash, recipient, relayer, fee, refund, poolId):"
-  );
-  publicInputs.forEach((input2, i) => {
-    const hexBE = Buffer.from(input2).toString("hex");
-    const hexLE = Buffer.from(input2.slice().reverse()).toString("hex");
-    console.log(`Input ${i}: BE=${hexBE} | LE=${hexLE}`);
-  });
   const proof_a = g1PointToBytes([proof.pi_a[0], proof.pi_a[1]]);
   const proof_b = g2PointToBytes([
     [proof.pi_b[0][0], proof.pi_b[0][1]],
@@ -1359,10 +1359,14 @@ async function findNullifierAddress(seeds, config = {}) {
   const { programAddress = MIXOOR_PROGRAM_ADDRESS } = config;
   return await getProgramDerivedAddress({
     programAddress,
-    seeds: ["nullifier", seeds.nullifierHash]
+    seeds: [
+      "nullifier",
+      getAddressEncoder().encode(seeds.pool),
+      seeds.nullifierHash
+    ]
   });
 }
 
-export { AssetType, DEPOSIT_DISCRIMINATOR, INITIALIZE_POOL_DISCRIMINATOR, MIXOOR_ERROR__INSUFFICIENT_FUNDS, MIXOOR_ERROR__INVALID_AMOUNT, MIXOOR_ERROR__INVALID_ASSET_TYPE, MIXOOR_ERROR__INVALID_MERKLE_PROOF, MIXOOR_ERROR__INVALID_MERKLE_TREE, MIXOOR_ERROR__INVALID_MERKLE_TREE_ADDRESS, MIXOOR_ERROR__INVALID_PROOF, MIXOOR_ERROR__INVALID_PUBLIC_INPUTS, MIXOOR_ERROR__MERKLE_TREE_FULL, MIXOOR_ERROR__MISSING_TOKEN_ACCOUNT, MIXOOR_ERROR__OVERFLOW, MIXOOR_ERROR__POSEIDON_HASH_ERROR, MIXOOR_ERROR__UNKNOWN_ROOT, MIXOOR_PROGRAM_ADDRESS, MerkleTree, MixoorAccount, MixoorInstruction, NULLIFIER_ACCOUNT_DISCRIMINATOR, POOL_DISCRIMINATOR, TRANSFER_DISCRIMINATOR, VAULT_DISCRIMINATOR, decodeNullifierAccount, decodePool, decodeVault, extractMerkleRootFromAccount, fetchAllMaybeNullifierAccount, fetchAllMaybePool, fetchAllMaybeVault, fetchAllNullifierAccount, fetchAllPool, fetchAllVault, fetchMaybeNullifierAccount, fetchMaybePool, fetchMaybeVault, fetchNullifierAccount, fetchPool, fetchVault, findMerkleTreeAddress, findNullifierAddress, findPoolAddress, findVaultAddress, fromHex, generateCommitment, generateNullifier, generateProof, getAssetTypeCodec, getAssetTypeDecoder, getAssetTypeEncoder, getCommitmentInsertedCodec, getCommitmentInsertedDecoder, getCommitmentInsertedEncoder, getDepositDiscriminatorBytes, getDepositInstruction, getDepositInstructionAsync, getDepositInstructionDataCodec, getDepositInstructionDataDecoder, getDepositInstructionDataEncoder, getInitializePoolDiscriminatorBytes, getInitializePoolInstruction, getInitializePoolInstructionAsync, getInitializePoolInstructionDataCodec, getInitializePoolInstructionDataDecoder, getInitializePoolInstructionDataEncoder, getMixoorErrorMessage, getNullifierAccountCodec, getNullifierAccountDecoder, getNullifierAccountDiscriminatorBytes, getNullifierAccountEncoder, getNullifierAccountSize, getPoolCodec, getPoolDecoder, getPoolDiscriminatorBytes, getPoolEncoder, getPoolSize, getRootEntryCodec, getRootEntryDecoder, getRootEntryEncoder, getTransferDiscriminatorBytes, getTransferInstruction, getTransferInstructionAsync, getTransferInstructionDataCodec, getTransferInstructionDataDecoder, getTransferInstructionDataEncoder, getVaultCodec, getVaultDecoder, getVaultDiscriminatorBytes, getVaultEncoder, getVaultSize, identifyMixoorAccount, identifyMixoorInstruction, isMixoorError, parseDepositInstruction, parseInitializePoolInstruction, parseTransferInstruction, poseidonHash, randomBytes, toHex };
+export { AssetType, DEPOSIT_DISCRIMINATOR, INITIALIZE_POOL_DISCRIMINATOR, MIXOOR_ERROR__INSUFFICIENT_FUNDS, MIXOOR_ERROR__INVALID_AMOUNT, MIXOOR_ERROR__INVALID_ASSET_TYPE, MIXOOR_ERROR__INVALID_MERKLE_PROOF, MIXOOR_ERROR__INVALID_MERKLE_TREE, MIXOOR_ERROR__INVALID_MERKLE_TREE_ADDRESS, MIXOOR_ERROR__INVALID_PROOF, MIXOOR_ERROR__INVALID_PUBLIC_INPUTS, MIXOOR_ERROR__MERKLE_TREE_FULL, MIXOOR_ERROR__MISSING_TOKEN_ACCOUNT, MIXOOR_ERROR__OVERFLOW, MIXOOR_ERROR__POSEIDON_HASH_ERROR, MIXOOR_ERROR__PUBLIC_INPUT_MISMATCH, MIXOOR_ERROR__UNKNOWN_ROOT, MIXOOR_PROGRAM_ADDRESS, MerkleTree, MixoorAccount, MixoorInstruction, NULLIFIER_ACCOUNT_DISCRIMINATOR, POOL_DISCRIMINATOR, TRANSFER_DISCRIMINATOR, VAULT_DISCRIMINATOR, decodeNullifierAccount, decodePool, decodeVault, extractMerkleRootFromAccount, fetchAllMaybeNullifierAccount, fetchAllMaybePool, fetchAllMaybeVault, fetchAllNullifierAccount, fetchAllPool, fetchAllVault, fetchMaybeNullifierAccount, fetchMaybePool, fetchMaybeVault, fetchNullifierAccount, fetchPool, fetchVault, findMerkleTreeAddress, findNullifierAddress, findPoolAddress, findVaultAddress, fromHex, generateCommitment, generateNullifier, generateProof, getAssetTypeCodec, getAssetTypeDecoder, getAssetTypeEncoder, getCommitmentInsertedCodec, getCommitmentInsertedDecoder, getCommitmentInsertedEncoder, getDepositDiscriminatorBytes, getDepositInstruction, getDepositInstructionAsync, getDepositInstructionDataCodec, getDepositInstructionDataDecoder, getDepositInstructionDataEncoder, getInitializePoolDiscriminatorBytes, getInitializePoolInstruction, getInitializePoolInstructionAsync, getInitializePoolInstructionDataCodec, getInitializePoolInstructionDataDecoder, getInitializePoolInstructionDataEncoder, getMixoorErrorMessage, getNullifierAccountCodec, getNullifierAccountDecoder, getNullifierAccountDiscriminatorBytes, getNullifierAccountEncoder, getNullifierAccountSize, getPoolCodec, getPoolDecoder, getPoolDiscriminatorBytes, getPoolEncoder, getPoolSize, getRootEntryCodec, getRootEntryDecoder, getRootEntryEncoder, getTransferDiscriminatorBytes, getTransferInstruction, getTransferInstructionAsync, getTransferInstructionDataCodec, getTransferInstructionDataDecoder, getTransferInstructionDataEncoder, getVaultCodec, getVaultDecoder, getVaultDiscriminatorBytes, getVaultEncoder, getVaultSize, identifyMixoorAccount, identifyMixoorInstruction, isMixoorError, parseDepositInstruction, parseInitializePoolInstruction, parseTransferInstruction, poseidonHash, randomBytes, toHex };
 //# sourceMappingURL=index.mjs.map
 //# sourceMappingURL=index.mjs.map