@hinkal/common 0.2.17 → 0.2.18

package/data-structures/Hinkal/hinkalDepositAndWithdraw.mjs

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

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

@@ -1,4 +1,4 @@
 import { IHinkal } from './IHinkal';
 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>;
+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('../../index.ts').RelayerTransaction>;

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

@@ -3,4 +3,4 @@ import { FeeStructure } from '../../types/hinkal.types';
 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>;
+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('../../index.ts').RelayerTransaction>;

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

@@ -3,4 +3,4 @@ import { FeeStructure } from '../../types/hinkal.types';
 import { AdminTransactionType } from '../../types/admin.types';
 import { IHinkal } from './IHinkal';
 import { SubAccount } from '../../types/proxy.types';
-export declare const hinkalProxyToPrivate: (hinkal: IHinkal, erc20Tokens: ERC20Token[], deltaAmountsBase: bigint[], recipientInfo: string, feeToken?: string, feeStructureOverride?: FeeStructure, subAccount?: SubAccount, action?: AdminTransactionType, onlyGasEstimate?: boolean) => Promise<bigint | import("../..").RelayerTransaction>;
+export declare const hinkalProxyToPrivate: (hinkal: IHinkal, erc20Tokens: ERC20Token[], deltaAmountsBase: bigint[], recipientInfo: string, feeToken?: string, feeStructureOverride?: FeeStructure, subAccount?: SubAccount, action?: AdminTransactionType, onlyGasEstimate?: boolean) => Promise<bigint | import('../../index.ts').RelayerTransaction>;

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

@@ -1,4 +1,4 @@
 import { FeeStructure, OKXSwapResponseInstruction } from '../../types';
 import { IHinkal } from './IHinkal';
 import { ERC20Token } from '../../types/token.types';
-export declare const hinkalSolanaSwap: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], instructionLists: OKXSwapResponseInstruction[], addressLookupTableAccount: string[], feeToken?: string, feeStructureOverride?: FeeStructure, onlyGasEstimate?: boolean) => Promise<import("../../types").RelayerTransaction>;
+export declare const hinkalSolanaSwap: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], instructionLists: OKXSwapResponseInstruction[], addressLookupTableAccount: string[], feeToken?: string, feeStructureOverride?: FeeStructure, onlyGasEstimate?: boolean) => Promise<import('../../types/relayer.types').RelayerTransaction>;

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

@@ -1,3 +1,3 @@
 import { ERC20Token, FeeStructure } from '../../types';
 import { IHinkal } from './IHinkal';
-export declare const hinkalSolanaTransfer: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], recipientAddress: string, feeToken?: string, feeStructureOverride?: FeeStructure, onlyGasEstimate?: boolean) => Promise<import("../../types").RelayerTransaction>;
+export declare const hinkalSolanaTransfer: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChanges: bigint[], recipientAddress: string, feeToken?: string, feeStructureOverride?: FeeStructure, onlyGasEstimate?: boolean) => Promise<import('../../types/relayer.types').RelayerTransaction>;

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

@@ -1,3 +1,3 @@
 import { FeeStructure } from '../../types';
 import { IHinkal } from './IHinkal';
-export declare const hinkalSolanaWithdraw: (hinkal: IHinkal, mintAddresses: string[], amountChanges: bigint[], recipientAddress: string, feeToken?: string, feeStructureOverride?: FeeStructure, onlyGasEstimate?: boolean) => Promise<import("../../types").RelayerTransaction>;
+export declare const hinkalSolanaWithdraw: (hinkal: IHinkal, mintAddresses: string[], amountChanges: bigint[], recipientAddress: string, feeToken?: string, feeStructureOverride?: FeeStructure, onlyGasEstimate?: boolean) => Promise<import('../../types/relayer.types').RelayerTransaction>;

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

@@ -3,4 +3,4 @@ import { IHinkal } from './IHinkal';
 import { FeeStructure } from '../../types/hinkal.types';
 import { type ERC20Token } from '../../types/token.types';
 import { AdminTransactionType } from '../../types/admin.types';
-export declare const hinkalSwap: (hinkal: IHinkal, erc20tokens: ERC20Token[], deltaAmounts: bigint[], externalActionId: ExternalActionId, data: string, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType, onlyGasEstimate?: boolean, withPrivateMempool?: boolean) => Promise<bigint | import("../..").RelayerTransaction>;
+export declare const hinkalSwap: (hinkal: IHinkal, erc20tokens: ERC20Token[], deltaAmounts: bigint[], externalActionId: ExternalActionId, data: string, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType, onlyGasEstimate?: boolean, withPrivateMempool?: boolean) => Promise<bigint | import('../../index.ts').RelayerTransaction>;

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

@@ -1,4 +1,4 @@
 import { FeeStructure } from '../../types/hinkal.types';
 import { AdminTransactionType, ERC20Token } from '../../types';
 import { IHinkal } from './IHinkal';
-export declare const hinkalTransfer: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChangesBase: bigint[], recipientAddress: string, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType, onlyGasEstimate?: boolean) => Promise<bigint | import("../../types").RelayerTransaction>;
+export declare const hinkalTransfer: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChangesBase: bigint[], recipientAddress: string, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType, onlyGasEstimate?: boolean) => Promise<bigint | import('../../types/relayer.types').RelayerTransaction>;

package/data-structures/Hinkal/hinkalWithdrawStuckUtxos.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const P=require("../../error-handling/error-codes.constants.cjs"),D=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),E=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),F=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),R=require("../../types/external-action.types.cjs"),M=require("../../types/hinkal.types.cjs"),_=require("../../functions/pre-transaction/outputApprovalDataProcessing.cjs"),W=require("../../functions/pre-transaction/getFeeStructure.cjs"),B=require("../../functions/pre-transaction/merge-with-fee-structure.cjs");require("../../types/circom-data.types.cjs");const b=require("../../types/ethereum-network.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");const K=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),L=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs");require("../../constants/server.constants.cjs");require("../../constants/chains.constants.cjs");require("../../constants/vite.constants.cjs");require("../http/HttpClient.cjs");require("axios");const H=require("../../functions/utils/amounts.utils.cjs");require("ethers");require("../../constants/token-data/index.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("@solana/web3.js");require("../crypto-keys/keys.cjs");const N=require("../../functions/utils/time.utils.cjs"),$=require("../../functions/pre-transaction/constructAdminData.cjs");require("@solana/spl-token");const O=require("../../functions/web3/events/getInputUtxoAndBalance.cjs"),Z=require("../../functions/web3/events/getShieldedBalance.cjs"),j=require("../../functions/utils/encodeTokenWithId.cjs"),z=require("../../API/unspent-utxos-calls.cjs"),G=require("../../functions/utils/addresses.cjs"),V=async(e,c,d,g,l)=>{const o=[c.erc20TokenAddress],A=c.erc20TokenAddress,a=await W.getFeeStructure(e.getCurrentChainId(),A,o,R.ExternalActionId.Transact),i=d-a.flatFee;if(i<=0n)throw new Error(`Insufficient balance to cover fee. Balance: ${d}, Fee: ${a.flatFee}`);const t=[-i];B.mergeWithFeeStructure(e.getCurrentChainId(),o,t,a);const u={externalActionId:0n,externalAddress:g,externalActionMetadata:"0x00"},s=[...await Z.addPaddingToUtxos(e,o,t,void 0,void 0,!1,!0)],q=`swapperM${t.length.toString()}x${s[0].length}x1`,r=M.defaultHinkalLogicArgs(t.length,e.userKeys),p=N.getCurrentTimeInSeconds().toString(),x=[];for(let n=0;n<o.length;n+=1){const{outputUtxos:k}=D.outputUtxoProcessing(e.userKeys,s[n],t[n],p,void 0,!1);x.push(k);const{useApprovalUtxoData:T}=_.outputApprovalDataProcessing(e,s[n],t[n]);T&&(r.useApprovalUtxoData[n]=T,r.doPreTxApproval=!0)}const m=await e.getRandomRelay(!0);if(!m)throw Error(P.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const{patchAccessTokenMerkleTree:h,kycRequired:C,hasAccessToken:w}=await L.shouldPatchAccessTokenMerkleTree(e,o,t),y=await K.getSignatureDataForTransact(e.getCurrentChainId(),await e.getEthereumAddress(),e.userKeys,C,w),{zkCallData:v,circomData:I,dimData:S}=await E.constructZkProof("v1x1",e.merkleTreeHinkal,e.merkleTreeAccessToken,s,x,e.userKeys,q,u.externalActionId,u.externalAddress,u.externalActionMetadata,e.generateProofRemotely,m,e.getCurrentChainId(),void 0,void 0,void 0,void 0,h,r,void 0,a,e.getContractWithFetcher(b.ContractType.HinkalHelperContract),y,void 0,!1),U=$.constructAdminData(l,e.getCurrentChainId(),o,t,await e.getEthereumAddress());return{tx:await F.transactCallRelayer(e.getCurrentChainId(),v,S,I,void 0,void 0,void 0,U),amountToRecipient:i}},Y=async(e,c,d,g)=>{const l=[],o=e.getCurrentChainId(),A=j.encodeTokenWithId(o,{erc20TokenAddress:c.erc20TokenAddress,tokenId:0}),a=await e.getEthereumAddress(),i=G.hashEthereumAddress(a);for(;;){const t=((await O.getInputUtxoAndBalancePerToken({hinkal:e,sliceIfMore6:!1,useBlockedUtxos:!0}))?.get(A)??[]).filter(r=>r.amount>0n).slice(0,6).sort((r,p)=>Number(p.amount-r.amount)),u=H.countTotalAmountInUtxos(t);if(!u)break;const s=t.map(r=>r.nullifier).filter(r=>!!r),{tx:q}=await V(e,c,u,d,g);s.length>0&&await z.deleteUnspentUtxos(o,i,s),l.push(q)}return l};exports.hinkalWithdrawStuckUtxos=Y;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const k=require("../../error-handling/error-codes.constants.cjs"),P=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),D=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),E=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),F=require("../../types/external-action.types.cjs"),R=require("../../types/hinkal.types.cjs"),_=require("../../functions/pre-transaction/outputApprovalDataProcessing.cjs"),M=require("../../functions/pre-transaction/getFeeStructure.cjs"),W=require("../../functions/pre-transaction/merge-with-fee-structure.cjs");require("../../types/circom-data.types.cjs");const B=require("../../types/ethereum-network.types.cjs");require("../../types/transactions.types.cjs");const b=require("../../types/admin.types.cjs");require("../../types/activities.types.cjs");const K=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),L=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs");require("../../constants/server.constants.cjs");require("../../constants/chains.constants.cjs");require("../../constants/vite.constants.cjs");require("../http/HttpClient.cjs");require("axios");const H=require("../../functions/utils/amounts.utils.cjs");require("ethers");require("../../constants/token-data/index.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("@solana/web3.js");require("../crypto-keys/keys.cjs");const N=require("../../functions/utils/time.utils.cjs"),$=require("../../functions/pre-transaction/constructAdminData.cjs");require("@solana/spl-token");const O=require("../../functions/web3/events/getInputUtxoAndBalance.cjs"),Z=require("../../functions/web3/events/getShieldedBalance.cjs"),j=require("../../functions/utils/encodeTokenWithId.cjs"),z=require("../../API/unspent-utxos-calls.cjs"),G=require("../../functions/utils/addresses.cjs"),V=async(e,c,d,l)=>{const o=[c.erc20TokenAddress],A=c.erc20TokenAddress,a=await M.getFeeStructure(e.getCurrentChainId(),A,o,F.ExternalActionId.Transact),i=d-a.flatFee;if(i<=0n)throw new Error(`Insufficient balance to cover fee. Balance: ${d}, Fee: ${a.flatFee}`);const t=[-i];W.mergeWithFeeStructure(e.getCurrentChainId(),o,t,a);const u={externalActionId:0n,externalAddress:l,externalActionMetadata:"0x00"},s=[...await Z.addPaddingToUtxos(e,o,t,void 0,void 0,!1,!0)],g=`swapperM${t.length.toString()}x${s[0].length}x1`,r=R.defaultHinkalLogicArgs(t.length,e.userKeys),q=N.getCurrentTimeInSeconds().toString(),p=[];for(let n=0;n<o.length;n+=1){const{outputUtxos:S}=P.outputUtxoProcessing(e.userKeys,s[n],t[n],q,void 0,!1);p.push(S);const{useApprovalUtxoData:x}=_.outputApprovalDataProcessing(e,s[n],t[n]);x&&(r.useApprovalUtxoData[n]=x,r.doPreTxApproval=!0)}const m=await e.getRandomRelay(!0);if(!m)throw Error(k.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const{patchAccessTokenMerkleTree:h,kycRequired:f,hasAccessToken:C}=await L.shouldPatchAccessTokenMerkleTree(e,o,t),w=await K.getSignatureDataForTransact(e.getCurrentChainId(),await e.getEthereumAddress(),e.userKeys,f,C),{zkCallData:y,circomData:v,dimData:I}=await D.constructZkProof("v1x1",e.merkleTreeHinkal,e.merkleTreeAccessToken,s,p,e.userKeys,g,u.externalActionId,u.externalAddress,u.externalActionMetadata,e.generateProofRemotely,m,e.getCurrentChainId(),void 0,void 0,void 0,void 0,h,r,void 0,a,e.getContractWithFetcher(B.ContractType.HinkalHelperContract),w,void 0,!1),U=$.constructAdminData(b.AdminTransactionType.WithdrawOnChainUtxos,e.getCurrentChainId(),o,t,await e.getEthereumAddress());return{tx:await E.transactCallRelayer(e.getCurrentChainId(),y,I,v,void 0,void 0,void 0,U),amountToRecipient:i}},Y=async(e,c,d)=>{const l=[],o=e.getCurrentChainId(),A=j.encodeTokenWithId(o,{erc20TokenAddress:c.erc20TokenAddress,tokenId:0}),a=await e.getEthereumAddress(),i=G.hashEthereumAddress(a);for(;;){const t=((await O.getInputUtxoAndBalancePerToken({hinkal:e,sliceIfMore6:!1,useBlockedUtxos:!0}))?.get(A)??[]).filter(r=>r.amount>0n).slice(0,6).sort((r,q)=>Number(q.amount-r.amount)),u=H.countTotalAmountInUtxos(t);if(!u)break;const s=t.map(r=>r.nullifier).filter(r=>!!r),{tx:g}=await V(e,c,u,d);s.length>0&&await z.deleteUnspentUtxos(o,i,s),l.push(g)}return l};exports.hinkalWithdrawStuckUtxos=Y;

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

@@ -1,4 +1,4 @@
 import { IHinkal } from './IHinkal';
-import { AdminTransactionType, ERC20Token } from '../../types';
+import { ERC20Token } from '../../types';
 import { RelayerTransaction } from '../../types/relayer.types';
-export declare const hinkalWithdrawStuckUtxos: (hinkal: IHinkal, erc20Token: ERC20Token, recipientAddress: string, action?: AdminTransactionType) => Promise<RelayerTransaction[]>;
+export declare const hinkalWithdrawStuckUtxos: (hinkal: IHinkal, erc20Token: ERC20Token, recipientAddress: string) => Promise<RelayerTransaction[]>;

package/data-structures/Hinkal/hinkalWithdrawStuckUtxos.mjs

@@ -1,15 +1,16 @@
-import { transactionErrorCodes as P } from "../../error-handling/error-codes.constants.mjs";
-import { outputUtxoProcessing as R } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { constructZkProof as k } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { transactCallRelayer as F } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { ExternalActionId as M } from "../../types/external-action.types.mjs";
-import { defaultHinkalLogicArgs as K } from "../../types/hinkal.types.mjs";
-import { outputApprovalDataProcessing as L } from "../../functions/pre-transaction/outputApprovalDataProcessing.mjs";
-import { getFeeStructure as B } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { mergeWithFeeStructure as H } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
+import { transactionErrorCodes as S } from "../../error-handling/error-codes.constants.mjs";
+import { outputUtxoProcessing as P } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { constructZkProof as R } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { transactCallRelayer as k } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { ExternalActionId as F } from "../../types/external-action.types.mjs";
+import { defaultHinkalLogicArgs as M } from "../../types/hinkal.types.mjs";
+import { outputApprovalDataProcessing as K } from "../../functions/pre-transaction/outputApprovalDataProcessing.mjs";
+import { getFeeStructure as L } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { mergeWithFeeStructure as W } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
 import "../../types/circom-data.types.mjs";
-import { ContractType as W } from "../../types/ethereum-network.types.mjs";
+import { ContractType as B } from "../../types/ethereum-network.types.mjs";
 import "../../types/transactions.types.mjs";
+import { AdminTransactionType as H } from "../../types/admin.types.mjs";
 import "../../types/activities.types.mjs";
 import { getSignatureDataForTransact as $ } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
 import { shouldPatchAccessTokenMerkleTree as b } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
@@ -32,116 +33,116 @@ import "../../functions/utils/mutexes.utils.mjs";
 import "@coral-xyz/anchor";
 import "@solana/web3.js";
 import "../crypto-keys/keys.mjs";
-import { getCurrentTimeInSeconds as _ } from "../../functions/utils/time.utils.mjs";
-import { constructAdminData as q } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { getCurrentTimeInSeconds as O } from "../../functions/utils/time.utils.mjs";
+import { constructAdminData as _ } from "../../functions/pre-transaction/constructAdminData.mjs";
 import "@solana/spl-token";
-import { getInputUtxoAndBalancePerToken as z } from "../../functions/web3/events/getInputUtxoAndBalance.mjs";
-import { addPaddingToUtxos as O } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { getInputUtxoAndBalancePerToken as q } from "../../functions/web3/events/getInputUtxoAndBalance.mjs";
+import { addPaddingToUtxos as z } from "../../functions/web3/events/getShieldedBalance.mjs";
 import { encodeTokenWithId as V } from "../../functions/utils/encodeTokenWithId.mjs";
 import { deleteUnspentUtxos as Y } from "../../API/unspent-utxos-calls.mjs";
 import { hashEthereumAddress as Z } from "../../functions/utils/addresses.mjs";
-const j = async (t, c, d, p, u) => {
-  const o = [c.erc20TokenAddress], f = c.erc20TokenAddress, a = await B(
+const j = async (t, m, d, u) => {
+  const o = [m.erc20TokenAddress], p = m.erc20TokenAddress, a = await L(
     t.getCurrentChainId(),
-    f,
+    p,
     o,
-    M.Transact
-  ), m = d - a.flatFee;
-  if (m <= 0n)
+    F.Transact
+  ), c = d - a.flatFee;
+  if (c <= 0n)
     throw new Error(`Insufficient balance to cover fee. Balance: ${d}, Fee: ${a.flatFee}`);
-  const e = [-m];
-  H(t.getCurrentChainId(), o, e, a);
+  const e = [-c];
+  W(t.getCurrentChainId(), o, e, a);
   const i = {
     externalActionId: 0n,
-    externalAddress: p,
+    externalAddress: u,
     externalActionMetadata: "0x00"
   }, s = [
-    ...await O(t, o, e, void 0, void 0, !1, !0)
-  ], l = `swapperM${e.length.toString()}x${s[0].length}x1`, r = K(e.length, t.userKeys), A = _().toString(), g = [];
+    ...await z(t, o, e, void 0, void 0, !1, !0)
+  ], f = `swapperM${e.length.toString()}x${s[0].length}x1`, r = M(e.length, t.userKeys), l = O().toString(), A = [];
   for (let n = 0; n < o.length; n += 1) {
-    const { outputUtxos: S } = R(
+    const { outputUtxos: D } = P(
       t.userKeys,
       s[n],
       e[n],
-      A,
+      l,
       void 0,
       !1
     );
-    g.push(S);
-    const { useApprovalUtxoData: T } = L(t, s[n], e[n]);
-    T && (r.useApprovalUtxoData[n] = T, r.doPreTxApproval = !0);
+    A.push(D);
+    const { useApprovalUtxoData: x } = K(t, s[n], e[n]);
+    x && (r.useApprovalUtxoData[n] = x, r.doPreTxApproval = !0);
   }
-  const x = await t.getRandomRelay(!0);
-  if (!x)
-    throw Error(P.RELAYER_NOT_AVAILABLE);
-  const { patchAccessTokenMerkleTree: C, kycRequired: h, hasAccessToken: v } = await b(
+  const g = await t.getRandomRelay(!0);
+  if (!g)
+    throw Error(S.RELAYER_NOT_AVAILABLE);
+  const { patchAccessTokenMerkleTree: w, kycRequired: C, hasAccessToken: h } = await b(
     t,
     o,
     e
-  ), I = await $(
+  ), v = await $(
     t.getCurrentChainId(),
     await t.getEthereumAddress(),
     t.userKeys,
-    h,
-    v
-  ), { zkCallData: y, circomData: U, dimData: E } = await k(
+    C,
+    h
+  ), { zkCallData: I, circomData: y, dimData: U } = await R(
     "v1x1",
     t.merkleTreeHinkal,
     t.merkleTreeAccessToken,
     s,
-    g,
+    A,
     t.userKeys,
-    l,
+    f,
     i.externalActionId,
     i.externalAddress,
     i.externalActionMetadata,
     t.generateProofRemotely,
-    x,
+    g,
     t.getCurrentChainId(),
     void 0,
     void 0,
     void 0,
     void 0,
-    C,
+    w,
     r,
     void 0,
     a,
-    t.getContractWithFetcher(W.HinkalHelperContract),
-    I,
+    t.getContractWithFetcher(B.HinkalHelperContract),
+    v,
     void 0,
     !1
-  ), D = q(
-    u,
+  ), E = _(
+    H.WithdrawOnChainUtxos,
     t.getCurrentChainId(),
     o,
     e,
     await t.getEthereumAddress()
   );
-  return { tx: await F(
+  return { tx: await k(
     t.getCurrentChainId(),
-    y,
-    E,
+    I,
     U,
+    y,
     void 0,
     void 0,
     void 0,
-    D
-  ), amountToRecipient: m };
-}, $t = async (t, c, d, p) => {
-  const u = [], o = t.getCurrentChainId(), f = V(o, { erc20TokenAddress: c.erc20TokenAddress, tokenId: 0 }), a = await t.getEthereumAddress(), m = Z(a);
+    E
+  ), amountToRecipient: c };
+}, bt = async (t, m, d) => {
+  const u = [], o = t.getCurrentChainId(), p = V(o, { erc20TokenAddress: m.erc20TokenAddress, tokenId: 0 }), a = await t.getEthereumAddress(), c = Z(a);
   for (; ; ) {
-    const e = ((await z({
+    const e = ((await q({
       hinkal: t,
       sliceIfMore6: !1,
       useBlockedUtxos: !0
-    }))?.get(f) ?? []).filter((r) => r.amount > 0n).slice(0, 6).sort((r, A) => Number(A.amount - r.amount)), i = N(e);
+    }))?.get(p) ?? []).filter((r) => r.amount > 0n).slice(0, 6).sort((r, l) => Number(l.amount - r.amount)), i = N(e);
     if (!i)
       break;
-    const s = e.map((r) => r.nullifier).filter((r) => !!r), { tx: l } = await j(t, c, i, d, p);
-    s.length > 0 && await Y(o, m, s), u.push(l);
+    const s = e.map((r) => r.nullifier).filter((r) => !!r), { tx: f } = await j(t, m, i, d);
+    s.length > 0 && await Y(o, c, s), u.push(f);
   }
   return u;
 };
 export {
-  $t as hinkalWithdrawStuckUtxos
+  bt as hinkalWithdrawStuckUtxos
 };