@hinkal/common 0.3.5 → 0.3.7

package/common/src/functions/utils/index.mjs

@@ -5,6 +5,7 @@ import "./amounts.utils.mjs";
 import "./time.utils.mjs";
 import "./upToDateState.mjs";
 import "./cacheFunctions.mjs";
+import "./encodeTokenWithId.mjs";
 import "./enclaveHandshakeService.mjs";
 import "./encryptInputForEnclave.mjs";
 import "./solanaMint.utils.mjs";
@@ -33,15 +34,13 @@ import "../pre-transaction/sendV0Transaction.mjs";
 import "./bytes32.utils.mjs";
 import "../pre-transaction/getFeeStructure.mjs";
 import "../pre-transaction/getExternalSwapAddress.mjs";
-import "../pre-transaction/waitForDepositedUtxosInMerkleTree.mjs";
+import "../pre-transaction/speculativeUtxo.mjs";
 import "../pre-transaction/buildCommitmentValidationData.mjs";
 import "../pre-transaction/index.mjs";
+import "./solana-program.utils.mjs";
 import "./getContractAddress.mjs";
 import "./getSignerFromContract.mjs";
 import "./tronSimulation.utils.mjs";
-import "./tx-confirmation.utils.mjs";
-import "./getUtxosFromReceipt.utils.mjs";
-import "./getRecipientInfoFromUserKeys.mjs";
 import "./resolve-domain-address.mjs";
 import "./resolve-sync.utils.mjs";
 import "./convertIntegrationProviderToExternalActionId.mjs";
@@ -52,6 +51,7 @@ import "./cacheDevice.utils.mjs";
 import "./getBlockExplorerUrl.mjs";
 import "./involves-permit2-op.mjs";
 import "./convertEmporiumOpToCallInfo.mjs";
+import "./getRecipientInfoFromUserKeys.mjs";
 import "./publicBalance.utils.mjs";
 import "./rpc-int-encode.mjs";
 import "./walletBalances.utils.mjs";
@@ -62,17 +62,22 @@ import "./postToOffscreen.mjs";
 import "./solanaSendPreflight.utils.mjs";
 import "./voidWallets.utils.mjs";
 import "./prepareHinkal.mjs";
+import "./getUtxosFromReceipt.utils.mjs";
 import "./getUtxosFromReceiptSolana.mjs";
 import "./fees.utils.mjs";
+import "./recovery-balance.utils.mjs";
 import "./proxyAvatar.utils.mjs";
 import "./enclave-utxo-storage.mjs";
 import "./enclave-signature-storage.mjs";
+import "./tx-confirmation.utils.mjs";
 import "./buildClaimableDepositPlan.mjs";
 import "./deposit-claimable.utils.mjs";
 import "./formatter.mjs";
 import "./transfer-claimable.utils.mjs";
+import "./bridge-arrival.utils.mjs";
 import "./bridge-flow.utils.mjs";
 import "./bridge-claimable.utils.mjs";
+import "./solana-sponsored.utils.mjs";
 import "./temp-wallet.utils.mjs";
 import "./dispatchBalanceRefreshes.mjs";
 import "./lifi.utils.mjs";
@@ -83,3 +88,4 @@ import "./nearIntents.utils.mjs";
 import "./enclaveSessionSigning.mjs";
 import "./validateWalletAddress.mjs";
 import "./waasStamp.mjs";
+import "./sponsored-shield.utils.mjs";

package/common/src/functions/utils/nearIntents.utils.cjs

@@ -1 +1 @@
-require(`../../constants/chains.constants.cjs`);const e=require(`../../constants/protocol.constants.cjs`);require(`./addresses.cjs`),require(`./tron.utils.cjs`);const t=require(`../../types/external-action.types.cjs`);require(`./erc20tokenFunctions.cjs`);const n=require(`../pre-transaction/getFeeStructure.cjs`);require(`../../constants/bridging.constants.cjs`),require(`../../API/callNearIntentsAPI.cjs`);var r=(r,i,a)=>n.getFeeStructure(r,i.erc20TokenAddress,[i.erc20TokenAddress],t.ExternalActionId.Transact,[],e.HINKAL_PRIVATE_SEND_VARIABLE_RATE,{mintTo:i.erc20TokenAddress,recipient:a,nullifierCount:i.erc20TokenAddress===`11111111111111111111111111111111`?0:1});exports.buildNearBridgeFeeStructure=r;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`./caseInsensitive.utils.cjs`),r=require(`./addresses.cjs`),i=require(`./tron.utils.cjs`),a=require(`../../types/external-action.types.cjs`);require(`./erc20tokenFunctions.cjs`);const o=require(`../pre-transaction/getFeeStructure.cjs`),s=require(`../../constants/bridging.constants.cjs`),c=require(`../../API/callNearIntentsAPI.cjs`);var l=(t,n)=>{if(!n||!e.isTronLike(t))return n;try{return i.addressToHexFormat(n)}catch{return n}},u=async(e,t)=>{let i=s.NEAR_INTENTS_BLOCKCHAIN_BY_CHAIN_ID[e];if(!i)throw Error(`NEAR Intents does not support chain ${e}`);let a=(await c.getNearIntentsTokens()).filter(e=>e.blockchain===i),o=r.isNativePlaceholderAddress(t)?a.find(e=>!e.contractAddress):a.find(r=>r.contractAddress&&n.caseInsensitiveEqual(l(e,r.contractAddress),t));if(!o)throw Error(`No NEAR Intents asset for token ${t} on chain ${e}`);return o.assetId},d=(e,n,r)=>o.getFeeStructure(e,n.erc20TokenAddress,[n.erc20TokenAddress],a.ExternalActionId.Transact,[],t.HINKAL_PRIVATE_SEND_VARIABLE_RATE,{mintTo:n.erc20TokenAddress,recipient:r,nullifierCount:n.erc20TokenAddress===`11111111111111111111111111111111`?0:1});exports.buildNearBridgeFeeStructure=d,exports.resolveNearAssetId=u;

package/common/src/functions/utils/nearIntents.utils.mjs

@@ -1,17 +1,31 @@
-import "../../constants/chains.constants.mjs";
-import { HINKAL_PRIVATE_SEND_VARIABLE_RATE as e } from "../../constants/protocol.constants.mjs";
-import "./addresses.mjs";
-import "./tron.utils.mjs";
-import { ExternalActionId as t } from "../../types/external-action.types.mjs";
+import { isTronLike as e } from "../../constants/chains.constants.mjs";
+import { HINKAL_PRIVATE_SEND_VARIABLE_RATE as t } from "../../constants/protocol.constants.mjs";
+import { caseInsensitiveEqual as n } from "./caseInsensitive.utils.mjs";
+import { isNativePlaceholderAddress as r } from "./addresses.mjs";
+import { addressToHexFormat as i } from "./tron.utils.mjs";
+import { ExternalActionId as a } from "../../types/external-action.types.mjs";
 import "./erc20tokenFunctions.mjs";
-import { getFeeStructure as n } from "../pre-transaction/getFeeStructure.mjs";
-import "../../constants/bridging.constants.mjs";
-import "../../API/callNearIntentsAPI.mjs";
+import { getFeeStructure as o } from "../pre-transaction/getFeeStructure.mjs";
+import { NEAR_INTENTS_BLOCKCHAIN_BY_CHAIN_ID as s } from "../../constants/bridging.constants.mjs";
+import { getNearIntentsTokens as c } from "../../API/callNearIntentsAPI.mjs";
 //#region libs/shared/common/src/functions/utils/nearIntents.utils.ts
-var r = (r, i, a) => n(r, i.erc20TokenAddress, [i.erc20TokenAddress], t.Transact, [], e, {
-	mintTo: i.erc20TokenAddress,
-	recipient: a,
-	nullifierCount: i.erc20TokenAddress === "11111111111111111111111111111111" ? 0 : 1
+var l = (t, n) => {
+	if (!n || !e(t)) return n;
+	try {
+		return i(n);
+	} catch {
+		return n;
+	}
+}, u = async (e, t) => {
+	let i = s[e];
+	if (!i) throw Error(`NEAR Intents does not support chain ${e}`);
+	let a = (await c()).filter((e) => e.blockchain === i), o = r(t) ? a.find((e) => !e.contractAddress) : a.find((r) => r.contractAddress && n(l(e, r.contractAddress), t));
+	if (!o) throw Error(`No NEAR Intents asset for token ${t} on chain ${e}`);
+	return o.assetId;
+}, d = (e, n, r) => o(e, n.erc20TokenAddress, [n.erc20TokenAddress], a.Transact, [], t, {
+	mintTo: n.erc20TokenAddress,
+	recipient: r,
+	nullifierCount: n.erc20TokenAddress === "11111111111111111111111111111111" ? 0 : 1
 });
 //#endregion
-export { r as buildNearBridgeFeeStructure };
+export { d as buildNearBridgeFeeStructure, u as resolveNearAssetId };

package/common/src/functions/utils/publicBalance.utils.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`),require(`../../constants/chains.constants.cjs`);const e=require(`../../constants/protocol.constants.cjs`);require(`../../data-structures/http/index.cjs`),require(`./addresses.cjs`);const t=require(`../../error-handling/logger.cjs`);require(`./erc20tokenFunctions.cjs`);const n=require(`./create-provider.cjs`);require(`../../externalABIs/index.cjs`);const r=require(`../../externalABIs/swapAbi.cjs`);require(`./ipfs.cjs`),require(`../../data-structures/IndexedDB/key-val-store.cjs`);let i=require(`ethers`);require(`@solana/web3.js`),require(`@solana/spl-token`);var a=async(t,n,a)=>{try{let o=a.erc20TokenAddress,s,c=new i.ethers.Contract(a.erc20TokenAddress,r.ERC20ABI,t);s=o===e.zeroAddress?await t.getBalance(n):await c?.balanceOf(n);let l=s;return l<=0n?null:{token:a,balance:l}}catch{return null}},o=async(a,o,s)=>{try{let t=n.createJsonRpcProvider(a),c=new i.ethers.Contract(s,r.ERC20ABI,t),l;return l=s===e.zeroAddress?await t.getBalance(o):await c?.balanceOf(o),l}catch{return t.Logger.error(`Failed to fetch public balance for address ${o}`),null}};exports.getPublicBalance=a,exports.getPublicBalanceByTokenAddress=o;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`);require(`../../data-structures/http/index.cjs`);const n=require(`./solanaMint.utils.cjs`),r=require(`./addresses.cjs`),i=require(`../../error-handling/logger.cjs`),a=require(`./erc20tokenFunctions.cjs`),o=require(`./create-provider.cjs`);require(`../../externalABIs/index.cjs`);const s=require(`../../externalABIs/swapAbi.cjs`);require(`./ipfs.cjs`),require(`../../data-structures/IndexedDB/key-val-store.cjs`);let c=require(`ethers`),l=require(`@solana/web3.js`);var u=async(e,n,r)=>{try{let i=r.erc20TokenAddress,a,o=new c.ethers.Contract(r.erc20TokenAddress,s.ERC20ABI,e);a=i===t.zeroAddress?await e.getBalance(n):await o?.balanceOf(n);let l=a;return l<=0n?null:{token:r,balance:l}}catch{return null}},d=async(e,t,r)=>{if(r.erc20TokenAddress===`11111111111111111111111111111111`)return BigInt(await e.getBalance(t));let i=await n.getSolanaAtaAddress(r,t);if(!await e.getAccountInfo(i))return 0n;let a=await e.getTokenAccountBalance(i);return BigInt(a.value.amount)},f=async(n,u,f)=>{try{if(e.isSolanaLike(n)){if(!r.isValidSolanaPublicKey(u))return null;let{rpcUrl:t}=e.networkRegistry[n],i=o.createCustomSolanaConnection(t),s=new l.PublicKey(u);if(f===`11111111111111111111111111111111`)return BigInt(await i.getBalance(s));let c=await a.getErc20TokenFromAPI(n,f);return c?d(i,s,c):null}let i=o.createJsonRpcProvider(n),p=new c.ethers.Contract(f,s.ERC20ABI,i),m;return m=f===t.zeroAddress?await i.getBalance(u):await p?.balanceOf(u),m}catch{return i.Logger.error(`Failed to fetch public balance for address ${u}`),null}};exports.getPublicBalance=u,exports.getPublicBalanceByTokenAddress=f;

package/common/src/functions/utils/publicBalance.utils.d.ts

@@ -3,5 +3,4 @@ import { ERC20Token, TokenBalance } from '../../types/token.types';
 export declare const getPublicBalance: (provider: ethers.JsonRpcProvider, ethereumAddress: string, token: ERC20Token) => Promise<TokenBalance | null>;
 export declare const getPublicBalancesOfTokens: (chainId: number, ethereumAddress: string, tokens?: ERC20Token[]) => Promise<TokenBalance[]>;
 export declare const getPublicBalanceByTokenAddress: (chainId: number, ethereumAddress: string, tokenAddress: string) => Promise<bigint | null>;
-export declare const getPublicTransactionCount: (chainId: number, address: string) => Promise<number>;
 export declare const getSolanaPublicBalances: (chainId: number, ethereumAddress: string, tokensToUpdate: ERC20Token[]) => Promise<TokenBalance[]>;

package/common/src/functions/utils/publicBalance.utils.mjs

@@ -1,37 +1,50 @@
-import "../../constants/chains.constants.mjs";
-import { zeroAddress as e } from "../../constants/protocol.constants.mjs";
+import { isSolanaLike as e, networkRegistry as t } from "../../constants/chains.constants.mjs";
+import { zeroAddress as n } from "../../constants/protocol.constants.mjs";
 import "../../data-structures/http/index.mjs";
-import "./addresses.mjs";
-import { Logger as t } from "../../error-handling/logger.mjs";
-import "./erc20tokenFunctions.mjs";
-import { createJsonRpcProvider as n } from "./create-provider.mjs";
+import { getSolanaAtaAddress as r } from "./solanaMint.utils.mjs";
+import { isValidSolanaPublicKey as i } from "./addresses.mjs";
+import { Logger as a } from "../../error-handling/logger.mjs";
+import { getErc20TokenFromAPI as o } from "./erc20tokenFunctions.mjs";
+import { createCustomSolanaConnection as s, createJsonRpcProvider as c } from "./create-provider.mjs";
 import "../../externalABIs/index.mjs";
-import { ERC20ABI as r } from "../../externalABIs/swapAbi.mjs";
+import { ERC20ABI as l } from "../../externalABIs/swapAbi.mjs";
 import "./ipfs.mjs";
 import "../../data-structures/IndexedDB/key-val-store.mjs";
-import { ethers as i } from "ethers";
-import "@solana/web3.js";
-import "@solana/spl-token";
+import { ethers as u } from "ethers";
+import { PublicKey as d } from "@solana/web3.js";
 //#region libs/shared/common/src/functions/utils/publicBalance.utils.ts
-var a = async (t, n, a) => {
+var f = async (e, t, r) => {
 	try {
-		let o = a.erc20TokenAddress, s, c = new i.Contract(a.erc20TokenAddress, r, t);
-		s = o === e ? await t.getBalance(n) : await c?.balanceOf(n);
-		let l = s;
-		return l <= 0n ? null : {
-			token: a,
-			balance: l
+		let i = r.erc20TokenAddress, a, o = new u.Contract(r.erc20TokenAddress, l, e);
+		a = i === n ? await e.getBalance(t) : await o?.balanceOf(t);
+		let s = a;
+		return s <= 0n ? null : {
+			token: r,
+			balance: s
 		};
 	} catch {
 		return null;
 	}
-}, o = async (a, o, s) => {
+}, p = async (e, t, n) => {
+	if (n.erc20TokenAddress === "11111111111111111111111111111111") return BigInt(await e.getBalance(t));
+	let i = await r(n, t);
+	if (!await e.getAccountInfo(i)) return 0n;
+	let a = await e.getTokenAccountBalance(i);
+	return BigInt(a.value.amount);
+}, m = async (r, f, m) => {
 	try {
-		let t = n(a), c = new i.Contract(s, r, t), l;
-		return l = s === e ? await t.getBalance(o) : await c?.balanceOf(o), l;
+		if (e(r)) {
+			if (!i(f)) return null;
+			let { rpcUrl: e } = t[r], n = s(e), a = new d(f);
+			if (m === "11111111111111111111111111111111") return BigInt(await n.getBalance(a));
+			let c = await o(r, m);
+			return c ? p(n, a, c) : null;
+		}
+		let a = c(r), h = new u.Contract(m, l, a), g;
+		return g = m === n ? await a.getBalance(f) : await h?.balanceOf(f), g;
 	} catch {
-		return t.error(`Failed to fetch public balance for address ${o}`), null;
+		return a.error(`Failed to fetch public balance for address ${f}`), null;
 	}
 };
 //#endregion
-export { a as getPublicBalance, o as getPublicBalanceByTokenAddress };
+export { f as getPublicBalance, m as getPublicBalanceByTokenAddress };

package/common/src/functions/utils/recovery-balance.utils.cjs

@@ -0,0 +1 @@
+require(`../../data-structures/token-price-fetcher/TokenChecker.cjs`);

package/common/src/functions/utils/recovery-balance.utils.d.ts

@@ -0,0 +1,2 @@
+import { TokenBalanceWithUsdValue } from '../../types/token.types';
+export declare const isRecoverableBalance: (balance: TokenBalanceWithUsdValue) => boolean;

package/common/src/functions/utils/recovery-balance.utils.mjs

@@ -0,0 +1 @@
+import "../../data-structures/token-price-fetcher/TokenChecker.mjs";

package/common/src/functions/utils/solana-program.utils.cjs

@@ -0,0 +1 @@
+require(`../../../../_virtual/_rolldown/runtime.cjs`);let e=require(`@solana/web3.js`),t=require(`@coral-xyz/anchor`);var n=()=>{let t=e.Keypair.generate();return{publicKey:t.publicKey,payer:t,signTransaction:async e=>e,signAllTransactions:async e=>e}},r=(e,r)=>new t.Program(r,new t.AnchorProvider(e,n(),{preflightCommitment:`confirmed`,commitment:`confirmed`}));exports.createReadOnlySolanaProgram=r;

package/common/src/functions/utils/solana-program.utils.d.ts

@@ -0,0 +1,3 @@
+import { Idl, Program } from '@coral-xyz/anchor';
+import { Connection } from '@solana/web3.js';
+export declare const createReadOnlySolanaProgram: (connection: Connection, idl: Idl) => Program<Idl>;

package/common/src/functions/utils/solana-program.utils.mjs

@@ -0,0 +1,17 @@
+import { Keypair as e } from "@solana/web3.js";
+import { AnchorProvider as t, Program as n } from "@coral-xyz/anchor";
+//#region libs/shared/common/src/functions/utils/solana-program.utils.ts
+var r = () => {
+	let t = e.generate();
+	return {
+		publicKey: t.publicKey,
+		payer: t,
+		signTransaction: async (e) => e,
+		signAllTransactions: async (e) => e
+	};
+}, i = (e, i) => new n(i, new t(e, r(), {
+	preflightCommitment: "confirmed",
+	commitment: "confirmed"
+}));
+//#endregion
+export { i as createReadOnlySolanaProgram };

package/common/src/functions/utils/solana-sponsored.utils.cjs

@@ -0,0 +1 @@
+require(`../../../../_virtual/_rolldown/runtime.cjs`),require(`../../constants/protocol.constants.cjs`),require(`./solanaMint.utils.cjs`);const e=require(`../../API/API.cjs`),t=require(`../../data-structures/AccountActions/AccountActions.cjs`);let n=require(`@solana/web3.js`);require(`@solana/spl-token`);var r=async({chainId:r,tempSubAccount:i,intent:a})=>{let o=i.solanaPrivateKey??i.privateKey;if(!o)throw Error(`No signing key available for Solana sponsored transaction`);let s=await e.API.callRelayerSolanaSponsoredBuildAPI({...a,chainId:r});if(s.status!==`success`||!s.serializedTx||!s.ticketId)throw Error(s.error||`Solana sponsored transaction could not be built`);let c=n.VersionedTransaction.deserialize(Buffer.from(s.serializedTx,`base64`));t.AccountActions.signSolanaTransactionFromPrivateKey(r,o,c);let l=await e.API.callRelayerSolanaSponsoredSubmitAPI({chainId:r,ticketId:s.ticketId,serializedTx:Buffer.from(c.serialize()).toString(`base64`)});if(l.status!==`success`||!l.txHash)throw Error(l.error||`Solana sponsored transaction failed`);return{txHash:l.txHash,feeWei:BigInt(s.fee??`0`)}};exports.sendSolanaSponsoredTx=r;

package/common/src/functions/utils/solana-sponsored.utils.d.ts

@@ -0,0 +1,22 @@
+import { Connection, PublicKey, TransactionInstruction } from '@solana/web3.js';
+import { SolanaSponsoredBuildRequestBody } from '../../API/callRelayer';
+import { SubAccount } from '../../types/proxy.types';
+import { ERC20Token } from '../../types/token.types';
+interface SolanaAtaEntry {
+    ata: PublicKey;
+    instruction?: TransactionInstruction;
+}
+interface SendSolanaSponsoredTxParams {
+    chainId: number;
+    tempSubAccount: SubAccount;
+    intent: Omit<SolanaSponsoredBuildRequestBody, 'chainId'>;
+}
+export declare const buildCreateSolanaAtaInstructionsIfMissing: (connection: Connection, payer: PublicKey, owners: PublicKey[], token: ERC20Token) => Promise<SolanaAtaEntry[] | undefined>;
+export declare const buildSolanaRootBucketPrefund: (connection: Connection, relayerPubkey: PublicKey, rootBucketCurrent: PublicKey, rootInsertCount: number) => Promise<TransactionInstruction>;
+export declare const buildCloseSolanaAtaInstruction: (token: ERC20Token, ata: PublicKey, owner: PublicKey, rentRecipient: PublicKey) => TransactionInstruction;
+export declare const buildSolanaTokenTransferInstruction: (token: ERC20Token, fromAta: PublicKey, toAta: PublicKey, owner: PublicKey, amount: bigint) => TransactionInstruction;
+export declare const sendSolanaSponsoredTx: ({ chainId, tempSubAccount, intent, }: SendSolanaSponsoredTxParams) => Promise<{
+    txHash: string;
+    feeWei: bigint;
+}>;
+export {};

package/common/src/functions/utils/solana-sponsored.utils.mjs

@@ -0,0 +1,30 @@
+import "../../constants/protocol.constants.mjs";
+import "./solanaMint.utils.mjs";
+import { API as e } from "../../API/API.mjs";
+import { AccountActions as t } from "../../data-structures/AccountActions/AccountActions.mjs";
+import { VersionedTransaction as n } from "@solana/web3.js";
+import "@solana/spl-token";
+//#region libs/shared/common/src/functions/utils/solana-sponsored.utils.ts
+var r = async ({ chainId: r, tempSubAccount: i, intent: a }) => {
+	let o = i.solanaPrivateKey ?? i.privateKey;
+	if (!o) throw Error("No signing key available for Solana sponsored transaction");
+	let s = await e.callRelayerSolanaSponsoredBuildAPI({
+		...a,
+		chainId: r
+	});
+	if (s.status !== "success" || !s.serializedTx || !s.ticketId) throw Error(s.error || "Solana sponsored transaction could not be built");
+	let c = n.deserialize(Buffer.from(s.serializedTx, "base64"));
+	t.signSolanaTransactionFromPrivateKey(r, o, c);
+	let l = await e.callRelayerSolanaSponsoredSubmitAPI({
+		chainId: r,
+		ticketId: s.ticketId,
+		serializedTx: Buffer.from(c.serialize()).toString("base64")
+	});
+	if (l.status !== "success" || !l.txHash) throw Error(l.error || "Solana sponsored transaction failed");
+	return {
+		txHash: l.txHash,
+		feeWei: BigInt(s.fee ?? "0")
+	};
+};
+//#endregion
+export { r as sendSolanaSponsoredTx };

package/common/src/functions/utils/solanaMint.utils.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../crypto/poseidon.cjs`);let t=require(`ethers`),n=require(`@solana/web3.js`);var r=e=>{let n=e.toBytes();return BigInt(t.ethers.hexlify(n))},i=t=>{let i=typeof t==`string`?new n.PublicKey(t):t,a=r(i),o=a/2n**128n,s=a%2n**128n;return{mintAccountPart1:o,mintAccountPart2:s,compressedAddress:e.poseidonHash(o,s),mintPublicKey:i}};exports.convertPublicKeyToBigint=r,exports.formatMintAddress=i;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../crypto/poseidon.cjs`);let t=require(`ethers`),n=require(`@solana/web3.js`),r=require(`@solana/spl-token`);var i=e=>e?r.TOKEN_2022_PROGRAM_ID:r.TOKEN_PROGRAM_ID,a=(e,t)=>(0,r.getAssociatedTokenAddress)(new n.PublicKey(e.erc20TokenAddress),t,!0,i(e.is2022Program)),o=e=>{let n=e.toBytes();return BigInt(t.ethers.hexlify(n))},s=t=>{let r=typeof t==`string`?new n.PublicKey(t):t,i=o(r),a=i/2n**128n,s=i%2n**128n;return{mintAccountPart1:a,mintAccountPart2:s,compressedAddress:e.poseidonHash(a,s),mintPublicKey:r}},c=e=>{if(!e)return;let r=t.ethers.getBytes(e);if(r.length!==32)return;let i=new n.PublicKey(r),a=i.toBase58(),{compressedAddress:o}=s(i);return{mintBase58:a,compressedAddress:o}};exports.convertPublicKeyToBigint=o,exports.formatMintAddress=s,exports.getSolanaAtaAddress=a,exports.getSolanaTokenProgramId=i,exports.normalizeSolanaMintAddress=c;

package/common/src/functions/utils/solanaMint.utils.d.ts

@@ -1,10 +1,17 @@
 import { PublicKey } from '@solana/web3.js';
+import { ERC20Token } from '../../types/token.types';
 type FormattedMintAddress = {
     mintAccountPart1: bigint;
     mintAccountPart2: bigint;
     compressedAddress: string;
     mintPublicKey: PublicKey;
 };
+export declare const getSolanaTokenProgramId: (is2022Program?: boolean) => PublicKey;
+export declare const getSolanaAtaAddress: (token: ERC20Token, owner: PublicKey) => Promise<PublicKey>;
 export declare const convertPublicKeyToBigint: (key: PublicKey) => bigint;
 export declare const formatMintAddress: (mint: PublicKey | string) => FormattedMintAddress;
+export declare const normalizeSolanaMintAddress: (mintHex?: string) => {
+    mintBase58: string;
+    compressedAddress: string;
+} | undefined;
 export {};

package/common/src/functions/utils/solanaMint.utils.mjs

@@ -1,18 +1,28 @@
 import { poseidonHash as e } from "../../crypto/poseidon.mjs";
 import { ethers as t } from "ethers";
 import { PublicKey as n } from "@solana/web3.js";
+import { TOKEN_2022_PROGRAM_ID as r, TOKEN_PROGRAM_ID as i, getAssociatedTokenAddress as a } from "@solana/spl-token";
 //#region libs/shared/common/src/functions/utils/solanaMint.utils.ts
-var r = (e) => {
+var o = (e) => e ? r : i, s = (e, t) => a(new n(e.erc20TokenAddress), t, !0, o(e.is2022Program)), c = (e) => {
 	let n = e.toBytes();
 	return BigInt(t.hexlify(n));
-}, i = (t) => {
-	let i = typeof t == "string" ? new n(t) : t, a = r(i), o = a / 2n ** 128n, s = a % 2n ** 128n;
+}, l = (t) => {
+	let r = typeof t == "string" ? new n(t) : t, i = c(r), a = i / 2n ** 128n, o = i % 2n ** 128n;
 	return {
-		mintAccountPart1: o,
-		mintAccountPart2: s,
-		compressedAddress: e(o, s),
-		mintPublicKey: i
+		mintAccountPart1: a,
+		mintAccountPart2: o,
+		compressedAddress: e(a, o),
+		mintPublicKey: r
+	};
+}, u = (e) => {
+	if (!e) return;
+	let r = t.getBytes(e);
+	if (r.length !== 32) return;
+	let i = new n(r), a = i.toBase58(), { compressedAddress: o } = l(i);
+	return {
+		mintBase58: a,
+		compressedAddress: o
 	};
 };
 //#endregion
-export { r as convertPublicKeyToBigint, i as formatMintAddress };
+export { c as convertPublicKeyToBigint, l as formatMintAddress, s as getSolanaAtaAddress, o as getSolanaTokenProgramId, u as normalizeSolanaMintAddress };

package/common/src/functions/utils/sponsored-shield.utils.cjs

@@ -0,0 +1 @@
+require(`../../constants/chains.constants.cjs`),require(`../pre-transaction/solana.cjs`),require(`@solana/web3.js`);

package/common/src/functions/utils/sponsored-shield.utils.d.ts

@@ -0,0 +1,3 @@
+import { SolanaTransactionParams } from '../../types/solana.types';
+import { ERC20Token } from '../../types/token.types';
+export declare const getSolanaShieldFeeParams: (chainId: number, token: ERC20Token) => SolanaTransactionParams | undefined;

package/common/src/functions/utils/sponsored-shield.utils.mjs

@@ -0,0 +1,3 @@
+import "../../constants/chains.constants.mjs";
+import "../pre-transaction/solana.mjs";
+import "@solana/web3.js";

package/common/src/functions/utils/temp-wallet.utils.cjs

@@ -1 +1 @@
-const e=require(`../../data-structures/AccountActions/AccountActions.cjs`),t=require(`./proxyAvatar.utils.cjs`);var n=(t,n,r)=>{let i=t.userKeys.getSignerPrivateKeyFromNonce(r);return{privateKey:i,ethAddress:e.AccountActions.getSignerAddressFromPrivateKey(n,i)}},r=(e,n,r)=>({index:Number(e),name:`Hinkal Bridge Temp Wallet`,createdAt:new Date().toISOString(),isHidden:!1,isFavorite:!1,privateKey:n,ethAddress:r,isImported:!1,iconIndex:t.getRandomProxyAvatarIndex()});exports.buildTempSubAccount=r,exports.deriveTempWallet=n;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`./tron.utils.cjs`),n=require(`../../data-structures/AccountActions/AccountActions.cjs`),r=require(`./proxyAvatar.utils.cjs`);var i=e=>({index:Number(e),name:`Hinkal Bridge Temp Wallet`,createdAt:new Date().toISOString(),isHidden:!1,isFavorite:!1,isImported:!1,iconIndex:r.getRandomProxyAvatarIndex()}),a=(r,i)=>{if(e.isSolanaLike(r)){let e=n.AccountActions.getSolanaPrivateKeyFromEvmPrivateKey(i);return{address:n.AccountActions.getSolanaSignerFromPrivateKey(e).publicKey.toString(),privateKey:e}}let a=n.AccountActions.getSignerAddressFromPrivateKey(r,i);return{address:e.isTronLike(r)?t.evmHexToTronBase58Address(a):a,privateKey:i}},o=(e,t,n)=>a(t,e.userKeys.getSignerPrivateKeyFromNonce(n)),s=(e,t,n)=>({...i(e),privateKey:t,ethAddress:n}),c=(e,t,n)=>({...i(e),solanaPrivateKey:t,solanaAddress:n}),l=(t,n,{address:r,privateKey:i})=>e.isSolanaLike(n)?c(t,i,r):s(t,i,r),u=(e,t,n)=>l(n,t,o(e,t,n)),d=(e,t,n,r)=>{let i=e.userKeys.getSignerPrivateKeyFromNonce(r),o=a(t,i),s=a(n,i);return{sourceSubAccount:l(r,t,o),destinationSubAccount:l(r,n,s)}};exports.buildSolanaTempSubAccount=c,exports.buildTempSubAccount=s,exports.buildTempSubAccountForChain=u,exports.deriveBridgeTempWallets=d,exports.deriveTempWallet=o;

package/common/src/functions/utils/temp-wallet.utils.d.ts

@@ -1,7 +1,8 @@
 import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
 import { SubAccount } from '../../types/proxy.types';
-export declare const deriveTempWallet: (hinkal: IHinkal, chainId: number, nonce: bigint) => {
-    privateKey: string;
-    ethAddress: string;
-};
+import { BridgeTempWallets, DerivedTempWallet } from '../../types/temp-wallet.types';
+export declare const deriveTempWallet: (hinkal: IHinkal, chainId: number, nonce: bigint) => DerivedTempWallet;
 export declare const buildTempSubAccount: (nonce: bigint, privateKey: string, ethAddress: string) => SubAccount;
+export declare const buildSolanaTempSubAccount: (nonce: bigint, solanaPrivateKey: string, solanaAddress: string) => SubAccount;
+export declare const buildTempSubAccountForChain: (hinkal: IHinkal, chainId: number, nonce: bigint) => SubAccount;
+export declare const deriveBridgeTempWallets: (hinkal: IHinkal, sourceChainId: number, destinationChainId: number, nonce: bigint) => BridgeTempWallets;

package/common/src/functions/utils/temp-wallet.utils.mjs

@@ -1,22 +1,43 @@
-import { AccountActions as e } from "../../data-structures/AccountActions/AccountActions.mjs";
-import { getRandomProxyAvatarIndex as t } from "./proxyAvatar.utils.mjs";
+import { isSolanaLike as e, isTronLike as t } from "../../constants/chains.constants.mjs";
+import { evmHexToTronBase58Address as n } from "./tron.utils.mjs";
+import { AccountActions as r } from "../../data-structures/AccountActions/AccountActions.mjs";
+import { getRandomProxyAvatarIndex as i } from "./proxyAvatar.utils.mjs";
 //#region libs/shared/common/src/functions/utils/temp-wallet.utils.ts
-var n = (t, n, r) => {
-	let i = t.userKeys.getSignerPrivateKeyFromNonce(r);
-	return {
-		privateKey: i,
-		ethAddress: e.getSignerAddressFromPrivateKey(n, i)
-	};
-}, r = (e, n, r) => ({
+var a = (e) => ({
 	index: Number(e),
 	name: "Hinkal Bridge Temp Wallet",
 	createdAt: (/* @__PURE__ */ new Date()).toISOString(),
 	isHidden: !1,
 	isFavorite: !1,
-	privateKey: n,
-	ethAddress: r,
 	isImported: !1,
-	iconIndex: t()
-});
+	iconIndex: i()
+}), o = (i, a) => {
+	if (e(i)) {
+		let e = r.getSolanaPrivateKeyFromEvmPrivateKey(a);
+		return {
+			address: r.getSolanaSignerFromPrivateKey(e).publicKey.toString(),
+			privateKey: e
+		};
+	}
+	let o = r.getSignerAddressFromPrivateKey(i, a);
+	return {
+		address: t(i) ? n(o) : o,
+		privateKey: a
+	};
+}, s = (e, t, n) => o(t, e.userKeys.getSignerPrivateKeyFromNonce(n)), c = (e, t, n) => ({
+	...a(e),
+	privateKey: t,
+	ethAddress: n
+}), l = (e, t, n) => ({
+	...a(e),
+	solanaPrivateKey: t,
+	solanaAddress: n
+}), u = (t, n, { address: r, privateKey: i }) => e(n) ? l(t, i, r) : c(t, i, r), d = (e, t, n) => u(n, t, s(e, t, n)), f = (e, t, n, r) => {
+	let i = e.userKeys.getSignerPrivateKeyFromNonce(r), a = o(t, i), s = o(n, i);
+	return {
+		sourceSubAccount: u(r, t, a),
+		destinationSubAccount: u(r, n, s)
+	};
+};
 //#endregion
-export { r as buildTempSubAccount, n as deriveTempWallet };
+export { l as buildSolanaTempSubAccount, c as buildTempSubAccount, d as buildTempSubAccountForChain, f as deriveBridgeTempWallets, s as deriveTempWallet };

package/common/src/functions/utils/transfer-claimable.utils.cjs

@@ -1 +1 @@
-require(`./solanaMint.utils.cjs`),require(`./token-check.utils.cjs`),require(`../../error-handling/index.cjs`),require(`../pre-transaction/index.cjs`),require(`../../constants/index.cjs`),require(`./tx-confirmation.utils.cjs`),require(`./getUtxosFromReceipt.utils.cjs`),require(`../../data-structures/crypto-keys/index.cjs`),require(`./getRecipientInfoFromUserKeys.cjs`),require(`./getUtxosFromReceiptSolana.cjs`);
+require(`./token-check.utils.cjs`),require(`../../error-handling/index.cjs`),require(`../../constants/index.cjs`),require(`../../data-structures/crypto-keys/index.cjs`),require(`./getRecipientInfoFromUserKeys.cjs`),require(`./enclave-utxo-storage.cjs`),require(`./tx-confirmation.utils.cjs`);

package/common/src/functions/utils/transfer-claimable.utils.d.ts

@@ -1,9 +1,8 @@
 import { ErrorWithIndex } from '../../error-handling';
 import { PrivateSendAllocation } from '../../API';
-import { AdminTransactionType, ERC20Token, FeeStructure, PendingEnclaveUtxo, RecipientRequest } from '../../types';
+import { AdminTransactionType, ERC20Token, FeeStructure, RecipientRequest } from '../../types';
 import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
 export declare const transferClaimableUtxos: (hinkal: IHinkal, token: ERC20Token, recipients: RecipientRequest[], allocations: PrivateSendAllocation[], baseNonce: bigint, feeToken?: string, feeStructure?: FeeStructure, action?: AdminTransactionType) => Promise<{
-    pendingEnclaveUtxos: PendingEnclaveUtxo[];
     txHashes: string[];
     failedRecipientErrorMessage: ErrorWithIndex | undefined;
 }>;

package/common/src/functions/utils/transfer-claimable.utils.mjs

@@ -1,10 +1,7 @@
-import "./solanaMint.utils.mjs";
 import "./token-check.utils.mjs";
 import "../../error-handling/index.mjs";
-import "../pre-transaction/index.mjs";
 import "../../constants/index.mjs";
-import "./tx-confirmation.utils.mjs";
-import "./getUtxosFromReceipt.utils.mjs";
 import "../../data-structures/crypto-keys/index.mjs";
 import "./getRecipientInfoFromUserKeys.mjs";
-import "./getUtxosFromReceiptSolana.mjs";
+import "./enclave-utxo-storage.mjs";
+import "./tx-confirmation.utils.mjs";

package/common/src/functions/utils/tron.utils.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../snarkjs/constant.cjs`),r=require(`../../data-structures/http/HttpClient.cjs`);let i=require(`ethers`),a=require(`tronweb`);var o=2000n,s=e=>{let t=e.trim(),n=t.startsWith(`0x`)?t.slice(2):t;if(!/^[0-9a-fA-F]{64}$/.test(n))throw Error(`Tron private key must be 32 bytes (64 hex characters), with or without 0x prefix`);return n},c=(t,n)=>{let r=e.networkRegistry[t].fetchRpcUrl,i=n?s(n):void 0,o=i?new a.TronWeb({fullHost:r,privateKey:i}):new a.TronWeb({fullHost:r});return n||o.setAddress(`T9yD14Nj9j7xAB4dbGeiX9h8unkKHxuWwb`),o},l=e=>e?.startsWith(`T`)?e:a.TronWeb.address.fromHex(e),u=e=>e.startsWith(`0x`)?l(e):e,d=e=>{if(e.startsWith(`0x`))return e;if(e.startsWith(`41`))return e.replace(`41`,`0x`);if(e.startsWith(`T`))return d(a.TronWeb.address.toHex(e));throw Error(`Failed to convert address to hex format`)},f=t=>{if(t===e.chainIds.tronNile)return`https://nile.trongrid.io`;if(t===e.chainIds.tronMainnet)return`https://api.trongrid.io`;throw Error(`Unsupported Tron chain for wallet RPC: ${t}`)},p=(e,t)=>e.map(e=>Array.isArray(e)?p(e,t):t(e)),m=(e,t,n)=>{let r=new i.ethers.Interface(e);if(!r.getFunction(t))throw Error(`${t} ABI is missing for Tron call data creation`);let a=p(n,e=>typeof e==`string`&&e.startsWith(`T`)?d(e):e);return r.encodeFunctionData(t,a)},h=(e,t,n)=>e?BigInt(Math.max((e[t]??0)-(e[n]??0),0)):0n,g=(e,t)=>{let n=e.find(e=>e.key===t);if(!n||typeof n.value!=`number`)throw Error(`Missing Tron chain parameter: ${t}`);return BigInt(n.value)},_=async e=>{let t=`${f(e)}/wallet/getchainparameters`,n=await r.httpClient.post(t,{});if(!n?.chainParameter?.length)throw Error(`Failed to fetch Tron chain parameters from wallet RPC`);return n.chainParameter},v=async(e,t)=>{let n=`${f(e)}/wallet/getaccountresource`,i=d(t),a=i.startsWith(`0x`)?`41${i.slice(2)}`:i;return await r.httpClient.post(n,{address:a,visible:!1})},y=async(e,n,r,i,a,s)=>{let c={input:a,callValue:Number(s),feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN},[l,u]=await Promise.all([e.transactionBuilder.estimateEnergy(r,``,c,[],i),e.transactionBuilder.triggerConstantContract(r,``,c,[],i)]),d=await _(n),f=g(d,`getEnergyFee`),p=g(d,`getTransactionFee`),m=await v(n,i),y=BigInt(l?.energy_required??u?.energy_used??0),b=h(m,`EnergyLimit`,`EnergyUsed`),x=(y>b?y-b:0n)*f,S=BigInt(Math.ceil((u?.transaction?.raw_data_hex?.length??0)/2)),C=h(m,`freeNetLimit`,`freeNetUsed`)+h(m,`NetLimit`,`NetUsed`),w=x+(S>C?S-C:0n)*p,T=w+w*o/10000n;return T>BigInt(1e9)?BigInt(t.TRON_DEFAULT_FEE_LIMIT_SUN):T},b=e=>{let t=e[0].map(BigInt),n=e[1][0].map(BigInt),r=e[1][1].map(BigInt),i=e[2].map(BigInt),a=e[3].map(BigInt);return{a:t,b:[[n[1],n[0]],[r[1],r[0]]],c:i,publicSignals:a}},x=(e,t)=>{let n=i.ethers.AbiCoder.defaultAbiCoder().encode([`uint16`,`uint16`,`uint16`,`uint256`],[e.tokenNumber,e.nullifierAmount,e.outputAmount,t]);return BigInt(i.ethers.keccak256(n))},S=async(e,t,a,o,s,c,l)=>{let u=x(s,c),d=e.map(String),f=a.map(String),p=o.map(String),m={chainId:l,a:d,b:[t[0].map(String),t[1].map(String)],c:f,inputs:p,verifier_id:String(u),tokenNumber:s.tokenNumber,nullifierAmount:s.nullifierAmount,outputAmount:s.outputAmount},h=await r.httpClient.post(`${n.ENCLAVE_URL}/sign-proof`,m),{v:g,r:_,s:v}=i.ethers.Signature.from(h.signature.trim());return{v:g,r:_,s:v}},C=e=>{if(e.newRootHash===void 0)throw Error(`circomData.newRootHash is required for Tron transactions`);if(e.insertedLeafIndex===void 0)throw Error(`circomData.insertedLeafIndex is required for Tron transactions`);return[e.rootHashHinkal,e.rootHashHinkalIndex,e.erc20TokenAddresses,e.amountChanges,e.newRootHash,e.inputNullifiers,e.outCommitments,e.encryptedOutputs,e.slippageValues,[e.feeStructure.feeToken,e.feeStructure.flatFee,e.feeStructure.variableRate],e.timeStamp,e.calldataHash,e.emporiumMessage,e.publicSignalCount,e.relay,[e.externalActionData.externalAddress,e.externalActionData.externalActionId,e.externalActionData.externalActionMetadata],[e.hookData.preHookContract,e.hookData.postHookContract,e.hookData.preHookMetadata,e.hookData.postHookMetadata],e.originalSender,e.extraData,e.insertedLeafIndex,e.createBlockedUtxos??!1]},w=e=>{e[1]=[[e[1][0][1],e[1][0][0]],[e[1][1][1],e[1][1][0]]]},T=async(e,t,n,r,i,a=!0)=>{if(e){let{a:e,b:o,c:s,publicSignals:c}=b(t),l=await S(e,o,s,c,n,BigInt(r.externalActionData.externalActionId),i),u={v:l.v,r:l.r,s:l.s};return a&&w(t),u}};exports.addressToHexFormat=d,exports.circomDataToArray=C,exports.createTronCallData=m,exports.createTronWeb=c,exports.estimateTronFeeSunWithPadding=y,exports.evmHexToTronBase58Address=l,exports.fetchTronAccountResources=v,exports.fetchTronChainParameters=_,exports.generateProofSignatureRemotely=S,exports.getAvailableResource=h,exports.getChainParameterValue=g,exports.getTronWalletRpcUrl=f,exports.getVerifierId=x,exports.normalizeTronPrivateKey=s,exports.parseZkCalldata=b,exports.reorderZkCallData=T,exports.swapTronBCoordinate=w,exports.toTronBase58IfHex=u;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../snarkjs/constant.cjs`),r=require(`../../data-structures/http/HttpClient.cjs`);let i=require(`ethers`),a=require(`tronweb`);var o=2000n,s=e=>{let t=e.trim(),n=t.startsWith(`0x`)?t.slice(2):t;if(!/^[0-9a-fA-F]{64}$/.test(n))throw Error(`Tron private key must be 32 bytes (64 hex characters), with or without 0x prefix`);return n},c=(t,n)=>{let{rpcUrl:r}=e.networkRegistry[t],i=n?s(n):void 0,o=i?new a.TronWeb({fullHost:r,privateKey:i}):new a.TronWeb({fullHost:r});return n||o.setAddress(`T9yD14Nj9j7xAB4dbGeiX9h8unkKHxuWwb`),o},l=e=>e?.startsWith(`T`)?e:a.TronWeb.address.fromHex(e),u=e=>e.startsWith(`0x`)?l(e):e,d=e=>{if(e.startsWith(`0x`))return e;if(e.startsWith(`41`))return e.replace(`41`,`0x`);if(e.startsWith(`T`))return d(a.TronWeb.address.toHex(e));throw Error(`Failed to convert address to hex format`)},f=t=>{if(t===e.chainIds.tronNile)return`https://nile.trongrid.io`;if(t===e.chainIds.tronMainnet)return`https://api.trongrid.io`;throw Error(`Unsupported Tron chain for wallet RPC: ${t}`)},p=(e,t)=>e.map(e=>Array.isArray(e)?p(e,t):t(e)),m=(e,t,n)=>{let r=new i.ethers.Interface(e);if(!r.getFunction(t))throw Error(`${t} ABI is missing for Tron call data creation`);let a=p(n,e=>typeof e==`string`&&e.startsWith(`T`)?d(e):e);return r.encodeFunctionData(t,a)},h=(e,t,n)=>e?BigInt(Math.max((e[t]??0)-(e[n]??0),0)):0n,g=(e,t)=>{let n=e.find(e=>e.key===t);if(!n||typeof n.value!=`number`)throw Error(`Missing Tron chain parameter: ${t}`);return BigInt(n.value)},_=async e=>{let t=`${f(e)}/wallet/getchainparameters`,n=await r.httpClient.post(t,{});if(!n?.chainParameter?.length)throw Error(`Failed to fetch Tron chain parameters from wallet RPC`);return n.chainParameter},v=async(e,t)=>{let n=`${f(e)}/wallet/getaccountresource`,i=d(t),a=i.startsWith(`0x`)?`41${i.slice(2)}`:i;return await r.httpClient.post(n,{address:a,visible:!1})},y=async(e,n,r,i,a,s)=>{let c={input:a,callValue:Number(s),feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN},[l,u]=await Promise.all([e.transactionBuilder.estimateEnergy(r,``,c,[],i),e.transactionBuilder.triggerConstantContract(r,``,c,[],i)]),d=await _(n),f=g(d,`getEnergyFee`),p=g(d,`getTransactionFee`),m=await v(n,i),y=BigInt(l?.energy_required??u?.energy_used??0),b=h(m,`EnergyLimit`,`EnergyUsed`),x=(y>b?y-b:0n)*f,S=BigInt(Math.ceil((u?.transaction?.raw_data_hex?.length??0)/2)),C=h(m,`freeNetLimit`,`freeNetUsed`)+h(m,`NetLimit`,`NetUsed`),w=x+(S>C?S-C:0n)*p,T=w+w*o/10000n;return T>BigInt(1e9)?BigInt(t.TRON_DEFAULT_FEE_LIMIT_SUN):T},b=e=>{let t=e[0].map(BigInt),n=e[1][0].map(BigInt),r=e[1][1].map(BigInt),i=e[2].map(BigInt),a=e[3].map(BigInt);return{a:t,b:[[n[1],n[0]],[r[1],r[0]]],c:i,publicSignals:a}},x=(e,t)=>{let n=i.ethers.AbiCoder.defaultAbiCoder().encode([`uint16`,`uint16`,`uint16`,`uint256`],[e.tokenNumber,e.nullifierAmount,e.outputAmount,t]);return BigInt(i.ethers.keccak256(n))},S=async(e,t,a,o,s,c,l,u=!1)=>{let d=x(s,c),f=e.map(String),p=a.map(String),m=o.map(String),h={chainId:l,a:f,b:[t[0].map(String),t[1].map(String)],c:p,inputs:m,verifier_id:String(d),tokenNumber:s.tokenNumber,nullifierAmount:s.nullifierAmount,outputAmount:s.outputAmount,skipLock:u},g=await r.httpClient.post(`${n.ENCLAVE_URL}/sign-proof`,h),{v:_,r:v,s:y}=i.ethers.Signature.from(g.signature.trim());return{v:_,r:v,s:y}},C=e=>{if(e.newRootHash===void 0)throw Error(`circomData.newRootHash is required for Tron transactions`);if(e.insertedLeafIndex===void 0)throw Error(`circomData.insertedLeafIndex is required for Tron transactions`);return[e.rootHashHinkal,e.rootHashHinkalIndex,e.erc20TokenAddresses,e.amountChanges,e.newRootHash,e.inputNullifiers,e.outCommitments,e.encryptedOutputs,e.slippageValues,[e.feeStructure.feeToken,e.feeStructure.flatFee,e.feeStructure.variableRate],e.timeStamp,e.calldataHash,e.emporiumMessage,e.publicSignalCount,e.relay,[e.externalActionData.externalAddress,e.externalActionData.externalActionId,e.externalActionData.externalActionMetadata],[e.hookData.preHookContract,e.hookData.postHookContract,e.hookData.preHookMetadata,e.hookData.postHookMetadata],e.originalSender,e.extraData,e.insertedLeafIndex,e.createBlockedUtxos??!1]},w=e=>{e[1]=[[e[1][0][1],e[1][0][0]],[e[1][1][1],e[1][1][0]]]},T=async(e,t,n,r,i,a=!0,o=!1)=>{if(e){let{a:e,b:s,c,publicSignals:l}=b(t),u=await S(e,s,c,l,n,BigInt(r.externalActionData.externalActionId),i,o),d={v:u.v,r:u.r,s:u.s};return a&&w(t),d}};exports.addressToHexFormat=d,exports.circomDataToArray=C,exports.createTronCallData=m,exports.createTronWeb=c,exports.estimateTronFeeSunWithPadding=y,exports.evmHexToTronBase58Address=l,exports.fetchTronAccountResources=v,exports.fetchTronChainParameters=_,exports.generateProofSignatureRemotely=S,exports.getAvailableResource=h,exports.getChainParameterValue=g,exports.getTronWalletRpcUrl=f,exports.getVerifierId=x,exports.normalizeTronPrivateKey=s,exports.parseZkCalldata=b,exports.reorderZkCallData=T,exports.swapTronBCoordinate=w,exports.toTronBase58IfHex=u;

package/common/src/functions/utils/tron.utils.d.ts

@@ -25,11 +25,11 @@ export declare const parseZkCalldata: (zkCallData: NewZkCallDataType) => {
     publicSignals: bigint[];
 };
 export declare const getVerifierId: (dimensionsArg: DimDataType, externalActionId: bigint) => bigint;
-export declare const generateProofSignatureRemotely: (a: bigint[], b: bigint[][], c: bigint[], input: bigint[], dimensionsArg: DimDataType, externalActionId: bigint, chainId: number) => Promise<{
+export declare const generateProofSignatureRemotely: (a: bigint[], b: bigint[][], c: bigint[], input: bigint[], dimensionsArg: DimDataType, externalActionId: bigint, chainId: number, skipLock?: boolean) => Promise<{
     v: number;
     r: string;
     s: string;
 }>;
 export declare const circomDataToArray: (circomData: CircomDataType) => (string | number | bigint | boolean | string[][] | (string | bigint)[] | undefined)[];
 export declare const swapTronBCoordinate: (zkCallData: NewZkCallDataType) => void;
-export declare const reorderZkCallData: (isTron: boolean, zkCallData: NewZkCallDataType, dimData: DimDataType, circomData: CircomDataType, chainId: number, modifyZkCallData?: boolean) => Promise<TronProofSignature | undefined>;
+export declare const reorderZkCallData: (isTron: boolean, zkCallData: NewZkCallDataType, dimData: DimDataType, circomData: CircomDataType, chainId: number, modifyZkCallData?: boolean, skipLock?: boolean) => Promise<TronProofSignature | undefined>;

package/common/src/functions/utils/tron.utils.mjs

@@ -10,7 +10,7 @@ var s = 2000n, c = (e) => {
 	if (!/^[0-9a-fA-F]{64}$/.test(n)) throw Error("Tron private key must be 32 bytes (64 hex characters), with or without 0x prefix");
 	return n;
 }, l = (e, n) => {
-	let r = t[e].fetchRpcUrl, i = n ? c(n) : void 0, a = i ? new o({
+	let { rpcUrl: r } = t[e], i = n ? c(n) : void 0, a = i ? new o({
 		fullHost: r,
 		privateKey: i
 	}) : new o({ fullHost: r });
@@ -71,22 +71,23 @@ var s = 2000n, c = (e) => {
 		t
 	]);
 	return BigInt(a.keccak256(n));
-}, C = async (e, t, n, o, s, c, l) => {
-	let u = S(s, c), d = e.map(String), f = n.map(String), p = o.map(String), m = {
+}, C = async (e, t, n, o, s, c, l, u = !1) => {
+	let d = S(s, c), f = e.map(String), p = n.map(String), m = o.map(String), h = {
 		chainId: l,
-		a: d,
+		a: f,
 		b: [t[0].map(String), t[1].map(String)],
-		c: f,
-		inputs: p,
-		verifier_id: String(u),
+		c: p,
+		inputs: m,
+		verifier_id: String(d),
 		tokenNumber: s.tokenNumber,
 		nullifierAmount: s.nullifierAmount,
-		outputAmount: s.outputAmount
-	}, h = await i.post(`${r}/sign-proof`, m), { v: g, r: _, s: v } = a.Signature.from(h.signature.trim());
+		outputAmount: s.outputAmount,
+		skipLock: u
+	}, g = await i.post(`${r}/sign-proof`, h), { v: _, r: v, s: y } = a.Signature.from(g.signature.trim());
 	return {
-		v: g,
-		r: _,
-		s: v
+		v: _,
+		r: v,
+		s: y
 	};
 }, w = (e) => {
 	if (e.newRootHash === void 0) throw Error("circomData.newRootHash is required for Tron transactions");
@@ -129,14 +130,14 @@ var s = 2000n, c = (e) => {
 	];
 }, T = (e) => {
 	e[1] = [[e[1][0][1], e[1][0][0]], [e[1][1][1], e[1][1][0]]];
-}, E = async (e, t, n, r, i, a = !0) => {
+}, E = async (e, t, n, r, i, a = !0, o = !1) => {
 	if (e) {
-		let { a: e, b: o, c: s, publicSignals: c } = x(t), l = await C(e, o, s, c, n, BigInt(r.externalActionData.externalActionId), i), u = {
-			v: l.v,
-			r: l.r,
-			s: l.s
+		let { a: e, b: s, c, publicSignals: l } = x(t), u = await C(e, s, c, l, n, BigInt(r.externalActionData.externalActionId), i, o), d = {
+			v: u.v,
+			r: u.r,
+			s: u.s
 		};
-		return a && T(t), u;
+		return a && T(t), d;
 	}
 };
 //#endregion

package/common/src/functions/utils/tronSimulation.utils.cjs

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`),t=require(`../../data-structures/http/HttpClient.cjs`),n=require(`./tron.utils.cjs`);var r=async(r,i,a,o,s,c,l)=>{let u=n.addressToHexFormat(i),d=n.addressToHexFormat(c),f=e.networkRegistry[r].fetchRpcUrl;if(!f)throw Error(`missing rpc url for tron simulation`);let p=n.createTronCallData(o,a,s),m=await t.httpClient.post(f,{jsonrpc:`2.0`,id:1,method:`eth_call`,params:[{from:d,to:u,data:p,value:l?`0x${(l??0n).toString(16)}`:void 0},`latest`]});if(m.error){let e=m.error.message||`Unknown revert`;throw Error(`Tron Transaction Simulation reverted: ${e}`)}};exports.simulateTronTransaction=r;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../data-structures/http/HttpClient.cjs`),n=require(`./tron.utils.cjs`);var r=async(r,i,a,o,s,c,l)=>{let u=n.addressToHexFormat(i),d=n.addressToHexFormat(c),{rpcUrl:f}=e.networkRegistry[r],p=f.includes(`.g.alchemy.com/`)?f:`${f}/jsonrpc`,m=n.createTronCallData(o,a,s),h=await t.httpClient.post(p,{jsonrpc:`2.0`,id:1,method:`eth_call`,params:[{from:d,to:u,data:m,value:l?`0x${(l??0n).toString(16)}`:void 0},`latest`]});if(h.error){let e=h.error.message||`Unknown revert`;throw Error(`Tron Transaction Simulation reverted: ${e}`)}};exports.simulateTronTransaction=r;