@hinkal/common 0.2.23 → 0.2.24

package/data-structures/Hinkal/hinkalDepositAndWithdraw.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const b=require("../../constants/protocol.constants.cjs"),F=require("../../error-handling/error-codes.constants.cjs"),O=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),K=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),L=require("../../types/external-action.types.cjs"),z=require("../utxo/Utxo.cjs");require("../../types/circom-data.types.cjs");const B=require("../../types/ethereum-network.types.cjs"),N=require("../../types/admin.types.cjs");require("../../types/activities.types.cjs");const D=require("../../types/scheduled-transactions.types.cjs"),Z=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),j=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),G=require("../../functions/utils/time.utils.cjs"),V=require("../../functions/pre-transaction/getFeeStructure.cjs"),Y=require("../../functions/utils/addresses.cjs"),$=require("./hinkalDepositOnChainUtxos.cjs"),J=require("../../functions/pre-transaction/constructAdminData.cjs"),q=require("../../API/deposit-and-withdraw-status-calls.cjs"),Q=async(e,t,r,h,s,c,A,i)=>{if(r.length===0)throw new Error("userDepositedUtxos must not be empty");const a=t.erc20TokenAddress,n=await e.getRandomRelay();if(!n)throw Error(F.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const o=await e.getEthereumAddress(),w=G.getCurrentTimeInSeconds().toString(),d=e.generateProofRemotely?5:1,p=[];for(let u=0;u<r.length;u+=d){const x=r.slice(u,u+d),S=await Promise.all(x.map(async({recipientAddress:I,utxo:l})=>{const E=[-l.amount],y=new z.Utxo({amount:0n,erc20TokenAddress:a,shieldedPrivateKey:e.userKeys.getShieldedPrivateKey(),timeStamp:w,tokenId:0}),T=[[l,y]],R=[[y]],P=`swapperM1x${T[0].length}x1`,m={externalActionId:0n,externalAddress:I,externalActionMetadata:"0x00"},{patchAccessTokenMerkleTree:_,kycRequired:f,hasAccessToken:U}=await j.shouldPatchAccessTokenMerkleTree(e,[a],E),W=await Z.getSignatureDataForTransact(e.getCurrentChainId(),o,e.userKeys,f,U),k=J.constructAdminData(N.AdminTransactionType.WithdrawOnChainUtxos,e.getCurrentChainId(),[a],[-l.amount],o),{zkCallData:v,circomData:H,dimData:M}=await O.constructZkProof("v1x1",e.merkleTreeHinkal,e.merkleTreeAccessToken,T,R,e.userKeys,P,m.externalActionId,m.externalAddress,m.externalActionMetadata,e.generateProofRemotely,n??b.zeroAddress,e.getCurrentChainId(),void 0,void 0,void 0,_,void 0,void 0,h,e.getContractWithFetcher(B.ContractType.HinkalHelperContract),W,void 0,!1);return{zkCallData:v,dimData:M,circomData:H,adminData:k}}));p.push(...S)}const C=e.getCurrentChainId();await q.safeUpdateDepositAndWithdrawStatus(C,{id:c,hashedEthereumAddress:s,phase:D.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});const g=await K.transactCallRelayerBatch(e.getCurrentChainId(),p,s,A,i);return await q.safeUpdateDepositAndWithdrawStatus(C,{id:c,hashedEthereumAddress:s,phase:D.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:g}),g},X=async(e,t,r,h,s,c,A)=>{const i=t.erc20TokenAddress,a=e.getCurrentChainId(),n=Y.hashEthereumAddress(await e.getEthereumAddress()),o=c??await V.getFeeStructure(a,i,[i],L.ExternalActionId.Transact),{userDepositedUtxos:w,statusId:d}=await $.hinkalDepositOnChainUtxos(e,t,r,h,o,n);return Q(e,t,w,o,n,d,s,A)};exports.hinkalDepositAndWithdraw=X;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const b=require("../../constants/protocol.constants.cjs"),F=require("../../error-handling/error-codes.constants.cjs"),O=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),K=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),L=require("../../types/external-action.types.cjs"),z=require("../utxo/Utxo.cjs");require("../../types/circom-data.types.cjs");const B=require("../../types/ethereum-network.types.cjs"),N=require("../../types/admin.types.cjs");require("../../types/activities.types.cjs");const D=require("../../types/scheduled-transactions.types.cjs"),Z=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),j=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),G=require("../../functions/utils/time.utils.cjs"),V=require("../../functions/pre-transaction/getFeeStructure.cjs"),Y=require("../../functions/utils/addresses.cjs"),$=require("./hinkalDepositOnChainUtxos.cjs"),J=require("../../functions/pre-transaction/constructAdminData.cjs"),q=require("../../API/deposit-and-withdraw-status-calls.cjs"),Q=async(e,t,r,w,a,c,A,i)=>{if(r.length===0)throw new Error("userDepositedUtxos must not be empty");const s=t.erc20TokenAddress,n=await e.getRandomRelay();if(!n)throw Error(F.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const o=await e.getEthereumAddress(),l=G.getCurrentTimeInSeconds().toString(),d=e.generateProofRemotely?5:1,u=[];for(let h=0;h<r.length;h+=d){const x=r.slice(h,h+d),S=await Promise.all(x.map(async({recipientAddress:I,utxo:p})=>{const E=[-p.amount],T=new z.Utxo({amount:0n,erc20TokenAddress:s,shieldedPrivateKey:e.userKeys.getShieldedPrivateKey(),timeStamp:l,tokenId:0}),y=[[p,T]],R=[[T]],P=`swapperM1x${y[0].length}x1`,m={externalActionId:0n,externalAddress:I,externalActionMetadata:"0x00"},{patchAccessTokenMerkleTree:_,kycRequired:f,hasAccessToken:U}=await j.shouldPatchAccessTokenMerkleTree(e,[s],E),W=await Z.getSignatureDataForTransact(e.getCurrentChainId(),o,e.userKeys,f,U),k=J.constructAdminData(N.AdminTransactionType.WithdrawOnChainUtxos,e.getCurrentChainId(),[s],[-p.amount],o),{zkCallData:v,circomData:H,dimData:M}=await O.constructZkProof("v1x1",e.merkleTreeHinkal,e.merkleTreeAccessToken,y,R,e.userKeys,P,m.externalActionId,m.externalAddress,m.externalActionMetadata,e.generateProofRemotely,n??b.zeroAddress,e.getCurrentChainId(),void 0,void 0,void 0,_,void 0,void 0,w,e.getContractWithFetcher(B.ContractType.HinkalHelperContract),W,void 0,!1);return{zkCallData:v,dimData:M,circomData:H,adminData:k}}));u.push(...S)}const C=e.getCurrentChainId();await q.safeUpdateDepositAndWithdrawStatus(C,{id:c,hashedEthereumAddress:a,phase:D.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});const g=await K.transactCallRelayerBatch(e.getCurrentChainId(),u,a,A,i);return await q.safeUpdateDepositAndWithdrawStatus(C,{id:c,hashedEthereumAddress:a,phase:D.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:g}),g},X=async(e,t,r,w,a,c,A)=>{const i=t.erc20TokenAddress,s=e.getCurrentChainId(),n=Y.hashEthereumAddress(await e.getEthereumAddress()),o=c??await V.getFeeStructure(s,i,[i],L.ExternalActionId.Transact),{userDepositedUtxos:l,statusId:d,depositTxHash:u}=await $.hinkalDepositOnChainUtxos(e,t,r,w,o,n);return await Q(e,t,l,o,n,d,a,A),u};exports.hinkalDepositAndWithdraw=X;

package/data-structures/Hinkal/hinkalDepositAndWithdraw.mjs

@@ -17,36 +17,36 @@ import { hashEthereumAddress as j } from "../../functions/utils/addresses.mjs";
 import { hinkalDepositOnChainUtxos as G } from "./hinkalDepositOnChainUtxos.mjs";
 import { constructAdminData as J } from "../../functions/pre-transaction/constructAdminData.mjs";
 import { safeUpdateDepositAndWithdrawStatus as x } from "../../API/deposit-and-withdraw-status-calls.mjs";
-const Q = async (t, e, r, p, o, i, u, c) => {
+const Q = async (t, e, r, u, o, i, w, c) => {
   if (r.length === 0)
     throw new Error("userDepositedUtxos must not be empty");
   const a = e.erc20TokenAddress, s = await t.getRandomRelay();
   if (!s)
     throw Error(F.RELAYER_NOT_AVAILABLE);
-  const n = await t.getEthereumAddress(), w = Z().toString(), d = t.generateProofRemotely ? 5 : 1, f = [];
-  for (let m = 0; m < r.length; m += d) {
-    const I = r.slice(m, m + d), E = await Promise.all(
+  const n = await t.getEthereumAddress(), h = Z().toString(), d = t.generateProofRemotely ? 5 : 1, m = [];
+  for (let p = 0; p < r.length; p += d) {
+    const I = r.slice(p, p + d), E = await Promise.all(
       I.map(async ({ recipientAddress: D, utxo: A }) => {
         const R = [-A.amount], l = new B({
           amount: 0n,
           erc20TokenAddress: a,
           shieldedPrivateKey: t.userKeys.getShieldedPrivateKey(),
-          timeStamp: w,
+          timeStamp: h,
           tokenId: 0
-        }), T = [[A, l]], S = [[l]], v = `swapperM1x${T[0].length}x1`, h = {
+        }), T = [[A, l]], S = [[l]], v = `swapperM1x${T[0].length}x1`, f = {
           externalActionId: 0n,
           externalAddress: D,
           externalActionMetadata: "0x00"
         }, {
-          patchAccessTokenMerkleTree: P,
-          kycRequired: U,
-          hasAccessToken: H
+          patchAccessTokenMerkleTree: H,
+          kycRequired: P,
+          hasAccessToken: U
         } = await Y(t, [a], R), W = await V(
           t.getCurrentChainId(),
           n,
           t.userKeys,
-          U,
-          H
+          P,
+          U
         ), K = J(
           N.WithdrawOnChainUtxos,
           t.getCurrentChainId(),
@@ -61,19 +61,19 @@ const Q = async (t, e, r, p, o, i, u, c) => {
           S,
           t.userKeys,
           v,
-          h.externalActionId,
-          h.externalAddress,
-          h.externalActionMetadata,
+          f.externalActionId,
+          f.externalAddress,
+          f.externalActionMetadata,
           t.generateProofRemotely,
           s ?? k,
           t.getCurrentChainId(),
           void 0,
           void 0,
           void 0,
-          P,
+          H,
           void 0,
           void 0,
-          p,
+          u,
           t.getContractWithFetcher(q.HinkalHelperContract),
           W,
           void 0,
@@ -87,7 +87,7 @@ const Q = async (t, e, r, p, o, i, u, c) => {
         };
       })
     );
-    f.push(...E);
+    m.push(...E);
   }
   const C = t.getCurrentChainId();
   await x(C, {
@@ -97,9 +97,9 @@ const Q = async (t, e, r, p, o, i, u, c) => {
   });
   const g = await O(
     t.getCurrentChainId(),
-    f,
+    m,
     o,
-    u,
+    w,
     c
   );
   return await x(C, {
@@ -108,25 +108,25 @@ const Q = async (t, e, r, p, o, i, u, c) => {
     phase: y.AFTER_SCHEDULE_WITHDRAW,
     scheduleId: g
   }), g;
-}, gt = async (t, e, r, p, o, i, u) => {
-  const c = e.erc20TokenAddress, a = t.getCurrentChainId(), s = j(await t.getEthereumAddress()), n = i ?? await $(a, c, [c], z.Transact), { userDepositedUtxos: w, statusId: d } = await G(
+}, gt = async (t, e, r, u, o, i, w) => {
+  const c = e.erc20TokenAddress, a = t.getCurrentChainId(), s = j(await t.getEthereumAddress()), n = i ?? await $(a, c, [c], z.Transact), { userDepositedUtxos: h, statusId: d, depositTxHash: m } = await G(
     t,
     e,
     r,
-    p,
+    u,
     n,
     s
   );
-  return Q(
+  return await Q(
     t,
     e,
-    w,
+    h,
     n,
     s,
     d,
     o,
-    u
-  );
+    w
+  ), m;
 };
 export {
   gt as hinkalDepositAndWithdraw

package/data-structures/Hinkal/hinkalDepositOnChainUtxos.cjs

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

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

@@ -4,4 +4,5 @@ import { FeeStructure } from '../../types/hinkal.types';
 export declare const hinkalDepositOnChainUtxos: (hinkal: IHinkal, erc20Token: ERC20Token, recipientAmounts: bigint[], recipientAddresses: string[], feeStructure: FeeStructure, hashedEthereumAddress: string) => Promise<{
     userDepositedUtxos: RecipientUtxo[];
     statusId?: string | undefined;
+    depositTxHash: string;
 }>;

package/data-structures/Hinkal/hinkalDepositOnChainUtxos.mjs

@@ -9,7 +9,7 @@ import "../../types/circom-data.types.mjs";
 import { ContractType as p } from "../../types/ethereum-network.types.mjs";
 import { AdminTransactionType as L } from "../../types/admin.types.mjs";
 import "../../types/activities.types.mjs";
-import { DepositAndWithdrawPhase as U } from "../../types/scheduled-transactions.types.mjs";
+import { DepositAndWithdrawPhase as y } from "../../types/scheduled-transactions.types.mjs";
 import { getSignatureDataForTransact as N } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
 import { shouldPatchAccessTokenMerkleTree as Q } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
 import { getUtxosFromReceipt as V } from "../../functions/utils/getUtxosFromReceipt.utils.mjs";
@@ -17,26 +17,26 @@ import { calculateTotalFee as Y } from "../../functions/utils/fees.utils.mjs";
 import { constructAdminData as tt } from "../../functions/pre-transaction/constructAdminData.mjs";
 import { emitTxPublicData as ot } from "../../API/admin-calls.mjs";
 import { updateDepositAndWithdrawStatus as et, safeUpdateDepositAndWithdrawStatus as rt } from "../../API/deposit-and-withdraw-status-calls.mjs";
-const yt = async (t, m, y, O, E, u) => {
-  const f = m.erc20TokenAddress, x = await t.getEthereumAddress(), a = y.map((o) => o + Y(o, E)), i = [f], n = [0n], P = [!0], { patchAccessTokenMerkleTree: v, kycRequired: I, hasAccessToken: W } = await Q(
+const yt = async (t, m, O, E, P, u) => {
+  const f = m.erc20TokenAddress, x = await t.getEthereumAddress(), a = O.map((o) => o + Y(o, P)), i = [f], n = [0n], v = [!0], { patchAccessTokenMerkleTree: I, kycRequired: W, hasAccessToken: S } = await Q(
     t,
     i,
     n
-  ), S = await N(
+  ), F = await N(
     t.getCurrentChainId(),
     x,
     t.userKeys,
-    I,
-    W
+    W,
+    S
   ), r = [...await j(t, i, n)], C = [];
   for (let o = 0; o < r.length; o += 1) {
     const { outputUtxos: e } = B(t.userKeys, r[o], n[o]);
     C.push(e);
   }
-  const A = a.reduce((o, e) => o + e, 0n), F = _.AbiCoder.defaultAbiCoder().encode(["uint256[]"], [a]), D = t.getContractWithSigner(p.HinkalWrapper), g = t.getContractWithSigner(p.DepositOnChainUtxos), {
-    zkCallData: H,
-    circomData: R,
-    dimData: b
+  const A = a.reduce((o, e) => o + e, 0n), H = _.AbiCoder.defaultAbiCoder().encode(["uint256[]"], [a]), D = t.getContractWithSigner(p.HinkalWrapper), g = t.getContractWithSigner(p.DepositOnChainUtxos), {
+    zkCallData: R,
+    circomData: b,
+    dimData: K
   } = await X(
     "v1x1",
     t.merkleTreeHinkal,
@@ -47,46 +47,46 @@ const yt = async (t, m, y, O, E, u) => {
     `swapperM1x${r[0].length}x1`,
     J.DepositOnChainUtxos,
     await g.getAddress(),
-    F,
+    H,
     t.generateProofRemotely,
     q,
     t.getCurrentChainId(),
-    P,
+    v,
     void 0,
     void 0,
-    v,
+    I,
     void 0,
     void 0,
     void 0,
     t.getContractWithFetcher(p.HinkalHelperContract),
-    S,
+    F,
     await D.getAddress(),
     !1
   ), s = t.getCurrentChainId(), h = (await et(s, {
     hashedEthereumAddress: u,
-    phase: U.BEFORE_DEPOSIT
+    phase: y.BEFORE_DEPOSIT
   })).id ?? void 0, w = await G(
     t,
     A,
     m,
-    H,
     R,
     b,
+    K,
     g,
     D
-  ), K = await w.wait(), M = w.hash;
+  ), M = await w.wait(), T = w.hash;
   await rt(s, {
     id: h,
     hashedEthereumAddress: u,
-    phase: U.AFTER_DEPOSIT,
-    depositTxHash: M
+    phase: y.AFTER_DEPOSIT,
+    depositTxHash: T
   });
-  const $ = await V(K, t, f), T = [], c = [...$];
-  O.forEach((o, e) => {
-    const l = a[e], d = c.find((Z) => Z.amount === l);
+  const $ = await V(M, t, f), l = [], c = [...$];
+  E.forEach((o, e) => {
+    const U = a[e], d = c.find((Z) => Z.amount === U);
     if (!d)
-      throw new Error(`Could not find newly created UTXO with amount ${l} for recipient ${o}.`);
-    T.push({
+      throw new Error(`Could not find newly created UTXO with amount ${U} for recipient ${o}.`);
+    l.push({
       recipientAddress: o,
       utxo: d
     });
@@ -100,7 +100,7 @@ const yt = async (t, m, y, O, E, u) => {
     [A],
     x
   );
-  return ot(s, k), { userDepositedUtxos: T, statusId: h };
+  return ot(s, k), { userDepositedUtxos: l, statusId: h, depositTxHash: T };
 };
 export {
   yt as hinkalDepositOnChainUtxos

package/data-structures/Hinkal/hinkalDepostAndBridge.cjs

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

package/data-structures/Hinkal/hinkalDepostAndBridge.mjs

@@ -1,20 +1,20 @@
-import { zeroAddress as f } from "../../constants/protocol.constants.mjs";
+import { zeroAddress as u } from "../../constants/protocol.constants.mjs";
 import { transactionErrorCodes as X } from "../../error-handling/error-codes.constants.mjs";
 import { constructEmporiumProof as tt } from "../../functions/snarkjs/constructEmporiumProof.mjs";
 import { transactCallRelayerBatch as et } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
 import { ExternalActionId as S } from "../../types/external-action.types.mjs";
-import { Utxo as K } from "../utxo/Utxo.mjs";
+import { Utxo as N } from "../utxo/Utxo.mjs";
 import "../../types/circom-data.types.mjs";
 import { ContractType as ot } from "../../types/ethereum-network.types.mjs";
 import "../../types/activities.types.mjs";
-import { DepositAndWithdrawPhase as N } from "../../types/scheduled-transactions.types.mjs";
+import { DepositAndWithdrawPhase as W } from "../../types/scheduled-transactions.types.mjs";
 import { getSignatureDataForTransact as rt } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
 import { shouldPatchAccessTokenMerkleTree as st } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
 import { getCurrentTimeInSeconds as it } from "../../functions/utils/time.utils.mjs";
-import { getFeeStructure as nt } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { hashEthereumAddress as at } from "../../functions/utils/addresses.mjs";
+import { getFeeStructure as at } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { hashEthereumAddress as nt } from "../../functions/utils/addresses.mjs";
 import { networkRegistry as mt } from "../../constants/chains.constants.mjs";
-import { SWAP_ROUTER_ADDRESSES as H } from "../../constants/addresses.constants.mjs";
+import { SWAP_ROUTER_ADDRESSES as O } from "../../constants/addresses.constants.mjs";
 import "idb-keyval";
 import "@solana/web3.js";
 import "../http/HttpClient.mjs";
@@ -24,7 +24,7 @@ import { getERC20Token as pt } from "../../functions/utils/erc20tokenFunctions.m
 import "../../functions/utils/convertIntegrationProviderToExternalActionId.mjs";
 import "../../constants/server.constants.mjs";
 import "axios";
-import { caseInsensitiveEqual as O } from "../../functions/utils/caseInsensitive.utils.mjs";
+import { caseInsensitiveEqual as z } from "../../functions/utils/caseInsensitive.utils.mjs";
 import "../../API/getServerURL.mjs";
 import "circomlibjs-hinkal-fork";
 import "libsodium-wrappers";
@@ -50,55 +50,55 @@ import { convertEmporiumOpToCallInfo as ct } from "../../functions/utils/convert
 import "multiformats";
 import { API as dt } from "../../API/API.mjs";
 import "../../API/tenderly.api.mjs";
-import { hinkalDepositOnChainUtxos as W } from "./hinkalDepositOnChainUtxos.mjs";
-import { createLifiBridgeOps as z } from "../../functions/private-wallet/emporium.helpers.mjs";
+import { hinkalDepositOnChainUtxos as H } from "./hinkalDepositOnChainUtxos.mjs";
+import { createLifiBridgeOps as B } from "../../functions/private-wallet/emporium.helpers.mjs";
 import { safeUpdateDepositAndWithdrawStatus as _ } from "../../API/deposit-and-withdraw-status-calls.mjs";
-const ut = async (t, A, r, R, n, T, c, d) => {
-  if (r.length === 0)
+const ut = async (t, f, s, R, a, T, c, d) => {
+  if (s.length === 0)
     throw new Error("No recipients to bridge");
-  const i = A.erc20TokenAddress, o = t.getCurrentChainId(), { contractData: a } = mt[o], { emporiumAddress: w } = a;
+  const i = f.erc20TokenAddress, o = t.getCurrentChainId(), { contractData: n } = mt[o], { emporiumAddress: w } = n;
   if (!w)
     throw Error("No Emporium Address");
-  const C = H[S.Lifi][o];
+  const C = O[S.Lifi][o];
   if (!C)
     throw new Error(`LIFI not configured for chain ${o}`);
-  const l = await t.getRandomRelay();
-  if (!l)
+  const A = await t.getRandomRelay();
+  if (!A)
     throw Error(X.RELAYER_NOT_AVAILABLE);
-  const D = await t.getEthereumAddress(), h = it().toString(), v = t.generateProofRemotely ? 5 : 1, y = [];
-  for (let u = 0; u < r.length; u += v) {
-    const e = r.slice(u, u + v), s = await Promise.all(
-      e.map(async ({ utxo: m, nativeUtxo: p, bridgeAmount: B, quote: x, temporarySubAccount: I }) => {
-        await dt.addTemporaryWalletNonce(o, n, I.index);
-        const q = x.nativeFee > 0n && !O(i, f), E = [i], U = [-m.amount], k = [!1], P = new K({
+  const D = await t.getEthereumAddress(), l = it().toString(), E = t.generateProofRemotely ? 5 : 1, v = [];
+  for (let m = 0; m < s.length; m += E) {
+    const I = s.slice(m, m + E), e = await Promise.all(
+      I.map(async ({ utxo: r, nativeUtxo: p, bridgeAmount: h, quote: U, temporarySubAccount: x }) => {
+        await dt.addTemporaryWalletNonce(o, a, x.index);
+        const q = U.nativeFee > 0n && !z(i, u), g = [i], k = [-r.amount], P = [!1], L = new N({
           amount: 0n,
           erc20TokenAddress: i,
           shieldedPrivateKey: t.userKeys.getShieldedPrivateKey(),
-          timeStamp: h,
+          timeStamp: l,
           tokenId: 0
-        }), F = [[m, P]], L = [[P]];
+        }), F = [[r, L]], b = [[L]];
         if (q && p) {
-          const b = new K({
+          const K = new N({
             amount: 0n,
-            erc20TokenAddress: f,
+            erc20TokenAddress: u,
             shieldedPrivateKey: t.userKeys.getShieldedPrivateKey(),
-            timeStamp: h,
+            timeStamp: l,
             tokenId: 0
           });
-          E.push(f), U.push(-p.amount), k.push(!1), F.push([p, b]), L.push([b]);
+          g.push(u), k.push(-p.amount), P.push(!1), F.push([p, K]), b.push([K]);
         }
-        const M = z(
+        const M = B(
           t,
-          I.ethAddress,
+          x.ethAddress,
           C,
           i,
-          m.amount,
-          B,
-          x
+          r.amount,
+          h,
+          U
         ), { patchAccessTokenMerkleTree: V, kycRequired: Y, hasAccessToken: Z } = await st(
           t,
-          E,
-          U
+          g,
+          k
         ), $ = await rt(
           o,
           D,
@@ -109,21 +109,21 @@ const ut = async (t, A, r, R, n, T, c, d) => {
           "v1x1",
           t.merkleTreeHinkal,
           t.merkleTreeAccessToken,
-          E,
-          E.map(() => 0),
+          g,
+          g.map(() => 0),
           F,
-          L,
+          b,
           t.userKeys,
-          E.length,
+          g.length,
           F[0].length,
           w,
           M,
           t.generateProofRemotely,
-          l ?? f,
+          A ?? u,
           o,
-          k,
+          P,
           void 0,
-          I.privateKey,
+          x.privateKey,
           void 0,
           V,
           void 0,
@@ -136,35 +136,35 @@ const ut = async (t, A, r, R, n, T, c, d) => {
         return { zkCallData: j, dimData: J, circomData: G, authorizationData: Q };
       })
     );
-    y.push(...s);
+    v.push(...e);
   }
   await _(o, {
     id: T,
-    hashedEthereumAddress: n,
-    phase: N.BEFORE_SCHEDULE_WITHDRAW
+    hashedEthereumAddress: a,
+    phase: W.BEFORE_SCHEDULE_WITHDRAW
   });
-  const g = await et(
+  const y = await et(
     o,
-    y,
-    n,
+    v,
+    a,
     c,
     d
   );
   return await _(o, {
     id: T,
-    hashedEthereumAddress: n,
-    phase: N.AFTER_SCHEDULE_WITHDRAW,
-    scheduleId: g
-  }), g;
-}, Ae = async (t, A, r, R, n, T) => {
-  const c = A.erc20TokenAddress, d = t.getCurrentChainId(), i = at(await t.getEthereumAddress()), o = H[S.Lifi][d];
+    hashedEthereumAddress: a,
+    phase: W.AFTER_SCHEDULE_WITHDRAW,
+    scheduleId: y
+  }), y;
+}, Ae = async (t, f, s, R, a, T) => {
+  const c = f.erc20TokenAddress, d = t.getCurrentChainId(), i = nt(await t.getEthereumAddress()), o = O[S.Lifi][d];
   if (!o)
     throw Error("LIFI router not configured");
-  let a;
-  if (n)
-    a = n;
+  let n;
+  if (a)
+    n = a;
   else {
-    const e = r[0], m = z(
+    const e = s[0], p = B(
       t,
       e.temporarySubAccount.ethAddress,
       o,
@@ -173,52 +173,56 @@ const ut = async (t, A, r, R, n, T, c, d) => {
       e.bridgeAmount,
       e.quote
     ).map(
-      (p) => ct(p, e.temporarySubAccount.ethAddress, d)
+      (h) => ct(h, e.temporarySubAccount.ethAddress, d)
     );
-    a = await nt(d, c, [c], S.Emporium, m);
+    n = await at(d, c, [c], S.Emporium, p);
   }
   const w = {
-    feeToken: a.feeToken,
+    feeToken: n.feeToken,
     flatFee: 0n,
     variableRate: 0n
-  }, l = r.reduce((e, s) => e + s.quote.nativeFee, 0n) > 0n && !O(c, f), D = r.map((e) => e.bridgeAmount), h = r.map((e) => e.recipientAddress), { userDepositedUtxos: v, statusId: y } = await W(
+  }, A = s.reduce((e, r) => e + r.quote.nativeFee, 0n) > 0n && !z(c, u), D = s.map((e) => e.bridgeAmount), l = s.map((e) => e.recipientAddress), {
+    userDepositedUtxos: E,
+    statusId: v,
+    depositTxHash: y
+  } = await H(
     t,
-    A,
+    f,
     D,
-    h,
-    a,
+    l,
+    n,
     i
   );
-  let g = [];
-  if (l) {
-    const e = pt(f, d);
+  let m = [];
+  if (A) {
+    const e = pt(u, d);
     if (!e)
       throw Error("No native token");
-    const s = r.map((p) => p.quote.nativeFee), { userDepositedUtxos: m } = await W(
+    const r = s.map((h) => h.quote.nativeFee), { userDepositedUtxos: p } = await H(
       t,
       e,
-      s,
-      h,
+      r,
+      l,
       w,
       i
     );
-    g = m;
+    m = p;
   }
-  const u = r.map((e, s) => ({
+  const I = s.map((e, r) => ({
     ...e,
-    utxo: v[s].utxo,
-    nativeUtxo: l ? g[s]?.utxo : void 0
+    utxo: E[r].utxo,
+    nativeUtxo: A ? m[r]?.utxo : void 0
   }));
-  return ut(
+  return await ut(
     t,
-    A,
-    u,
-    a,
+    f,
+    I,
+    n,
     i,
-    y,
+    v,
     R,
     T
-  );
+  ), y;
 };
 export {
   Ae as hinkalDepositAndBridge

package/data-structures/Hinkal/hinkalSolanaDepositAndWithdraw.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const M=require("../../functions/web3/etherFunctions.cjs"),z=require("../utxo/Utxo.cjs"),Y=require("../../error-handling/error-codes.constants.cjs");require("idb-keyval");const j=require("../../constants/chains.constants.cjs"),G=require("ethers");require("../crypto-keys/keys.cjs");require("node-forge");require("../../constants/vite.constants.cjs");require("libsodium-wrappers");require("../http/HttpClient.cjs");require("axios");const $=require("../../functions/utils/solanaMint.utils.cjs"),N=require("@solana/web3.js"),J=require("../../functions/utils/addresses.cjs");require("../../constants/server.constants.cjs");require("../../constants/token-data/index.cjs");const _=require("../../constants/protocol.constants.cjs"),Q=require("../../API/API.cjs");require("../../functions/utils/mutexes.utils.cjs");require("../../types/circom-data.types.cjs");const ee=require("../../types/external-action.types.cjs");require("../../types/activities.types.cjs");const B=require("../../types/scheduled-transactions.types.cjs");require("../../functions/web3/events/getApprovedBalance.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");require("../../constants/coingecko.constants.cjs");require("../../constants/reorg-depths.constants.cjs");require("../../constants/addresses.constants.cjs");require("../../constants/token.limits.constants.cjs");require("../../constants/presale.constants.cjs");require("../../constants/activity.constants.cjs");require("../../constants/tasks.constants.cjs");require("../../constants/events.constants.cjs");require("../../functions/utils/convertIntegrationProviderToExternalActionId.cjs");require("../../API/getServerURL.cjs");require("circomlibjs-hinkal-fork");require("process");require("buffer");require("../../constants/save-depths.cjs");const te=require("@coral-xyz/anchor"),E=require("../../functions/pre-transaction/solana.cjs");require("@solana/spl-token");require("../../functions/utils/userAgent.cjs");const re=require("../../functions/utils/time.utils.cjs");require("multiformats");require("../../API/tenderly.api.cjs");const oe=require("../../functions/utils/fees.utils.cjs");require("../../functions/web3/getTokenHolder.cjs");const ne=require("../../functions/web3/signAndSendSerializedTransaction.cjs"),Z=require("../../functions/snarkjs/common.snarkjs.cjs"),ae=require("./hinkalCheckSolanaTokenRegistry.cjs"),se=require("../../functions/utils/getUtxosFromReceiptSolana.cjs"),ie=require("../../functions/snarkjs/constructSolanaZkProof.cjs"),ce=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),ue=require("../../functions/pre-transaction/getFeeStructure.cjs"),W=require("../../API/deposit-and-withdraw-status-calls.cjs"),de=async(e,r,d,l,g,h)=>{const p=d.map(t=>t+oe.calculateTotalFee(t,g)),{hinkalIdl:m,hinkalAddress:q,originalDeployer:i}=j.networkRegistry[e.getCurrentChainId()].contractData;if(!m)throw new Error("No IDL configured for Solana program on this network");if(!i)throw new Error("missing original deployer");const w=e.userKeys.getShieldedPrivateKey(),P=z.Utxo.findCorrectRandomization(M.randomBigInt(31),w),S=Z.calcStealthAddressStructure(P,w),o=e.getSolanaProgram(m),b=e.getSolanaPublicKey(),n=new N.PublicKey(i),A=new N.PublicKey(q),{mintPublicKey:c}=$.formatMintAddress(r),D=c.toString(),O=E.getStorageAccountPublicKey(A,n),R=E.getStorageVaultPublicKey(A,n),F=E.getMerkleAccountPublicKey(A,n),v=E.buildAnchorStealthAddressStructure(S),f=e.getCurrentChainId(),x=p.reduce((t,s)=>t+s,0n),I=await ae.hinkalCheckSolanaTokenRegistry(o,new N.PublicKey(n),[r],[x]),K=p.map(t=>`${t}`);let a="";const T=(await W.updateDepositAndWithdrawStatus(f,{hashedEthereumAddress:h,phase:B.DepositAndWithdrawPhase.BEFORE_DEPOSIT})).id??void 0;if(I){const{serializedTransaction:t,blockhash:s,lastValidBlockHeight:y}=await Q.API.generateMultiPaymentDepositLimitless(f,{amounts:K,payer:e.getSolanaPublicKey().toBase58(),ethereumAddress:await e.getEthereumAddress(),mint:r,stealthAddressStructure:v}),{wallet:u}=o.provider;if(!u)throw new Error("missing wallet");a=await ne.signAndSendSerializedTransaction(o.provider,t,s,y)}else{const t=E.getTokenLimitStorageAccountPublicKey(o.programId,n,c),s=D===_.solanaNativeAddress?null:c,y=D===_.solanaNativeAddress?null:void 0;a=await o.methods.multiPaymentDeposit(K.map(L=>new te.BN(L)),v).accounts({mint:s,signer:b,signerAta:y,originalDeployer:n,storageAccount:O,storageVault:R,merkleAccount:F,tokenLimitStorage:t,storageVaultAta:y,accessTokenOwner:null}).rpc();const u=await o.provider.connection.getLatestBlockhash();await o.provider.connection.confirmTransaction({blockhash:u.blockhash,lastValidBlockHeight:u.lastValidBlockHeight,signature:a},"confirmed")}const k=await o.provider.connection.getTransaction(a,{commitment:"confirmed",maxSupportedTransactionVersion:0});if(!k)throw new Error("Transaction missing");await W.safeUpdateDepositAndWithdrawStatus(f,{id:T,hashedEthereumAddress:h,phase:B.DepositAndWithdrawPhase.AFTER_DEPOSIT,depositTxHash:a});const H=se.getUtxosFromReceiptSolana(k,o,e.userKeys),U=[],C=[...H];return l.forEach((t,s)=>{const y=p[s],u=C.find(X=>X.amount===y);if(!u)throw new Error(`Could not find newly created UTXO with amount ${y} for recipient ${t}.`);U.push({recipientAddress:t,utxo:u});const L=C.indexOf(u);C.splice(L,1)}),{userDepositedUtxos:U,signature:a,statusId:T}},le=async(e,r,d,l,g,h,p,m)=>{const q=e.getCurrentChainId();if(d.length===0)throw new Error("userDepositedUtxos must not be empty");const{hinkalIdl:i,originalDeployer:w}=j.networkRegistry[e.getCurrentChainId()].contractData;if(!w||!i)throw new Error("missing data");const P=e.getSolanaProgram(i),S=await e.getRandomRelay(!0);if(!S)throw new Error(Y.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const o=re.getCurrentTimeInSeconds().toString(),b=e.generateProofRemotely?5:1,n=[];for(let c=0;c<d.length;c+=b){const D=d.slice(c,c+b),O=await Promise.all(D.map(async({recipientAddress:R,utxo:F})=>{const{compressedAddress:v}=$.formatMintAddress(_.solanaNativeAddress),f=new z.Utxo({amount:0n,mintAddress:r,erc20TokenAddress:v,shieldedPrivateKey:e.userKeys.getShieldedPrivateKey(),timeStamp:o,tokenId:0}),x=[F,f],I=[f],K=z.Utxo.findCorrectRandomization(M.randomBigInt(31),e.userKeys.getShieldedPrivateKey()),a={tokenNumber:1,nullifierAmount:x.length,outputAmount:I.length},V=Z.calcEncryptedOutputs([I])[0][0],T=Array.from(G.ethers.getBytes(V)),{proofAArr:k,proofBArr:H,proofCArr:U,publicInputsArr:C}=await ie.constructSolanaZkProof(e.generateProofRemotely,w,e.merkleTreeHinkal,e.merkleTreeAccessToken,e.userKeys,P,[r],[x],[I],K,l.flatFee,l.variableRate,R,S,a,[T],e.getCurrentChainId(),void 0,void 0,void 0,void 0,void 0,!1),t=r===_.solanaNativeAddress,s={recipient:R,mint:t?void 0:r};return{relayAddress:S,functionName:"transact",args:{proofAArr:k,proofBArr:H,proofCArr:U,publicInputsArr:C,encryptedOutputs:[T],relayerFee:l.flatFee.toString(),dimensions:a},accounts:s}}));n.push(...O)}await W.safeUpdateDepositAndWithdrawStatus(q,{id:h,hashedEthereumAddress:g,phase:B.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});const A=await ce.solanaTransactCallRelayerBatch(e.getCurrentChainId(),n,g,p,m);return await W.safeUpdateDepositAndWithdrawStatus(q,{id:h,hashedEthereumAddress:g,phase:B.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:A}),A},ge=async(e,r,d,l,g,h,p)=>{const m=J.hashEthereumAddress(await e.getEthereumAddress()),q=e.getCurrentChainId(),i=h??await ue.getFeeStructure(q,r,[r],ee.ExternalActionId.Transact,[],0n),{userDepositedUtxos:w,statusId:P}=await de(e,r,d,l,i,m);return await le(e,r,w,i,m,P,g,p)};exports.hinkalSolanaDepositAndWithdraw=ge;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const M=require("../../functions/web3/etherFunctions.cjs"),z=require("../utxo/Utxo.cjs"),Y=require("../../error-handling/error-codes.constants.cjs");require("idb-keyval");const j=require("../../constants/chains.constants.cjs"),G=require("ethers");require("../crypto-keys/keys.cjs");require("node-forge");require("../../constants/vite.constants.cjs");require("libsodium-wrappers");require("../http/HttpClient.cjs");require("axios");const $=require("../../functions/utils/solanaMint.utils.cjs"),N=require("@solana/web3.js"),J=require("../../functions/utils/addresses.cjs");require("../../constants/server.constants.cjs");require("../../constants/token-data/index.cjs");const _=require("../../constants/protocol.constants.cjs"),Q=require("../../API/API.cjs");require("../../functions/utils/mutexes.utils.cjs");require("../../types/circom-data.types.cjs");const ee=require("../../types/external-action.types.cjs");require("../../types/activities.types.cjs");const B=require("../../types/scheduled-transactions.types.cjs");require("../../functions/web3/events/getApprovedBalance.cjs");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");require("../../constants/coingecko.constants.cjs");require("../../constants/reorg-depths.constants.cjs");require("../../constants/addresses.constants.cjs");require("../../constants/token.limits.constants.cjs");require("../../constants/presale.constants.cjs");require("../../constants/activity.constants.cjs");require("../../constants/tasks.constants.cjs");require("../../constants/events.constants.cjs");require("../../functions/utils/convertIntegrationProviderToExternalActionId.cjs");require("../../API/getServerURL.cjs");require("circomlibjs-hinkal-fork");require("process");require("buffer");require("../../constants/save-depths.cjs");const te=require("@coral-xyz/anchor"),E=require("../../functions/pre-transaction/solana.cjs");require("@solana/spl-token");require("../../functions/utils/userAgent.cjs");const re=require("../../functions/utils/time.utils.cjs");require("multiformats");require("../../API/tenderly.api.cjs");const oe=require("../../functions/utils/fees.utils.cjs");require("../../functions/web3/getTokenHolder.cjs");const ne=require("../../functions/web3/signAndSendSerializedTransaction.cjs"),Z=require("../../functions/snarkjs/common.snarkjs.cjs"),ae=require("./hinkalCheckSolanaTokenRegistry.cjs"),se=require("../../functions/utils/getUtxosFromReceiptSolana.cjs"),ie=require("../../functions/snarkjs/constructSolanaZkProof.cjs"),ce=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),ue=require("../../functions/pre-transaction/getFeeStructure.cjs"),W=require("../../API/deposit-and-withdraw-status-calls.cjs"),de=async(e,r,d,l,g,p)=>{const h=d.map(t=>t+oe.calculateTotalFee(t,g)),{hinkalIdl:m,hinkalAddress:S,originalDeployer:i}=j.networkRegistry[e.getCurrentChainId()].contractData;if(!m)throw new Error("No IDL configured for Solana program on this network");if(!i)throw new Error("missing original deployer");const w=e.userKeys.getShieldedPrivateKey(),P=z.Utxo.findCorrectRandomization(M.randomBigInt(31),w),y=Z.calcStealthAddressStructure(P,w),o=e.getSolanaProgram(m),b=e.getSolanaPublicKey(),n=new N.PublicKey(i),A=new N.PublicKey(S),{mintPublicKey:c}=$.formatMintAddress(r),x=c.toString(),O=E.getStorageAccountPublicKey(A,n),D=E.getStorageVaultPublicKey(A,n),F=E.getMerkleAccountPublicKey(A,n),R=E.buildAnchorStealthAddressStructure(y),f=e.getCurrentChainId(),v=h.reduce((t,s)=>t+s,0n),T=await ae.hinkalCheckSolanaTokenRegistry(o,new N.PublicKey(n),[r],[v]),K=h.map(t=>`${t}`);let a="";const I=(await W.updateDepositAndWithdrawStatus(f,{hashedEthereumAddress:p,phase:B.DepositAndWithdrawPhase.BEFORE_DEPOSIT})).id??void 0;if(T){const{serializedTransaction:t,blockhash:s,lastValidBlockHeight:q}=await Q.API.generateMultiPaymentDepositLimitless(f,{amounts:K,payer:e.getSolanaPublicKey().toBase58(),ethereumAddress:await e.getEthereumAddress(),mint:r,stealthAddressStructure:R}),{wallet:u}=o.provider;if(!u)throw new Error("missing wallet");a=await ne.signAndSendSerializedTransaction(o.provider,t,s,q)}else{const t=E.getTokenLimitStorageAccountPublicKey(o.programId,n,c),s=x===_.solanaNativeAddress?null:c,q=x===_.solanaNativeAddress?null:void 0;a=await o.methods.multiPaymentDeposit(K.map(L=>new te.BN(L)),R).accounts({mint:s,signer:b,signerAta:q,originalDeployer:n,storageAccount:O,storageVault:D,merkleAccount:F,tokenLimitStorage:t,storageVaultAta:q,accessTokenOwner:null}).rpc();const u=await o.provider.connection.getLatestBlockhash();await o.provider.connection.confirmTransaction({blockhash:u.blockhash,lastValidBlockHeight:u.lastValidBlockHeight,signature:a},"confirmed")}const k=await o.provider.connection.getTransaction(a,{commitment:"confirmed",maxSupportedTransactionVersion:0});if(!k)throw new Error("Transaction missing");await W.safeUpdateDepositAndWithdrawStatus(f,{id:I,hashedEthereumAddress:p,phase:B.DepositAndWithdrawPhase.AFTER_DEPOSIT,depositTxHash:a});const H=se.getUtxosFromReceiptSolana(k,o,e.userKeys),U=[],C=[...H];return l.forEach((t,s)=>{const q=h[s],u=C.find(X=>X.amount===q);if(!u)throw new Error(`Could not find newly created UTXO with amount ${q} for recipient ${t}.`);U.push({recipientAddress:t,utxo:u});const L=C.indexOf(u);C.splice(L,1)}),{userDepositedUtxos:U,depositTxHash:a,statusId:I}},le=async(e,r,d,l,g,p,h,m)=>{const S=e.getCurrentChainId();if(d.length===0)throw new Error("userDepositedUtxos must not be empty");const{hinkalIdl:i,originalDeployer:w}=j.networkRegistry[e.getCurrentChainId()].contractData;if(!w||!i)throw new Error("missing data");const P=e.getSolanaProgram(i),y=await e.getRandomRelay(!0);if(!y)throw new Error(Y.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const o=re.getCurrentTimeInSeconds().toString(),b=e.generateProofRemotely?5:1,n=[];for(let c=0;c<d.length;c+=b){const x=d.slice(c,c+b),O=await Promise.all(x.map(async({recipientAddress:D,utxo:F})=>{const{compressedAddress:R}=$.formatMintAddress(_.solanaNativeAddress),f=new z.Utxo({amount:0n,mintAddress:r,erc20TokenAddress:R,shieldedPrivateKey:e.userKeys.getShieldedPrivateKey(),timeStamp:o,tokenId:0}),v=[F,f],T=[f],K=z.Utxo.findCorrectRandomization(M.randomBigInt(31),e.userKeys.getShieldedPrivateKey()),a={tokenNumber:1,nullifierAmount:v.length,outputAmount:T.length},V=Z.calcEncryptedOutputs([T])[0][0],I=Array.from(G.ethers.getBytes(V)),{proofAArr:k,proofBArr:H,proofCArr:U,publicInputsArr:C}=await ie.constructSolanaZkProof(e.generateProofRemotely,w,e.merkleTreeHinkal,e.merkleTreeAccessToken,e.userKeys,P,[r],[v],[T],K,l.flatFee,l.variableRate,D,y,a,[I],e.getCurrentChainId(),void 0,void 0,void 0,void 0,void 0,!1),t=r===_.solanaNativeAddress,s={recipient:D,mint:t?void 0:r};return{relayAddress:y,functionName:"transact",args:{proofAArr:k,proofBArr:H,proofCArr:U,publicInputsArr:C,encryptedOutputs:[I],relayerFee:l.flatFee.toString(),dimensions:a},accounts:s}}));n.push(...O)}await W.safeUpdateDepositAndWithdrawStatus(S,{id:p,hashedEthereumAddress:g,phase:B.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});const A=await ce.solanaTransactCallRelayerBatch(e.getCurrentChainId(),n,g,h,m);return await W.safeUpdateDepositAndWithdrawStatus(S,{id:p,hashedEthereumAddress:g,phase:B.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:A}),A},ge=async(e,r,d,l,g,p,h)=>{const m=J.hashEthereumAddress(await e.getEthereumAddress()),S=e.getCurrentChainId(),i=p??await ue.getFeeStructure(S,r,[r],ee.ExternalActionId.Transact,[],0n),{userDepositedUtxos:w,statusId:P,depositTxHash:y}=await de(e,r,d,l,i,m);return await le(e,r,w,i,m,P,g,h),y};exports.hinkalSolanaDepositAndWithdraw=ge;

package/data-structures/Hinkal/hinkalSolanaDepositAndWithdraw.mjs

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

package/package.json

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