@hinkal/common 0.3.2 → 0.3.4

package/common/src/error-handling/error-codes.constants.d.ts

@@ -22,6 +22,7 @@ export declare const transactionErrorCodes: {
     TRANSACTION_NOT_CONFIRMED: string;
     RPC_PROVIDER_LIMIT_ERROR: string;
     RELAYER_NOT_AVAILABLE: string;
+    NO_STUCK_BALANCE_TO_WITHDRAW: string;
     TRANSACTION_TIMEOUT: string;
     CONNECT_ERROR: string;
     CONNECT_ERROR2: string;
@@ -74,14 +75,12 @@ export declare const transactionErrorCodes: {
     SWAP_RELAYER_MIN: string;
     LOW_LEVEL_CALL: string;
     INTEGRAL_CURVE_ZERO: string;
-    ODOS_FETCH: string;
     YOU_CANCELED_REQUEST: string;
     YOU_CANCELED_TRANSACTION_REQUEST: string;
     SLIPPAGE_LIMIT: string;
     SLIPPAGE_LIMIT_1: string;
     QUOTE_EXPIRED: string;
     REVERT_NO_STRING: string;
-    UNISWAP_NOT_ENOUGH_LIQUIDITY: string;
     CONNECTION_FAILED: string;
     FAILED_TO_SWITCH_NETWORKS: string;
     INVALID_FROM: string;
@@ -98,17 +97,11 @@ export declare const transactionErrorCodes: {
     LEDGER_BLIDN_SIGNING_NOT_ALLOWED: string;
     LEDGER_IS_NOT_AVAILABLE: string;
     LEDGER_ACCESS_DENIED: string;
-    ODOS_SWAP_FAILED: string;
-    ONEINCH_SWAP_FAILED: string;
     GAS_ESTIMATION_ERROR: string;
     GAS_ESTIMATE_INCORRECT_PARAMETERS: string;
     CONNECTIVITY_ERROR: string;
     TRANSACTION_FAILED: string;
     NO_SWAP_QUOTES: string;
-    NO_UNISWAP_PRICE: string;
-    NO_ODOS_PRICE: string;
-    NO_ONEINCH_PRICE: string;
-    NO_LIFI_PRICE: string;
     FEES_OVER_TRANSACTION_VALUE: string;
     GAS_STATION_NOT_AVAILABLE: string;
     INBALANCE_IN_TOKEN: string;
@@ -146,6 +139,8 @@ export declare const transactionErrorCodes: {
     TRON_CONFIRMATION_DECLINED: string;
     BLACKLISTED_INPUT_COMMITMENT_ADDRESS: string;
     ACCOUNT_RESOURCE_INSUFFICIENT_ERROR: string;
+    TRON_ROOT_HASH_STALE: string;
+    TRON_TX_IN_FLIGHT: string;
     GAS_PRICE_EXCEEDS_AUTOSHIELD_LIMIT: string;
     AUTO_SHIELD_INSUFFICIENT_GAS: string;
     INSUFFICIENT_FUNDS: string;
@@ -186,9 +181,6 @@ export declare const UserFriendlyErrorCodes: {
     USER_REJECTED_RPC: string;
     USER_DENIED_TRANSACTION_SIGNATURE: string;
     USER_DENIED_REQUEST_SIGNATURE: string;
-    ODOS_FETCH: string;
-    ODOS_SWAP_FAILED: string;
-    ONEINCH_SWAP_FAILED: string;
     CONNECT_ERROR2: string;
     WALLET_CONNECT_MATCHING_KEYS: string;
     SIGNATURE_UNSUPPORTED_CHAINS: string;
@@ -240,6 +232,9 @@ export declare const UserFriendlyErrorCodes: {
     REQUEST_PENDING: string;
     BLACKLISTED_INPUT_COMMITMENT_ADDRESS: string;
     NO_SWAP_QUOTES: string;
+    TRON_ROOT_HASH_STALE: string;
+    TRON_TX_IN_FLIGHT: string;
+    NO_LIFI_PRICE: string;
 };
 export declare const DIRECTLY_SHOW_MESSAGE_ERROR_CODES: {
     UTXO_LIMITATIONS: string;

package/common/src/error-handling/error-codes.constants.mjs

@@ -24,6 +24,7 @@ var e = {
 	TRANSACTION_NOT_CONFIRMED: "The transaction was not confirmed by the network. Please, try again",
 	RPC_PROVIDER_LIMIT_ERROR: "Non-200 status code: '429'",
 	RELAYER_NOT_AVAILABLE: "All relayers are busy, please try in a few seconds",
+	NO_STUCK_BALANCE_TO_WITHDRAW: "No stuck balance found to withdraw",
 	TRANSACTION_TIMEOUT: "Your transaction got stale. Please, try in a few seconds",
 	CONNECT_ERROR: "Connection error",
 	CONNECT_ERROR2: "DOMException: Failed",
@@ -76,14 +77,12 @@ var e = {
 	SWAP_RELAYER_MIN: "Relayer minimum fee is not satisfied",
 	LOW_LEVEL_CALL: "low-level delegate call failed",
 	INTEGRAL_CURVE_ZERO: "previous integral cannot be zero",
-	ODOS_FETCH: "Odos API Fetch Error",
 	YOU_CANCELED_REQUEST: "You canceled the request",
 	YOU_CANCELED_TRANSACTION_REQUEST: "You cancelled the transaction request.",
 	SLIPPAGE_LIMIT: "Slippage Limit Exceeded",
 	SLIPPAGE_LIMIT_1: "Slippage screwed you",
 	QUOTE_EXPIRED: "Quote has expired",
 	REVERT_NO_STRING: "Transaction reverted without a reason string",
-	UNISWAP_NOT_ENOUGH_LIQUIDITY: "Not Enough Liquidity",
 	CONNECTION_FAILED: "Failed to connect",
 	FAILED_TO_SWITCH_NETWORKS: "Please switch networks in your wallet settings",
 	INVALID_FROM: "Invalid from token",
@@ -100,17 +99,11 @@ var e = {
 	LEDGER_BLIDN_SIGNING_NOT_ALLOWED: "Ledger device: UNKNOWN_ERROR (0x6a8c)",
 	LEDGER_IS_NOT_AVAILABLE: "Ledger device: UNKNOWN_ERROR",
 	LEDGER_ACCESS_DENIED: "Access denied to use Ledger device.",
-	ODOS_SWAP_FAILED: "Odos swap call failed",
-	ONEINCH_SWAP_FAILED: "One inch swap failed",
 	GAS_ESTIMATION_ERROR: "Failed Gas Estimates Response",
 	GAS_ESTIMATE_INCORRECT_PARAMETERS: "Incorrect Parameters for Gas Estimate",
 	CONNECTIVITY_ERROR: "Request failed with status code 500",
 	TRANSACTION_FAILED: "Transaction Failed: Revert",
 	NO_SWAP_QUOTES: "No swap quotes available",
-	NO_UNISWAP_PRICE: "Cannot get Uniswap Price",
-	NO_ODOS_PRICE: "Cannot get Odos Price",
-	NO_ONEINCH_PRICE: "Cannot get OneInch Price",
-	NO_LIFI_PRICE: "Cannot get LiFi Price",
 	FEES_OVER_TRANSACTION_VALUE: "Fees are over transaction value. Please, increase the amount",
 	GAS_STATION_NOT_AVAILABLE: "Gas Station Not Available",
 	INBALANCE_IN_TOKEN: "Inbalance in token detected",
@@ -147,7 +140,9 @@ var e = {
 	RELAY_FEE_OVER_WITHDRAW_AMOUNT: "Relay Fee is over withdraw amount",
 	TRON_CONFIRMATION_DECLINED: "Confirmation declined by user",
 	BLACKLISTED_INPUT_COMMITMENT_ADDRESS: "One of the source addresses is restricted from private transactions",
-	ACCOUNT_RESOURCE_INSUFFICIENT_ERROR: "Account resource insufficient error"
+	ACCOUNT_RESOURCE_INSUFFICIENT_ERROR: "Account resource insufficient error",
+	TRON_ROOT_HASH_STALE: "Hinkal Root Hash Is Stale For Proof",
+	TRON_TX_IN_FLIGHT: "Another Hinkal transaction is in progress"
 }, i = "Not enough memory. Please, close some tabs/applications to free up memory and try again", a = "Your transaction didn’t go through due to price slippage. Try increasing your slippage tolerance", o = {
 	USER_REJECTED_TRANSACTION: "You cancelled the transaction",
 	SOME_ERROR: "Some error has occurred. Please try again in a few minutes. If the issue persists, please report it in Discord",
@@ -175,9 +170,6 @@ var e = {
 	USER_REJECTED_RPC: "You canceled the request",
 	USER_DENIED_TRANSACTION_SIGNATURE: "You canceled the request",
 	USER_DENIED_REQUEST_SIGNATURE: "You canceled the request",
-	ODOS_FETCH: "Current Odos price is unavailable. Please try again",
-	ODOS_SWAP_FAILED: "Your Odos Swap transaction didn’t go through. Please try again",
-	ONEINCH_SWAP_FAILED: "Your 1inch Swap transaction didn’t go through. Please try again",
 	CONNECT_ERROR2: "Oops, there are connectivity issues. Please check your internet connection and try again",
 	WALLET_CONNECT_MATCHING_KEYS: "An internal WalletConnect error occurred. Please try reconnecting",
 	SIGNATURE_UNSUPPORTED_CHAINS: "The transaction couldn’t be signed: this network is not supported",
@@ -228,7 +220,10 @@ var e = {
 	INVALID_RELAYER_FEE: "The transaction fee changed while submitting. Please try again.",
 	REQUEST_PENDING: "A request is already pending in your wallet. Please confirm to connect.",
 	BLACKLISTED_INPUT_COMMITMENT_ADDRESS: "The funds you’re trying to use have been flagged as sanctioned.",
-	NO_SWAP_QUOTES: "No swap route available for this token pair on the selected network at the moment. Please try again later or adjust the swap parameters."
+	NO_SWAP_QUOTES: "No swap route available for this token pair on the selected network at the moment. Please try again later or adjust the swap parameters.",
+	TRON_ROOT_HASH_STALE: "Another transaction was processed just before yours. Please try again",
+	TRON_TX_IN_FLIGHT: "Another transaction is currently being processed. Please try again in a few seconds",
+	NO_LIFI_PRICE: "Li-Fi provider couldn't fetch the price. please, retry in a few seconds."
 }, s = {
 	UTXO_LIMITATIONS: "Your transaction exceeds the UTXO limit",
 	INSUFFICIENT_BALANCE_FOR_FEES: "Fees are high right now and would consume a large portion of your balance. Consider reducing the amount or retrying later.",

package/common/src/error-handling/get-error.message.cjs

@@ -1 +1 @@
-const e=require(`./error-codes.constants.cjs`),t=require(`./customErrors/ErrorWithAmount.cjs`),n=require(`./customErrors/FeeOverTransactionValueError.cjs`),r=require(`./types.cjs`),i=require(`./customErrors/customErrors.helpers.cjs`);require(`./customErrors/index.cjs`);const a=require(`../types/transaction.types.cjs`);require(`../types/index.cjs`);const o=require(`./isInsufficientFundsError.cjs`);var s=e=>{if(typeof e==`object`&&e){if(`response`in e&&typeof e.response==`object`&&e.response!==null&&`data`in e.response&&typeof e.response.data==`object`&&e.response.data!==null&&`message`in e.response.data&&typeof e.response.data.message==`string`)return e.response.data.message;if(`data`in e&&typeof e.data==`object`&&e.data!==null&&`message`in e.data&&typeof e.data.message==`string`)return e.data.message;if(`message`in e&&typeof e.message==`string`&&e.message)return e.message;if(`error`in e&&typeof e.error==`string`&&e.error)return e.error}if(e instanceof Error)return e.message;if(typeof e==`string`)return e},c=t=>{switch(t){case r.ErrorCategory.DEPOSIT:return`Deposit failed`;case r.ErrorCategory.SWAP:return`Swap failed`;case r.ErrorCategory.BRIDGE:return`Bridge failed`;case r.ErrorCategory.WITHDRAW:return`Send failed`;case r.ErrorCategory.Fund:return`Unshield failed`;case r.ErrorCategory.Receive:return`Shield failed`;case r.ErrorCategory.DappTransaction:return`DApp transaction failed`;case r.ErrorCategory.Approve:return`Approval failed`;default:return e.transactionErrorCodes.UNKNOWN}},l=(r,a)=>{if(r instanceof n.FeeOverTransactionValueError)return i.getGenericFeeOverTransactionValueErrorMessage(r,a);if(r instanceof t.ErrorWithAmount){let{amount:e,message:t}=r;return`${t} ${e}`}let l=s(r);if(l&&o.isInsufficientFundsError(l))return e.insufficientResourcesErrorCodes.INSUFFICIENT_FUNDS;if(l){let t=l.toLowerCase(),n=Object.keys(e.transactionErrorCodes).find(n=>t===e.transactionErrorCodes[n].toLowerCase());if(n&&n in e.UserFriendlyErrorCodes)return e.UserFriendlyErrorCodes[n];let r=Object.entries(e.transactionErrorCodes).find(([e,n])=>t.includes(n.toLowerCase()));if(r)return e.UserFriendlyErrorCodes[r[0]]??r[1];if(Object.values(e.DIRECTLY_SHOW_MESSAGE_ERROR_CODES).find(e=>t.includes(e.toLowerCase())))return l}return a?c(a):e.transactionErrorCodes.UNKNOWN},u=(e,t)=>{let n;switch(t){case a.TransactionRequestType.Send:case a.TransactionRequestType.ProxySend:n=r.ErrorCategory.WITHDRAW;break;case a.TransactionRequestType.SwapTokens:case a.TransactionRequestType.ProxySwapTokens:n=r.ErrorCategory.SWAP;break;case a.TransactionRequestType.ReceiveFromShieldedAccount:n=r.ErrorCategory.Receive;break;case a.TransactionRequestType.Fund:n=r.ErrorCategory.Fund;break;case a.TransactionRequestType.PrivateTransactionFromProxy:n=r.ErrorCategory.DappTransaction;break;default:n=void 0;break}return l(e,n)};exports.extractMessage=s,exports.getErrorMessage=l,exports.getErrorMessageFromTransactionRequest=u;
+const e=require(`./error-codes.constants.cjs`),t=require(`./customErrors/ErrorWithAmount.cjs`),n=require(`./customErrors/FeeOverTransactionValueError.cjs`),r=require(`./types.cjs`),i=require(`./customErrors/customErrors.helpers.cjs`);require(`./customErrors/index.cjs`);const a=require(`../types/transaction.types.cjs`);require(`../types/index.cjs`);const o=require(`./isInsufficientFundsError.cjs`);var s=(e,t)=>{let n=t.reduce((e,t)=>{if(!(typeof e!=`object`||!e||!(t in e)))return e[t]},e);return typeof n==`string`&&n?n:void 0},c=e=>{if(typeof e==`object`&&e){let t=s(e,[`response`,`data`,`message`])??s(e,[`response`,`data`,`detail`])??s(e,[`data`,`message`])??s(e,[`data`,`detail`]);if(t)return t;if(`message`in e&&typeof e.message==`string`&&e.message)return e.message;if(`error`in e&&typeof e.error==`string`&&e.error)return e.error}if(e instanceof Error)return e.message;if(typeof e==`string`)return e},l=t=>{switch(t){case r.ErrorCategory.DEPOSIT:return`Deposit failed`;case r.ErrorCategory.SWAP:return`Swap failed`;case r.ErrorCategory.BRIDGE:return`Bridge failed`;case r.ErrorCategory.WITHDRAW:return`Send failed`;case r.ErrorCategory.Fund:return`Unshield failed`;case r.ErrorCategory.Receive:return`Shield failed`;case r.ErrorCategory.DappTransaction:return`DApp transaction failed`;case r.ErrorCategory.Approve:return`Approval failed`;default:return e.transactionErrorCodes.UNKNOWN}},u=(r,a)=>{if(r instanceof n.FeeOverTransactionValueError)return i.getGenericFeeOverTransactionValueErrorMessage(r,a);if(r instanceof t.ErrorWithAmount){let{amount:e,message:t}=r;return`${t} ${e}`}let s=c(r);if(s&&o.isInsufficientFundsError(s))return e.insufficientResourcesErrorCodes.INSUFFICIENT_FUNDS;if(s){let t=s.toLowerCase(),n=Object.keys(e.transactionErrorCodes).find(n=>t===e.transactionErrorCodes[n].toLowerCase());if(n&&n in e.UserFriendlyErrorCodes)return e.UserFriendlyErrorCodes[n];let r=Object.entries(e.transactionErrorCodes).find(([e,n])=>t.includes(n.toLowerCase()));if(r)return e.UserFriendlyErrorCodes[r[0]]??r[1];if(Object.values(e.DIRECTLY_SHOW_MESSAGE_ERROR_CODES).find(e=>t.includes(e.toLowerCase())))return s}return a?l(a):e.transactionErrorCodes.UNKNOWN},d=(e,t)=>{let n;switch(t){case a.TransactionRequestType.Send:case a.TransactionRequestType.ProxySend:n=r.ErrorCategory.WITHDRAW;break;case a.TransactionRequestType.SwapTokens:case a.TransactionRequestType.ProxySwapTokens:n=r.ErrorCategory.SWAP;break;case a.TransactionRequestType.ReceiveFromShieldedAccount:n=r.ErrorCategory.Receive;break;case a.TransactionRequestType.Fund:n=r.ErrorCategory.Fund;break;case a.TransactionRequestType.PrivateTransactionFromProxy:n=r.ErrorCategory.DappTransaction;break;default:n=void 0;break}return u(e,n)};exports.extractMessage=c,exports.getErrorMessage=u,exports.getErrorMessageFromTransactionRequest=d;

package/common/src/error-handling/get-error.message.mjs

@@ -8,16 +8,29 @@ import { TransactionRequestType as c } from "../types/transaction.types.mjs";
 import "../types/index.mjs";
 import { isInsufficientFundsError as l } from "./isInsufficientFundsError.mjs";
 //#region libs/shared/common/src/error-handling/get-error.message.ts
-var u = (e) => {
+var u = (e, t) => {
+	let n = t.reduce((e, t) => {
+		if (!(typeof e != "object" || !e || !(t in e))) return e[t];
+	}, e);
+	return typeof n == "string" && n ? n : void 0;
+}, d = (e) => {
 	if (typeof e == "object" && e) {
-		if ("response" in e && typeof e.response == "object" && e.response !== null && "data" in e.response && typeof e.response.data == "object" && e.response.data !== null && "message" in e.response.data && typeof e.response.data.message == "string") return e.response.data.message;
-		if ("data" in e && typeof e.data == "object" && e.data !== null && "message" in e.data && typeof e.data.message == "string") return e.data.message;
+		let t = u(e, [
+			"response",
+			"data",
+			"message"
+		]) ?? u(e, [
+			"response",
+			"data",
+			"detail"
+		]) ?? u(e, ["data", "message"]) ?? u(e, ["data", "detail"]);
+		if (t) return t;
 		if ("message" in e && typeof e.message == "string" && e.message) return e.message;
 		if ("error" in e && typeof e.error == "string" && e.error) return e.error;
 	}
 	if (e instanceof Error) return e.message;
 	if (typeof e == "string") return e;
-}, d = (e) => {
+}, f = (e) => {
 	switch (e) {
 		case o.DEPOSIT: return "Deposit failed";
 		case o.SWAP: return "Swap failed";
@@ -29,23 +42,23 @@ var u = (e) => {
 		case o.Approve: return "Approval failed";
 		default: return r.UNKNOWN;
 	}
-}, f = (o, c) => {
+}, p = (o, c) => {
 	if (o instanceof a) return s(o, c);
 	if (o instanceof i) {
 		let { amount: e, message: t } = o;
 		return `${t} ${e}`;
 	}
-	let f = u(o);
-	if (f && l(f)) return n.INSUFFICIENT_FUNDS;
-	if (f) {
-		let n = f.toLowerCase(), i = Object.keys(r).find((e) => n === r[e].toLowerCase());
+	let u = d(o);
+	if (u && l(u)) return n.INSUFFICIENT_FUNDS;
+	if (u) {
+		let n = u.toLowerCase(), i = Object.keys(r).find((e) => n === r[e].toLowerCase());
 		if (i && i in t) return t[i];
 		let a = Object.entries(r).find(([e, t]) => n.includes(t.toLowerCase()));
 		if (a) return t[a[0]] ?? a[1];
-		if (Object.values(e).find((e) => n.includes(e.toLowerCase()))) return f;
+		if (Object.values(e).find((e) => n.includes(e.toLowerCase()))) return u;
 	}
-	return c ? d(c) : r.UNKNOWN;
-}, p = (e, t) => {
+	return c ? f(c) : r.UNKNOWN;
+}, m = (e, t) => {
 	let n;
 	switch (t) {
 		case c.Send:
@@ -69,7 +82,7 @@ var u = (e) => {
 			n = void 0;
 			break;
 	}
-	return f(e, n);
+	return p(e, n);
 };
 //#endregion
-export { u as extractMessage, f as getErrorMessage, p as getErrorMessageFromTransactionRequest };
+export { d as extractMessage, p as getErrorMessage, m as getErrorMessageFromTransactionRequest };

package/common/src/externalABIs/index.cjs

@@ -1 +1 @@
-const e=require(`./ERC20.json.cjs`),t=require(`./ERC721.json.cjs`),n=require(`./ERC1155.json.cjs`),r=require(`./IQuoterV2.json.cjs`),i=require(`./IUniswapV3Factory.json.cjs`),a=require(`./ISwapRouter.json.cjs`);var o=e.default.abi,s=t.default.abi,c=n.default.abi;r.default.abi,i.default.abi,a.default.abi,exports.ERC1155ABI=c,exports.ERC20ABI=o,exports.ERC721ABI=s;
+const e=require(`./ERC20.json.cjs`),t=require(`./ERC721.json.cjs`),n=require(`./ERC1155.json.cjs`);var r=e.default.abi,i=t.default.abi,a=n.default.abi;exports.ERC1155ABI=a,exports.ERC20ABI=r,exports.ERC721ABI=i;

package/common/src/externalABIs/index.d.ts

@@ -104,116 +104,4 @@ declare const ERC1155ABI: ({
     type: string;
     anonymous?: undefined;
 })[];
-declare const quoterV2ABI: ({
-    inputs: {
-        internalType: string;
-        name: string;
-        type: string;
-    }[];
-    name: string;
-    outputs: {
-        internalType: string;
-        name: string;
-        type: string;
-    }[];
-    stateMutability: string;
-    type: string;
-} | {
-    inputs: {
-        components: {
-            internalType: string;
-            name: string;
-            type: string;
-        }[];
-        internalType: string;
-        name: string;
-        type: string;
-    }[];
-    name: string;
-    outputs: {
-        internalType: string;
-        name: string;
-        type: string;
-    }[];
-    stateMutability: string;
-    type: string;
-})[];
-declare const factoryABI: ({
-    anonymous: boolean;
-    inputs: {
-        indexed: boolean;
-        internalType: string;
-        name: string;
-        type: string;
-    }[];
-    name: string;
-    type: string;
-    outputs?: undefined;
-    stateMutability?: undefined;
-} | {
-    inputs: {
-        internalType: string;
-        name: string;
-        type: string;
-    }[];
-    name: string;
-    outputs: {
-        internalType: string;
-        name: string;
-        type: string;
-    }[];
-    stateMutability: string;
-    type: string;
-    anonymous?: undefined;
-})[];
-declare const ISwapRouterABI: ({
-    inputs: {
-        internalType: string;
-        name: string;
-        type: string;
-    }[];
-    stateMutability: string;
-    type: string;
-    name?: undefined;
-    outputs?: undefined;
-} | {
-    inputs: {
-        components: {
-            internalType: string;
-            name: string;
-            type: string;
-        }[];
-        internalType: string;
-        name: string;
-        type: string;
-    }[];
-    name: string;
-    outputs: {
-        internalType: string;
-        name: string;
-        type: string;
-    }[];
-    stateMutability: string;
-    type: string;
-} | {
-    inputs: {
-        internalType: string;
-        name: string;
-        type: string;
-    }[];
-    name: string;
-    outputs: {
-        internalType: string;
-        name: string;
-        type: string;
-    }[];
-    stateMutability: string;
-    type: string;
-} | {
-    stateMutability: string;
-    type: string;
-    inputs?: undefined;
-    name?: undefined;
-    outputs?: undefined;
-})[];
-export { quoterV2ABI, factoryABI, AmTokenABI, ERC20ABI, ERC721ABI, USDCABI, daiABI, USDRABI, USDR3CRVABI, USDTABI, WETHABI, BUSDABI, sanctionsListABI, optimismGasPriceOracleAbi, NodeInterfaceABI, ISwapRouterABI, ERC1155ABI, };
+export { AmTokenABI, ERC20ABI, ERC721ABI, USDCABI, daiABI, USDRABI, USDR3CRVABI, USDTABI, WETHABI, BUSDABI, sanctionsListABI, optimismGasPriceOracleAbi, NodeInterfaceABI, ERC1155ABI, };

package/common/src/externalABIs/index.mjs

@@ -1,11 +1,7 @@
 import e from "./ERC20.json.mjs";
 import t from "./ERC721.json.mjs";
 import n from "./ERC1155.json.mjs";
-import r from "./IQuoterV2.json.mjs";
-import i from "./IUniswapV3Factory.json.mjs";
-import a from "./ISwapRouter.json.mjs";
 //#region libs/shared/common/src/externalABIs/index.ts
-var o = e.abi, s = t.abi, c = n.abi;
-r.abi, i.abi, a.abi;
+var r = e.abi, i = t.abi, a = n.abi;
 //#endregion
-export { c as ERC1155ABI, o as ERC20ABI, s as ERC721ABI };
+export { a as ERC1155ABI, r as ERC20ABI, i as ERC721ABI };

package/common/src/functions/auto-deposit-back-helpers/select-gas-token.cjs

@@ -1 +1 @@
-const e=require(`../utils/caseInsensitive.utils.cjs`),t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`../../error-handling/logger.cjs`),r=require(`../../types/external-action.types.cjs`),i=require(`../../types/offscreen.types.cjs`);require(`../../types/index.cjs`),require(`../../error-handling/index.cjs`);const a=require(`../pre-transaction/getFeeStructure.cjs`);require(`../pre-transaction/index.cjs`);const o=require(`../utils/convertEmporiumOpToCallInfo.cjs`),s=require(`../utils/postToOffscreen.cjs`);require(`../utils/index.cjs`);var c=async(c,l,u,d,f,p,m,h,g)=>{try{if(!((p.find(({erc20Token:t})=>e.caseInsensitiveEqual(t.erc20TokenAddress,c))?.totalUsdBalance??0)>=l)){let n=p.find(t=>t.totalUsdBalance<=l?!1:d.find(({erc20TokenAddress:n})=>e.caseInsensitiveEqual(n,t.erc20Token.erc20TokenAddress))?t.publicUsdBalance>l:!0);if(!n){s.postToOffscreen(i.MessagesFromOffscreen.AutoShieldTxStatus,{message:t.transactionErrorCodes.AUTO_SHIELD_INSUFFICIENT_GAS});return}c=n.erc20Token.erc20TokenAddress,m=await a.getFeeStructure(u,c,h,r.ExternalActionId.Emporium,f.map(e=>o.convertEmporiumOpToCallInfo(e,g,u)))}return{feeToken:c,feeStructure:m}}catch(e){n.Logger.error(`selectGasToken error`,{error:e});return}};exports.selectGasToken=c;
+const e=require(`../utils/caseInsensitive.utils.cjs`),t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`../../types/external-action.types.cjs`),r=require(`../../types/offscreen.types.cjs`);require(`../../types/index.cjs`);const i=require(`../../error-handling/logger.cjs`);require(`../../error-handling/index.cjs`);const a=require(`../pre-transaction/getFeeStructure.cjs`);require(`../pre-transaction/index.cjs`);const o=require(`../utils/convertEmporiumOpToCallInfo.cjs`),s=require(`../utils/postToOffscreen.cjs`);require(`../utils/index.cjs`);var c=async(c,l,u,d,f,p,m,h,g)=>{try{if(!((p.find(({erc20Token:t})=>e.caseInsensitiveEqual(t.erc20TokenAddress,c))?.totalUsdBalance??0)>=l)){let i=p.find(t=>t.totalUsdBalance<=l?!1:d.find(({erc20TokenAddress:n})=>e.caseInsensitiveEqual(n,t.erc20Token.erc20TokenAddress))?t.publicUsdBalance>l:!0);if(!i){s.postToOffscreen(r.MessagesFromOffscreen.AutoShieldTxStatus,{message:t.transactionErrorCodes.AUTO_SHIELD_INSUFFICIENT_GAS});return}c=i.erc20Token.erc20TokenAddress,m=await a.getFeeStructure(u,c,h,n.ExternalActionId.Emporium,f.map(e=>o.convertEmporiumOpToCallInfo(e,g,u)))}return{feeToken:c,feeStructure:m}}catch(e){i.Logger.error(`selectGasToken error`,{error:e});return}};exports.selectGasToken=c;

package/common/src/functions/auto-deposit-back-helpers/select-gas-token.mjs

@@ -1,9 +1,9 @@
 import { caseInsensitiveEqual as e } from "../utils/caseInsensitive.utils.mjs";
 import { transactionErrorCodes as t } from "../../error-handling/error-codes.constants.mjs";
-import { Logger as n } from "../../error-handling/logger.mjs";
-import { ExternalActionId as r } from "../../types/external-action.types.mjs";
-import { MessagesFromOffscreen as i } from "../../types/offscreen.types.mjs";
+import { ExternalActionId as n } from "../../types/external-action.types.mjs";
+import { MessagesFromOffscreen as r } from "../../types/offscreen.types.mjs";
 import "../../types/index.mjs";
+import { Logger as i } from "../../error-handling/logger.mjs";
 import "../../error-handling/index.mjs";
 import { getFeeStructure as a } from "../pre-transaction/getFeeStructure.mjs";
 import "../pre-transaction/index.mjs";
@@ -14,19 +14,19 @@ import "../utils/index.mjs";
 var c = async (c, l, u, d, f, p, m, h, g) => {
 	try {
 		if (!((p.find(({ erc20Token: t }) => e(t.erc20TokenAddress, c))?.totalUsdBalance ?? 0) >= l)) {
-			let n = p.find((t) => t.totalUsdBalance <= l ? !1 : d.find(({ erc20TokenAddress: n }) => e(n, t.erc20Token.erc20TokenAddress)) ? t.publicUsdBalance > l : !0);
-			if (!n) {
-				s(i.AutoShieldTxStatus, { message: t.AUTO_SHIELD_INSUFFICIENT_GAS });
+			let i = p.find((t) => t.totalUsdBalance <= l ? !1 : d.find(({ erc20TokenAddress: n }) => e(n, t.erc20Token.erc20TokenAddress)) ? t.publicUsdBalance > l : !0);
+			if (!i) {
+				s(r.AutoShieldTxStatus, { message: t.AUTO_SHIELD_INSUFFICIENT_GAS });
 				return;
 			}
-			c = n.erc20Token.erc20TokenAddress, m = await a(u, c, h, r.Emporium, f.map((e) => o(e, g, u)));
+			c = i.erc20Token.erc20TokenAddress, m = await a(u, c, h, n.Emporium, f.map((e) => o(e, g, u)));
 		}
 		return {
 			feeToken: c,
 			feeStructure: m
 		};
 	} catch (e) {
-		n.error("selectGasToken error", { error: e });
+		i.error("selectGasToken error", { error: e });
 		return;
 	}
 };

package/common/src/functions/index.cjs

@@ -1 +1 @@
-require(`./utils/abi.utils.cjs`),require(`./utils/serialize.utils.cjs`),require(`./utils/caseInsensitive.utils.cjs`),require(`./utils/amounts.utils.cjs`),require(`./web3/etherFunctions.cjs`),require(`./utils/time.utils.cjs`),require(`./utils/upToDateState.cjs`),require(`./utils/cacheFunctions.cjs`),require(`./utils/enclaveHandshakeService.cjs`),require(`./utils/encryptInputForEnclave.cjs`),require(`./utils/solanaMint.utils.cjs`),require(`./utils/customEnclaveFunctionsRegister.cjs`),require(`./utils/serialize-utxos.utils.cjs`),require(`./utils/addresses.cjs`),require(`./utils/tron.utils.cjs`),require(`./web3/events/getInputUtxoAndBalance.cjs`),require(`./utils/get-signature-header.cjs`),require(`./utils/legacyKeys.cjs`),require(`./utils/auth.utils.cjs`),require(`./utils/string.utils.cjs`),require(`./utils/token-check.utils.cjs`),require(`./utils/map.utils.cjs`),require(`./utils/mutexes.utils.cjs`),require(`./utils/erc20tokenFunctions.cjs`),require(`./web3/events/getShieldedBalance.cjs`),require(`./pre-transaction/outputUtxoProcessing.cjs`),require(`./utils/external-action.utils.cjs`),require(`./snarkjs/common.snarkjs.cjs`),require(`./pre-transaction/solana.cjs`),require(`./snarkjs/signedMessageHash.cjs`),require(`./pre-transaction/process-gas-estimates.cjs`),require(`./pre-transaction/getVolatileTransferAmount.cjs`),require(`./pre-transaction/constructAdminData.cjs`),require(`./utils/create-provider.cjs`),require(`./pre-transaction/convert-okx-instructions.cjs`),require(`./web3/getSolanaPriorityFee.cjs`),require(`./utils/process.utils.cjs`),require(`./pre-transaction/sendV0Transaction.cjs`),require(`./utils/bytes32.utils.cjs`),require(`./pre-transaction/recipientUtxoProcessing.cjs`),require(`./pre-transaction/ensureAmountChanges.cjs`),require(`./pre-transaction/getFeeStructure.cjs`),require(`./pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`),require(`./pre-transaction/buildCommitmentValidationData.cjs`),require(`./pre-transaction/index.cjs`),require(`./snarkjs/generateZkProof.cjs`),require(`./snarkjs/generateMainAndCommitmentZkProof.cjs`),require(`./utils/resolve-sync.utils.cjs`),require(`./utils/reloadPage.cjs`),require(`./utils/cacheDevice.utils.cjs`),require(`./utils/involves-permit2-op.cjs`),require(`./utils/convertEmporiumOpToCallInfo.cjs`),require(`./utils/getRecipientInfoFromUserKeys.cjs`),require(`./utils/publicBalance.utils.cjs`),require(`./utils/postToOffscreen.cjs`),require(`./utils/getContractAddress.cjs`),require(`./utils/getUtxosFromReceipt.utils.cjs`),require(`./utils/getUtxosFromReceiptSolana.cjs`),require(`./utils/fees.utils.cjs`),require(`./utils/proxyAvatar.utils.cjs`),require(`./utils/enclave-signature-storage.cjs`),require(`./utils/tx-confirmation.utils.cjs`),require(`./utils/tronSimulation.utils.cjs`),require(`./utils/getSignerFromContract.cjs`),require(`./utils/temp-wallet.utils.cjs`),require(`./utils/mnemonics.cjs`),require(`./utils/nearIntents.utils.cjs`),require(`./utils/index.cjs`),require(`./snarkjs/fetchOnChainRootHashes.cjs`),require(`./private-wallet/emporium.helpers.cjs`),require(`./snarkjs/constructGeneralZkProof.cjs`),require(`./web3/uniswapAPI.cjs`),require(`./web3/odosAPI.cjs`),require(`./web3/oneInchAPI.cjs`),require(`./web3/lifiAPI.cjs`),require(`./web3/okxAPI.cjs`),require(`./web3/index.cjs`),require(`./snarkjs/constructSolanaZkProof.cjs`),require(`./snarkjs/index.cjs`),require(`./private-wallet/emporium.swap.helpers.cjs`),require(`./private-wallet/index.cjs`),require(`./auto-deposit-back-helpers/get-tokens-to-deposit-back.cjs`),require(`./auto-deposit-back-helpers/get-gas-token-records.cjs`),require(`./auto-deposit-back-helpers/select-gas-token.cjs`),require(`./auto-deposit-back-helpers/update-hinkal.cjs`),require(`./auto-deposit-back-helpers/index.cjs`);
+require(`./utils/abi.utils.cjs`),require(`./utils/serialize.utils.cjs`),require(`./utils/caseInsensitive.utils.cjs`),require(`./utils/amounts.utils.cjs`),require(`./web3/etherFunctions.cjs`),require(`./utils/time.utils.cjs`),require(`./utils/upToDateState.cjs`),require(`./utils/cacheFunctions.cjs`),require(`./utils/enclaveHandshakeService.cjs`),require(`./utils/encryptInputForEnclave.cjs`),require(`./utils/solanaMint.utils.cjs`),require(`./utils/serialize-utxos.utils.cjs`),require(`./utils/customEnclaveFunctionsRegister.cjs`),require(`./utils/addresses.cjs`),require(`./utils/tron.utils.cjs`),require(`./web3/events/getInputUtxoAndBalance.cjs`),require(`./utils/legacyKeys.cjs`),require(`./utils/auth.utils.cjs`),require(`./utils/string.utils.cjs`),require(`./utils/token-check.utils.cjs`),require(`./utils/map.utils.cjs`),require(`./utils/mutexes.utils.cjs`),require(`./utils/erc20tokenFunctions.cjs`),require(`./web3/events/getShieldedBalance.cjs`),require(`./pre-transaction/outputUtxoProcessing.cjs`),require(`./utils/external-action.utils.cjs`),require(`./snarkjs/common.snarkjs.cjs`),require(`./pre-transaction/solana.cjs`),require(`./snarkjs/signedMessageHash.cjs`),require(`./pre-transaction/process-gas-estimates.cjs`),require(`./pre-transaction/getVolatileTransferAmount.cjs`),require(`./pre-transaction/constructAdminData.cjs`),require(`./utils/create-provider.cjs`),require(`./pre-transaction/calculateSolanaNullifierCount.cjs`),require(`./pre-transaction/convert-okx-instructions.cjs`),require(`./web3/getSolanaPriorityFee.cjs`),require(`./utils/process.utils.cjs`),require(`./pre-transaction/sendV0Transaction.cjs`),require(`./utils/bytes32.utils.cjs`),require(`./pre-transaction/ensureAmountChanges.cjs`),require(`./pre-transaction/getFeeStructure.cjs`),require(`./pre-transaction/getExternalSwapAddress.cjs`),require(`./pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`),require(`./pre-transaction/buildCommitmentValidationData.cjs`),require(`./pre-transaction/index.cjs`),require(`./snarkjs/generateZkProof.cjs`),require(`./snarkjs/generateMainAndCommitmentZkProof.cjs`),require(`./snarkjs/fetchOnChainRootHashes.cjs`),require(`./utils/getContractAddress.cjs`),require(`./private-wallet/emporium.helpers.cjs`),require(`./snarkjs/constructGeneralZkProof.cjs`),require(`./utils/getSignerFromContract.cjs`),require(`./utils/tronSimulation.utils.cjs`),require(`./utils/tx-confirmation.utils.cjs`),require(`./utils/getUtxosFromReceipt.utils.cjs`),require(`./utils/getRecipientInfoFromUserKeys.cjs`),require(`./utils/resolve-sync.utils.cjs`),require(`./utils/reloadPage.cjs`),require(`./utils/cacheDevice.utils.cjs`),require(`./utils/involves-permit2-op.cjs`),require(`./utils/convertEmporiumOpToCallInfo.cjs`),require(`./utils/publicBalance.utils.cjs`),require(`./utils/postToOffscreen.cjs`),require(`./utils/getUtxosFromReceiptSolana.cjs`),require(`./utils/fees.utils.cjs`),require(`./utils/proxyAvatar.utils.cjs`),require(`./utils/enclave-signature-storage.cjs`),require(`./utils/temp-wallet.utils.cjs`),require(`./utils/mnemonics.cjs`),require(`./utils/nearIntents.utils.cjs`),require(`./utils/index.cjs`),require(`./web3/lifiAPI.cjs`),require(`./web3/okxAPI.cjs`),require(`./web3/index.cjs`),require(`./snarkjs/constructSolanaZkProof.cjs`),require(`./snarkjs/index.cjs`),require(`./private-wallet/emporium.swap.helpers.cjs`),require(`./private-wallet/index.cjs`),require(`./auto-deposit-back-helpers/get-tokens-to-deposit-back.cjs`),require(`./auto-deposit-back-helpers/get-gas-token-records.cjs`),require(`./auto-deposit-back-helpers/select-gas-token.cjs`),require(`./auto-deposit-back-helpers/update-hinkal.cjs`),require(`./auto-deposit-back-helpers/index.cjs`);

package/common/src/functions/index.d.ts

@@ -9,4 +9,3 @@ export * from './pre-transaction/outputUtxoProcessing';
 export * from './utils/requireEnv';
 export * from './utils/resolve-sync.utils';
 export * from './utils/getDataFromTransaction';
-export * from './web3/uniswapAPI';

package/common/src/functions/index.mjs

@@ -9,12 +9,11 @@ import "./utils/cacheFunctions.mjs";
 import "./utils/enclaveHandshakeService.mjs";
 import "./utils/encryptInputForEnclave.mjs";
 import "./utils/solanaMint.utils.mjs";
-import "./utils/customEnclaveFunctionsRegister.mjs";
 import "./utils/serialize-utxos.utils.mjs";
+import "./utils/customEnclaveFunctionsRegister.mjs";
 import "./utils/addresses.mjs";
 import "./utils/tron.utils.mjs";
 import "./web3/events/getInputUtxoAndBalance.mjs";
-import "./utils/get-signature-header.mjs";
 import "./utils/legacyKeys.mjs";
 import "./utils/auth.utils.mjs";
 import "./utils/string.utils.mjs";
@@ -32,46 +31,44 @@ import "./pre-transaction/process-gas-estimates.mjs";
 import "./pre-transaction/getVolatileTransferAmount.mjs";
 import "./pre-transaction/constructAdminData.mjs";
 import "./utils/create-provider.mjs";
+import "./pre-transaction/calculateSolanaNullifierCount.mjs";
 import "./pre-transaction/convert-okx-instructions.mjs";
 import "./web3/getSolanaPriorityFee.mjs";
 import "./utils/process.utils.mjs";
 import "./pre-transaction/sendV0Transaction.mjs";
 import "./utils/bytes32.utils.mjs";
-import "./pre-transaction/recipientUtxoProcessing.mjs";
 import "./pre-transaction/ensureAmountChanges.mjs";
 import "./pre-transaction/getFeeStructure.mjs";
+import "./pre-transaction/getExternalSwapAddress.mjs";
 import "./pre-transaction/waitForDepositedUtxosInMerkleTree.mjs";
 import "./pre-transaction/buildCommitmentValidationData.mjs";
 import "./pre-transaction/index.mjs";
 import "./snarkjs/generateZkProof.mjs";
 import "./snarkjs/generateMainAndCommitmentZkProof.mjs";
+import "./snarkjs/fetchOnChainRootHashes.mjs";
+import "./utils/getContractAddress.mjs";
+import "./private-wallet/emporium.helpers.mjs";
+import "./snarkjs/constructGeneralZkProof.mjs";
+import "./utils/getSignerFromContract.mjs";
+import "./utils/tronSimulation.utils.mjs";
+import "./utils/tx-confirmation.utils.mjs";
+import "./utils/getUtxosFromReceipt.utils.mjs";
+import "./utils/getRecipientInfoFromUserKeys.mjs";
 import "./utils/resolve-sync.utils.mjs";
 import "./utils/reloadPage.mjs";
 import "./utils/cacheDevice.utils.mjs";
 import "./utils/involves-permit2-op.mjs";
 import "./utils/convertEmporiumOpToCallInfo.mjs";
-import "./utils/getRecipientInfoFromUserKeys.mjs";
 import "./utils/publicBalance.utils.mjs";
 import "./utils/postToOffscreen.mjs";
-import "./utils/getContractAddress.mjs";
-import "./utils/getUtxosFromReceipt.utils.mjs";
 import "./utils/getUtxosFromReceiptSolana.mjs";
 import "./utils/fees.utils.mjs";
 import "./utils/proxyAvatar.utils.mjs";
 import "./utils/enclave-signature-storage.mjs";
-import "./utils/tx-confirmation.utils.mjs";
-import "./utils/tronSimulation.utils.mjs";
-import "./utils/getSignerFromContract.mjs";
 import "./utils/temp-wallet.utils.mjs";
 import "./utils/mnemonics.mjs";
 import "./utils/nearIntents.utils.mjs";
 import "./utils/index.mjs";
-import "./snarkjs/fetchOnChainRootHashes.mjs";
-import "./private-wallet/emporium.helpers.mjs";
-import "./snarkjs/constructGeneralZkProof.mjs";
-import "./web3/uniswapAPI.mjs";
-import "./web3/odosAPI.mjs";
-import "./web3/oneInchAPI.mjs";
 import "./web3/lifiAPI.mjs";
 import "./web3/okxAPI.mjs";
 import "./web3/index.mjs";

package/common/src/functions/pre-transaction/calculateSolanaNullifierCount.cjs

@@ -1 +1 @@
-require(`../../constants/chains.constants.cjs`),require(`../web3/events/getShieldedBalance.cjs`),require(`./solana.cjs`),require(`../utils/create-provider.cjs`),require(`@solana/web3.js`);
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../error-handling/logger.cjs`),n=require(`../web3/events/getShieldedBalance.cjs`),r=require(`./solana.cjs`),i=require(`../utils/create-provider.cjs`),a=require(`../snarkjs/constructTxEnclave.cjs`);let o=require(`@solana/web3.js`);var s=6,c=async(c,l,u,d)=>{if(!e.isSolanaLike(l)||u.length===0||d.length===0)return 0;if(c.generateProofRemotely)try{return await a.estimateNullifiersEnclaveCall(c,{chainId:l,mintAddresses:u,amountChanges:d})}catch(e){return t.Logger.error(`calculateSolanaNullifierCount: enclave estimate failed, charging maximum rent`,e),s}let f;try{f=(await n.addPaddingToUtxos(c,l,u,d,6)).flat().filter(e=>e.amount!==0n)}catch(e){return t.Logger.log(`Error during getting inputUtxos locally:`,e),s}if(f.length===0)return 0;try{let{fetchRpcUrl:t,contractData:n}=e.networkRegistry[l],{originalDeployer:a,hinkalIdl:s}=n;if(!t)throw Error(`RPC URL not found for chain ID`);if(!a)throw Error(`Original deployer not found for chain ID`);if(!s)throw Error(`Hinkal IDL not found for chain ID`);let c=i.createCustomSolanaConnection(t),u=new o.PublicKey(a),d=new o.PublicKey(s.address),p=f.map(e=>r.getNullifierAccount(BigInt(e.getNullifier()),u,d));return(await c.getMultipleAccountsInfo(p)).filter(e=>e===null).length}catch(e){return t.Logger.error(`calculateSolanaNullifierCount: nullifier probe failed, charging for every note`,e),f.length}};exports.calculateSolanaNullifierCount=c;

package/common/src/functions/pre-transaction/calculateSolanaNullifierCount.mjs

@@ -1,5 +1,39 @@
-import "../../constants/chains.constants.mjs";
-import "../web3/events/getShieldedBalance.mjs";
-import "./solana.mjs";
-import "../utils/create-provider.mjs";
-import "@solana/web3.js";
+import { isSolanaLike as e, networkRegistry as t } from "../../constants/chains.constants.mjs";
+import { Logger as n } from "../../error-handling/logger.mjs";
+import { addPaddingToUtxos as r } from "../web3/events/getShieldedBalance.mjs";
+import { getNullifierAccount as i } from "./solana.mjs";
+import { createCustomSolanaConnection as a } from "../utils/create-provider.mjs";
+import { estimateNullifiersEnclaveCall as o } from "../snarkjs/constructTxEnclave.mjs";
+import { PublicKey as s } from "@solana/web3.js";
+//#region libs/shared/common/src/functions/pre-transaction/calculateSolanaNullifierCount.ts
+var c = 6, l = async (l, u, d, f) => {
+	if (!e(u) || d.length === 0 || f.length === 0) return 0;
+	if (l.generateProofRemotely) try {
+		return await o(l, {
+			chainId: u,
+			mintAddresses: d,
+			amountChanges: f
+		});
+	} catch (e) {
+		return n.error("calculateSolanaNullifierCount: enclave estimate failed, charging maximum rent", e), c;
+	}
+	let p;
+	try {
+		p = (await r(l, u, d, f, 6)).flat().filter((e) => e.amount !== 0n);
+	} catch (e) {
+		return n.log("Error during getting inputUtxos locally:", e), c;
+	}
+	if (p.length === 0) return 0;
+	try {
+		let { fetchRpcUrl: e, contractData: n } = t[u], { originalDeployer: r, hinkalIdl: o } = n;
+		if (!e) throw Error("RPC URL not found for chain ID");
+		if (!r) throw Error("Original deployer not found for chain ID");
+		if (!o) throw Error("Hinkal IDL not found for chain ID");
+		let c = a(e), l = new s(r), d = new s(o.address), f = p.map((e) => i(BigInt(e.getNullifier()), l, d));
+		return (await c.getMultipleAccountsInfo(f)).filter((e) => e === null).length;
+	} catch (e) {
+		return n.error("calculateSolanaNullifierCount: nullifier probe failed, charging for every note", e), p.length;
+	}
+};
+//#endregion
+export { l as calculateSolanaNullifierCount };

package/common/src/functions/pre-transaction/getExternalSwapAddress.cjs

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`),t=require(`../../types/external-action.types.cjs`);var n=(n,r)=>{let{contractData:i}=e.networkRegistry[n],a;switch(r){case t.ExternalActionId.Uniswap:a=i?.uniswapExternalActionAddress;break;case t.ExternalActionId.Odos:a=i?.odosExternalActionInstanceAddress;break;case t.ExternalActionId.OneInch:a=i?.oneInchExternalActionInstanceAddress;break;case t.ExternalActionId.Lifi:a=i?.hinkalAddress;break;default:a=i?.uniswapExternalActionAddress;break}if(!a)throw Error(`No external Address set during swap`);return a};exports.getExternalSwapAddress=n;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../types/external-action.types.cjs`);var n=(n,r)=>{if(r!==t.ExternalActionId.Lifi)throw Error(`Unsupported swap external action: ${r}`);let{contractData:i}=e.networkRegistry[n],a=i?.lifiExternalActionInstanceAddress;if(!a)throw Error(`No external Address set during swap`);return a};exports.getExternalSwapAddress=n;

package/common/src/functions/pre-transaction/getExternalSwapAddress.mjs

@@ -2,24 +2,8 @@ import { networkRegistry as e } from "../../constants/chains.constants.mjs";
 import { ExternalActionId as t } from "../../types/external-action.types.mjs";
 //#region libs/shared/common/src/functions/pre-transaction/getExternalSwapAddress.ts
 var n = (n, r) => {
-	let { contractData: i } = e[n], a;
-	switch (r) {
-		case t.Uniswap:
-			a = i?.uniswapExternalActionAddress;
-			break;
-		case t.Odos:
-			a = i?.odosExternalActionInstanceAddress;
-			break;
-		case t.OneInch:
-			a = i?.oneInchExternalActionInstanceAddress;
-			break;
-		case t.Lifi:
-			a = i?.hinkalAddress;
-			break;
-		default:
-			a = i?.uniswapExternalActionAddress;
-			break;
-	}
+	if (r !== t.Lifi) throw Error(`Unsupported swap external action: ${r}`);
+	let { contractData: i } = e[n], a = i?.lifiExternalActionInstanceAddress;
 	if (!a) throw Error("No external Address set during swap");
 	return a;
 };

package/common/src/functions/pre-transaction/getSolanaCalldataHash.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/protocol.constants.cjs`);let t=require(`ethers`),n=require(`@coral-xyz/anchor`);var r=(r,i,a,o,s,c,l,u)=>{let d=new n.BN(s.toString()),f=new n.BN(c.toString()),p=o.reduce((e,t)=>[...e,...new n.BN(t.length).toArray(`be`,8),...t],[]),m=l.reduce((e,t)=>{let r=[...new n.BN(t.programIndex).toArray(`be`,1),...new n.BN(t.accountIndexes.length).toArray(`be`,8),...t.accountIndexes,...new n.BN(t.data.length).toArray(`be`,8),...t.data];return[...e,...r]},[]),h=u.reduce((e,t)=>[...e,+!!t.isWritable,...t.pubkey.toBytes()],[]),g=[r.tokenNumber,r.nullifierAmount,r.outputAmount,...i.toBytes(),...a.toBytes(),...p,...d.toArray(`be`,8),...f.toArray(`be`,8),...m,...h];return BigInt(t.ethers.sha256(new Uint8Array(g)))%e.CIRCOM_P};exports.getSolanaCalldataHash=r;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/protocol.constants.cjs`);let t=require(`ethers`),n=require(`@coral-xyz/anchor`);var r=(r,i,a,o,s,c,l,u,d)=>{let f=new n.BN(c.toString()),p=new n.BN(l.toString()),m=o.reduce((e,t)=>[...e,...new n.BN(t.length).toArray(`be`,8),...t],[]),h=u.reduce((e,t)=>{let r=[...new n.BN(t.programIndex).toArray(`be`,1),...new n.BN(t.accountIndexes.length).toArray(`be`,8),...t.accountIndexes,...new n.BN(t.data.length).toArray(`be`,8),...t.data];return[...e,...r]},[]),g=d.reduce((e,t)=>[...e,+!!t.isWritable,...t.pubkey.toBytes()],[]),_=[r.tokenNumber,r.nullifierAmount,r.outputAmount,...i.toBytes(),...a.toBytes(),...m,...t.ethers.getBytes(s),...f.toArray(`be`,8),...p.toArray(`be`,8),...h,...g];return BigInt(t.ethers.sha256(new Uint8Array(_)))%e.CIRCOM_P};exports.getSolanaCalldataHash=r;

package/common/src/functions/pre-transaction/getSolanaCalldataHash.d.ts

@@ -1,4 +1,4 @@
 import { DimDataType } from '../../types/circom-data.types';
 import { AccountMeta, PublicKey } from '@solana/web3.js';
 import { HinkalInstruction } from './convert-okx-instructions';
-export declare const getSolanaCalldataHash: (dimensions: DimDataType, recipient: PublicKey, signer: PublicKey, encryptedOutputs: number[][], relayerFee: bigint, variableRate: bigint, instructions: HinkalInstruction[], remainingAccounts: AccountMeta[]) => bigint;
+export declare const getSolanaCalldataHash: (dimensions: DimDataType, recipient: PublicKey, signer: PublicKey, encryptedOutputs: number[][], onChainEncryptedOutput: string, relayerFee: bigint, variableRate: bigint, instructions: HinkalInstruction[], remainingAccounts: AccountMeta[]) => bigint;