@hinkal/common 0.2.31 → 0.2.32

package/functions/utils/tx-confirmation.utils.mjs

@@ -3,16 +3,16 @@ import { transactionErrorCodes as n } from "../../error-handling/error-codes.con
 import { TX_CONFIRMATION_TIMEOUT_EXTENDED as r } from "../../constants/tx-confirmation.constants.mjs";
 import "../../constants/index.mjs";
 import { Logger as i } from "../../error-handling/logger.mjs";
-import { createCustomRpcProvider as a, createCustomSolanaConnection as o } from "./create-provider.mjs";
+import { createCustomSolanaConnection as a, createJsonRpcProvider as o } from "./create-provider.mjs";
 //#region libs/shared/common/src/functions/utils/tx-confirmation.utils.ts
 var s = "confirmed", c = async (e, t, i = {}) => {
-	let { evmConfirmations: o = 1, evmTimeoutMs: s = r } = i, c = t.startsWith("0x") ? t : `0x${t}`, l = await a(e).waitForTransaction(c, o, s);
+	let { evmConfirmations: a = 1, evmTimeoutMs: s = r } = i, c = t.startsWith("0x") ? t : `0x${t}`, l = await o(e).waitForTransaction(c, a, s);
 	if (!l || l.status !== 1) throw Error(n.TRANSACTION_NOT_CONFIRMED);
 	return l;
 }, l = async (e, n, r = {}) => {
-	let { solanaCommitment: i = s } = r, { fetchRpcUrl: a } = t[e];
-	if (!a) throw Error("RPC URL not found for the specified chain ID");
-	let c = await o(a, i).confirmTransaction(n, i);
+	let { solanaCommitment: i = s } = r, { fetchRpcUrl: o } = t[e];
+	if (!o) throw Error("RPC URL not found for the specified chain ID");
+	let c = await a(o, i).confirmTransaction(n, i);
 	if (c.value.err) throw Error("Transaction failed");
 	return c;
 }, u = async (t, n, r = {}) => {

package/functions/utils/userAgent.cjs

@@ -1 +1 @@
-require(`../../_virtual/_rolldown/runtime.cjs`);var e=new(require(`ua-parser-js`)).UAParser,t=17,n=()=>{let{name:n,version:r}=e.getBrowser(),i=parseInt(r?.split(`.`)[0]??`0`,10);return!(n===`Safari`&&i&&t>i)};exports.browserSupported=n;
+require(`../../_virtual/_rolldown/runtime.cjs`);var e=new(require(`ua-parser-js`)).UAParser,t=17,n=()=>{let{name:n,version:r}=e.getBrowser(),i=parseInt(r?.split(`.`)[0]??`0`,10);return!(n===`Safari`&&i&&t>i)},r=()=>{let{type:t}=e.getDevice();return t===`mobile`||t===`tablet`};exports.browserSupported=n,exports.isMobileDevice=r;

package/functions/utils/userAgent.d.ts

@@ -1 +1,2 @@
 export declare const browserSupported: () => boolean;
+export declare const isMobileDevice: () => boolean;

package/functions/utils/userAgent.mjs

@@ -3,6 +3,9 @@ import { UAParser as e } from "ua-parser-js";
 var t = new e(), n = 17, r = () => {
 	let { name: e, version: r } = t.getBrowser(), i = parseInt(r?.split(".")[0] ?? "0", 10);
 	return !(e === "Safari" && i && n > i);
+}, i = () => {
+	let { type: e } = t.getDevice();
+	return e === "mobile" || e === "tablet";
 };
 //#endregion
-export { r as browserSupported };
+export { r as browserSupported, i as isMobileDevice };

package/functions/web3/connectors.utils.cjs

@@ -1 +1 @@
-const e=require(`../utils/getWalletGroupKey.utils.cjs`);require(`../utils/index.cjs`);var t={Trust:`Trust Wallet`},n=e=>e.type===`injected`,r=e=>e.id===`mock`,i=e=>e.id.startsWith(`solana`),a=e=>e.id.startsWith(`tron-`),o=n=>{let r=new Map;return n.forEach(n=>{let o=n.name,s=e.getWalletGroupKey(o),c=r.get(s),l=i(n),u=a(n);if(c){l?c.solanaConnector=n:u?c.tronConnector=n:c.evmConnector=n;return}let d={name:t[s]??n.name,icon:n.icon,evmConnector:l||u?void 0:n,solanaConnector:l?n:void 0,tronConnector:u?n:void 0};r.set(s,d)}),Array.from(r.values())};exports.groupConnectorsByWallet=o,exports.isInjectedConnector=n,exports.isMockConnector=r,exports.isSolanaConnector=i,exports.isTronConnector=a;
+const e=require(`../utils/getWalletGroupKey.utils.cjs`);require(`../utils/index.cjs`);var t={Trust:`Trust Wallet`,Ledger:`Ledger`},n=e=>e.type===`injected`,r=e=>e.id===`mock`,i=e=>e.id.startsWith(`solana`),a=e=>e.id.startsWith(`tron-`),o=e=>e.id===`walletConnect`||e.type===`walletConnect`,s=n=>{let r=new Map;return n.forEach(n=>{let o=n.name,s=e.getWalletGroupKey(o),c=r.get(s),l=i(n),u=a(n);if(c){l?c.solanaConnector=n:u?c.tronConnector=n:c.evmConnector=n;return}let d={name:t[s]??n.name,icon:n.icon,evmConnector:l||u?void 0:n,solanaConnector:l?n:void 0,tronConnector:u?n:void 0};r.set(s,d)}),Array.from(r.values())};exports.groupConnectorsByWallet=s,exports.isInjectedConnector=n,exports.isMockConnector=r,exports.isSolanaConnector=i,exports.isTronConnector=a,exports.isWalletConnectConnector=o;

package/functions/web3/connectors.utils.d.ts

@@ -4,4 +4,5 @@ export declare const isInjectedConnector: (c: Connector) => boolean;
 export declare const isMockConnector: (c: Connector) => boolean;
 export declare const isSolanaConnector: (c: Connector) => boolean;
 export declare const isTronConnector: (c: Connector) => boolean;
+export declare const isWalletConnectConnector: (c: Connector) => boolean;
 export declare const groupConnectorsByWallet: (connectors: Connector[]) => WalletGroup[];

package/functions/web3/connectors.utils.mjs

@@ -1,7 +1,10 @@
 import { getWalletGroupKey as e } from "../utils/getWalletGroupKey.utils.mjs";
 import "../utils/index.mjs";
 //#region libs/shared/common/src/functions/web3/connectors.utils.ts
-var t = { Trust: "Trust Wallet" }, n = (e) => e.type === "injected", r = (e) => e.id === "mock", i = (e) => e.id.startsWith("solana"), a = (e) => e.id.startsWith("tron-"), o = (n) => {
+var t = {
+	Trust: "Trust Wallet",
+	Ledger: "Ledger"
+}, n = (e) => e.type === "injected", r = (e) => e.id === "mock", i = (e) => e.id.startsWith("solana"), a = (e) => e.id.startsWith("tron-"), o = (e) => e.id === "walletConnect" || e.type === "walletConnect", s = (n) => {
 	let r = /* @__PURE__ */ new Map();
 	return n.forEach((n) => {
 		let o = n.name, s = e(o), c = r.get(s), l = i(n), u = a(n);
@@ -20,4 +23,4 @@ var t = { Trust: "Trust Wallet" }, n = (e) => e.type === "injected", r = (e) =>
 	}), Array.from(r.values());
 };
 //#endregion
-export { o as groupConnectorsByWallet, n as isInjectedConnector, r as isMockConnector, i as isSolanaConnector, a as isTronConnector };
+export { s as groupConnectorsByWallet, n as isInjectedConnector, r as isMockConnector, i as isSolanaConnector, a as isTronConnector, o as isWalletConnectConnector };

package/functions/web3/events/balanceChangedHandler.cjs

@@ -1 +1 @@
-const e=require(`../../../types/hinkal.types.cjs`);require(`../../../types/index.cjs`);var t=()=>{let t=e.EventType.BalanceChange;typeof document<`u`?document.dispatchEvent(new Event(t)):process?.emit(`message`,t,void 0)};exports.balanceChangedHandler=t;
+const e=require(`../../../types/hinkal.types.cjs`);require(`../../../types/index.cjs`);var t=t=>{let n=e.EventType.BalanceChange,r=new CustomEvent(n,{detail:t});typeof document<`u`?document.dispatchEvent(r):process?.emit(`message`,r,void 0)};exports.balanceChangedHandler=t;

package/functions/web3/events/balanceChangedHandler.d.ts

@@ -1 +1,2 @@
-export declare const balanceChangedHandler: () => void;
+import { PrivateBalanceUpdateEventType } from '../../../types';
+export declare const balanceChangedHandler: (detail: PrivateBalanceUpdateEventType) => void;

package/functions/web3/events/balanceChangedHandler.mjs

@@ -1,9 +1,9 @@
 import { EventType as e } from "../../../types/hinkal.types.mjs";
 import "../../../types/index.mjs";
 //#region libs/shared/common/src/functions/web3/events/balanceChangedHandler.ts
-var t = () => {
-	let t = e.BalanceChange;
-	typeof document < "u" ? document.dispatchEvent(new Event(t)) : process?.emit("message", t, void 0);
+var t = (t) => {
+	let n = e.BalanceChange, r = new CustomEvent(n, { detail: t });
+	typeof document < "u" ? document.dispatchEvent(r) : process?.emit("message", r, void 0);
 };
 //#endregion
 export { t as balanceChangedHandler };

package/functions/web3/events/getInputUtxoAndBalance.cjs

@@ -1 +1 @@
-require(`../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../../constants/chains.constants.cjs`),t=require(`../../utils/caseInsensitive.utils.cjs`),n=require(`../../utils/addresses.cjs`),r=require(`../../../API/scheduled-transactions-calls.cjs`),i=require(`../../../data-structures/utxo/Utxo.cjs`),a=require(`../../utils/upToDateState.cjs`),o=require(`../../utils/cacheFunctions.cjs`),s=require(`../../utils/encodeTokenWithId.cjs`),c=require(`../../utils/solanaMint.utils.cjs`),l=require(`./getInputUtxosEnclave.cjs`),u=require(`../../utils/tron.utils.cjs`);var d=new(require(`async-mutex`)).Mutex,f=async(e,t,n,r,i,s,c,l,u)=>d.runExclusive(async()=>{u+=1;let d=s.slice(u),{lastOutput:f,additionalEncryptedOutputs:p}=await e.utxoUtils.batchProcess(d,l,t,n),m=[...c,...p];return await a.checkAddressNotUpdated(e,r),o.setHinkalCache({lastOutput:f,encryptedOutputs:m},e,n,i),await e.utxoUtils.buildBatchProcess(m,t,n)}),p=async(e,t,n,r)=>{let{utxos:i,encryptedOutputs:a,lastOutput:s}=await l.getInputUtxosEnclave(e,n,t);return o.setHinkalCache({encryptedOutputs:a,lastOutput:s},e,n,r),i},m=async(e,t,n,r,i,a,o,s,c)=>{try{return await p(e,t,n,i)}catch{return f(e,t,n,r,i,a,o,s,c)}},h=e=>{if(Array.isArray(e))return e;if(e!==void 0)return[e]},g=async(e,t,n)=>await e.utxoUtils.batchFilterUtxosWithNullifier(t,n),_=(e,t,n,r,a,o,s)=>{for(e.sort((e,t)=>e.amount<=t.amount?1:-1);e.length<t||e.length>t&&e.length<6;)if(e.push(new i.Utxo({amount:0n,erc20TokenAddress:a,mintAddress:s,shieldedPrivateKey:r,tokenId:o})),n)for(;e.length>6;)e.splice(e.length-1)},v=async({hinkal:e,chainId:t,passedShieldedPublicKey:n=void 0,ethAddress:r=void 0,resetCacheBefore:i=!1,allowRemoteDecryption:s=!1,useBlockedUtxos:c=!1})=>{let l=r??await e.getEthereumAddress(),u=n??e.userKeys.getShieldedPublicKey(),{userKeys:d}=e,p=e.encryptedOutputsByChain[t],h=e.nullifiersByChain[t],_=Array.from(p);i&&o.resetCache(e,t,u);let{encryptedOutputs:v,lastOutput:y}=o.getHinkalCache(e,t,u);await a.checkAddressNotUpdated(e,l);let b=y!==``,x=_.findIndex(e=>e.value===y),S=x>-1,C=!b&&x===-1,w=e.areMerkleTreeUpdatesDisabled(),T=!w&&(S||!s&&C),E=!w&&s&&C,D=!T&&!E,O=[];T?O=await f(e,d,t,l,u,_,v,y,x):E?O=await m(e,d,t,l,u,_,v,y,x):D&&(O=await e.utxoUtils.buildBatchProcess(v,d,t)),await a.checkAddressNotUpdated(e,l);let k=await g(e,O,h);return{inputUtxos:c?k.filter(e=>e.isBlocked):k.filter(e=>!e.isBlocked)}},y=async({hinkal:t,chainId:i,passedShieldedPublicKey:a=void 0,ethAddress:o=void 0,resetCacheBefore:s=!1,allowRemoteDecryption:c=!1})=>{let l=o??await t.getEthereumAddressByChain(i),d=n.hashEthereumAddress(e.isTronLike(i)?u.addressToHexFormat(l):l),{inputUtxos:f}=await v({hinkal:t,chainId:i,passedShieldedPublicKey:a,ethAddress:l,resetCacheBefore:s,allowRemoteDecryption:c,useBlockedUtxos:!0});if(!f.length)return{inputUtxos:[]};let{indexes:p}=await r.getScheduledTransactionsNullifierIndexes({hashedEthereumAddress:d,nullifiers:f.map(e=>e.getNullifier())});return{inputUtxos:p.map(e=>f[e]).filter(e=>!!e)}},b=async({hinkal:n,tokenWithId:r,minInput:i=2,sliceIfMore6:a=!0,chainId:o,passedShieldedPrivateKey:l=void 0,passedShieldedPublicKey:u=void 0,ethAddress:d=void 0,resetCacheBefore:f=!1,ensuredTokensWithId:p,useBlockedUtxos:m=!1,allowRemoteDecryption:g=!0})=>{let b=l??n.userKeys.getShieldedPrivateKey(),{inputUtxos:x}=m?await y({hinkal:n,chainId:o,ethAddress:d,passedShieldedPrivateKey:l,resetCacheBefore:f,allowRemoteDecryption:g}):await v({hinkal:n,tokenWithId:r,minInput:i,sliceIfMore6:a,chainId:o,passedShieldedPrivateKey:l,passedShieldedPublicKey:u,ethAddress:d,resetCacheBefore:f,allowRemoteDecryption:g}),S=h(r),C=new Map;x.forEach(e=>{let n=e.getTokenAddress(o);if(S&&!S.some(r=>t.caseInsensitiveEqual(r.erc20TokenAddress,n)&&r.tokenId===e.tokenId))return;let r=s.encodeTokenWithId(o,{erc20TokenAddress:n,tokenId:e.tokenId}),i=C.get(r)??[];C.set(r,[...i,e])}),p?.forEach(e=>{let t=s.encodeTokenWithId(o,{erc20TokenAddress:e.erc20TokenAddress,tokenId:e.tokenId});C.set(t,C.get(t)??[])});for(let[t,n]of C){let r=t.split(`-`)[0],s=Number(t.split(`-`)[1]),l=e.isSolanaLike(o),u=l?r:void 0;_(n,i,a,b,l?c.formatMintAddress(r).compressedAddress.toLowerCase():r.toLowerCase(),s,u)}return C};exports.attemptGetInputUtxosRemotely=m,exports.getInputUtxoAndBalance=v,exports.getInputUtxoAndBalanceOfStuckUtxos=y,exports.getInputUtxoAndBalancePerToken=b,exports.getInputUtxosRemotely=p;
+require(`../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../../constants/chains.constants.cjs`),t=require(`../../utils/caseInsensitive.utils.cjs`),n=require(`../../utils/addresses.cjs`),r=require(`../../../API/scheduled-transactions-calls.cjs`),i=require(`../../../data-structures/utxo/Utxo.cjs`),a=require(`../../utils/upToDateState.cjs`),o=require(`../../utils/cacheFunctions.cjs`),s=require(`../../utils/encodeTokenWithId.cjs`),c=require(`../../utils/solanaMint.utils.cjs`),l=require(`./getInputUtxosEnclave.cjs`),u=require(`../../utils/tron.utils.cjs`);var d=new(require(`async-mutex`)).Mutex,f=async(e,t,n,r,i,s,c,l,u)=>d.runExclusive(async()=>{u+=1;let d=s.slice(u),{lastOutput:f,additionalEncryptedOutputs:p}=await e.utxoUtils.batchProcess(d,l,t,n),m=[...c,...p];return await a.checkAddressNotUpdated(e,r),o.setHinkalCache({lastOutput:f,encryptedOutputs:m},e,n,i),await e.utxoUtils.buildBatchProcess(m,t,n)}),p=async(e,t,n,r)=>{let{utxos:i,encryptedOutputs:a,lastOutput:s}=await l.getInputUtxosEnclave(e,n,t);return o.setHinkalCache({encryptedOutputs:a,lastOutput:s},e,n,r),i},m=async(e,t,n,r,i,a,o,s,c)=>{try{return await p(e,t,n,i)}catch{return f(e,t,n,r,i,a,o,s,c)}},h=e=>{if(Array.isArray(e))return e;if(e!==void 0)return[e]},g=async(e,t,n)=>await e.utxoUtils.batchFilterUtxosWithNullifier(t,n),_=(e,t,n,r,a,o,s,c)=>{for(e.sort((e,t)=>e.amount<=t.amount?1:-1);e.length<t||e.length>t&&e.length<6;)if(e.push(new i.Utxo({amount:0n,erc20TokenAddress:o,mintAddress:c,nullifyingKey:r,spendingPublicKey:a,isNewStyle:!0})),n)for(;e.length>6;)e.splice(e.length-1)},v=async({hinkal:e,chainId:t,passedShieldedPublicKey:n=void 0,ethAddress:r=void 0,resetCacheBefore:i=!1,allowRemoteDecryption:s=!1,useBlockedUtxos:c=!1})=>{let l=r??await e.getEthereumAddress(),u=n??e.userKeys.getShieldedPublicKey(),{userKeys:d}=e,p=e.encryptedOutputsByChain[t],h=e.nullifiersByChain[t],_=Array.from(p);i&&o.resetCache(e,t,u);let{encryptedOutputs:v,lastOutput:y}=o.getHinkalCache(e,t,u);await a.checkAddressNotUpdated(e,l);let b=y!==``,x=_.findIndex(e=>e.value===y),S=x>-1,C=!b&&x===-1,w=e.areMerkleTreeUpdatesDisabled(),T=!w&&(S||!s&&C),E=!w&&s&&C,D=!T&&!E,O=[];T?O=await f(e,d,t,l,u,_,v,y,x):E?O=await m(e,d,t,l,u,_,v,y,x):D&&(O=await e.utxoUtils.buildBatchProcess(v,d,t)),await a.checkAddressNotUpdated(e,l);let k=await g(e,O,h);return{inputUtxos:c?k.filter(e=>e.isBlocked):k.filter(e=>!e.isBlocked)}},y=async({hinkal:t,chainId:i,passedShieldedPublicKey:a=void 0,ethAddress:o=void 0,resetCacheBefore:s=!1,allowRemoteDecryption:c=!1})=>{let l=o??await t.getEthereumAddressByChain(i),d=n.hashEthereumAddress(e.isTronLike(i)?u.addressToHexFormat(l):l),{inputUtxos:f}=await v({hinkal:t,chainId:i,passedShieldedPublicKey:a,ethAddress:l,resetCacheBefore:s,allowRemoteDecryption:c,useBlockedUtxos:!0});if(!f.length)return{inputUtxos:[]};let{indexes:p}=await r.getScheduledTransactionsNullifierIndexes({hashedEthereumAddress:d,nullifiers:f.map(e=>e.getNullifier())});return{inputUtxos:p.map(e=>f[e]).filter(e=>!!e)}},b=async({hinkal:n,tokenWithId:r,minInput:i=2,sliceIfMore6:a=!0,chainId:o,passedShieldedPrivateKey:l=void 0,passedShieldedPublicKey:u=void 0,ethAddress:d=void 0,resetCacheBefore:f=!1,ensuredTokensWithId:p,allowRemoteDecryption:m=!1,useBlockedUtxos:g=!1})=>{let b=l??n.userKeys.getShieldedPrivateKey(),x=n.userKeys.getSpendingKeyPair().pubSpendingBJJPoint,{inputUtxos:S}=g?await y({hinkal:n,chainId:o,ethAddress:d,passedShieldedPrivateKey:l,resetCacheBefore:f,allowRemoteDecryption:m}):await v({hinkal:n,tokenWithId:r,minInput:i,sliceIfMore6:a,chainId:o,passedShieldedPrivateKey:l,passedShieldedPublicKey:u,ethAddress:d,resetCacheBefore:f,allowRemoteDecryption:m}),C=h(r),w=new Map;S.forEach(e=>{let n=e.getTokenAddress(o);if(C&&!C.some(e=>t.caseInsensitiveEqual(e.erc20TokenAddress,n)))return;let r=s.encodeTokenWithId(o,{erc20TokenAddress:n,tokenId:0}),i=w.get(r)??[];w.set(r,[...i,e])}),p?.forEach(e=>{let t=s.encodeTokenWithId(o,{erc20TokenAddress:e.erc20TokenAddress,tokenId:0});w.set(t,w.get(t)??[])});for(let[t,n]of w){let r=t.split(`-`)[0],s=Number(t.split(`-`)[1]),l=e.isSolanaLike(o),u=l?r:void 0;_(n,i,a,b,x,l?c.formatMintAddress(r).compressedAddress.toLowerCase():r.toLowerCase(),s,u)}return w};exports.attemptGetInputUtxosRemotely=m,exports.getInputUtxoAndBalance=v,exports.getInputUtxoAndBalanceOfStuckUtxos=y,exports.getInputUtxoAndBalancePerToken=b,exports.getInputUtxosRemotely=p;

package/functions/web3/events/getInputUtxoAndBalance.d.ts

@@ -34,5 +34,5 @@ export declare const getInputUtxoAndBalance: ({ hinkal, chainId, passedShieldedP
 export declare const getInputUtxoAndBalanceOfStuckUtxos: ({ hinkal, chainId, passedShieldedPublicKey, ethAddress, resetCacheBefore, allowRemoteDecryption, }: IGetInputUtxos) => Promise<{
     inputUtxos: Utxo[];
 }>;
-export declare const getInputUtxoAndBalancePerToken: ({ hinkal, tokenWithId, minInput, sliceIfMore6, chainId, passedShieldedPrivateKey, passedShieldedPublicKey, ethAddress, resetCacheBefore, ensuredTokensWithId, useBlockedUtxos, allowRemoteDecryption, }: IGetInputUtxos) => Promise<Map<string, Utxo[]>>;
+export declare const getInputUtxoAndBalancePerToken: ({ hinkal, tokenWithId, minInput, sliceIfMore6, chainId, passedShieldedPrivateKey, passedShieldedPublicKey, ethAddress, resetCacheBefore, ensuredTokensWithId, allowRemoteDecryption, useBlockedUtxos, }: IGetInputUtxos) => Promise<Map<string, Utxo[]>>;
 export {};

package/functions/web3/events/getInputUtxoAndBalance.mjs

@@ -33,13 +33,14 @@ var h = new m(), g = async (e, t, n, r, i, a, s, c, u) => h.runExclusive(async (
 }, y = (e) => {
 	if (Array.isArray(e)) return e;
 	if (e !== void 0) return [e];
-}, b = async (e, t, n) => await e.utxoUtils.batchFilterUtxosWithNullifier(t, n), x = (e, t, n, r, i, o, s) => {
+}, b = async (e, t, n) => await e.utxoUtils.batchFilterUtxosWithNullifier(t, n), x = (e, t, n, r, i, o, s, c) => {
 	for (e.sort((e, t) => e.amount <= t.amount ? 1 : -1); e.length < t || e.length > t && e.length < 6;) if (e.push(new a({
 		amount: 0n,
-		erc20TokenAddress: i,
-		mintAddress: s,
-		shieldedPrivateKey: r,
-		tokenId: o
+		erc20TokenAddress: o,
+		mintAddress: c,
+		nullifyingKey: r,
+		spendingPublicKey: i,
+		isNewStyle: !0
 	})), n) for (; e.length > 6;) e.splice(e.length - 1);
 }, S = async ({ hinkal: e, chainId: t, passedShieldedPublicKey: n = void 0, ethAddress: r = void 0, resetCacheBefore: i = !1, allowRemoteDecryption: a = !1, useBlockedUtxos: l = !1 }) => {
 	let u = r ?? await e.getEthereumAddress(), d = n ?? e.userKeys.getShieldedPublicKey(), { userKeys: f } = e, p = e.encryptedOutputsByChain[t], m = e.nullifiersByChain[t], h = Array.from(p);
@@ -66,14 +67,14 @@ var h = new m(), g = async (e, t, n, r, i, a, s, c, u) => h.runExclusive(async (
 		nullifiers: d.map((e) => e.getNullifier())
 	});
 	return { inputUtxos: f.map((e) => d[e]).filter((e) => !!e) };
-}, w = async ({ hinkal: t, tokenWithId: r, minInput: i = 2, sliceIfMore6: a = !0, chainId: o, passedShieldedPrivateKey: s = void 0, passedShieldedPublicKey: c = void 0, ethAddress: l = void 0, resetCacheBefore: f = !1, ensuredTokensWithId: p, useBlockedUtxos: m = !1, allowRemoteDecryption: h = !0 }) => {
-	let g = s ?? t.userKeys.getShieldedPrivateKey(), { inputUtxos: _ } = m ? await C({
+}, w = async ({ hinkal: t, tokenWithId: r, minInput: i = 2, sliceIfMore6: a = !0, chainId: o, passedShieldedPrivateKey: s = void 0, passedShieldedPublicKey: c = void 0, ethAddress: l = void 0, resetCacheBefore: f = !1, ensuredTokensWithId: p, allowRemoteDecryption: m = !1, useBlockedUtxos: h = !1 }) => {
+	let g = s ?? t.userKeys.getShieldedPrivateKey(), _ = t.userKeys.getSpendingKeyPair().pubSpendingBJJPoint, { inputUtxos: v } = h ? await C({
 		hinkal: t,
 		chainId: o,
 		ethAddress: l,
 		passedShieldedPrivateKey: s,
 		resetCacheBefore: f,
-		allowRemoteDecryption: h
+		allowRemoteDecryption: m
 	}) : await S({
 		hinkal: t,
 		tokenWithId: r,
@@ -84,28 +85,28 @@ var h = new m(), g = async (e, t, n, r, i, a, s, c, u) => h.runExclusive(async (
 		passedShieldedPublicKey: c,
 		ethAddress: l,
 		resetCacheBefore: f,
-		allowRemoteDecryption: h
-	}), v = y(r), b = /* @__PURE__ */ new Map();
-	_.forEach((e) => {
+		allowRemoteDecryption: m
+	}), b = y(r), w = /* @__PURE__ */ new Map();
+	v.forEach((e) => {
 		let t = e.getTokenAddress(o);
-		if (v && !v.some((r) => n(r.erc20TokenAddress, t) && r.tokenId === e.tokenId)) return;
+		if (b && !b.some((e) => n(e.erc20TokenAddress, t))) return;
 		let r = u(o, {
 			erc20TokenAddress: t,
-			tokenId: e.tokenId
-		}), i = b.get(r) ?? [];
-		b.set(r, [...i, e]);
+			tokenId: 0
+		}), i = w.get(r) ?? [];
+		w.set(r, [...i, e]);
 	}), p?.forEach((e) => {
 		let t = u(o, {
 			erc20TokenAddress: e.erc20TokenAddress,
-			tokenId: e.tokenId
+			tokenId: 0
 		});
-		b.set(t, b.get(t) ?? []);
+		w.set(t, w.get(t) ?? []);
 	});
-	for (let [t, n] of b) {
+	for (let [t, n] of w) {
 		let r = t.split("-")[0], s = Number(t.split("-")[1]), c = e(o), l = c ? r : void 0;
-		x(n, i, a, g, c ? d(r).compressedAddress.toLowerCase() : r.toLowerCase(), s, l);
+		x(n, i, a, g, _, c ? d(r).compressedAddress.toLowerCase() : r.toLowerCase(), s, l);
 	}
-	return b;
+	return w;
 };
 //#endregion
 export { v as attemptGetInputUtxosRemotely, S as getInputUtxoAndBalance, C as getInputUtxoAndBalanceOfStuckUtxos, w as getInputUtxoAndBalancePerToken, _ as getInputUtxosRemotely };

package/functions/web3/events/getInputUtxosEnclave.cjs

@@ -1 +1 @@
-require(`../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../../constants/chains.constants.cjs`),t=require(`../../../data-structures/crypto-keys/keys.cjs`),n=require(`../../../data-structures/utxo/Utxo.cjs`),r=require(`../../utils/encryptInputForEnclave.cjs`),i=require(`../../utils/solanaMint.utils.cjs`);let a=require(`ethers`),o=require(`@solana/web3.js`);var s=e=>{if(!e)return;let t=a.ethers.getBytes(e);if(t.length!==32)return;let n=new o.PublicKey(t),r=n.toBase58(),{compressedAddress:s}=i.formatMintAddress(n);return{mintBase58:r,compressedAddress:s}},c=async(i,o,c)=>{let l=c.getShieldedPrivateKey(),{privateKey:u,publicKey:d}=t.UserKeys.getEncryptionKeyPair(l),f=a.ethers.solidityPacked([`uint256`,`uint256`,`uint256`],[d,u,l]),{keyCiphertext:p,inputCiphertext:m}=await r.makeEnclaveHandshakeAndEncryptUint8Array(a.ethers.getBytes(f)),{utxos:h,lastOutput:g,encryptedOutputs:_}=await i.getAPI().decryptUtxoEnclaveCall(o,p,m);return{utxos:h.map(t=>{let r=t;if(e.isSolanaLike(o)){let e=s(t.mintAddress);if(!e)throw Error(`Invalid mint address`);r={...r,erc20TokenAddress:e.compressedAddress,mintAddress:e.mintBase58}}return new n.Utxo({...r,amount:BigInt(r.amount),randomization:r.randomization?BigInt(r.randomization):void 0,shieldedPrivateKey:l})}),encryptedOutputs:_,lastOutput:g}};exports.getInputUtxosEnclave=c;
+require(`../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../../constants/chains.constants.cjs`),t=require(`../../../data-structures/crypto-keys/keys.cjs`),n=require(`../../../data-structures/utxo/Utxo.cjs`),r=require(`../../utils/encryptInputForEnclave.cjs`),i=require(`../../utils/solanaMint.utils.cjs`),a=require(`../../utils/customEnclaveFunctionsRegister.cjs`);let o=require(`ethers`),s=require(`@solana/web3.js`);var c=e=>{if(!e)return;let t=o.ethers.getBytes(e);if(t.length!==32)return;let n=new s.PublicKey(t),r=n.toBase58(),{compressedAddress:a}=i.formatMintAddress(n);return{mintBase58:r,compressedAddress:a}},l=async(e,t,n)=>{let{keyCiphertext:i,inputCiphertext:a}=await r.makeEnclaveHandshakeAndEncryptUint8Array(n);return e.getAPI().decryptUtxoEnclaveCall(t,i,a)},u=async(r,i,s)=>{let u=s.getShieldedPrivateKey(),{privateKey:d,publicKey:f}=t.UserKeys.getEncryptionKeyPair(u),p=s.getSpendingKeyPair().pubSpendingBJJPoint,m=o.ethers.solidityPacked([`uint256`,`uint256`,`uint256`],[f,d,u]),h=o.ethers.getBytes(m),g=a.getCustomUtxoDecryptor(),{utxos:_,lastOutput:v,encryptedOutputs:y}=await(g?g(i,h):l(r,i,h));return{utxos:_.map(t=>{let r=t;if(e.isSolanaLike(i)){let e=c(t.mintAddress);if(!e)throw Error(`Invalid mint address`);r={...r,erc20TokenAddress:e.compressedAddress,mintAddress:e.mintBase58}}return new n.Utxo({...r,amount:BigInt(r.amount),randomization:r.randomization?BigInt(r.randomization):void 0,nullifyingKey:u,spendingPublicKey:p,isNewStyle:r.isNewStyle,H0:r.H0?[BigInt(r.H0[0]),BigInt(r.H0[1])]:void 0})}),encryptedOutputs:y,lastOutput:v}};exports.getInputUtxosEnclave=u;

package/functions/web3/events/getInputUtxosEnclave.d.ts

@@ -1,8 +1,9 @@
 import { IHinkal } from '../../../data-structures/Hinkal/IHinkal';
 import { Utxo } from '../../../data-structures/utxo/Utxo';
 import { UserKeys } from '../../../data-structures/crypto-keys/keys';
+import { EncryptedOutputWithSign } from '../../../types/commitments.types';
 export declare const getInputUtxosEnclave: (hinkal: IHinkal, chainId: number, userKeys: UserKeys) => Promise<{
     utxos: Utxo[];
-    encryptedOutputs: import('../../..').EncryptedOutputWithSign<boolean>[];
+    encryptedOutputs: EncryptedOutputWithSign<boolean>[];
     lastOutput: string;
 }>;

package/functions/web3/events/getInputUtxosEnclave.mjs

@@ -3,33 +3,37 @@ import { UserKeys as t } from "../../../data-structures/crypto-keys/keys.mjs";
 import { Utxo as n } from "../../../data-structures/utxo/Utxo.mjs";
 import { makeEnclaveHandshakeAndEncryptUint8Array as r } from "../../utils/encryptInputForEnclave.mjs";
 import { formatMintAddress as i } from "../../utils/solanaMint.utils.mjs";
-import { ethers as a } from "ethers";
-import { PublicKey as o } from "@solana/web3.js";
+import { getCustomUtxoDecryptor as a } from "../../utils/customEnclaveFunctionsRegister.mjs";
+import { ethers as o } from "ethers";
+import { PublicKey as s } from "@solana/web3.js";
 //#region libs/shared/common/src/functions/web3/events/getInputUtxosEnclave.ts
-var s = (e) => {
+var c = (e) => {
 	if (!e) return;
-	let t = a.getBytes(e);
+	let t = o.getBytes(e);
 	if (t.length !== 32) return;
-	let n = new o(t), r = n.toBase58(), { compressedAddress: s } = i(n);
+	let n = new s(t), r = n.toBase58(), { compressedAddress: a } = i(n);
 	return {
 		mintBase58: r,
-		compressedAddress: s
+		compressedAddress: a
 	};
-}, c = async (i, o, c) => {
-	let l = c.getShieldedPrivateKey(), { privateKey: u, publicKey: d } = t.getEncryptionKeyPair(l), f = a.solidityPacked([
+}, l = async (e, t, n) => {
+	let { keyCiphertext: i, inputCiphertext: a } = await r(n);
+	return e.getAPI().decryptUtxoEnclaveCall(t, i, a);
+}, u = async (r, i, s) => {
+	let u = s.getShieldedPrivateKey(), { privateKey: d, publicKey: f } = t.getEncryptionKeyPair(u), p = s.getSpendingKeyPair().pubSpendingBJJPoint, m = o.solidityPacked([
 		"uint256",
 		"uint256",
 		"uint256"
 	], [
+		f,
 		d,
-		u,
-		l
-	]), { keyCiphertext: p, inputCiphertext: m } = await r(a.getBytes(f)), { utxos: h, lastOutput: g, encryptedOutputs: _ } = await i.getAPI().decryptUtxoEnclaveCall(o, p, m);
+		u
+	]), h = o.getBytes(m), g = a(), { utxos: _, lastOutput: v, encryptedOutputs: y } = await (g ? g(i, h) : l(r, i, h));
 	return {
-		utxos: h.map((t) => {
+		utxos: _.map((t) => {
 			let r = t;
-			if (e(o)) {
-				let e = s(t.mintAddress);
+			if (e(i)) {
+				let e = c(t.mintAddress);
 				if (!e) throw Error("Invalid mint address");
 				r = {
 					...r,
@@ -41,12 +45,15 @@ var s = (e) => {
 				...r,
 				amount: BigInt(r.amount),
 				randomization: r.randomization ? BigInt(r.randomization) : void 0,
-				shieldedPrivateKey: l
+				nullifyingKey: u,
+				spendingPublicKey: p,
+				isNewStyle: r.isNewStyle,
+				H0: r.H0 ? [BigInt(r.H0[0]), BigInt(r.H0[1])] : void 0
 			});
 		}),
-		encryptedOutputs: _,
-		lastOutput: g
+		encryptedOutputs: y,
+		lastOutput: v
 	};
 };
 //#endregion
-export { c as getInputUtxosEnclave };
+export { u as getInputUtxosEnclave };

package/functions/web3/events/getShieldedBalance.cjs

@@ -1 +1 @@
-const e=require(`../../../constants/vite.constants.cjs`),t=require(`../../../constants/chains.constants.cjs`),n=require(`../../utils/caseInsensitive.utils.cjs`),r=require(`../../../error-handling/error-codes.constants.cjs`),i=require(`../etherFunctions.cjs`),a=require(`../../utils/erc20tokenFunctions.cjs`),o=require(`../../../data-structures/utxo/Utxo.cjs`),s=require(`../../../error-handling/customErrors/ErrorWithAmount.cjs`);require(`../../../error-handling/customErrors/index.cjs`);const c=require(`../../utils/encodeTokenWithId.cjs`),l=require(`../../utils/solanaMint.utils.cjs`),u=require(`./getInputUtxoAndBalance.cjs`),d=require(`../../../data-structures/TokenDBs/PrivateTokensDB.cjs`),f=require(`../../utils/mutexes.utils.cjs`);var p=async(t,r,i,o,s,c=!1,l,p=!1,m=!1)=>f.getChainBalanceFetchingMutex(r).runExclusive(async()=>{let{inputUtxos:f}=m?await u.getInputUtxoAndBalanceOfStuckUtxos({hinkal:t,chainId:r,ethAddress:s,passedShieldedPrivateKey:i,resetCacheBefore:c,allowRemoteDecryption:l}):await u.getInputUtxoAndBalance({hinkal:t,sliceIfMore6:!1,chainId:r,passedShieldedPrivateKey:i,passedShieldedPublicKey:o,ethAddress:s,resetCacheBefore:c,allowRemoteDecryption:l});p&&e.isExtension&&await d.privateTokensDB.fetchAndUpdatePrivateTokens(f.map(e=>e.getTokenAddress(r)).filter(e=>e!==void 0),r,s);let h=(e.isExtension?await d.privateTokensDB.getPrivateTokens(r,s):a.getErc20TokensForChain(r)).map(e=>({token:e,balance:f.reduce((t,i)=>{let a=e.erc20TokenAddress;return n.caseInsensitiveEqual(a,i.getTokenAddress(r))?t+i.amount:t},0n),timestamp:f.filter(t=>n.caseInsensitiveEqual(t.getTokenAddress(r),e.erc20TokenAddress))[0]?.timeStamp,nfts:f.filter(t=>n.caseInsensitiveEqual(t.getTokenAddress(r),e.erc20TokenAddress)&&t.tokenId!==0).map(e=>({tokenId:e.tokenId,timestamp:e.timeStamp}))})),g=new Map;return h.forEach(e=>{g.set(e.token.erc20TokenAddress.toLowerCase(),e)}),g}),m=async(e,n,d,f,p=6,m=d.map(()=>0),h=!1,g=!1)=>{let{userKeys:_}=e,v=[],y=[];if(d.length===0)return[];let b=await u.getInputUtxoAndBalancePerToken({hinkal:e,sliceIfMore6:!1,ensuredTokensWithId:d.map((e,t)=>({erc20TokenAddress:d[t],tokenId:m[t]})),allowRemoteDecryption:!0,useBlockedUtxos:g,chainId:n}),x=0;for(let e=0;e<d.length;e+=1)if(h===!1){let t=b.get(c.encodeTokenWithId(n,{erc20TokenAddress:d[e],tokenId:m[e]}))??[];if(!t)throw Error(`Missing utxos for token`);x=Math.max(t.length,x),y.push(t)}else y.push([]);return x===2?y:(y.forEach((e,c)=>{if(e.length>p){let t=e.slice(0,p),o=t.reduce((e,t)=>e+t.amount,0n);if(f[c]<0n&&o<-f[c]){let e=a.getERC20Token(d[c],n),t=e.decimals===18?6:2,l=Number(i.getAmountWithPrecision(o,e,t));throw new s.ErrorWithAmount(l,`${r.DIRECTLY_SHOW_MESSAGE_ERROR_CODES.UTXO_LIMITATIONS}. Please try again with ${l} ${e.symbol}, including gas fees.`)}v.push(t)}else if(e.length<=p){let r=[...e],i=p-e.length;for(;i>0;){--i;let e=t.isSolanaLike(n),a=e?d[c]:void 0,s=e?l.formatMintAddress(d[c]).compressedAddress:d[c];r.push(new o.Utxo({amount:0n,erc20TokenAddress:s,mintAddress:a,shieldedPrivateKey:_.getShieldedPrivateKey(),tokenId:m[c]}))}v.push(r)}}),v)};exports.addPaddingToUtxos=m,exports.getShieldedBalance=p;
+const e=require(`../../../constants/vite.constants.cjs`),t=require(`../../../constants/chains.constants.cjs`),n=require(`../../utils/caseInsensitive.utils.cjs`),r=require(`../../../error-handling/error-codes.constants.cjs`),i=require(`../etherFunctions.cjs`),a=require(`../../utils/erc20tokenFunctions.cjs`),o=require(`../../../data-structures/utxo/Utxo.cjs`),s=require(`../../../error-handling/customErrors/ErrorWithAmount.cjs`);require(`../../../error-handling/customErrors/index.cjs`);const c=require(`../../utils/encodeTokenWithId.cjs`),l=require(`../../utils/solanaMint.utils.cjs`),u=require(`./getInputUtxoAndBalance.cjs`),d=require(`../../../data-structures/TokenDBs/PrivateTokensDB.cjs`),f=require(`../../utils/mutexes.utils.cjs`);var p=async(t,r,i,o,s,c=!1,l,p=!1,m=!1)=>f.getChainBalanceFetchingMutex(r).runExclusive(async()=>{let{inputUtxos:f}=m?await u.getInputUtxoAndBalanceOfStuckUtxos({hinkal:t,chainId:r,ethAddress:s,passedShieldedPrivateKey:i,resetCacheBefore:c,allowRemoteDecryption:l}):await u.getInputUtxoAndBalance({hinkal:t,sliceIfMore6:!1,chainId:r,passedShieldedPrivateKey:i,passedShieldedPublicKey:o,ethAddress:s,resetCacheBefore:c,allowRemoteDecryption:l});p&&e.isExtension&&await d.privateTokensDB.fetchAndUpdatePrivateTokens(f.map(e=>e.getTokenAddress(r)).filter(e=>e!==void 0),r,s);let h=(e.isExtension?await d.privateTokensDB.getPrivateTokens(r,s):a.getErc20TokensForChain(r)).map(e=>({token:e,balance:f.reduce((t,i)=>{let a=e.erc20TokenAddress;return n.caseInsensitiveEqual(a,i.getTokenAddress(r))?t+i.amount:t},0n),timestamp:f.filter(t=>n.caseInsensitiveEqual(t.getTokenAddress(r),e.erc20TokenAddress))[0]?.timeStamp,nfts:[]})),g=new Map;return h.forEach(e=>{g.set(e.token.erc20TokenAddress.toLowerCase(),e)}),g}),m=async(e,n,d,f,p=6,m=d.map(()=>0),h=!1,g=!1)=>{let{userKeys:_}=e,v=_.getSpendingKeyPair().pubSpendingBJJPoint,y=[],b=[];if(d.length===0)return[];let x=await u.getInputUtxoAndBalancePerToken({hinkal:e,sliceIfMore6:!1,ensuredTokensWithId:d.map((e,t)=>({erc20TokenAddress:d[t],tokenId:m[t]})),allowRemoteDecryption:e.generateProofRemotely,useBlockedUtxos:g,chainId:n}),S=0;for(let e=0;e<d.length;e+=1)if(h===!1){let t=x.get(c.encodeTokenWithId(n,{erc20TokenAddress:d[e],tokenId:m[e]}))??[];if(!t)throw Error(`Missing utxos for token`);S=Math.max(t.length,S),b.push(t)}else b.push([]);return S===2?b:(b.forEach((e,c)=>{if(e.length>p){let t=e.slice(0,p),o=t.reduce((e,t)=>e+t.amount,0n);if(f[c]<0n&&o<-f[c]){let e=a.getERC20Token(d[c],n),t=e.decimals===18?6:2,l=Number(i.getAmountWithPrecision(o,e,t));throw new s.ErrorWithAmount(l,`${r.DIRECTLY_SHOW_MESSAGE_ERROR_CODES.UTXO_LIMITATIONS}. Please try again with ${l} ${e.symbol}, including gas fees.`)}y.push(t)}else if(e.length<=p){let r=[...e],i=p-e.length;for(;i>0;){--i;let e=t.isSolanaLike(n),a=e?d[c]:void 0,s=e?l.formatMintAddress(d[c]).compressedAddress:d[c];r.push(new o.Utxo({amount:0n,erc20TokenAddress:s,mintAddress:a,nullifyingKey:_.getShieldedPrivateKey(),spendingPublicKey:v,isNewStyle:!0}))}y.push(r)}}),y)};exports.addPaddingToUtxos=m,exports.getShieldedBalance=p;

package/functions/web3/events/getShieldedBalance.mjs

@@ -39,44 +39,41 @@ var g = async (t, r, i, a, s, c = !1, l, u = !1, p = !1) => h(r).runExclusive(as
 			return n(a, i.getTokenAddress(r)) ? t + i.amount : t;
 		}, 0n),
 		timestamp: h.filter((t) => n(t.getTokenAddress(r), e.erc20TokenAddress))[0]?.timeStamp,
-		nfts: h.filter((t) => n(t.getTokenAddress(r), e.erc20TokenAddress) && t.tokenId !== 0).map((e) => ({
-			tokenId: e.tokenId,
-			timestamp: e.timeStamp
-		}))
+		nfts: []
 	})), _ = /* @__PURE__ */ new Map();
 	return g.forEach((e) => {
 		_.set(e.token.erc20TokenAddress.toLowerCase(), e);
 	}), _;
 }), _ = async (e, n, o, d, f = 6, m = o.map(() => 0), h = !1, g = !1) => {
-	let { userKeys: _ } = e, v = [], y = [];
+	let { userKeys: _ } = e, v = _.getSpendingKeyPair().pubSpendingBJJPoint, y = [], b = [];
 	if (o.length === 0) return [];
-	let b = await p({
+	let x = await p({
 		hinkal: e,
 		sliceIfMore6: !1,
 		ensuredTokensWithId: o.map((e, t) => ({
 			erc20TokenAddress: o[t],
 			tokenId: m[t]
 		})),
-		allowRemoteDecryption: !0,
+		allowRemoteDecryption: e.generateProofRemotely,
 		useBlockedUtxos: g,
 		chainId: n
-	}), x = 0;
+	}), S = 0;
 	for (let e = 0; e < o.length; e += 1) if (h === !1) {
-		let t = b.get(l(n, {
+		let t = x.get(l(n, {
 			erc20TokenAddress: o[e],
 			tokenId: m[e]
 		})) ?? [];
 		if (!t) throw Error("Missing utxos for token");
-		x = Math.max(t.length, x), y.push(t);
-	} else y.push([]);
-	return x === 2 ? y : (y.forEach((e, l) => {
+		S = Math.max(t.length, S), b.push(t);
+	} else b.push([]);
+	return S === 2 ? b : (b.forEach((e, l) => {
 		if (e.length > f) {
 			let t = e.slice(0, f), s = t.reduce((e, t) => e + t.amount, 0n);
 			if (d[l] < 0n && s < -d[l]) {
 				let e = a(o[l], n), t = e.decimals === 18 ? 6 : 2, u = Number(i(s, e, t));
 				throw new c(u, `${r.UTXO_LIMITATIONS}. Please try again with ${u} ${e.symbol}, including gas fees.`);
 			}
-			v.push(t);
+			y.push(t);
 		} else if (e.length <= f) {
 			let r = [...e], i = f - e.length;
 			for (; i > 0;) {
@@ -86,13 +83,14 @@ var g = async (t, r, i, a, s, c = !1, l, u = !1, p = !1) => h(r).runExclusive(as
 					amount: 0n,
 					erc20TokenAddress: c,
 					mintAddress: a,
-					shieldedPrivateKey: _.getShieldedPrivateKey(),
-					tokenId: m[l]
+					nullifyingKey: _.getShieldedPrivateKey(),
+					spendingPublicKey: v,
+					isNewStyle: !0
 				}));
 			}
-			v.push(r);
+			y.push(r);
 		}
-	}), v);
+	}), y);
 };
 //#endregion
 export { _ as addPaddingToUtxos, g as getShieldedBalance };

package/functions/web3/events/getTransactionLogEvents.cjs

@@ -1 +1 @@
-require(`../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../utils/create-provider.cjs`);require(`../../utils/index.cjs`);let t=require(`ethers`);var n=(e,n)=>{let r=new t.ethers.Interface(n);try{let t=r.parseLog(e);if(!t)throw Error(`Could not parse log`);return{name:t.name,args:t.args}}catch{return console.warn(`Could not decode log`),null}};async function r(t,r,i,a){try{let o=await e.createCustomRpcProvider(t).getTransactionReceipt(r);if(!o)throw Error(`Transaction receipt not found`);if(o.status!==1)throw Error(`Transaction failed`);let s=o.logs.filter(e=>e.address.toLowerCase()===i.toLowerCase()).map(e=>n(e,a)).filter(e=>e!==null);return{transactionHash:o.hash,from:o.from,to:o.to,blockNumber:o.blockNumber,events:s}}catch(e){throw console.error(`Error retrieving transaction events:`,e),e}}exports.getTransactionLogEvents=r;
+require(`../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../utils/create-provider.cjs`);require(`../../utils/index.cjs`);let t=require(`ethers`);var n=(e,n)=>{let r=new t.ethers.Interface(n);try{let t=r.parseLog(e);if(!t)throw Error(`Could not parse log`);return{name:t.name,args:t.args}}catch{return console.warn(`Could not decode log`),null}};async function r(t,r,i,a){try{let o=await e.createJsonRpcProvider(t).getTransactionReceipt(r);if(!o)throw Error(`Transaction receipt not found`);if(o.status!==1)throw Error(`Transaction failed`);let s=o.logs.filter(e=>e.address.toLowerCase()===i.toLowerCase()).map(e=>n(e,a)).filter(e=>e!==null);return{transactionHash:o.hash,from:o.from,to:o.to,blockNumber:o.blockNumber,events:s}}catch(e){throw console.error(`Error retrieving transaction events:`,e),e}}exports.getTransactionLogEvents=r;

package/functions/web3/events/getTransactionLogEvents.mjs

@@ -1,4 +1,4 @@
-import { createCustomRpcProvider as e } from "../../utils/create-provider.mjs";
+import { createJsonRpcProvider as e } from "../../utils/create-provider.mjs";
 import "../../utils/index.mjs";
 import { ethers as t } from "ethers";
 //#region libs/shared/common/src/functions/web3/events/getTransactionLogEvents.ts

package/functions/web3/events/index.cjs

@@ -1 +1 @@
-require(`./getInputUtxoAndBalance.cjs`),require(`./getShieldedBalance.cjs`),require(`./balanceChangedHandler.cjs`),require(`./balanceChangedCustomHandler.cjs`),require(`./getApprovedBalance.cjs`),require(`./getTransactionLogEvents.cjs`);
+require(`./getInputUtxoAndBalance.cjs`),require(`./getShieldedBalance.cjs`),require(`./balanceChangedHandler.cjs`),require(`./getTransactionLogEvents.cjs`);

package/functions/web3/events/index.d.ts

@@ -1,6 +1,4 @@
 export * from './getInputUtxoAndBalance';
 export * from './getShieldedBalance';
 export * from './balanceChangedHandler';
-export * from './balanceChangedCustomHandler';
-export * from './getApprovedBalance';
 export * from './getTransactionLogEvents';

package/functions/web3/events/index.mjs

@@ -1,6 +1,4 @@
 import "./getInputUtxoAndBalance.mjs";
 import "./getShieldedBalance.mjs";
 import "./balanceChangedHandler.mjs";
-import "./balanceChangedCustomHandler.mjs";
-import "./getApprovedBalance.mjs";
 import "./getTransactionLogEvents.mjs";

package/functions/web3/functionCalls/constructBatchCall.cjs

@@ -1 +1 @@
-require(`../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../../externalABIs/index.cjs`),t=require(`../../utils/getContractAddress.cjs`);let n=require(`ethers`);var r=(t,r)=>new n.ethers.Interface(e.ERC20ABI).encodeFunctionData(`approve`,[t,r]),i=(e,t,n,r)=>r.encodeFunctionData(`transact`,[e[0],e[1],e[2],t,n]),a=(e,t,n,r,i)=>i.encodeFunctionData(`prooflessDeposit`,[e,t,n,r]),o=(e,t,i,a,o,s)=>{let c=[];for(let a=0;a<e.length;a+=1){let o=e[a],s=t[a];o!==n.ethers.ZeroAddress&&s>0n&&c.push({to:o,value:`0x0`,data:r(i,s)})}return c.push({to:a,value:s>0n?`0x${s.toString(16)}`:`0x0`,data:o}),c},s=(e,a,o,s,c,l,u,d)=>{let f=[];for(let t=0;t<e.length;t+=1){let i=e[t],s=a[t];i!==n.ethers.ZeroAddress&&s>0n&&f.push({to:i,value:`0x0`,data:r(o,s)})}return f.push({to:t.getContractAddress(s),value:d>0n?`0x${d.toString(16)}`:`0x0`,data:i(c,l,u,s.interface)}),f},c=(e,n,r,i,s,c,l,u,d)=>{let f=a(s,c,l,u,i.interface);return o(e,n,r,t.getContractAddress(i),f,d)};exports.buildApproveAndProoflessDepositCalls=c,exports.buildApproveAndTransactCalls=s;
+require(`../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../../externalABIs/index.cjs`),t=require(`../../utils/getContractAddress.cjs`);let n=require(`ethers`);var r=(t,r)=>new n.ethers.Interface(e.ERC20ABI).encodeFunctionData(`approve`,[t,r]),i=(e,t,n,r)=>r.encodeFunctionData(`transact`,[e[0],e[1],e[2],t,n]),a=(e,t,n,r,i)=>i.encodeFunctionData(`prooflessDeposit`,[e,t,n,r]),o=(e,t,i,a,o,s)=>{let c=[];for(let a=0;a<e.length;a+=1){let o=e[a],s=t[a];o!==n.ethers.ZeroAddress&&s>0n&&c.push({to:o,value:`0x0`,data:r(i,s)})}return c.push({to:a,value:s>0n?`0x${s.toString(16)}`:`0x0`,data:o}),c},s=(e,a,o,s,c,l,u,d)=>{let f=[];for(let t=0;t<e.length;t+=1){let i=e[t],s=a[t];i!==n.ethers.ZeroAddress&&s>0n&&f.push({to:i,value:`0x0`,data:r(o,s)})}return f.push({to:t.getContractAddress(s),value:d>0n?`0x${d.toString(16)}`:`0x0`,data:i(c,l,u,s.interface)}),f},c=(e,t,n,r,i,a,o,s)=>e.encodeFunctionData(`prooflessDeposit`,[t,n,r,i,a,o,s]),l=(e,t,n,r,i,a,s,l,u,d,f,p)=>o(e,t,n,n,c(r,i,a,s,l,u,d,f),p),u=(e,n,r,i,s,c,l,u,d)=>{let f=a(s,c,l,u,i.interface);return o(e,n,r,t.getContractAddress(i),f,d)};exports.buildApproveAndDepositWrapperCalls=l,exports.buildApproveAndProoflessDepositCalls=u,exports.buildApproveAndTransactCalls=s;

package/functions/web3/functionCalls/constructBatchCall.d.ts

@@ -3,4 +3,5 @@ import { CircomDataType, DimDataType, StealthAddressStructure } from '../../../t
 import { NewZkCallDataType } from '../../../types/snark.types';
 import { Call } from '../../../types/eip5792.types';
 export declare const buildApproveAndTransactCalls: (tokenAddresses: string[], amounts: bigint[], spenderAddress: string, contractForTransaction: ethers.Contract, zkCallData: NewZkCallDataType, dimData: DimDataType, circomData: CircomDataType, ethValue: bigint) => Call[];
+export declare const buildApproveAndDepositWrapperCalls: (tokenAddresses: string[], amounts: bigint[], wrapperAddress: string, wrapperInterface: ethers.Interface, feeRecipient: string, feeToken: string, feeAmount: bigint, depositErc20Addresses: string[], depositAmounts: bigint[], depositTokenIds: bigint[], stealthAddressStructures: StealthAddressStructure[], ethValue: bigint) => Call[];
 export declare const buildApproveAndProoflessDepositCalls: (tokenAddresses: string[], amounts: bigint[], spenderAddress: string, contractForTransaction: ethers.Contract, prooflessDepositTokenAddresses: string[], prooflessDepositAmountChanges: bigint[], prooflessDepositTokenIds: bigint[], stealthAddressStructures: StealthAddressStructure[], ethValue: bigint) => Call[];

package/functions/web3/functionCalls/constructBatchCall.mjs

@@ -43,9 +43,17 @@ var r = (t, r) => new n.Interface(e).encodeFunctionData("approve", [t, r]), i =
 		value: d > 0n ? `0x${d.toString(16)}` : "0x0",
 		data: i(c, l, u, s.interface)
 	}), f;
-}, c = (e, n, r, i, s, c, l, u, d) => {
+}, c = (e, t, n, r, i, a, o, s) => e.encodeFunctionData("prooflessDeposit", [
+	t,
+	n,
+	r,
+	i,
+	a,
+	o,
+	s
+]), l = (e, t, n, r, i, a, s, l, u, d, f, p) => o(e, t, n, n, c(r, i, a, s, l, u, d, f), p), u = (e, n, r, i, s, c, l, u, d) => {
 	let f = a(s, c, l, u, i.interface);
 	return o(e, n, r, t(i), f, d);
 };
 //#endregion
-export { c as buildApproveAndProoflessDepositCalls, s as buildApproveAndTransactCalls };
+export { l as buildApproveAndDepositWrapperCalls, u as buildApproveAndProoflessDepositCalls, s as buildApproveAndTransactCalls };

package/functions/web3/functionCalls/transactCallDirectTron.cjs

@@ -1 +1 @@
-const e=require(`../../../constants/chains.constants.cjs`),t=require(`../../../constants/protocol.constants.cjs`),n=require(`../../utils/caseInsensitive.utils.cjs`),r=require(`../../../externalABIs/index.cjs`),i=require(`../../../error-handling/error-codes.constants.cjs`),a=require(`../../utils/tron.utils.cjs`),o=require(`../../../error-handling/logger.cjs`),s=require(`../../utils/tronSimulation.utils.cjs`),c=require(`./waitForErc20Approvals.cjs`);var l=async(l,u,d,f,p,m,h,g,_,v=!0)=>{let y=l.getTronWeb(),b=a.evmHexToTronBase58Address(f.erc20TokenAddress),x=await l.getEthereumAddressByChain(u),{hinkalAddress:S,hinkalABI:C}=e.networkRegistry[u].contractData,w=y.contract(C,a.evmHexToTronBase58Address(S)),T=g??w,E=_??w;if(!T.address)throw Error(`contractForApproval address not set`);if(!E.address)throw Error(`contractForTransaction address not set`);let D=n.caseInsensitiveEqual(f.erc20TokenAddress,t.zeroAddress);if(!D&&d>0n){let e=T.address;if(!e)throw Error(`token approval spender not set`);let n=d,i=await y.contract(r.ERC20ABI,b).allowance(x,e).call({from:x});if(BigInt(String(i))<n){let{transaction:r}=await y.transactionBuilder.triggerSmartContract(b,`approve(address,uint256)`,{feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN},[{type:`address`,value:e},{type:`uint256`,value:n.toString()}],x),i=await y.trx.sign(r),a=await y.trx.sendRawTransaction(i);if(!a.result){let e=a.code??`UNKNOWN`,t=a.message?Buffer.from(a.message,`hex`).toString():`no message`;throw Error(`Tron token approval failed: ${e} - ${t}`)}await c.waitForTronErc20Approvals(y,x,e,[{tokenAddress:b,requiredAmount:n}])}}let{a:O,b:k,c:A}=a.parseZkCalldata(p),j=await a.reorderZkCallData(!0,p,h,m,!1);if(!j)throw Error(`Tron proof signature not found`);let M=[j.v,j.r,j.s],N=[h.tokenNumber,h.nullifierAmount,h.outputAmount],P=a.circomDataToArray(m);if(v&&(await s.simulateTronTransaction(u,E.address,`transact`,E.abi,[M,O,k,A,N,P],x,D?d:0n),D)){let e=BigInt(await y.trx.getBalance(x)),n=BigInt(t.TRON_DEFAULT_FEE_LIMIT_SUN);try{let e=a.createTronCallData(E.abi,`transact`,[M,O,k,A,N,P]);n=await a.estimateTronFeeSunWithPadding(y,u,E.address,x,e,d)}catch(e){o.Logger.error(`Error estimating Tron transact fee`,e)}if(e<d+n)throw Error(i.insufficientResourcesErrorCodes.INSUFFICIENT_TRON_BALANCE_FOR_FEE)}let F=await E.transact(M,O,k,A,N,P).send({feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN,callValue:D?Number(d):0}),I=typeof F==`string`?F:F?.txid??F?.transaction?.txID??F?.transaction?.txid;if(!I)throw Error(`Tron transact failed (missing txid)`);return I};exports.transactCallDirectTron=l;
+const e=require(`../../../constants/chains.constants.cjs`),t=require(`../../../constants/protocol.constants.cjs`),n=require(`../../utils/caseInsensitive.utils.cjs`),r=require(`../../../externalABIs/index.cjs`),i=require(`../../../error-handling/error-codes.constants.cjs`),a=require(`../../../error-handling/logger.cjs`),o=require(`../../utils/tron.utils.cjs`),s=require(`../../utils/tronSimulation.utils.cjs`),c=require(`./waitForErc20Approvals.cjs`);var l=async(l,u,d,f,p,m,h,g,_,v=!0)=>{let y=Array.isArray(d)?d:[d],b=Array.isArray(f)?f:[f];if(y.length!==b.length)throw Error(`token and amount length mismatch`);let x=l.getTronWeb(),S=await l.getEthereumAddressByChain(u),{hinkalAddress:C,hinkalABI:w}=e.networkRegistry[u].contractData,T=x.contract(w,o.evmHexToTronBase58Address(C)),E=g??T,D=_??T;if(!E.address)throw Error(`contractForApproval address not set`);if(!D.address)throw Error(`contractForTransaction address not set`);let O=b.findIndex(({erc20TokenAddress:e})=>n.caseInsensitiveEqual(e,t.zeroAddress)),k=O===-1?0n:y[O],A=k>0n?k:0n;if(b.some(({erc20TokenAddress:e},r)=>!n.caseInsensitiveEqual(e,t.zeroAddress)&&y[r]>0n)){let e=E.address;if(!e)throw Error(`token approval spender not set`);let i=[];for(let a=0;a<b.length;a+=1){let s=b[a],c=y[a];if(c>0n&&!n.caseInsensitiveEqual(s.erc20TokenAddress,t.zeroAddress)){let n=o.evmHexToTronBase58Address(s.erc20TokenAddress),a=await x.contract(r.ERC20ABI,n).allowance(S,e).call({from:S});if(BigInt(String(a))<c){let{transaction:r}=await x.transactionBuilder.triggerSmartContract(n,`approve(address,uint256)`,{feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN},[{type:`address`,value:e},{type:`uint256`,value:c.toString()}],S),a=await x.trx.sign(r),o=await x.trx.sendRawTransaction(a);if(!o.result){let e=o.code??`UNKNOWN`,t=o.message?Buffer.from(o.message,`hex`).toString():`no message`;throw Error(`Tron token approval failed: ${e} - ${t}`)}i.push({tokenAddress:n,requiredAmount:c})}}}i.length>0&&await c.waitForTronErc20Approvals(x,S,e,i)}let{a:j,b:M,c:N}=o.parseZkCalldata(p),P=await o.reorderZkCallData(!0,p,h,m,!1);if(!P)throw Error(`Tron proof signature not found`);let F=[P.v,P.r,P.s],I=[h.tokenNumber,h.nullifierAmount,h.outputAmount],L=o.circomDataToArray(m);if(v){await s.simulateTronTransaction(u,D.address,`transact`,D.abi,[F,j,M,N,I,L],S,A);let e=BigInt(await x.trx.getBalance(S)),n=BigInt(t.TRON_DEFAULT_FEE_LIMIT_SUN);try{let e=o.createTronCallData(D.abi,`transact`,[F,j,M,N,I,L]);n=await o.estimateTronFeeSunWithPadding(x,u,D.address,S,e,A)}catch(e){a.Logger.error(`Error estimating Tron transact fee`,e)}if(e<A+n)throw Error(i.insufficientResourcesErrorCodes.INSUFFICIENT_TRON_BALANCE_FOR_FEE)}let R=await D.transact(F,j,M,N,I,L).send({feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN,callValue:Number(A)}),z=typeof R==`string`?R:R?.txid??R?.transaction?.txID??R?.transaction?.txid;if(!z)throw Error(`Tron transact failed (missing txid)`);return z},u=async(e,r,i,a,s,c,l,u,d)=>{let f=e.getTronWeb(),p=await e.getEthereumAddressByChain(r),m=n.caseInsensitiveEqual(a.erc20TokenAddress,t.zeroAddress),{a:h,b:g,c:_}=o.parseZkCalldata(s),v=await o.reorderZkCallData(!0,s,l,c,!1);if(!v)throw Error(`Tron proof signature not found`);let y=o.createTronCallData(d,`transact`,[[v.v,v.r,v.s],h,g,_,[l.tokenNumber,l.nullifierAmount,l.outputAmount],o.circomDataToArray(c)]),{transaction:b}=await f.transactionBuilder.triggerSmartContract(o.evmHexToTronBase58Address(u),``,{feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN,callValue:m?Number(i):0,input:y},[],p);return b};exports.buildTronUnsignedTransactTransaction=u,exports.transactCallDirectTron=l;

package/functions/web3/functionCalls/transactCallDirectTron.d.ts

@@ -1,9 +1,12 @@
 import { IHinkal } from '../../../data-structures/Hinkal/IHinkal';
+import { createTronCallData } from '../../utils/tron.utils';
 import { CircomDataType, DimDataType } from '../../../types/circom-data.types';
 import { NewZkCallDataType } from '../../../types/snark.types';
 import { ERC20Token } from '../../../types/token.types';
 import { Types as TronWebTypes } from 'tronweb';
-export declare const transactCallDirectTron: (hinkal: IHinkal, chainId: number, amount: bigint, tokenToApprove: ERC20Token, // in hex format
+export declare const transactCallDirectTron: (hinkal: IHinkal, chainId: number, amount: bigint | bigint[], tokenToApprove: ERC20Token | ERC20Token[], // in hex format
 newZkCallData: NewZkCallDataType, circomData: CircomDataType, dimData: DimDataType, contractApproval?: TronWebTypes.ContractInstance<any>, // in base58 format
 contractTransaction?: TronWebTypes.ContractInstance<any>, // in base58 format
 preEstimateGas?: boolean) => Promise<string>;
+/** Builds an unsigned Tron `transact` transaction (no approve/send). Used for PAL / deposit-and-withdraw prepare flows. */
+export declare const buildTronUnsignedTransactTransaction: (hinkal: IHinkal, chainId: number, amount: bigint, token: ERC20Token, newZkCallData: NewZkCallDataType, circomData: CircomDataType, dimData: DimDataType, contractAddressHex: string, contractAbi: Parameters<typeof createTronCallData>[0]) => Promise<TronWebTypes.Transaction>;