@hinkal/common 0.2.19 → 0.2.21

package/data-structures/Hinkal/hinkalDepostAndBridge.mjs

@@ -0,0 +1,214 @@
+import { zeroAddress as d } from "../../constants/protocol.constants.mjs";
+import { transactionErrorCodes as Z } from "../../error-handling/error-codes.constants.mjs";
+import { constructEmporiumProof as $ } from "../../functions/snarkjs/constructEmporiumProof.mjs";
+import { transactCallRelayerBatch as j } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { ExternalActionId as k } from "../../types/external-action.types.mjs";
+import { Utxo as K } from "../utxo/Utxo.mjs";
+import "../../types/circom-data.types.mjs";
+import { ContractType as J } from "../../types/ethereum-network.types.mjs";
+import "../../types/transactions.types.mjs";
+import "../../types/activities.types.mjs";
+import { getSignatureDataForTransact as Q } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
+import { shouldPatchAccessTokenMerkleTree as X } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
+import { getCurrentTimeInSeconds as tt } from "../../functions/utils/time.utils.mjs";
+import { getFeeStructure as et } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { hashEthereumAddress as ot } from "../../functions/utils/addresses.mjs";
+import { networkRegistry as rt } from "../../constants/chains.constants.mjs";
+import { SWAP_ROUTER_ADDRESSES as U } from "../../constants/addresses.constants.mjs";
+import "ethers";
+import "idb-keyval";
+import "@solana/web3.js";
+import "../http/HttpClient.mjs";
+import "../../constants/vite.constants.mjs";
+import { getERC20Token as st } from "../../functions/utils/erc20tokenFunctions.mjs";
+import "../../functions/utils/convertIntegrationProviderToExternalActionId.mjs";
+import "../../constants/server.constants.mjs";
+import "../../API/getServerURL.mjs";
+import "axios";
+import { caseInsensitiveEqual as L } from "../../functions/utils/caseInsensitive.utils.mjs";
+import "@coral-xyz/anchor";
+import "circomlibjs-hinkal-fork";
+import "@solana/spl-token";
+import "ethers-v6h";
+import "tweetnacl";
+import "bs58";
+import "buffer";
+import "../../constants/token-data/index.mjs";
+import "../../constants/contracts.constants.mjs";
+import "../../constants/kyc.constants.mjs";
+import "../../constants/coingecko.constants.mjs";
+import "../../constants/reorg-depths.constants.mjs";
+import "../../constants/token.limits.constants.mjs";
+import "../../constants/presale.constants.mjs";
+import "../../constants/activity.constants.mjs";
+import "../../constants/tasks.constants.mjs";
+import "../../constants/events.constants.mjs";
+import "../../functions/utils/userAgent.mjs";
+import { convertEmporiumOpToCallInfo as it } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
+import "../crypto-keys/keys.mjs";
+import "libsodium-wrappers";
+import "multiformats";
+import { validateAndGetChainId as mt } from "../../functions/utils/token-check.utils.mjs";
+import "async-mutex";
+import "process";
+import "../../providers/EthersProviderAdapter.mjs";
+import { hinkalDepositOnChainUtxos as N } from "./hinkalDepositOnChainUtxos.mjs";
+import { createLifiBridgeOps as z } from "../../functions/private-wallet/emporium.helpers.mjs";
+import { API as nt } from "../../API/API.mjs";
+const at = async (t, e, i, u, A, a, r) => {
+  if (u.length === 0)
+    throw new Error("No recipients to bridge");
+  const m = i.erc20TokenAddress, { contractData: g } = rt[e], { emporiumAddress: n } = g;
+  if (!n)
+    throw Error("No Emporium Address");
+  const y = U[k.Lifi][e];
+  if (!y)
+    throw new Error(`LIFI not configured for chain ${e}`);
+  const E = await t.getRandomRelay(e);
+  if (!E)
+    throw Error(Z.RELAYER_NOT_AVAILABLE);
+  const h = await t.getEthereumAddressByChain(e), v = tt().toString(), f = t.generateProofRemotely ? 5 : 1, T = [];
+  for (let p = 0; p < u.length; p += f) {
+    const w = u.slice(p, p + f), o = await Promise.all(
+      w.map(async ({ utxo: s, nativeUtxo: c, bridgeAmount: C, quote: x, temporarySubAccount: R }) => {
+        await nt.addTemporaryWalletNonce(e, a, R.index);
+        const O = x.nativeFee > 0n && !L(m, d), l = [m], S = [-s.amount], D = [!1], P = new K({
+          amount: 0n,
+          erc20TokenAddress: m,
+          shieldedPrivateKey: t.userKeys.getShieldedPrivateKey(),
+          timeStamp: v,
+          tokenId: 0
+        }), F = [[s, P]], b = [[P]];
+        if (O && c) {
+          const B = new K({
+            amount: 0n,
+            erc20TokenAddress: d,
+            shieldedPrivateKey: t.userKeys.getShieldedPrivateKey(),
+            timeStamp: v,
+            tokenId: 0
+          });
+          l.push(d), S.push(-c.amount), D.push(!1), F.push([c, B]), b.push([B]);
+        }
+        const q = z(
+          t,
+          e,
+          R.ethAddress,
+          y,
+          m,
+          s.amount,
+          C,
+          x
+        ), { patchAccessTokenMerkleTree: _, kycRequired: H, hasAccessToken: W } = await X(
+          t,
+          e,
+          l,
+          S
+        ), M = await Q(
+          e,
+          h,
+          t.userKeys,
+          H,
+          W
+        ), { zkCallData: G, circomData: I, dimData: V, authorizationData: Y } = await $(
+          "v1x1",
+          t.merkleTreeHinkalByChain[e],
+          t.merkleTreeAccessTokenByChain[e],
+          l,
+          l.map(() => 0),
+          F,
+          b,
+          t.userKeys,
+          l.length,
+          F[0].length,
+          n,
+          q,
+          t.generateProofRemotely,
+          E ?? d,
+          e,
+          D,
+          void 0,
+          R.privateKey,
+          void 0,
+          _,
+          void 0,
+          A,
+          t.getContractWithFetcher(e, J.HinkalHelperContract),
+          M,
+          void 0,
+          !1
+        );
+        return { zkCallData: G, dimData: V, circomData: I, authorizationData: Y };
+      })
+    );
+    T.push(...o);
+  }
+  return j(e, T, a, r);
+}, ue = async (t, e, i, u, A) => {
+  const a = e.erc20TokenAddress, r = mt([e]), m = ot(await t.getEthereumAddressByChain(r)), g = U[k.Lifi][r];
+  if (!g)
+    throw Error("LIFI router not configured");
+  let n;
+  if (A)
+    n = A;
+  else {
+    const o = i[0], c = z(
+      t,
+      r,
+      o.temporarySubAccount.ethAddress,
+      g,
+      a,
+      o.bridgeAmount,
+      o.bridgeAmount,
+      o.quote
+    ).map(
+      (C) => it(C, o.temporarySubAccount.ethAddress, r)
+    );
+    n = await et(r, a, [a], k.Emporium, c);
+  }
+  const y = {
+    feeToken: n.feeToken,
+    flatFee: 0n,
+    variableRate: 0n
+  }, h = i.reduce((o, s) => o + s.quote.nativeFee, 0n) > 0n && !L(a, d), v = i.map((o) => o.bridgeAmount), f = i.map((o) => o.recipientAddress), T = await N(
+    t,
+    r,
+    e,
+    v,
+    f,
+    n,
+    m
+  );
+  let p = [];
+  if (h) {
+    const o = st(d, r);
+    if (!o)
+      throw Error("No native token");
+    const s = i.map((c) => c.quote.nativeFee);
+    p = await N(
+      t,
+      r,
+      o,
+      s,
+      f,
+      y,
+      m
+    );
+  }
+  const w = i.map((o, s) => ({
+    ...o,
+    utxo: T[s].utxo,
+    nativeUtxo: h ? p[s]?.utxo : void 0
+  }));
+  return at(
+    t,
+    r,
+    e,
+    w,
+    n,
+    m,
+    u
+  );
+};
+export {
+  ue as hinkalDepositAndBridge
+};

package/data-structures/Hinkal/hinkalGetZkMeProvider.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("../../API/API.cjs"),o=r=>({async getAccessToken(){return a.API.getZkMeAccessToken()},async getUserAccounts(){return[await r.getEthereumAddress()]},async delegateTransaction(e){const s=await r.getProviderAdapter(),t={...e,chainId:Number(e.chainId),type:e.type?e.type:void 0,maxPriorityFeePerGas:e.maxPriorityFeePerGas?e.maxPriorityFeePerGas:void 0,maxFeePerGas:e.maxFeePerGas?e.maxFeePerGas:void 0};return(await s.sendTransaction(t)).hash}});exports.getHinkalZkMeProvider=o;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("../../API/API.cjs"),n=r=>({async getAccessToken(){return a.API.getZkMeAccessToken()},async getUserAccounts(){return[await r.getEthereumAddress()]},async delegateTransaction(e){const s=r.getProviderAdapter(Number(e.chainId)),t={...e,chainId:Number(e.chainId),type:e.type?e.type:void 0,maxPriorityFeePerGas:e.maxPriorityFeePerGas?e.maxPriorityFeePerGas:void 0,maxFeePerGas:e.maxFeePerGas?e.maxFeePerGas:void 0};return(await s.sendTransaction(t)).hash}});exports.getHinkalZkMeProvider=n;

package/data-structures/Hinkal/hinkalGetZkMeProvider.mjs

@@ -1,20 +1,20 @@
-import { API as a } from "../../API/API.mjs";
+import { API as t } from "../../API/API.mjs";
 const d = (r) => ({
   async getAccessToken() {
-    return a.getZkMeAccessToken();
+    return t.getZkMeAccessToken();
   },
   async getUserAccounts() {
     return [await r.getEthereumAddress()];
   },
   async delegateTransaction(e) {
-    const s = await r.getProviderAdapter(), t = {
+    const s = r.getProviderAdapter(Number(e.chainId)), a = {
       ...e,
       chainId: Number(e.chainId),
       type: e.type ? e.type : void 0,
       maxPriorityFeePerGas: e.maxPriorityFeePerGas ? e.maxPriorityFeePerGas : void 0,
       maxFeePerGas: e.maxFeePerGas ? e.maxFeePerGas : void 0
     };
-    return (await s.sendTransaction(t)).hash;
+    return (await s.sendTransaction(a)).hash;
   }
 });
 export {

package/data-structures/Hinkal/hinkalPrivateWallet.cjs

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

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

@@ -1,6 +1,6 @@
 import { IHinkal } from './IHinkal';
 import { FeeStructure } from '../../types/hinkal.types';
-import { PrivateRecipientInfo, TokenChanges } from '../../types/token.types';
+import { ERC20Token, PrivateRecipientInfo, TokenChanges } from '../../types/token.types';
 import { SubAccount } from '../../types/proxy.types';
 import { AdminTransactionType } from '../../types/admin.types';
-export declare const hinkalPrivateWallet: (hinkal: IHinkal, chainId: number, 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>;
+export declare const hinkalPrivateWallet: (hinkal: IHinkal, chainId: number, erc20Tokens: ERC20Token[], 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/hinkalPrivateWallet.mjs

@@ -1,4 +1,4 @@
-import { networkRegistry as V } from "../../constants/chains.constants.mjs";
+import { networkRegistry as C } from "../../constants/chains.constants.mjs";
 import { transactionErrorCodes as R } from "../../error-handling/error-codes.constants.mjs";
 import "ethers";
 import "../../types/circom-data.types.mjs";
@@ -13,141 +13,145 @@ import { constructEmporiumProof as Q } from "../../functions/snarkjs/constructEm
 import { outputUtxoProcessing as X } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
 import { addPaddingToUtxos as Z } from "../../functions/web3/events/getShieldedBalance.mjs";
 import { estimateGasRelayer as $ } from "../../functions/web3/functionCalls/estimateGasRelayer.mjs";
-import { transactCallRelayer as b } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { uniswapWorkaround as C } from "../../functions/utils/involves-permit2-op.mjs";
-import { outputApprovalDataProcessing as I } from "../../functions/pre-transaction/outputApprovalDataProcessing.mjs";
-import { convertEmporiumOpToCallInfo as h } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
-import { getFeeStructure as tt } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { shouldPatchAccessTokenMerkleTree as rt } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
-import { getSignatureDataForTransact as ot } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
-import { mergeWithFeeStructureEmporium as et } from "../../functions/pre-transaction/merge-with-fee-structure-emporium.mjs";
-import { caseInsensitiveEqual as mt } from "../../functions/utils/caseInsensitive.utils.mjs";
-import { getCurrentTimeInSeconds as it } from "../../functions/utils/time.utils.mjs";
-import { handleAutoDepositBack as st } from "./handleAutoDepositBack.mjs";
-import { UserKeys as at } from "../crypto-keys/keys.mjs";
+import { transactCallRelayer as I } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { uniswapWorkaround as h } from "../../functions/utils/involves-permit2-op.mjs";
+import { outputApprovalDataProcessing as rr } from "../../functions/pre-transaction/outputApprovalDataProcessing.mjs";
+import { convertEmporiumOpToCallInfo as tr } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
+import { getFeeStructure as or } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { shouldPatchAccessTokenMerkleTree as er } from "../../functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs";
+import { getSignatureDataForTransact as sr } from "../../functions/pre-transaction/getSignatureDataForTransact.mjs";
+import { mergeWithFeeStructureEmporium as mr } from "../../functions/pre-transaction/merge-with-fee-structure-emporium.mjs";
+import { caseInsensitiveEqual as ir } from "../../functions/utils/caseInsensitive.utils.mjs";
+import { getCurrentTimeInSeconds as ar } from "../../functions/utils/time.utils.mjs";
+import { handleAutoDepositBack as pr } from "./handleAutoDepositBack.mjs";
 import "../../constants/server.constants.mjs";
 import "../../API/getServerURL.mjs";
 import "../http/HttpClient.mjs";
 import "axios";
 import "../../constants/token-data/index.mjs";
-import { constructAdminData as pt } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { constructAdminData as cr } from "../../functions/pre-transaction/constructAdminData.mjs";
 import "@coral-xyz/anchor";
 import "@solana/web3.js";
 import "circomlibjs-hinkal-fork";
 import "@solana/spl-token";
-import { recipientUtxoProcessing as ft } from "../../functions/pre-transaction/recipientUtxoProcessing.mjs";
-import { isValidPrivateAddress as ut } from "../../functions/utils/addresses.mjs";
-const bt = async (o, t, e, m, l, p, i, A, U, S, k, K = !1, F, y, f, T = !1) => {
-  if (f && !ut(f.recipientInfo))
+import { AccountActions as S } from "../AccountActions/AccountActions.mjs";
+import "buffer";
+import { recipientUtxoProcessing as ur } from "../../functions/pre-transaction/recipientUtxoProcessing.mjs";
+import { isValidPrivateAddress as fr } from "../../functions/utils/addresses.mjs";
+const Ir = async (o, r, k, e, A, c, m, l, U, F, B, H = !1, K, w, u, T = !1) => {
+  if (u && !fr(u.recipientInfo))
     throw Error(R.RECIPIENT_FORMAT_INCORRECT);
-  const u = at.getSignerAddressFromPrivateKey(t, A.privateKey), { contractData: H } = V[t], { emporiumAddress: n } = H;
-  if (!n)
+  const s = k.map((t) => t.erc20TokenAddress), i = S.getAddressFromSubAccount(r, l);
+  if (!i)
+    throw Error("Public account address is not available");
+  const { contractData: L } = C[r], { emporiumAddress: f } = L;
+  if (!f)
     throw Error("No Emporium Address Provided");
-  const c = S ?? await tt(
-    t,
+  const n = F ?? await or(
+    r,
     U,
-    e,
+    s,
     j.Emporium,
-    p.map((r) => h(r, u ?? "", t))
-  ), L = i.find(
-    (r) => mt(r.token.erc20TokenAddress, c.feeToken)
+    c.map((t) => tr(t, i ?? "", r))
+  ), W = m.find(
+    (t) => ir(t.token.erc20TokenAddress, n.feeToken)
   )?.amount ?? 0n;
-  for (u && await et(
+  for (i && await mr(
     o,
-    t,
-    u,
-    p,
-    e,
-    m,
+    r,
+    i,
     c,
-    L
-  ); l.length < e.length; )
-    l.push(!1);
-  const s = [...await Z(o, t, e, m)], g = [], a = G(m.length, o.userKeys), E = it().toString();
-  for (let r = 0; r < e.length; r += 1) {
-    const { outputUtxos: z } = X(
+    s,
+    e,
+    n,
+    W
+  ); A.length < s.length; )
+    A.push(!1);
+  const a = [...await Z(o, r, s, e)], d = [], p = G(e.length, o.userKeys), y = ar().toString();
+  for (let t = 0; t < s.length; t += 1) {
+    const { outputUtxos: V } = X(
       o.userKeys,
-      s[r],
-      m[r],
-      E,
+      a[t],
+      e[t],
+      y,
       void 0,
       !1
     );
-    g.push(z);
-    const { useApprovalUtxoData: D } = I(o, t, s[r], m[r]);
-    D && (a.doPreTxApproval = !0, a.useApprovalUtxoData[r] = D, a.interactionAddress = n, a.inHinkalAddress = o.userKeys.getInHinkalAddress(n));
+    d.push(V);
+    const { useApprovalUtxoData: D } = rr(o, r, a[t], e[t]);
+    D && (p.doPreTxApproval = !0, p.useApprovalUtxoData[t] = D, p.interactionAddress = f, p.inHinkalAddress = o.userKeys.getInHinkalAddress(f));
   }
-  f && ft(f, g, m, E);
-  const P = k ?? await o.getRandomRelay(t, !T);
-  if (!P)
+  u && ur(u, d, e, y);
+  const E = B ?? await o.getRandomRelay(r, !T);
+  if (!E)
     throw Error(R.RELAYER_NOT_AVAILABLE);
-  const { patchAccessTokenMerkleTree: W, kycRequired: B, hasAccessToken: N } = await rt(
+  const { patchAccessTokenMerkleTree: N, kycRequired: O, hasAccessToken: _ } = await er(
     o,
-    t,
-    e,
-    m
-  ), O = await ot(
-    t,
-    await o.getEthereumAddress(),
+    r,
+    s,
+    e
+  ), b = await sr(
+    r,
+    await o.getEthereumAddressByChain(r),
     o.userKeys,
-    B,
-    N
-  ), { zkCallData: d, circomData: w, dimData: v, authorizationData: x } = await Q(
+    O,
+    _
+  ), { zkCallData: P, circomData: g, dimData: v, authorizationData: x } = await Q(
     "v1x1",
-    o.merkleTreeHinkalByChain[t],
-    o.merkleTreeAccessTokenByChain[t],
-    e,
-    e.map(() => 0),
+    o.merkleTreeHinkalByChain[r],
+    o.merkleTreeAccessTokenByChain[r],
     s,
-    g,
+    s.map(() => 0),
+    a,
+    d,
     o.userKeys,
-    m.length,
-    s.length > 0 ? s[0].length : 0,
-    n,
-    p,
+    e.length,
+    a.length > 0 ? a[0].length : 0,
+    f,
+    c,
     o.generateProofRemotely,
-    P,
-    t,
-    l,
-    void 0,
+    E,
+    r,
     A,
-    a,
-    W,
     void 0,
-    c,
-    o.getContractWithFetcher(t, Y.HinkalHelperContract),
-    O
-  ), _ = C(p);
+    S.getPrivateKeyFromSubAccount(r, l),
+    p,
+    N,
+    void 0,
+    n,
+    o.getContractWithFetcher(r, Y.HinkalHelperContract),
+    b
+  ), M = h(c);
   if (T)
-    return await $(t, d, v, w, x);
-  const M = pt(
-    y,
-    t,
-    i.map((r) => r.token.erc20TokenAddress),
-    i.map((r) => r.amount),
-    await o.getEthereumAddress(),
-    y === J.PublicSwap ? i.map(({ token: r }) => r) : void 0
-  ), q = await b(
-    t,
-    d,
-    v,
+    return await $(r, P, v, g, x);
+  const q = cr(
     w,
+    r,
+    m.map((t) => t.token.erc20TokenAddress),
+    m.map((t) => t.amount),
+    await o.getEthereumAddressByChain(r),
+    w === J.PublicSwap ? m.map(({ token: t }) => t) : void 0
+  ), z = await I(
+    r,
+    P,
+    v,
+    g,
     !1,
-    _,
+    M,
     x,
-    M
+    q
   );
-  return K && st(
+  return H && pr(
     o,
-    t,
-    u,
-    A,
-    c.feeToken,
-    F,
+    r,
     i,
-    w
-  ), q;
+    l,
+    n.feeToken,
+    K,
+    m,
+    g
+  ), z;
 };
 export {
-  bt as hinkalPrivateWallet
+  Ir as hinkalPrivateWallet
 };

package/data-structures/Hinkal/hinkalProxySwap.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const g=require("../../constants/addresses.constants.cjs"),h=require("../../functions/pre-transaction/getFeeStructure.cjs"),v=require("../../functions/private-wallet/emporium.swap.helpers.cjs"),P=require("../../functions/utils/convertEmporiumOpToCallInfo.cjs"),f=require("../../types/external-action.types.cjs"),C=require("../../error-handling/error-codes.constants.cjs"),I=require("../../constants/protocol.constants.cjs"),O=require("../crypto-keys/keys.cjs"),L=require("../../functions/utils/token-check.utils.cjs"),T=async(t,o,s,c,m,E,u,n,S,A=!1,_,w,p=!1)=>{if(!n)throw new Error("Fee token is required in hinkalProxySwap");const e=L.validateAndGetChainId(o),d=O.UserKeys.getSignerAddressFromPrivateKey(e,u.privateKey),a=o.map(r=>r.erc20TokenAddress),i=await t.getRandomRelay(e,!p);if(!i)throw Error(C.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const l=await v.createSwapToEmporiumOps(t,e,c,g.SWAP_ROUTER_ADDRESSES[c][e],m,a[0],s[0],s[1],a[1],E,d,i,!0),y=S??await h.getFeeStructure(e,n,a,f.ExternalActionId.Emporium,l.map(r=>P.convertEmporiumOpToCallInfo(r,d,e)),I.HINKAL_SWAP_VARIABLE_RATE),q=o.map((r,R)=>({token:r,amount:s[R]}));return t.actionPrivateWallet(e,[],[],[],l,q,u,n,y,i,A,_,w,void 0,p)};exports.hinkalProxySwap=T;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const f=require("../../constants/addresses.constants.cjs"),y=require("../../functions/pre-transaction/getFeeStructure.cjs"),P=require("../../functions/private-wallet/emporium.swap.helpers.cjs"),g=require("../../functions/utils/convertEmporiumOpToCallInfo.cjs"),v=require("../../types/external-action.types.cjs"),C=require("../../error-handling/error-codes.constants.cjs"),I=require("../../constants/protocol.constants.cjs"),O=require("../../functions/utils/token-check.utils.cjs"),L=require("../AccountActions/AccountActions.cjs"),T=async(t,o,s,u,A,m,p,n,E,S=!1,_,w,d=!1)=>{if(!n)throw new Error("Fee token is required in hinkalProxySwap");const r=O.validateAndGetChainId(o),a=L.AccountActions.getAddressFromSubAccount(r,p);if(!a)throw Error("Public account address is not available");const c=o.map(e=>e.erc20TokenAddress),i=await t.getRandomRelay(r,!d);if(!i)throw Error(C.transactionErrorCodes.RELAYER_NOT_AVAILABLE);const l=await P.createSwapToEmporiumOps(t,r,u,f.SWAP_ROUTER_ADDRESSES[u][r],A,c[0],s[0],s[1],c[1],m,a,i,!0),q=E??await y.getFeeStructure(r,n,c,v.ExternalActionId.Emporium,l.map(e=>g.convertEmporiumOpToCallInfo(e,a,r)),I.HINKAL_SWAP_VARIABLE_RATE),h=o.map((e,R)=>({token:e,amount:s[R]}));return t.actionPrivateWallet(r,[],[],[],l,h,p,n,q,i,S,_,w,void 0,d)};exports.hinkalProxySwap=T;

package/data-structures/Hinkal/hinkalProxySwap.mjs

@@ -1,61 +1,64 @@
-import { SWAP_ROUTER_ADDRESSES as v } from "../../constants/addresses.constants.mjs";
-import { getFeeStructure as I } from "../../functions/pre-transaction/getFeeStructure.mjs";
-import { createSwapToEmporiumOps as P } from "../../functions/private-wallet/emporium.swap.helpers.mjs";
-import { convertEmporiumOpToCallInfo as g } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
-import { ExternalActionId as h } from "../../types/external-action.types.mjs";
-import { transactionErrorCodes as L } from "../../error-handling/error-codes.constants.mjs";
-import { HINKAL_SWAP_VARIABLE_RATE as O } from "../../constants/protocol.constants.mjs";
-import { UserKeys as C } from "../crypto-keys/keys.mjs";
-import { validateAndGetChainId as K } from "../../functions/utils/token-check.utils.mjs";
-const q = async (t, e, a, s, E, A, n, i, S, w = !1, R, l, c = !1) => {
-  if (!i)
+import { SWAP_ROUTER_ADDRESSES as I } from "../../constants/addresses.constants.mjs";
+import { getFeeStructure as P } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { createSwapToEmporiumOps as v } from "../../functions/private-wallet/emporium.swap.helpers.mjs";
+import { convertEmporiumOpToCallInfo as L } from "../../functions/utils/convertEmporiumOpToCallInfo.mjs";
+import { ExternalActionId as O } from "../../types/external-action.types.mjs";
+import { transactionErrorCodes as g } from "../../error-handling/error-codes.constants.mjs";
+import { HINKAL_SWAP_VARIABLE_RATE as y } from "../../constants/protocol.constants.mjs";
+import { validateAndGetChainId as C } from "../../functions/utils/token-check.utils.mjs";
+import { AccountActions as x } from "../AccountActions/AccountActions.mjs";
+const H = async (t, a, i, p, f, E, c, e, u, l = !1, w, S, d = !1) => {
+  if (!e)
     throw new Error("Fee token is required in hinkalProxySwap");
-  const r = K(e), d = C.getSignerAddressFromPrivateKey(r, n.privateKey), m = e.map((o) => o.erc20TokenAddress), p = await t.getRandomRelay(r, !c);
-  if (!p)
-    throw Error(L.RELAYER_NOT_AVAILABLE);
-  const f = await P(
+  const r = C(a), m = x.getAddressFromSubAccount(r, c);
+  if (!m)
+    throw Error("Public account address is not available");
+  const n = a.map((o) => o.erc20TokenAddress), s = await t.getRandomRelay(r, !d);
+  if (!s)
+    throw Error(g.RELAYER_NOT_AVAILABLE);
+  const A = await v(
     t,
     r,
-    s,
-    v[s][r],
-    E,
-    m[0],
-    a[0],
-    a[1],
-    m[1],
-    A,
-    d,
     p,
+    I[p][r],
+    f,
+    n[0],
+    i[0],
+    i[1],
+    n[1],
+    E,
+    m,
+    s,
     !0
-  ), u = S ?? await I(
+  ), R = u ?? await P(
     r,
-    i,
-    m,
-    h.Emporium,
-    f.map((o) => g(o, d, r)),
-    O
-  ), y = e.map((o, _) => ({
+    e,
+    n,
+    O.Emporium,
+    A.map((o) => L(o, m, r)),
+    y
+  ), _ = a.map((o, h) => ({
     token: o,
-    amount: a[_]
+    amount: i[h]
   }));
   return t.actionPrivateWallet(
     r,
     [],
     [],
     [],
-    f,
-    y,
-    n,
-    i,
-    u,
-    p,
-    w,
+    A,
+    _,
+    c,
+    e,
     R,
+    s,
     l,
+    w,
+    S,
     void 0,
-    c
+    d
   );
 };
 export {
-  q as hinkalProxySwap
+  H as hinkalProxySwap
 };