@smithii_io/mixoor 0.0.9 → 0.0.10

package/dist/src/index.js

@@ -381,6 +381,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 = {
@@ -396,6 +397,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`
   };
 }
@@ -846,8 +848,8 @@ function getTransferInstructionDataEncoder() {
         kit.getArrayEncoder(kit.fixEncoderSize(kit.getBytesEncoder(), 32), { size: 7 })
       ],
       ["nullifierHash", kit.fixEncoderSize(kit.getBytesEncoder(), 32)],
-      ["amount", kit.getU64Encoder()],
-      ["fee", kit.getU64Encoder()]
+      ["relayerFee", kit.getU64Encoder()],
+      ["recipientAmount", kit.getU64Encoder()]
     ]),
     (value) => ({ ...value, discriminator: TRANSFER_DISCRIMINATOR })
   );
@@ -863,8 +865,8 @@ function getTransferInstructionDataDecoder() {
       kit.getArrayDecoder(kit.fixDecoderSize(kit.getBytesDecoder(), 32), { size: 7 })
     ],
     ["nullifierHash", kit.fixDecoderSize(kit.getBytesDecoder(), 32)],
-    ["amount", kit.getU64Decoder()],
-    ["fee", kit.getU64Decoder()]
+    ["relayerFee", kit.getU64Decoder()],
+    ["recipientAmount", kit.getU64Decoder()]
   ]);
 }
 function getTransferInstructionDataCodec() {
@@ -920,6 +922,7 @@ async function getTransferInstructionAsync(input, config) {
         kit.getBytesEncoder().encode(
           new Uint8Array([110, 117, 108, 108, 105, 102, 105, 101, 114])
         ),
+        kit.getAddressEncoder().encode(expectAddress(accounts.pool.value)),
         kit.fixEncoderSize(kit.getBytesEncoder(), 32).encode(
           expectSome(args.nullifierHash)
         )
@@ -1222,14 +1225,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]],
@@ -1388,7 +1383,11 @@ async function findNullifierAddress(seeds, config = {}) {
   const { programAddress = MIXOOR_PROGRAM_ADDRESS } = config;
   return await kit.getProgramDerivedAddress({
     programAddress,
-    seeds: ["nullifier", seeds.nullifierHash]
+    seeds: [
+      "nullifier",
+      kit.getAddressEncoder().encode(seeds.pool),
+      seeds.nullifierHash
+    ]
   });
 }
 
@@ -1407,6 +1406,7 @@ exports.MIXOOR_ERROR__MERKLE_TREE_FULL = MIXOOR_ERROR__MERKLE_TREE_FULL;
 exports.MIXOOR_ERROR__MISSING_TOKEN_ACCOUNT = MIXOOR_ERROR__MISSING_TOKEN_ACCOUNT;
 exports.MIXOOR_ERROR__OVERFLOW = MIXOOR_ERROR__OVERFLOW;
 exports.MIXOOR_ERROR__POSEIDON_HASH_ERROR = MIXOOR_ERROR__POSEIDON_HASH_ERROR;
+exports.MIXOOR_ERROR__PUBLIC_INPUT_MISMATCH = MIXOOR_ERROR__PUBLIC_INPUT_MISMATCH;
 exports.MIXOOR_ERROR__UNKNOWN_ROOT = MIXOOR_ERROR__UNKNOWN_ROOT;
 exports.MIXOOR_PROGRAM_ADDRESS = MIXOOR_PROGRAM_ADDRESS;
 exports.MerkleTree = MerkleTree;