@hinkal/common 0.2.27 → 0.2.29

package/data-structures/Hinkal/hinkalCheckTokenRegistry.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("idb-keyval");const u=require("../../constants/chains.constants.cjs"),n=require("../../functions/utils/create-provider.cjs"),o=require("ethers");require("../../constants/token-data/index.cjs");require("../../error-handling/error-codes.constants.cjs");require("../../functions/utils/convertIntegrationProviderToExternalActionId.cjs");require("../../types/circom-data.types.cjs");require("../../types/activities.types.cjs");require("circomlibjs-hinkal-fork");require("../crypto-keys/keys.cjs");require("../../constants/server.constants.cjs");require("../../constants/vite.constants.cjs");require("../http/HttpClient.cjs");require("axios");require("../../API/getServerURL.cjs");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/save-depths.cjs");require("../../constants/reorg-depths.constants.cjs");require("../../functions/utils/mutexes.utils.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");require("@solana/spl-token");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");require("../../constants/coingecko.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/userAgent.cjs");require("multiformats");require("../../API/tenderly.api.cjs");const q=async(r,e,i)=>await r.checkTokenRegistry(e,i),a=r=>{const e=u.networkRegistry[r].contractData,{fetchRpcUrl:i}=u.networkRegistry[r];if(!i)throw new Error("RPC URL not found for the specified chain ID");const t=n.createCustomRpcProvider(i);if(!e.hinkalHelperAddress||!e.hinkalHelperABI)throw Error("hinkal helpercontract data not found");return new o.ethers.Contract(e.hinkalHelperAddress,e.hinkalHelperABI,t)};exports.createHinkalHelperFromData=a;exports.hinkalCheckTokenRegistry=q;
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../functions/utils/tron.utils.cjs`),n=require(`../../functions/utils/create-provider.cjs`);require(`../../functions/utils/index.cjs`);let r=require(`ethers`);var i=async(e,t,n)=>await e.checkTokenRegistry(t,n),a=t=>{let i=e.networkRegistry[t].contractData,a=n.createCustomRpcProvider(t);if(!i.hinkalHelperAddress||!i.hinkalHelperABI)throw Error(`hinkal helpercontract data not found`);return new r.ethers.Contract(i.hinkalHelperAddress,i.hinkalHelperABI,a)},o=async(n,r,i)=>{let a=t.createTronWeb(i),{contractData:o}=e.networkRegistry[i],{hinkalHelperAddress:s,hinkalHelperABI:c}=o;if(!s||!c)throw Error(`hinkal helper contract data not found`);let l=a.contract(c,t.evmHexToTronBase58Address(s)),u=n.map(t.evmHexToTronBase58Address);return!!await l.checkTokenRegistry(u,r.map(String)).call()};exports.createHinkalHelperFromData=a,exports.hinkalCheckTokenRegistry=i,exports.hinkalCheckTronTokenRegistry=o;

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

@@ -1,3 +1,4 @@
 import { ethers } from 'ethers';
 export declare const hinkalCheckTokenRegistry: (hinkalHelper: ethers.Contract, erc20Addresses: string[], amountChanges: bigint[]) => Promise<boolean>;
 export declare const createHinkalHelperFromData: (chainId: number) => ethers.Contract;
+export declare const hinkalCheckTronTokenRegistry: (erc20Addresses: string[], amountChanges: bigint[], chainId: number) => Promise<boolean>;

package/data-structures/Hinkal/hinkalCheckTokenRegistry.mjs

@@ -1,50 +1,18 @@
-import "idb-keyval";
-import { networkRegistry as p } from "../../constants/chains.constants.mjs";
-import { createCustomRpcProvider as m } from "../../functions/utils/create-provider.mjs";
-import { ethers as e } from "ethers";
-import "../../constants/token-data/index.mjs";
-import "../../error-handling/error-codes.constants.mjs";
-import "../../functions/utils/convertIntegrationProviderToExternalActionId.mjs";
-import "../../types/circom-data.types.mjs";
-import "../../types/activities.types.mjs";
-import "circomlibjs-hinkal-fork";
-import "../crypto-keys/keys.mjs";
-import "../../constants/server.constants.mjs";
-import "../../constants/vite.constants.mjs";
-import "../http/HttpClient.mjs";
-import "axios";
-import "../../API/getServerURL.mjs";
-import "libsodium-wrappers";
-import "process";
-import "buffer";
-import "../../constants/save-depths.mjs";
-import "../../constants/reorg-depths.constants.mjs";
-import "../../functions/utils/mutexes.utils.mjs";
-import "@coral-xyz/anchor";
-import "@solana/web3.js";
-import "@solana/spl-token";
-import "../../constants/contracts.constants.mjs";
-import "../../constants/kyc.constants.mjs";
-import "../../constants/coingecko.constants.mjs";
-import "../../constants/addresses.constants.mjs";
-import "../../constants/token.limits.constants.mjs";
-import "../../constants/presale.constants.mjs";
-import "../../constants/activity.constants.mjs";
-import "../../constants/tasks.constants.mjs";
-import "../../constants/events.constants.mjs";
-import "../../functions/utils/userAgent.mjs";
-import "multiformats";
-import "../../API/tenderly.api.mjs";
-const O = async (t, r, o) => await t.checkTokenRegistry(r, o), Q = (t) => {
-  const r = p[t].contractData, { fetchRpcUrl: o } = p[t];
-  if (!o)
-    throw new Error("RPC URL not found for the specified chain ID");
-  const i = m(o);
-  if (!r.hinkalHelperAddress || !r.hinkalHelperABI)
-    throw Error("hinkal helpercontract data not found");
-  return new e.Contract(r.hinkalHelperAddress, r.hinkalHelperABI, i);
-};
-export {
-  Q as createHinkalHelperFromData,
-  O as hinkalCheckTokenRegistry
+import { networkRegistry as e } from "../../constants/chains.constants.mjs";
+import { createTronWeb as t, evmHexToTronBase58Address as n } from "../../functions/utils/tron.utils.mjs";
+import { createCustomRpcProvider as r } from "../../functions/utils/create-provider.mjs";
+import "../../functions/utils/index.mjs";
+import { ethers as i } from "ethers";
+//#region ../shared/common/src/data-structures/Hinkal/hinkalCheckTokenRegistry.ts
+var a = async (e, t, n) => await e.checkTokenRegistry(t, n), o = (t) => {
+	let n = e[t].contractData, a = r(t);
+	if (!n.hinkalHelperAddress || !n.hinkalHelperABI) throw Error("hinkal helpercontract data not found");
+	return new i.Contract(n.hinkalHelperAddress, n.hinkalHelperABI, a);
+}, s = async (r, i, a) => {
+	let o = t(a), { contractData: s } = e[a], { hinkalHelperAddress: c, hinkalHelperABI: l } = s;
+	if (!c || !l) throw Error("hinkal helper contract data not found");
+	let u = o.contract(l, n(c)), d = r.map(n);
+	return !!await u.checkTokenRegistry(d, i.map(String)).call();
 };
+//#endregion
+export { o as createHinkalHelperFromData, a as hinkalCheckTokenRegistry, s as hinkalCheckTronTokenRegistry };

package/data-structures/Hinkal/hinkalClaimUtxo.cjs

@@ -0,0 +1 @@
+const e=require(`../../types/ethereum-network.types.cjs`),t=require(`../../types/external-action.types.cjs`),n=require(`../../constants/chains.constants.cjs`),r=require(`../../constants/protocol.constants.cjs`),i=require(`../../types/hinkal.types.cjs`),a=require(`../../types/admin.types.cjs`),o=require(`../../functions/utils/caseInsensitive.utils.cjs`),s=require(`../../error-handling/error-codes.constants.cjs`),c=require(`../crypto-keys/keys.cjs`),ee=require(`../../functions/utils/time.utils.cjs`),l=require(`../utxo/Utxo.cjs`),u=require(`../../functions/utils/tron.utils.cjs`),d=require(`../../functions/utils/token-check.utils.cjs`),f=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),p=require(`../../functions/pre-transaction/constructAdminData.cjs`),m=require(`../../functions/pre-transaction/getFeeStructure.cjs`),h=require(`../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs`),g=require(`../../functions/pre-transaction/getSignatureDataForTransact.cjs`),_=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),v=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`);var y=async(y,b,x,S,C)=>{let w=d.validateAndGetChainId([b]),te=n.isTronLike(w),T=b.erc20TokenAddress,E=u.addressToHexFormat(await y.getEthereumAddressByChain(w));if(!o.caseInsensitiveEqual(T,x.erc20TokenAddress))throw Error(`Off-chain UTXO token mismatch`);if(!x.shieldedPrivateKey)throw Error(`Claimable UTXO shieldedPrivateKey is missing`);let D=new c.UserKeys(void 0,x.shieldedPrivateKey),O=y.getRecipientInfo(),k=l.Utxo.createFrom(x,{shieldedPrivateKey:D.getShieldedPrivateKey()}),A=new l.Utxo({amount:0n,erc20TokenAddress:k.erc20TokenAddress,mintAddress:k.mintAddress,tokenId:k.tokenId,shieldedPrivateKey:D.getShieldedPrivateKey()}),j=[T],M=S??await m.getFeeStructure(w,T,[T],t.ExternalActionId.Transact);if(!o.caseInsensitiveEqual(M.feeToken,T))throw Error(`Claim fee token mismatch: fee must be paid from claimed UTXO token`);let N=M.variableRate>0n?M.variableRate:r.HINKAL_PRIVATE_SEND_VARIABLE_RATE;if(k.amount<=M.flatFee)throw Error(s.transactionErrorCodes.INSUFFICIENT_FUNDS_TO_TRANSACT);let P=k.amount-M.flatFee,F=P*N/10000n,I=P-F;if(I<=0n)throw Error(s.transactionErrorCodes.RECIPIENT_AMOUNT_INVALID);let L={feeToken:M.feeToken,flatFee:M.flatFee+F,variableRate:0n},R=[-k.amount],z=await y.getRandomRelay(w,!0);if(!z)throw Error(s.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let B={externalActionId:0n,externalAddress:z??E,externalActionMetadata:`0x00`},V=[[k,A]],H=[],U=i.defaultHinkalLogicArgs(R.length,D),W=ee.getCurrentTimeInSeconds().toString(),{outputUtxos:G}=f.outputUtxoProcessing(D,V[0],R[0],W,k.tokenId,!0,O,I);H.push(G);let{patchAccessTokenMerkleTree:K,kycRequired:q,hasAccessToken:J}=await h.shouldPatchAccessTokenMerkleTree(y,w,j,R,D.getAccessKey()),Y=await g.getSignatureDataForTransact(w,E,D,q,J),X=`swapperM${R.length}x${V[0].length}x2`,{zkCallData:Z,circomData:Q,dimData:$}=await _.constructZkProof(y.merkleTreeHinkalByChain[w],y.merkleTreeAccessTokenByChain[w],V,H,D,X,B.externalActionId,B.externalAddress,B.externalActionMetadata,y.generateProofRemotely,z,w,void 0,void 0,void 0,K,U,void 0,L,y.getContractWithFetcher(w,e.ContractType.HinkalHelperContract),Y),ne=await u.reorderZkCallData(te,Z,$,Q);return v.transactCallRelayer(w,Z,$,Q,void 0,void 0,p.constructAdminData(C??a.AdminTransactionType.ClaimUtxo,w,j,R,E),ne)};exports.hinkalClaimUtxo=y;

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

@@ -0,0 +1,6 @@
+import { ERC20Token } from '../../types/token.types';
+import { IHinkal } from './IHinkal';
+import { FeeStructure } from '../../types/hinkal.types';
+import { AdminTransactionType } from '../../types/admin.types';
+import { Utxo } from '../utxo/Utxo';
+export declare const hinkalClaimUtxo: (hinkal: IHinkal, erc20Token: ERC20Token, utxo: Utxo, feeStructureOverride?: FeeStructure, action?: AdminTransactionType) => Promise<string>;

package/data-structures/Hinkal/hinkalClaimUtxo.mjs

@@ -0,0 +1,54 @@
+import { ContractType as e } from "../../types/ethereum-network.types.mjs";
+import { ExternalActionId as t } from "../../types/external-action.types.mjs";
+import { isTronLike as n } from "../../constants/chains.constants.mjs";
+import { HINKAL_PRIVATE_SEND_VARIABLE_RATE as r } from "../../constants/protocol.constants.mjs";
+import { defaultHinkalLogicArgs as i } from "../../types/hinkal.types.mjs";
+import { AdminTransactionType as a } from "../../types/admin.types.mjs";
+import { caseInsensitiveEqual as o } from "../../functions/utils/caseInsensitive.utils.mjs";
+import { transactionErrorCodes as s } from "../../error-handling/error-codes.constants.mjs";
+import { UserKeys as c } from "../crypto-keys/keys.mjs";
+import { getCurrentTimeInSeconds as l } from "../../functions/utils/time.utils.mjs";
+import { Utxo as u } from "../utxo/Utxo.mjs";
+import { addressToHexFormat as d, reorderZkCallData as f } from "../../functions/utils/tron.utils.mjs";
+import { validateAndGetChainId as p } from "../../functions/utils/token-check.utils.mjs";
+import { outputUtxoProcessing as m } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { constructAdminData as h } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { getFeeStructure as g } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { shouldPatchAccessTokenMerkleTree as _ } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
+import { getSignatureDataForTransact as ee } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
+import { constructZkProof as v } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { transactCallRelayer as y } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+//#region ../shared/common/src/data-structures/Hinkal/hinkalClaimUtxo.ts
+var b = async (b, x, S, te, ne) => {
+	let C = p([x]), w = n(C), T = x.erc20TokenAddress, E = d(await b.getEthereumAddressByChain(C));
+	if (!o(T, S.erc20TokenAddress)) throw Error("Off-chain UTXO token mismatch");
+	if (!S.shieldedPrivateKey) throw Error("Claimable UTXO shieldedPrivateKey is missing");
+	let D = new c(void 0, S.shieldedPrivateKey), O = b.getRecipientInfo(), k = u.createFrom(S, { shieldedPrivateKey: D.getShieldedPrivateKey() }), A = new u({
+		amount: 0n,
+		erc20TokenAddress: k.erc20TokenAddress,
+		mintAddress: k.mintAddress,
+		tokenId: k.tokenId,
+		shieldedPrivateKey: D.getShieldedPrivateKey()
+	}), j = [T], M = te ?? await g(C, T, [T], t.Transact);
+	if (!o(M.feeToken, T)) throw Error("Claim fee token mismatch: fee must be paid from claimed UTXO token");
+	let N = M.variableRate > 0n ? M.variableRate : r;
+	if (k.amount <= M.flatFee) throw Error(s.INSUFFICIENT_FUNDS_TO_TRANSACT);
+	let P = k.amount - M.flatFee, F = P * N / 10000n, I = P - F;
+	if (I <= 0n) throw Error(s.RECIPIENT_AMOUNT_INVALID);
+	let L = {
+		feeToken: M.feeToken,
+		flatFee: M.flatFee + F,
+		variableRate: 0n
+	}, R = [-k.amount], z = await b.getRandomRelay(C, !0);
+	if (!z) throw Error(s.RELAYER_NOT_AVAILABLE);
+	let B = {
+		externalActionId: 0n,
+		externalAddress: z ?? E,
+		externalActionMetadata: "0x00"
+	}, V = [[k, A]], H = [], U = i(R.length, D), W = l().toString(), { outputUtxos: G } = m(D, V[0], R[0], W, k.tokenId, !0, O, I);
+	H.push(G);
+	let { patchAccessTokenMerkleTree: K, kycRequired: q, hasAccessToken: J } = await _(b, C, j, R, D.getAccessKey()), Y = await ee(C, E, D, q, J), X = `swapperM${R.length}x${V[0].length}x2`, { zkCallData: Z, circomData: Q, dimData: $ } = await v(b.merkleTreeHinkalByChain[C], b.merkleTreeAccessTokenByChain[C], V, H, D, X, B.externalActionId, B.externalAddress, B.externalActionMetadata, b.generateProofRemotely, z, C, void 0, void 0, void 0, K, U, void 0, L, b.getContractWithFetcher(C, e.HinkalHelperContract), Y), re = await f(w, Z, $, Q);
+	return y(C, Z, $, Q, void 0, void 0, h(ne ?? a.ClaimUtxo, C, j, R, E), re);
+};
+//#endregion
+export { b as hinkalClaimUtxo };

package/data-structures/Hinkal/hinkalDeposit.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const q=require("../../constants/protocol.constants.cjs"),F=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),I=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),R=require("../../functions/web3/events/getShieldedBalance.cjs"),M=require("../../functions/web3/functionCalls/transactCallDirect.cjs"),w=require("../utxo/Utxo.cjs"),_=require("../../error-handling/error-codes.constants.cjs");require("../../types/circom-data.types.cjs");const S=require("../../types/ethereum-network.types.cjs"),U=require("../../types/admin.types.cjs");require("../../types/activities.types.cjs");const z=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),H=require("../../functions/utils/addresses.cjs"),O=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),b=require("../../functions/utils/time.utils.cjs"),K=require("../../API/admin-calls.cjs"),f=require("../../functions/pre-transaction/constructAdminData.cjs"),E=async(t,s,e)=>{const{patchAccessTokenMerkleTree:n,kycRequired:d,hasAccessToken:o}=await O.shouldPatchAccessTokenMerkleTree(t,s,e),r=void 0,u=await t.getEthereumAddress(),A=await z.getSignatureDataForTransact(t.getCurrentChainId(),u,t.userKeys,d,o),l={externalActionId:0n,externalAddress:await t.getEthereumAddress(),externalActionMetadata:"0x00"};return{signatureData:A,externalActionData:l,contractTransaction:r,contractToApprove:r,patchAccessTokenMerkleTree:n}},N=async(t,s,e,n=!0,d=!1)=>{const o=s.map(a=>a.erc20TokenAddress),{externalActionData:r,contractTransaction:u,contractToApprove:A,patchAccessTokenMerkleTree:l,signatureData:T}=await E(t,o,e),p=[...await R.addPaddingToUtxos(t,o,e)],m=`swapperM${e.length.toString()}x${p[0].length}x1`,c=[],x=b.getCurrentTimeInSeconds().toString();for(let a=0;a<o.length;a+=1){const{outputUtxos:P}=F.outputUtxoProcessing(t.userKeys,p[a],e[a],x);c.push(P)}const{zkCallData:g,circomData:y,dimData:D}=await I.constructZkProof("v1x1",t.merkleTreeHinkal,t.merkleTreeAccessToken,p,c,t.userKeys,m,r.externalActionId,r.externalAddress,r.externalActionMetadata,t.generateProofRemotely,q.zeroAddress,t.getCurrentChainId(),void 0,void 0,void 0,l,void 0,void 0,void 0,t.getContractWithFetcher(S.ContractType.HinkalHelperContract),T),v=await M.transactCallDirect(t,e,s,g,y,D,A,u,n,d),C=f.constructAdminData(U.AdminTransactionType.Onboarding,t.getCurrentChainId(),o,e,await t.getEthereumAddress());return K.emitTxPublicData(t.getCurrentChainId(),C),v},k=async(t,s,e,n,d=!0,o=!1)=>{const r=s.map(i=>i.erc20TokenAddress),[u,A,l]=n.split(",");if(!H.isValidPrivateAddress(n))throw Error(_.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);const T=r.map(i=>[new w.Utxo({amount:0n,erc20TokenAddress:i,shieldedPrivateKey:t.userKeys.getShieldedPrivateKey()}),new w.Utxo({amount:0n,erc20TokenAddress:i,shieldedPrivateKey:t.userKeys.getShieldedPrivateKey()})]),p=`swapperM${e.length.toString()}x${T[0].length}x1`,m=r.map((i,h)=>[new w.Utxo({amount:e[h],erc20TokenAddress:i,randomization:BigInt(u),stealthAddress:A,encryptionKey:l})]),{externalActionData:c,contractTransaction:x,contractToApprove:g,patchAccessTokenMerkleTree:y}=await E(t,r,e),{zkCallData:D,circomData:v,dimData:C}=await I.constructZkProof("v1x1",t.merkleTreeHinkal,t.merkleTreeAccessToken,T,m,t.userKeys,p,c.externalActionId,c.externalAddress,c.externalActionMetadata,t.generateProofRemotely,q.zeroAddress,t.getCurrentChainId(),void 0,void 0,void 0,y,void 0,void 0,void 0,t.getContractWithFetcher(S.ContractType.HinkalHelperContract)),a=await M.transactCallDirect(t,e,s,D,v,C,g,x,d,o),P=f.constructAdminData(U.AdminTransactionType.PaymentLink,t.getCurrentChainId(),r,e,await t.getEthereumAddress());return K.emitTxPublicData(t.getCurrentChainId(),P),a};exports.hinkalDeposit=N;exports.hinkalDepositForOther=k;
+const e=require(`../../types/ethereum-network.types.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../types/admin.types.cjs`);require(`../../types/index.cjs`);const r=require(`../../functions/utils/addresses.cjs`),i=require(`../../error-handling/error-codes.constants.cjs`),a=require(`../../API/admin-calls.cjs`),o=require(`../../functions/utils/time.utils.cjs`),s=require(`../utxo/Utxo.cjs`),c=require(`../../functions/utils/token-check.utils.cjs`),l=require(`../../functions/web3/events/getShieldedBalance.cjs`),u=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),d=require(`../../functions/pre-transaction/constructAdminData.cjs`),f=require(`../../functions/pre-transaction/getKycAndSignatureData.cjs`),p=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),m=require(`../../functions/web3/functionCalls/transactCallDirect.cjs`);var h=async(e,t,n,r)=>{let i=await e.getEthereumAddressByChain(t),{patchAccessTokenMerkleTree:a,signatureData:o}=await f.getKycAndSignatureData(e,t,n,r,i);return{signatureData:o,externalActionData:{externalActionId:0n,externalAddress:i,externalActionMetadata:`0x00`},contractTransaction:void 0,contractToApprove:void 0,patchAccessTokenMerkleTree:a}},g=async(e,t,n,r)=>{let i=[...await l.addPaddingToUtxos(e,t,n,r)],a=[],s=o.getCurrentTimeInSeconds().toString();for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=u.outputUtxoProcessing(e.userKeys,i[t],r[t],s);a.push(n)}return{inputUtxosArray:i,outputUtxosArray:a}},_=async(r,i,o,s=!0,l=!1)=>{let u=c.validateAndGetChainId(i),f=i.map(e=>e.erc20TokenAddress),[{externalActionData:_,contractTransaction:v,contractToApprove:y,patchAccessTokenMerkleTree:b,signatureData:x},{inputUtxosArray:S,outputUtxosArray:C}]=await Promise.all([h(r,u,f,o),g(r,u,f,o)]),w=`swapperM${o.length.toString()}x${S[0].length}x1`,{zkCallData:T,circomData:E,dimData:D}=await p.constructZkProof(r.merkleTreeHinkalByChain[u],r.merkleTreeAccessTokenByChain[u],S,C,r.userKeys,w,_.externalActionId,_.externalAddress,_.externalActionMetadata,r.generateProofRemotely,t.zeroAddress,u,void 0,void 0,void 0,b,void 0,void 0,void 0,r.getContractWithFetcher(u,e.ContractType.HinkalHelperContract),x),O=await m.transactCallDirect(r,u,o,i,T,E,D,y,v,s,l);return a.emitTxPublicData(d.constructAdminData(n.AdminTransactionType.Onboarding,u,f,o,await r.getEthereumAddress())),O},v=async(o,l,u,f,g=!0,_=!1)=>{let v=c.validateAndGetChainId(l),y=l.map(e=>e.erc20TokenAddress),[b,x,S]=f.split(`,`);if(!r.isValidPrivateAddress(f))throw Error(i.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let C=y.map(e=>[new s.Utxo({amount:0n,erc20TokenAddress:e,shieldedPrivateKey:o.userKeys.getShieldedPrivateKey()}),new s.Utxo({amount:0n,erc20TokenAddress:e,shieldedPrivateKey:o.userKeys.getShieldedPrivateKey()})]),w=`swapperM${u.length.toString()}x${C[0].length}x1`,T=y.map((e,t)=>[new s.Utxo({amount:u[t],erc20TokenAddress:e,randomization:BigInt(b),stealthAddress:x,encryptionKey:S})]),{externalActionData:E,contractTransaction:D,contractToApprove:O,patchAccessTokenMerkleTree:k}=await h(o,v,y,u),{zkCallData:A,circomData:j,dimData:M}=await p.constructZkProof(o.merkleTreeHinkalByChain[v],o.merkleTreeAccessTokenByChain[v],C,T,o.userKeys,w,E.externalActionId,E.externalAddress,E.externalActionMetadata,o.generateProofRemotely,t.zeroAddress,v,void 0,void 0,void 0,k,void 0,void 0,void 0,o.getContractWithFetcher(v,e.ContractType.HinkalHelperContract)),N=await m.transactCallDirect(o,v,u,l,A,j,M,O,D,g,_);return a.emitTxPublicData(d.constructAdminData(n.AdminTransactionType.PaymentLink,v,y,u,await o.getEthereumAddress())),N};exports.hinkalDeposit=_,exports.hinkalDepositForOther=v;

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

@@ -1,4 +1,4 @@
 import { IHinkal } from './IHinkal';
 import { ERC20Token } from '../../types';
-export declare const hinkalDeposit: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], preEstimateGas?: boolean, returnTxData?: boolean) => Promise<any>;
-export declare const hinkalDepositForOther: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], recipinetInfo: string, preEstimateGas?: boolean, returnTxData?: boolean) => Promise<any>;
+export declare const hinkalDeposit: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], preEstimateGas?: boolean, returnTxData?: boolean) => Promise<import('ethers').TransactionRequest | import('ethers').TransactionResponse>;
+export declare const hinkalDepositForOther: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], recipinetInfo: string, preEstimateGas?: boolean, returnTxData?: boolean) => Promise<import('ethers').TransactionRequest | import('ethers').TransactionResponse>;

package/data-structures/Hinkal/hinkalDeposit.mjs

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

package/data-structures/Hinkal/hinkalDepositAndBridge.cjs

@@ -0,0 +1 @@
+const e=require(`../../types/ethereum-network.types.cjs`),t=require(`../../types/external-action.types.cjs`),n=require(`../../constants/chains.constants.cjs`),r=require(`../../constants/protocol.constants.cjs`),i=require(`../../types/scheduled-transactions.types.cjs`);require(`../../types/index.cjs`);const a=require(`../../functions/utils/caseInsensitive.utils.cjs`),o=require(`../../functions/utils/addresses.cjs`),s=require(`../../API/API.cjs`),c=require(`../../constants/addresses.constants.cjs`),l=require(`../../error-handling/error-codes.constants.cjs`),u=require(`../../functions/utils/erc20tokenFunctions.cjs`),d=require(`../../functions/utils/time.utils.cjs`),f=require(`../utxo/Utxo.cjs`),p=require(`../../functions/utils/token-check.utils.cjs`),m=require(`../../functions/utils/fees.utils.cjs`),h=require(`../../functions/pre-transaction/constructAdminData.cjs`),g=require(`../../functions/pre-transaction/getFeeStructure.cjs`),_=require(`../../functions/pre-transaction/getKycAndSignatureData.cjs`),v=require(`../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`),y=require(`../../functions/utils/convertEmporiumOpToCallInfo.cjs`);require(`../../functions/utils/index.cjs`);const b=require(`../../functions/private-wallet/emporium.helpers.cjs`),x=require(`../../functions/snarkjs/constructEmporiumProof.cjs`),S=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),C=require(`../../API/deposit-and-withdraw-status-calls.cjs`),w=require(`./hinkalDepositOnChainUtxos.cjs`);require(`../../functions/index.cjs`);var T=async(o,u,p,g,v,y,w,T,E,D)=>{if(g.length===0)throw Error(`No recipients to bridge`);let O=p.erc20TokenAddress,{contractData:k}=n.networkRegistry[u],{emporiumAddress:A}=k;if(!A)throw Error(`No Emporium Address`);let j=c.SWAP_ROUTER_ADDRESSES[t.ExternalActionId.Lifi][u];if(!j)throw Error(`LIFI not configured for chain ${u}`);let M=await o.getRandomRelay(u);if(!M)throw Error(l.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let N=await o.getEthereumAddressByChain(u),P=d.getCurrentTimeInSeconds().toString(),F=o.generateProofRemotely?5:1,I=[];for(let t=0;t<g.length;t+=F){let n=g.slice(t,t+F),i=await Promise.all(n.map(async({utxo:t,nativeUtxo:n,bridgeAmount:i,quote:c,temporarySubAccount:l,recipientAddress:d})=>{await s.API.addTemporaryWalletNonce(u,y,l.index);let p=c.nativeFee>0n&&!a.caseInsensitiveEqual(O,r.zeroAddress),g=[O],S=[-t.amount],C=[!1],w=new f.Utxo({amount:0n,erc20TokenAddress:O,shieldedPrivateKey:o.userKeys.getShieldedPrivateKey(),timeStamp:P,tokenId:0}),T=[[t,w]],E=[[w]];if(p&&n){let e=new f.Utxo({amount:0n,erc20TokenAddress:r.zeroAddress,shieldedPrivateKey:o.userKeys.getShieldedPrivateKey(),timeStamp:P,tokenId:0});g.push(r.zeroAddress),S.push(-n.amount),C.push(!1),T.push([n,e]),E.push([e])}let k=b.createLifiBridgeOps(o,u,l.ethAddress,j,O,t.amount,i,c),{patchAccessTokenMerkleTree:F,signatureData:I}=await _.getKycAndSignatureData(o,u,g,S,N),L=m.calculateTotalFee(i,v),R={feeToken:v.feeToken,flatFee:L,variableRate:0n},z=h.constructAdminData(D,u,g,[-t.amount],N),{zkCallData:B,circomData:V,dimData:H,authorizationData:U}=await x.constructEmporiumProof(o.merkleTreeHinkalByChain[u],o.merkleTreeAccessTokenByChain[u],g,g.map(()=>0),T,E,o.userKeys,g.length,T[0].length,A,k,o.generateProofRemotely,M??r.zeroAddress,u,C,void 0,l.privateKey,void 0,F,void 0,R,o.getContractWithFetcher(u,e.ContractType.HinkalHelperContract),I);return{zkCallData:B,dimData:H,circomData:V,authorizationData:U,recipientAddress:d,adminData:z}}));I.push(...i)}await C.safeUpdateDepositAndWithdrawStatus({id:w,chainId:u,hashedEthereumAddress:y,phase:i.DepositAndWithdrawPhase.BEFORE_SCHEDULE_WITHDRAW});let L=await S.transactCallRelayerBatch(u,I,y,T,E);return await C.safeUpdateDepositAndWithdrawStatus({id:w,chainId:u,hashedEthereumAddress:y,phase:i.DepositAndWithdrawPhase.AFTER_SCHEDULE_WITHDRAW,scheduleId:L}),L},E=async(e,n,i,s,l,d,f,m=!0)=>{let h=n.erc20TokenAddress,_=p.validateAndGetChainId([n]),x=o.hashEthereumAddress(await e.getEthereumAddressByChain(_)),S=c.SWAP_ROUTER_ADDRESSES[t.ExternalActionId.Lifi][_];if(!S)throw Error(`LIFI router not configured`);let C;if(l)C=l;else{let n=i[0],a=b.createLifiBridgeOps(e,_,n.temporarySubAccount.ethAddress,S,h,n.bridgeAmount,n.bridgeAmount,n.quote).map(e=>y.convertEmporiumOpToCallInfo(e,n.temporarySubAccount.ethAddress,_));C=await g.getFeeStructure(_,h,[h],t.ExternalActionId.Emporium,a,r.PAY_SEND_VARIABLE_RATE)}let E={feeToken:C.feeToken,flatFee:0n,variableRate:0n},D=i.reduce((e,t)=>e+t.quote.nativeFee,0n)>0n&&!a.caseInsensitiveEqual(h,r.zeroAddress),O=i.map(e=>e.bridgeAmount),k=i.map(e=>e.recipientAddress),{userDepositedUtxos:A,statusId:j,depositTxHash:M}=await w.hinkalDepositOnChainUtxos(e,_,n,O,k,C,x,m),N=[];if(D){let t=u.getERC20Token(r.zeroAddress,_);if(!t)throw Error(`No native token`);let{userDepositedUtxos:n}=await w.hinkalDepositOnChainUtxos(e,_,t,i.map(e=>e.quote.nativeFee),k,E,x,m);N=n}return await v.waitForDepositedUtxosInMerkleTree(e,_,[...A,...N]),await T(e,_,n,i.map((e,t)=>({...e,utxo:A[t].utxo,nativeUtxo:D?N[t]?.utxo:void 0})),C,x,j,s,d,f),M};exports.hinkalDepositAndBridge=E;

package/data-structures/Hinkal/{hinkalDepostAndBridge.d.ts → hinkalDepositAndBridge.d.ts}

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

package/data-structures/Hinkal/hinkalDepositAndBridge.mjs

@@ -0,0 +1,116 @@
+import { ContractType as e } from "../../types/ethereum-network.types.mjs";
+import { ExternalActionId as t } from "../../types/external-action.types.mjs";
+import { networkRegistry as n } from "../../constants/chains.constants.mjs";
+import { PAY_SEND_VARIABLE_RATE as r, zeroAddress as i } from "../../constants/protocol.constants.mjs";
+import { DepositAndWithdrawPhase as a } from "../../types/scheduled-transactions.types.mjs";
+import "../../types/index.mjs";
+import { caseInsensitiveEqual as o } from "../../functions/utils/caseInsensitive.utils.mjs";
+import { hashEthereumAddress as s } from "../../functions/utils/addresses.mjs";
+import { API as c } from "../../API/API.mjs";
+import { SWAP_ROUTER_ADDRESSES as l } from "../../constants/addresses.constants.mjs";
+import { transactionErrorCodes as u } from "../../error-handling/error-codes.constants.mjs";
+import { getERC20Token as d } from "../../functions/utils/erc20tokenFunctions.mjs";
+import { getCurrentTimeInSeconds as f } from "../../functions/utils/time.utils.mjs";
+import { Utxo as p } from "../utxo/Utxo.mjs";
+import { validateAndGetChainId as m } from "../../functions/utils/token-check.utils.mjs";
+import { calculateTotalFee as h } from "../../functions/utils/fees.utils.mjs";
+import { constructAdminData as g } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { getFeeStructure as _ } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { getKycAndSignatureData as v } from "../../functions/pre-transaction/getKycAndSignatureData.mjs";
+import { waitForDepositedUtxosInMerkleTree as y } from "../../functions/pre-transaction/waitForDepositedUtxosInMerkleTree.mjs";
+import { convertEmporiumOpToCallInfo as b } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
+import "../../functions/utils/index.mjs";
+import { createLifiBridgeOps as x } from "../../functions/private-wallet/emporium.helpers.mjs";
+import { constructEmporiumProof as S } from "../../functions/snarkjs/constructEmporiumProof.mjs";
+import { transactCallRelayerBatch as C } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { safeUpdateDepositAndWithdrawStatus as w } from "../../API/deposit-and-withdraw-status-calls.mjs";
+import { hinkalDepositOnChainUtxos as T } from "./hinkalDepositOnChainUtxos.mjs";
+import "../../functions/index.mjs";
+//#region ../shared/common/src/data-structures/Hinkal/hinkalDepositAndBridge.ts
+var E = async (r, s, d, m, _, y, b, T, E, D) => {
+	if (m.length === 0) throw Error("No recipients to bridge");
+	let O = d.erc20TokenAddress, { contractData: k } = n[s], { emporiumAddress: A } = k;
+	if (!A) throw Error("No Emporium Address");
+	let j = l[t.Lifi][s];
+	if (!j) throw Error(`LIFI not configured for chain ${s}`);
+	let M = await r.getRandomRelay(s);
+	if (!M) throw Error(u.RELAYER_NOT_AVAILABLE);
+	let N = await r.getEthereumAddressByChain(s), P = f().toString(), F = r.generateProofRemotely ? 5 : 1, I = [];
+	for (let t = 0; t < m.length; t += F) {
+		let n = m.slice(t, t + F), a = await Promise.all(n.map(async ({ utxo: t, nativeUtxo: n, bridgeAmount: a, quote: l, temporarySubAccount: u, recipientAddress: d }) => {
+			await c.addTemporaryWalletNonce(s, y, u.index);
+			let f = l.nativeFee > 0n && !o(O, i), m = [O], b = [-t.amount], C = [!1], w = new p({
+				amount: 0n,
+				erc20TokenAddress: O,
+				shieldedPrivateKey: r.userKeys.getShieldedPrivateKey(),
+				timeStamp: P,
+				tokenId: 0
+			}), T = [[t, w]], E = [[w]];
+			if (f && n) {
+				let e = new p({
+					amount: 0n,
+					erc20TokenAddress: i,
+					shieldedPrivateKey: r.userKeys.getShieldedPrivateKey(),
+					timeStamp: P,
+					tokenId: 0
+				});
+				m.push(i), b.push(-n.amount), C.push(!1), T.push([n, e]), E.push([e]);
+			}
+			let k = x(r, s, u.ethAddress, j, O, t.amount, a, l), { patchAccessTokenMerkleTree: F, signatureData: I } = await v(r, s, m, b, N), L = h(a, _), R = {
+				feeToken: _.feeToken,
+				flatFee: L,
+				variableRate: 0n
+			}, z = g(D, s, m, [-t.amount], N), { zkCallData: B, circomData: V, dimData: H, authorizationData: U } = await S(r.merkleTreeHinkalByChain[s], r.merkleTreeAccessTokenByChain[s], m, m.map(() => 0), T, E, r.userKeys, m.length, T[0].length, A, k, r.generateProofRemotely, M ?? i, s, C, void 0, u.privateKey, void 0, F, void 0, R, r.getContractWithFetcher(s, e.HinkalHelperContract), I);
+			return {
+				zkCallData: B,
+				dimData: H,
+				circomData: V,
+				authorizationData: U,
+				recipientAddress: d,
+				adminData: z
+			};
+		}));
+		I.push(...a);
+	}
+	await w({
+		id: b,
+		chainId: s,
+		hashedEthereumAddress: y,
+		phase: a.BEFORE_SCHEDULE_WITHDRAW
+	});
+	let L = await C(s, I, y, T, E);
+	return await w({
+		id: b,
+		chainId: s,
+		hashedEthereumAddress: y,
+		phase: a.AFTER_SCHEDULE_WITHDRAW,
+		scheduleId: L
+	}), L;
+}, D = async (e, n, a, c, u, f, p, h = !0) => {
+	let g = n.erc20TokenAddress, v = m([n]), S = s(await e.getEthereumAddressByChain(v)), C = l[t.Lifi][v];
+	if (!C) throw Error("LIFI router not configured");
+	let w;
+	if (u) w = u;
+	else {
+		let n = a[0], i = x(e, v, n.temporarySubAccount.ethAddress, C, g, n.bridgeAmount, n.bridgeAmount, n.quote).map((e) => b(e, n.temporarySubAccount.ethAddress, v));
+		w = await _(v, g, [g], t.Emporium, i, r);
+	}
+	let D = {
+		feeToken: w.feeToken,
+		flatFee: 0n,
+		variableRate: 0n
+	}, O = a.reduce((e, t) => e + t.quote.nativeFee, 0n) > 0n && !o(g, i), k = a.map((e) => e.bridgeAmount), A = a.map((e) => e.recipientAddress), { userDepositedUtxos: j, statusId: M, depositTxHash: N } = await T(e, v, n, k, A, w, S, h), P = [];
+	if (O) {
+		let t = d(i, v);
+		if (!t) throw Error("No native token");
+		let { userDepositedUtxos: n } = await T(e, v, t, a.map((e) => e.quote.nativeFee), A, D, S, h);
+		P = n;
+	}
+	return await y(e, v, [...j, ...P]), await E(e, v, n, a.map((e, t) => ({
+		...e,
+		utxo: j[t].utxo,
+		nativeUtxo: O ? P[t]?.utxo : void 0
+	})), w, S, M, c, f, p), N;
+};
+//#endregion
+export { D as hinkalDepositAndBridge };

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

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

@@ -1,4 +1,5 @@
 import { IHinkal } from './IHinkal';
-import { ERC20Token } from '../../types';
+import { AdminTransactionType, ERC20Token } from '../../types';
 import { FeeStructure } from '../../types/hinkal.types';
-export declare const hinkalDepositAndWithdraw: (hinkal: IHinkal, erc20Token: ERC20Token, recipientAmounts: bigint[], recipientAddresses: string[], txCompletionTime?: number, feeStructureOverride?: FeeStructure, ref?: string, preEstimateGas?: boolean) => Promise<string>;
+export declare const hinkalDepositAndWithdraw: (hinkal: IHinkal, erc20Token: ERC20Token, recipientAmounts: bigint[], recipientAddresses: string[], txCompletionTime?: number, feeStructureOverride?: FeeStructure, // Should be passed fee for only one withdraw transaction, multiplication happening in this function
+ref?: string, action?: AdminTransactionType, preEstimateGas?: boolean) => Promise<string>;