@hinkal/common 0.2.23 → 0.2.25

package/data-structures/Hinkal/hinkalSolanaDepositAndWithdraw.mjs

@@ -59,33 +59,33 @@ import { updateDepositAndWithdrawStatus as ht, safeUpdateDepositAndWithdrawStatu
 const ft = async (t, r, p, d, l, u) => {
   const g = p.map((o) => o + nt(o, l)), {
     hinkalIdl: h,
-    hinkalAddress: y,
+    hinkalAddress: S,
     originalDeployer: s
   } = $[t.getCurrentChainId()].contractData;
   if (!h)
     throw new Error("No IDL configured for Solana program on this network");
   if (!s)
     throw new Error("missing original deployer");
-  const f = t.userKeys.getShieldedPrivateKey(), E = z.findCorrectRandomization(M(31), f), S = ct(E, f), e = t.getSolanaProgram(h), v = t.getSolanaPublicKey(), a = new W(s), A = new W(y), { mintPublicKey: c } = q(r), R = c.toString(), F = tt(A, a), b = ot(A, a), H = rt(A, a), x = et(S), I = t.getCurrentChainId(), D = g.reduce((o, n) => o + n, 0n), T = await pt(
+  const f = t.userKeys.getShieldedPrivateKey(), E = z.findCorrectRandomization(M(31), f), w = ct(E, f), e = t.getSolanaProgram(h), v = t.getSolanaPublicKey(), a = new W(s), A = new W(S), { mintPublicKey: c } = q(r), x = c.toString(), H = tt(A, a), R = ot(A, a), F = rt(A, a), b = et(w), T = t.getCurrentChainId(), D = g.reduce((o, n) => o + n, 0n), I = await pt(
     e,
     new W(a),
     [r],
     [D]
   ), K = g.map((o) => `${o}`);
   let i = "";
-  const P = (await ht(I, {
+  const P = (await ht(T, {
     hashedEthereumAddress: u,
     phase: k.BEFORE_DEPOSIT
   })).id ?? void 0;
-  if (T) {
-    const { serializedTransaction: o, blockhash: n, lastValidBlockHeight: w } = await G.generateMultiPaymentDepositLimitless(
-      I,
+  if (I) {
+    const { serializedTransaction: o, blockhash: n, lastValidBlockHeight: y } = await G.generateMultiPaymentDepositLimitless(
+      T,
       {
         amounts: K,
         payer: t.getSolanaPublicKey().toBase58(),
         ethereumAddress: await t.getEthereumAddress(),
         mint: r,
-        stealthAddressStructure: x
+        stealthAddressStructure: b
       }
     ), { wallet: m } = e.provider;
     if (!m)
@@ -94,23 +94,23 @@ const ft = async (t, r, p, d, l, u) => {
       e.provider,
       o,
       n,
-      w
+      y
     );
   } else {
-    const o = at(e.programId, a, c), n = R === U ? null : c, w = R === U ? null : void 0;
+    const o = at(e.programId, a, c), n = x === U ? null : c, y = x === U ? null : void 0;
     i = await e.methods.multiPaymentDeposit(
       K.map((V) => new Q(V)),
-      x
+      b
     ).accounts({
       mint: n,
       signer: v,
-      signerAta: w,
+      signerAta: y,
       originalDeployer: a,
-      storageAccount: F,
-      storageVault: b,
-      merkleAccount: H,
+      storageAccount: H,
+      storageVault: R,
+      merkleAccount: F,
       tokenLimitStorage: o,
-      storageVaultAta: w,
+      storageVaultAta: y,
       accessTokenOwner: null
     }).rpc();
     const m = await e.provider.connection.getLatestBlockhash();
@@ -129,7 +129,7 @@ const ft = async (t, r, p, d, l, u) => {
   });
   if (!B)
     throw new Error("Transaction missing");
-  await N(I, {
+  await N(T, {
     id: P,
     hashedEthereumAddress: u,
     phase: k.AFTER_DEPOSIT,
@@ -137,45 +137,45 @@ const ft = async (t, r, p, d, l, u) => {
   });
   const L = dt(B, e, t.userKeys), O = [], C = [...L];
   return d.forEach((o, n) => {
-    const w = g[n], m = C.find((X) => X.amount === w);
+    const y = g[n], m = C.find((X) => X.amount === y);
     if (!m)
-      throw new Error(`Could not find newly created UTXO with amount ${w} for recipient ${o}.`);
+      throw new Error(`Could not find newly created UTXO with amount ${y} for recipient ${o}.`);
     O.push({
       recipientAddress: o,
       utxo: m
     });
     const V = C.indexOf(m);
     C.splice(V, 1);
-  }), { userDepositedUtxos: O, signature: i, statusId: P };
+  }), { userDepositedUtxos: O, depositTxHash: i, statusId: P };
 }, wt = async (t, r, p, d, l, u, g, h) => {
-  const y = t.getCurrentChainId();
+  const S = t.getCurrentChainId();
   if (p.length === 0)
     throw new Error("userDepositedUtxos must not be empty");
   const { hinkalIdl: s, originalDeployer: f } = $[t.getCurrentChainId()].contractData;
   if (!f || !s)
     throw new Error("missing data");
-  const E = t.getSolanaProgram(s), S = await t.getRandomRelay(!0);
-  if (!S)
+  const E = t.getSolanaProgram(s), w = await t.getRandomRelay(!0);
+  if (!w)
     throw new Error(Y.RELAYER_NOT_AVAILABLE);
   const e = it().toString(), v = t.generateProofRemotely ? 5 : 1, a = [];
   for (let c = 0; c < p.length; c += v) {
-    const R = p.slice(c, c + v), F = await Promise.all(
-      R.map(async ({ recipientAddress: b, utxo: H }) => {
-        const { compressedAddress: x } = q(U), I = new z({
+    const x = p.slice(c, c + v), H = await Promise.all(
+      x.map(async ({ recipientAddress: R, utxo: F }) => {
+        const { compressedAddress: b } = q(U), T = new z({
           amount: 0n,
           mintAddress: r,
-          erc20TokenAddress: x,
+          erc20TokenAddress: b,
           shieldedPrivateKey: t.userKeys.getShieldedPrivateKey(),
           timeStamp: e,
           tokenId: 0
-        }), D = [H, I], T = [I], K = z.findCorrectRandomization(
+        }), D = [F, T], I = [T], K = z.findCorrectRandomization(
           M(31),
           t.userKeys.getShieldedPrivateKey()
         ), i = {
           tokenNumber: 1,
           nullifierAmount: D.length,
-          outputAmount: T.length
-        }, _ = mt([T])[0][0], P = Array.from(Z.getBytes(_)), { proofAArr: B, proofBArr: L, proofCArr: O, publicInputsArr: C } = await lt(
+          outputAmount: I.length
+        }, _ = mt([I])[0][0], P = Array.from(Z.getBytes(_)), { proofAArr: B, proofBArr: L, proofCArr: O, publicInputsArr: C } = await lt(
           t.generateProofRemotely,
           f,
           t.merkleTreeHinkal,
@@ -184,12 +184,12 @@ const ft = async (t, r, p, d, l, u) => {
           E,
           [r],
           [D],
-          [T],
+          [I],
           K,
           d.flatFee,
           d.variableRate,
-          b,
-          S,
+          R,
+          w,
           i,
           [P],
           t.getCurrentChainId(),
@@ -200,11 +200,11 @@ const ft = async (t, r, p, d, l, u) => {
           void 0,
           !1
         ), n = {
-          recipient: b,
+          recipient: R,
           mint: r === U ? void 0 : r
         };
         return {
-          relayAddress: S,
+          relayAddress: w,
           functionName: "transact",
           args: {
             proofAArr: B,
@@ -219,9 +219,9 @@ const ft = async (t, r, p, d, l, u) => {
         };
       })
     );
-    a.push(...F);
+    a.push(...H);
   }
-  await N(y, {
+  await N(S, {
     id: u,
     hashedEthereumAddress: l,
     phase: k.BEFORE_SCHEDULE_WITHDRAW
@@ -233,14 +233,14 @@ const ft = async (t, r, p, d, l, u) => {
     g,
     h
   );
-  return await N(y, {
+  return await N(S, {
     id: u,
     hashedEthereumAddress: l,
     phase: k.AFTER_SCHEDULE_WITHDRAW,
     scheduleId: A
   }), A;
-}, To = async (t, r, p, d, l, u, g) => {
-  const h = j(await t.getEthereumAddress()), y = t.getCurrentChainId(), s = u ?? await gt(y, r, [r], J.Transact, [], 0n), { userDepositedUtxos: f, statusId: E } = await ft(
+}, Io = async (t, r, p, d, l, u, g) => {
+  const h = j(await t.getEthereumAddress()), S = t.getCurrentChainId(), s = u ?? await gt(S, r, [r], J.Transact, [], 0n), { userDepositedUtxos: f, statusId: E, depositTxHash: w } = await ft(
     t,
     r,
     p,
@@ -257,8 +257,8 @@ const ft = async (t, r, p, d, l, u) => {
     E,
     l,
     g
-  );
+  ), w;
 };
 export {
-  To as hinkalSolanaDepositAndWithdraw
+  Io as hinkalSolanaDepositAndWithdraw
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hinkal/common",
-  "version": "0.2.23",
+  "version": "0.2.25",
   "homepage": "hinkal.io",
   "author": {
     "name": "Hinkal Protocol"