@hinkal/common 0.2.19 → 0.2.21

package/data-structures/Hinkal/hinkalDeposit.mjs

@@ -1,60 +1,60 @@
 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 { 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 K } 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 { transactionErrorCodes as z } from "../../error-handling/error-codes.constants.mjs";
 import "../../types/circom-data.types.mjs";
-import { ContractType as C } from "../../types/ethereum-network.types.mjs";
+import { ContractType as M } from "../../types/ethereum-network.types.mjs";
 import "../../types/transactions.types.mjs";
-import { AdminTransactionType as E } 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 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(
+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,
     a,
-    e,
+    r,
     o
-  ), n = void 0, l = await t.getEthereumAddress(), d = await F(
+  ), c = void 0, y = await t.getEthereumAddressByChain(a), d = await F(
     a,
-    l,
+    y,
     t.userKeys,
     s,
     A
-  ), c = {
+  ), n = {
     externalActionId: 0n,
-    externalAddress: await t.getEthereumAddress(),
+    externalAddress: await t.getEthereumAddressByChain(a),
     externalActionMetadata: "0x00"
   };
   return {
     signatureData: d,
-    externalActionData: c,
-    contractTransaction: n,
-    contractToApprove: n,
-    patchAccessTokenMerkleTree: r
+    externalActionData: n,
+    contractTransaction: c,
+    contractToApprove: c,
+    patchAccessTokenMerkleTree: e
   };
-}, 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);
+}, 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: y, circomData: T, dimData: v } = await K(
+  const { zkCallData: u, circomData: T, dimData: v } = await C(
     "v1x1",
     t.merkleTreeHinkalByChain[o],
     t.merkleTreeAccessTokenByChain[o],
-    c,
+    n,
     m,
     t.userKeys,
-    x,
+    l,
     s.externalActionId,
     s.externalAddress,
     s.externalActionMetadata,
@@ -64,60 +64,60 @@ const R = async (t, a, e, o) => {
     void 0,
     void 0,
     void 0,
-    l,
+    y,
     void 0,
     void 0,
     void 0,
-    t.getContractWithFetcher(o, C.HinkalHelperContract),
+    t.getContractWithFetcher(o, M.HinkalHelperContract),
     d
-  ), f = await M(
+  ), f = await K(
     t,
     o,
-    e,
+    r,
     // for volotile tokens: amountChanges != amountOfTokenToApprove
     a,
-    y,
+    u,
     T,
     v,
-    n,
+    c,
     A
-  ), g = S(
-    E.Onboarding,
+  ), g = h(
+    B.Onboarding,
     o,
-    r,
     e,
-    await t.getEthereumAddress()
+    r,
+    await t.getEthereumAddressByChain(o)
   );
-  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(",");
+  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(B.RECIPIENT_FORMAT_INCORRECT);
+    throw Error(z.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) => [
+  ]), n = `swapperM${r.length.toString()}x${d[0].length}x1`, l = s.map((p, I) => [
     new D({
-      amount: e[h],
+      amount: r[I],
       erc20TokenAddress: p,
       randomization: BigInt(A),
-      stealthAddress: n,
-      encryptionKey: l
+      stealthAddress: c,
+      encryptionKey: y
     })
-  ]), { externalActionData: m, contractTransaction: u, contractToApprove: y, patchAccessTokenMerkleTree: T } = await R(t, r, s, e), { zkCallData: v, circomData: f, dimData: g } = await K(
+  ]), { externalActionData: m, contractTransaction: x, contractToApprove: u, patchAccessTokenMerkleTree: T } = await U(t, e, s, r), { zkCallData: v, circomData: f, dimData: g } = await C(
     "v1x1",
-    t.merkleTreeHinkalByChain[r],
-    t.merkleTreeAccessTokenByChain[r],
+    t.merkleTreeHinkalByChain[e],
+    t.merkleTreeAccessTokenByChain[e],
     d,
-    x,
+    l,
     t.userKeys,
-    c,
+    n,
     m.externalActionId,
     m.externalAddress,
     m.externalActionMetadata,
     t.generateProofRemotely,
     P,
-    r,
+    e,
     void 0,
     void 0,
     void 0,
@@ -125,25 +125,25 @@ const R = async (t, a, e, o) => {
     void 0,
     void 0,
     void 0,
-    t.getContractWithFetcher(r, C.HinkalHelperContract)
-  ), i = await M(
+    t.getContractWithFetcher(e, M.HinkalHelperContract)
+  ), i = await K(
     t,
-    r,
     e,
+    r,
     a,
     v,
     f,
     g,
-    y,
-    u
-  ), w = S(
-    E.PaymentLink,
-    r,
-    s,
+    u,
+    x
+  ), w = h(
+    B.PaymentLink,
     e,
-    await t.getEthereumAddress()
+    s,
+    r,
+    await t.getEthereumAddressByChain(e)
   );
-  return I(w), i;
+  return E(w), i;
 };
 export {
   st as hinkalDeposit,

package/data-structures/Hinkal/hinkalDepositAndWithdraw.cjs

@@ -1 +1 @@
-"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;
+"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,158 +1,71 @@
-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 J } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { ExternalActionId as z } from "../../types/external-action.types.mjs";
-import { Utxo as Q } 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 E } from "../../types/ethereum-network.types.mjs";
+import { ContractType as F } from "../../types/ethereum-network.types.mjs";
 import "../../types/transactions.types.mjs";
-import { AdminTransactionType as $ } from "../../types/admin.types.mjs";
+import { AdminTransactionType as L } from "../../types/admin.types.mjs";
 import "../../types/activities.types.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 N } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { emitTxPublicData as at } from "../../API/admin-calls.mjs";
-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,
-    t.userKeys,
-    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 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: k,
-    dimData: O
-  } = await F(
-    "v1x1",
-    t.merkleTreeHinkalByChain[e],
-    t.merkleTreeAccessTokenByChain[e],
-    n,
-    g,
-    t.userKeys,
-    `swapperM1x${n[0].length}x1`,
-    z.DepositOnChainUtxos,
-    D.address,
-    h,
-    t.generateProofRemotely,
-    W,
-    e,
-    C,
-    void 0,
-    void 0,
-    u,
-    void 0,
-    void 0,
-    void 0,
-    t.getContractWithFetcher(e, E.HinkalHelperContract),
-    S,
-    T.address,
-    !1
-  ), K = await (await j(
-    t,
-    e,
-    w,
-    m,
-    x,
-    k,
-    O,
-    D,
-    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: o,
-      utxo: H
-    });
-    const Z = f.indexOf(H);
-    f.splice(Z, 1);
-  }), await rt({
-    hashedEthereumAddress: d,
-    chainId: e,
-    utxos: U
-  });
-  const b = N(
-    $.DepositOnChainUtxos,
-    e,
-    c,
-    [w],
-    a
-  );
-  return at(b), v;
-}, ct = async (t, e, m, i, A, l, d) => {
-  if (i.length === 0)
+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 r = m.erc20TokenAddress, a = await t.getRandomRelay(e);
+  const r = c.erc20TokenAddress, a = await t.getRandomRelay(e);
   if (!a)
-    throw Error(V.RELAYER_NOT_AVAILABLE);
-  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({
+    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: r,
           shieldedPrivateKey: t.userKeys.getShieldedPrivateKey(),
-          timeStamp: c,
+          timeStamp: p,
           tokenId: 0
-        }), h = [[n, w]], T = [[w]], D = `swapperM1x${h[0].length}x1`, x = {
+        }), f = [[A, l]], C = [[l]], E = `swapperM1x${f[0].length}x1`, u = {
           externalActionId: 0n,
-          externalAddress: S,
+          externalAddress: T,
           externalActionMetadata: "0x00"
         }, {
           patchAccessTokenMerkleTree: k,
-          kycRequired: O,
-          hasAccessToken: M
-        } = await L(t, e, [r], g), K = await q(
+          kycRequired: v,
+          hasAccessToken: D
+        } = await N(t, e, [r], g), R = await q(
           e,
           s,
           t.userKeys,
-          O,
-          M
-        ), U = N(
-          $.WithdrawOnChainUtxos,
+          v,
+          D
+        ), S = Y(
+          L.WithdrawOnChainUtxos,
           e,
           [r],
-          [-n.amount],
+          [-A.amount],
           s
-        ), { zkCallData: v, circomData: f, dimData: b } = await F(
+        ), { zkCallData: P, circomData: B, dimData: K } = await b(
           "v1x1",
           t.merkleTreeHinkalByChain[e],
           t.merkleTreeAccessTokenByChain[e],
-          h,
-          T,
+          f,
+          C,
           t.userKeys,
-          D,
-          x.externalActionId,
-          x.externalAddress,
-          x.externalActionMetadata,
+          E,
+          u.externalActionId,
+          u.externalAddress,
+          u.externalActionMetadata,
           t.generateProofRemotely,
-          a ?? W,
+          a ?? M,
           e,
           void 0,
           void 0,
@@ -160,43 +73,43 @@ const it = async (t, e, m, i, A, l, d) => {
           k,
           void 0,
           void 0,
-          A,
-          t.getContractWithFetcher(e, E.HinkalHelperContract),
-          K,
+          m,
+          t.getContractWithFetcher(e, F.HinkalHelperContract),
+          R,
           void 0,
           !1
         );
         return {
-          zkCallData: v,
-          dimData: b,
-          circomData: f,
-          adminData: U
+          zkCallData: P,
+          dimData: K,
+          circomData: B,
+          adminData: S
         };
       })
     );
-    C.push(...P);
+    h.push(...x);
   }
-  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(
+  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,
     r,
     e,
-    m,
-    i,
+    c,
+    o,
     s,
     a
   );
-  return ct(
+  return $(
     t,
     r,
     e,
-    c,
+    p,
     s,
     a,
-    A
+    m
   );
 };
 export {
-  Mt 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[]>;

package/data-structures/Hinkal/hinkalDepositOnChainUtxos.mjs

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

package/data-structures/Hinkal/hinkalDepostAndBridge.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("../../constants/protocol.constants.cjs"),Y=require("../../error-handling/error-codes.constants.cjs"),Z=require("../../functions/snarkjs/constructEmporiumProof.cjs"),$=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),R=require("../../types/external-action.types.cjs"),U=require("../utxo/Utxo.cjs");require("../../types/circom-data.types.cjs");const J=require("../../types/ethereum-network.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");const Q=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),X=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),ee=require("../../functions/utils/time.utils.cjs"),re=require("../../functions/pre-transaction/getFeeStructure.cjs"),te=require("../../functions/utils/addresses.cjs"),se=require("../../constants/chains.constants.cjs"),b=require("../../constants/addresses.constants.cjs");require("ethers");require("idb-keyval");require("@solana/web3.js");require("../http/HttpClient.cjs");require("../../constants/vite.constants.cjs");const oe=require("../../functions/utils/erc20tokenFunctions.cjs");require("../../functions/utils/convertIntegrationProviderToExternalActionId.cjs");require("../../constants/server.constants.cjs");require("../../API/getServerURL.cjs");require("axios");const z=require("../../functions/utils/caseInsensitive.utils.cjs");require("@coral-xyz/anchor");require("circomlibjs-hinkal-fork");require("@solana/spl-token");require("ethers-v6h");require("tweetnacl");require("bs58");require("buffer");require("../../constants/token-data/index.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");require("../../constants/coingecko.constants.cjs");require("../../constants/reorg-depths.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");require("../../functions/utils/userAgent.cjs");const ne=require("../../functions/utils/convertEmporiumOpToCallInfo.cjs");require("../crypto-keys/keys.cjs");require("libsodium-wrappers");require("multiformats");const ie=require("../../functions/utils/token-check.utils.cjs");require("async-mutex");require("process");require("../../providers/EthersProviderAdapter.cjs");const O=require("./hinkalDepositOnChainUtxos.cjs"),B=require("../../functions/private-wallet/emporium.helpers.cjs"),ae=require("../../API/API.cjs"),ue=async(e,r,n,q,p,u,s)=>{if(q.length===0)throw new Error("No recipients to bridge");const i=n.erc20TokenAddress,{contractData:h}=se.networkRegistry[r],{emporiumAddress:a}=h;if(!a)throw Error("No Emporium Address");const g=b.SWAP_ROUTER_ADDRESSES[R.ExternalActionId.Lifi][r];if(!g)throw new Error(`LIFI not configured for chain ${r}`);const T=await e.getRandomRelay(r);if(!T)throw Error(Y.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const f=await e.getEthereumAddressByChain(r),y=ee.getCurrentTimeInSeconds().toString(),m=e.generateProofRemotely?5:1,E=[];for(let c=0;c<q.length;c+=m){const v=q.slice(c,c+m),t=await Promise.all(v.map(async({utxo:o,nativeUtxo:d,bridgeAmount:C,quote:S,temporarySubAccount:w})=>{await ae.API.addTemporaryWalletNonce(r,u,w.index);const N=S.nativeFee>0n&&!z.caseInsensitiveEqual(i,l.zeroAddress),A=[i],x=[-o.amount],D=[!1],F=new U.Utxo({amount:0n,erc20TokenAddress:i,shieldedPrivateKey:e.userKeys.getShieldedPrivateKey(),timeStamp:y,tokenId:0}),k=[[o,F]],P=[[F]];if(N&&d){const _=new U.Utxo({amount:0n,erc20TokenAddress:l.zeroAddress,shieldedPrivateKey:e.userKeys.getShieldedPrivateKey(),timeStamp:y,tokenId:0});A.push(l.zeroAddress),x.push(-d.amount),D.push(!1),k.push([d,_]),P.push([_])}const K=B.createLifiBridgeOps(e,r,w.ethAddress,g,i,o.amount,C,S),{patchAccessTokenMerkleTree:L,kycRequired:I,hasAccessToken:M}=await X.shouldPatchAccessTokenMerkleTree(e,r,A,x),W=await Q.getSignatureDataForTransact(r,f,e.userKeys,I,M),{zkCallData:H,circomData:j,dimData:G,authorizationData:V}=await Z.constructEmporiumProof("v1x1",e.merkleTreeHinkalByChain[r],e.merkleTreeAccessTokenByChain[r],A,A.map(()=>0),k,P,e.userKeys,A.length,k[0].length,a,K,e.generateProofRemotely,T??l.zeroAddress,r,D,void 0,w.privateKey,void 0,L,void 0,p,e.getContractWithFetcher(r,J.ContractType.HinkalHelperContract),W,void 0,!1);return{zkCallData:H,dimData:G,circomData:j,authorizationData:V}}));E.push(...t)}return $.transactCallRelayerBatch(r,E,u,s)},ce=async(e,r,n,q,p)=>{const u=r.erc20TokenAddress,s=ie.validateAndGetChainId([r]),i=te.hashEthereumAddress(await e.getEthereumAddressByChain(s)),h=b.SWAP_ROUTER_ADDRESSES[R.ExternalActionId.Lifi][s];if(!h)throw Error("LIFI router not configured");let a;if(p)a=p;else{const t=n[0],d=B.createLifiBridgeOps(e,s,t.temporarySubAccount.ethAddress,h,u,t.bridgeAmount,t.bridgeAmount,t.quote).map(C=>ne.convertEmporiumOpToCallInfo(C,t.temporarySubAccount.ethAddress,s));a=await re.getFeeStructure(s,u,[u],R.ExternalActionId.Emporium,d)}const g={feeToken:a.feeToken,flatFee:0n,variableRate:0n},f=n.reduce((t,o)=>t+o.quote.nativeFee,0n)>0n&&!z.caseInsensitiveEqual(u,l.zeroAddress),y=n.map(t=>t.bridgeAmount),m=n.map(t=>t.recipientAddress),E=await O.hinkalDepositOnChainUtxos(e,s,r,y,m,a,i);let c=[];if(f){const t=oe.getERC20Token(l.zeroAddress,s);if(!t)throw Error("No native token");const o=n.map(d=>d.quote.nativeFee);c=await O.hinkalDepositOnChainUtxos(e,s,t,o,m,g,i)}const v=n.map((t,o)=>({...t,utxo:E[o].utxo,nativeUtxo:f?c[o]?.utxo:void 0}));return ue(e,s,r,v,a,i,q)};exports.hinkalDepositAndBridge=ce;

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

@@ -0,0 +1,4 @@
+import { IHinkal } from './IHinkal';
+import { BridgeRecipient, ERC20Token } from '../../types';
+import { FeeStructure } from '../../types/hinkal.types';
+export declare const hinkalDepositAndBridge: (hinkal: IHinkal, erc20Token: ERC20Token, recipients: BridgeRecipient[], txCompletionTime?: number, feeStructureOverride?: FeeStructure) => Promise<string>;