@hinkal/common 0.2.22 → 0.2.24

package/functions/pre-transaction/interaction-to-action.mjs

@@ -1,11 +1,10 @@
 import "../../types/circom-data.types.mjs";
 import { ExternalActionId as r } from "../../types/external-action.types.mjs";
 import { INTERACTION as t } from "../../types/hinkal.types.mjs";
-import "../../types/transactions.types.mjs";
 import "../../types/activities.types.mjs";
-const s = (o) => o === r.Transact ? t.WITHDRAW : [r.Uniswap, r.Odos, r.OneInch].includes(
+const p = (o) => o === r.Transact ? t.WITHDRAW : [r.Uniswap, r.Odos, r.OneInch].includes(
   o
 ) ? t.SWAP : o === r.Emporium ? t.EMPORIUM : t.NONE;
 export {
-  s as getInteractionFromAction
+  p as getInteractionFromAction
 };

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"),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;
+"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,12 +1,11 @@
-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;
@@ -30,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,14 +1,14 @@
-import { utils as p, BigNumber as w, ethers as C } from "ethers";
 import { zeroAddress as u } from "../../constants/protocol.constants.mjs";
-import { ContractType as h } from "../../types/ethereum-network.types.mjs";
+import { ContractType as g } from "../../types/ethereum-network.types.mjs";
 import "idb-keyval";
-import { networkRegistry as A, chainIds as W } from "../../constants/chains.constants.mjs";
-import { createCustomRpcProvider as k } 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 { UserKeys as y } from "../../data-structures/crypto-keys/keys.mjs";
@@ -16,7 +16,7 @@ import "../../constants/server.constants.mjs";
 import "../../constants/vite.constants.mjs";
 import "../../data-structures/http/HttpClient.mjs";
 import "axios";
-import { caseInsensitiveEqual as f } from "../utils/caseInsensitive.utils.mjs";
+import { caseInsensitiveEqual as l } from "../utils/caseInsensitive.utils.mjs";
 import "../../API/getServerURL.mjs";
 import "libsodium-wrappers";
 import "process";
@@ -25,7 +25,7 @@ import "../../constants/save-depths.mjs";
 import "../../constants/reorg-depths.constants.mjs";
 import "../utils/mutexes.utils.mjs";
 import "@coral-xyz/anchor";
-import { Logger as D } from "../../error-handling/logger.mjs";
+import { Logger as k } from "../../error-handling/logger.mjs";
 import "@solana/web3.js";
 import "@solana/spl-token";
 import "../../constants/contracts.constants.mjs";
@@ -38,161 +38,160 @@ import "../../constants/activity.constants.mjs";
 import "../../constants/tasks.constants.mjs";
 import "../../constants/events.constants.mjs";
 import "../utils/userAgent.mjs";
-import { replaceAllInstances as O } from "../utils/string.utils.mjs";
+import { replaceAllInstances as B } from "../utils/string.utils.mjs";
 import "multiformats";
 import "../../API/tenderly.api.mjs";
-import { replaceAddressesInCalldata as P } from "../utils/replaceAddressInCalldata.mjs";
-import { ethers as I } from "ethers-v6h";
-const g = ({
+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 c = p.arrayify([i ? 1 : 0]), m = p.zeroPad(p.arrayify(w.from(a ?? 0n)), 16), d = p.concat([n, c, m, s]);
+    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);
-}, Dt = async (t, r, o, e, i, a) => {
+}, 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: c, s: m } = 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: c,
+        v: c,
+        r: s,
         s: m,
         message: i ?? 0n,
         signerAddress: a ?? u,
-        ops: e
+        ops: r
       }
     ]
   );
-}, E = (t, r, o, e) => g(t ? {
+}, E = (t, e, o, r) => h(t ? {
   contract: t,
   func: "transfer",
-  args: [r, o],
-  invokeWallet: e
-} : { contract: r, value: o, invokeWallet: e }), Ot = (t, r, o, e) => {
-  const i = t.getContractWithFetcher(h.HinkalContract);
-  return r.map((a, n) => {
-    const s = f(a, u) ? void 0 : t.getContractWithFetcher(h.ERC20Contract, a);
-    return E(s, e ?? i.address, o[n], !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);
   });
-}, B = (t, r, o, e) => g({
+}, O = (t, e, o, r) => h({
   contract: t,
   func: "approve",
-  args: [r, o],
-  invokeWallet: e
-}), x = (t, r, o) => {
-  const e = t.getSelectedNetwork()?.contractData.hinkalAddress;
-  if (!e)
-    throw Error("No Hinkal Address Provided to modifyDataForProxy");
-  return O(o, e.slice(2), r.slice(2));
-}, Pt = (t, r, o) => {
+  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 e = y.getSignerAddressFromPrivateKey(t.getCurrentChainId(), r);
-  return x(t, e, o);
-}, F = (t, r, o, e, i, a, n) => {
-  const s = [];
-  for (let c = 0; c < r.length; c += 1) {
-    const m = r[c], d = f(m, u) ? void 0 : t.getContractWithFetcher(h.ERC20Contract, m);
-    s.push(E(d, a, o[c], !1));
+  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 (n)
-    for (let c = 0; c < e.length; c += 1) {
-      const m = e[c];
-      if (!f(m, u)) {
-        const d = t.getContractWithFetcher(h.ERC20Contract, m);
-        s.push(B(d, n, i[c], !0));
+    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 s;
-}, It = (t, r, o, e, i, a, n, s, c, m) => {
+  return c;
+}, Bt = (t, e, o, r, i, a, n, c, s, m) => {
   const d = F(
     t,
-    r,
-    o,
     e,
+    o,
+    r,
     i,
     a,
     n
   );
-  if (!!s && !!c) {
-    const l = t.getContractWithFetcher(h.HinkalContract);
+  if (!!c && !!s) {
+    const f = t.getContractWithFetcher(g.HinkalContract);
     d.push(
-      g({
-        contract: s,
-        callDataString: P(c, l.address, a),
+      h({
+        contract: c,
+        callDataString: D(s, v(f), a),
         value: m,
         invokeWallet: !0
       })
     );
   }
   return d;
-}, Bt = (t, r, o, e, i, a, n) => {
-  const s = [], c = [e], m = [i];
-  n.nativeFee > 0n && !f(e, u) && (c.push(u), m.push(n.nativeFee));
-  const v = F(
+}, 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,
-    c,
+    s,
     m,
-    [e],
+    [r],
     [a],
-    r,
+    e,
     o
   );
-  s.push(...v);
-  let l = n.nativeFee;
-  return f(e, u) && (l += a), s.push(
-    g({
+  c.push(...C);
+  let f = n.nativeFee;
+  return l(r, u) && (f += a), c.push(
+    h({
       contract: o,
       callDataString: n.calldata,
-      value: l > 0n ? l : void 0,
+      value: f > 0n ? f : void 0,
       invokeWallet: !0
     })
-  ), s;
-}, T = "0xef0100", H = async (t, r) => {
+  ), c;
+}, I = "0xef0100", x = async (t, e) => {
   try {
     const { fetchRpcUrl: o } = A[t];
     if (!o)
       throw new Error("RPC URL not found for the specified chain ID");
-    const e = k(o), i = await e.getCode(r);
+    const r = W(o), i = await r.getCode(e);
     if (i === "0x" || !i)
       return { delegated: !1, implementation: void 0, nonce: void 0 };
-    if (i.toLowerCase().startsWith(T) && i.length === 48) {
-      const a = `0x${i.slice(8)}`, n = await e.getTransactionCount(r);
+    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 D.error("checkEOAWithDelegation error", { error: o }), o;
+    throw k.error("checkEOAWithDelegation error", { error: o }), o;
   }
-}, N = (t) => {
-  const { hinkalWalletAddress: r } = A[t].contractData;
-  if (!r || f(r, u))
+}, H = (t) => {
+  const { hinkalWalletAddress: e } = A[t].contractData;
+  if (!e || l(e, u))
     throw Error("Hinkal Wallet Address is not set");
-  return r;
-}, xt = async (t, r) => {
-  if (t === W.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 H(t, o), a = N(t);
-  if (!e || !f(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,
@@ -202,24 +201,24 @@ const g = ({
       chainId: String(t)
     };
   }
-}, Tt = (t) => {
+}, Pt = (t) => {
   if (!t)
     return;
-  const { v: r, r: o, s: e, nonce: i, chainId: a, address: n } = t;
-  return { signature: I.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 {
-  H as checkEOAWithDelegation,
-  B as createApproveEmporiumOp,
-  Bt as createLifiBridgeOps,
-  Ot as createTransaferEmporiumOpsBatch,
+  x as checkEOAWithDelegation,
+  O as createApproveEmporiumOp,
+  Dt as createLifiBridgeOps,
+  Wt as createTransaferEmporiumOpsBatch,
   E as createTransferToEmporiumOp,
-  g as emporiumOp,
-  Dt as encodeEmporiumMetadata,
+  h as emporiumOp,
+  wt as encodeEmporiumMetadata,
   F as generateFundAndApproveOps,
-  It as generateFundApproveAndTransactOps,
-  xt as getAuthorizationDataIfNeeded,
-  x as modifyDataForProxy,
-  Pt as modifyDataForProxyWithPrivateKey,
-  Tt as recoverAuthorizationData
+  Bt as generateFundApproveAndTransactOps,
+  Ot as getAuthorizationDataIfNeeded,
+  P as modifyDataForProxy,
+  kt as modifyDataForProxyWithPrivateKey,
+  Pt as recoverAuthorizationData
 };

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

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const R=require("ethers"),E=require("./emporium.helpers.cjs"),l=require("../../constants/addresses.constants.cjs"),I=require("../../types/external-action.types.cjs"),h=require("../../types/ethereum-network.types.cjs"),P=require("../pre-transaction/getExternalSwapAddress.cjs"),x=require("../utils/string.utils.cjs"),C=require("../../constants/protocol.constants.cjs");require("../../constants/token-data/index.cjs");const U=require("../utils/caseInsensitive.utils.cjs"),A=require("../../error-handling/logger.cjs"),L=require("../../constants/token-data/ERC20Registry.cjs"),B=(e,n,c,a,t,i,o=!1)=>{const r=R.BigNumber.from(i).toBigInt(),m={tokenIn:n,tokenOut:a,fee:r,recipient:t,amountIn:c,amountOutMinimum:0,sqrtPriceLimitX96:0},f=["function exactInputSingle(tuple(address tokenIn,address tokenOut,uint24 fee,address recipient,uint256 amountIn,uint256 amountOutMinimum,uint160 sqrtPriceLimitX96)) external payable returns (uint256 amountOut)"],g=new R.ethers.Contract(e,f);return E.emporiumOp({contract:g,func:"exactInputSingle",args:[m],invokeWallet:o})},F=(e,n,c,a,t,i,o=!1)=>{const r=P.getExternalSwapAddress(e,n),m=x.replaceAllInstances(a,r.slice(2),t.slice(2));return E.emporiumOp({contract:c,callDataString:m,value:i,invokeWallet:o})},v=(e,n)=>{const a=L.getERC20Registry(n).find(t=>t.symbol==="USDT");return a?U.caseInsensitiveEqual(e,a.erc20TokenAddress):!1},b=async(e,n,c,a,t,i)=>{const o=c.address;if(v(o,e.getCurrentChainId()))try{(await c.allowance(a,t)).toBigInt()>0n&&n.push(E.createApproveEmporiumOp(c,t,0n,i))}catch(r){A.Logger.error("Error in nullifyUsdtApprovalIfNeeded",r)}},d=async(e,n,c,a,t,i,o)=>{if(n!==C.zeroAddress){const r=l.SWAP_FEE_TAKER_ADDRESSES[e.getCurrentChainId()],m=e.getContractWithFetcher(h.ContractType.ERC20Contract,n),f=await m.balanceOf(c);await b(e,t,m,c,r,i),t.push(E.createApproveEmporiumOp(m,r,2n**256n-1n,i));const g=["function takeSwapFee(address token, uint256 beforeBalance, uint256 variableRate, address relay) external payable"],s=new R.ethers.Contract(r,g),w=a;t.push(E.emporiumOp({contract:s,func:"takeSwapFee",args:[n,f,C.HINKAL_SWAP_VARIABLE_RATE,w],invokeWallet:i}))}else{const r=a;t.push(E.emporiumOp({contract:r,value:o*C.HINKAL_SWAP_VARIABLE_RATE/10000n,invokeWallet:i}))}},z=async(e,n,c,a,t,i,o,r,m,f,g,s=!1)=>{const w=i<0n?-1n*i:i,q=e.getCurrentChainId(),u=[],O=l.NATIVE_TOKEN_WRAPPER_ADDRESSES[q];let D=!1,S;if(n===I.ExternalActionId.OneInch||n===I.ExternalActionId.Lifi){if(t!==C.zeroAddress){const _=e.getContractWithFetcher(h.ContractType.ERC20Contract,t);u.push(E.createApproveEmporiumOp(_,c,w,s))}let p=0n;t===C.zeroAddress&&(p+=w),o&&r===C.zeroAddress&&o<0n&&(p+=-1n*o);const y=p>0n?p:void 0;return S=F(e,n,c,a,f,y,s),u.push(S),(n===I.ExternalActionId.OneInch||m&&n===I.ExternalActionId.Lifi)&&r&&o!==void 0&&await d(e,r,f,g,u,s,o),u}if(!r||!o)throw Error("There should be output token for UniSwap and Odos");if(t===C.zeroAddress){const p=e.getContractWithFetcher(h.ContractType.ERC20Contract,O);u.push(E.emporiumOp({contract:p,func:"deposit",value:w,invokeWallet:s})),t=O}let T=0n;if(r===C.zeroAddress&&(r=O,D=!0,T=await e.getContractWithFetcher(h.ContractType.ERC20Contract,O).balanceOf(f)),t!==C.zeroAddress){const p=e.getContractWithFetcher(h.ContractType.ERC20Contract,t);await b(e,u,p,f,c,s),u.push(E.createApproveEmporiumOp(p,c,w,s))}if(n===I.ExternalActionId.Uniswap?S=B(c,t,w,r,f,a,s):S=F(e,n,c,a,f,void 0,s),u.push(S),await d(e,r,f,g,u,s,o),D){const p=l.WRAPPER_TOKEN_EXCHANGE_ADDRESSES[q],y=e.getContractWithFetcher(h.ContractType.ERC20Contract,O);u.push(E.createApproveEmporiumOp(y,p,2n**256n-1n,s));const _=["function withdrawBalanceDifference(uint256 beforeBalance) external"],N=new R.ethers.Contract(p,_);u.push(E.emporiumOp({contract:N,func:"withdrawBalanceDifference",args:[T],invokeWallet:s}))}return u};exports.createSwapToEmporiumOpForUniswap=B;exports.createSwapToEmporiumOpFromData=F;exports.createSwapToEmporiumOps=z;exports.nullifyUsdtApprovalIfNeeded=b;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const F=require("ethers"),E=require("./emporium.helpers.cjs"),_=require("../../constants/addresses.constants.cjs"),I=require("../../types/external-action.types.cjs"),h=require("../../types/ethereum-network.types.cjs"),x=require("../pre-transaction/getExternalSwapAddress.cjs"),B=require("../utils/string.utils.cjs"),C=require("../../constants/protocol.constants.cjs");require("../../constants/token-data/index.cjs");const N=require("../utils/caseInsensitive.utils.cjs"),U=require("../../error-handling/logger.cjs"),L=require("../utils/getContractAddress.cjs"),v=require("../../constants/token-data/ERC20Registry.cjs"),A=(e,n,c,a,t,s,o=!1)=>{const r=BigInt(s),m={tokenIn:n,tokenOut:a,fee:r,recipient:t,amountIn:c,amountOutMinimum:0,sqrtPriceLimitX96:0},f=["function exactInputSingle(tuple(address tokenIn,address tokenOut,uint24 fee,address recipient,uint256 amountIn,uint256 amountOutMinimum,uint160 sqrtPriceLimitX96)) external payable returns (uint256 amountOut)"],g=new F.ethers.Contract(e,f);return E.emporiumOp({contract:g,func:"exactInputSingle",args:[m],invokeWallet:o})},l=(e,n,c,a,t,s,o=!1)=>{const r=x.getExternalSwapAddress(e,n),m=B.replaceAllInstances(a,r.slice(2),t.slice(2));return E.emporiumOp({contract:c,callDataString:m,value:s,invokeWallet:o})},z=(e,n)=>{const a=v.getERC20Registry(n).find(t=>t.symbol==="USDT");return a?N.caseInsensitiveEqual(e,a.erc20TokenAddress):!1},q=async(e,n,c,a,t,s)=>{const o=L.getContractAddress(c);if(z(o,e.getCurrentChainId()))try{await c.allowance(a,t)>0n&&n.push(E.createApproveEmporiumOp(c,t,0n,s))}catch(r){U.Logger.error("Error in nullifyUsdtApprovalIfNeeded",r)}},T=async(e,n,c,a,t,s,o)=>{if(n!==C.zeroAddress){const r=_.SWAP_FEE_TAKER_ADDRESSES[e.getCurrentChainId()],m=e.getContractWithFetcher(h.ContractType.ERC20Contract,n),f=await m.balanceOf(c);await q(e,t,m,c,r,s),t.push(E.createApproveEmporiumOp(m,r,2n**256n-1n,s));const g=["function takeSwapFee(address token, uint256 beforeBalance, uint256 variableRate, address relay) external payable"],i=new F.ethers.Contract(r,g),w=a;t.push(E.emporiumOp({contract:i,func:"takeSwapFee",args:[n,f,C.HINKAL_SWAP_VARIABLE_RATE,w],invokeWallet:s}))}else{const r=a;t.push(E.emporiumOp({contract:r,value:o*C.HINKAL_SWAP_VARIABLE_RATE/10000n,invokeWallet:s}))}},K=async(e,n,c,a,t,s,o,r,m,f,g,i=!1)=>{const w=s<0n?-1n*s:s,b=e.getCurrentChainId(),u=[],O=_.NATIVE_TOKEN_WRAPPER_ADDRESSES[b];let d=!1,S;if(n===I.ExternalActionId.OneInch||n===I.ExternalActionId.Lifi){if(t!==C.zeroAddress){const y=e.getContractWithFetcher(h.ContractType.ERC20Contract,t);u.push(E.createApproveEmporiumOp(y,c,w,i))}let p=0n;t===C.zeroAddress&&(p+=w),o&&r===C.zeroAddress&&o<0n&&(p+=-1n*o);const R=p>0n?p:void 0;return S=l(e,n,c,a,f,R,i),u.push(S),(n===I.ExternalActionId.OneInch||m&&n===I.ExternalActionId.Lifi)&&r&&o!==void 0&&await T(e,r,f,g,u,i,o),u}if(!r||!o)throw Error("There should be output token for UniSwap and Odos");if(t===C.zeroAddress){const p=e.getContractWithFetcher(h.ContractType.ERC20Contract,O);u.push(E.emporiumOp({contract:p,func:"deposit",value:w,invokeWallet:i})),t=O}let D=0n;if(r===C.zeroAddress&&(r=O,d=!0,D=await e.getContractWithFetcher(h.ContractType.ERC20Contract,O).balanceOf(f)),t!==C.zeroAddress){const p=e.getContractWithFetcher(h.ContractType.ERC20Contract,t);await q(e,u,p,f,c,i),u.push(E.createApproveEmporiumOp(p,c,w,i))}if(n===I.ExternalActionId.Uniswap?S=A(c,t,w,r,f,a,i):S=l(e,n,c,a,f,void 0,i),u.push(S),await T(e,r,f,g,u,i,o),d){const p=_.WRAPPER_TOKEN_EXCHANGE_ADDRESSES[b],R=e.getContractWithFetcher(h.ContractType.ERC20Contract,O);u.push(E.createApproveEmporiumOp(R,p,2n**256n-1n,i));const y=["function withdrawBalanceDifference(uint256 beforeBalance) external"],P=new F.ethers.Contract(p,y);u.push(E.emporiumOp({contract:P,func:"withdrawBalanceDifference",args:[D],invokeWallet:i}))}return u};exports.createSwapToEmporiumOpForUniswap=A;exports.createSwapToEmporiumOpFromData=l;exports.createSwapToEmporiumOps=K;exports.nullifyUsdtApprovalIfNeeded=q;

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

@@ -1,22 +1,23 @@
-import { BigNumber as K, ethers as D } from "ethers";
+import { ethers as D } from "ethers";
 import { emporiumOp as u, createApproveEmporiumOp as I } from "./emporium.helpers.mjs";
-import { NATIVE_TOKEN_WRAPPER_ADDRESSES as T, WRAPPER_TOKEN_EXCHANGE_ADDRESSES as q, SWAP_FEE_TAKER_ADDRESSES as V } from "../../constants/addresses.constants.mjs";
+import { NATIVE_TOKEN_WRAPPER_ADDRESSES as K, WRAPPER_TOKEN_EXCHANGE_ADDRESSES as T, SWAP_FEE_TAKER_ADDRESSES as q } from "../../constants/addresses.constants.mjs";
 import { ExternalActionId as O } from "../../types/external-action.types.mjs";
 import { ContractType as g } from "../../types/ethereum-network.types.mjs";
-import { getExternalSwapAddress as X } from "../pre-transaction/getExternalSwapAddress.mjs";
-import { replaceAllInstances as H } from "../utils/string.utils.mjs";
+import { getExternalSwapAddress as V } from "../pre-transaction/getExternalSwapAddress.mjs";
+import { replaceAllInstances as X } from "../utils/string.utils.mjs";
 import { zeroAddress as w, HINKAL_SWAP_VARIABLE_RATE as P } from "../../constants/protocol.constants.mjs";
 import "../../constants/token-data/index.mjs";
-import { caseInsensitiveEqual as M } from "../utils/caseInsensitive.utils.mjs";
-import { Logger as l } from "../../error-handling/logger.mjs";
+import { caseInsensitiveEqual as H } from "../utils/caseInsensitive.utils.mjs";
+import { Logger as M } from "../../error-handling/logger.mjs";
+import { getContractAddress as l } from "../utils/getContractAddress.mjs";
 import { getERC20Registry as v } from "../../constants/token-data/ERC20Registry.mjs";
-const z = (t, a, c, e, n, i, o = !1) => {
-  const r = K.from(i).toBigInt(), C = {
-    tokenIn: a,
+const z = (t, c, a, e, n, i, o = !1) => {
+  const r = BigInt(i), C = {
+    tokenIn: c,
     tokenOut: e,
     fee: r,
     recipient: n,
-    amountIn: c,
+    amountIn: a,
     amountOutMinimum: 0,
     sqrtPriceLimitX96: 0
   }, m = [
@@ -28,33 +29,33 @@ const z = (t, a, c, e, n, i, o = !1) => {
     args: [C],
     invokeWallet: o
   });
-}, N = (t, a, c, e, n, i, o = !1) => {
-  const r = X(t, a), C = H(e, r.slice(2), n.slice(2));
+}, U = (t, c, a, e, n, i, o = !1) => {
+  const r = V(t, c), C = X(e, r.slice(2), n.slice(2));
   return u({
-    contract: c,
+    contract: a,
     callDataString: C,
     value: i,
     invokeWallet: o
   });
-}, G = (t, a) => {
-  const e = v(a).find((n) => n.symbol === "USDT");
-  return e ? M(t, e.erc20TokenAddress) : !1;
-}, L = async (t, a, c, e, n, i) => {
-  const o = c.address;
+}, G = (t, c) => {
+  const e = v(c).find((n) => n.symbol === "USDT");
+  return e ? H(t, e.erc20TokenAddress) : !1;
+}, N = async (t, c, a, e, n, i) => {
+  const o = l(a);
   if (G(o, t.getCurrentChainId()))
     try {
-      (await c.allowance(e, n)).toBigInt() > 0n && a.push(I(c, n, 0n, i));
+      await a.allowance(e, n) > 0n && c.push(I(a, n, 0n, i));
     } catch (r) {
-      l.error("Error in nullifyUsdtApprovalIfNeeded", r);
+      M.error("Error in nullifyUsdtApprovalIfNeeded", r);
     }
-}, U = async (t, a, c, e, n, i, o) => {
-  if (a !== w) {
-    const r = V[t.getCurrentChainId()], C = t.getContractWithFetcher(g.ERC20Contract, a), m = await C.balanceOf(c);
-    await L(
+}, L = async (t, c, a, e, n, i, o) => {
+  if (c !== w) {
+    const r = q[t.getCurrentChainId()], C = t.getContractWithFetcher(g.ERC20Contract, c), m = await C.balanceOf(a);
+    await N(
       t,
       n,
       C,
-      c,
+      a,
       r,
       i
     ), n.push(I(C, r, 2n ** 256n - 1n, i));
@@ -65,7 +66,7 @@ const z = (t, a, c, e, n, i, o = !1) => {
       u({
         contract: f,
         func: "takeSwapFee",
-        args: [a, m, P, E],
+        args: [c, m, P, E],
         invokeWallet: i
       })
     );
@@ -79,26 +80,26 @@ const z = (t, a, c, e, n, i, o = !1) => {
       })
     );
   }
-}, rt = async (t, a, c, e, n, i, o, r, C, m, h, f = !1) => {
-  const E = i < 0n ? -1n * i : i, y = t.getCurrentChainId(), p = [], S = T[y];
+}, ct = async (t, c, a, e, n, i, o, r, C, m, h, f = !1) => {
+  const E = i < 0n ? -1n * i : i, y = t.getCurrentChainId(), p = [], S = K[y];
   let _ = !1, R;
-  if (a === O.OneInch || a === O.Lifi) {
+  if (c === O.OneInch || c === O.Lifi) {
     if (n !== w) {
       const b = t.getContractWithFetcher(g.ERC20Contract, n);
-      p.push(I(b, c, E, f));
+      p.push(I(b, a, E, f));
     }
     let s = 0n;
     n === w && (s += E), o && r === w && o < 0n && (s += -1n * o);
     const F = s > 0n ? s : void 0;
-    return R = N(
+    return R = U(
       t,
-      a,
       c,
+      a,
       e,
       m,
       F,
       f
-    ), p.push(R), (a === O.OneInch || C && a === O.Lifi) && r && o !== void 0 && await U(t, r, m, h, p, f, o), p;
+    ), p.push(R), (c === O.OneInch || C && c === O.Lifi) && r && o !== void 0 && await L(t, r, m, h, p, f, o), p;
   }
   if (!r || !o)
     throw Error("There should be output token for UniSwap and Odos");
@@ -116,26 +117,26 @@ const z = (t, a, c, e, n, i, o = !1) => {
   let B = 0n;
   if (r === w && (r = S, _ = !0, B = await t.getContractWithFetcher(g.ERC20Contract, S).balanceOf(m)), n !== w) {
     const s = t.getContractWithFetcher(g.ERC20Contract, n);
-    await L(t, p, s, m, c, f), p.push(I(s, c, E, f));
+    await N(t, p, s, m, a, f), p.push(I(s, a, E, f));
   }
-  if (a === O.Uniswap ? R = z(
-    c,
+  if (c === O.Uniswap ? R = z(
+    a,
     n,
     E,
     r,
     m,
     e,
     f
-  ) : R = N(
+  ) : R = U(
     t,
-    a,
     c,
+    a,
     e,
     m,
     void 0,
     f
-  ), p.push(R), await U(t, r, m, h, p, f, o), _) {
-    const s = q[y], F = t.getContractWithFetcher(g.ERC20Contract, S);
+  ), p.push(R), await L(t, r, m, h, p, f, o), _) {
+    const s = T[y], F = t.getContractWithFetcher(g.ERC20Contract, S);
     p.push(I(F, s, 2n ** 256n - 1n, f));
     const b = ["function withdrawBalanceDifference(uint256 beforeBalance) external"], x = new D.Contract(s, b);
     p.push(
@@ -151,7 +152,7 @@ const z = (t, a, c, e, n, i, o = !1) => {
 };
 export {
   z as createSwapToEmporiumOpForUniswap,
-  N as createSwapToEmporiumOpFromData,
-  rt as createSwapToEmporiumOps,
-  L as nullifyUsdtApprovalIfNeeded
+  U as createSwapToEmporiumOpFromData,
+  ct as createSwapToEmporiumOps,
+  N as nullifyUsdtApprovalIfNeeded
 };

package/functions/private-wallet/opProducer.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const t=require("../../externalABIs/index.cjs"),p=require("ethers"),d=require("./emporium.helpers.cjs");var o=(e=>(e[e.Erc20Token=0]="Erc20Token",e[e.Uniswap=1]="Uniswap",e))(o||{});const h=(e,c,n,i,s,a)=>{let r="";switch(e){case 0:r=t.ERC20ABI;break;case 1:r=t.ISwapRouterABI;break}if(!r)throw Error("No ABI match in produceOp");const u=new p.ethers.Contract(c,r);return d.emporiumOp({contract:u,func:n,args:i,invokeWallet:s,value:a})};exports.OpType=o;exports.produceOp=h;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const t=require("../../externalABIs/index.cjs"),p=require("ethers"),d=require("./emporium.helpers.cjs");var o=(e=>(e[e.Erc20Token=0]="Erc20Token",e[e.Uniswap=1]="Uniswap",e))(o||{});const h=(e,c,n,i,s,a)=>{let r=[];switch(e){case 0:r=t.ERC20ABI;break;case 1:r=t.ISwapRouterABI;break}if(!r)throw Error("No ABI match in produceOp");const u=new p.ethers.Contract(c,r);return d.emporiumOp({contract:u,func:n,args:i,invokeWallet:s,value:a})};exports.OpType=o;exports.produceOp=h;

package/functions/private-wallet/opProducer.mjs

@@ -3,7 +3,7 @@ import { ethers as p } from "ethers";
 import { emporiumOp as u } from "./emporium.helpers.mjs";
 var w = /* @__PURE__ */ ((r) => (r[r.Erc20Token = 0] = "Erc20Token", r[r.Uniswap = 1] = "Uniswap", r))(w || {});
 const E = (r, t, e, c, a, n) => {
-  let o = "";
+  let o = [];
   switch (r) {
     case 0:
       o = s;