@smithii_io/mixoor 0.0.9 → 0.0.11

package/dist/src/index.mjs

@@ -1,4 +1,4 @@
-import { fixEncoderSize, getBytesEncoder, transformEncoder, getStructEncoder, getI64Encoder, getStructDecoder, fixDecoderSize, getI64Decoder, getBytesDecoder, combineCodec, decodeAccount, assertAccountExists, fetchEncodedAccount, assertAccountsExist, fetchEncodedAccounts, getEnumEncoder, getEnumDecoder, getU32Encoder, getAddressEncoder, getU32Decoder, getAddressDecoder, getArrayEncoder, getU64Encoder, getU8Encoder, getArrayDecoder, getU64Decoder, getU8Decoder, containsBytes, isProgramError, getProgramDerivedAddress, AccountRole, upgradeRoleToSigner, isTransactionSigner as isTransactionSigner$1 } from '@solana/kit';
+import { fixEncoderSize, getBytesEncoder, transformEncoder, getStructEncoder, getI64Encoder, getStructDecoder, fixDecoderSize, getI64Decoder, getBytesDecoder, combineCodec, decodeAccount, assertAccountExists, fetchEncodedAccount, assertAccountsExist, fetchEncodedAccounts, getEnumEncoder, getEnumDecoder, getU32Encoder, getAddressEncoder, getU32Decoder, getAddressDecoder, getArrayEncoder, getU64Encoder, getU8Encoder, getArrayDecoder, getU64Decoder, getU8Decoder, containsBytes, isProgramError, getProgramDerivedAddress, getEnumCodec, AccountRole, upgradeRoleToSigner, isTransactionSigner as isTransactionSigner$1 } from '@solana/kit';
 import { buildPoseidon } from 'circomlibjs';
 import * as fs from 'fs';
 import * as path from 'path';
@@ -150,7 +150,7 @@ function getPoolEncoder() {
       ["mint", getAddressEncoder()],
       ["vault", getAddressEncoder()],
       ["feeCollector", getAddressEncoder()],
-      ["rootHistory", getArrayEncoder(getRootEntryEncoder(), { size: 30 })],
+      ["rootHistory", getArrayEncoder(getRootEntryEncoder(), { size: 50 })],
       ["totalDeposited", getU64Encoder()],
       ["totalWithdrawn", getU64Encoder()],
       ["nextLeafIndex", getU32Encoder()],
@@ -169,7 +169,7 @@ function getPoolDecoder() {
     ["mint", getAddressDecoder()],
     ["vault", getAddressDecoder()],
     ["feeCollector", getAddressDecoder()],
-    ["rootHistory", getArrayDecoder(getRootEntryDecoder(), { size: 30 })],
+    ["rootHistory", getArrayDecoder(getRootEntryDecoder(), { size: 50 })],
     ["totalDeposited", getU64Decoder()],
     ["totalWithdrawn", getU64Decoder()],
     ["nextLeafIndex", getU32Decoder()],
@@ -207,7 +207,7 @@ async function fetchAllMaybePool(rpc, addresses, config) {
   return maybeAccounts.map((maybeAccount) => decodePool(maybeAccount));
 }
 function getPoolSize() {
-  return 1360;
+  return 2160;
 }
 var VAULT_DISCRIMINATOR = new Uint8Array([
   211,
@@ -263,7 +263,7 @@ async function fetchAllMaybeVault(rpc, addresses, config) {
 function getVaultSize() {
   return 8;
 }
-var MIXOOR_PROGRAM_ADDRESS = "mixmC791jTymqvJR2Zgvd8NAvXpXw99GdCW5uQcMBj8";
+var MIXOOR_PROGRAM_ADDRESS = "mixEcfx7w47hvRwb9Nj7UeSQkCz6vZMbRHixMyYMLMb";
 var MixoorAccount = /* @__PURE__ */ ((MixoorAccount2) => {
   MixoorAccount2[MixoorAccount2["NullifierAccount"] = 0] = "NullifierAccount";
   MixoorAccount2[MixoorAccount2["Pool"] = 1] = "Pool";
@@ -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`
   };
 }
@@ -668,7 +670,8 @@ async function getInitializePoolInstructionAsync(input, config) {
       programAddress,
       seeds: [
         getBytesEncoder().encode(new Uint8Array([112, 111, 111, 108])),
-        getAddressEncoder().encode(expectAddress(accounts.mint.value))
+        getAddressEncoder().encode(expectAddress(accounts.mint.value)),
+        getAssetTypeEncoder().encode(expectSome(args.assetType))
       ]
     });
   }
@@ -822,8 +825,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 +842,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 +899,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)
         )
@@ -1198,14 +1202,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]],
@@ -1343,7 +1339,11 @@ async function findPoolAddress(seeds, config = {}) {
   const { programAddress = MIXOOR_PROGRAM_ADDRESS } = config;
   return await getProgramDerivedAddress({
     programAddress,
-    seeds: ["pool", getAddressEncoder().encode(seeds.mint)]
+    seeds: [
+      "pool",
+      getAddressEncoder().encode(seeds.mint),
+      getEnumCodec(AssetType).encode(seeds.assetType)
+    ]
   });
 }
 async function findMerkleTreeAddress(seeds, config = {}) {
@@ -1364,10 +1364,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