@smithii_io/mixoor 0.0.9 → 0.0.11

package/circuits/verification_key.json

@@ -1,124 +1,115 @@
 {
- "protocol": "groth16",
- "curve": "bn128",
- "nPublic": 7,
- "vk_alpha_1": [
-  "5546433345559129444237190777830761250332113749146486872468235040665291734547",
-  "13963905734702601515485862894046335164180959786365513804837155437966338284436",
-  "1"
- ],
- "vk_beta_2": [
-  [
-   "21412145793220292067859405918112107716359293542119378539352891116432217911143",
-   "2611966564152221085363047640833318876719586724975105066179882056173108088903"
+  "protocol": "groth16",
+  "curve": "bn128",
+  "nPublic": 7,
+  "vk_alpha_1": [
+    "10682077369620390470672191943941755806401562773406118168125211005198142236229",
+    "18516280274548043265075789800457661020967268084471806959300470959610232621362",
+    "1"
   ],
-  [
-   "5683913335783624892102444117130791035155207942152776919376767806572080471466",
-   "20424418561484727324565184652251513974075649083989440164478053411013464042109"
+  "vk_beta_2": [
+    [
+      "1721186449098360879715205785763954946450032460477406779451565366651601272997",
+      "15975801424202176299743118874578724262799622074807931890167230307041296454694"
+    ],
+    [
+      "768812259572708274067987333022194397471490825841210597153387150410437539788",
+      "12314575679613070604619946798376425642024326214433278915467225005027639469645"
+    ],
+    ["1", "0"]
   ],
-  [
-   "1",
-   "0"
-  ]
- ],
- "vk_gamma_2": [
-  [
-   "10857046999023057135944570762232829481370756359578518086990519993285655852781",
-   "11559732032986387107991004021392285783925812861821192530917403151452391805634"
-  ],
-  [
-   "8495653923123431417604973247489272438418190587263600148770280649306958101930",
-   "4082367875863433681332203403145435568316851327593401208105741076214120093531"
-  ],
-  [
-   "1",
-   "0"
-  ]
- ],
- "vk_delta_2": [
-  [
-   "14990800869627850257893476139502138886842300073782552416527527220211999051021",
-   "12019227350316302784523778352691865318953394316697895104204947035916007498199"
-  ],
-  [
-   "4782487834358741961569897821318547231280402135966285712520334657603277542574",
-   "2749538355489199106712219902886462447683742227659308580079039377096586499583"
-  ],
-  [
-   "1",
-   "0"
-  ]
- ],
- "vk_alphabeta_12": [
-  [
-   [
-    "16004604140728965578138661638211594037063293277199793332563710415107506403520",
-    "11147560166332981252925195150980455467875144655505899867249798224526410047168"
-   ],
-   [
-    "6885248949178366070388253878092568893637466600168081265843685606931844530240",
-    "16338979583697105458788164829930805615704040650316790143822770401021791453011"
-   ],
-   [
-    "16999255288466657357929768473293392136087902628034586995869476993675858607964",
-    "17319716874845868217639405801798359751259784577964908873054359885398726572212"
-   ]
-  ],
-  [
-   [
-    "16065932114393349213400212155432985804364119886372730654401480458147339753454",
-    "19492410405735392736025405612326078134005714512479382795304779697851446975052"
-   ],
-   [
-    "19316995995129947188171619844923027852024324073427133485549527394782130881463",
-    "15152158843247135514589563238821772760234127722300614674014602048664122417314"
-   ],
-   [
-    "4413911027750469686293381147712195016200499995285328063918209101558201901380",
-    "13756379472300325575468067886046279096717793365882446758762570308974885229873"
-   ]
-  ]
- ],
- "IC": [
-  [
-   "3949268453856671477837944156738550879784344849318952569404254752776571543558",
-   "18880214408650637025151652959348151451776787379955660714374817103157848430447",
-   "1"
-  ],
-  [
-   "7595383299465162355762836247608390932868047357866691105205992865750052290945",
-   "20433437015153212901089547709024839459004759345208190123539659491221344306189",
-   "1"
-  ],
-  [
-   "13374632508151173855086275271447357852814774320197819996760809172154184804557",
-   "16243978781153453546157051308457933764757039947655668837125687410464695287676",
-   "1"
-  ],
-  [
-   "5100006802904210985453765707472395269225543487583823550337192150736970528292",
-   "11422826625115544450768095068673594582668285010128785727772989005420123848364",
-   "1"
-  ],
-  [
-   "6372192181718433266625543056882793633891933831629698322649596298241635548389",
-   "1709100153456215113738425147889192593829068042544692876702518987995366013294",
-   "1"
+  "vk_gamma_2": [
+    [
+      "10857046999023057135944570762232829481370756359578518086990519993285655852781",
+      "11559732032986387107991004021392285783925812861821192530917403151452391805634"
+    ],
+    [
+      "8495653923123431417604973247489272438418190587263600148770280649306958101930",
+      "4082367875863433681332203403145435568316851327593401208105741076214120093531"
+    ],
+    ["1", "0"]
   ],
-  [
-   "19023554220556579593405142750585200583727431288001850956526899901383498587894",
-   "18297669907692343833002904807534260395539852692277207966597076894953025600140",
-   "1"
+  "vk_delta_2": [
+    [
+      "11288288598486280333888896815388982141923920071063235530573263155299681574663",
+      "20204709969587071650290879313621593092672746746019171366651596352828588169015"
+    ],
+    [
+      "16028446280144140733417863155990994277946461311560136943295621069314843993463",
+      "13219556331739353167326336871085263223517435300657854349663555662288681302820"
+    ],
+    ["1", "0"]
   ],
-  [
-   "8941916294769993668611112875396217591149851648038239397926633496081198913978",
-   "9988646368972541886335809760033327451475524812702990285260789674301170666927",
-   "1"
+  "vk_alphabeta_12": [
+    [
+      [
+        "9518393467030687778362421976414365543442395444074114717946109423555856390800",
+        "10494959380723343697407652664710741755507871538095970815698653867876454444460"
+      ],
+      [
+        "21707761660911474091257886735768318442459314721770099121620404251246606795918",
+        "20298782457644837729671984411114036654961751675881335324009014602862417708496"
+      ],
+      [
+        "11521001865771922669452267308933996867023570860304919440000362482946247816571",
+        "15688401513242912467371425405728069066161657347478477258423528592888793863046"
+      ]
+    ],
+    [
+      [
+        "17926964466292241307753679690071545611894135095194611278005300459638735985275",
+        "4294893626773636618729713105095130779223800196533566051625817280313404966262"
+      ],
+      [
+        "10904353822845988768072629637622809686476950637689044427798094714297050913553",
+        "11281209735348744001516242567334022729276183574028464182923678770132768229384"
+      ],
+      [
+        "1756564607795176477222752371032854291139593544552439699787324126232466385418",
+        "9981039337733913835270922061423936011994489455127830453076124991671391188899"
+      ]
+    ]
   ],
-  [
-   "1442460910073871138127576487044360633238044344422191659635689177249834998473",
-   "14346911267655939600069210937090128179049312695187836316371484475583295682383",
-   "1"
+  "IC": [
+    [
+      "20900658727185368861189514638640394334687544907429003224592977157339464086399",
+      "8404536624604833207697675211543991349815864918911893838947144025192618330306",
+      "1"
+    ],
+    [
+      "6608587653630007035440323386802184877437336970939721453016507018215158477721",
+      "6849722319551100654606971003136630622999162217818215653480003984933738191350",
+      "1"
+    ],
+    [
+      "17314278680230802744556788650287395270877776058258795875397726285390368761769",
+      "8538456233993825786511409342233924822486233013209564644051142048898858014462",
+      "1"
+    ],
+    [
+      "2379791508054612066223968488060803268212351162467242184911036096789433279574",
+      "9294447565247345541626090703957177969390258948149368176400159038909870325052",
+      "1"
+    ],
+    [
+      "11634073295286663567488987523044607222026400804941157797325897067133160732987",
+      "4411574583372809640582532197134768896724830303468704698621344226310034980457",
+      "1"
+    ],
+    [
+      "1051309528532532181495401458524320915480800154043197311568239379175701995237",
+      "16049650041774514901903699946886420271437149091901188280115629660280394231382",
+      "1"
+    ],
+    [
+      "10765307682165219589500307233502571823837307903862854252412437845558662033180",
+      "5810241881886990319631921824916908518649587202772244188940553300875033523615",
+      "1"
+    ],
+    [
+      "21390118222734437031030539323317055818291450854673372268124653216684520473972",
+      "20379989733267052681730672792521850270626738173993553817946684140254030745648",
+      "1"
+    ]
   ]
- ]
-}
+}

package/dist/src/index.js

@@ -174,7 +174,7 @@ function getPoolEncoder() {
       ["mint", kit.getAddressEncoder()],
       ["vault", kit.getAddressEncoder()],
       ["feeCollector", kit.getAddressEncoder()],
-      ["rootHistory", kit.getArrayEncoder(getRootEntryEncoder(), { size: 30 })],
+      ["rootHistory", kit.getArrayEncoder(getRootEntryEncoder(), { size: 50 })],
       ["totalDeposited", kit.getU64Encoder()],
       ["totalWithdrawn", kit.getU64Encoder()],
       ["nextLeafIndex", kit.getU32Encoder()],
@@ -193,7 +193,7 @@ function getPoolDecoder() {
     ["mint", kit.getAddressDecoder()],
     ["vault", kit.getAddressDecoder()],
     ["feeCollector", kit.getAddressDecoder()],
-    ["rootHistory", kit.getArrayDecoder(getRootEntryDecoder(), { size: 30 })],
+    ["rootHistory", kit.getArrayDecoder(getRootEntryDecoder(), { size: 50 })],
     ["totalDeposited", kit.getU64Decoder()],
     ["totalWithdrawn", kit.getU64Decoder()],
     ["nextLeafIndex", kit.getU32Decoder()],
@@ -231,7 +231,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,
@@ -287,7 +287,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";
@@ -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`
   };
 }
@@ -692,7 +694,8 @@ async function getInitializePoolInstructionAsync(input, config) {
       programAddress,
       seeds: [
         kit.getBytesEncoder().encode(new Uint8Array([112, 111, 111, 108])),
-        kit.getAddressEncoder().encode(expectAddress(accounts.mint.value))
+        kit.getAddressEncoder().encode(expectAddress(accounts.mint.value)),
+        getAssetTypeEncoder().encode(expectSome(args.assetType))
       ]
     });
   }
@@ -846,8 +849,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 +866,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 +923,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 +1226,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]],
@@ -1367,7 +1363,11 @@ async function findPoolAddress(seeds, config = {}) {
   const { programAddress = MIXOOR_PROGRAM_ADDRESS } = config;
   return await kit.getProgramDerivedAddress({
     programAddress,
-    seeds: ["pool", kit.getAddressEncoder().encode(seeds.mint)]
+    seeds: [
+      "pool",
+      kit.getAddressEncoder().encode(seeds.mint),
+      kit.getEnumCodec(AssetType).encode(seeds.assetType)
+    ]
   });
 }
 async function findMerkleTreeAddress(seeds, config = {}) {
@@ -1388,7 +1388,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 +1411,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;