@hinkal/common 0.2.26 → 0.2.28

package/data-structures/Hinkal/hinkalSolanaWithdraw.mjs

@@ -1,19 +1,19 @@
 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 { ExternalActionId as L } from "../../types/external-action.types.mjs";
+import { networkRegistry as z } from "../../constants/chains.constants.mjs";
+import { solanaNativeAddress as M } 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 { addPaddingToUtxos as W } from "../../functions/web3/events/getShieldedBalance.mjs";
+import { outputUtxoProcessing as _ } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { getCurrentTimeInSeconds as q } from "../../functions/utils/time.utils.mjs";
+import { transactionErrorCodes as G } from "../../error-handling/error-codes.constants.mjs";
+import { getFeeStructure as H } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { calcEncryptedOutputs as V } from "../../functions/snarkjs/common.snarkjs.mjs";
+import { constructSolanaZkProof as Y } from "../../functions/snarkjs/constructSolanaZkProof.mjs";
+import { Utxo as Z } from "../utxo/Utxo.mjs";
+import { randomBigInt as j } from "../../functions/web3/etherFunctions.mjs";
+import { solanaTransactCallRelayer as J } 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";
@@ -26,79 +26,117 @@ 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(
+import "../../constants/schedule.constants.mjs";
+import "../../constants/tokens.constants.mjs";
+import { shouldPatchAccessTokenMerkleTree as Q } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
+import { ethers as X } from "ethers";
+import { validateAndGetChainId as $ } from "../../functions/utils/token-check.utils.mjs";
+import "../../API/getServerURL.mjs";
+import "../http/HttpClient.mjs";
+import "axios";
+import { constructAdminData as tt } from "../../functions/pre-transaction/constructAdminData.mjs";
+import "@coral-xyz/anchor";
+import "@solana/web3.js";
+import "circomlibjs-hinkal-fork";
+import "@solana/spl-token";
+import "tweetnacl";
+import "bs58";
+import "buffer";
+import { ensureAmountChanges as rt } from "../../functions/pre-transaction/ensureAmountChanges.mjs";
+import "../../API/enclaveUtxoCalls.mjs";
+import "tronweb";
+import { calculateTotalFee as ot } from "../../functions/utils/fees.utils.mjs";
+const et = async (t, n, e, i) => {
+  const s = [...await W(t, n, e, i, 6)][0], p = q().toString(), { outputUtxos: c } = _(
     t.userKeys,
-    n,
-    o[0],
-    R,
+    s,
+    i[0],
+    p,
     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 _(
+  );
+  return { inputUtxos: s, outputUtxos: c };
+}, Xt = async (t, n, e, i, s, p, c) => {
+  const r = $(n), o = n.map((C) => C.erc20TokenAddress), { originalDeployer: l, hinkalIdl: f } = z[r].contractData;
+  if (!l || !f)
+    throw new Error("missing data");
+  const { userKeys: y, merkleTreeAccessTokenByChain: R, merkleTreeHinkalByChain: w } = t, A = p ?? await H(r, s, o, L.Transact), S = ot(-e[0], A), m = {
+    feeToken: A.feeToken,
+    flatFee: S,
+    variableRate: 0n
+  };
+  e[0] -= m.flatFee;
+  const [
+    { patchAccessTokenMerkleTree: h, kycRequired: x, hasAccessToken: E },
+    k,
+    d,
+    { inputUtxos: u, outputUtxos: a }
+  ] = await Promise.all([
+    Q(t, r, o, e),
+    t.getEthereumAddressByChain(r),
+    t.getRandomRelay(r, !0),
+    et(t, r, o, e)
+  ]);
+  if (!d)
+    throw Error(G.RELAYER_NOT_AVAILABLE);
+  if (o.length > 1)
+    throw new Error("Solana Withdraw: Only one mint address is supported");
+  const v = Z.findCorrectRandomization(j(31), t.userKeys.getShieldedPrivateKey()), g = {
+    tokenNumber: o.length,
+    nullifierAmount: u.length,
+    outputAmount: a.length
+  }, F = t.getSolanaProgram(f), I = V([a])[0][0], T = Array.from(X.getBytes(I));
+  rt([u], [a], e);
+  const { proofAArr: B, proofBArr: P, proofCArr: U, publicInputsArr: O } = await Y(
     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]
+    w[r],
+    R[r],
+    y,
+    F,
+    [o[0]],
+    [u],
+    [a],
+    v,
+    m.flatFee,
+    m.variableRate,
+    i,
+    d,
+    g,
+    [T],
+    r,
+    h
+  ), K = o[0] === M, D = {
+    recipient: i,
+    mint: K ? void 0 : o[0]
   }, N = {
-    proofAArr: v,
+    proofAArr: B,
     proofBArr: P,
-    proofCArr: K,
+    proofCArr: U,
     publicInputsArr: O,
-    encryptedOutputs: [d],
-    relayerFee: a.flatFee.toString(),
-    dimensions: l
-  };
-  return V(e, {
-    relayAddress: c,
+    encryptedOutputs: [T],
+    relayerFee: m.flatFee.toString(),
+    dimensions: g
+  }, b = tt(
+    c,
+    r,
+    o,
+    e,
+    await t.getEthereumAddress()
+  );
+  return J({
+    chainId: r,
+    relayAddress: d,
     functionName: "transact",
     args: N,
-    accounts: F,
-    solanaAccessTokenData: !E && h ? {
-      ethereumAddress: w,
-      accessKey: f.getAccessKey()
-    } : void 0
+    accounts: D,
+    solanaAccessTokenData: !E && x ? {
+      ethereumAddress: k,
+      accessKey: y.getAccessKey()
+    } : void 0,
+    adminData: b
   });
 };
 export {
-  It as hinkalSolanaWithdraw
+  Xt 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;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const P=require("../../error-handling/error-codes.constants.cjs"),U=require("../../functions/pre-transaction/outputUtxoProcessing.cjs"),_=require("../../functions/snarkjs/constructGeneralZkProof.cjs"),E=require("../../functions/web3/events/getShieldedBalance.cjs"),R=require("../../functions/web3/functionCalls/transactCallRelayer.cjs"),L=require("../../functions/pre-transaction/getFeeStructure.cjs"),k=require("../../functions/pre-transaction/merge-with-fee-structure.cjs"),H=require("../../types/hinkal.types.cjs"),B=require("../../functions/pre-transaction/outputApprovalDataProcessing.cjs"),K=require("../../types/ethereum-network.types.cjs"),F=require("../../functions/pre-transaction/getKycAndSignatureData.cjs"),I=require("../../functions/pre-transaction/getExternalSwapAddress.cjs"),M=require("../../functions/utils/time.utils.cjs"),N=require("../../constants/protocol.constants.cjs");require("../../types/circom-data.types.cjs");require("../../types/activities.types.cjs");require("../../constants/server.constants.cjs");require("../../API/getServerURL.cjs");require("../http/HttpClient.cjs");require("axios");require("../../constants/vite.constants.cjs");require("ethers");require("../../constants/token-data/index.cjs");require("../../constants/tokens.constants.cjs");require("../../constants/chains.constants.cjs");const W=require("../../functions/pre-transaction/constructAdminData.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");require("circomlibjs-hinkal-fork");require("@solana/spl-token");require("tweetnacl");require("bs58");require("buffer");require("../crypto-keys/keys.cjs");require("libsodium-wrappers");require("lodash");const O=require("../../functions/utils/token-check.utils.cjs"),b=async(r,s,t,o)=>{const i=[...await E.addPaddingToUtxos(r,s,t,o)],c=[],n=H.defaultHinkalLogicArgs(o.length,r.userKeys),d=M.getCurrentTimeInSeconds().toString();for(let e=0;e<t.length;e+=1){const{outputUtxos:a}=U.outputUtxoProcessing(r.userKeys,i[e],o[e],d,void 0,!1);c.push(a);const{useApprovalUtxoData:u}=B.outputApprovalDataProcessing(r,s,i[e],o[e]);u&&(n.useApprovalUtxoData[e]=u,n.doPreTxApproval=!0)}return{inputUtxosArray:i,outputUtxosArray:c,hinkalLogicArgs:n}},G=async(r,s,t,o,i,c,n,d)=>{const e=O.validateAndGetChainId(s),a=s.map(f=>f.erc20TokenAddress),u=await r.getEthereumAddressByChain(e),l=n??await L.getFeeStructure(e,c,a,o,void 0,N.HINKAL_SWAP_VARIABLE_RATE);k.mergeWithFeeStructure(e,a,t,l);const A=I.getExternalSwapAddress(e,o),g={externalActionId:o,externalAddress:A,externalActionMetadata:i},[p,{patchAccessTokenMerkleTree:y,signatureData:x},{inputUtxosArray:q,outputUtxosArray:S,hinkalLogicArgs:h}]=await Promise.all([r.getRandomRelay(e,!0),F.getKycAndSignatureData(r,e,a,t,u),b(r,e,a,t)]);if(!p)throw Error(P.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const C=`swapperM${t.length.toString()}x${q[0].length}x1`,v=[!1,!0,!1].slice(0,t.length),{zkCallData:m,circomData:D,dimData:w}=await _.constructZkProof("v1x1",r.merkleTreeHinkalByChain[e],r.merkleTreeAccessTokenByChain[e],q,S,r.userKeys,C,g.externalActionId,g.externalAddress,g.externalActionMetadata,r.generateProofRemotely,p,e,v,void 0,void 0,y,h,void 0,l,r.getContractWithFetcher(e,K.ContractType.HinkalHelperContract),x),T=W.constructAdminData(d,e,a,t,u,s);return await R.transactCallRelayer(e,m,w,D,void 0,void 0,T)};exports.hinkalSwap=G;

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('../../index.ts').RelayerTransaction>;
+export declare const hinkalSwap: (hinkal: IHinkal, erc20tokens: ERC20Token[], deltaAmounts: bigint[], externalActionId: ExternalActionId, data: string, feeToken?: string, feeStructureOverride?: FeeStructure, action?: AdminTransactionType) => Promise<string>;

package/data-structures/Hinkal/hinkalSwap.mjs

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

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>;