@hinkal/common 0.2.21 → 0.2.23

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

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

@@ -1,22 +1,24 @@
-import { Contract, ContractTransaction, ethers } from 'ethers';
 import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
 import { type AuthorizationData } from '../../types/hinkal.types';
-import { ethers as ethersV6 } from 'ethers-v6h';
+import { ethers } from 'ethers';
 import { BridgeQuote } from '../../types/bridging-tx.types';
-export declare const emporiumOp: <ContractInstance extends Contract, ContractFunctions extends ContractInstance["functions"], ExactFunction extends { [K in keyof ContractFunctions]: ReturnType<ContractFunctions[K]> extends Promise<ContractTransaction> ? K : never; }[keyof ContractFunctions], FunctionArguments extends Parameters<ContractFunctions[ExactFunction]>>({ contract, func, args, callDataString, invokeWallet, value, }: {
-    contract: ContractInstance | string;
-    func?: ExactFunction | undefined;
-    args?: (FunctionArguments extends [] ? [] : FunctionArguments) | undefined;
+export declare const emporiumOp: ({ contract, func, args, callDataString, invokeWallet, value, }: {
+    contract: ethers.BaseContract | string;
+    func?: string | undefined;
+    args?: unknown[] | undefined;
     callDataString?: string | undefined;
     invokeWallet?: boolean | undefined;
     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 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;
@@ -27,4 +29,4 @@ export declare const checkEOAWithDelegation: (chainId: number, eoaAddress: strin
     nonce: number;
 }>;
 export declare const getAuthorizationDataIfNeeded: (chainId: number, privateKey: string | undefined) => Promise<AuthorizationData | undefined>;
-export declare const recoverAuthorizationData: (authorizationData: AuthorizationData | undefined) => ethersV6.Authorization | undefined;
+export declare const recoverAuthorizationData: (authorizationData: AuthorizationData | undefined) => ethers.Authorization | undefined;

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

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