@hinkal/common 0.2.18 → 0.2.19

package/data-structures/Hinkal/hinkalDeposit.mjs

@@ -1,149 +1,151 @@
-import { zeroAddress as D } from "../../constants/protocol.constants.mjs";
-import { outputUtxoProcessing as R } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { constructZkProof as C } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { addPaddingToUtxos as H } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { transactCallDirect as P } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
-import { Utxo as w } from "../utxo/Utxo.mjs";
-import { transactionErrorCodes as z } from "../../error-handling/error-codes.constants.mjs";
+import { zeroAddress as P } from "../../constants/protocol.constants.mjs";
+import { outputUtxoProcessing as H } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { constructZkProof as K } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { addPaddingToUtxos as z } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { transactCallDirect as M } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
+import { Utxo as D } from "../utxo/Utxo.mjs";
+import { transactionErrorCodes as B } from "../../error-handling/error-codes.constants.mjs";
 import "../../types/circom-data.types.mjs";
-import { ContractType as I } from "../../types/ethereum-network.types.mjs";
+import { ContractType as C } from "../../types/ethereum-network.types.mjs";
 import "../../types/transactions.types.mjs";
-import { AdminTransactionType as K } from "../../types/admin.types.mjs";
+import { AdminTransactionType as E } from "../../types/admin.types.mjs";
 import "../../types/activities.types.mjs";
 import { getSignatureDataForTransact as F } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
 import { isValidPrivateAddress as N } from "../../functions/utils/addresses.mjs";
 import { shouldPatchAccessTokenMerkleTree as O } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
 import { getCurrentTimeInSeconds as $ } from "../../functions/utils/time.utils.mjs";
-import { emitTxPublicData as M } from "../../API/admin-calls.mjs";
-import { constructAdminData as E } from "../../functions/pre-transaction/constructAdminData.mjs";
-const S = async (t, s, e) => {
-  const { patchAccessTokenMerkleTree: o, kycRequired: r, hasAccessToken: p } = await O(
+import { emitTxPublicData as I } from "../../API/admin-calls.mjs";
+import { constructAdminData as S } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { validateAndGetChainId as U } from "../../functions/utils/token-check.utils.mjs";
+const R = async (t, a, e, o) => {
+  const { patchAccessTokenMerkleTree: r, kycRequired: s, hasAccessToken: A } = await O(
     t,
-    s,
-    e
-  ), c = void 0, A = await t.getEthereumAddress(), i = await F(
-    t.getCurrentChainId(),
-    A,
+    a,
+    e,
+    o
+  ), n = void 0, l = await t.getEthereumAddress(), d = await F(
+    a,
+    l,
     t.userKeys,
-    r,
-    p
-  ), n = {
+    s,
+    A
+  ), c = {
     externalActionId: 0n,
     externalAddress: await t.getEthereumAddress(),
     externalActionMetadata: "0x00"
   };
   return {
-    signatureData: i,
-    externalActionData: n,
-    contractTransaction: c,
-    contractToApprove: c,
-    patchAccessTokenMerkleTree: o
+    signatureData: d,
+    externalActionData: c,
+    contractTransaction: n,
+    contractToApprove: n,
+    patchAccessTokenMerkleTree: r
   };
-}, rt = async (t, s, e) => {
-  const o = s.map((a) => a.erc20TokenAddress), { externalActionData: r, contractTransaction: p, contractToApprove: c, patchAccessTokenMerkleTree: A, signatureData: i } = await S(t, o, e), n = [...await H(t, o, e)], u = `swapperM${e.length.toString()}x${n[0].length}x1`, d = [], x = $().toString();
-  for (let a = 0; a < o.length; a += 1) {
-    const { outputUtxos: f } = R(t.userKeys, n[a], e[a], x);
-    d.push(f);
+}, st = async (t, a, e) => {
+  const o = U(a), r = a.map((i) => i.erc20TokenAddress), { externalActionData: s, contractTransaction: A, contractToApprove: n, patchAccessTokenMerkleTree: l, signatureData: d } = await R(t, o, r, e), c = [...await z(t, o, r, e)], x = `swapperM${e.length.toString()}x${c[0].length}x1`, m = [], u = $().toString();
+  for (let i = 0; i < r.length; i += 1) {
+    const { outputUtxos: w } = H(t.userKeys, c[i], e[i], u);
+    m.push(w);
   }
-  const { zkCallData: T, circomData: g, dimData: v } = await C(
+  const { zkCallData: y, circomData: T, dimData: v } = await K(
     "v1x1",
-    t.merkleTreeHinkal,
-    t.merkleTreeAccessToken,
-    n,
-    d,
+    t.merkleTreeHinkalByChain[o],
+    t.merkleTreeAccessTokenByChain[o],
+    c,
+    m,
     t.userKeys,
-    u,
-    r.externalActionId,
-    r.externalAddress,
-    r.externalActionMetadata,
+    x,
+    s.externalActionId,
+    s.externalAddress,
+    s.externalActionMetadata,
     t.generateProofRemotely,
-    D,
-    t.getCurrentChainId(),
-    void 0,
+    P,
+    o,
     void 0,
     void 0,
     void 0,
-    A,
+    l,
     void 0,
     void 0,
     void 0,
-    t.getContractWithFetcher(I.HinkalHelperContract),
-    i
-  ), y = await P(
+    t.getContractWithFetcher(o, C.HinkalHelperContract),
+    d
+  ), f = await M(
     t,
+    o,
     e,
     // for volotile tokens: amountChanges != amountOfTokenToApprove
-    s,
+    a,
+    y,
     T,
-    g,
     v,
-    c,
-    p
-  ), l = E(
-    K.Onboarding,
-    t.getCurrentChainId(),
+    n,
+    A
+  ), g = S(
+    E.Onboarding,
     o,
+    r,
     e,
     await t.getEthereumAddress()
   );
-  return M(t.getCurrentChainId(), l), y;
-}, ot = async (t, s, e, o) => {
-  const r = s.map((m) => m.erc20TokenAddress), [p, c, A] = o.split(",");
+  return I(g), f;
+}, it = async (t, a, e, o) => {
+  const r = U(a), s = a.map((p) => p.erc20TokenAddress), [A, n, l] = o.split(",");
   if (!N(o))
-    throw Error(z.RECIPIENT_FORMAT_INCORRECT);
-  const i = r.map((m) => [
-    new w({ amount: 0n, erc20TokenAddress: m, shieldedPrivateKey: t.userKeys.getShieldedPrivateKey() }),
-    new w({ amount: 0n, erc20TokenAddress: m, shieldedPrivateKey: t.userKeys.getShieldedPrivateKey() })
-  ]), n = `swapperM${e.length.toString()}x${i[0].length}x1`, u = r.map((m, U) => [
-    new w({
-      amount: e[U],
-      erc20TokenAddress: m,
-      randomization: BigInt(p),
-      stealthAddress: c,
-      encryptionKey: A
+    throw Error(B.RECIPIENT_FORMAT_INCORRECT);
+  const d = s.map((p) => [
+    new D({ amount: 0n, erc20TokenAddress: p, shieldedPrivateKey: t.userKeys.getShieldedPrivateKey() }),
+    new D({ amount: 0n, erc20TokenAddress: p, shieldedPrivateKey: t.userKeys.getShieldedPrivateKey() })
+  ]), c = `swapperM${e.length.toString()}x${d[0].length}x1`, x = s.map((p, h) => [
+    new D({
+      amount: e[h],
+      erc20TokenAddress: p,
+      randomization: BigInt(A),
+      stealthAddress: n,
+      encryptionKey: l
     })
-  ]), { externalActionData: d, contractTransaction: x, contractToApprove: T, patchAccessTokenMerkleTree: g } = await S(t, r, e), { zkCallData: v, circomData: y, dimData: l } = await C(
+  ]), { externalActionData: m, contractTransaction: u, contractToApprove: y, patchAccessTokenMerkleTree: T } = await R(t, r, s, e), { zkCallData: v, circomData: f, dimData: g } = await K(
     "v1x1",
-    t.merkleTreeHinkal,
-    t.merkleTreeAccessToken,
-    i,
-    u,
+    t.merkleTreeHinkalByChain[r],
+    t.merkleTreeAccessTokenByChain[r],
+    d,
+    x,
     t.userKeys,
-    n,
-    d.externalActionId,
-    d.externalAddress,
-    d.externalActionMetadata,
+    c,
+    m.externalActionId,
+    m.externalAddress,
+    m.externalActionMetadata,
     t.generateProofRemotely,
-    D,
-    t.getCurrentChainId(),
-    void 0,
+    P,
+    r,
     void 0,
     void 0,
     void 0,
-    g,
+    T,
     void 0,
     void 0,
     void 0,
-    t.getContractWithFetcher(I.HinkalHelperContract)
-  ), a = await P(
+    t.getContractWithFetcher(r, C.HinkalHelperContract)
+  ), i = await M(
     t,
+    r,
     e,
-    s,
+    a,
     v,
+    f,
+    g,
     y,
-    l,
-    T,
-    x
-  ), f = E(
-    K.PaymentLink,
-    t.getCurrentChainId(),
+    u
+  ), w = S(
+    E.PaymentLink,
     r,
+    s,
     e,
     await t.getEthereumAddress()
   );
-  return M(t.getCurrentChainId(), f), a;
+  return I(w), i;
 };
 export {
-  rt as hinkalDeposit,
-  ot as hinkalDepositForOther
+  st as hinkalDeposit,
+  it as hinkalDepositForOther
 };

package/data-structures/Hinkal/hinkalDepositAndWithdraw.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const N=require("ethers"),F=require("../../constants/protocol.constants.cjs"),j=require("../../error-handling/error-codes.constants.cjs"),G=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),_=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),V=require("../../functions/web3/events/getShieldedBalance.cjs"),X=require("../../functions/web3/functionCalls/transactCallDirect.cjs"),Y=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),K=require("../../types/external-action.types.cjs"),J=require("../utxo/Utxo.cjs");require("../../types/circom-data.types.cjs");const v=require("../../types/ethereum-network.types.cjs");require("../../types/transactions.types.cjs");const H=require("../../types/admin.types.cjs");require("../../types/activities.types.cjs");const W=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),z=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),Q=require("../../functions/utils/time.utils.cjs"),tt=require("../../functions/utils/getUtxosFromReceipt.utils.cjs"),et=require("../../functions/pre-transaction/getFeeStructure.cjs"),rt=require("../../functions/utils/fees.utils.cjs"),st=require("../../API/unspent-utxos-calls.cjs"),ot=require("../../functions/utils/addresses.cjs"),B=require("../../functions/pre-transaction/constructAdminData.cjs"),nt=require("../../API/admin-calls.cjs"),at=async(t,o,i,p,m,A)=>{const r=o.erc20TokenAddress,d=await t.getEthereumAddress(),s=i.map(e=>e+rt.calculateTotalFee(e,m)),n=[r],a=[0n],w=[!0],{patchAccessTokenMerkleTree:u,kycRequired:I,hasAccessToken:P}=await z.shouldPatchAccessTokenMerkleTree(t,n,a),S=await W.getSignatureDataForTransact(t.getCurrentChainId(),d,t.userKeys,I,P),c=[...await V.addPaddingToUtxos(t,n,a)],T=[];for(let e=0;e<c.length;e+=1){const{outputUtxos:g}=G.outputUtxoProcessing(t.userKeys,c[e],a[e]);T.push(g)}const h=s.reduce((e,g)=>e+g,0n),y=N.ethers.utils.defaultAbiCoder.encode(["uint256[]"],[s]),D=t.getContractWithSigner(v.ContractType.HinkalWrapper),q=t.getContractWithSigner(v.ContractType.DepositOnChainUtxos),{zkCallData:C,circomData:E,dimData:R}=await _.constructZkProof("v1x1",t.merkleTreeHinkal,t.merkleTreeAccessToken,c,T,t.userKeys,`swapperM1x${c[0].length}x1`,K.ExternalActionId.DepositOnChainUtxos,q.address,y,t.generateProofRemotely,F.zeroAddress,t.getCurrentChainId(),w,void 0,void 0,void 0,u,void 0,void 0,void 0,t.getContractWithFetcher(v.ContractType.HinkalHelperContract),S,D.address,!1),k=await(await X.transactCallDirect(t,h,o,C,E,R,q,D)).wait(),U=tt.getUtxosFromReceipt(k,t,r),f=[],x=[...U];p.forEach((e,g)=>{const b=s[g],M=x.find(L=>L.amount===b);if(!M)throw new Error(`Could not find newly created UTXO with amount ${b} for recipient ${e}.`);f.push({recipientAddress:e,utxo:M});const $=x.indexOf(M);x.splice($,1)});const l=t.getCurrentChainId();await st.storeUnspentUtxos(l,{hashedEthereumAddress:A,chainId:l,utxos:U});const Z=B.constructAdminData(H.AdminTransactionType.DepositOnChainUtxos,l,n,[h],d);return nt.emitTxPublicData(l,Z),f},ct=async(t,o,i,p,m,A)=>{if(i.length===0)throw new Error("userDepositedUtxos must not be empty");const r=o.erc20TokenAddress,d=await t.getRandomRelay();if(!d)throw Error(j.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const s=await t.getEthereumAddress(),n=Q.getCurrentTimeInSeconds().toString(),a=t.generateProofRemotely?5:1,w=[];for(let u=0;u<i.length;u+=a){const I=i.slice(u,u+a),P=await Promise.all(I.map(async({recipientAddress:S,utxo:c})=>{const T=[-c.amount],h=new J.Utxo({amount:0n,erc20TokenAddress:r,shieldedPrivateKey:t.userKeys.getShieldedPrivateKey(),timeStamp:n,tokenId:0}),y=[[c,h]],D=[[h]],q=`swapperM1x${y[0].length}x1`,C={externalActionId:0n,externalAddress:S,externalActionMetadata:"0x00"},{patchAccessTokenMerkleTree:E,kycRequired:R,hasAccessToken:O}=await z.shouldPatchAccessTokenMerkleTree(t,[r],T),k=await W.getSignatureDataForTransact(t.getCurrentChainId(),s,t.userKeys,R,O),U=B.constructAdminData(H.AdminTransactionType.WithdrawOnChainUtxos,t.getCurrentChainId(),[r],[-c.amount],s),{zkCallData:f,circomData:x,dimData:l}=await _.constructZkProof("v1x1",t.merkleTreeHinkal,t.merkleTreeAccessToken,y,D,t.userKeys,q,C.externalActionId,C.externalAddress,C.externalActionMetadata,t.generateProofRemotely,d??F.zeroAddress,t.getCurrentChainId(),void 0,void 0,void 0,void 0,E,void 0,void 0,p,t.getContractWithFetcher(v.ContractType.HinkalHelperContract),k,void 0,!1);return{zkCallData:f,dimData:l,circomData:x,adminData:U}}));w.push(...P)}return Y.transactCallRelayerBatch(t.getCurrentChainId(),w,m,A)},it=async(t,o,i,p,m,A)=>{const r=o.erc20TokenAddress,d=t.getCurrentChainId(),s=ot.hashEthereumAddress(await t.getEthereumAddress()),n=A??await et.getFeeStructure(d,r,[r],K.ExternalActionId.Transact),a=await at(t,o,i,p,n,s);return ct(t,o,a,n,s,m)};exports.hinkalDepositAndWithdraw=it;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const G=require("ethers"),K=require("../../constants/protocol.constants.cjs"),j=require("../../error-handling/error-codes.constants.cjs"),V=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),B=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),X=require("../../functions/web3/events/getShieldedBalance.cjs"),Y=require("../../functions/web3/functionCalls/transactCallDirect.cjs"),J=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),H=require("../../types/external-action.types.cjs"),Q=require("../utxo/Utxo.cjs");require("../../types/circom-data.types.cjs");const k=require("../../types/ethereum-network.types.cjs");require("../../types/transactions.types.cjs");const W=require("../../types/admin.types.cjs");require("../../types/activities.types.cjs");const z=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),Z=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),I=require("../../functions/utils/time.utils.cjs"),tt=require("../../functions/utils/getUtxosFromReceipt.utils.cjs"),et=require("../../functions/pre-transaction/getFeeStructure.cjs"),rt=require("../../functions/utils/fees.utils.cjs"),st=require("../../API/unspent-utxos-calls.cjs"),ot=require("../../functions/utils/addresses.cjs"),$=require("../../functions/pre-transaction/constructAdminData.cjs"),at=require("../../API/admin-calls.cjs"),nt=require("../../functions/utils/token-check.utils.cjs"),ct=async(t,e,u,c,A,m,d)=>{const s=u.erc20TokenAddress,a=await t.getEthereumAddress(),o=c.map(r=>r+rt.calculateTotalFee(r,m)),i=[s],l=[0n],T=[!0],{patchAccessTokenMerkleTree:p,kycRequired:v,hasAccessToken:P}=await Z.shouldPatchAccessTokenMerkleTree(t,e,i,l),S=await z.getSignatureDataForTransact(e,a,t.userKeys,v,P),n=[...await X.addPaddingToUtxos(t,e,i,l)],g=[];for(let r=0;r<n.length;r+=1){const{outputUtxos:C}=V.outputUtxoProcessing(t.userKeys,n[r],l[r]);g.push(C)}const x=o.reduce((r,C)=>r+C,0n),h=G.ethers.utils.defaultAbiCoder.encode(["uint256[]"],[o]),D=t.getContractWithSigner(e,k.ContractType.HinkalWrapper),q=t.getContractWithSigner(e,k.ContractType.DepositOnChainUtxos),{zkCallData:w,circomData:E,dimData:R}=await B.constructZkProof("v1x1",t.merkleTreeHinkalByChain[e],t.merkleTreeAccessTokenByChain[e],n,g,t.userKeys,`swapperM1x${n[0].length}x1`,H.ExternalActionId.DepositOnChainUtxos,q.address,h,t.generateProofRemotely,K.zeroAddress,e,T,void 0,void 0,p,void 0,void 0,void 0,t.getContractWithFetcher(e,k.ContractType.HinkalHelperContract),S,D.address,!1),M=await(await Y.transactCallDirect(t,e,x,u,w,E,R,q,D)).wait(),U=tt.getUtxosFromReceipt(M,t,e,s),f=[],y=[...U];A.forEach((r,C)=>{const F=o[C],_=y.find(N=>N.amount===F);if(!_)throw new Error(`Could not find newly created UTXO with amount ${F} for recipient ${r}.`);f.push({recipientAddress:r,utxo:_});const L=y.indexOf(_);y.splice(L,1)}),await st.storeUnspentUtxos({hashedEthereumAddress:d,chainId:e,utxos:U});const O=$.constructAdminData(W.AdminTransactionType.DepositOnChainUtxos,e,i,[x],a);return at.emitTxPublicData(O),f},it=async(t,e,u,c,A,m,d)=>{if(c.length===0)throw new Error("userDepositedUtxos must not be empty");const s=u.erc20TokenAddress,a=await t.getRandomRelay(e);if(!a)throw Error(j.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const o=await t.getEthereumAddress(),i=I.getCurrentTimeInSeconds().toString(),l=t.generateProofRemotely?5:1,T=[];for(let p=0;p<c.length;p+=l){const v=c.slice(p,p+l),P=await Promise.all(v.map(async({recipientAddress:S,utxo:n})=>{const g=[-n.amount],x=new Q.Utxo({amount:0n,erc20TokenAddress:s,shieldedPrivateKey:t.userKeys.getShieldedPrivateKey(),timeStamp:i,tokenId:0}),h=[[n,x]],D=[[x]],q=`swapperM1x${h[0].length}x1`,w={externalActionId:0n,externalAddress:S,externalActionMetadata:"0x00"},{patchAccessTokenMerkleTree:E,kycRequired:R,hasAccessToken:b}=await Z.shouldPatchAccessTokenMerkleTree(t,e,[s],g),M=await z.getSignatureDataForTransact(e,o,t.userKeys,R,b),U=$.constructAdminData(W.AdminTransactionType.WithdrawOnChainUtxos,e,[s],[-n.amount],o),{zkCallData:f,circomData:y,dimData:O}=await B.constructZkProof("v1x1",t.merkleTreeHinkalByChain[e],t.merkleTreeAccessTokenByChain[e],h,D,t.userKeys,q,w.externalActionId,w.externalAddress,w.externalActionMetadata,t.generateProofRemotely,a??K.zeroAddress,e,void 0,void 0,void 0,E,void 0,void 0,A,t.getContractWithFetcher(e,k.ContractType.HinkalHelperContract),M,void 0,!1);return{zkCallData:f,dimData:O,circomData:y,adminData:U}}));T.push(...P)}return J.transactCallRelayerBatch(e,T,m,d)},ut=async(t,e,u,c,A,m)=>{const d=e.erc20TokenAddress,s=nt.validateAndGetChainId([e]),a=ot.hashEthereumAddress(await t.getEthereumAddress()),o=m??await et.getFeeStructure(s,d,[d],H.ExternalActionId.Transact),i=await ct(t,s,e,u,c,o,a);return it(t,s,e,i,o,a,A)};exports.hinkalDepositAndWithdraw=ut;

package/data-structures/Hinkal/hinkalDepositAndWithdraw.mjs

@@ -1,206 +1,202 @@
-import { ethers as _ } from "ethers";
+import { ethers as G } from "ethers";
 import { zeroAddress as W } from "../../constants/protocol.constants.mjs";
 import { transactionErrorCodes as V } from "../../error-handling/error-codes.constants.mjs";
 import { outputUtxoProcessing as X } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
 import { constructZkProof as F } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
 import { addPaddingToUtxos as Y } from "../../functions/web3/events/getShieldedBalance.mjs";
 import { transactCallDirect as j } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
-import { transactCallRelayerBatch as G } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { transactCallRelayerBatch as J } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
 import { ExternalActionId as z } from "../../types/external-action.types.mjs";
-import { Utxo as J } from "../utxo/Utxo.mjs";
+import { Utxo as Q } from "../utxo/Utxo.mjs";
 import "../../types/circom-data.types.mjs";
-import { ContractType as I } from "../../types/ethereum-network.types.mjs";
+import { ContractType as E } from "../../types/ethereum-network.types.mjs";
 import "../../types/transactions.types.mjs";
-import { AdminTransactionType as k } from "../../types/admin.types.mjs";
+import { AdminTransactionType as $ } from "../../types/admin.types.mjs";
 import "../../types/activities.types.mjs";
-import { getSignatureDataForTransact as $ } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
-import { shouldPatchAccessTokenMerkleTree as q } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
-import { getCurrentTimeInSeconds as Q } from "../../functions/utils/time.utils.mjs";
+import { getSignatureDataForTransact as q } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
+import { shouldPatchAccessTokenMerkleTree as L } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
+import { getCurrentTimeInSeconds as I } from "../../functions/utils/time.utils.mjs";
 import { getUtxosFromReceipt as tt } from "../../functions/utils/getUtxosFromReceipt.utils.mjs";
 import { getFeeStructure as et } from "../../functions/pre-transaction/getFeeStructure.mjs";
 import { calculateTotalFee as ot } from "../../functions/utils/fees.utils.mjs";
 import { storeUnspentUtxos as rt } from "../../API/unspent-utxos-calls.mjs";
 import { hashEthereumAddress as st } from "../../functions/utils/addresses.mjs";
-import { constructAdminData as B } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { constructAdminData as N } from "../../functions/pre-transaction/constructAdminData.mjs";
 import { emitTxPublicData as at } from "../../API/admin-calls.mjs";
-const nt = async (t, s, c, p, A, w) => {
-  const o = s.erc20TokenAddress, d = await t.getEthereumAddress(), r = c.map((e) => e + ot(e, A)), a = [o], n = [0n], g = [!0], { patchAccessTokenMerkleTree: m, kycRequired: E, hasAccessToken: R } = await q(
+import { validateAndGetChainId as nt } from "../../functions/utils/token-check.utils.mjs";
+const it = async (t, e, m, i, A, l, d) => {
+  const r = m.erc20TokenAddress, a = await t.getEthereumAddress(), s = i.map((o) => o + ot(o, l)), c = [r], p = [0n], C = [!0], { patchAccessTokenMerkleTree: u, kycRequired: R, hasAccessToken: P } = await L(
     t,
+    e,
+    c,
+    p
+  ), S = await q(
+    e,
     a,
-    n
-  ), P = await $(
-    t.getCurrentChainId(),
-    d,
     t.userKeys,
-    E,
-    R
-  ), i = [...await Y(t, a, n)], l = [];
-  for (let e = 0; e < i.length; e += 1) {
-    const { outputUtxos: f } = X(t.userKeys, i[e], n[e]);
-    l.push(f);
+    R,
+    P
+  ), n = [...await Y(t, e, c, p)], g = [];
+  for (let o = 0; o < n.length; o += 1) {
+    const { outputUtxos: y } = X(t.userKeys, n[o], p[o]);
+    g.push(y);
   }
-  const h = r.reduce((e, f) => e + f, 0n), T = _.utils.defaultAbiCoder.encode(["uint256[]"], [r]), y = t.getContractWithSigner(I.HinkalWrapper), D = t.getContractWithSigner(I.DepositOnChainUtxos), {
+  const w = s.reduce((o, y) => o + y, 0n), h = G.utils.defaultAbiCoder.encode(["uint256[]"], [s]), T = t.getContractWithSigner(e, E.HinkalWrapper), D = t.getContractWithSigner(e, E.DepositOnChainUtxos), {
     zkCallData: x,
-    circomData: S,
+    circomData: k,
     dimData: O
   } = await F(
     "v1x1",
-    t.merkleTreeHinkal,
-    t.merkleTreeAccessToken,
-    i,
-    l,
+    t.merkleTreeHinkalByChain[e],
+    t.merkleTreeAccessTokenByChain[e],
+    n,
+    g,
     t.userKeys,
-    `swapperM1x${i[0].length}x1`,
+    `swapperM1x${n[0].length}x1`,
     z.DepositOnChainUtxos,
     D.address,
-    T,
+    h,
     t.generateProofRemotely,
     W,
-    t.getCurrentChainId(),
-    g,
+    e,
+    C,
     void 0,
     void 0,
-    void 0,
-    m,
+    u,
     void 0,
     void 0,
     void 0,
-    t.getContractWithFetcher(I.HinkalHelperContract),
-    P,
-    y.address,
+    t.getContractWithFetcher(e, E.HinkalHelperContract),
+    S,
+    T.address,
     !1
   ), K = await (await j(
     t,
-    h,
-    s,
+    e,
+    w,
+    m,
     x,
-    S,
+    k,
     O,
     D,
-    y
-  )).wait(), U = tt(K, t, o), v = [], C = [...U];
-  p.forEach((e, f) => {
-    const M = r[f], b = C.find((Z) => Z.amount === M);
-    if (!b)
-      throw new Error(`Could not find newly created UTXO with amount ${M} for recipient ${e}.`);
+    T
+  )).wait(), U = tt(K, t, e, r), v = [], f = [...U];
+  A.forEach((o, y) => {
+    const B = s[y], H = f.find((_) => _.amount === B);
+    if (!H)
+      throw new Error(`Could not find newly created UTXO with amount ${B} for recipient ${o}.`);
     v.push({
-      recipientAddress: e,
-      utxo: b
+      recipientAddress: o,
+      utxo: H
     });
-    const N = C.indexOf(b);
-    C.splice(N, 1);
-  });
-  const u = t.getCurrentChainId();
-  await rt(u, {
-    hashedEthereumAddress: w,
-    chainId: u,
+    const Z = f.indexOf(H);
+    f.splice(Z, 1);
+  }), await rt({
+    hashedEthereumAddress: d,
+    chainId: e,
     utxos: U
   });
-  const L = B(
-    k.DepositOnChainUtxos,
-    u,
-    a,
-    [h],
-    d
+  const b = N(
+    $.DepositOnChainUtxos,
+    e,
+    c,
+    [w],
+    a
   );
-  return at(u, L), v;
-}, it = async (t, s, c, p, A, w) => {
-  if (c.length === 0)
+  return at(b), v;
+}, ct = async (t, e, m, i, A, l, d) => {
+  if (i.length === 0)
     throw new Error("userDepositedUtxos must not be empty");
-  const o = s.erc20TokenAddress, d = await t.getRandomRelay();
-  if (!d)
+  const r = m.erc20TokenAddress, a = await t.getRandomRelay(e);
+  if (!a)
     throw Error(V.RELAYER_NOT_AVAILABLE);
-  const r = await t.getEthereumAddress(), a = Q().toString(), n = t.generateProofRemotely ? 5 : 1, g = [];
-  for (let m = 0; m < c.length; m += n) {
-    const E = c.slice(m, m + n), R = await Promise.all(
-      E.map(async ({ recipientAddress: P, utxo: i }) => {
-        const l = [-i.amount], h = new J({
+  const s = await t.getEthereumAddress(), c = I().toString(), p = t.generateProofRemotely ? 5 : 1, C = [];
+  for (let u = 0; u < i.length; u += p) {
+    const R = i.slice(u, u + p), P = await Promise.all(
+      R.map(async ({ recipientAddress: S, utxo: n }) => {
+        const g = [-n.amount], w = new Q({
           amount: 0n,
-          erc20TokenAddress: o,
+          erc20TokenAddress: r,
           shieldedPrivateKey: t.userKeys.getShieldedPrivateKey(),
-          timeStamp: a,
+          timeStamp: c,
           tokenId: 0
-        }), T = [[i, h]], y = [[h]], D = `swapperM1x${T[0].length}x1`, x = {
+        }), h = [[n, w]], T = [[w]], D = `swapperM1x${h[0].length}x1`, x = {
           externalActionId: 0n,
-          externalAddress: P,
+          externalAddress: S,
           externalActionMetadata: "0x00"
         }, {
-          patchAccessTokenMerkleTree: S,
+          patchAccessTokenMerkleTree: k,
           kycRequired: O,
-          hasAccessToken: H
-        } = await q(t, [o], l), K = await $(
-          t.getCurrentChainId(),
-          r,
+          hasAccessToken: M
+        } = await L(t, e, [r], g), K = await q(
+          e,
+          s,
           t.userKeys,
           O,
-          H
-        ), U = B(
-          k.WithdrawOnChainUtxos,
-          t.getCurrentChainId(),
-          [o],
-          [-i.amount],
-          r
-        ), { zkCallData: v, circomData: C, dimData: u } = await F(
+          M
+        ), U = N(
+          $.WithdrawOnChainUtxos,
+          e,
+          [r],
+          [-n.amount],
+          s
+        ), { zkCallData: v, circomData: f, dimData: b } = await F(
           "v1x1",
-          t.merkleTreeHinkal,
-          t.merkleTreeAccessToken,
+          t.merkleTreeHinkalByChain[e],
+          t.merkleTreeAccessTokenByChain[e],
+          h,
           T,
-          y,
           t.userKeys,
           D,
           x.externalActionId,
           x.externalAddress,
           x.externalActionMetadata,
           t.generateProofRemotely,
-          d ?? W,
-          t.getCurrentChainId(),
-          void 0,
+          a ?? W,
+          e,
           void 0,
           void 0,
           void 0,
-          S,
+          k,
           void 0,
           void 0,
-          p,
-          t.getContractWithFetcher(I.HinkalHelperContract),
+          A,
+          t.getContractWithFetcher(e, E.HinkalHelperContract),
           K,
           void 0,
           !1
         );
         return {
           zkCallData: v,
-          dimData: u,
-          circomData: C,
+          dimData: b,
+          circomData: f,
           adminData: U
         };
       })
     );
-    g.push(...R);
+    C.push(...P);
   }
-  return G(
-    t.getCurrentChainId(),
-    g,
-    A,
-    w
-  );
-}, bt = async (t, s, c, p, A, w) => {
-  const o = s.erc20TokenAddress, d = t.getCurrentChainId(), r = st(await t.getEthereumAddress()), a = w ?? await et(d, o, [o], z.Transact), n = await nt(
+  return J(e, C, l, d);
+}, Mt = async (t, e, m, i, A, l) => {
+  const d = e.erc20TokenAddress, r = nt([e]), a = st(await t.getEthereumAddress()), s = l ?? await et(r, d, [d], z.Transact), c = await it(
     t,
+    r,
+    e,
+    m,
+    i,
     s,
-    c,
-    p,
-    a,
-    r
+    a
   );
-  return it(
+  return ct(
     t,
+    r,
+    e,
+    c,
     s,
-    n,
     a,
-    r,
     A
   );
 };
 export {
-  bt as hinkalDepositAndWithdraw
+  Mt as hinkalDepositAndWithdraw
 };

package/data-structures/Hinkal/hinkalGetZkMeProvider.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("../../API/API.cjs"),n=r=>({async getAccessToken(){const e=r.getCurrentChainId();return a.API.getZkMeAccessToken(e)},async getUserAccounts(){return[await r.getEthereumAddress()]},async delegateTransaction(e){const t=await r.getProviderAdapter(),s={...e,chainId:Number(e.chainId),type:e.type?e.type:void 0,maxPriorityFeePerGas:e.maxPriorityFeePerGas?e.maxPriorityFeePerGas:void 0,maxFeePerGas:e.maxFeePerGas?e.maxFeePerGas:void 0};return(await t.sendTransaction(s)).hash}});exports.getHinkalZkMeProvider=n;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("../../API/API.cjs"),o=r=>({async getAccessToken(){return a.API.getZkMeAccessToken()},async getUserAccounts(){return[await r.getEthereumAddress()]},async delegateTransaction(e){const s=await r.getProviderAdapter(),t={...e,chainId:Number(e.chainId),type:e.type?e.type:void 0,maxPriorityFeePerGas:e.maxPriorityFeePerGas?e.maxPriorityFeePerGas:void 0,maxFeePerGas:e.maxFeePerGas?e.maxFeePerGas:void 0};return(await s.sendTransaction(t)).hash}});exports.getHinkalZkMeProvider=o;

package/data-structures/Hinkal/hinkalGetZkMeProvider.mjs

@@ -1,8 +1,7 @@
 import { API as a } from "../../API/API.mjs";
 const d = (r) => ({
   async getAccessToken() {
-    const e = r.getCurrentChainId();
-    return a.getZkMeAccessToken(e);
+    return a.getZkMeAccessToken();
   },
   async getUserAccounts() {
     return [await r.getEthereumAddress()];