@hinkal/common 0.2.15 → 0.2.17

package/data-structures/Hinkal/hinkalDepositAndWithdraw.mjs

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

package/data-structures/Hinkal/hinkalGetRecipientInfo.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("../../functions/utils/getRecipientInfoFromUserKeys.cjs"),n=(e,o=!1)=>{if(!e)throw Error("No hinkal provided");const{userKeys:t}=e;return o?r.getExtendedRecipientInfoFromUserKeys(t):r.getRecipientInfoFromUserKeys(t)};exports.getRecipientInfo=n;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("../../functions/utils/getRecipientInfoFromUserKeys.cjs"),o=e=>{if(!e)throw Error("No hinkal provided");const{userKeys:t}=e;return r.getRecipientInfoFromUserKeys(t)};exports.getRecipientInfo=o;

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

@@ -1,2 +1,2 @@
 import { IHinkal } from './IHinkal';
-export declare const getRecipientInfo: (hinkal: IHinkal, extendedInfo?: boolean) => string;
+export declare const getRecipientInfo: (hinkal: IHinkal) => string;

package/data-structures/Hinkal/hinkalGetRecipientInfo.mjs

@@ -1,10 +1,10 @@
-import { getExtendedRecipientInfoFromUserKeys as t, getRecipientInfoFromUserKeys as n } from "../../functions/utils/getRecipientInfoFromUserKeys.mjs";
-const s = (e, o = !1) => {
+import { getRecipientInfoFromUserKeys as o } from "../../functions/utils/getRecipientInfoFromUserKeys.mjs";
+const i = (e) => {
   if (!e)
     throw Error("No hinkal provided");
   const { userKeys: r } = e;
-  return o ? t(r) : n(r);
+  return o(r);
 };
 export {
-  s as getRecipientInfo
+  i as getRecipientInfo
 };

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

@@ -1,3 +1,28 @@
-import { type Provider } from '@zkmelabs/widget';
 import { IHinkal } from './IHinkal';
-export declare const getHinkalZkMeProvider: (hinkal: IHinkal) => Provider;
+export type ZkMeTransactionRequest = {
+    type: null | number;
+    from: string;
+    to: string;
+    data: string;
+    chainId: string;
+    gasLimit: string;
+    gasPrice: string;
+    maxFeePerGas: string | null;
+    maxPriorityFeePerGas: string | null;
+};
+export declare const getHinkalZkMeProvider: (hinkal: IHinkal) => {
+    getAccessToken(): Promise<any>;
+    getUserAccounts(): Promise<string[]>;
+    delegateTransaction(tx: ZkMeTransactionRequest): Promise<string>;
+};
+export type ZkMeProvider = ReturnType<typeof getHinkalZkMeProvider>;
+export type ZkMeWidgetMessageBody = {
+    id?: string;
+    channelId: string;
+    method?: 'getUserAccounts' | 'delegateTransaction' | 'signMessage' | 'getAccessToken';
+    params?: ZkMeTransactionRequest | string;
+    kycResults?: 'matching' | 'mismatch';
+    verifiedAddress?: string;
+    event?: 'close' | 'finished';
+    email?: string;
+};

package/data-structures/Hinkal/hinkalInsideTransact.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const H=require("../../error-handling/error-codes.constants.cjs"),L=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),W=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),N=require("../../functions/web3/events/getShieldedBalance.cjs"),b=require("../../functions/web3/functionCalls/estimateGasRelayer.cjs"),B=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),v=require("../../types/external-action.types.cjs"),P=require("../../types/hinkal.types.cjs"),f=require("../../functions/utils/amounts.utils.cjs"),K=require("../../functions/pre-transaction/outputApprovalDataProcessing.cjs"),M=require("../../constants/conversion.constants.cjs"),G=require("../../constants/protocol.constants.cjs"),V=require("../../functions/pre-transaction/merge-with-fee-structure.cjs"),X=require("../../functions/pre-transaction/getFeeStructure.cjs"),D=require("../../types/ethereum-network.types.cjs"),E=require("../../error-handling/logger.cjs"),z=require("../../functions/utils/involves-permit2-op.cjs"),Z=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),$=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),j=async(t,n,r,o,c,i,U,w=!1)=>{const u={externalActionId:v.ExternalActionId.Wallet,externalAddress:c,externalActionMetadata:i},C=t.getContractWithFetcher(D.ContractType.HinkalContract),l=n.findIndex(e=>e===G.zeroAddress),R=l!==-1&&r[l]<0n?r[l]:0n,p=await X.getFeeStructure(t.getCurrentChainId(),U,n,v.ExternalActionId.Wallet,void 0,[{from:C.address,to:c,value:R,calldata:i}]);V.mergeWithFeeStructure(t.getCurrentChainId(),n,r,p),o=[...o],o.length<r.length&&o.push(0n);const a=[...await N.addPaddingToUtxos(t,n,r)],S=`swapperMHA${r.length.toString()}x${a[0].length}x1`,A=r.map(e=>!(e<0n)),d=[],s={inHinkalAddress:t.userKeys.getInHinkalAddress(c),executeApprovalChanges:o,hinkalLogicAction:P.HinkalLogicAction.EXECUTE,doPreTxApproval:!1,useApprovalUtxoData:[]};for(let e=0;e<n.length;e+=1){const q=A[e]?0n:-(f.absBigInt(r[e])-f.absBigInt(o[e])),{outputUtxos:F}=L.outputUtxoProcessing(t.userKeys,a[e],q,void 0,void 0,!1);d.push(F);const{useApprovalUtxoData:I}=K.outputApprovalDataProcessing(t,a[e],q,c);s.useApprovalUtxoData.push(I??P.defaultUseApprovalUTXOData(M.APPROVED_UTXO_CONVERSION_COUNT,0n)),I&&(s.doPreTxApproval=!0)}const T=await t.getRandomRelay();if(!T)throw Error(H.transactionErrorCodes.RELAYER_NOT_AVAILABLE);E.Logger.log("hinkaInAction",{hinkalLogicArgs:s,deltaChanges:r,approvalChanges:o});const{patchAccessTokenMerkleTree:_,kycRequired:k,hasAccessToken:O}=await $.shouldPatchAccessTokenMerkleTree(t,n,r),h=await Z.getSignatureDataForTransact(t.getCurrentChainId(),await t.getEthereumAddress(),t.userKeys,k,O),{zkCallData:m,circomData:g,dimData:x}=await W.constructZkProof("v1x1",t.merkleTreeHinkal,t.merkleTreeAccessToken,a,d,t.userKeys,S,u.externalActionId,u.externalAddress,u.externalActionMetadata,t.generateProofRemotely,T,t.getCurrentChainId(),A,void 0,void 0,void 0,_,s,void 0,p,t.getContractWithFetcher(D.ContractType.HinkalHelperContract),h),y=z.involvesPermit2Op([i]);return E.Logger.log("hinkalInAction circomData",{circomData:g,withUniswapWorkAround:y}),w?await b.estimateGasRelayer(t,m,x,g):await B.transactCallRelayer(t.getCurrentChainId(),m,x,g,y)};exports.hinkalInsideTransact=j;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const B=require("../../error-handling/error-codes.constants.cjs"),K=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),V=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),X=require("../../functions/web3/events/getShieldedBalance.cjs"),z=require("../../functions/web3/functionCalls/estimateGasRelayer.cjs"),G=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),P=require("../../types/external-action.types.cjs"),f=require("../../types/hinkal.types.cjs"),v=require("../../functions/utils/amounts.utils.cjs"),Z=require("../../functions/pre-transaction/outputApprovalDataProcessing.cjs"),$=require("../../constants/conversion.constants.cjs"),j=require("../../constants/protocol.constants.cjs"),Y=require("../../functions/pre-transaction/merge-with-fee-structure.cjs"),J=require("../../functions/pre-transaction/getFeeStructure.cjs"),w=require("../../types/ethereum-network.types.cjs"),C=require("../../error-handling/logger.cjs"),Q=require("../../functions/utils/involves-permit2-op.cjs"),tt=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),et=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),rt=require("../../functions/utils/inLogicMetadata.cjs"),ot=require("../../functions/utils/time.utils.cjs"),nt=require("../../functions/pre-transaction/constructAdminData.cjs"),at=async(t,o,r,n,a,g,E,S,U,_,l=!1)=>{const R=rt.encodeParsedInLogicMetadata(E),s={externalActionId:P.ExternalActionId.Wallet,externalAddress:a,externalActionMetadata:R},k=t.getContractWithFetcher(w.ContractType.HinkalContract),u=o.findIndex(e=>e===j.zeroAddress),L=u!==-1&&r[u]<0n?-r[u]:0n,A=U??await J.getFeeStructure(t.getCurrentChainId(),S,o,P.ExternalActionId.Wallet,[{from:k.address,to:a,value:L,calldata:g}]);Y.mergeWithFeeStructure(t.getCurrentChainId(),o,r,A),n=[...n],n.length<r.length&&n.push(0n);const c=[...await X.addPaddingToUtxos(t,o,r)],M=`swapperMHA${r.length.toString()}x${c[0].length}x1`,p=r.map(e=>!(e<0n)),m=[],i={inHinkalAddress:t.userKeys.getInHinkalAddress(a),executeApprovalChanges:n,hinkalLogicAction:f.HinkalLogicAction.EXECUTE,doPreTxApproval:!1,useApprovalUtxoData:[]},O=ot.getCurrentTimeInSeconds().toString();for(let e=0;e<o.length;e+=1){const y=p[e]?0n:-(v.absBigInt(r[e])-v.absBigInt(n[e])),{outputUtxos:b}=K.outputUtxoProcessing(t.userKeys,c[e],y,O,void 0,!1);m.push(b);const{useApprovalUtxoData:D}=Z.outputApprovalDataProcessing(t,c[e],y,a);i.useApprovalUtxoData.push(D??f.defaultUseApprovalUTXOData($.APPROVED_UTXO_CONVERSION_COUNT,0n)),D&&(i.doPreTxApproval=!0)}const T=await t.getRandomRelay(!l);if(!T)throw Error(B.transactionErrorCodes.RELAYER_NOT_AVAILABLE);C.Logger.log("hinkaInAction",{hinkalLogicArgs:i,deltaChanges:r,approvalChanges:n});const{patchAccessTokenMerkleTree:F,kycRequired:H,hasAccessToken:W}=await et.shouldPatchAccessTokenMerkleTree(t,o,r),h=await tt.getSignatureDataForTransact(t.getCurrentChainId(),await t.getEthereumAddress(),t.userKeys,H,W),{zkCallData:x,circomData:d,dimData:q}=await V.constructZkProof("v1x1",t.merkleTreeHinkal,t.merkleTreeAccessToken,c,m,t.userKeys,M,s.externalActionId,s.externalAddress,s.externalActionMetadata,t.generateProofRemotely,T,t.getCurrentChainId(),p,void 0,void 0,void 0,F,i,void 0,A,t.getContractWithFetcher(w.ContractType.HinkalHelperContract),h),I=Q.uniswapWorkaround([g]);if(C.Logger.log("hinkalInAction circomData",{circomData:d,withUniswapWorkAround:I}),l)return await z.estimateGasRelayer(t,x,q,d);const N=nt.constructAdminData(_,t.getCurrentChainId(),o,r,await t.getEthereumAddress());return await G.transactCallRelayer(t.getCurrentChainId(),x,q,d,I,void 0,void 0,N)};exports.hinkalInsideTransact=at;

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

@@ -1,2 +1,4 @@
 import { IHinkal } from './IHinkal';
-export declare const hinkalInsideTransact: (hinkal: IHinkal, erc20Addresses: string[], deltaChanges: bigint[], approvalChanges: bigint[], externalAddress: string, externalActionMetadata: string, feeToken?: string, onlyGasEstimate?: boolean) => Promise<bigint | import('../../index.ts').RelayerTransaction>;
+import { FeeStructure, type ParsedInLogicMetadata } from '../../types/hinkal.types';
+import { AdminTransactionType } from '../../types/admin.types';
+export declare const hinkalInsideTransact: (hinkal: IHinkal, erc20Addresses: string[], deltaChanges: bigint[], approvalChanges: bigint[], externalAddress: string, externalActionMetadata: string, parsedInLogicMetadata: ParsedInLogicMetadata, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType, onlyGasEstimate?: boolean) => Promise<bigint | import("../..").RelayerTransaction>;

package/data-structures/Hinkal/hinkalInsideTransact.mjs

@@ -1,111 +1,121 @@
-import { transactionErrorCodes as F } from "../../error-handling/error-codes.constants.mjs";
-import { outputUtxoProcessing as N } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { constructZkProof as _ } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { addPaddingToUtxos as K } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { estimateGasRelayer as V } from "../../functions/web3/functionCalls/estimateGasRelayer.mjs";
-import { transactCallRelayer as X } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { ExternalActionId as D } from "../../types/external-action.types.mjs";
-import { HinkalLogicAction as z, defaultUseApprovalUTXOData as B } from "../../types/hinkal.types.mjs";
-import { absBigInt as E } from "../../functions/utils/amounts.utils.mjs";
-import { outputApprovalDataProcessing as M } from "../../functions/pre-transaction/outputApprovalDataProcessing.mjs";
-import { APPROVED_UTXO_CONVERSION_COUNT as $ } from "../../constants/conversion.constants.mjs";
-import { zeroAddress as b } from "../../constants/protocol.constants.mjs";
-import { mergeWithFeeStructure as h } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
-import { getFeeStructure as q } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { ContractType as U } from "../../types/ethereum-network.types.mjs";
-import { Logger as v } from "../../error-handling/logger.mjs";
-import { involvesPermit2Op as G } from "../../functions/utils/involves-permit2-op.mjs";
-import { getSignatureDataForTransact as Y } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
-import { shouldPatchAccessTokenMerkleTree as Z } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
-const xt = async (t, i, r, e, n, m, w, C = !1) => {
-  const s = {
-    externalActionId: D.Wallet,
+import { transactionErrorCodes as X } from "../../error-handling/error-codes.constants.mjs";
+import { outputUtxoProcessing as z } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { constructZkProof as B } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { addPaddingToUtxos as $ } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { estimateGasRelayer as b } from "../../functions/web3/functionCalls/estimateGasRelayer.mjs";
+import { transactCallRelayer as q } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { ExternalActionId as E } from "../../types/external-action.types.mjs";
+import { HinkalLogicAction as Y, defaultUseApprovalUTXOData as Z } from "../../types/hinkal.types.mjs";
+import { absBigInt as U } from "../../functions/utils/amounts.utils.mjs";
+import { outputApprovalDataProcessing as h } from "../../functions/pre-transaction/outputApprovalDataProcessing.mjs";
+import { APPROVED_UTXO_CONVERSION_COUNT as j } from "../../constants/conversion.constants.mjs";
+import { zeroAddress as G } from "../../constants/protocol.constants.mjs";
+import { mergeWithFeeStructure as J } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
+import { getFeeStructure as Q } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { ContractType as y } from "../../types/ethereum-network.types.mjs";
+import { Logger as C } from "../../error-handling/logger.mjs";
+import { uniswapWorkaround as tt } from "../../functions/utils/involves-permit2-op.mjs";
+import { getSignatureDataForTransact as ot } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
+import { shouldPatchAccessTokenMerkleTree as rt } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
+import { encodeParsedInLogicMetadata as et } from "../../functions/utils/inLogicMetadata.mjs";
+import { getCurrentTimeInSeconds as at } from "../../functions/utils/time.utils.mjs";
+import { constructAdminData as nt } from "../../functions/pre-transaction/constructAdminData.mjs";
+const St = async (t, e, r, a, n, p, v, P, R, S, f = !1) => {
+  const H = et(v), m = {
+    externalActionId: E.Wallet,
     externalAddress: n,
-    externalActionMetadata: m
-  }, P = t.getContractWithFetcher(U.HinkalContract), u = i.findIndex((o) => o === b), R = u !== -1 && r[u] < 0n ? r[u] : 0n, f = await q(
-    t.getCurrentChainId(),
-    w,
-    i,
-    D.Wallet,
-    void 0,
-    [{ from: P.address, to: n, value: R, calldata: m }]
-  );
-  h(t.getCurrentChainId(), i, r, f), e = [...e], e.length < r.length && e.push(0n);
-  const a = [...await K(t, i, r)], H = `swapperMHA${r.length.toString()}x${a[0].length}x1`, A = r.map((o) => !(o < 0n)), g = [], c = {
+    externalActionMetadata: H
+  }, L = t.getContractWithFetcher(y.HinkalContract), s = e.findIndex((o) => o === G), O = s !== -1 && r[s] < 0n ? -r[s] : 0n, d = R ?? await Q(t.getCurrentChainId(), P, e, E.Wallet, [
+    { from: L.address, to: n, value: O, calldata: p }
+  ]);
+  J(t.getCurrentChainId(), e, r, d), a = [...a], a.length < r.length && a.push(0n);
+  const i = [...await $(t, e, r)], W = `swapperMHA${r.length.toString()}x${i[0].length}x1`, A = r.map((o) => !(o < 0n)), g = [], c = {
     inHinkalAddress: t.userKeys.getInHinkalAddress(n),
-    executeApprovalChanges: e,
-    hinkalLogicAction: z.EXECUTE,
+    executeApprovalChanges: a,
+    hinkalLogicAction: Y.EXECUTE,
     doPreTxApproval: !1,
     useApprovalUtxoData: []
-  };
-  for (let o = 0; o < i.length; o += 1) {
-    const I = A[o] ? 0n : -(E(r[o]) - E(e[o])), { outputUtxos: k } = N(
+  }, M = at().toString();
+  for (let o = 0; o < e.length; o += 1) {
+    const D = A[o] ? 0n : -(U(r[o]) - U(a[o])), { outputUtxos: V } = z(
       t.userKeys,
-      a[o],
-      I,
-      void 0,
+      i[o],
+      D,
+      M,
       void 0,
       !1
     );
-    g.push(k);
-    const { useApprovalUtxoData: y } = M(
+    g.push(V);
+    const { useApprovalUtxoData: w } = h(
       t,
-      a[o],
-      I,
+      i[o],
+      D,
       n
     );
     c.useApprovalUtxoData.push(
-      y ?? B($, 0n)
-    ), y && (c.doPreTxApproval = !0);
+      w ?? Z(j, 0n)
+    ), w && (c.doPreTxApproval = !0);
   }
-  const l = await t.getRandomRelay();
-  if (!l)
-    throw Error(F.RELAYER_NOT_AVAILABLE);
-  v.log("hinkaInAction", { hinkalLogicArgs: c, deltaChanges: r, approvalChanges: e });
-  const { patchAccessTokenMerkleTree: O, kycRequired: L, hasAccessToken: S } = await Z(
+  const x = await t.getRandomRelay(!f);
+  if (!x)
+    throw Error(X.RELAYER_NOT_AVAILABLE);
+  C.log("hinkaInAction", { hinkalLogicArgs: c, deltaChanges: r, approvalChanges: a });
+  const { patchAccessTokenMerkleTree: F, kycRequired: N, hasAccessToken: _ } = await rt(
     t,
-    i,
+    e,
     r
-  ), W = await Y(
+  ), k = await ot(
     t.getCurrentChainId(),
     await t.getEthereumAddress(),
     t.userKeys,
-    L,
-    S
-  ), { zkCallData: d, circomData: p, dimData: x } = await _(
+    N,
+    _
+  ), { zkCallData: l, circomData: u, dimData: I } = await B(
     "v1x1",
     t.merkleTreeHinkal,
     t.merkleTreeAccessToken,
-    a,
+    i,
     g,
     t.userKeys,
-    H,
-    s.externalActionId,
-    s.externalAddress,
-    s.externalActionMetadata,
+    W,
+    m.externalActionId,
+    m.externalAddress,
+    m.externalActionMetadata,
     t.generateProofRemotely,
-    l,
+    x,
     t.getCurrentChainId(),
     A,
     void 0,
     void 0,
     void 0,
     // stakeArgs
-    O,
+    F,
     c,
     void 0,
-    f,
-    t.getContractWithFetcher(U.HinkalHelperContract),
-    W
-  ), T = G([m]);
-  return v.log("hinkalInAction circomData", { circomData: p, withUniswapWorkAround: T }), C ? await V(t, d, x, p) : await X(
-    t.getCurrentChainId(),
     d,
-    x,
-    p,
-    T
+    t.getContractWithFetcher(y.HinkalHelperContract),
+    k
+  ), T = tt([p]);
+  if (C.log("hinkalInAction circomData", { circomData: u, withUniswapWorkAround: T }), f)
+    return await b(t, l, I, u);
+  const K = nt(
+    S,
+    t.getCurrentChainId(),
+    e,
+    r,
+    await t.getEthereumAddress()
+  );
+  return await q(
+    t.getCurrentChainId(),
+    l,
+    I,
+    u,
+    T,
+    void 0,
+    void 0,
+    K
   );
 };
 export {
-  xt as hinkalInsideTransact
+  St as hinkalInsideTransact
 };

package/data-structures/Hinkal/hinkalMultiSend.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("../../error-handling/error-codes.constants.cjs"),s=require("../../functions/utils/addresses.cjs"),d=async(i,a,o,t)=>{let r;return t&&(r=t.map(e=>{if(!s.isValidExtendedPrivateAddress(e))throw Error(n.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);return s.constructStealthAddressStructure(e)})),await i.prooflessDeposit(a,o,r)};exports.hinkalMultiSendPrivateRecipients=d;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=require("../../error-handling/error-codes.constants.cjs"),s=require("../../functions/utils/addresses.cjs"),u=async(i,a,o,t)=>{let r;return t&&(r=t.map(e=>{if(!s.isValidPrivateAddress(e))throw Error(n.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);return s.constructStealthAddressStructure(e)})),await i.prooflessDeposit(a,o,r)};exports.hinkalMultiSendPrivateRecipients=u;

package/data-structures/Hinkal/hinkalMultiSend.mjs

@@ -1,13 +1,13 @@
 import { transactionErrorCodes as i } from "../../error-handling/error-codes.constants.mjs";
-import { isValidExtendedPrivateAddress as d, constructStealthAddressStructure as u } from "../../functions/utils/addresses.mjs";
-const E = async (e, o, a, r) => {
+import { isValidPrivateAddress as u, constructStealthAddressStructure as c } from "../../functions/utils/addresses.mjs";
+const m = async (o, a, e, r) => {
   let t;
   return r && (t = r.map((s) => {
-    if (!d(s))
+    if (!u(s))
       throw Error(i.RECIPIENT_FORMAT_INCORRECT);
-    return u(s);
-  })), await e.prooflessDeposit(o, a, t);
+    return c(s);
+  })), await o.prooflessDeposit(a, e, t);
 };
 export {
-  E as hinkalMultiSendPrivateRecipients
+  m as hinkalMultiSendPrivateRecipients
 };

package/data-structures/Hinkal/hinkalPrivateWallet.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const R=require("../../constants/chains.constants.cjs"),S=require("../../error-handling/error-codes.constants.cjs");require("ethers");require("axios");require("../../constants/vite.constants.cjs");require("../../types/circom-data.types.cjs");const U=require("../../types/ethereum-network.types.cjs"),_=require("../../types/external-action.types.cjs"),F=require("../../types/hinkal.types.cjs");require("../../types/transactions.types.cjs");require("../../types/curve.types.cjs");require("../../types/activities.types.cjs");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/reorg-depths.constants.cjs");const H=require("../../functions/snarkjs/constructEmporiumProof.cjs"),K=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),O=require("../../functions/web3/events/getShieldedBalance.cjs"),W=require("../../functions/web3/functionCalls/estimateGasRelayer.cjs"),h=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),L=require("../../functions/utils/involves-permit2-op.cjs"),M=require("../../functions/pre-transaction/outputApprovalDataProcessing.cjs"),k=require("../../functions/utils/convertEmporiumOpToCallInfo.cjs"),b=require("../../functions/private-wallet/smartContractWalletCalculator.cjs"),B=require("../../functions/pre-transaction/getFeeStructure.cjs"),G=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),N=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),j=async(e,n,t,q,i=[],u,A,y,v=!1)=>{const C=u===0n?void 0:await b.calculateSmartContractWalletAddressFromNonce(e.getCurrentChainId(),e.userKeys,u??0n),{contractData:T}=R.networkRegistry[e.getCurrentChainId()],{emporiumAddress:o}=T;if(!o)throw Error("No Emporium Address Provided");const P=y??await B.getFeeStructure(e.getCurrentChainId(),A,n,_.ExternalActionId.Emporium,void 0,i.map(r=>k.convertEmporiumOpToCallInfo(r,C??"",o))),s=[...await O.addPaddingToUtxos(e,n,t)],c=[],a=F.defaultHinkalLogicArgs(t.length,e.userKeys);for(let r=0;r<n.length;r+=1){const{outputUtxos:I}=K.outputUtxoProcessing(e.userKeys,s[r],t[r],void 0,void 0,!1);c.push(I);const{useApprovalUtxoData:m}=M.outputApprovalDataProcessing(e,s[r],t[r]);m&&(a.doPreTxApproval=!0,a.useApprovalUtxoData[r]=m,a.interactionAddress=o,a.inHinkalAddress=e.userKeys.getInHinkalAddress(o))}const l=await e.getRandomRelay();if(!l)throw Error(S.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const{patchAccessTokenMerkleTree:f,kycRequired:E,hasAccessToken:w}=await G.shouldPatchAccessTokenMerkleTree(e,n,t),x=await N.getSignatureDataForTransact(e.getCurrentChainId(),await e.getEthereumAddress(),e.userKeys,E,w),{zkCallData:d,circomData:p,dimData:g}=await H.constructEmporiumProof("v1x1",e.merkleTreeHinkal,e.merkleTreeAccessToken,s,c,e.userKeys,t.length,s.length>0?s[0].length:0,o,i,e.generateProofRemotely,l,e.getCurrentChainId(),q,void 0,u,a,f,void 0,P,e.getContractWithFetcher(U.ContractType.HinkalHelperContract),x),D=L.involvesPermit2Op(i);return v?await W.estimateGasRelayer(e,d,g,p):await h.transactCallRelayer(e.getCurrentChainId(),d,g,p,!1,D)};exports.hinkalPrivateWallet=j;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const z=require("../../constants/chains.constants.cjs"),I=require("../../error-handling/error-codes.constants.cjs");require("ethers");require("../../types/circom-data.types.cjs");const V=require("../../types/ethereum-network.types.cjs"),b=require("../../types/external-action.types.cjs"),j=require("../../types/hinkal.types.cjs");require("../../types/transactions.types.cjs");const S=require("../../types/admin.types.cjs");require("../../types/activities.types.cjs");require("../../constants/server.constants.cjs");require("../../API/getServerURL.cjs");require("../http/HttpClient.cjs");require("axios");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/vite.constants.cjs");require("../../constants/save-depths.cjs");const G=require("../../functions/utils/caseInsensitive.utils.cjs");require("../../constants/reorg-depths.constants.cjs");require("../../functions/utils/mutexes.utils.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");const Y=require("../crypto-keys/keys.cjs"),J=require("../../functions/utils/time.utils.cjs"),Q=require("../../functions/snarkjs/constructEmporiumProof.cjs"),X=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),Z=require("../../functions/web3/events/getShieldedBalance.cjs"),$=require("../../functions/web3/functionCalls/estimateGasRelayer.cjs"),ee=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),re=require("../../functions/utils/involves-permit2-op.cjs"),te=require("../../functions/pre-transaction/outputApprovalDataProcessing.cjs"),oe=require("../../functions/utils/convertEmporiumOpToCallInfo.cjs"),se=require("../../functions/pre-transaction/getFeeStructure.cjs"),ie=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),ae=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),ne=require("../../functions/pre-transaction/merge-with-fee-structure-emporium.cjs"),ue=require("./handleAutoDepositBack.cjs");require("../../constants/token-data/index.cjs");const ce=require("../../functions/pre-transaction/constructAdminData.cjs");require("@solana/spl-token");const de=require("../../functions/pre-transaction/recipientUtxoProcessing.cjs"),qe=require("../../functions/utils/addresses.cjs"),pe=async(e,t,o,l,n,s,m,R,U,_,F=!1,C,g,u,v=!1)=>{if(u&&!qe.isValidPrivateAddress(u.recipientInfo))throw Error(I.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);const c=e.getCurrentChainId(),d=Y.UserKeys.getSignerAddressFromPrivateKey(c,m.privateKey),{contractData:k}=z.networkRegistry[c],{emporiumAddress:q}=k;if(!q)throw Error("No Emporium Address Provided");const p=U??await se.getFeeStructure(c,R,t,b.ExternalActionId.Emporium,n.map(r=>oe.convertEmporiumOpToCallInfo(r,d??"",c))),K=s.find(r=>G.caseInsensitiveEqual(r.token.erc20TokenAddress,p.feeToken))?.amount??0n;for(d&&await ne.mergeWithFeeStructureEmporium(e,d,n,t,o,p,K);l.length<t.length;)l.push(!1);const i=[...await Z.addPaddingToUtxos(e,t,o)],A=[],a=j.defaultHinkalLogicArgs(o.length,e.userKeys),f=J.getCurrentTimeInSeconds().toString();for(let r=0;r<t.length;r+=1){const{outputUtxos:B}=X.outputUtxoProcessing(e.userKeys,i[r],o[r],f,void 0,!1);A.push(B);const{useApprovalUtxoData:x}=te.outputApprovalDataProcessing(e,i[r],o[r]);x&&(a.doPreTxApproval=!0,a.useApprovalUtxoData[r]=x,a.interactionAddress=q,a.inHinkalAddress=e.userKeys.getInHinkalAddress(q))}u&&de.recipientUtxoProcessing(u,A,o,f);const E=_??await e.getRandomRelay(!v);if(!E)throw Error(I.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const{patchAccessTokenMerkleTree:O,kycRequired:W,hasAccessToken:h}=await ie.shouldPatchAccessTokenMerkleTree(e,t,o),H=await ae.getSignatureDataForTransact(e.getCurrentChainId(),await e.getEthereumAddress(),e.userKeys,W,h),{zkCallData:w,circomData:y,dimData:P,authorizationData:D}=await Q.constructEmporiumProof("v1x1",e.merkleTreeHinkal,e.merkleTreeAccessToken,t,t.map(()=>0),i,A,e.userKeys,o.length,i.length>0?i[0].length:0,q,n,e.generateProofRemotely,E,e.getCurrentChainId(),l,void 0,m,a,O,void 0,p,e.getContractWithFetcher(V.ContractType.HinkalHelperContract),H),L=re.uniswapWorkaround(n);if(v)return await $.estimateGasRelayer(e,w,P,y,D);const T=g===S.AdminTransactionType.FundApproveAndTransact,M=ce.constructAdminData(g,e.getCurrentChainId(),s.map(r=>r.token.erc20TokenAddress),s.map(r=>r.amount),await e.getEthereumAddress(),g===S.AdminTransactionType.PublicSwap?s.map(({token:r})=>r):void 0,T?o:void 0,T?t:void 0,T?s:void 0),N=await ee.transactCallRelayer(e.getCurrentChainId(),w,P,y,!1,L,D,M);return F&&ue.handleAutoDepositBack(e,d,m,p.feeToken,C,s,y),N};exports.hinkalPrivateWallet=pe;

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

@@ -1,3 +1,6 @@
 import { IHinkal } from './IHinkal';
 import { FeeStructure } from '../../types/hinkal.types';
-export declare const hinkalPrivateWallet: (hinkal: IHinkal, erc20Addresses: string[], deltaChanges: bigint[], onChainCreation: boolean[], ops?: string[], walletNonce?: bigint, feeToken?: string, feeStructureOverride?: FeeStructure, onlyGasEstimate?: boolean) => Promise<bigint | import('../../index.ts').RelayerTransaction>;
+import { PrivateRecipientInfo, TokenChanges } from '../../types/token.types';
+import { SubAccount } from '../../types/proxy.types';
+import { AdminTransactionType } from '../../types/admin.types';
+export declare const hinkalPrivateWallet: (hinkal: IHinkal, erc20Addresses: string[], deltaChanges: bigint[], onChainCreation: boolean[], ops: string[], emporiumTokenChanges: TokenChanges<bigint>[], subAccount: SubAccount, feeToken?: string, feeStructureOverride?: FeeStructure, relayOverride?: string, autoDepositBack?: boolean, maxGasInDollar?: string, action?: AdminTransactionType, privateRecipientInfo?: PrivateRecipientInfo, onlyGasEstimate?: boolean) => Promise<bigint | import("../..").RelayerTransaction>;