@hinkal/common 0.2.27 → 0.2.29

package/data-structures/Hinkal/hinkalSolanaWithdraw.mjs

@@ -1,104 +1,79 @@
-import "../../types/circom-data.types.mjs";
-import { ExternalActionId as U } from "../../types/external-action.types.mjs";
-import { solanaNativeAddress as C } from "../../constants/protocol.constants.mjs";
-import "../../types/activities.types.mjs";
-import { addPaddingToUtxos as b } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { outputUtxoProcessing as D } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { getCurrentTimeInSeconds as L } from "../../functions/utils/time.utils.mjs";
-import { transactionErrorCodes as z } from "../../error-handling/error-codes.constants.mjs";
-import { getFeeStructure as M } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { calcEncryptedOutputs as W } from "../../functions/snarkjs/common.snarkjs.mjs";
-import { constructSolanaZkProof as _ } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
-import { Utxo as q } from "../utxo/Utxo.mjs";
-import { randomBigInt as H } from "../../functions/web3/etherFunctions.mjs";
-import { solanaTransactCallRelayer as V } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import "../../constants/token-data/index.mjs";
-import { networkRegistry as Y } from "../../constants/chains.constants.mjs";
-import "../../constants/contracts.constants.mjs";
-import "../../constants/kyc.constants.mjs";
-import "../../constants/server.constants.mjs";
-import "../../constants/vite.constants.mjs";
-import "../../constants/coingecko.constants.mjs";
-import "../../constants/reorg-depths.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 { shouldPatchAccessTokenMerkleTree as Z } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
-import { ethers as j } from "ethers";
-const It = async (t, r, o, s, y, g, m = !1) => {
-  if (m)
-    throw new Error("onlyGasEstimate is not supported for Solana withdraw");
-  const e = t.getCurrentChainId(), w = await t.getEthereumAddress(), { originalDeployer: p, hinkalIdl: u } = Y[e].contractData;
-  if (!p || !u)
-    throw new Error("missing data");
-  const { userKeys: f, merkleTreeAccessToken: A, merkleTreeHinkal: T } = t, a = g ?? await M(e, y, r, U.Transact);
-  o[0] -= a.flatFee;
-  const { patchAccessTokenMerkleTree: S, kycRequired: h, hasAccessToken: E } = await Z(
-    t,
-    r,
-    o
-  );
-  if (r.length > 1)
-    throw new Error("Solana Withdraw: Only one mint address is supported");
-  const n = [...await b(t, r, o, 6)][0], R = L().toString(), { outputUtxos: i } = D(
-    t.userKeys,
-    n,
-    o[0],
-    R,
-    void 0,
-    !1
-  ), c = await t.getRandomRelay(!m);
-  if (!c)
-    throw Error(z.RELAYER_NOT_AVAILABLE);
-  const x = q.findCorrectRandomization(H(31), t.userKeys.getShieldedPrivateKey()), l = {
-    tokenNumber: r.length,
-    nullifierAmount: n.length,
-    outputAmount: i.length
-  }, I = t.getSolanaProgram(u), k = W([i])[0][0], d = Array.from(j.getBytes(k)), { proofAArr: v, proofBArr: P, proofCArr: K, publicInputsArr: O } = await _(
-    t.generateProofRemotely,
-    p,
-    T,
-    A,
-    f,
-    I,
-    [r[0]],
-    [n],
-    [i],
-    x,
-    a.flatFee,
-    a.variableRate,
-    s,
-    c,
-    l,
-    [d],
-    e,
-    S
-  ), B = r[0] === C, F = {
-    recipient: s,
-    mint: B ? void 0 : r[0]
-  }, N = {
-    proofAArr: v,
-    proofBArr: P,
-    proofCArr: K,
-    publicInputsArr: O,
-    encryptedOutputs: [d],
-    relayerFee: a.flatFee.toString(),
-    dimensions: l
-  };
-  return V(e, {
-    relayAddress: c,
-    functionName: "transact",
-    args: N,
-    accounts: F,
-    solanaAccessTokenData: !E && h ? {
-      ethereumAddress: w,
-      accessKey: f.getAccessKey()
-    } : void 0
-  });
-};
-export {
-  It as hinkalSolanaWithdraw
+import { ExternalActionId as e } from "../../types/external-action.types.mjs";
+import { networkRegistry as t } from "../../constants/chains.constants.mjs";
+import "../../constants/protocol.constants.mjs";
+import "../../types/index.mjs";
+import { transactionErrorCodes as n } from "../../error-handling/error-codes.constants.mjs";
+import { randomBigInt as r } from "../../functions/web3/etherFunctions.mjs";
+import "../../constants/index.mjs";
+import { getCurrentTimeInSeconds as i } from "../../functions/utils/time.utils.mjs";
+import { Utxo as a } from "../utxo/Utxo.mjs";
+import { validateAndGetChainId as o } from "../../functions/utils/token-check.utils.mjs";
+import { addPaddingToUtxos as s } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { outputUtxoProcessing as c } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { calcEncryptedOutputs as l } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { calculateTotalFee as u } from "../../functions/utils/fees.utils.mjs";
+import { constructAdminData as d } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { ensureAmountChanges as f } from "../../functions/pre-transaction/ensureAmountChanges.mjs";
+import { getFeeStructure as p } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { shouldPatchAccessTokenMerkleTree as m } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
+import "../../functions/pre-transaction/index.mjs";
+import { constructSolanaZkProof as h } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
+import { solanaTransactCallRelayer as g } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { ethers as _ } from "ethers";
+//#region ../shared/common/src/data-structures/Hinkal/hinkalSolanaWithdraw.ts
+var v = async (e, t, n, r) => {
+	let a = [...await s(e, t, n, r, 6)][0], o = i().toString(), { outputUtxos: l } = c(e.userKeys, a, r[0], o, void 0, !1);
+	return {
+		inputUtxos: a,
+		outputUtxos: l
+	};
+}, y = async (i, s, c, y, b, x, S) => {
+	let C = o(s), w = s.map((e) => e.erc20TokenAddress), { originalDeployer: T, hinkalIdl: E } = t[C].contractData;
+	if (!T || !E) throw Error("missing data");
+	let { userKeys: D, merkleTreeAccessTokenByChain: O, merkleTreeHinkalByChain: k } = i, A = x ?? await p(C, b, w, e.Transact), j = u(-c[0], A), M = {
+		feeToken: A.feeToken,
+		flatFee: j,
+		variableRate: 0n
+	};
+	c[0] -= M.flatFee;
+	let [{ patchAccessTokenMerkleTree: N, kycRequired: P, hasAccessToken: F }, I, L, { inputUtxos: R, outputUtxos: z }] = await Promise.all([
+		m(i, C, w, c),
+		i.getEthereumAddressByChain(C),
+		i.getRandomRelay(C, !0),
+		v(i, C, w, c)
+	]);
+	if (!L) throw Error(n.RELAYER_NOT_AVAILABLE);
+	if (w.length > 1) throw Error("Solana Withdraw: Only one mint address is supported");
+	let B = a.findCorrectRandomization(r(31), i.userKeys.getShieldedPrivateKey()), V = {
+		tokenNumber: w.length,
+		nullifierAmount: R.length,
+		outputAmount: z.length
+	}, H = i.getSolanaProgram(E), U = l([z])[0][0], W = Array.from(_.getBytes(U));
+	f([R], [z], c);
+	let { proofAArr: G, proofBArr: K, proofCArr: q, publicInputsArr: J } = await h(i.generateProofRemotely, T, k[C], O[C], D, H, [w[0]], [R], [z], B, M.flatFee, M.variableRate, y, L, V, [W], C, N), Y = {
+		recipient: y,
+		mint: w[0] === "11111111111111111111111111111111" ? void 0 : w[0]
+	}, X = {
+		proofAArr: G,
+		proofBArr: K,
+		proofCArr: q,
+		publicInputsArr: J,
+		encryptedOutputs: [W],
+		relayerFee: M.flatFee.toString(),
+		dimensions: V
+	}, Z = d(S, C, w, c, await i.getEthereumAddress());
+	return g({
+		chainId: C,
+		relayAddress: L,
+		functionName: "transact",
+		args: X,
+		accounts: Y,
+		solanaAccessTokenData: !F && P ? {
+			ethereumAddress: I,
+			accessKey: D.getAccessKey()
+		} : void 0,
+		adminData: Z
+	});
 };
+//#endregion
+export { y as hinkalSolanaWithdraw };

package/data-structures/Hinkal/hinkalSwap.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const F=require("../../error-handling/error-codes.constants.cjs"),L=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),M=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),H=require("../../functions/web3/events/getShieldedBalance.cjs"),K=require("../../functions/web3/functionCalls/estimateGasRelayer.cjs"),N=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),W=require("../../functions/pre-transaction/getFeeStructure.cjs"),B=require("../../functions/pre-transaction/merge-with-fee-structure.cjs"),b=require("../../types/external-action.types.cjs"),k=require("../../types/hinkal.types.cjs"),G=require("../../functions/pre-transaction/outputApprovalDataProcessing.cjs"),O=require("../../types/ethereum-network.types.cjs"),V=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),Z=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),$=require("../../functions/pre-transaction/getExternalSwapAddress.cjs"),j=require("../../functions/utils/time.utils.cjs"),z=require("../../constants/protocol.constants.cjs");require("../../types/circom-data.types.cjs");require("../../types/activities.types.cjs");require("../../constants/server.constants.cjs");require("../../constants/chains.constants.cjs");require("../../constants/vite.constants.cjs");require("../http/HttpClient.cjs");require("axios");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 Y=require("../../functions/pre-transaction/constructAdminData.cjs");require("@solana/spl-token");const J=async(e,c,t,i,x,T,S,m,u=!1,w=!1)=>{const s=c.map(r=>r.erc20TokenAddress),d=await e.getEthereumAddress(),g=S??await W.getFeeStructure(e.getCurrentChainId(),T,s,b.ExternalActionId.Transact,void 0,z.HINKAL_SWAP_VARIABLE_RATE);B.mergeWithFeeStructure(e.getCurrentChainId(),s,t,g);const f=$.getExternalSwapAddress(e,i),o={externalActionId:i,externalAddress:f,externalActionMetadata:x},a=[...await H.addPaddingToUtxos(e,s,t)],v=`swapperM${t.length.toString()}x${a[0].length}x1`,D=[!1,!0,!1].slice(0,t.length),q=[],n=k.defaultHinkalLogicArgs(t.length,e.userKeys),R=j.getCurrentTimeInSeconds().toString();for(let r=0;r<s.length;r+=1){const{outputUtxos:U}=L.outputUtxoProcessing(e.userKeys,a[r],t[r],R,void 0,!1);q.push(U);const{useApprovalUtxoData:y}=G.outputApprovalDataProcessing(e,a[r],t[r]);y&&(n.useApprovalUtxoData[r]=y,n.doPreTxApproval=!0)}const l=await e.getRandomRelay(!u);if(!l)throw Error(F.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const{patchAccessTokenMerkleTree:P,kycRequired:h,hasAccessToken:E}=await V.shouldPatchAccessTokenMerkleTree(e,s,t),I=await Z.getSignatureDataForTransact(e.getCurrentChainId(),d,e.userKeys,h,E),{zkCallData:p,circomData:A,dimData:C}=await M.constructZkProof("v1x1",e.merkleTreeHinkal,e.merkleTreeAccessToken,a,q,e.userKeys,v,o.externalActionId,o.externalAddress,o.externalActionMetadata,e.generateProofRemotely,l,e.getCurrentChainId(),D,void 0,void 0,P,n,void 0,g,e.getContractWithFetcher(O.ContractType.HinkalHelperContract),I);if(u)return await K.estimateGasRelayer(e,p,C,A);const _=Y.constructAdminData(m,e.getCurrentChainId(),s,t,d,c);return await N.transactCallRelayer(e.getCurrentChainId(),p,C,A,w,void 0,void 0,_)};exports.hinkalSwap=J;
+const e=require(`../../types/ethereum-network.types.cjs`);require(`../../constants/protocol.constants.cjs`);const t=require(`../../types/hinkal.types.cjs`),n=require(`../../error-handling/error-codes.constants.cjs`),r=require(`../../functions/utils/time.utils.cjs`),i=require(`../../functions/utils/token-check.utils.cjs`),a=require(`../../functions/web3/events/getShieldedBalance.cjs`),o=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),s=require(`../../functions/pre-transaction/outputApprovalDataProcessing.cjs`),c=require(`../../functions/pre-transaction/constructAdminData.cjs`),l=require(`../../functions/pre-transaction/getFeeStructure.cjs`),u=require(`../../functions/pre-transaction/getKycAndSignatureData.cjs`);require(`../../functions/pre-transaction/index.cjs`);const d=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),f=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),p=require(`../../functions/pre-transaction/getExternalSwapAddress.cjs`),m=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var h=async(e,n,i,c)=>{let l=[...await a.addPaddingToUtxos(e,n,i,c)],u=[],d=t.defaultHinkalLogicArgs(c.length,e.userKeys),f=r.getCurrentTimeInSeconds().toString();for(let t=0;t<i.length;t+=1){let{outputUtxos:r}=o.outputUtxoProcessing(e.userKeys,l[t],c[t],f,void 0,!1);u.push(r);let{useApprovalUtxoData:i}=s.outputApprovalDataProcessing(e,n,l[t],c[t]);i&&(d.useApprovalUtxoData[t]=i,d.doPreTxApproval=!0)}return{inputUtxosArray:l,outputUtxosArray:u,hinkalLogicArgs:d}},g=async(t,r,a,o,s,g,_,v)=>{let y=i.validateAndGetChainId(r),b=r.map(e=>e.erc20TokenAddress),x=await t.getEthereumAddressByChain(y),S=_??await l.getFeeStructure(y,g,b,o,void 0,35n);m.mergeWithFeeStructure(y,b,a,S);let C={externalActionId:o,externalAddress:p.getExternalSwapAddress(y,o),externalActionMetadata:s},[w,{patchAccessTokenMerkleTree:T,signatureData:E},{inputUtxosArray:D,outputUtxosArray:O,hinkalLogicArgs:k}]=await Promise.all([t.getRandomRelay(y,!0),u.getKycAndSignatureData(t,y,b,a,x),h(t,y,b,a)]);if(!w)throw Error(n.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let A=`swapperM${a.length.toString()}x${D[0].length}x1`,j=[!1,!0,!1].slice(0,a.length),{zkCallData:M,circomData:N,dimData:P}=await d.constructZkProof(t.merkleTreeHinkalByChain[y],t.merkleTreeAccessTokenByChain[y],D,O,t.userKeys,A,C.externalActionId,C.externalAddress,C.externalActionMetadata,t.generateProofRemotely,w,y,j,void 0,void 0,T,k,void 0,S,t.getContractWithFetcher(y,e.ContractType.HinkalHelperContract),E);return await f.transactCallRelayer(y,M,P,N,void 0,void 0,c.constructAdminData(v,y,b,a,x,r))};exports.hinkalSwap=g;

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

@@ -1,6 +1,7 @@
 import { ExternalActionId } from '../../types/external-action.types';
 import { IHinkal } from './IHinkal';
 import { FeeStructure } from '../../types/hinkal.types';
-import { type ERC20Token } from '../../types/token.types';
+import { 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('../../index.ts').RelayerTransaction>;
+export declare const hinkalSwap: (hinkal: IHinkal, erc20tokens: ERC20Token[], deltaAmounts: bigint[], externalActionId: ExternalActionId, data: string, // call data used to call the router contracts.
+feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType) => Promise<string>;

package/data-structures/Hinkal/hinkalSwap.mjs

@@ -1,128 +1,53 @@
-import { transactionErrorCodes as K } from "../../error-handling/error-codes.constants.mjs";
-import { outputUtxoProcessing as M } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { constructZkProof as _ } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { addPaddingToUtxos as F } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { estimateGasRelayer as N } from "../../functions/web3/functionCalls/estimateGasRelayer.mjs";
-import { transactCallRelayer as W } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { getFeeStructure as B } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { mergeWithFeeStructure as V } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
-import { ExternalActionId as $ } from "../../types/external-action.types.mjs";
-import { defaultHinkalLogicArgs as q } from "../../types/hinkal.types.mjs";
-import { outputApprovalDataProcessing as z } from "../../functions/pre-transaction/outputApprovalDataProcessing.mjs";
-import { ContractType as O } from "../../types/ethereum-network.types.mjs";
-import { shouldPatchAccessTokenMerkleTree as Y } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
-import { getSignatureDataForTransact as Z } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
-import { getExternalSwapAddress as b } from "../../functions/pre-transaction/getExternalSwapAddress.mjs";
-import { getCurrentTimeInSeconds as j } from "../../functions/utils/time.utils.mjs";
-import { HINKAL_SWAP_VARIABLE_RATE as G } from "../../constants/protocol.constants.mjs";
-import "../../types/circom-data.types.mjs";
-import "../../types/activities.types.mjs";
-import "../../constants/server.constants.mjs";
-import "../../constants/chains.constants.mjs";
-import "../../constants/vite.constants.mjs";
-import "../http/HttpClient.mjs";
-import "axios";
-import "ethers";
-import "../../constants/token-data/index.mjs";
-import "../../API/getServerURL.mjs";
-import "circomlibjs-hinkal-fork";
-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 "../crypto-keys/keys.mjs";
-import { constructAdminData as J } from "../../functions/pre-transaction/constructAdminData.mjs";
-import "@solana/spl-token";
-const Nt = async (t, m, e, p, l, T, y, w, c = !1, v = !1) => {
-  const o = m.map((r) => r.erc20TokenAddress), n = await t.getEthereumAddress(), d = y ?? await B(
-    t.getCurrentChainId(),
-    T,
-    o,
-    $.Transact,
-    void 0,
-    G
-  );
-  V(t.getCurrentChainId(), o, e, d);
-  const R = b(t, p), s = {
-    externalActionId: p,
-    externalAddress: R,
-    externalActionMetadata: l
-  }, a = [...await F(t, o, e)], D = `swapperM${e.length.toString()}x${a[0].length}x1`, E = [!1, !0, !1].slice(0, e.length), u = [], i = q(e.length, t.userKeys), I = j().toString();
-  for (let r = 0; r < o.length; r += 1) {
-    const { outputUtxos: H } = M(
-      t.userKeys,
-      a[r],
-      e[r],
-      I,
-      void 0,
-      !1
-    );
-    u.push(H);
-    const { useApprovalUtxoData: x } = z(t, a[r], e[r]);
-    x && (i.useApprovalUtxoData[r] = x, i.doPreTxApproval = !0);
-  }
-  const g = await t.getRandomRelay(!c);
-  if (!g)
-    throw Error(K.RELAYER_NOT_AVAILABLE);
-  const { patchAccessTokenMerkleTree: S, kycRequired: P, hasAccessToken: L } = await Y(
-    t,
-    o,
-    e
-  ), U = await Z(
-    t.getCurrentChainId(),
-    n,
-    t.userKeys,
-    P,
-    L
-  ), { zkCallData: f, circomData: A, dimData: C } = await _(
-    "v1x1",
-    t.merkleTreeHinkal,
-    t.merkleTreeAccessToken,
-    a,
-    u,
-    t.userKeys,
-    D,
-    s.externalActionId,
-    s.externalAddress,
-    s.externalActionMetadata,
-    t.generateProofRemotely,
-    g,
-    t.getCurrentChainId(),
-    E,
-    void 0,
-    void 0,
-    S,
-    i,
-    void 0,
-    d,
-    t.getContractWithFetcher(O.HinkalHelperContract),
-    U
-  );
-  if (c)
-    return await N(t, f, C, A);
-  const h = J(
-    w,
-    t.getCurrentChainId(),
-    o,
-    e,
-    n,
-    m
-  );
-  return await W(
-    t.getCurrentChainId(),
-    f,
-    C,
-    A,
-    v,
-    void 0,
-    void 0,
-    h
-  );
-};
-export {
-  Nt as hinkalSwap
+import { ContractType as e } from "../../types/ethereum-network.types.mjs";
+import "../../constants/protocol.constants.mjs";
+import { defaultHinkalLogicArgs as t } from "../../types/hinkal.types.mjs";
+import { transactionErrorCodes as n } from "../../error-handling/error-codes.constants.mjs";
+import { getCurrentTimeInSeconds as r } from "../../functions/utils/time.utils.mjs";
+import { validateAndGetChainId as i } from "../../functions/utils/token-check.utils.mjs";
+import { addPaddingToUtxos as a } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { outputUtxoProcessing as o } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { outputApprovalDataProcessing as s } from "../../functions/pre-transaction/outputApprovalDataProcessing.mjs";
+import { constructAdminData as c } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { getFeeStructure as l } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { getKycAndSignatureData as u } from "../../functions/pre-transaction/getKycAndSignatureData.mjs";
+import "../../functions/pre-transaction/index.mjs";
+import { constructZkProof as d } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { transactCallRelayer as f } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { getExternalSwapAddress as p } from "../../functions/pre-transaction/getExternalSwapAddress.mjs";
+import { mergeWithFeeStructure as m } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
+//#region ../shared/common/src/data-structures/Hinkal/hinkalSwap.ts
+var h = async (e, n, i, c) => {
+	let l = [...await a(e, n, i, c)], u = [], d = t(c.length, e.userKeys), f = r().toString();
+	for (let t = 0; t < i.length; t += 1) {
+		let { outputUtxos: r } = o(e.userKeys, l[t], c[t], f, void 0, !1);
+		u.push(r);
+		let { useApprovalUtxoData: i } = s(e, n, l[t], c[t]);
+		i && (d.useApprovalUtxoData[t] = i, d.doPreTxApproval = !0);
+	}
+	return {
+		inputUtxosArray: l,
+		outputUtxosArray: u,
+		hinkalLogicArgs: d
+	};
+}, g = async (t, r, a, o, s, g, _, v) => {
+	let y = i(r), b = r.map((e) => e.erc20TokenAddress), x = await t.getEthereumAddressByChain(y), S = _ ?? await l(y, g, b, o, void 0, 35n);
+	m(y, b, a, S);
+	let C = {
+		externalActionId: o,
+		externalAddress: p(y, o),
+		externalActionMetadata: s
+	}, [w, { patchAccessTokenMerkleTree: T, signatureData: E }, { inputUtxosArray: D, outputUtxosArray: O, hinkalLogicArgs: k }] = await Promise.all([
+		t.getRandomRelay(y, !0),
+		u(t, y, b, a, x),
+		h(t, y, b, a)
+	]);
+	if (!w) throw Error(n.RELAYER_NOT_AVAILABLE);
+	let A = `swapperM${a.length.toString()}x${D[0].length}x1`, j = [
+		!1,
+		!0,
+		!1
+	].slice(0, a.length), { zkCallData: M, circomData: N, dimData: P } = await d(t.merkleTreeHinkalByChain[y], t.merkleTreeAccessTokenByChain[y], D, O, t.userKeys, A, C.externalActionId, C.externalAddress, C.externalActionMetadata, t.generateProofRemotely, w, y, j, void 0, void 0, T, k, void 0, S, t.getContractWithFetcher(y, e.HinkalHelperContract), E);
+	return await f(y, M, P, N, void 0, void 0, c(v, y, b, a, x, r));
 };
+//#endregion
+export { g as hinkalSwap };

package/data-structures/Hinkal/hinkalTransfer.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const d=require("../../error-handling/error-codes.constants.cjs"),N=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),F=require("../../functions/web3/events/getShieldedBalance.cjs"),M=require("../../functions/web3/functionCalls/estimateGasRelayer.cjs"),U=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),L=require("../../functions/pre-transaction/getFeeStructure.cjs"),V=require("../../functions/pre-transaction/merge-with-fee-structure.cjs");require("../../types/circom-data.types.cjs");const k=require("../../types/ethereum-network.types.cjs"),H=require("../../types/external-action.types.cjs"),K=require("../../types/hinkal.types.cjs");require("../../types/activities.types.cjs");const O=require("../../functions/pre-transaction/outputUtxoProcessing.cjs");require("../../constants/server.constants.cjs");require("../../constants/chains.constants.cjs");require("../../constants/vite.constants.cjs");require("../http/HttpClient.cjs");require("axios");require("ethers");require("../../constants/token-data/index.cjs");const B=require("../../constants/protocol.constants.cjs"),G=require("../../functions/pre-transaction/outputApprovalDataProcessing.cjs"),W=require("../../functions/pre-transaction/getVolatileTransferAmount.cjs"),b=require("../../functions/pre-transaction/constructAdminData.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");require("circomlibjs-hinkal-fork");require("@solana/spl-token");require("../crypto-keys/keys.cjs");require("buffer");const Z=require("../../functions/utils/time.utils.cjs"),$=require("../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs"),j=require("../../functions/pre-transaction/getSignatureDataForTransact.cjs"),z=require("../../functions/utils/addresses.cjs"),Y=async(e,n,E,A,x,y,f,I=!1)=>{if(!z.isValidPrivateAddress(A))throw Error(d.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);const o=n.map(t=>t.erc20TokenAddress),r=await W.modifyVolatileTokenAmountChanges(e.getCurrentChainId(),n,E),l=-r[0]*(10000n-B.HINKAL_PRIVATE_SEND_VARIABLE_RATE)/10000n;if(l<=0n)throw Error(d.transactionErrorCodes.RECIPIENT_AMOUNT_INVALID);const g=y??await L.getFeeStructure(e.getCurrentChainId(),x,o,H.ExternalActionId.Transact);V.mergeWithFeeStructure(e.getCurrentChainId(),o,r,g);const a=e.getCurrentChainId();if(!n[0])throw Error("Transfer Action: No Token Found");const c=await e.getRandomRelay(),i={externalActionId:0n,externalAddress:c??await e.getEthereumAddress(),externalActionMetadata:"0x00"},s=[...await F.addPaddingToUtxos(e,o,r)],w=`swapperM${r.length}x${s[0].length}x2`,q=[],u=K.defaultHinkalLogicArgs(r.length,e.userKeys),R=Z.getCurrentTimeInSeconds().toString();for(let t=0;t<o.length;t+=1){const{outputUtxos:S}=O.outputUtxoProcessing(e.userKeys,s[t],r[t],R,void 0,!1,A,t===0?l:0n);q.push(S);const{useApprovalUtxoData:C}=G.outputApprovalDataProcessing(e,s[t],r[t]);C&&(u.useApprovalUtxoData[t]=C,u.doPreTxApproval=!0)}if(!c)throw Error(d.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const{patchAccessTokenMerkleTree:h,kycRequired:v,hasAccessToken:D}=await $.shouldPatchAccessTokenMerkleTree(e,o,r),P=await j.getSignatureDataForTransact(a,await e.getEthereumAddress(),e.userKeys,v,D),{zkCallData:m,circomData:T,dimData:p}=await N.constructZkProof("v1x1",e.merkleTreeHinkal,e.merkleTreeAccessToken,s,q,e.userKeys,w,i.externalActionId,i.externalAddress,i.externalActionMetadata,e.generateProofRemotely,c,a,void 0,void 0,void 0,h,u,void 0,g,e.getContractWithFetcher(k.ContractType.HinkalHelperContract),P);if(I)return await M.estimateGasRelayer(e,m,p,T);const _=b.constructAdminData(f,a,o,r,await e.getEthereumAddress());return await U.transactCallRelayer(a,m,p,T,void 0,void 0,void 0,_)};exports.hinkalTransfer=Y;
+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`);require(`../../types/index.cjs`);const a=require(`../../functions/utils/addresses.cjs`),o=require(`../../error-handling/error-codes.constants.cjs`),s=require(`../../functions/utils/time.utils.cjs`),c=require(`../../functions/utils/tron.utils.cjs`),l=require(`../../functions/utils/token-check.utils.cjs`),u=require(`../../functions/web3/events/getShieldedBalance.cjs`),d=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),f=require(`../../functions/utils/fees.utils.cjs`),p=require(`../../functions/pre-transaction/outputApprovalDataProcessing.cjs`),m=require(`../../functions/pre-transaction/getVolatileTransferAmount.cjs`),h=require(`../../functions/pre-transaction/constructAdminData.cjs`),g=require(`../../functions/pre-transaction/getFeeStructure.cjs`),_=require(`../../functions/pre-transaction/getKycAndSignatureData.cjs`);require(`../../functions/pre-transaction/index.cjs`);const v=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),y=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),b=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var x=async(e,t,n,r,a,o)=>{let c=[...await u.addPaddingToUtxos(e,t,n,r)],l=[],f=i.defaultHinkalLogicArgs(r.length,e.userKeys),m=s.getCurrentTimeInSeconds().toString();for(let i=0;i<n.length;i+=1){let{outputUtxos:n}=d.outputUtxoProcessing(e.userKeys,c[i],r[i],m,void 0,!1,a,i===0?o:0n);l.push(n);let{useApprovalUtxoData:s}=p.outputApprovalDataProcessing(e,t,c[i],r[i]);s&&(f.useApprovalUtxoData[i]=s,f.doPreTxApproval=!0)}return{inputUtxosArray:c,outputUtxosArray:l,hinkalLogicArgs:f}},S=async(i,s,u,d,p,S,C)=>{let w=l.validateAndGetChainId(s),T=n.isTronLike(w);if(!a.isValidPrivateAddress(d))throw Error(o.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let E=c.addressToHexFormat(await i.getEthereumAddressByChain(w)),D=s.map(e=>e.erc20TokenAddress),O=await m.modifyVolatileTokenAmountChanges(w,s,u),k=S??await g.getFeeStructure(w,p,D,t.ExternalActionId.Transact,[],5n);k.variableRate||=r.HINKAL_PRIVATE_SEND_VARIABLE_RATE;let A=f.calculateTotalFee(-O[0],k),j=-O[0],M={feeToken:k.feeToken,flatFee:A,variableRate:0n};if(b.mergeWithFeeStructure(w,D,O,M),!s[0])throw Error(`Transfer Action: No Token Found`);let[N,{patchAccessTokenMerkleTree:P,signatureData:F},{inputUtxosArray:I,outputUtxosArray:L,hinkalLogicArgs:R}]=await Promise.all([i.getRandomRelay(w,!0),_.getKycAndSignatureData(i,w,D,O,E),x(i,w,D,O,d,j)]);if(!N)throw Error(o.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let z={externalActionId:0n,externalAddress:N,externalActionMetadata:`0x00`},B=`swapperM${O.length}x${I[0].length}x2`,{zkCallData:V,circomData:H,dimData:U}=await v.constructZkProof(i.merkleTreeHinkalByChain[w],i.merkleTreeAccessTokenByChain[w],I,L,i.userKeys,B,z.externalActionId,z.externalAddress,z.externalActionMetadata,i.generateProofRemotely,N,w,void 0,void 0,void 0,P,R,void 0,M,i.getContractWithFetcher(w,e.ContractType.HinkalHelperContract),F),W=await c.reorderZkCallData(T,V,U,H);return await y.transactCallRelayer(w,V,U,H,void 0,void 0,h.constructAdminData(C,w,D,O,E),W)};exports.hinkalTransfer=S;

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/relayer.types').RelayerTransaction>;
+export declare const hinkalTransfer: (hinkal: IHinkal, erc20Tokens: ERC20Token[], amountChangesBase: bigint[], recipientAddress: string, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType) => Promise<string>;