@hinkal/common 0.2.18 → 0.2.20

package/data-structures/Hinkal/hinkalDeposit.mjs

@@ -1,149 +1,151 @@
-import { zeroAddress as D } from "../../constants/protocol.constants.mjs";
+import { zeroAddress as P } 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 { transactCallDirect as K } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
+import { Utxo as D } from "../utxo/Utxo.mjs";
 import { transactionErrorCodes as z } 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 M } from "../../types/ethereum-network.types.mjs";
 import "../../types/transactions.types.mjs";
-import { AdminTransactionType as K } from "../../types/admin.types.mjs";
+import { AdminTransactionType as B } 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 E } from "../../API/admin-calls.mjs";
+import { constructAdminData as h } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { validateAndGetChainId as S } from "../../functions/utils/token-check.utils.mjs";
+const U = async (t, a, r, o) => {
+  const { patchAccessTokenMerkleTree: e, kycRequired: s, hasAccessToken: A } = await O(
     t,
-    s,
-    e
-  ), c = void 0, A = await t.getEthereumAddress(), i = await F(
-    t.getCurrentChainId(),
-    A,
-    t.userKeys,
+    a,
     r,
-    p
+    o
+  ), c = void 0, y = await t.getEthereumAddressByChain(a), d = await F(
+    a,
+    y,
+    t.userKeys,
+    s,
+    A
   ), n = {
     externalActionId: 0n,
-    externalAddress: await t.getEthereumAddress(),
+    externalAddress: await t.getEthereumAddressByChain(a),
     externalActionMetadata: "0x00"
   };
   return {
-    signatureData: i,
+    signatureData: d,
     externalActionData: n,
     contractTransaction: c,
     contractToApprove: c,
-    patchAccessTokenMerkleTree: o
+    patchAccessTokenMerkleTree: e
   };
-}, 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, r) => {
+  const o = S(a), e = a.map((i) => i.erc20TokenAddress), { externalActionData: s, contractTransaction: A, contractToApprove: c, patchAccessTokenMerkleTree: y, signatureData: d } = await U(t, o, e, r), n = [...await H(t, o, e, r)], l = `swapperM${r.length.toString()}x${n[0].length}x1`, m = [], x = $().toString();
+  for (let i = 0; i < e.length; i += 1) {
+    const { outputUtxos: w } = R(t.userKeys, n[i], r[i], x);
+    m.push(w);
   }
-  const { zkCallData: T, circomData: g, dimData: v } = await C(
+  const { zkCallData: u, circomData: T, dimData: v } = await C(
     "v1x1",
-    t.merkleTreeHinkal,
-    t.merkleTreeAccessToken,
+    t.merkleTreeHinkalByChain[o],
+    t.merkleTreeAccessTokenByChain[o],
     n,
-    d,
+    m,
     t.userKeys,
-    u,
-    r.externalActionId,
-    r.externalAddress,
-    r.externalActionMetadata,
+    l,
+    s.externalActionId,
+    s.externalAddress,
+    s.externalActionMetadata,
     t.generateProofRemotely,
-    D,
-    t.getCurrentChainId(),
-    void 0,
+    P,
+    o,
     void 0,
     void 0,
     void 0,
-    A,
+    y,
     void 0,
     void 0,
     void 0,
-    t.getContractWithFetcher(I.HinkalHelperContract),
-    i
-  ), y = await P(
+    t.getContractWithFetcher(o, M.HinkalHelperContract),
+    d
+  ), f = await K(
     t,
-    e,
+    o,
+    r,
     // for volotile tokens: amountChanges != amountOfTokenToApprove
-    s,
+    a,
+    u,
     T,
-    g,
     v,
     c,
-    p
-  ), l = E(
-    K.Onboarding,
-    t.getCurrentChainId(),
+    A
+  ), g = h(
+    B.Onboarding,
     o,
     e,
-    await t.getEthereumAddress()
+    r,
+    await t.getEthereumAddressByChain(o)
   );
-  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 E(g), f;
+}, it = async (t, a, r, o) => {
+  const e = S(a), s = a.map((p) => p.erc20TokenAddress), [A, c, y] = 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),
+  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() })
+  ]), n = `swapperM${r.length.toString()}x${d[0].length}x1`, l = s.map((p, I) => [
+    new D({
+      amount: r[I],
+      erc20TokenAddress: p,
+      randomization: BigInt(A),
       stealthAddress: c,
-      encryptionKey: A
+      encryptionKey: y
     })
-  ]), { externalActionData: d, contractTransaction: x, contractToApprove: T, patchAccessTokenMerkleTree: g } = await S(t, r, e), { zkCallData: v, circomData: y, dimData: l } = await C(
+  ]), { externalActionData: m, contractTransaction: x, contractToApprove: u, patchAccessTokenMerkleTree: T } = await U(t, e, s, r), { zkCallData: v, circomData: f, dimData: g } = await C(
     "v1x1",
-    t.merkleTreeHinkal,
-    t.merkleTreeAccessToken,
-    i,
-    u,
+    t.merkleTreeHinkalByChain[e],
+    t.merkleTreeAccessTokenByChain[e],
+    d,
+    l,
     t.userKeys,
     n,
-    d.externalActionId,
-    d.externalAddress,
-    d.externalActionMetadata,
+    m.externalActionId,
+    m.externalAddress,
+    m.externalActionMetadata,
     t.generateProofRemotely,
-    D,
-    t.getCurrentChainId(),
-    void 0,
+    P,
+    e,
     void 0,
     void 0,
     void 0,
-    g,
+    T,
     void 0,
     void 0,
     void 0,
-    t.getContractWithFetcher(I.HinkalHelperContract)
-  ), a = await P(
+    t.getContractWithFetcher(e, M.HinkalHelperContract)
+  ), i = await K(
     t,
     e,
-    s,
+    r,
+    a,
     v,
-    y,
-    l,
-    T,
+    f,
+    g,
+    u,
     x
-  ), f = E(
-    K.PaymentLink,
-    t.getCurrentChainId(),
-    r,
+  ), w = h(
+    B.PaymentLink,
     e,
-    await t.getEthereumAddress()
+    s,
+    r,
+    await t.getEthereumAddressByChain(e)
   );
-  return M(t.getCurrentChainId(), f), a;
+  return E(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 M=require("../../constants/protocol.constants.cjs"),U=require("../../error-handling/error-codes.constants.cjs"),b=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),B=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),K=require("../../types/external-action.types.cjs"),O=require("../utxo/Utxo.cjs");require("../../types/circom-data.types.cjs");const F=require("../../types/ethereum-network.types.cjs");require("../../types/transactions.types.cjs");const z=require("../../types/admin.types.cjs");require("../../types/activities.types.cjs");const H=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),L=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),N=require("../../functions/utils/time.utils.cjs"),W=require("../../functions/pre-transaction/getFeeStructure.cjs"),G=require("../../functions/utils/addresses.cjs"),Z=require("./hinkalDepositOnChainUtxos.cjs"),j=require("../../functions/pre-transaction/constructAdminData.cjs"),V=require("../../functions/utils/token-check.utils.cjs"),Y=async(e,t,i,s,d,u,o)=>{if(s.length===0)throw new Error("userDepositedUtxos must not be empty");const r=i.erc20TokenAddress,a=await e.getRandomRelay(t);if(!a)throw Error(U.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const n=await e.getEthereumAddressByChain(t),l=N.getCurrentTimeInSeconds().toString(),w=e.generateProofRemotely?5:1,m=[];for(let c=0;c<s.length;c+=w){const p=s.slice(c,c+w),T=await Promise.all(p.map(async({recipientAddress:q,utxo:h})=>{const x=[-h.amount],y=new O.Utxo({amount:0n,erc20TokenAddress:r,shieldedPrivateKey:e.userKeys.getShieldedPrivateKey(),timeStamp:l,tokenId:0}),g=[[h,y]],C=[[y]],k=`swapperM1x${g[0].length}x1`,A={externalActionId:0n,externalAddress:q,externalActionMetadata:"0x00"},{patchAccessTokenMerkleTree:D,kycRequired:S,hasAccessToken:E}=await L.shouldPatchAccessTokenMerkleTree(e,t,[r],x),v=await H.getSignatureDataForTransact(t,n,e.userKeys,S,E),P=j.constructAdminData(z.AdminTransactionType.WithdrawOnChainUtxos,t,[r],[-h.amount],n),{zkCallData:R,circomData:f,dimData:_}=await b.constructZkProof("v1x1",e.merkleTreeHinkalByChain[t],e.merkleTreeAccessTokenByChain[t],g,C,e.userKeys,k,A.externalActionId,A.externalAddress,A.externalActionMetadata,e.generateProofRemotely,a??M.zeroAddress,t,void 0,void 0,void 0,D,void 0,void 0,d,e.getContractWithFetcher(t,F.ContractType.HinkalHelperContract),v,void 0,!1);return{zkCallData:R,dimData:_,circomData:f,adminData:P}}));m.push(...T)}return B.transactCallRelayerBatch(t,m,u,o)},$=async(e,t,i,s,d,u)=>{const o=t.erc20TokenAddress,r=V.validateAndGetChainId([t]),a=G.hashEthereumAddress(await e.getEthereumAddressByChain(r)),n=u??await W.getFeeStructure(r,o,[o],K.ExternalActionId.Transact),l=await Z.hinkalDepositOnChainUtxos(e,r,t,i,s,n,a);return Y(e,r,t,l,n,a,d)};exports.hinkalDepositAndWithdraw=$;

package/data-structures/Hinkal/hinkalDepositAndWithdraw.mjs

@@ -1,206 +1,115 @@
-import { ethers as _ } 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 { ExternalActionId as z } from "../../types/external-action.types.mjs";
-import { Utxo as J } from "../utxo/Utxo.mjs";
+import { zeroAddress as M } from "../../constants/protocol.constants.mjs";
+import { transactionErrorCodes as U } from "../../error-handling/error-codes.constants.mjs";
+import { constructZkProof as b } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { transactCallRelayerBatch as z } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { ExternalActionId as H } from "../../types/external-action.types.mjs";
+import { Utxo as O } from "../utxo/Utxo.mjs";
 import "../../types/circom-data.types.mjs";
-import { ContractType as I } from "../../types/ethereum-network.types.mjs";
+import { ContractType as F } from "../../types/ethereum-network.types.mjs";
 import "../../types/transactions.types.mjs";
-import { AdminTransactionType as k } from "../../types/admin.types.mjs";
+import { AdminTransactionType as L } 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 { 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 { 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(
-    t,
-    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);
-  }
-  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), {
-    zkCallData: x,
-    circomData: S,
-    dimData: O
-  } = await F(
-    "v1x1",
-    t.merkleTreeHinkal,
-    t.merkleTreeAccessToken,
-    i,
-    l,
-    t.userKeys,
-    `swapperM1x${i[0].length}x1`,
-    z.DepositOnChainUtxos,
-    D.address,
-    T,
-    t.generateProofRemotely,
-    W,
-    t.getCurrentChainId(),
-    g,
-    void 0,
-    void 0,
-    void 0,
-    m,
-    void 0,
-    void 0,
-    void 0,
-    t.getContractWithFetcher(I.HinkalHelperContract),
-    P,
-    y.address,
-    !1
-  ), K = await (await j(
-    t,
-    h,
-    s,
-    x,
-    S,
-    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}.`);
-    v.push({
-      recipientAddress: e,
-      utxo: b
-    });
-    const N = C.indexOf(b);
-    C.splice(N, 1);
-  });
-  const u = t.getCurrentChainId();
-  await rt(u, {
-    hashedEthereumAddress: w,
-    chainId: u,
-    utxos: U
-  });
-  const L = B(
-    k.DepositOnChainUtxos,
-    u,
-    a,
-    [h],
-    d
-  );
-  return at(u, L), v;
-}, it = async (t, s, c, p, A, w) => {
-  if (c.length === 0)
+import { getSignatureDataForTransact as q } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
+import { shouldPatchAccessTokenMerkleTree as N } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
+import { getCurrentTimeInSeconds as W } from "../../functions/utils/time.utils.mjs";
+import { getFeeStructure as _ } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { hashEthereumAddress as G } from "../../functions/utils/addresses.mjs";
+import { hinkalDepositOnChainUtxos as V } from "./hinkalDepositOnChainUtxos.mjs";
+import { constructAdminData as Y } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { validateAndGetChainId as Z } from "../../functions/utils/token-check.utils.mjs";
+const $ = async (t, e, c, o, m, d, n) => {
+  if (o.length === 0)
     throw new Error("userDepositedUtxos must not be empty");
-  const o = s.erc20TokenAddress, d = await t.getRandomRelay();
-  if (!d)
-    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 r = c.erc20TokenAddress, a = await t.getRandomRelay(e);
+  if (!a)
+    throw Error(U.RELAYER_NOT_AVAILABLE);
+  const s = await t.getEthereumAddressByChain(e), p = W().toString(), w = t.generateProofRemotely ? 5 : 1, h = [];
+  for (let i = 0; i < o.length; i += w) {
+    const y = o.slice(i, i + w), x = await Promise.all(
+      y.map(async ({ recipientAddress: T, utxo: A }) => {
+        const g = [-A.amount], l = new O({
           amount: 0n,
-          erc20TokenAddress: o,
+          erc20TokenAddress: r,
           shieldedPrivateKey: t.userKeys.getShieldedPrivateKey(),
-          timeStamp: a,
+          timeStamp: p,
           tokenId: 0
-        }), T = [[i, h]], y = [[h]], D = `swapperM1x${T[0].length}x1`, x = {
+        }), f = [[A, l]], C = [[l]], E = `swapperM1x${f[0].length}x1`, u = {
           externalActionId: 0n,
-          externalAddress: P,
+          externalAddress: T,
           externalActionMetadata: "0x00"
         }, {
-          patchAccessTokenMerkleTree: S,
-          kycRequired: O,
-          hasAccessToken: H
-        } = await q(t, [o], l), K = await $(
-          t.getCurrentChainId(),
-          r,
+          patchAccessTokenMerkleTree: k,
+          kycRequired: v,
+          hasAccessToken: D
+        } = await N(t, e, [r], g), R = 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(
+          v,
+          D
+        ), S = Y(
+          L.WithdrawOnChainUtxos,
+          e,
+          [r],
+          [-A.amount],
+          s
+        ), { zkCallData: P, circomData: B, dimData: K } = await b(
           "v1x1",
-          t.merkleTreeHinkal,
-          t.merkleTreeAccessToken,
-          T,
-          y,
+          t.merkleTreeHinkalByChain[e],
+          t.merkleTreeAccessTokenByChain[e],
+          f,
+          C,
           t.userKeys,
-          D,
-          x.externalActionId,
-          x.externalAddress,
-          x.externalActionMetadata,
+          E,
+          u.externalActionId,
+          u.externalAddress,
+          u.externalActionMetadata,
           t.generateProofRemotely,
-          d ?? W,
-          t.getCurrentChainId(),
+          a ?? M,
+          e,
           void 0,
           void 0,
           void 0,
+          k,
           void 0,
-          S,
           void 0,
-          void 0,
-          p,
-          t.getContractWithFetcher(I.HinkalHelperContract),
-          K,
+          m,
+          t.getContractWithFetcher(e, F.HinkalHelperContract),
+          R,
           void 0,
           !1
         );
         return {
-          zkCallData: v,
-          dimData: u,
-          circomData: C,
-          adminData: U
+          zkCallData: P,
+          dimData: K,
+          circomData: B,
+          adminData: S
         };
       })
     );
-    g.push(...R);
+    h.push(...x);
   }
-  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 z(e, h, d, n);
+}, wt = async (t, e, c, o, m, d) => {
+  const n = e.erc20TokenAddress, r = Z([e]), a = G(await t.getEthereumAddressByChain(r)), s = d ?? await _(r, n, [n], H.Transact), p = await V(
     t,
-    s,
+    r,
+    e,
     c,
-    p,
-    a,
-    r
+    o,
+    s,
+    a
   );
-  return it(
+  return $(
     t,
+    r,
+    e,
+    p,
     s,
-    n,
     a,
-    r,
-    A
+    m
   );
 };
 export {
-  bt as hinkalDepositAndWithdraw
+  wt as hinkalDepositAndWithdraw
 };

package/data-structures/Hinkal/hinkalDepositOnChainUtxos.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const H=require("ethers"),R=require("../../constants/protocol.constants.cjs"),K=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),Z=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),$=require("../../functions/web3/events/getShieldedBalance.cjs"),z=require("../../functions/web3/functionCalls/transactCallDirect.cjs"),j=require("../../types/external-action.types.cjs");require("../../types/circom-data.types.cjs");const d=require("../../types/ethereum-network.types.cjs");require("../../types/transactions.types.cjs");const G=require("../../types/admin.types.cjs");require("../../types/activities.types.cjs");const N=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),X=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),J=require("../../functions/utils/getUtxosFromReceipt.utils.cjs"),L=require("../../functions/utils/fees.utils.cjs"),Q=require("../../API/unspent-utxos-calls.cjs"),V=require("../../functions/pre-transaction/constructAdminData.cjs"),Y=require("../../API/admin-calls.cjs"),I=async(t,e,p,y,q,w,f)=>{const l=p.erc20TokenAddress,x=await t.getEthereumAddressByChain(e),n=y.map(o=>o+L.calculateTotalFee(o,w)),a=[l],c=[0n],h=[!0],{patchAccessTokenMerkleTree:k,kycRequired:P,hasAccessToken:O}=await X.shouldPatchAccessTokenMerkleTree(t,e,a,c),v=await N.getSignatureDataForTransact(e,x,t.userKeys,P,O),r=[...await $.addPaddingToUtxos(t,e,a,c)],C=[];for(let o=0;o<r.length;o+=1){const{outputUtxos:s}=K.outputUtxoProcessing(t.userKeys,r[o],c[o]);C.push(s)}const m=n.reduce((o,s)=>o+s,0n),S=H.ethers.utils.defaultAbiCoder.encode(["uint256[]"],[n]),T=t.getContractWithSigner(e,d.ContractType.HinkalWrapper),g=t.getContractWithSigner(e,d.ContractType.DepositOnChainUtxos),{zkCallData:F,circomData:_,dimData:b}=await Z.constructZkProof("v1x1",t.merkleTreeHinkalByChain[e],t.merkleTreeAccessTokenByChain[e],r,C,t.userKeys,`swapperM1x${r[0].length}x1`,j.ExternalActionId.DepositOnChainUtxos,g.address,S,t.generateProofRemotely,R.zeroAddress,e,h,void 0,void 0,k,void 0,void 0,void 0,t.getContractWithFetcher(e,d.ContractType.HinkalHelperContract),v,T.address,!1),E=await(await z.transactCallDirect(t,e,m,p,F,_,b,g,T)).wait(),A=J.getUtxosFromReceipt(E,t,e,l),D=[],i=[...A];q.forEach((o,s)=>{const U=n[s],u=i.find(B=>B.amount===U);if(!u)throw new Error(`Could not find newly created UTXO with amount ${U} for recipient ${o}.`);D.push({recipientAddress:o,utxo:u});const W=i.indexOf(u);i.splice(W,1)}),await Q.storeUnspentUtxos({hashedEthereumAddress:f,chainId:e,utxos:A});const M=V.constructAdminData(G.AdminTransactionType.DepositOnChainUtxos,e,a,[m],x);return Y.emitTxPublicData(M),D};exports.hinkalDepositOnChainUtxos=I;

package/data-structures/Hinkal/hinkalDepositOnChainUtxos.d.ts

@@ -0,0 +1,4 @@
+import { IHinkal } from './IHinkal';
+import { ERC20Token, RecipientUtxo } from '../../types';
+import { FeeStructure } from '../../types/hinkal.types';
+export declare const hinkalDepositOnChainUtxos: (hinkal: IHinkal, chainId: number, erc20Token: ERC20Token, recipientAmounts: bigint[], recipientAddresses: string[], feeStructure: FeeStructure, hashedEthereumAddress: string) => Promise<RecipientUtxo[]>;