@hinkal/common 0.2.21 → 0.2.22

package/functions/pre-transaction/merge-with-fee-structure-emporium.mjs

@@ -1,24 +1,24 @@
-import { getPublicAddressBalance as T } from "../web3/getPublicAddressBalance.mjs";
-import { mergeWithFeeStructure as F } from "./merge-with-fee-structure.mjs";
-import { createTransferToEmporiumOp as c } from "../private-wallet/emporium.helpers.mjs";
-import { zeroAddress as g } from "../../constants/protocol.constants.mjs";
-import { ContractType as l } from "../../types/ethereum-network.types.mjs";
+import { getPublicAddressBalance as s } from "../web3/getPublicAddressBalance.mjs";
+import { mergeWithFeeStructure as c } from "./merge-with-fee-structure.mjs";
+import { createTransferToEmporiumOp as T } from "../private-wallet/emporium.helpers.mjs";
+import { zeroAddress as F } from "../../constants/protocol.constants.mjs";
+import { ContractType as g } from "../../types/ethereum-network.types.mjs";
 import { maxBigInt as C } from "../utils/amounts.utils.mjs";
-const x = async (r, t, n, a, f, p, o, m) => {
-  let e = 0n;
-  const s = m < 0n ? m : 0n, i = await T(r, t, o.feeToken, n) + s;
-  i < 0 ? e = o.flatFee : e = C(o.flatFee - i, 0n), e !== 0n && (F(t, f, p, {
-    ...o,
-    flatFee: e
-  }), a.push(
-    c(
-      o.feeToken === g ? void 0 : r.getContractWithFetcher(t, l.ERC20Contract, o.feeToken),
-      n,
-      e,
+const u = async (t, r, i, a, f, e, n) => {
+  let o = 0n;
+  const p = n < 0n ? n : 0n, m = await s(t, e.feeToken, r) + p;
+  m < 0 ? o = e.flatFee : o = C(e.flatFee - m, 0n), o !== 0n && (c(t.getCurrentChainId(), a, f, {
+    ...e,
+    flatFee: o
+  }), i.push(
+    T(
+      e.feeToken === F ? void 0 : t.getContractWithFetcher(g.ERC20Contract, e.feeToken),
+      r,
+      o,
       !1
     )
   ));
 };
 export {
-  x as mergeWithFeeStructureEmporium
+  u as mergeWithFeeStructureEmporium
 };

package/functions/pre-transaction/outputApprovalDataProcessing.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const l=require("../../error-handling/error-codes.constants.cjs"),u=require("../../constants/conversion.constants.cjs"),_=require("../../types/hinkal.types.cjs"),E=require("../utils/processUseApprovalUtxoData.cjs"),N=require("../utils/amounts.utils.cjs"),O=require("../utils/caseInsensitive.utils.cjs"),D=(d,A,n,s,v,a)=>{if(a&&a>0)throw new Error(l.transactionErrorCodes.INSUFFICIENT_FUNDS);const i=N.countTotalAmountInUtxos(n),{erc20TokenAddress:U}=n[0],c=d.getApprovedUtxosForToken(U,A).filter(t=>!O.caseInsensitiveEqual(t.interactionAddress,v)),o=_.defaultUseApprovalUTXOData(u.APPROVED_UTXO_CONVERSION_COUNT,0n);if(s<0n&&i+s<0n){let t=-(i+s);for(let e=0;e<Math.min(c.length,u.APPROVED_UTXO_CONVERSION_COUNT)&&t!==0n;e+=1){const r=c[e],p=r.amount>=t?-t:-r.amount;t+=p,o.approvalChanges[e]=p,o.externalApprovalAddresses[e]=r.interactionAddress,o.conversionInHinkalAddress[e]=r.inHinkalAddress}if(t!==0n)throw new Error(l.transactionErrorCodes.INSUFFICIENT_FUNDS)}return{useApprovalUtxoData:E.isUseApprovalDataEmpty(o)?void 0:o}};exports.outputApprovalDataProcessing=D;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const U=require("../../error-handling/error-codes.constants.cjs"),p=require("../../constants/conversion.constants.cjs"),_=require("../../types/hinkal.types.cjs"),D=require("../utils/processUseApprovalUtxoData.cjs"),T=require("../utils/amounts.utils.cjs"),f=require("../utils/caseInsensitive.utils.cjs"),m=(i,d,s,O,A)=>{if(A&&A>0)throw new Error(U.transactionErrorCodes.INSUFFICIENT_FUNDS);const l=T.countTotalAmountInUtxos(d),{erc20TokenAddress:N}=d[0],c=i.getApprovedUtxosForToken(N).filter(n=>!f.caseInsensitiveEqual(n.interactionAddress,O)),r=_.defaultUseApprovalUTXOData(p.APPROVED_UTXO_CONVERSION_COUNT,0n);if(s<0n&&l+s<0n){let n=-(l+s);for(let t=0;t<Math.min(c.length,p.APPROVED_UTXO_CONVERSION_COUNT)&&n!==0n;t+=1){const a=c[t],u=a.amount>=n?-n:-a.amount;n+=u,r.approvalChanges[t]=u,r.externalApprovalAddresses[t]=a.interactionAddress,r.conversionInHinkalAddress[t]=a.inHinkalAddress}if(n!==0n)throw new Error(U.transactionErrorCodes.INSUFFICIENT_FUNDS)}return{useApprovalUtxoData:D.isUseApprovalDataEmpty(r)?void 0:r}},k=(i,d,s,O,A,l)=>{if(l&&l>0)throw new Error(U.transactionErrorCodes.INSUFFICIENT_FUNDS);const N=T.countTotalAmountInUtxos(d),{erc20TokenAddress:c}=d[0],r=_.defaultUseApprovalUTXOData(p.APPROVED_UTXO_CONVERSION_COUNT,0n),n=i.userKeys.getInHinkalAddress(s),t=i.getApprovedUtxosForToken(c).sort((e,o)=>e.inHinkalAddress===n?-1:o.inHinkalAddress===n?1:e.amount===o.amount?0:e.amount<o.amount?-1:1),a=t[0]?.inHinkalAddress===n,u=a?t[0].amount:0n,C=O-u;r.approvalChanges[0]=C,r.externalApprovalAddresses[0]=s,r.conversionInHinkalAddress[0]=i.userKeys.getInHinkalAddress(s);const E=a?1:0,v=E===0?1:0;let I=A;for(let e=E;e<Math.min(p.APPROVED_UTXO_CONVERSION_COUNT,t.length)&&!(e+v>=p.APPROVED_UTXO_CONVERSION_COUNT);e+=1){const o=t[e];I+=o.amount,r.approvalChanges[e+v]=-o.amount,r.externalApprovalAddresses[e+v]=o.interactionAddress,r.conversionInHinkalAddress[e+v]=o.inHinkalAddress}if(N+I<0n)throw new Error(U.transactionErrorCodes.INSUFFICIENT_FUNDS);return{useApprovalUtxoData:r,deltaAmountOverride:I}};exports.outputApprovalDataProcessing=m;exports.outputApprovalDataProcessingForHinkalApprove=k;

package/functions/pre-transaction/outputApprovalDataProcessing.d.ts

@@ -1,9 +1,17 @@
 import { Utxo } from '../../data-structures/utxo/Utxo';
 import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
-export declare const outputApprovalDataProcessing: (hinkal: IHinkal, chainId: number, inputUtxos: Utxo[], amountChange: bigint, interactionToIgnore?: string, tokenId?: number) => {
+export declare const outputApprovalDataProcessing: (hinkal: IHinkal, inputUtxos: Utxo[], amountChange: bigint, interactionToIgnore?: string, tokenId?: number) => {
     useApprovalUtxoData: {
         approvalChanges: bigint[];
         externalApprovalAddresses: string[];
         conversionInHinkalAddress: bigint[];
     } | undefined;
 };
+export declare const outputApprovalDataProcessingForHinkalApprove: (hinkal: IHinkal, inputUtxos: Utxo[], approvedTo: string, approvalAmount: bigint, deltaAmount: bigint, tokenId?: number) => {
+    useApprovalUtxoData: {
+        approvalChanges: bigint[];
+        externalApprovalAddresses: string[];
+        conversionInHinkalAddress: bigint[];
+    };
+    deltaAmountOverride: bigint;
+};

package/functions/pre-transaction/outputApprovalDataProcessing.mjs

@@ -1,24 +1,39 @@
-import { transactionErrorCodes as A } from "../../error-handling/error-codes.constants.mjs";
-import { APPROVED_UTXO_CONVERSION_COUNT as d } from "../../constants/conversion.constants.mjs";
-import { defaultUseApprovalUTXOData as f } from "../../types/hinkal.types.mjs";
-import { isUseApprovalDataEmpty as u } from "../utils/processUseApprovalUtxoData.mjs";
-import { countTotalAmountInUtxos as E } from "../utils/amounts.utils.mjs";
-import { caseInsensitiveEqual as I } from "../utils/caseInsensitive.utils.mjs";
-const w = (m, c, s, n, v, a) => {
-  if (a && a > 0)
-    throw new Error(A.INSUFFICIENT_FUNDS);
-  const p = E(s), { erc20TokenAddress: U } = s[0], i = m.getApprovedUtxosForToken(U, c).filter((o) => !I(o.interactionAddress, v)), t = f(d, 0n);
-  if (n < 0n && p + n < 0n) {
-    let o = -(p + n);
-    for (let r = 0; r < Math.min(i.length, d) && o !== 0n; r += 1) {
-      const e = i[r], l = e.amount >= o ? -o : -e.amount;
-      o += l, t.approvalChanges[r] = l, t.externalApprovalAddresses[r] = e.interactionAddress, t.conversionInHinkalAddress[r] = e.inHinkalAddress;
+import { transactionErrorCodes as v } from "../../error-handling/error-codes.constants.mjs";
+import { APPROVED_UTXO_CONVERSION_COUNT as l } from "../../constants/conversion.constants.mjs";
+import { defaultUseApprovalUTXOData as F } from "../../types/hinkal.types.mjs";
+import { isUseApprovalDataEmpty as D } from "../utils/processUseApprovalUtxoData.mjs";
+import { countTotalAmountInUtxos as N } from "../utils/amounts.utils.mjs";
+import { caseInsensitiveEqual as E } from "../utils/caseInsensitive.utils.mjs";
+const S = (i, d, s, f, A) => {
+  if (A && A > 0)
+    throw new Error(v.INSUFFICIENT_FUNDS);
+  const p = N(d), { erc20TokenAddress: U } = d[0], c = i.getApprovedUtxosForToken(U).filter((n) => !E(n.interactionAddress, f)), r = F(l, 0n);
+  if (s < 0n && p + s < 0n) {
+    let n = -(p + s);
+    for (let o = 0; o < Math.min(c.length, l) && n !== 0n; o += 1) {
+      const a = c[o], u = a.amount >= n ? -n : -a.amount;
+      n += u, r.approvalChanges[o] = u, r.externalApprovalAddresses[o] = a.interactionAddress, r.conversionInHinkalAddress[o] = a.inHinkalAddress;
     }
-    if (o !== 0n)
-      throw new Error(A.INSUFFICIENT_FUNDS);
+    if (n !== 0n)
+      throw new Error(v.INSUFFICIENT_FUNDS);
   }
-  return { useApprovalUtxoData: u(t) ? void 0 : t };
+  return { useApprovalUtxoData: D(r) ? void 0 : r };
+}, O = (i, d, s, f, A, p) => {
+  if (p && p > 0)
+    throw new Error(v.INSUFFICIENT_FUNDS);
+  const U = N(d), { erc20TokenAddress: c } = d[0], r = F(l, 0n), n = i.userKeys.getInHinkalAddress(s), o = i.getApprovedUtxosForToken(c).sort((t, e) => t.inHinkalAddress === n ? -1 : e.inHinkalAddress === n ? 1 : t.amount === e.amount ? 0 : t.amount < e.amount ? -1 : 1), a = o[0]?.inHinkalAddress === n, u = a ? o[0].amount : 0n, x = f - u;
+  r.approvalChanges[0] = x, r.externalApprovalAddresses[0] = s, r.conversionInHinkalAddress[0] = i.userKeys.getInHinkalAddress(s);
+  const k = a ? 1 : 0, m = k === 0 ? 1 : 0;
+  let I = A;
+  for (let t = k; t < Math.min(l, o.length) && !(t + m >= l); t += 1) {
+    const e = o[t];
+    I += e.amount, r.approvalChanges[t + m] = -e.amount, r.externalApprovalAddresses[t + m] = e.interactionAddress, r.conversionInHinkalAddress[t + m] = e.inHinkalAddress;
+  }
+  if (U + I < 0n)
+    throw new Error(v.INSUFFICIENT_FUNDS);
+  return { useApprovalUtxoData: r, deltaAmountOverride: I };
 };
 export {
-  w as outputApprovalDataProcessing
+  S as outputApprovalDataProcessing,
+  O as outputApprovalDataProcessingForHinkalApprove
 };

package/functions/pre-transaction/sendV0Transaction.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const d=require("@solana/spl-token"),r=require("@solana/web3.js"),T=require("../../constants/protocol.constants.cjs"),U=require("../utils/ethers-formatter.utils.cjs"),M=require("../../data-structures/AccountActions/AccountActions.cjs"),_=async(t,s,e,a)=>{try{const{blockhash:n}=await t.getLatestBlockhash(),o=[r.ComputeBudgetProgram.setComputeUnitLimit({units:T.MAX_COMPUTE_UNIT_LIMIT}),...e],i=new r.TransactionMessage({payerKey:s,recentBlockhash:n,instructions:o}).compileToV0Message(a),c=new r.VersionedTransaction(i),u=await t.simulateTransaction(c,{sigVerify:!1,replaceRecentBlockhash:!0}),{unitsConsumed:m}=u.value;if(!m)return T.MAX_COMPUTE_UNIT_LIMIT;const l=Math.ceil(m*(1+T.COMPUTE_UNIT_PADDING_PERCENTAGE));return Math.max(T.MIN_COMPUTE_UNIT_LIMIT,Math.min(l,T.MAX_COMPUTE_UNIT_LIMIT))}catch{return T.MAX_COMPUTE_UNIT_LIMIT}},I=async(t,s,e,a)=>{const n=e.filter(u=>!u.programId.equals(r.ComputeBudgetProgram.programId)),o=await _(t,s,n,a),i=r.ComputeBudgetProgram.setComputeUnitLimit({units:o}),c=r.ComputeBudgetProgram.setComputeUnitPrice({microLamports:T.MICRO_LAMPORTS_PER_CU});return[i,c,...n]},A=async(t,s,e,a,n)=>{if(s.length===0)return"";const{blockhash:o,lastValidBlockHeight:i}=await t.getLatestBlockhash("confirmed"),c=await I(t,e.publicKey,s,n),u=new r.TransactionMessage({payerKey:e.publicKey,instructions:c,recentBlockhash:o}).compileToV0Message(n),m=new r.VersionedTransaction(u);m.sign(a);const l=await t.sendTransaction(m);return await t.confirmTransaction({signature:l,blockhash:o,lastValidBlockHeight:i},"confirmed"),l},V=async(t,s,e,a)=>{if(!e)return null;const n=await d.getAssociatedTokenAddress(e,a,!0,d.TOKEN_PROGRAM_ID,d.ASSOCIATED_TOKEN_PROGRAM_ID);if(!await t.getAccountInfo(n)){const i=d.createAssociatedTokenAccountInstruction(s.publicKey,n,a,e,d.TOKEN_PROGRAM_ID,d.ASSOCIATED_TOKEN_PROGRAM_ID);await A(t,[i],s,[s])}return n},y=async({connection:t,chainId:s,subAccount:e,payerPublicKey:a,instructions:n,lookupTableAccounts:o,convertParams:i})=>{const{blockhash:c,lastValidBlockHeight:u}=await t.getLatestBlockhash(),m=await I(t,a,n,o),l=new r.TransactionMessage({payerKey:a,recentBlockhash:c,instructions:m}).compileToV0Message(o),p=new r.VersionedTransaction(l),h=M.AccountActions.getPrivateKeyFromSubAccount(s,e);if(!h)throw Error("Private key is not available");const g=await M.AccountActions.sendAndSignTransactionFromPrivateKey(s,h,p);await t.confirmTransaction({signature:g,blockhash:c,lastValidBlockHeight:u},"confirmed");const f=await t.getTransaction(g,{commitment:"confirmed",maxSupportedTransactionVersion:0}),{fromAddress:w,toAddress:P,programAddress:C}=i;return U.convertSolanaTransactionToRelayer(g,f,w,P,C)},E=async(t,s,e,a)=>{const{blockhash:n}=await t.getLatestBlockhash(),o=await I(t,s,e,a),i=new r.TransactionMessage({payerKey:s,recentBlockhash:n,instructions:o}).compileToV0Message(a),c=new r.VersionedTransaction(i);return Buffer.from(c.serialize()).toString("base64")};exports.ensureAtaExists=V;exports.estimateComputeUnitLimit=_;exports.sendProxyV0Transaction=y;exports.sendV0Transaction=A;exports.serializeProxyV0Transaction=E;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const d=require("@solana/spl-token"),r=require("@solana/web3.js"),T=require("../../constants/protocol.constants.cjs"),U=require("../utils/ethers-formatter.utils.cjs"),C=require("../../data-structures/crypto-keys/keys.cjs"),h=async(t,e,a,n)=>{try{const{blockhash:s}=await t.getLatestBlockhash(),o=[r.ComputeBudgetProgram.setComputeUnitLimit({units:T.MAX_COMPUTE_UNIT_LIMIT}),...a],i=new r.TransactionMessage({payerKey:e,recentBlockhash:s,instructions:o}).compileToV0Message(n),c=new r.VersionedTransaction(i),u=await t.simulateTransaction(c,{sigVerify:!1,replaceRecentBlockhash:!0}),{unitsConsumed:m}=u.value;if(!m)return T.MAX_COMPUTE_UNIT_LIMIT;const l=Math.ceil(m*(1+T.COMPUTE_UNIT_PADDING_PERCENTAGE));return Math.max(T.MIN_COMPUTE_UNIT_LIMIT,Math.min(l,T.MAX_COMPUTE_UNIT_LIMIT))}catch{return T.MAX_COMPUTE_UNIT_LIMIT}},I=async(t,e,a,n)=>{const s=a.filter(u=>!u.programId.equals(r.ComputeBudgetProgram.programId)),o=await h(t,e,s,n),i=r.ComputeBudgetProgram.setComputeUnitLimit({units:o}),c=r.ComputeBudgetProgram.setComputeUnitPrice({microLamports:T.MICRO_LAMPORTS_PER_CU});return[i,c,...s]},M=async(t,e,a,n,s)=>{if(e.length===0)return"";const{blockhash:o,lastValidBlockHeight:i}=await t.getLatestBlockhash("confirmed"),c=await I(t,a.publicKey,e,s),u=new r.TransactionMessage({payerKey:a.publicKey,instructions:c,recentBlockhash:o}).compileToV0Message(s),m=new r.VersionedTransaction(u);m.sign(n);const l=await t.sendTransaction(m);return await t.confirmTransaction({signature:l,blockhash:o,lastValidBlockHeight:i},"confirmed"),l},P=async(t,e,a,n)=>{if(!a)return null;const s=await d.getAssociatedTokenAddress(a,n,!0,d.TOKEN_PROGRAM_ID,d.ASSOCIATED_TOKEN_PROGRAM_ID);if(!await t.getAccountInfo(s)){const i=d.createAssociatedTokenAccountInstruction(e.publicKey,s,n,a,d.TOKEN_PROGRAM_ID,d.ASSOCIATED_TOKEN_PROGRAM_ID);await M(t,[i],e,[e])}return s},V=async({connection:t,chainId:e,subAccount:a,payerPublicKey:n,instructions:s,lookupTableAccounts:o,convertParams:i})=>{const{blockhash:c,lastValidBlockHeight:u}=await t.getLatestBlockhash(),m=await I(t,n,s,o),l=new r.TransactionMessage({payerKey:n,recentBlockhash:c,instructions:m}).compileToV0Message(o),_=new r.VersionedTransaction(l),g=await C.UserKeys.sendAndSignTransactionFromPrivateKey(e,a.privateKey,_);await t.confirmTransaction({signature:g,blockhash:c,lastValidBlockHeight:u},"confirmed");const p=await t.getTransaction(g,{commitment:"confirmed",maxSupportedTransactionVersion:0}),{fromAddress:f,toAddress:w,programAddress:A}=i;return U.convertSolanaTransactionToRelayer(g,p,f,w,A)},y=async(t,e,a,n)=>{const{blockhash:s}=await t.getLatestBlockhash(),o=await I(t,e,a,n),i=new r.TransactionMessage({payerKey:e,recentBlockhash:s,instructions:o}).compileToV0Message(n),c=new r.VersionedTransaction(i);return Buffer.from(c.serialize()).toString("base64")};exports.ensureAtaExists=P;exports.estimateComputeUnitLimit=h;exports.sendProxyV0Transaction=V;exports.sendV0Transaction=M;exports.serializeProxyV0Transaction=y;

package/functions/pre-transaction/sendV0Transaction.mjs

@@ -1,16 +1,16 @@
-import { getAssociatedTokenAddress as B, TOKEN_PROGRAM_ID as I, ASSOCIATED_TOKEN_PROGRAM_ID as w, createAssociatedTokenAccountInstruction as C } from "@solana/spl-token";
+import { getAssociatedTokenAddress as V, TOKEN_PROGRAM_ID as I, ASSOCIATED_TOKEN_PROGRAM_ID as p, createAssociatedTokenAccountInstruction as y } from "@solana/spl-token";
 import { ComputeBudgetProgram as d, TransactionMessage as h, VersionedTransaction as g } from "@solana/web3.js";
-import { MAX_COMPUTE_UNIT_LIMIT as l, COMPUTE_UNIT_PADDING_PERCENTAGE as k, MIN_COMPUTE_UNIT_LIMIT as L, MICRO_LAMPORTS_PER_CU as P } from "../../constants/protocol.constants.mjs";
-import { convertSolanaTransactionToRelayer as E } from "../utils/ethers-formatter.utils.mjs";
-import { AccountActions as A } from "../../data-structures/AccountActions/AccountActions.mjs";
-const R = async (t, s, n, e) => {
+import { MAX_COMPUTE_UNIT_LIMIT as l, COMPUTE_UNIT_PADDING_PERCENTAGE as B, MIN_COMPUTE_UNIT_LIMIT as C, MICRO_LAMPORTS_PER_CU as L } from "../../constants/protocol.constants.mjs";
+import { convertSolanaTransactionToRelayer as k } from "../utils/ethers-formatter.utils.mjs";
+import { UserKeys as E } from "../../data-structures/crypto-keys/keys.mjs";
+const P = async (t, a, n, e) => {
   try {
-    const { blockhash: a } = await t.getLatestBlockhash(), o = [
+    const { blockhash: s } = await t.getLatestBlockhash(), o = [
       d.setComputeUnitLimit({ units: l }),
       ...n
     ], i = new h({
-      payerKey: s,
-      recentBlockhash: a,
+      payerKey: a,
+      recentBlockhash: s,
       instructions: o
     }).compileToV0Message(e), r = new g(i), c = await t.simulateTransaction(r, {
       sigVerify: !1,
@@ -18,107 +18,104 @@ const R = async (t, s, n, e) => {
     }), { unitsConsumed: m } = c.value;
     if (!m)
       return l;
-    const u = Math.ceil(m * (1 + k));
-    return Math.max(L, Math.min(u, l));
+    const u = Math.ceil(m * (1 + B));
+    return Math.max(C, Math.min(u, l));
   } catch {
     return l;
   }
-}, T = async (t, s, n, e) => {
-  const a = n.filter(
+}, f = async (t, a, n, e) => {
+  const s = n.filter(
     (c) => !c.programId.equals(d.programId)
-  ), o = await R(
+  ), o = await P(
     t,
-    s,
     a,
+    s,
     e
   ), i = d.setComputeUnitLimit({ units: o }), r = d.setComputeUnitPrice({
-    microLamports: P
+    microLamports: L
   });
-  return [i, r, ...a];
-}, O = async (t, s, n, e, a) => {
-  if (s.length === 0)
+  return [i, r, ...s];
+}, R = async (t, a, n, e, s) => {
+  if (a.length === 0)
     return "";
-  const { blockhash: o, lastValidBlockHeight: i } = await t.getLatestBlockhash("confirmed"), r = await T(
+  const { blockhash: o, lastValidBlockHeight: i } = await t.getLatestBlockhash("confirmed"), r = await f(
     t,
     n.publicKey,
-    s,
-    a
+    a,
+    s
   ), c = new h({
     payerKey: n.publicKey,
     instructions: r,
     recentBlockhash: o
-  }).compileToV0Message(a), m = new g(c);
+  }).compileToV0Message(s), m = new g(c);
   m.sign(e);
   const u = await t.sendTransaction(m);
   return await t.confirmTransaction({ signature: u, blockhash: o, lastValidBlockHeight: i }, "confirmed"), u;
-}, D = async (t, s, n, e) => {
+}, D = async (t, a, n, e) => {
   if (!n)
     return null;
-  const a = await B(n, e, !0, I, w);
-  if (!await t.getAccountInfo(a)) {
-    const i = C(
-      s.publicKey,
-      a,
+  const s = await V(n, e, !0, I, p);
+  if (!await t.getAccountInfo(s)) {
+    const i = y(
+      a.publicKey,
+      s,
       e,
       n,
       I,
-      w
+      p
     );
-    await O(t, [i], s, [s]);
+    await R(t, [i], a, [a]);
   }
-  return a;
-}, G = async ({
+  return s;
+}, v = async ({
   connection: t,
-  chainId: s,
+  chainId: a,
   subAccount: n,
   payerPublicKey: e,
-  instructions: a,
+  instructions: s,
   lookupTableAccounts: o,
   convertParams: i
 }) => {
-  const { blockhash: r, lastValidBlockHeight: c } = await t.getLatestBlockhash(), m = await T(
+  const { blockhash: r, lastValidBlockHeight: c } = await t.getLatestBlockhash(), m = await f(
     t,
     e,
-    a,
+    s,
     o
   ), u = new h({
     payerKey: e,
     recentBlockhash: r,
     instructions: m
-  }).compileToV0Message(o), M = new g(u), p = A.getPrivateKeyFromSubAccount(s, n);
-  if (!p)
-    throw Error("Private key is not available");
-  const f = await A.sendAndSignTransactionFromPrivateKey(s, p, M);
+  }).compileToV0Message(o), w = new g(u), T = await E.sendAndSignTransactionFromPrivateKey(a, n.privateKey, w);
   await t.confirmTransaction(
     {
-      signature: f,
+      signature: T,
       blockhash: r,
       lastValidBlockHeight: c
     },
     "confirmed"
   );
-  const _ = await t.getTransaction(f, {
+  const M = await t.getTransaction(T, {
     commitment: "confirmed",
     maxSupportedTransactionVersion: 0
-  }), { fromAddress: V, toAddress: y, programAddress: U } = i;
-  return E(f, _, V, y, U);
-}, b = async (t, s, n, e) => {
-  const { blockhash: a } = await t.getLatestBlockhash(), o = await T(
+  }), { fromAddress: _, toAddress: A, programAddress: U } = i;
+  return k(T, M, _, A, U);
+}, G = async (t, a, n, e) => {
+  const { blockhash: s } = await t.getLatestBlockhash(), o = await f(
     t,
-    s,
+    a,
     n,
     e
   ), i = new h({
-    payerKey: s,
-    recentBlockhash: a,
+    payerKey: a,
+    recentBlockhash: s,
     instructions: o
   }).compileToV0Message(e), r = new g(i);
   return Buffer.from(r.serialize()).toString("base64");
 };
 export {
   D as ensureAtaExists,
-  R as estimateComputeUnitLimit,
-  G as sendProxyV0Transaction,
-  O as sendV0Transaction,
-  b as serializeProxyV0Transaction
+  P as estimateComputeUnitLimit,
+  v as sendProxyV0Transaction,
+  R as sendV0Transaction,
+  G as serializeProxyV0Transaction
 };

package/functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const k=async(e,c,o,r)=>{const s=await e.checkTokenRegistry(c,o,r),t=await e.checkAccessToken(c);return{patchAccessTokenMerkleTree:s&&!t,hasAccessToken:t,kycRequired:s}};exports.shouldPatchAccessTokenMerkleTree=k;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=async(e,t,o)=>{const c=await e.checkTokenRegistry(t,o),s=await e.checkAccessToken();return{patchAccessTokenMerkleTree:c&&!s,hasAccessToken:s,kycRequired:c}};exports.shouldPatchAccessTokenMerkleTree=r;

package/functions/pre-transaction/shouldPatchAccessTokenMerkleTree.d.ts

@@ -1,5 +1,5 @@
 import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
-export declare const shouldPatchAccessTokenMerkleTree: (hinkal: IHinkal, chainId: number, erc20Addresses: string[], amountChanges: bigint[]) => Promise<{
+export declare const shouldPatchAccessTokenMerkleTree: (hinkal: IHinkal, erc20Addresses: string[], amountChanges: bigint[]) => Promise<{
     patchAccessTokenMerkleTree: boolean;
     hasAccessToken: boolean;
     kycRequired: boolean;

package/functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs

@@ -1,7 +1,7 @@
-const r = async (e, c, t, k) => {
-  const s = await e.checkTokenRegistry(c, t, k), o = await e.checkAccessToken(c);
-  return { patchAccessTokenMerkleTree: s && !o, hasAccessToken: o, kycRequired: s };
+const k = async (e, o, t) => {
+  const c = await e.checkTokenRegistry(o, t), s = await e.checkAccessToken();
+  return { patchAccessTokenMerkleTree: c && !s, hasAccessToken: s, kycRequired: c };
 };
 export {
-  r as shouldPatchAccessTokenMerkleTree
+  k as shouldPatchAccessTokenMerkleTree
 };

package/functions/private-wallet/emporium.helpers.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("ethers"),p=require("../../constants/protocol.constants.cjs"),q=require("../../types/ethereum-network.types.cjs");require("idb-keyval");const A=require("../../constants/chains.constants.cjs"),F=require("../utils/create-provider.cjs");require("../../constants/token-data/index.cjs");require("../../error-handling/error-codes.constants.cjs");require("../utils/convertIntegrationProviderToExternalActionId.cjs");require("../../types/circom-data.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");require("circomlibjs-hinkal-fork");require("../../data-structures/crypto-keys/keys.cjs");require("../../constants/server.constants.cjs");require("../../API/getServerURL.cjs");require("../../data-structures/http/HttpClient.cjs");require("axios");require("../../constants/vite.constants.cjs");const g=require("../utils/caseInsensitive.utils.cjs"),I=require("../../error-handling/logger.cjs");require("@solana/web3.js");require("@coral-xyz/anchor");require("@solana/spl-token");const v=require("../../data-structures/AccountActions/AccountActions.cjs");require("buffer");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");require("../../constants/coingecko.constants.cjs");require("../../constants/reorg-depths.constants.cjs");require("../../constants/addresses.constants.cjs");require("../../constants/token.limits.constants.cjs");require("../../constants/presale.constants.cjs");require("../../constants/activity.constants.cjs");require("../../constants/tasks.constants.cjs");require("../../constants/events.constants.cjs");require("../utils/userAgent.cjs");require("libsodium-wrappers");require("multiformats");require("../../API/enclaveCalls.cjs");require("async-mutex");require("process");require("../../providers/EthersProviderAdapter.cjs");const z=require("ethers-v6h"),m=({contract:e,func:t,args:n,callDataString:r,invokeWallet:s,value:o})=>{let i=new Uint8Array,a=r?u.utils.arrayify(r):new Uint8Array;if(typeof e=="object"&&"address"in e){if(i=u.utils.arrayify(e.address),r?.length&&r?.length>0)throw Error("If function and args are providedm no calldata is needed");t&&n&&!r&&(a=u.utils.arrayify(e.interface.encodeFunctionData(t,n)))}else i=u.utils.arrayify(e);const d=u.utils.arrayify([s?1:0]),c=u.utils.zeroPad(u.utils.arrayify(u.BigNumber.from(o??0n)),16),l=u.utils.concat([i,d,c,a]);return u.utils.hexlify(l)},W=async(e,t,n,r,s,o)=>{const i=n?await v.AccountActions.signTypedDataFromPrivateKey(e,n,{name:"Emporium",version:"1.0.0",chainId:e,verifyingContract:t},{EmporiumSignature:[{name:"message",type:"uint256"}]},{message:s}):void 0,{v:a,r:d,s:c}=i?u.utils.splitSignature(i):{v:0,r:u.ethers.constants.HashZero,s:u.ethers.constants.HashZero};return u.utils.defaultAbiCoder.encode(["tuple(uint8 v,bytes32 r, bytes32 s, uint256 message, address signerAddress, bytes[] ops)"],[{v:a,r:d,s:c,message:s??0n,signerAddress:o??p.zeroAddress,ops:r}])},y=(e,t,n,r)=>m(e?{contract:e,func:"transfer",args:[t,n],invokeWallet:r}:{contract:t,value:n,invokeWallet:r}),B=(e,t,n,r,s)=>{const o=e.getContractWithFetcher(t,q.ContractType.HinkalContract);return n.map((i,a)=>{const d=g.caseInsensitiveEqual(i,p.zeroAddress)?void 0:e.getContractWithFetcher(t,q.ContractType.ERC20Contract,i);return y(d,s??o.address,r[a],!0)})},E=(e,t,n,r)=>m({contract:e,func:"approve",args:[t,n],invokeWallet:r}),C=(e,t,n,r,s,o,i,a)=>{const d=[];for(let c=0;c<n.length;c+=1){const l=n[c],h=g.caseInsensitiveEqual(l,p.zeroAddress)?void 0:e.getContractWithFetcher(t,q.ContractType.ERC20Contract,l);d.push(y(h,i,r[c],!1))}if(a)for(let c=0;c<s.length;c+=1){const l=s[c];if(!g.caseInsensitiveEqual(l,p.zeroAddress)){const h=e.getContractWithFetcher(t,q.ContractType.ERC20Contract,l);d.push(E(h,a,o[c],!0))}}return d},T=(e,t,n,r,s,o,i,a)=>{const d=[],c=[s],l=[o];a.nativeFee>0n&&!g.caseInsensitiveEqual(s,p.zeroAddress)&&(c.push(p.zeroAddress),l.push(a.nativeFee));const w=C(e,t,c,l,[s],[i],n,r);d.push(...w);let f=a.nativeFee;return g.caseInsensitiveEqual(s,p.zeroAddress)&&(f+=i),d.push(m({contract:r,callDataString:a.calldata,value:f>0n?f:void 0,invokeWallet:!0})),d},k="0xef0100",O=async(e,t)=>{try{const n=F.createCustomRpcProvider(e),r=await n.getCode(t);if(r==="0x"||!r)return{delegated:!1,implementation:void 0,nonce:void 0};if(r.toLowerCase().startsWith(k)&&r.length===48){const s=`0x${r.slice(8)}`,o=await n.getTransactionCount(t);return{delegated:!0,implementation:u.utils.getAddress(s),nonce:o}}else throw Error("checkEOAWithDelegation: It is a contract")}catch(n){throw I.Logger.error("checkEOAWithDelegation error",{error:n}),n}},D=e=>{const{hinkalWalletAddress:t}=A.networkRegistry[e].contractData;if(!t||g.caseInsensitiveEqual(t,p.zeroAddress))throw Error("Hinkal Wallet Address is not set");return t},b=async(e,t)=>{if(e===A.chainIds.localhost||!t)return;const n=v.AccountActions.getSignerAddressFromPrivateKey(e,t),{delegated:r,implementation:s}=await O(e,n),o=D(e);if(!r||!g.caseInsensitiveEqual(s,o)){const i=await v.AccountActions.authorizeDelegation(e,t,o);return{v:i.signature.v.toString(),r:i.signature.r,s:i.signature.s,nonce:i.nonce.toString(),address:o,chainId:String(e)}}},P=e=>{if(!e)return;const{v:t,r:n,s:r,nonce:s,chainId:o,address:i}=e;return{signature:z.ethers.Signature.from({v:t,r:n,s:r}),nonce:BigInt(s),chainId:BigInt(o),address:i}};exports.checkEOAWithDelegation=O;exports.createApproveEmporiumOp=E;exports.createLifiBridgeOps=T;exports.createTransaferEmporiumOpsBatch=B;exports.createTransferToEmporiumOp=y;exports.emporiumOp=m;exports.encodeEmporiumMetadata=W;exports.generateFundAndApproveOps=C;exports.getAuthorizationDataIfNeeded=b;exports.recoverAuthorizationData=P;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("ethers"),p=require("../../constants/protocol.constants.cjs"),m=require("../../types/ethereum-network.types.cjs");require("idb-keyval");const v=require("../../constants/chains.constants.cjs"),I=require("../utils/create-provider.cjs");require("../../constants/token-data/index.cjs");require("../../error-handling/error-codes.constants.cjs");require("../utils/convertIntegrationProviderToExternalActionId.cjs");require("../../types/circom-data.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");require("circomlibjs-hinkal-fork");const y=require("../../data-structures/crypto-keys/keys.cjs");require("../../constants/server.constants.cjs");require("../../constants/vite.constants.cjs");require("../../data-structures/http/HttpClient.cjs");require("axios");const h=require("../utils/caseInsensitive.utils.cjs");require("../../API/getServerURL.cjs");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/save-depths.cjs");require("../../constants/reorg-depths.constants.cjs");require("../utils/mutexes.utils.cjs");require("@coral-xyz/anchor");const k=require("../../error-handling/logger.cjs");require("@solana/web3.js");require("@solana/spl-token");require("../../constants/contracts.constants.cjs");require("../../constants/kyc.constants.cjs");require("../../constants/coingecko.constants.cjs");require("../../constants/addresses.constants.cjs");require("../../constants/token.limits.constants.cjs");require("../../constants/presale.constants.cjs");require("../../constants/activity.constants.cjs");require("../../constants/tasks.constants.cjs");require("../../constants/events.constants.cjs");require("../utils/userAgent.cjs");const w=require("../utils/string.utils.cjs");require("multiformats");require("../../API/tenderly.api.cjs");const D=require("../utils/replaceAddressInCalldata.cjs"),W=require("ethers-v6h"),g=({contract:e,func:r,args:n,callDataString:t,invokeWallet:i,value:o})=>{let s=new Uint8Array,a=t?u.utils.arrayify(t):new Uint8Array;if(typeof e=="object"&&"address"in e){if(s=u.utils.arrayify(e.address),t?.length&&t?.length>0)throw Error("If function and args are providedm no calldata is needed");r&&n&&!t&&(a=u.utils.arrayify(e.interface.encodeFunctionData(r,n)))}else s=u.utils.arrayify(e);const c=u.utils.arrayify([i?1:0]),d=u.utils.zeroPad(u.utils.arrayify(u.BigNumber.from(o??0n)),16),l=u.utils.concat([s,c,d,a]);return u.utils.hexlify(l)},P=async(e,r,n,t,i,o)=>{const s=n?await y.UserKeys.signTypedDataFromPrivateKey(e,n,{name:"Emporium",version:"1.0.0",chainId:e,verifyingContract:r},{EmporiumSignature:[{name:"message",type:"uint256"}]},{message:i}):void 0,{v:a,r:c,s:d}=s?u.utils.splitSignature(s):{v:0,r:u.ethers.constants.HashZero,s:u.ethers.constants.HashZero};return u.utils.defaultAbiCoder.encode(["tuple(uint8 v,bytes32 r, bytes32 s, uint256 message, address signerAddress, bytes[] ops)"],[{v:a,r:c,s:d,message:i??0n,signerAddress:o??p.zeroAddress,ops:t}])},q=(e,r,n,t)=>g(e?{contract:e,func:"transfer",args:[r,n],invokeWallet:t}:{contract:r,value:n,invokeWallet:t}),T=(e,r,n,t)=>{const i=e.getContractWithFetcher(m.ContractType.HinkalContract);return r.map((o,s)=>{const a=h.caseInsensitiveEqual(o,p.zeroAddress)?void 0:e.getContractWithFetcher(m.ContractType.ERC20Contract,o);return q(a,t??i.address,n[s],!0)})},E=(e,r,n,t)=>g({contract:e,func:"approve",args:[r,n],invokeWallet:t}),F=(e,r,n)=>{const t=e.getSelectedNetwork()?.contractData.hinkalAddress;if(!t)throw Error("No Hinkal Address Provided to modifyDataForProxy");return w.replaceAllInstances(n,t.slice(2),r.slice(2))},z=(e,r,n)=>{if(!r)throw Error("No private key provided to modifyDataForProxy");const t=y.UserKeys.getSignerAddressFromPrivateKey(e.getCurrentChainId(),r);return F(e,t,n)},A=(e,r,n,t,i,o,s)=>{const a=[];for(let c=0;c<r.length;c+=1){const d=r[c],l=h.caseInsensitiveEqual(d,p.zeroAddress)?void 0:e.getContractWithFetcher(m.ContractType.ERC20Contract,d);a.push(q(l,o,n[c],!1))}if(s)for(let c=0;c<t.length;c+=1){const d=t[c];if(!h.caseInsensitiveEqual(d,p.zeroAddress)){const l=e.getContractWithFetcher(m.ContractType.ERC20Contract,d);a.push(E(l,s,i[c],!0))}}return a},B=(e,r,n,t,i,o,s,a,c,d)=>{const l=A(e,r,n,t,i,o,s);if(!!a&&!!c){const f=e.getContractWithFetcher(m.ContractType.HinkalContract);l.push(g({contract:a,callDataString:D.replaceAddressesInCalldata(c,f.address,o),value:d,invokeWallet:!0}))}return l},x=(e,r,n,t,i,o,s)=>{const a=[],c=[t],d=[i];s.nativeFee>0n&&!h.caseInsensitiveEqual(t,p.zeroAddress)&&(c.push(p.zeroAddress),d.push(s.nativeFee));const C=A(e,c,d,[t],[o],r,n);a.push(...C);let f=s.nativeFee;return h.caseInsensitiveEqual(t,p.zeroAddress)&&(f+=o),a.push(g({contract:n,callDataString:s.calldata,value:f>0n?f:void 0,invokeWallet:!0})),a},N="0xef0100",O=async(e,r)=>{try{const{fetchRpcUrl:n}=v.networkRegistry[e];if(!n)throw new Error("RPC URL not found for the specified chain ID");const t=I.createCustomRpcProvider(n),i=await t.getCode(r);if(i==="0x"||!i)return{delegated:!1,implementation:void 0,nonce:void 0};if(i.toLowerCase().startsWith(N)&&i.length===48){const o=`0x${i.slice(8)}`,s=await t.getTransactionCount(r);return{delegated:!0,implementation:u.utils.getAddress(o),nonce:s}}else throw Error("checkEOAWithDelegation: It is a contract")}catch(n){throw k.Logger.error("checkEOAWithDelegation error",{error:n}),n}},R=e=>{const{hinkalWalletAddress:r}=v.networkRegistry[e].contractData;if(!r||h.caseInsensitiveEqual(r,p.zeroAddress))throw Error("Hinkal Wallet Address is not set");return r},S=async(e,r)=>{if(e===v.chainIds.localhost||!r)return;const n=y.UserKeys.getSignerAddressFromPrivateKey(e,r),{delegated:t,implementation:i}=await O(e,n),o=R(e);if(!t||!h.caseInsensitiveEqual(i,o)){const s=await y.UserKeys.authorizeDelegation(e,r,o);return{v:s.signature.v.toString(),r:s.signature.r,s:s.signature.s,nonce:s.nonce.toString(),address:o,chainId:String(e)}}},U=e=>{if(!e)return;const{v:r,r:n,s:t,nonce:i,chainId:o,address:s}=e;return{signature:W.ethers.Signature.from({v:r,r:n,s:t}),nonce:BigInt(i),chainId:BigInt(o),address:s}};exports.checkEOAWithDelegation=O;exports.createApproveEmporiumOp=E;exports.createLifiBridgeOps=x;exports.createTransaferEmporiumOpsBatch=T;exports.createTransferToEmporiumOp=q;exports.emporiumOp=g;exports.encodeEmporiumMetadata=P;exports.generateFundAndApproveOps=A;exports.generateFundApproveAndTransactOps=B;exports.getAuthorizationDataIfNeeded=S;exports.modifyDataForProxy=F;exports.modifyDataForProxyWithPrivateKey=z;exports.recoverAuthorizationData=U;

package/functions/private-wallet/emporium.helpers.d.ts

@@ -13,10 +13,13 @@ export declare const emporiumOp: <ContractInstance extends Contract, ContractFun
 }) => string;
 export declare const encodeEmporiumMetadata: (chainId: number, emporiumAddress: string, privateKey: string | undefined, ops: string[], message?: bigint, signerAddress?: string) => Promise<string>;
 export declare const createTransferToEmporiumOp: (tokenContract: ethers.Contract | undefined, to: string, amount: bigint, invokeWallet: boolean) => string;
-export declare const createTransaferEmporiumOpsBatch: (hinkal: IHinkal, chainId: number, erc20TokenAddresses: string[], amounts: bigint[], to?: string) => string[];
+export declare const createTransaferEmporiumOpsBatch: (hinkal: IHinkal, erc20TokenAddresses: string[], amounts: bigint[], to?: string) => string[];
 export declare const createApproveEmporiumOp: (tokenContract: ethers.Contract, to: string, amount: bigint, invokeWallet: boolean) => string;
-export declare const generateFundAndApproveOps: (hinkal: IHinkal, chainId: number, erc20AddressesToFund: string[], fundAmounts: bigint[], approveTokenAddresses: string[], approveAmounts: bigint[], walletAddress: string, spenderAddress: string | undefined) => string[];
-export declare const createLifiBridgeOps: (hinkal: IHinkal, chainId: number, fromAddress: string, lifiRouterAddress: string, tokenAddress: string, fundAmount: bigint, bridgeAmount: bigint, quote: BridgeQuote) => string[];
+export declare const modifyDataForProxy: (hinkal: IHinkal, userAddress: string, data: string) => string;
+export declare const modifyDataForProxyWithPrivateKey: (hinkal: IHinkal, privateKey: string | undefined, data: string) => string;
+export declare const generateFundAndApproveOps: (hinkal: IHinkal, erc20AddressesToFund: string[], fundAmounts: bigint[], approveTokenAddresses: string[], approveAmounts: bigint[], walletAddress: string, spenderAddress: string | undefined) => string[];
+export declare const generateFundApproveAndTransactOps: (hinkal: IHinkal, erc20AddressesToFund: string[], fundAmounts: bigint[], approveTokenAddresses: string[], approveAmounts: bigint[], walletAddress: string, spenderAddress: string | undefined, to?: string, callDataString?: string, value?: bigint) => string[];
+export declare const createLifiBridgeOps: (hinkal: IHinkal, fromAddress: string, lifiRouterAddress: string, tokenAddress: string, fundAmount: bigint, bridgeAmount: bigint, quote: BridgeQuote) => string[];
 export declare const checkEOAWithDelegation: (chainId: number, eoaAddress: string) => Promise<{
     delegated: boolean;
     implementation: undefined;