@hinkal/common 0.2.26 → 0.2.28

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

@@ -1,17 +1,9 @@
 import { Utxo } from '../../data-structures/utxo/Utxo';
 import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
-export declare const outputApprovalDataProcessing: (hinkal: IHinkal, inputUtxos: Utxo[], amountChange: bigint, interactionToIgnore?: string, tokenId?: number) => {
+export declare const outputApprovalDataProcessing: (hinkal: IHinkal, chainId: number, 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,39 +1,24 @@
-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;
+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;
     }
-    if (n !== 0n)
-      throw new Error(v.INSUFFICIENT_FUNDS);
+    if (o !== 0n)
+      throw new Error(A.INSUFFICIENT_FUNDS);
   }
-  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 };
+  return { useApprovalUtxoData: u(t) ? void 0 : t };
 };
 export {
-  S as outputApprovalDataProcessing,
-  O as outputApprovalDataProcessingForHinkalApprove
+  w as outputApprovalDataProcessing
 };

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"),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;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const m=require("@solana/spl-token"),c=require("@solana/web3.js"),d=require("../../constants/protocol.constants.cjs"),A=require("../../data-structures/AccountActions/AccountActions.cjs"),B=require("../web3/getSolanaPriorityFee.cjs"),C=require("../utils/process.utils.cjs"),g=require("../../types/fee.types.cjs"),y=5e3,L=6e4,f=async(t,a,r="confirmed")=>await C.pollForValue(()=>t.getTransaction(a,{commitment:r,maxSupportedTransactionVersion:0}),{timeoutMs:L,intervalMs:y})??null,w=async(t,a,r,n)=>{try{const{blockhash:s}=await t.getLatestBlockhash(),e=[c.ComputeBudgetProgram.setComputeUnitLimit({units:d.MAX_COMPUTE_UNIT_LIMIT}),...r],o=new c.TransactionMessage({payerKey:a,recentBlockhash:s,instructions:e}).compileToV0Message(n),i=new c.VersionedTransaction(o),l=await t.simulateTransaction(i,{sigVerify:!1,replaceRecentBlockhash:!0}),{unitsConsumed:u}=l.value;if(!u)return d.MAX_COMPUTE_UNIT_LIMIT;const T=Math.ceil(u*(1+d.COMPUTE_UNIT_PADDING_PERCENTAGE));return Math.max(d.MIN_COMPUTE_UNIT_LIMIT,Math.min(T,d.MAX_COMPUTE_UNIT_LIMIT))}catch{return d.MAX_COMPUTE_UNIT_LIMIT}},O=(t,a,r,n)=>{const s=new Set;return a&&s.add(a.toBase58()),r?.forEach(e=>s.add(e.toBase58())),t.forEach(e=>{s.add(e.programId.toBase58()),e.keys.forEach(o=>{s.add(o.pubkey.toBase58())})}),n&&n.forEach(e=>{s.add(e.key.toBase58()),e.state.addresses.forEach(o=>{s.add(o.toBase58())})}),[...s].map(e=>new c.PublicKey(e))},p=t=>{if(!t)throw new Error("Failed to fetch Solana transaction details for signature");if(t.meta?.err){const a=JSON.stringify(t.meta.err);throw new Error(`Solana transaction failed on-chain: ${a}`)}},M=async(t,a,r,n,s)=>{const e=r.filter(h=>!h.programId.equals(c.ComputeBudgetProgram.programId)),o=await w(t,a,e,n),i=c.ComputeBudgetProgram.setComputeUnitLimit({units:o}),u=t.rpcEndpoint.includes("helius")?await B.getSolanaPriorityFee(O(e,a,[c.ComputeBudgetProgram.programId],n),s):0,T=c.ComputeBudgetProgram.setComputeUnitPrice({microLamports:u});return[i,T,...e]},P=async(t,a,r,n,s)=>{if(a.length===0)return"";for(let e=0;e<d.SOLANA_BLOCKHEIGHT_EXPIRED_RETRY_COUNT;e+=1){const o=e===d.SOLANA_BLOCKHEIGHT_EXPIRED_RETRY_COUNT-1;try{const i=await M(t,r.publicKey,a,s,o?g.SolanaPriorityFeeMode.HIGH:g.SolanaPriorityFeeMode.RECOMMENDED),{blockhash:l,lastValidBlockHeight:u}=await t.getLatestBlockhash(),T=new c.TransactionMessage({payerKey:r.publicKey,instructions:i,recentBlockhash:l}).compileToV0Message(s),h=new c.VersionedTransaction(T);h.sign(n);const E=await t.sendTransaction(h);await t.confirmTransaction({signature:E,blockhash:l,lastValidBlockHeight:u},"confirmed");const I=await f(t,E);return p(I),E}catch(i){if(i instanceof Error&&(i.name==="TransactionExpiredBlockheightExceededError"||i.message?.includes("block height exceeded"))&&!o)continue;throw i}}return""},N=async(t,a,r,n)=>{if(!r)return null;const s=await m.getAssociatedTokenAddress(r,n,!0,m.TOKEN_PROGRAM_ID,m.ASSOCIATED_TOKEN_PROGRAM_ID);if(!await t.getAccountInfo(s)){const o=m.createAssociatedTokenAccountInstruction(a.publicKey,s,n,r,m.TOKEN_PROGRAM_ID,m.ASSOCIATED_TOKEN_PROGRAM_ID);await P(t,[o],a,[a])}return s},R=async({connection:t,chainId:a,subAccount:r,payerPublicKey:n,instructions:s,lookupTableAccounts:e})=>{const o=A.AccountActions.getPrivateKeyFromSubAccount(a,r);if(!o)throw Error("Private key is not available");for(let i=0;i<d.SOLANA_BLOCKHEIGHT_EXPIRED_RETRY_COUNT;i+=1){const l=i===d.SOLANA_BLOCKHEIGHT_EXPIRED_RETRY_COUNT-1;try{const u=await M(t,n,s,e,l?g.SolanaPriorityFeeMode.HIGH:g.SolanaPriorityFeeMode.RECOMMENDED),{blockhash:T,lastValidBlockHeight:h}=await t.getLatestBlockhash(),E=new c.TransactionMessage({payerKey:n,recentBlockhash:T,instructions:u}).compileToV0Message(e),I=new c.VersionedTransaction(E),_=await A.AccountActions.sendAndSignSolanaTransactionFromPrivateKey(t,o,I,!0);await t.confirmTransaction({signature:_,blockhash:T,lastValidBlockHeight:h},"confirmed");const S=await f(t,_);return p(S),_}catch(u){if(u instanceof Error&&(u.name==="TransactionExpiredBlockheightExceededError"||u.message?.includes("block height exceeded"))&&!l)continue;throw u}}throw new Error("Failed to send proxy v0 transaction due to expired blockheight after all retries")},U=async(t,a,r,n)=>{const{blockhash:s}=await t.getLatestBlockhash(),e=await M(t,a,r,n),o=new c.TransactionMessage({payerKey:a,recentBlockhash:s,instructions:e}).compileToV0Message(n),i=new c.VersionedTransaction(o);return Buffer.from(i.serialize()).toString("base64")};exports.ensureAtaExists=N;exports.estimateComputeUnitLimit=w;exports.fetchSolanaTransaction=f;exports.getAccountsFromInstructions=O;exports.sendProxyV0Transaction=R;exports.sendV0Transaction=P;exports.serializeProxyV0Transaction=U;

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

@@ -1,7 +1,8 @@
-import { AddressLookupTableAccount, Connection, Keypair, PublicKey, TransactionInstruction } from '@solana/web3.js';
-import { RelayerTransaction } from '../../types/relayer.types';
+import { AddressLookupTableAccount, Connection, Finality, Keypair, PublicKey, TransactionInstruction, VersionedTransactionResponse } from '@solana/web3.js';
 import { SubAccount } from '../../types/proxy.types';
+export declare const fetchSolanaTransaction: (connection: Connection, signature: string, finality?: Finality) => Promise<VersionedTransactionResponse | null>;
 export declare const estimateComputeUnitLimit: (connection: Connection, payerKey: PublicKey, instructions: TransactionInstruction[], lookupTableAccounts?: AddressLookupTableAccount[]) => Promise<number>;
+export declare const getAccountsFromInstructions: (instructions: TransactionInstruction[], payerKey?: PublicKey, additionalAccounts?: PublicKey[], lookupTableAccounts?: AddressLookupTableAccount[]) => PublicKey[];
 export declare const sendV0Transaction: (connection: Connection, instructions: TransactionInstruction[], payer: Keypair, signers: Keypair[], lookupTableAccounts?: AddressLookupTableAccount[]) => Promise<string>;
 export declare const ensureAtaExists: (connection: Connection, payer: Keypair, mintPubkey: PublicKey | null, owner: PublicKey) => Promise<PublicKey | null>;
 type SendProxyV0TransactionParams = {
@@ -11,12 +12,7 @@ type SendProxyV0TransactionParams = {
     payerPublicKey: PublicKey;
     instructions: TransactionInstruction[];
     lookupTableAccounts?: AddressLookupTableAccount[];
-    convertParams: {
-        fromAddress: string;
-        toAddress: string;
-        programAddress: string;
-    };
 };
-export declare const sendProxyV0Transaction: ({ connection, chainId, subAccount, payerPublicKey, instructions, lookupTableAccounts, convertParams, }: SendProxyV0TransactionParams) => Promise<RelayerTransaction>;
+export declare const sendProxyV0Transaction: ({ connection, chainId, subAccount, payerPublicKey, instructions, lookupTableAccounts, }: SendProxyV0TransactionParams) => Promise<string>;
 export declare const serializeProxyV0Transaction: (connection: Connection, payerPublicKey: PublicKey, instructions: TransactionInstruction[], lookupTableAccounts?: AddressLookupTableAccount[]) => Promise<string>;
 export {};

package/functions/pre-transaction/sendV0Transaction.mjs

@@ -1,121 +1,185 @@
-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 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) => {
+import { getAssociatedTokenAddress as k, TOKEN_PROGRAM_ID as M, ASSOCIATED_TOKEN_PROGRAM_ID as _, createAssociatedTokenAccountInstruction as O } from "@solana/spl-token";
+import { ComputeBudgetProgram as u, TransactionMessage as T, VersionedTransaction as w, PublicKey as N } from "@solana/web3.js";
+import { MAX_COMPUTE_UNIT_LIMIT as f, COMPUTE_UNIT_PADDING_PERCENTAGE as x, MIN_COMPUTE_UNIT_LIMIT as C, SOLANA_BLOCKHEIGHT_EXPIRED_RETRY_COUNT as g } from "../../constants/protocol.constants.mjs";
+import { AccountActions as A } from "../../data-structures/AccountActions/AccountActions.mjs";
+import { getSolanaPriorityFee as V } from "../web3/getSolanaPriorityFee.mjs";
+import { pollForValue as P } from "../utils/process.utils.mjs";
+import { SolanaPriorityFeeMode as E } from "../../types/fee.types.mjs";
+const U = 5e3, R = 6e4, y = async (t, a, n = "confirmed") => await P(
+  () => t.getTransaction(a, {
+    commitment: n,
+    maxSupportedTransactionVersion: 0
+  }),
+  { timeoutMs: R, intervalMs: U }
+) ?? null, D = async (t, a, n, r) => {
   try {
-    const { blockhash: s } = await t.getLatestBlockhash(), o = [
-      d.setComputeUnitLimit({ units: l }),
+    const { blockhash: s } = await t.getLatestBlockhash(), e = [
+      u.setComputeUnitLimit({ units: f }),
       ...n
-    ], i = new h({
+    ], o = new T({
       payerKey: a,
       recentBlockhash: s,
-      instructions: o
-    }).compileToV0Message(e), r = new g(i), c = await t.simulateTransaction(r, {
+      instructions: e
+    }).compileToV0Message(r), i = new w(o), d = await t.simulateTransaction(i, {
       sigVerify: !1,
       replaceRecentBlockhash: !0
-    }), { unitsConsumed: m } = c.value;
-    if (!m)
-      return l;
-    const u = Math.ceil(m * (1 + B));
-    return Math.max(C, Math.min(u, l));
+    }), { unitsConsumed: c } = d.value;
+    if (!c)
+      return f;
+    const l = Math.ceil(c * (1 + x));
+    return Math.max(C, Math.min(l, f));
   } catch {
-    return l;
+    return f;
+  }
+}, H = (t, a, n, r) => {
+  const s = /* @__PURE__ */ new Set();
+  return a && s.add(a.toBase58()), n?.forEach((e) => s.add(e.toBase58())), t.forEach((e) => {
+    s.add(e.programId.toBase58()), e.keys.forEach((o) => {
+      s.add(o.pubkey.toBase58());
+    });
+  }), r && r.forEach((e) => {
+    s.add(e.key.toBase58()), e.state.addresses.forEach((o) => {
+      s.add(o.toBase58());
+    });
+  }), [...s].map((e) => new N(e));
+}, L = (t) => {
+  if (!t)
+    throw new Error("Failed to fetch Solana transaction details for signature");
+  if (t.meta?.err) {
+    const a = JSON.stringify(t.meta.err);
+    throw new Error(`Solana transaction failed on-chain: ${a}`);
   }
-}, f = async (t, a, n, e) => {
-  const s = n.filter(
-    (c) => !c.programId.equals(d.programId)
-  ), o = await P(
+}, B = async (t, a, n, r, s) => {
+  const e = n.filter(
+    (h) => !h.programId.equals(u.programId)
+  ), o = await D(
     t,
     a,
-    s,
-    e
-  ), i = d.setComputeUnitLimit({ units: o }), r = d.setComputeUnitPrice({
-    microLamports: L
+    e,
+    r
+  ), i = u.setComputeUnitLimit({ units: o }), c = t.rpcEndpoint.includes("helius") ? await V(
+    H(
+      e,
+      a,
+      [u.programId],
+      r
+    ),
+    s
+  ) : 0, l = u.setComputeUnitPrice({
+    microLamports: c
   });
-  return [i, r, ...s];
-}, R = async (t, a, n, e, s) => {
+  return [i, l, ...e];
+}, K = async (t, a, n, r, s) => {
   if (a.length === 0)
     return "";
-  const { blockhash: o, lastValidBlockHeight: i } = await t.getLatestBlockhash("confirmed"), r = await f(
-    t,
-    n.publicKey,
-    a,
-    s
-  ), c = new h({
-    payerKey: n.publicKey,
-    instructions: r,
-    recentBlockhash: o
-  }).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, a, n, e) => {
+  for (let e = 0; e < g; e += 1) {
+    const o = e === g - 1;
+    try {
+      const i = await B(
+        t,
+        n.publicKey,
+        a,
+        s,
+        o ? E.HIGH : E.RECOMMENDED
+      ), { blockhash: d, lastValidBlockHeight: c } = await t.getLatestBlockhash(), l = new T({
+        payerKey: n.publicKey,
+        instructions: i,
+        recentBlockhash: d
+      }).compileToV0Message(s), h = new w(l);
+      h.sign(r);
+      const m = await t.sendTransaction(h);
+      await t.confirmTransaction({ signature: m, blockhash: d, lastValidBlockHeight: c }, "confirmed");
+      const I = await y(t, m);
+      return L(I), m;
+    } catch (i) {
+      if (i instanceof Error && (i.name === "TransactionExpiredBlockheightExceededError" || i.message?.includes("block height exceeded")) && !o)
+        continue;
+      throw i;
+    }
+  }
+  return "";
+}, J = async (t, a, n, r) => {
   if (!n)
     return null;
-  const s = await V(n, e, !0, I, p);
+  const s = await k(n, r, !0, M, _);
   if (!await t.getAccountInfo(s)) {
-    const i = y(
+    const o = O(
       a.publicKey,
       s,
-      e,
+      r,
       n,
-      I,
-      p
+      M,
+      _
     );
-    await R(t, [i], a, [a]);
+    await K(t, [o], a, [a]);
   }
   return s;
-}, v = async ({
+}, Y = async ({
   connection: t,
   chainId: a,
   subAccount: n,
-  payerPublicKey: e,
+  payerPublicKey: r,
   instructions: s,
-  lookupTableAccounts: o,
-  convertParams: i
+  lookupTableAccounts: e
 }) => {
-  const { blockhash: r, lastValidBlockHeight: c } = await t.getLatestBlockhash(), m = await f(
-    t,
-    e,
-    s,
-    o
-  ), u = new h({
-    payerKey: e,
-    recentBlockhash: r,
-    instructions: m
-  }).compileToV0Message(o), w = new g(u), T = await E.sendAndSignTransactionFromPrivateKey(a, n.privateKey, w);
-  await t.confirmTransaction(
-    {
-      signature: T,
-      blockhash: r,
-      lastValidBlockHeight: c
-    },
-    "confirmed"
-  );
-  const M = await t.getTransaction(T, {
-    commitment: "confirmed",
-    maxSupportedTransactionVersion: 0
-  }), { 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(
+  const o = A.getPrivateKeyFromSubAccount(a, n);
+  if (!o)
+    throw Error("Private key is not available");
+  for (let i = 0; i < g; i += 1) {
+    const d = i === g - 1;
+    try {
+      const c = await B(
+        t,
+        r,
+        s,
+        e,
+        d ? E.HIGH : E.RECOMMENDED
+      ), { blockhash: l, lastValidBlockHeight: h } = await t.getLatestBlockhash(), m = new T({
+        payerKey: r,
+        recentBlockhash: l,
+        instructions: c
+      }).compileToV0Message(e), I = new w(m), p = await A.sendAndSignSolanaTransactionFromPrivateKey(
+        t,
+        o,
+        I,
+        !0
+      );
+      await t.confirmTransaction(
+        {
+          signature: p,
+          blockhash: l,
+          lastValidBlockHeight: h
+        },
+        "confirmed"
+      );
+      const S = await y(t, p);
+      return L(S), p;
+    } catch (c) {
+      if (c instanceof Error && (c.name === "TransactionExpiredBlockheightExceededError" || c.message?.includes("block height exceeded")) && !d)
+        continue;
+      throw c;
+    }
+  }
+  throw new Error("Failed to send proxy v0 transaction due to expired blockheight after all retries");
+}, $ = async (t, a, n, r) => {
+  const { blockhash: s } = await t.getLatestBlockhash(), e = await B(
     t,
     a,
     n,
-    e
-  ), i = new h({
+    r
+  ), o = new T({
     payerKey: a,
     recentBlockhash: s,
-    instructions: o
-  }).compileToV0Message(e), r = new g(i);
-  return Buffer.from(r.serialize()).toString("base64");
+    instructions: e
+  }).compileToV0Message(r), i = new w(o);
+  return Buffer.from(i.serialize()).toString("base64");
 };
 export {
-  D as ensureAtaExists,
-  P as estimateComputeUnitLimit,
-  v as sendProxyV0Transaction,
-  R as sendV0Transaction,
-  G as serializeProxyV0Transaction
+  J as ensureAtaExists,
+  D as estimateComputeUnitLimit,
+  y as fetchSolanaTransaction,
+  H as getAccountsFromInstructions,
+  Y as sendProxyV0Transaction,
+  K as sendV0Transaction,
+  $ as serializeProxyV0Transaction
 };

package/functions/pre-transaction/shouldPatchAccessTokenMerkleTree.cjs

@@ -1 +1 @@
-"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;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const n=async(e,c,r,t,k)=>{const[s,o]=await Promise.all([e.checkTokenRegistry(c,r,t),e.checkAccessToken(c,k)]);return{patchAccessTokenMerkleTree:s&&!o,hasAccessToken:o,kycRequired:s}};exports.shouldPatchAccessTokenMerkleTree=n;

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

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

package/functions/pre-transaction/shouldPatchAccessTokenMerkleTree.mjs

@@ -1,7 +1,10 @@
-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 };
+const n = async (e, c, r, k, t) => {
+  const [s, o] = await Promise.all([
+    e.checkTokenRegistry(c, r, k),
+    e.checkAccessToken(c, t)
+  ]);
+  return { patchAccessTokenMerkleTree: s && !o, hasAccessToken: o, kycRequired: s };
 };
 export {
-  k as shouldPatchAccessTokenMerkleTree
+  n as shouldPatchAccessTokenMerkleTree
 };

package/functions/pre-transaction/store-instructions.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("./sendV0Transaction.cjs"),i=require("./solana.cjs"),a=async(o,n,t,s,c,e)=>{const r=await n.methods.storeInstructions(Number(c),e).accounts({signer:t.publicKey,originalDeployer:s}).instruction();return await u.sendV0Transaction(o,[r],t,[t]),i.getInstructionsAccountPublicKey(n.programId,s,t.publicKey,c)};exports.storeInstructions=a;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("./sendV0Transaction.cjs"),a=require("./solana.cjs"),b=async(u,n,t,s,c,e)=>{const o=a.getInstructionsAccountPublicKey(n.programId,s,t.publicKey,c),r=await n.methods.storeInstructions(Number(c),e).accounts({signer:t.publicKey,originalDeployer:s,instructionsAccount:o}).instruction();return await i.sendV0Transaction(u,[r],t,[t]),o};exports.storeInstructions=b;

package/functions/pre-transaction/store-instructions.mjs

@@ -1,9 +1,14 @@
-import { sendV0Transaction as i } from "./sendV0Transaction.mjs";
-import { getInstructionsAccountPublicKey as e } from "./solana.mjs";
-const p = async (s, c, t, o, n, r) => {
-  const u = await c.methods.storeInstructions(Number(n), r).accounts({ signer: t.publicKey, originalDeployer: o }).instruction();
-  return await i(s, [u], t, [t]), e(c.programId, o, t.publicKey, n);
+import { sendV0Transaction as e } from "./sendV0Transaction.mjs";
+import { getInstructionsAccountPublicKey as a } from "./solana.mjs";
+const b = async (u, c, t, n, o, r) => {
+  const s = a(
+    c.programId,
+    n,
+    t.publicKey,
+    o
+  ), i = await c.methods.storeInstructions(Number(o), r).accounts({ signer: t.publicKey, originalDeployer: n, instructionsAccount: s }).instruction();
+  return await e(u, [i], t, [t]), s;
 };
 export {
-  p as storeInstructions
+  b as storeInstructions
 };

package/functions/pre-transaction/waitForDepositedUtxosInMerkleTree.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const w=require("../utils/time.utils.cjs"),T=60,I=(n,r)=>{if(!n.length)return!0;const e=new Set(r.map(t=>t.toString()));return n.every(({utxo:t})=>{const o=BigInt(t.getCommitment());return e.has(o.toString())})},f=(n,r,e=20)=>{const t=n.merkleTreeHinkalByChain[r],o=t.getStartIndex(),{count:c}=t.toJSON(),i=BigInt(c);if(i===0n)return[];const g=t.getMerkleData(),l=[],m=i<BigInt(e)?i:BigInt(e);for(let s=0n;s<m;s+=1n){const u=o+i-1n-s,a=g.get(u);a&&a!==0n&&l.push(a)}return l},k=async(n,r,e)=>{if(e.length){for(let t=0;t<T;t+=1){const o=f(n,r);if(I(e,o))return;await w.waitLittle()}throw new Error("Timeout while waiting for deposited UTXOs to appear in Merkle tree.")}};exports.waitForDepositedUtxosInMerkleTree=k;

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

@@ -0,0 +1,3 @@
+import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
+import { RecipientUtxo } from '../../types';
+export declare const waitForDepositedUtxosInMerkleTree: (hinkal: IHinkal, chainId: number, userDepositedUtxos: RecipientUtxo[]) => Promise<void>;

package/functions/pre-transaction/waitForDepositedUtxosInMerkleTree.mjs

@@ -0,0 +1,33 @@
+import { waitLittle as w } from "../utils/time.utils.mjs";
+const f = 60, I = (n, r) => {
+  if (!n.length)
+    return !0;
+  const e = new Set(r.map((t) => t.toString()));
+  return n.every(({ utxo: t }) => {
+    const o = BigInt(t.getCommitment());
+    return e.has(o.toString());
+  });
+}, T = (n, r, e = 20) => {
+  const t = n.merkleTreeHinkalByChain[r], o = t.getStartIndex(), { count: c } = t.toJSON(), s = BigInt(c);
+  if (s === 0n)
+    return [];
+  const m = t.getMerkleData(), l = [], g = s < BigInt(e) ? s : BigInt(e);
+  for (let i = 0n; i < g; i += 1n) {
+    const u = o + s - 1n - i, a = m.get(u);
+    a && a !== 0n && l.push(a);
+  }
+  return l;
+}, p = async (n, r, e) => {
+  if (e.length) {
+    for (let t = 0; t < f; t += 1) {
+      const o = T(n, r);
+      if (I(e, o))
+        return;
+      await w();
+    }
+    throw new Error("Timeout while waiting for deposited UTXOs to appear in Merkle tree.");
+  }
+};
+export {
+  p as waitForDepositedUtxosInMerkleTree
+};

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

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

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

@@ -1,6 +1,6 @@
+import { ethers } from 'ethers';
 import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
 import { type AuthorizationData } from '../../types/hinkal.types';
-import { ethers } from 'ethers';
 import { BridgeQuote } from '../../types/bridging-tx.types';
 export declare const emporiumOp: ({ contract, func, args, callDataString, invokeWallet, value, }: {
     contract: ethers.BaseContract | string;
@@ -11,14 +11,19 @@ export declare const emporiumOp: ({ contract, func, args, callDataString, invoke
     value?: bigint | undefined;
 }) => string;
 export declare const encodeEmporiumMetadata: (chainId: number, emporiumAddress: string, privateKey: string | undefined, ops: string[], message?: bigint, signerAddress?: string) => Promise<string>;
+export declare const decodeEmporiumMetadata: (metadata: string) => {
+    v: number;
+    r: string;
+    s: string;
+    message: bigint;
+    signerAddress: string;
+    ops: string[];
+};
 export declare const createTransferToEmporiumOp: (tokenContract: ethers.Contract | undefined, to: string, amount: bigint, invokeWallet: boolean) => string;
-export declare const createTransaferEmporiumOpsBatch: (hinkal: IHinkal, erc20TokenAddresses: string[], amounts: bigint[], to?: string) => string[];
+export declare const createTransaferEmporiumOpsBatch: (hinkal: IHinkal, chainId: number, erc20TokenAddresses: string[], amounts: bigint[], to?: string) => string[];
 export declare const createApproveEmporiumOp: (tokenContract: ethers.Contract, to: string, amount: bigint, invokeWallet: boolean) => 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 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 checkEOAWithDelegation: (chainId: number, eoaAddress: string) => Promise<{
     delegated: boolean;
     implementation: undefined;