@hinkal/common 0.2.22 → 0.2.23

package/data-structures/Hinkal/hinkalSolanaSwap.mjs

@@ -1,9 +1,8 @@
 import "../../types/circom-data.types.mjs";
-import { ExternalActionId as rt } from "../../types/external-action.types.mjs";
+import { ExternalActionId as ot } from "../../types/external-action.types.mjs";
 import { solanaNativeAddress as A } from "../../constants/protocol.constants.mjs";
-import "../../types/transactions.types.mjs";
 import "../../types/activities.types.mjs";
-import { StorageKeys as ot } from "../../types/cache.types.mjs";
+import { StorageKeys as rt } from "../../types/cache.types.mjs";
 import { addPaddingToUtxos as nt } from "../../functions/web3/events/getShieldedBalance.mjs";
 import { outputUtxoProcessing as st } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
 import { getCurrentTimeInSeconds as at } from "../../functions/utils/time.utils.mjs";
@@ -20,26 +19,26 @@ import { solanaTransactCallRelayer as wt } from "../../functions/web3/functionCa
 import { transactionErrorCodes as Tt } from "../../error-handling/error-codes.constants.mjs";
 import { shouldPatchAccessTokenMerkleTree as It } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
 import { ethers as Pt } from "ethers";
-const qt = async (e, o, r, f, E, x, K, R, h = !1) => {
+const Mt = async (e, r, o, f, E, x, K, R, h = !1) => {
   if (h)
     throw new Error("onlyGasEstimate is not supported for Solana swap");
   const i = e.getCurrentChainId(), y = new a(A), { hinkalAddress: v, originalDeployer: c, hinkalIdl: S } = mt[i].contractData;
   if (!c || !S)
     throw new Error("No IDL configured for Solana program on this network");
-  const m = new a(c), u = new a(v), n = o.map((t) => t.erc20TokenAddress), { userKeys: w, merkleTreeAccessToken: F, merkleTreeHinkal: N } = e, D = e.getSolanaProgram(S), s = R ?? await it(i, K, n, rt.Transact), { patchAccessTokenMerkleTree: O, kycRequired: U, hasAccessToken: L } = await It(
+  const m = new a(c), u = new a(v), n = r.map((t) => t.erc20TokenAddress), { userKeys: w, merkleTreeAccessToken: F, merkleTreeHinkal: N } = e, D = e.getSolanaProgram(S), s = R ?? await it(i, K, n, ot.Transact), { patchAccessTokenMerkleTree: O, kycRequired: U, hasAccessToken: B } = await It(
     e,
     n,
-    r
+    o
   );
-  r[1] -= s.flatFee;
-  const B = s.variableRate.toString(), C = Number(e.cacheDevice.get(ot.SLIPPAGE_PERCENTAGE) ?? 0), p = o[1], V = At(p, r[1]), G = Number(V) * C / 100;
-  r[1] -= ft(p, G.toFixed(p.decimals));
-  const l = [...await nt(e, n, r, 6)], W = at().toString(), _ = e.userKeys.getShieldedPrivateKey(), d = [];
+  o[1] -= s.flatFee;
+  const L = s.variableRate.toString(), C = Number(e.cacheDevice.get(rt.SLIPPAGE_PERCENTAGE) ?? 0), p = r[1], V = At(p, o[1]), G = Number(V) * C / 100;
+  o[1] -= ft(p, G.toFixed(p.decimals));
+  const l = [...await nt(e, n, o, 6)], W = at().toString(), _ = e.userKeys.getShieldedPrivateKey(), d = [];
   for (let t = 0; t < n.length; t += 1) {
     const { outputUtxos: et } = st(
       e.userKeys,
       l[t],
-      r[t],
+      o[t],
       W,
       void 0,
       !1
@@ -50,10 +49,10 @@ const qt = async (e, o, r, f, E, x, K, R, h = !1) => {
     tokenNumber: 2,
     nullifierAmount: l[0].length,
     outputAmount: 1
-  }, H = [!1, !0].slice(0, r.length), g = await e.getRandomRelay(!0);
+  }, H = [!1, !0].slice(0, o.length), g = await e.getRandomRelay(!0);
   if (!g)
     throw Error(Tt.RELAYER_NOT_AVAILABLE);
-  const I = ct(d).map((t) => [...Pt.utils.arrayify(t[0])]), P = ut(u, m, f), { remainingAccounts: b, hinkalInstructions: k } = St(E, P), { proofAArr: M, proofBArr: q, proofCArr: X, publicInputsArr: Y } = await dt(
+  const I = ct(d).map((t) => [...Pt.getBytes(t[0])]), P = ut(u, m, f), { remainingAccounts: b, hinkalInstructions: k } = St(E, P), { proofAArr: M, proofBArr: q, proofCArr: X, publicInputsArr: Y } = await dt(
     e.generateProofRemotely,
     c,
     N,
@@ -76,7 +75,7 @@ const qt = async (e, o, r, f, E, x, K, R, h = !1) => {
     f,
     k,
     b
-  ), Z = pt(u, m), j = lt(u, m), J = o[0].erc20TokenAddress !== A ? new a(o[0].erc20TokenAddress) : null, Q = o[1].erc20TokenAddress !== A ? new a(o[1].erc20TokenAddress) : null, $ = {
+  ), Z = pt(u, m), j = lt(u, m), J = r[0].erc20TokenAddress !== A ? new a(r[0].erc20TokenAddress) : null, Q = r[1].erc20TokenAddress !== A ? new a(r[1].erc20TokenAddress) : null, $ = {
     recipient: y.toString(),
     storageAccount: Z.toString(),
     storageVault: j.toString(),
@@ -96,7 +95,7 @@ const qt = async (e, o, r, f, E, x, K, R, h = !1) => {
     proofCArr: X,
     publicInputsArr: Y,
     relayerFee: s.flatFee.toString(),
-    variableRate: B,
+    variableRate: L,
     dimensions: T,
     hinkalInstructions: k.map((t) => ({
       accountIndexes: [...t.accountIndexes],
@@ -109,12 +108,12 @@ const qt = async (e, o, r, f, E, x, K, R, h = !1) => {
     functionName: "swap",
     args: tt,
     accounts: $,
-    solanaAccessTokenData: !L && U ? {
+    solanaAccessTokenData: !B && U ? {
       ethereumAddress: await e.getEthereumAddress(),
       accessKey: w.getAccessKey()
     } : void 0
   });
 };
 export {
-  qt as hinkalSolanaSwap
+  Mt as hinkalSolanaSwap
 };

package/data-structures/Hinkal/hinkalSolanaTransfer.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../types/circom-data.types.cjs");const z=require("../../types/external-action.types.cjs"),c=require("../../constants/protocol.constants.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");const D=require("../../functions/web3/events/getShieldedBalance.cjs"),M=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),j=require("../../functions/utils/time.utils.cjs"),u=require("../../error-handling/error-codes.constants.cjs"),H=require("../../functions/pre-transaction/getFeeStructure.cjs"),Z=require("../../functions/snarkjs/common.snarkjs.cjs"),Y=require("../../functions/snarkjs/constructSolanaZkProof.cjs"),I=require("../utxo/Utxo.cjs"),G=require("../../functions/web3/etherFunctions.cjs"),J=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),Q=require("../../functions/utils/addresses.cjs"),W=require("../../constants/chains.constants.cjs"),X=require("ethers"),$=async(e,R,t,d,S,q,l=!1)=>{if(l)throw new Error("onlyGasEstimate is not supported for Solana transfer");if(!Q.isValidPrivateAddress(d))throw Error(u.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);const n=e.getCurrentChainId(),{originalDeployer:p,hinkalIdl:A}=W.networkRegistry[n].contractData;if(!p||!A)throw new Error("missing data");const{userKeys:_,merkleTreeAccessToken:w,merkleTreeHinkal:x}=e,r=R.map(i=>i.erc20TokenAddress);if(r.length>1)throw new Error("Solana Transfer: Only one mint address is supported");const N=q??await H.getFeeStructure(n,S,r,z.ExternalActionId.Transact),a=-t[0]*(10000n-c.HINKAL_PRIVATE_SEND_VARIABLE_RATE)/10000n;if(t[0]-=N.flatFee,a<=0n)throw Error(u.transactionErrorCodes.RECIPIENT_AMOUNT_INVALID);const m=-t[0]-a,o=(await D.addPaddingToUtxos(e,r,t,6))[0],y=j.getCurrentTimeInSeconds().toString(),{outputUtxos:P}=M.outputUtxoProcessing(e.userKeys,o,t[0],y,void 0,!1),f=P[0],[C,O,U]=d.split(","),g=new I.Utxo({amount:a,erc20TokenAddress:o[0].erc20TokenAddress,mintAddress:o[0].mintAddress,timeStamp:y,randomization:BigInt(C),stealthAddress:O,encryptionKey:U}),s=await e.getRandomRelay(!l);if(!s)throw Error(u.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const h=I.Utxo.findCorrectRandomization(G.randomBigInt(31),e.userKeys.getShieldedPrivateKey()),E={tokenNumber:r.length,nullifierAmount:o.length,outputAmount:2},k=e.getSolanaProgram(A),T=Z.calcEncryptedOutputs([[f,g]])[0].map(i=>Array.from(X.ethers.utils.arrayify(i))),{proofAArr:v,proofBArr:B,proofCArr:F,publicInputsArr:K}=await Y.constructSolanaZkProof(e.generateProofRemotely,p,x,w,_,k,[r[0]],[o],[[f,g]],h,m,0n,c.solanaNativeAddress,s,E,T,n),L=r[0]===c.solanaNativeAddress,V={recipient:s,mint:L?void 0:r[0]},b={proofAArr:v,proofBArr:B,proofCArr:F,publicInputsArr:K,encryptedOutputs:T,relayerFee:m.toString(),dimensions:E};return J.solanaTransactCallRelayer(n,{relayAddress:s,functionName:"transfer",args:b,accounts:V})};exports.hinkalSolanaTransfer=$;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../types/circom-data.types.cjs");const z=require("../../types/external-action.types.cjs"),c=require("../../constants/protocol.constants.cjs");require("../../types/activities.types.cjs");const D=require("../../functions/web3/events/getShieldedBalance.cjs"),M=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),j=require("../../functions/utils/time.utils.cjs"),u=require("../../error-handling/error-codes.constants.cjs"),H=require("../../functions/pre-transaction/getFeeStructure.cjs"),Z=require("../../functions/snarkjs/common.snarkjs.cjs"),Y=require("../../functions/snarkjs/constructSolanaZkProof.cjs"),I=require("../utxo/Utxo.cjs"),G=require("../../functions/web3/etherFunctions.cjs"),J=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),Q=require("../../functions/utils/addresses.cjs"),W=require("../../constants/chains.constants.cjs"),X=require("ethers"),$=async(e,R,r,d,S,q,l=!1)=>{if(l)throw new Error("onlyGasEstimate is not supported for Solana transfer");if(!Q.isValidPrivateAddress(d))throw Error(u.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);const n=e.getCurrentChainId(),{originalDeployer:p,hinkalIdl:A}=W.networkRegistry[n].contractData;if(!p||!A)throw new Error("missing data");const{userKeys:_,merkleTreeAccessToken:w,merkleTreeHinkal:x}=e,t=R.map(i=>i.erc20TokenAddress);if(t.length>1)throw new Error("Solana Transfer: Only one mint address is supported");const N=q??await H.getFeeStructure(n,S,t,z.ExternalActionId.Transact),a=-r[0]*(10000n-c.HINKAL_PRIVATE_SEND_VARIABLE_RATE)/10000n;if(r[0]-=N.flatFee,a<=0n)throw Error(u.transactionErrorCodes.RECIPIENT_AMOUNT_INVALID);const m=-r[0]-a,o=(await D.addPaddingToUtxos(e,t,r,6))[0],y=j.getCurrentTimeInSeconds().toString(),{outputUtxos:P}=M.outputUtxoProcessing(e.userKeys,o,r[0],y,void 0,!1),f=P[0],[C,O,U]=d.split(","),g=new I.Utxo({amount:a,erc20TokenAddress:o[0].erc20TokenAddress,mintAddress:o[0].mintAddress,timeStamp:y,randomization:BigInt(C),stealthAddress:O,encryptionKey:U}),s=await e.getRandomRelay(!l);if(!s)throw Error(u.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const h=I.Utxo.findCorrectRandomization(G.randomBigInt(31),e.userKeys.getShieldedPrivateKey()),E={tokenNumber:t.length,nullifierAmount:o.length,outputAmount:2},k=e.getSolanaProgram(A),T=Z.calcEncryptedOutputs([[f,g]])[0].map(i=>Array.from(X.ethers.getBytes(i))),{proofAArr:v,proofBArr:B,proofCArr:F,publicInputsArr:K}=await Y.constructSolanaZkProof(e.generateProofRemotely,p,x,w,_,k,[t[0]],[o],[[f,g]],h,m,0n,c.solanaNativeAddress,s,E,T,n),L=t[0]===c.solanaNativeAddress,V={recipient:s,mint:L?void 0:t[0]},b={proofAArr:v,proofBArr:B,proofCArr:F,publicInputsArr:K,encryptedOutputs:T,relayerFee:m.toString(),dimensions:E};return J.solanaTransactCallRelayer(n,{relayAddress:s,functionName:"transfer",args:b,accounts:V})};exports.hinkalSolanaTransfer=$;

package/data-structures/Hinkal/hinkalSolanaTransfer.mjs

@@ -1,7 +1,6 @@
 import "../../types/circom-data.types.mjs";
 import { ExternalActionId as b } from "../../types/external-action.types.mjs";
-import { solanaNativeAddress as g, HINKAL_PRIVATE_SEND_VARIABLE_RATE as H } from "../../constants/protocol.constants.mjs";
-import "../../types/transactions.types.mjs";
+import { solanaNativeAddress as T, HINKAL_PRIVATE_SEND_VARIABLE_RATE as H } from "../../constants/protocol.constants.mjs";
 import "../../types/activities.types.mjs";
 import { addPaddingToUtxos as M } from "../../functions/web3/events/getShieldedBalance.mjs";
 import { outputUtxoProcessing as Y } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
@@ -16,74 +15,74 @@ import { solanaTransactCallRelayer as Q } from "../../functions/web3/functionCal
 import { isValidPrivateAddress as W } from "../../functions/utils/addresses.mjs";
 import { networkRegistry as X } from "../../constants/chains.constants.mjs";
 import { ethers as $ } from "ethers";
-const Ir = async (r, R, o, c, w, S, d = !1) => {
+const Tt = async (t, R, o, c, w, S, d = !1) => {
   if (d)
     throw new Error("onlyGasEstimate is not supported for Solana transfer");
   if (!W(c))
     throw Error(m.RECIPIENT_FORMAT_INCORRECT);
-  const n = r.getCurrentChainId(), { originalDeployer: p, hinkalIdl: u } = X[n].contractData;
+  const n = t.getCurrentChainId(), { originalDeployer: p, hinkalIdl: u } = X[n].contractData;
   if (!p || !u)
     throw new Error("missing data");
-  const { userKeys: N, merkleTreeAccessToken: x, merkleTreeHinkal: O } = r, t = R.map((a) => a.erc20TokenAddress);
-  if (t.length > 1)
+  const { userKeys: N, merkleTreeAccessToken: x, merkleTreeHinkal: O } = t, r = R.map((a) => a.erc20TokenAddress);
+  if (r.length > 1)
     throw new Error("Solana Transfer: Only one mint address is supported");
-  const P = S ?? await j(n, w, t, b.Transact), i = -o[0] * (10000n - H) / 10000n;
+  const P = S ?? await j(n, w, r, b.Transact), i = -o[0] * (10000n - H) / 10000n;
   if (o[0] -= P.flatFee, i <= 0n)
     throw Error(m.RECIPIENT_AMOUNT_INVALID);
-  const f = -o[0] - i, e = (await M(r, t, o, 6))[0], l = Z().toString(), { outputUtxos: _ } = Y(
-    r.userKeys,
+  const f = -o[0] - i, e = (await M(t, r, o, 6))[0], l = Z().toString(), { outputUtxos: _ } = Y(
+    t.userKeys,
     e,
     o[0],
     l,
     void 0,
     !1
-  ), A = _[0], [U, C, h] = c.split(","), y = new I({
+  ), A = _[0], [U, C, B] = c.split(","), y = new I({
     amount: i,
     erc20TokenAddress: e[0].erc20TokenAddress,
     mintAddress: e[0].mintAddress,
     timeStamp: l,
     randomization: BigInt(U),
     stealthAddress: C,
-    encryptionKey: h
-  }), s = await r.getRandomRelay(!d);
+    encryptionKey: B
+  }), s = await t.getRandomRelay(!d);
   if (!s)
     throw Error(m.RELAYER_NOT_AVAILABLE);
-  const v = I.findCorrectRandomization(J(31), r.userKeys.getShieldedPrivateKey()), E = {
-    tokenNumber: t.length,
+  const h = I.findCorrectRandomization(J(31), t.userKeys.getShieldedPrivateKey()), E = {
+    tokenNumber: r.length,
     nullifierAmount: e.length,
     outputAmount: 2
-  }, B = r.getSolanaProgram(u), T = q([[A, y]])[0].map((a) => Array.from($.utils.arrayify(a))), { proofAArr: K, proofBArr: L, proofCArr: k, publicInputsArr: F } = await G(
-    r.generateProofRemotely,
+  }, v = t.getSolanaProgram(u), g = q([[A, y]])[0].map((a) => Array.from($.getBytes(a))), { proofAArr: K, proofBArr: L, proofCArr: k, publicInputsArr: F } = await G(
+    t.generateProofRemotely,
     p,
     O,
     x,
     N,
-    B,
-    [t[0]],
+    v,
+    [r[0]],
     [e],
     [[A, y]],
-    v,
+    h,
     f,
     0n,
-    g,
+    T,
     s,
     E,
-    T,
+    g,
     n
-  ), V = t[0] === g, z = {
+  ), V = r[0] === T, z = {
     recipient: s,
-    mint: V ? void 0 : t[0]
+    mint: V ? void 0 : r[0]
   }, D = {
     proofAArr: K,
     proofBArr: L,
     proofCArr: k,
     publicInputsArr: F,
-    encryptedOutputs: T,
+    encryptedOutputs: g,
     relayerFee: f.toString(),
     dimensions: E
   };
   return Q(n, { relayAddress: s, functionName: "transfer", args: D, accounts: z });
 };
 export {
-  Ir as hinkalSolanaTransfer
+  Tt as hinkalSolanaTransfer
 };

package/data-structures/Hinkal/hinkalSolanaWithdraw.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../types/circom-data.types.cjs");const C=require("../../types/external-action.types.cjs"),K=require("../../constants/protocol.constants.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");const b=require("../../functions/web3/events/getShieldedBalance.cjs"),B=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),N=require("../../functions/utils/time.utils.cjs"),M=require("../../error-handling/error-codes.constants.cjs"),D=require("../../functions/pre-transaction/getFeeStructure.cjs"),L=require("../../functions/snarkjs/common.snarkjs.cjs"),W=require("../../functions/snarkjs/constructSolanaZkProof.cjs"),j=require("../utxo/Utxo.cjs"),z=require("../../functions/web3/etherFunctions.cjs"),Z=require("../../functions/web3/functionCalls/transactCallRelayer.cjs");require("../../constants/token-data/index.cjs");const H=require("../../constants/chains.constants.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");require("../../constants/server.constants.cjs");require("../../constants/vite.constants.cjs");require("../../constants/coingecko.constants.cjs");require("../../constants/reorg-depths.constants.cjs");require("../../constants/addresses.constants.cjs");require("../../constants/token.limits.constants.cjs");require("../../constants/presale.constants.cjs");require("../../constants/activity.constants.cjs");require("../../constants/tasks.constants.cjs");require("../../constants/events.constants.cjs");const V=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),Y=require("ethers"),G=async(e,r,t,i,g,f,u=!1)=>{if(u)throw new Error("onlyGasEstimate is not supported for Solana withdraw");const o=e.getCurrentChainId(),h=await e.getEthereumAddress(),{originalDeployer:l,hinkalIdl:d}=H.networkRegistry[o].contractData;if(!l||!d)throw new Error("missing data");const{userKeys:q,merkleTreeAccessToken:w,merkleTreeHinkal:S}=e,n=f??await D.getFeeStructure(o,g,r,C.ExternalActionId.Transact);t[0]-=n.flatFee;const{patchAccessTokenMerkleTree:m,kycRequired:A,hasAccessToken:T}=await V.shouldPatchAccessTokenMerkleTree(e,r,t);if(r.length>1)throw new Error("Solana Withdraw: Only one mint address is supported");const a=[...await b.addPaddingToUtxos(e,r,t,6)][0],k=N.getCurrentTimeInSeconds().toString(),{outputUtxos:s}=B.outputUtxoProcessing(e.userKeys,a,t[0],k,void 0,!1),c=await e.getRandomRelay(!u);if(!c)throw Error(M.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const R=j.Utxo.findCorrectRandomization(z.randomBigInt(31),e.userKeys.getShieldedPrivateKey()),p={tokenNumber:r.length,nullifierAmount:a.length,outputAmount:s.length},E=e.getSolanaProgram(d),P=L.calcEncryptedOutputs([s])[0][0],y=Array.from(Y.ethers.utils.arrayify(P)),{proofAArr:x,proofBArr:v,proofCArr:I,publicInputsArr:_}=await W.constructSolanaZkProof(e.generateProofRemotely,l,S,w,q,E,[r[0]],[a],[s],R,n.flatFee,n.variableRate,i,c,p,[y],o,m),F=r[0]===K.solanaNativeAddress,O={recipient:i,mint:F?void 0:r[0]},U={proofAArr:x,proofBArr:v,proofCArr:I,publicInputsArr:_,encryptedOutputs:[y],relayerFee:n.flatFee.toString(),dimensions:p};return Z.solanaTransactCallRelayer(o,{relayAddress:c,functionName:"transact",args:U,accounts:O,solanaAccessTokenData:!T&&A?{ethereumAddress:h,accessKey:q.getAccessKey()}:void 0})};exports.hinkalSolanaWithdraw=G;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../types/circom-data.types.cjs");const B=require("../../types/external-action.types.cjs"),C=require("../../constants/protocol.constants.cjs");require("../../types/activities.types.cjs");const K=require("../../functions/web3/events/getShieldedBalance.cjs"),b=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),N=require("../../functions/utils/time.utils.cjs"),M=require("../../error-handling/error-codes.constants.cjs"),D=require("../../functions/pre-transaction/getFeeStructure.cjs"),L=require("../../functions/snarkjs/common.snarkjs.cjs"),W=require("../../functions/snarkjs/constructSolanaZkProof.cjs"),j=require("../utxo/Utxo.cjs"),z=require("../../functions/web3/etherFunctions.cjs"),Z=require("../../functions/web3/functionCalls/transactCallRelayer.cjs");require("../../constants/token-data/index.cjs");const H=require("../../constants/chains.constants.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");require("../../constants/server.constants.cjs");require("../../constants/vite.constants.cjs");require("../../constants/coingecko.constants.cjs");require("../../constants/reorg-depths.constants.cjs");require("../../constants/addresses.constants.cjs");require("../../constants/token.limits.constants.cjs");require("../../constants/presale.constants.cjs");require("../../constants/activity.constants.cjs");require("../../constants/tasks.constants.cjs");require("../../constants/events.constants.cjs");const V=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),Y=require("ethers"),G=async(e,r,t,i,g,f,u=!1)=>{if(u)throw new Error("onlyGasEstimate is not supported for Solana withdraw");const o=e.getCurrentChainId(),h=await e.getEthereumAddress(),{originalDeployer:l,hinkalIdl:d}=H.networkRegistry[o].contractData;if(!l||!d)throw new Error("missing data");const{userKeys:q,merkleTreeAccessToken:w,merkleTreeHinkal:S}=e,n=f??await D.getFeeStructure(o,g,r,B.ExternalActionId.Transact);t[0]-=n.flatFee;const{patchAccessTokenMerkleTree:m,kycRequired:A,hasAccessToken:T}=await V.shouldPatchAccessTokenMerkleTree(e,r,t);if(r.length>1)throw new Error("Solana Withdraw: Only one mint address is supported");const a=[...await K.addPaddingToUtxos(e,r,t,6)][0],k=N.getCurrentTimeInSeconds().toString(),{outputUtxos:s}=b.outputUtxoProcessing(e.userKeys,a,t[0],k,void 0,!1),c=await e.getRandomRelay(!u);if(!c)throw Error(M.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const R=j.Utxo.findCorrectRandomization(z.randomBigInt(31),e.userKeys.getShieldedPrivateKey()),p={tokenNumber:r.length,nullifierAmount:a.length,outputAmount:s.length},E=e.getSolanaProgram(d),P=L.calcEncryptedOutputs([s])[0][0],y=Array.from(Y.ethers.getBytes(P)),{proofAArr:x,proofBArr:v,proofCArr:I,publicInputsArr:_}=await W.constructSolanaZkProof(e.generateProofRemotely,l,S,w,q,E,[r[0]],[a],[s],R,n.flatFee,n.variableRate,i,c,p,[y],o,m),F=r[0]===C.solanaNativeAddress,O={recipient:i,mint:F?void 0:r[0]},U={proofAArr:x,proofBArr:v,proofCArr:I,publicInputsArr:_,encryptedOutputs:[y],relayerFee:n.flatFee.toString(),dimensions:p};return Z.solanaTransactCallRelayer(o,{relayAddress:c,functionName:"transact",args:U,accounts:O,solanaAccessTokenData:!T&&A?{ethereumAddress:h,accessKey:q.getAccessKey()}:void 0})};exports.hinkalSolanaWithdraw=G;

package/data-structures/Hinkal/hinkalSolanaWithdraw.mjs

@@ -1,7 +1,6 @@
 import "../../types/circom-data.types.mjs";
-import { ExternalActionId as B } from "../../types/external-action.types.mjs";
+import { ExternalActionId as U } from "../../types/external-action.types.mjs";
 import { solanaNativeAddress as C } from "../../constants/protocol.constants.mjs";
-import "../../types/transactions.types.mjs";
 import "../../types/activities.types.mjs";
 import { addPaddingToUtxos as b } from "../../functions/web3/events/getShieldedBalance.mjs";
 import { outputUtxoProcessing as D } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
@@ -29,13 +28,13 @@ import "../../constants/tasks.constants.mjs";
 import "../../constants/events.constants.mjs";
 import { shouldPatchAccessTokenMerkleTree as Z } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
 import { ethers as j } from "ethers";
-const kt = async (t, r, o, s, y, g, m = !1) => {
+const It = async (t, r, o, s, y, g, m = !1) => {
   if (m)
     throw new Error("onlyGasEstimate is not supported for Solana withdraw");
   const e = t.getCurrentChainId(), w = await t.getEthereumAddress(), { originalDeployer: p, hinkalIdl: u } = Y[e].contractData;
   if (!p || !u)
     throw new Error("missing data");
-  const { userKeys: f, merkleTreeAccessToken: A, merkleTreeHinkal: T } = t, a = g ?? await M(e, y, r, B.Transact);
+  const { userKeys: f, merkleTreeAccessToken: A, merkleTreeHinkal: T } = t, a = g ?? await M(e, y, r, U.Transact);
   o[0] -= a.flatFee;
   const { patchAccessTokenMerkleTree: S, kycRequired: h, hasAccessToken: E } = await Z(
     t,
@@ -44,9 +43,9 @@ const kt = async (t, r, o, s, y, g, m = !1) => {
   );
   if (r.length > 1)
     throw new Error("Solana Withdraw: Only one mint address is supported");
-  const i = [...await b(t, r, o, 6)][0], R = L().toString(), { outputUtxos: n } = D(
+  const n = [...await b(t, r, o, 6)][0], R = L().toString(), { outputUtxos: i } = D(
     t.userKeys,
-    i,
+    n,
     o[0],
     R,
     void 0,
@@ -56,9 +55,9 @@ const kt = async (t, r, o, s, y, g, m = !1) => {
     throw Error(z.RELAYER_NOT_AVAILABLE);
   const x = q.findCorrectRandomization(H(31), t.userKeys.getShieldedPrivateKey()), l = {
     tokenNumber: r.length,
-    nullifierAmount: i.length,
-    outputAmount: n.length
-  }, I = t.getSolanaProgram(u), k = W([n])[0][0], d = Array.from(j.utils.arrayify(k)), { proofAArr: v, proofBArr: P, proofCArr: K, publicInputsArr: O } = await _(
+    nullifierAmount: n.length,
+    outputAmount: i.length
+  }, I = t.getSolanaProgram(u), k = W([i])[0][0], d = Array.from(j.getBytes(k)), { proofAArr: v, proofBArr: P, proofCArr: K, publicInputsArr: O } = await _(
     t.generateProofRemotely,
     p,
     T,
@@ -66,8 +65,8 @@ const kt = async (t, r, o, s, y, g, m = !1) => {
     f,
     I,
     [r[0]],
-    [i],
     [n],
+    [i],
     x,
     a.flatFee,
     a.variableRate,
@@ -77,10 +76,10 @@ const kt = async (t, r, o, s, y, g, m = !1) => {
     [d],
     e,
     S
-  ), F = r[0] === C, N = {
+  ), B = r[0] === C, F = {
     recipient: s,
-    mint: F ? void 0 : r[0]
-  }, U = {
+    mint: B ? void 0 : r[0]
+  }, N = {
     proofAArr: v,
     proofBArr: P,
     proofCArr: K,
@@ -92,8 +91,8 @@ const kt = async (t, r, o, s, y, g, m = !1) => {
   return V(e, {
     relayAddress: c,
     functionName: "transact",
-    args: U,
-    accounts: N,
+    args: N,
+    accounts: F,
     solanaAccessTokenData: !E && h ? {
       ethereumAddress: w,
       accessKey: f.getAccessKey()
@@ -101,5 +100,5 @@ const kt = async (t, r, o, s, y, g, m = !1) => {
   });
 };
 export {
-  kt as hinkalSolanaWithdraw
+  It as hinkalSolanaWithdraw
 };

package/data-structures/Hinkal/hinkalSwap.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const F=require("../../error-handling/error-codes.constants.cjs"),L=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),M=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),H=require("../../functions/web3/events/getShieldedBalance.cjs"),K=require("../../functions/web3/functionCalls/estimateGasRelayer.cjs"),N=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),W=require("../../functions/pre-transaction/getFeeStructure.cjs"),B=require("../../functions/pre-transaction/merge-with-fee-structure.cjs"),b=require("../../types/external-action.types.cjs"),k=require("../../types/hinkal.types.cjs"),G=require("../../functions/pre-transaction/outputApprovalDataProcessing.cjs"),O=require("../../types/ethereum-network.types.cjs"),V=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),Z=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),$=require("../../functions/pre-transaction/getExternalSwapAddress.cjs"),j=require("../../functions/utils/time.utils.cjs"),z=require("../../constants/protocol.constants.cjs");require("../../types/circom-data.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");require("../../constants/server.constants.cjs");require("../../constants/chains.constants.cjs");require("../../constants/vite.constants.cjs");require("../http/HttpClient.cjs");require("axios");require("ethers");require("../../constants/token-data/index.cjs");require("../../API/getServerURL.cjs");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/save-depths.cjs");require("../../constants/reorg-depths.constants.cjs");require("../../functions/utils/mutexes.utils.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");require("../crypto-keys/keys.cjs");const Y=require("../../functions/pre-transaction/constructAdminData.cjs");require("@solana/spl-token");const J=async(e,c,t,i,x,T,S,m,u=!1,w=!1)=>{const s=c.map(r=>r.erc20TokenAddress),d=await e.getEthereumAddress(),g=S??await W.getFeeStructure(e.getCurrentChainId(),T,s,b.ExternalActionId.Transact,void 0,z.HINKAL_SWAP_VARIABLE_RATE);B.mergeWithFeeStructure(e.getCurrentChainId(),s,t,g);const f=$.getExternalSwapAddress(e,i),o={externalActionId:i,externalAddress:f,externalActionMetadata:x},a=[...await H.addPaddingToUtxos(e,s,t)],v=`swapperM${t.length.toString()}x${a[0].length}x1`,D=[!1,!0,!1].slice(0,t.length),q=[],n=k.defaultHinkalLogicArgs(t.length,e.userKeys),R=j.getCurrentTimeInSeconds().toString();for(let r=0;r<s.length;r+=1){const{outputUtxos:U}=L.outputUtxoProcessing(e.userKeys,a[r],t[r],R,void 0,!1);q.push(U);const{useApprovalUtxoData:y}=G.outputApprovalDataProcessing(e,a[r],t[r]);y&&(n.useApprovalUtxoData[r]=y,n.doPreTxApproval=!0)}const l=await e.getRandomRelay(!u);if(!l)throw Error(F.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const{patchAccessTokenMerkleTree:P,kycRequired:h,hasAccessToken:E}=await V.shouldPatchAccessTokenMerkleTree(e,s,t),I=await Z.getSignatureDataForTransact(e.getCurrentChainId(),d,e.userKeys,h,E),{zkCallData:p,circomData:A,dimData:C}=await M.constructZkProof("v1x1",e.merkleTreeHinkal,e.merkleTreeAccessToken,a,q,e.userKeys,v,o.externalActionId,o.externalAddress,o.externalActionMetadata,e.generateProofRemotely,l,e.getCurrentChainId(),D,void 0,void 0,P,n,void 0,g,e.getContractWithFetcher(O.ContractType.HinkalHelperContract),I);if(u)return await K.estimateGasRelayer(e,p,C,A);const _=Y.constructAdminData(m,e.getCurrentChainId(),s,t,d,c);return await N.transactCallRelayer(e.getCurrentChainId(),p,C,A,w,void 0,void 0,_)};exports.hinkalSwap=J;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const F=require("../../error-handling/error-codes.constants.cjs"),L=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),M=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),H=require("../../functions/web3/events/getShieldedBalance.cjs"),K=require("../../functions/web3/functionCalls/estimateGasRelayer.cjs"),N=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),W=require("../../functions/pre-transaction/getFeeStructure.cjs"),B=require("../../functions/pre-transaction/merge-with-fee-structure.cjs"),b=require("../../types/external-action.types.cjs"),k=require("../../types/hinkal.types.cjs"),G=require("../../functions/pre-transaction/outputApprovalDataProcessing.cjs"),O=require("../../types/ethereum-network.types.cjs"),V=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),Z=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),$=require("../../functions/pre-transaction/getExternalSwapAddress.cjs"),j=require("../../functions/utils/time.utils.cjs"),z=require("../../constants/protocol.constants.cjs");require("../../types/circom-data.types.cjs");require("../../types/activities.types.cjs");require("../../constants/server.constants.cjs");require("../../constants/chains.constants.cjs");require("../../constants/vite.constants.cjs");require("../http/HttpClient.cjs");require("axios");require("ethers");require("../../constants/token-data/index.cjs");require("../../API/getServerURL.cjs");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/save-depths.cjs");require("../../constants/reorg-depths.constants.cjs");require("../../functions/utils/mutexes.utils.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");require("../crypto-keys/keys.cjs");const Y=require("../../functions/pre-transaction/constructAdminData.cjs");require("@solana/spl-token");const J=async(e,c,t,i,x,T,S,m,u=!1,w=!1)=>{const s=c.map(r=>r.erc20TokenAddress),d=await e.getEthereumAddress(),g=S??await W.getFeeStructure(e.getCurrentChainId(),T,s,b.ExternalActionId.Transact,void 0,z.HINKAL_SWAP_VARIABLE_RATE);B.mergeWithFeeStructure(e.getCurrentChainId(),s,t,g);const f=$.getExternalSwapAddress(e,i),o={externalActionId:i,externalAddress:f,externalActionMetadata:x},a=[...await H.addPaddingToUtxos(e,s,t)],v=`swapperM${t.length.toString()}x${a[0].length}x1`,D=[!1,!0,!1].slice(0,t.length),q=[],n=k.defaultHinkalLogicArgs(t.length,e.userKeys),R=j.getCurrentTimeInSeconds().toString();for(let r=0;r<s.length;r+=1){const{outputUtxos:U}=L.outputUtxoProcessing(e.userKeys,a[r],t[r],R,void 0,!1);q.push(U);const{useApprovalUtxoData:y}=G.outputApprovalDataProcessing(e,a[r],t[r]);y&&(n.useApprovalUtxoData[r]=y,n.doPreTxApproval=!0)}const l=await e.getRandomRelay(!u);if(!l)throw Error(F.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const{patchAccessTokenMerkleTree:P,kycRequired:h,hasAccessToken:E}=await V.shouldPatchAccessTokenMerkleTree(e,s,t),I=await Z.getSignatureDataForTransact(e.getCurrentChainId(),d,e.userKeys,h,E),{zkCallData:p,circomData:A,dimData:C}=await M.constructZkProof("v1x1",e.merkleTreeHinkal,e.merkleTreeAccessToken,a,q,e.userKeys,v,o.externalActionId,o.externalAddress,o.externalActionMetadata,e.generateProofRemotely,l,e.getCurrentChainId(),D,void 0,void 0,P,n,void 0,g,e.getContractWithFetcher(O.ContractType.HinkalHelperContract),I);if(u)return await K.estimateGasRelayer(e,p,C,A);const _=Y.constructAdminData(m,e.getCurrentChainId(),s,t,d,c);return await N.transactCallRelayer(e.getCurrentChainId(),p,C,A,w,void 0,void 0,_)};exports.hinkalSwap=J;

package/data-structures/Hinkal/hinkalSwap.mjs

@@ -16,7 +16,6 @@ import { getExternalSwapAddress as b } from "../../functions/pre-transaction/get
 import { getCurrentTimeInSeconds as j } from "../../functions/utils/time.utils.mjs";
 import { HINKAL_SWAP_VARIABLE_RATE as G } from "../../constants/protocol.constants.mjs";
 import "../../types/circom-data.types.mjs";
-import "../../types/transactions.types.mjs";
 import "../../types/activities.types.mjs";
 import "../../constants/server.constants.mjs";
 import "../../constants/chains.constants.mjs";
@@ -38,7 +37,7 @@ import "@solana/web3.js";
 import "../crypto-keys/keys.mjs";
 import { constructAdminData as J } from "../../functions/pre-transaction/constructAdminData.mjs";
 import "@solana/spl-token";
-const Wt = async (t, m, e, p, l, T, y, w, c = !1, v = !1) => {
+const Nt = async (t, m, e, p, l, T, y, w, c = !1, v = !1) => {
   const o = m.map((r) => r.erc20TokenAddress), n = await t.getEthereumAddress(), d = y ?? await B(
     t.getCurrentChainId(),
     T,
@@ -125,5 +124,5 @@ const Wt = async (t, m, e, p, l, T, y, w, c = !1, v = !1) => {
   );
 };
 export {
-  Wt as hinkalSwap
+  Nt as hinkalSwap
 };

package/data-structures/Hinkal/hinkalTransfer.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const d=require("../../error-handling/error-codes.constants.cjs"),N=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),F=require("../../functions/web3/events/getShieldedBalance.cjs"),M=require("../../functions/web3/functionCalls/estimateGasRelayer.cjs"),U=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),L=require("../../functions/pre-transaction/getFeeStructure.cjs"),V=require("../../functions/pre-transaction/merge-with-fee-structure.cjs");require("../../types/circom-data.types.cjs");const k=require("../../types/ethereum-network.types.cjs"),H=require("../../types/external-action.types.cjs"),K=require("../../types/hinkal.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");const O=require("../../functions/pre-transaction/outputUtxoProcessing.cjs");require("../../constants/server.constants.cjs");require("../../constants/chains.constants.cjs");require("../../constants/vite.constants.cjs");require("../http/HttpClient.cjs");require("axios");require("ethers");require("../../constants/token-data/index.cjs");const B=require("../../constants/protocol.constants.cjs"),G=require("../../functions/pre-transaction/outputApprovalDataProcessing.cjs"),W=require("../../functions/pre-transaction/getVolatileTransferAmount.cjs"),b=require("../../functions/pre-transaction/constructAdminData.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");require("circomlibjs-hinkal-fork");require("@solana/spl-token");require("../crypto-keys/keys.cjs");require("buffer");const Z=require("../../functions/utils/time.utils.cjs"),$=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),j=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),z=require("../../functions/utils/addresses.cjs"),Y=async(e,n,E,A,x,y,f,I=!1)=>{if(!z.isValidPrivateAddress(A))throw Error(d.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);const o=n.map(t=>t.erc20TokenAddress),r=await W.modifyVolatileTokenAmountChanges(e.getCurrentChainId(),n,E),l=-r[0]*(10000n-B.HINKAL_PRIVATE_SEND_VARIABLE_RATE)/10000n;if(l<=0n)throw Error(d.transactionErrorCodes.RECIPIENT_AMOUNT_INVALID);const g=y??await L.getFeeStructure(e.getCurrentChainId(),x,o,H.ExternalActionId.Transact);V.mergeWithFeeStructure(e.getCurrentChainId(),o,r,g);const a=e.getCurrentChainId();if(!n[0])throw Error("Transfer Action: No Token Found");const c=await e.getRandomRelay(),i={externalActionId:0n,externalAddress:c??await e.getEthereumAddress(),externalActionMetadata:"0x00"},s=[...await F.addPaddingToUtxos(e,o,r)],w=`swapperM${r.length}x${s[0].length}x2`,q=[],u=K.defaultHinkalLogicArgs(r.length,e.userKeys),R=Z.getCurrentTimeInSeconds().toString();for(let t=0;t<o.length;t+=1){const{outputUtxos:S}=O.outputUtxoProcessing(e.userKeys,s[t],r[t],R,void 0,!1,A,t===0?l:0n);q.push(S);const{useApprovalUtxoData:C}=G.outputApprovalDataProcessing(e,s[t],r[t]);C&&(u.useApprovalUtxoData[t]=C,u.doPreTxApproval=!0)}if(!c)throw Error(d.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const{patchAccessTokenMerkleTree:h,kycRequired:v,hasAccessToken:D}=await $.shouldPatchAccessTokenMerkleTree(e,o,r),P=await j.getSignatureDataForTransact(a,await e.getEthereumAddress(),e.userKeys,v,D),{zkCallData:m,circomData:T,dimData:p}=await N.constructZkProof("v1x1",e.merkleTreeHinkal,e.merkleTreeAccessToken,s,q,e.userKeys,w,i.externalActionId,i.externalAddress,i.externalActionMetadata,e.generateProofRemotely,c,a,void 0,void 0,void 0,h,u,void 0,g,e.getContractWithFetcher(k.ContractType.HinkalHelperContract),P);if(I)return await M.estimateGasRelayer(e,m,p,T);const _=b.constructAdminData(f,a,o,r,await e.getEthereumAddress());return await U.transactCallRelayer(a,m,p,T,void 0,void 0,void 0,_)};exports.hinkalTransfer=Y;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const d=require("../../error-handling/error-codes.constants.cjs"),N=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),F=require("../../functions/web3/events/getShieldedBalance.cjs"),M=require("../../functions/web3/functionCalls/estimateGasRelayer.cjs"),U=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),L=require("../../functions/pre-transaction/getFeeStructure.cjs"),V=require("../../functions/pre-transaction/merge-with-fee-structure.cjs");require("../../types/circom-data.types.cjs");const k=require("../../types/ethereum-network.types.cjs"),H=require("../../types/external-action.types.cjs"),K=require("../../types/hinkal.types.cjs");require("../../types/activities.types.cjs");const O=require("../../functions/pre-transaction/outputUtxoProcessing.cjs");require("../../constants/server.constants.cjs");require("../../constants/chains.constants.cjs");require("../../constants/vite.constants.cjs");require("../http/HttpClient.cjs");require("axios");require("ethers");require("../../constants/token-data/index.cjs");const B=require("../../constants/protocol.constants.cjs"),G=require("../../functions/pre-transaction/outputApprovalDataProcessing.cjs"),W=require("../../functions/pre-transaction/getVolatileTransferAmount.cjs"),b=require("../../functions/pre-transaction/constructAdminData.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");require("circomlibjs-hinkal-fork");require("@solana/spl-token");require("../crypto-keys/keys.cjs");require("buffer");const Z=require("../../functions/utils/time.utils.cjs"),$=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),j=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),z=require("../../functions/utils/addresses.cjs"),Y=async(e,n,E,A,x,y,f,I=!1)=>{if(!z.isValidPrivateAddress(A))throw Error(d.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);const o=n.map(t=>t.erc20TokenAddress),r=await W.modifyVolatileTokenAmountChanges(e.getCurrentChainId(),n,E),l=-r[0]*(10000n-B.HINKAL_PRIVATE_SEND_VARIABLE_RATE)/10000n;if(l<=0n)throw Error(d.transactionErrorCodes.RECIPIENT_AMOUNT_INVALID);const g=y??await L.getFeeStructure(e.getCurrentChainId(),x,o,H.ExternalActionId.Transact);V.mergeWithFeeStructure(e.getCurrentChainId(),o,r,g);const a=e.getCurrentChainId();if(!n[0])throw Error("Transfer Action: No Token Found");const c=await e.getRandomRelay(),i={externalActionId:0n,externalAddress:c??await e.getEthereumAddress(),externalActionMetadata:"0x00"},s=[...await F.addPaddingToUtxos(e,o,r)],w=`swapperM${r.length}x${s[0].length}x2`,q=[],u=K.defaultHinkalLogicArgs(r.length,e.userKeys),R=Z.getCurrentTimeInSeconds().toString();for(let t=0;t<o.length;t+=1){const{outputUtxos:S}=O.outputUtxoProcessing(e.userKeys,s[t],r[t],R,void 0,!1,A,t===0?l:0n);q.push(S);const{useApprovalUtxoData:C}=G.outputApprovalDataProcessing(e,s[t],r[t]);C&&(u.useApprovalUtxoData[t]=C,u.doPreTxApproval=!0)}if(!c)throw Error(d.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const{patchAccessTokenMerkleTree:h,kycRequired:v,hasAccessToken:D}=await $.shouldPatchAccessTokenMerkleTree(e,o,r),P=await j.getSignatureDataForTransact(a,await e.getEthereumAddress(),e.userKeys,v,D),{zkCallData:m,circomData:T,dimData:p}=await N.constructZkProof("v1x1",e.merkleTreeHinkal,e.merkleTreeAccessToken,s,q,e.userKeys,w,i.externalActionId,i.externalAddress,i.externalActionMetadata,e.generateProofRemotely,c,a,void 0,void 0,void 0,h,u,void 0,g,e.getContractWithFetcher(k.ContractType.HinkalHelperContract),P);if(I)return await M.estimateGasRelayer(e,m,p,T);const _=b.constructAdminData(f,a,o,r,await e.getEthereumAddress());return await U.transactCallRelayer(a,m,p,T,void 0,void 0,void 0,_)};exports.hinkalTransfer=Y;

package/data-structures/Hinkal/hinkalTransfer.mjs

@@ -9,7 +9,6 @@ import "../../types/circom-data.types.mjs";
 import { ContractType as K } from "../../types/ethereum-network.types.mjs";
 import { ExternalActionId as O } from "../../types/external-action.types.mjs";
 import { defaultHinkalLogicArgs as B } from "../../types/hinkal.types.mjs";
-import "../../types/transactions.types.mjs";
 import "../../types/activities.types.mjs";
 import { outputUtxoProcessing as W } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
 import "../../constants/server.constants.mjs";
@@ -33,7 +32,7 @@ import { getCurrentTimeInSeconds as Y } from "../../functions/utils/time.utils.m
 import { shouldPatchAccessTokenMerkleTree as Z } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
 import { getSignatureDataForTransact as b } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
 import { isValidPrivateAddress as j } from "../../functions/utils/addresses.mjs";
-const Ut = async (t, i, E, d, C, I, w, R = !1) => {
+const St = async (t, i, E, d, C, I, w, R = !1) => {
   if (!j(d))
     throw Error(p.RECIPIENT_FORMAT_INCORRECT);
   const e = i.map((r) => r.erc20TokenAddress), o = await z(
@@ -126,5 +125,5 @@ const Ut = async (t, i, E, d, C, I, w, R = !1) => {
   );
 };
 export {
-  Ut as hinkalTransfer
+  St as hinkalTransfer
 };

package/data-structures/Hinkal/hinkalWithdraw.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const U=require("../../constants/protocol.constants.cjs"),_=require("../../error-handling/error-codes.constants.cjs"),M=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),R=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),W=require("../../functions/web3/events/getShieldedBalance.cjs"),L=require("../../functions/web3/functionCalls/estimateGasRelayer.cjs"),N=require("../../functions/web3/functionCalls/transactCallDirect.cjs"),H=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),K=require("../../types/external-action.types.cjs"),V=require("../../types/hinkal.types.cjs"),b=require("../../functions/pre-transaction/outputApprovalDataProcessing.cjs"),k=require("../../functions/pre-transaction/getFeeStructure.cjs"),z=require("../../functions/pre-transaction/merge-with-fee-structure.cjs");require("../../types/circom-data.types.cjs");const B=require("../../types/ethereum-network.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");const G=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),Z=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs");require("../../constants/server.constants.cjs");require("../../constants/chains.constants.cjs");require("../../constants/vite.constants.cjs");require("../http/HttpClient.cjs");require("axios");require("ethers");require("../../constants/token-data/index.cjs");const $=require("../../functions/pre-transaction/getVolatileTransferAmount.cjs"),j=require("../../functions/pre-transaction/constructAdminData.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");require("circomlibjs-hinkal-fork");require("@solana/spl-token");require("../crypto-keys/keys.cjs");require("buffer");const Y=require("../../functions/utils/time.utils.cjs"),J=async(e,n,C,T,a,w,y,D,q=!1)=>{const o=n.map(t=>t.erc20TokenAddress),r=await $.modifyVolatileTokenAmountChanges(e.getCurrentChainId(),n,C);let c;a||(c=y??await k.getFeeStructure(e.getCurrentChainId(),w,o,K.ExternalActionId.Transact),z.mergeWithFeeStructure(e.getCurrentChainId(),o,r,c));const i=n[0];if(!i)throw Error("Deposit Action: No Token Found");const u={externalActionId:0n,externalAddress:T,externalActionMetadata:"0x00"},s=[...await W.addPaddingToUtxos(e,o,r)],v=`swapperM${r.length.toString()}x${s[0].length}x1`,p=[],d=V.defaultHinkalLogicArgs(r.length,e.userKeys),h=Y.getCurrentTimeInSeconds().toString();for(let t=0;t<o.length;t+=1){const{outputUtxos:F}=M.outputUtxoProcessing(e.userKeys,s[t],r[t],h,void 0,!1);p.push(F);const{useApprovalUtxoData:x}=b.outputApprovalDataProcessing(e,s[t],r[t]);x&&(d.useApprovalUtxoData[t]=x,d.doPreTxApproval=!0)}const m=await e.getRandomRelay(!q);if(!a&&!m)throw Error(_.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const{patchAccessTokenMerkleTree:S,kycRequired:E,hasAccessToken:I}=await Z.shouldPatchAccessTokenMerkleTree(e,o,r),P=await G.getSignatureDataForTransact(e.getCurrentChainId(),await e.getEthereumAddress(),e.userKeys,E,I),{zkCallData:g,circomData:l,dimData:A}=await R.constructZkProof("v1x1",e.merkleTreeHinkal,e.merkleTreeAccessToken,s,p,e.userKeys,v,u.externalActionId,u.externalAddress,u.externalActionMetadata,e.generateProofRemotely,a?U.zeroAddress:m,e.getCurrentChainId(),void 0,void 0,void 0,S,d,void 0,c,e.getContractWithFetcher(B.ContractType.HinkalHelperContract),P,a?await e.getEthereumAddress():void 0);if(q)return await L.estimateGasRelayer(e,g,A,l);if(a){if(!i)throw Error("Withdraw Action: No Token Found");return await N.transactCallDirect(e,r[0],i,g,l,A)}const f=j.constructAdminData(D,e.getCurrentChainId(),o,r,await e.getEthereumAddress());return await H.transactCallRelayer(e.getCurrentChainId(),g,A,l,void 0,void 0,void 0,f)};exports.hinkalWithdraw=J;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const U=require("../../constants/protocol.constants.cjs"),_=require("../../error-handling/error-codes.constants.cjs"),M=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),R=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),W=require("../../functions/web3/events/getShieldedBalance.cjs"),L=require("../../functions/web3/functionCalls/estimateGasRelayer.cjs"),N=require("../../functions/web3/functionCalls/transactCallDirect.cjs"),H=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),K=require("../../types/external-action.types.cjs"),V=require("../../types/hinkal.types.cjs"),b=require("../../functions/pre-transaction/outputApprovalDataProcessing.cjs"),k=require("../../functions/pre-transaction/getFeeStructure.cjs"),z=require("../../functions/pre-transaction/merge-with-fee-structure.cjs");require("../../types/circom-data.types.cjs");const B=require("../../types/ethereum-network.types.cjs");require("../../types/activities.types.cjs");const G=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),Z=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs");require("../../constants/server.constants.cjs");require("../../constants/chains.constants.cjs");require("../../constants/vite.constants.cjs");require("../http/HttpClient.cjs");require("axios");require("ethers");require("../../constants/token-data/index.cjs");const $=require("../../functions/pre-transaction/getVolatileTransferAmount.cjs"),j=require("../../functions/pre-transaction/constructAdminData.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");require("circomlibjs-hinkal-fork");require("@solana/spl-token");require("../crypto-keys/keys.cjs");require("buffer");const Y=require("../../functions/utils/time.utils.cjs"),J=async(e,n,C,T,a,w,y,D,q=!1)=>{const o=n.map(t=>t.erc20TokenAddress),r=await $.modifyVolatileTokenAmountChanges(e.getCurrentChainId(),n,C);let c;a||(c=y??await k.getFeeStructure(e.getCurrentChainId(),w,o,K.ExternalActionId.Transact),z.mergeWithFeeStructure(e.getCurrentChainId(),o,r,c));const i=n[0];if(!i)throw Error("Deposit Action: No Token Found");const u={externalActionId:0n,externalAddress:T,externalActionMetadata:"0x00"},s=[...await W.addPaddingToUtxos(e,o,r)],v=`swapperM${r.length.toString()}x${s[0].length}x1`,p=[],d=V.defaultHinkalLogicArgs(r.length,e.userKeys),h=Y.getCurrentTimeInSeconds().toString();for(let t=0;t<o.length;t+=1){const{outputUtxos:F}=M.outputUtxoProcessing(e.userKeys,s[t],r[t],h,void 0,!1);p.push(F);const{useApprovalUtxoData:x}=b.outputApprovalDataProcessing(e,s[t],r[t]);x&&(d.useApprovalUtxoData[t]=x,d.doPreTxApproval=!0)}const m=await e.getRandomRelay(!q);if(!a&&!m)throw Error(_.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const{patchAccessTokenMerkleTree:S,kycRequired:E,hasAccessToken:I}=await Z.shouldPatchAccessTokenMerkleTree(e,o,r),P=await G.getSignatureDataForTransact(e.getCurrentChainId(),await e.getEthereumAddress(),e.userKeys,E,I),{zkCallData:g,circomData:l,dimData:A}=await R.constructZkProof("v1x1",e.merkleTreeHinkal,e.merkleTreeAccessToken,s,p,e.userKeys,v,u.externalActionId,u.externalAddress,u.externalActionMetadata,e.generateProofRemotely,a?U.zeroAddress:m,e.getCurrentChainId(),void 0,void 0,void 0,S,d,void 0,c,e.getContractWithFetcher(B.ContractType.HinkalHelperContract),P,a?await e.getEthereumAddress():void 0);if(q)return await L.estimateGasRelayer(e,g,A,l);if(a){if(!i)throw Error("Withdraw Action: No Token Found");return await N.transactCallDirect(e,r[0],i,g,l,A)}const f=j.constructAdminData(D,e.getCurrentChainId(),o,r,await e.getEthereumAddress());return await H.transactCallRelayer(e.getCurrentChainId(),g,A,l,void 0,void 0,void 0,f)};exports.hinkalWithdraw=J;

package/data-structures/Hinkal/hinkalWithdraw.mjs

@@ -13,7 +13,6 @@ import { getFeeStructure as q } from "../../functions/pre-transaction/getFeeStru
 import { mergeWithFeeStructure as B } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
 import "../../types/circom-data.types.mjs";
 import { ContractType as Y } from "../../types/ethereum-network.types.mjs";
-import "../../types/transactions.types.mjs";
 import "../../types/activities.types.mjs";
 import { getSignatureDataForTransact as Z } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
 import { shouldPatchAccessTokenMerkleTree as b } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
@@ -33,7 +32,7 @@ import "@solana/spl-token";
 import "../crypto-keys/keys.mjs";
 import "buffer";
 import { getCurrentTimeInSeconds as J } from "../../functions/utils/time.utils.mjs";
-const Mt = async (t, s, w, l, a, T, v, D, A = !1) => {
+const Lt = async (t, s, w, l, a, T, v, D, A = !1) => {
   const e = s.map((r) => r.erc20TokenAddress), o = await j(
     t.getCurrentChainId(),
     s,
@@ -48,7 +47,7 @@ const Mt = async (t, s, w, l, a, T, v, D, A = !1) => {
     externalActionId: 0n,
     externalAddress: l,
     externalActionMetadata: "0x00"
-  }, i = [...await N(t, e, o)], E = `swapperM${o.length.toString()}x${i[0].length}x1`, f = [], p = _(o.length, t.userKeys), I = J().toString();
+  }, i = [...await N(t, e, o)], E = `swapperM${o.length.toString()}x${i[0].length}x1`, f = [], d = _(o.length, t.userKeys), I = J().toString();
   for (let r = 0; r < e.length; r += 1) {
     const { outputUtxos: F } = H(
       t.userKeys,
@@ -60,7 +59,7 @@ const Mt = async (t, s, w, l, a, T, v, D, A = !1) => {
     );
     f.push(F);
     const { useApprovalUtxoData: C } = $(t, i[r], o[r]);
-    C && (p.useApprovalUtxoData[r] = C, p.doPreTxApproval = !0);
+    C && (d.useApprovalUtxoData[r] = C, d.doPreTxApproval = !0);
   }
   const x = await t.getRandomRelay(!A);
   if (!a && !x)
@@ -75,7 +74,7 @@ const Mt = async (t, s, w, l, a, T, v, D, A = !1) => {
     t.userKeys,
     S,
     h
-  ), { zkCallData: d, circomData: u, dimData: g } = await K(
+  ), { zkCallData: p, circomData: u, dimData: g } = await K(
     "v1x1",
     t.merkleTreeHinkal,
     t.merkleTreeAccessToken,
@@ -93,7 +92,7 @@ const Mt = async (t, s, w, l, a, T, v, D, A = !1) => {
     void 0,
     void 0,
     y,
-    p,
+    d,
     void 0,
     n,
     t.getContractWithFetcher(Y.HinkalHelperContract),
@@ -101,11 +100,11 @@ const Mt = async (t, s, w, l, a, T, v, D, A = !1) => {
     a ? await t.getEthereumAddress() : void 0
   );
   if (A)
-    return await R(t, d, g, u);
+    return await R(t, p, g, u);
   if (a) {
     if (!m)
       throw Error("Withdraw Action: No Token Found");
-    return await W(t, o[0], m, d, u, g);
+    return await W(t, o[0], m, p, u, g);
   }
   const U = G(
     D,
@@ -116,7 +115,7 @@ const Mt = async (t, s, w, l, a, T, v, D, A = !1) => {
   );
   return await z(
     t.getCurrentChainId(),
-    d,
+    p,
     g,
     u,
     void 0,
@@ -126,5 +125,5 @@ const Mt = async (t, s, w, l, a, T, v, D, A = !1) => {
   );
 };
 export {
-  Mt as hinkalWithdraw
+  Lt as hinkalWithdraw
 };

package/data-structures/Hinkal/hinkalWithdrawStuckUtxos.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const U=require("../../error-handling/error-codes.constants.cjs"),P=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),D=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),F=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),E=require("../../types/external-action.types.cjs"),M=require("../../types/hinkal.types.cjs"),R=require("../../functions/pre-transaction/outputApprovalDataProcessing.cjs"),_=require("../../functions/pre-transaction/getFeeStructure.cjs"),W=require("../../functions/pre-transaction/merge-with-fee-structure.cjs");require("../../types/circom-data.types.cjs");const B=require("../../types/ethereum-network.types.cjs");require("../../types/transactions.types.cjs");const b=require("../../types/admin.types.cjs");require("../../types/activities.types.cjs");const K=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),L=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs");require("../../constants/server.constants.cjs");require("../../constants/chains.constants.cjs");require("../../constants/vite.constants.cjs");require("../http/HttpClient.cjs");require("axios");const N=require("../../functions/utils/amounts.utils.cjs");require("ethers");require("../../constants/token-data/index.cjs");require("../../API/getServerURL.cjs");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/save-depths.cjs");require("../../constants/reorg-depths.constants.cjs");require("../../functions/utils/mutexes.utils.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");require("../crypto-keys/keys.cjs");const H=require("../../functions/utils/time.utils.cjs"),$=require("../../functions/pre-transaction/constructAdminData.cjs");require("@solana/spl-token");const O=require("../../functions/web3/events/getInputUtxoAndBalance.cjs"),Z=require("../../functions/web3/events/getShieldedBalance.cjs"),j=require("../../functions/utils/encodeTokenWithId.cjs"),z=async(e,a,i,d)=>{const r=[a.erc20TokenAddress],l=a.erc20TokenAddress,c=await _.getFeeStructure(e.getCurrentChainId(),l,r,E.ExternalActionId.Transact),u=i-c.flatFee;if(u<=0n)throw new Error(`Insufficient balance to cover fee. Balance: ${i}, Fee: ${c.flatFee}`);const t=[-u];W.mergeWithFeeStructure(e.getCurrentChainId(),r,t,c);const o={externalActionId:0n,externalAddress:d,externalActionMetadata:"0x00"},s=[...await Z.addPaddingToUtxos(e,r,t,void 0,void 0,!1,!0)],T=`swapperM${t.length.toString()}x${s[0].length}x1`,A=M.defaultHinkalLogicArgs(t.length,e.userKeys),m=H.getCurrentTimeInSeconds().toString(),q=[];for(let n=0;n<r.length;n+=1){const{outputUtxos:k}=P.outputUtxoProcessing(e.userKeys,s[n],t[n],m,void 0,!1);q.push(k);const{useApprovalUtxoData:x}=R.outputApprovalDataProcessing(e,s[n],t[n]);x&&(A.useApprovalUtxoData[n]=x,A.doPreTxApproval=!0)}const p=await e.getRandomRelay(!0);if(!p)throw Error(U.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const{patchAccessTokenMerkleTree:f,kycRequired:y,hasAccessToken:C}=await L.shouldPatchAccessTokenMerkleTree(e,r,t),w=await K.getSignatureDataForTransact(e.getCurrentChainId(),await e.getEthereumAddress(),e.userKeys,y,C),{zkCallData:I,circomData:h,dimData:v}=await D.constructZkProof("v1x1",e.merkleTreeHinkal,e.merkleTreeAccessToken,s,q,e.userKeys,T,o.externalActionId,o.externalAddress,o.externalActionMetadata,e.generateProofRemotely,p,e.getCurrentChainId(),void 0,void 0,void 0,f,A,void 0,c,e.getContractWithFetcher(B.ContractType.HinkalHelperContract),w,void 0,!1),S=$.constructAdminData(b.AdminTransactionType.WithdrawOnChainUtxos,e.getCurrentChainId(),r,t,await e.getEthereumAddress());return{tx:await F.transactCallRelayer(e.getCurrentChainId(),I,v,h,void 0,void 0,void 0,S),amountToRecipient:u}},G=async(e,a,i)=>{const d=[],r=e.getCurrentChainId(),l=j.encodeTokenWithId(r,{erc20TokenAddress:a.erc20TokenAddress,tokenId:0});for(;;){await e.resetMerkleTreesIfNecessary();const u=((await O.getInputUtxoAndBalancePerToken({hinkal:e,sliceIfMore6:!1,useBlockedUtxos:!0}))?.get(l)??[]).filter(o=>o.amount>0n).slice(0,6).sort((o,s)=>Number(s.amount-o.amount)),g=N.countTotalAmountInUtxos(u);if(!g)break;const{tx:t}=await z(e,a,g,i);d.push(t)}return d};exports.hinkalWithdrawStuckUtxos=G;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const U=require("../../error-handling/error-codes.constants.cjs"),P=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),D=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),F=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),E=require("../../types/external-action.types.cjs"),M=require("../../types/hinkal.types.cjs"),R=require("../../functions/pre-transaction/outputApprovalDataProcessing.cjs"),_=require("../../functions/pre-transaction/getFeeStructure.cjs"),W=require("../../functions/pre-transaction/merge-with-fee-structure.cjs");require("../../types/circom-data.types.cjs");const B=require("../../types/ethereum-network.types.cjs"),b=require("../../types/admin.types.cjs");require("../../types/activities.types.cjs");const K=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),L=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs");require("../../constants/server.constants.cjs");require("../../constants/chains.constants.cjs");require("../../constants/vite.constants.cjs");require("../http/HttpClient.cjs");require("axios");const N=require("../../functions/utils/amounts.utils.cjs");require("ethers");require("../../constants/token-data/index.cjs");require("../../API/getServerURL.cjs");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/save-depths.cjs");require("../../constants/reorg-depths.constants.cjs");require("../../functions/utils/mutexes.utils.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");require("../crypto-keys/keys.cjs");const H=require("../../functions/utils/time.utils.cjs"),$=require("../../functions/pre-transaction/constructAdminData.cjs");require("@solana/spl-token");const O=require("../../functions/web3/events/getInputUtxoAndBalance.cjs"),Z=require("../../functions/web3/events/getShieldedBalance.cjs"),j=require("../../functions/utils/encodeTokenWithId.cjs"),z=async(e,a,i,d)=>{const r=[a.erc20TokenAddress],l=a.erc20TokenAddress,c=await _.getFeeStructure(e.getCurrentChainId(),l,r,E.ExternalActionId.Transact),u=i-c.flatFee;if(u<=0n)throw new Error(`Insufficient balance to cover fee. Balance: ${i}, Fee: ${c.flatFee}`);const t=[-u];W.mergeWithFeeStructure(e.getCurrentChainId(),r,t,c);const o={externalActionId:0n,externalAddress:d,externalActionMetadata:"0x00"},s=[...await Z.addPaddingToUtxos(e,r,t,void 0,void 0,!1,!0)],T=`swapperM${t.length.toString()}x${s[0].length}x1`,A=M.defaultHinkalLogicArgs(t.length,e.userKeys),m=H.getCurrentTimeInSeconds().toString(),q=[];for(let n=0;n<r.length;n+=1){const{outputUtxos:k}=P.outputUtxoProcessing(e.userKeys,s[n],t[n],m,void 0,!1);q.push(k);const{useApprovalUtxoData:x}=R.outputApprovalDataProcessing(e,s[n],t[n]);x&&(A.useApprovalUtxoData[n]=x,A.doPreTxApproval=!0)}const p=await e.getRandomRelay(!0);if(!p)throw Error(U.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const{patchAccessTokenMerkleTree:f,kycRequired:y,hasAccessToken:C}=await L.shouldPatchAccessTokenMerkleTree(e,r,t),w=await K.getSignatureDataForTransact(e.getCurrentChainId(),await e.getEthereumAddress(),e.userKeys,y,C),{zkCallData:I,circomData:h,dimData:v}=await D.constructZkProof("v1x1",e.merkleTreeHinkal,e.merkleTreeAccessToken,s,q,e.userKeys,T,o.externalActionId,o.externalAddress,o.externalActionMetadata,e.generateProofRemotely,p,e.getCurrentChainId(),void 0,void 0,void 0,f,A,void 0,c,e.getContractWithFetcher(B.ContractType.HinkalHelperContract),w,void 0,!1),S=$.constructAdminData(b.AdminTransactionType.WithdrawOnChainUtxos,e.getCurrentChainId(),r,t,await e.getEthereumAddress());return{tx:await F.transactCallRelayer(e.getCurrentChainId(),I,v,h,void 0,void 0,void 0,S),amountToRecipient:u}},G=async(e,a,i)=>{const d=[],r=e.getCurrentChainId(),l=j.encodeTokenWithId(r,{erc20TokenAddress:a.erc20TokenAddress,tokenId:0});for(;;){await e.resetMerkleTreesIfNecessary();const u=((await O.getInputUtxoAndBalancePerToken({hinkal:e,sliceIfMore6:!1,useBlockedUtxos:!0}))?.get(l)??[]).filter(o=>o.amount>0n).slice(0,6).sort((o,s)=>Number(s.amount-o.amount)),g=N.countTotalAmountInUtxos(u);if(!g)break;const{tx:t}=await z(e,a,g,i);d.push(t)}return d};exports.hinkalWithdrawStuckUtxos=G;

package/data-structures/Hinkal/hinkalWithdrawStuckUtxos.mjs

@@ -9,7 +9,6 @@ import { getFeeStructure as L } from "../../functions/pre-transaction/getFeeStru
 import { mergeWithFeeStructure as W } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
 import "../../types/circom-data.types.mjs";
 import { ContractType as B } from "../../types/ethereum-network.types.mjs";
-import "../../types/transactions.types.mjs";
 import { AdminTransactionType as H } from "../../types/admin.types.mjs";
 import "../../types/activities.types.mjs";
 import { getSignatureDataForTransact as N } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
@@ -40,9 +39,9 @@ import { getInputUtxoAndBalancePerToken as q } from "../../functions/web3/events
 import { addPaddingToUtxos as z } from "../../functions/web3/events/getShieldedBalance.mjs";
 import { encodeTokenWithId as V } from "../../functions/utils/encodeTokenWithId.mjs";
 const Y = async (t, s, m, d) => {
-  const r = [s.erc20TokenAddress], p = s.erc20TokenAddress, i = await L(
+  const r = [s.erc20TokenAddress], u = s.erc20TokenAddress, i = await L(
     t.getCurrentChainId(),
-    p,
+    u,
     r,
     F.Transact
   ), c = m - i.flatFee;
@@ -125,22 +124,22 @@ const Y = async (t, s, m, d) => {
     void 0,
     D
   ), amountToRecipient: c };
-}, Wt = async (t, s, m) => {
-  const d = [], r = t.getCurrentChainId(), p = V(r, { erc20TokenAddress: s.erc20TokenAddress, tokenId: 0 });
+}, Lt = async (t, s, m) => {
+  const d = [], r = t.getCurrentChainId(), u = V(r, { erc20TokenAddress: s.erc20TokenAddress, tokenId: 0 });
   for (; ; ) {
     await t.resetMerkleTreesIfNecessary();
     const c = ((await q({
       hinkal: t,
       sliceIfMore6: !1,
       useBlockedUtxos: !0
-    }))?.get(p) ?? []).filter((o) => o.amount > 0n).slice(0, 6).sort((o, n) => Number(n.amount - o.amount)), u = b(c);
-    if (!u)
+    }))?.get(u) ?? []).filter((o) => o.amount > 0n).slice(0, 6).sort((o, n) => Number(n.amount - o.amount)), p = b(c);
+    if (!p)
       break;
-    const { tx: e } = await Y(t, s, u, m);
+    const { tx: e } = await Y(t, s, p, m);
     d.push(e);
   }
   return d;
 };
 export {
-  Wt as hinkalWithdrawStuckUtxos
+  Lt as hinkalWithdrawStuckUtxos
 };