@hinkal/common 0.3.1 → 0.3.2

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

@@ -0,0 +1,2 @@
+import "crypto";
+import "@noble/curves/secp256k1";

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

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`);var t=(t,n)=>{let r=`${n.erc20TokenAddress}-0`;return e.isSolanaLike(t)?r:r.toLowerCase()};exports.encodeTokenWithId=t;
+const e=require(`../../constants/chains.constants.cjs`);var t=(t,n)=>e.isSolanaLike(t)?n:n.toLowerCase();exports.normalizeTokenAddress=t;

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

@@ -1,2 +1 @@
-import { TokenWithId } from '../../types/token-with-id.types';
-export declare const encodeTokenWithId: (chainId: number, tokenWithId: TokenWithId) => string;
+export declare const normalizeTokenAddress: (chainId: number, erc20TokenAddress: string) => string;

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

@@ -1,8 +1,5 @@
 import { isSolanaLike as e } from "../../constants/chains.constants.mjs";
 //#region libs/shared/common/src/functions/utils/encodeTokenWithId.ts
-var t = (t, n) => {
-	let r = `${n.erc20TokenAddress}-0`;
-	return e(t) ? r : r.toLowerCase();
-};
+var t = (t, n) => e(t) ? n : n.toLowerCase();
 //#endregion
-export { t as encodeTokenWithId };
+export { t as normalizeTokenAddress };

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

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../constants/fees.constants.cjs`),r=require(`./caseInsensitive.utils.cjs`),i=require(`../web3/etherFunctions.cjs`),a=require(`../../error-handling/logger.cjs`),o=require(`../../API/getTokenPrice.cjs`),s=require(`./erc20tokenFunctions.cjs`);var c=async r=>{if(!r)return n.EXTENDED_NON_NATIVE_GAS_COST_TOKEN_SYMBOL_OPTIONS;let i=t.zeroAddress;e.isSolanaLike(r)&&(i=t.solanaNativeAddress);let a=(await s.getErc20TokenFromAPI(r,i))?.symbol;return e.isSolanaLike(r)&&a?[a]:a&&!n.NON_NATIVE_GAS_COST_TOKEN_SYMBOL_OPTIONS(r).includes(a)?[a,...n.NON_NATIVE_GAS_COST_TOKEN_SYMBOL_OPTIONS(r)]:n.NON_NATIVE_GAS_COST_TOKEN_SYMBOL_OPTIONS(r)},l=(e,t)=>{let r=e*t.variableRate/n.BPS_DENOMINATOR;return t.flatFee+r},u=async(e,t,c,u)=>{let d=await s.getErc20TokenFromAPI(e,u.feeToken),f;if(!d||r.caseInsensitiveEqual(u.feeToken,t.erc20TokenAddress)||u.variableRate===0n)f=l(c,u);else{let r=0n;try{let{prices:a}=await o.getTokenPrices(e,[t.erc20TokenAddress,d.erc20TokenAddress]),[s,l]=a;if(!s||!l)throw Error(`failed to get token prices`);r=i.getAmountInWei(d,(Number(i.getAmountInToken(t,c))*s*Number(u.variableRate)/Number(n.BPS_DENOMINATOR)/l).toFixed(d.decimals))}catch(e){a.Logger.error(`calculateModifiedFeeStructure: failed to price cross-token variable fee, charging gas fee only`,e)}f=u.flatFee+r}return{feeToken:u.feeToken,flatFee:f,variableRate:0n}};exports.calculateModifiedFeeStructure=u,exports.calculateTotalFee=l,exports.getGasTokenSymbols=c;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../constants/fees.constants.cjs`),r=require(`./caseInsensitive.utils.cjs`),i=require(`../web3/etherFunctions.cjs`),a=require(`../../error-handling/logger.cjs`),o=require(`../../API/getTokenPrice.cjs`),s=require(`./erc20tokenFunctions.cjs`);var c=async r=>{if(!r)return n.EXTENDED_NON_NATIVE_GAS_COST_TOKEN_SYMBOL_OPTIONS;let i=t.zeroAddress;e.isSolanaLike(r)&&(i=t.solanaNativeAddress);let a=(await s.getErc20TokenFromAPI(r,i))?.symbol;return e.isSolanaLike(r)&&a?[a]:a&&!n.NON_NATIVE_GAS_COST_TOKEN_SYMBOL_OPTIONS(r).includes(a)?[a,...n.NON_NATIVE_GAS_COST_TOKEN_SYMBOL_OPTIONS(r)]:n.NON_NATIVE_GAS_COST_TOKEN_SYMBOL_OPTIONS(r)},l=(e,t)=>{let r=e*t.variableRate/n.BPS_DENOMINATOR;return t.flatFee+r},u=async(e,t,c,u)=>{let d=await s.getErc20TokenFromAPI(e,u.feeToken),f;if(!d||r.caseInsensitiveEqual(u.feeToken,t.erc20TokenAddress)||u.variableRate===0n)f=l(c,u);else{let r=0n;try{let{prices:a}=await o.getTokenPrices(e,[t.erc20TokenAddress,d.erc20TokenAddress]),[s,l]=a;if(!s||!l)throw Error(`failed to get token prices`);r=i.getAmountInWei(d,(Number(i.getAmountInToken(t,c))*s*Number(u.variableRate)/Number(n.BPS_DENOMINATOR)/l).toFixed(d.decimals))}catch(e){a.Logger.error(`calculateModifiedFeeStructure: failed to price cross-token variable fee, charging gas fee only`,e)}f=u.flatFee+r}return{feeToken:u.feeToken,flatFee:f,variableRate:0n}},d=(e,t)=>{if(t.variableRate===0n)return e+t.flatFee;let r=(e+t.flatFee)*n.BPS_DENOMINATOR,i=n.BPS_DENOMINATOR-t.variableRate;return(r+i-1n)/i};exports.calculateGrossAmountWithFee=d,exports.calculateModifiedFeeStructure=u,exports.calculateTotalFee=l,exports.getGasTokenSymbols=c;

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

@@ -4,3 +4,4 @@ export declare const getGasTokenSymbols: (chainId: number | undefined) => Promis
 export declare const calculateTotalFee: (amount: bigint, feeStructure: FeeStructure) => bigint;
 export declare const calculateModifiedFeeStructure: (chainId: number, amountToken: ERC20Token, amount: bigint, feeStructure: FeeStructure) => Promise<FeeStructure>;
 export declare const calculateWithdrawalAmount: (amountWithFee: bigint, feeStructure: FeeStructure) => bigint;
+export declare const calculateGrossAmountWithFee: (netAmount: bigint, feeStructure: FeeStructure) => bigint;

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

@@ -35,6 +35,10 @@ var f = async (r) => {
 		flatFee: f,
 		variableRate: 0n
 	};
+}, h = (e, t) => {
+	if (t.variableRate === 0n) return e + t.flatFee;
+	let n = (e + t.flatFee) * r, i = r - t.variableRate;
+	return (n + i - 1n) / i;
 };
 //#endregion
-export { m as calculateModifiedFeeStructure, p as calculateTotalFee, f as getGasTokenSymbols };
+export { h as calculateGrossAmountWithFee, m as calculateModifiedFeeStructure, p as calculateTotalFee, f as getGasTokenSymbols };

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

@@ -7,10 +7,11 @@ export declare const serializeDecodedTxs: (decodedTxs: DecodedTx[]) => {
         flatFees: string[];
         externalActionId: string;
         stealthAddressStructure: {
-            extraRandomization: string;
+            H0x: string;
+            H0y: string;
+            H1x: string;
+            H1y: string;
             stealthAddress: string;
-            H0: string;
-            H1: string;
         };
         erc20TokenAddresses: string[];
         externalActionMetadata: string;

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

@@ -1 +1 @@
-const e=require(`../../constants/protocol.constants.cjs`),t=require(`../../data-structures/crypto-keys/keys.cjs`),n=require(`../../data-structures/utxo/Utxo.cjs`),r=require(`./addresses.cjs`);require(`../../data-structures/crypto-keys/index.cjs`);var i=r=>{let i=r.getShieldedPrivateKey(),a=t.UserKeys.getEncryptionKeyPair(i).publicKey,o=new n.Utxo({amount:0n,erc20TokenAddress:e.zeroAddress,nullifyingKey:i,spendingPublicKey:r.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0}),{H0:s}=o;if(!s)throw Error(`H0 is not set`);let c=o.getStealthAddress(),l=t.UserKeys.getH1FromH0(s,i);return`${c},${s[0]},${s[1]},${l[1]},${a}`},a=e=>r.constructStealthAddressStructure(i(e));exports.getRecipientInfoFromUserKeys=i,exports.getStealthAddressStructureFromUserKeys=a;
+const e=require(`../../constants/protocol.constants.cjs`),t=require(`../../data-structures/crypto-keys/keys.cjs`),n=require(`../../data-structures/utxo/Utxo.cjs`),r=require(`./addresses.cjs`);require(`../../data-structures/crypto-keys/index.cjs`);var i=r=>{let i=r.getShieldedPrivateKey(),a=t.UserKeys.getEncryptionKeyPair(i).publicKey,o=new n.Utxo({amount:0n,erc20TokenAddress:e.zeroAddress,nullifyingKey:i,spendingPublicKey:r.getSpendingKeyPair().pubSpendingBJJPoint}),{H0:s}=o;if(!s)throw Error(`H0 is not set`);let c=o.getStealthAddress(),l=t.UserKeys.getH1FromH0(s,i);return`${c},${s[0]},${s[1]},${l[0]},${l[1]},${a}`},a=e=>r.constructStealthAddressStructure(i(e));exports.getRecipientInfoFromUserKeys=i,exports.getStealthAddressStructureFromUserKeys=a;

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

@@ -9,12 +9,11 @@ var i = (r) => {
 		amount: 0n,
 		erc20TokenAddress: e,
 		nullifyingKey: i,
-		spendingPublicKey: r.getSpendingKeyPair().pubSpendingBJJPoint,
-		isNewStyle: !0
+		spendingPublicKey: r.getSpendingKeyPair().pubSpendingBJJPoint
 	}), { H0: s } = o;
 	if (!s) throw Error("H0 is not set");
 	let c = o.getStealthAddress(), l = t.getH1FromH0(s, i);
-	return `${c},${s[0]},${s[1]},${l[1]},${a}`;
+	return `${c},${s[0]},${s[1]},${l[0]},${l[1]},${a}`;
 }, a = (e) => r(i(e));
 //#endregion
 export { i as getRecipientInfoFromUserKeys, a as getStealthAddressStructureFromUserKeys };

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

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`),require(`../../constants/chains.constants.cjs`);const e=require(`./caseInsensitive.utils.cjs`),t=require(`../../crypto/poseidon.cjs`),n=require(`../../data-structures/utxo/Utxo.cjs`);require(`../../data-structures/crypto-keys/encryptDecryptUtxo.cjs`);const r=require(`./bit.operations.cjs`),i=require(`./bytes32.utils.cjs`);let a=require(`ethers`),o=require(`@solana/web3.js`),s=require(`@coral-xyz/anchor`);var c=(c,l,u,d)=>[...new s.EventParser(l.programId,new s.BorshCoder(l.idl)).parseLogs(c.meta?.logMessages??[])].filter(({name:t})=>e.caseInsensitiveEqual(t,`newCommitment`)).filter(({data:e})=>e.encryptedOutput.length===0).map(e=>{let{onChainData:s}=e.data,[c,l,d,f,p,m,,h]=s.map(i.convertBytes32ToBigInt),[,g,_]=s,v=new o.PublicKey([...g.slice(16),..._.slice(16)]),y=t.poseidonHash(l,d),b=r.extractHighestBit(f)===1n,x=new n.Utxo({amount:c,timeStamp:h.toString(),nullifyingKey:u.getShieldedPrivateKey(),mintAddress:v.toBase58(),erc20TokenAddress:y,stealthAddress:a.ethers.toBeHex(p),isNewStyle:b,...b?{H0:[r.takeOffHighestBit(f),m]}:{randomization:f}});return x.getStealthAddress(),x}).filter(t=>e.caseInsensitiveEqual(t.erc20TokenAddress,d));exports.getOnChainUtxosFromReceiptSolana=c;
+require(`../../../../_virtual/_rolldown/runtime.cjs`),require(`../../constants/chains.constants.cjs`);const e=require(`./caseInsensitive.utils.cjs`),t=require(`../../crypto/poseidon.cjs`),n=require(`../../data-structures/utxo/Utxo.cjs`);require(`../../data-structures/crypto-keys/encryptDecryptUtxo.cjs`);const r=require(`./bytes32.utils.cjs`);let i=require(`ethers`),a=require(`@solana/web3.js`),o=require(`@coral-xyz/anchor`);var s=(s,c,l,u)=>[...new o.EventParser(c.programId,new o.BorshCoder(c.idl)).parseLogs(s.meta?.logMessages??[])].filter(({name:t})=>e.caseInsensitiveEqual(t,`newCommitment`)).filter(({data:e})=>e.encryptedOutput.length===0).map(e=>{let{onChainData:o}=e.data,[s,c,u,d,f,,,p,m]=o.map(r.convertBytes32ToBigInt),[,h,g]=o,_=new a.PublicKey([...h.slice(16),...g.slice(16)]),v=t.poseidonHash(c,u),y=new n.Utxo({amount:s,timeStamp:m.toString(),nullifyingKey:l.getShieldedPrivateKey(),mintAddress:_.toBase58(),erc20TokenAddress:v,stealthAddress:i.ethers.toBeHex(p),H0:[d,f]});return y.getStealthAddress(),y}).filter(t=>e.caseInsensitiveEqual(t.erc20TokenAddress,u));exports.getOnChainUtxosFromReceiptSolana=s;

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

@@ -3,24 +3,22 @@ import { caseInsensitiveEqual as e } from "./caseInsensitive.utils.mjs";
 import { poseidonHash as t } from "../../crypto/poseidon.mjs";
 import { Utxo as n } from "../../data-structures/utxo/Utxo.mjs";
 import "../../data-structures/crypto-keys/encryptDecryptUtxo.mjs";
-import { extractHighestBit as r, takeOffHighestBit as i } from "./bit.operations.mjs";
-import { convertBytes32ToBigInt as a } from "./bytes32.utils.mjs";
-import { ethers as o } from "ethers";
-import { PublicKey as s } from "@solana/web3.js";
-import { BorshCoder as c, EventParser as l } from "@coral-xyz/anchor";
+import { convertBytes32ToBigInt as r } from "./bytes32.utils.mjs";
+import { ethers as i } from "ethers";
+import { PublicKey as a } from "@solana/web3.js";
+import { BorshCoder as o, EventParser as s } from "@coral-xyz/anchor";
 //#region libs/shared/common/src/functions/utils/getUtxosFromReceiptSolana.ts
-var u = (u, d, f, p) => [...new l(d.programId, new c(d.idl)).parseLogs(u.meta?.logMessages ?? [])].filter(({ name: t }) => e(t, "newCommitment")).filter(({ data: e }) => e.encryptedOutput.length === 0).map((e) => {
-	let { onChainData: c } = e.data, [l, u, d, p, m, h, , g] = c.map(a), [, _, v] = c, y = new s([..._.slice(16), ...v.slice(16)]), b = t(u, d), x = r(p) === 1n, S = new n({
-		amount: l,
-		timeStamp: g.toString(),
-		nullifyingKey: f.getShieldedPrivateKey(),
-		mintAddress: y.toBase58(),
-		erc20TokenAddress: b,
-		stealthAddress: o.toBeHex(m),
-		isNewStyle: x,
-		...x ? { H0: [i(p), h] } : { randomization: p }
+var c = (c, l, u, d) => [...new s(l.programId, new o(l.idl)).parseLogs(c.meta?.logMessages ?? [])].filter(({ name: t }) => e(t, "newCommitment")).filter(({ data: e }) => e.encryptedOutput.length === 0).map((e) => {
+	let { onChainData: o } = e.data, [s, c, l, d, f, , , p, m] = o.map(r), [, h, g] = o, _ = new a([...h.slice(16), ...g.slice(16)]), v = t(c, l), y = new n({
+		amount: s,
+		timeStamp: m.toString(),
+		nullifyingKey: u.getShieldedPrivateKey(),
+		mintAddress: _.toBase58(),
+		erc20TokenAddress: v,
+		stealthAddress: i.toBeHex(p),
+		H0: [d, f]
 	});
-	return S.getStealthAddress(), S;
-}).filter((t) => e(t.erc20TokenAddress, p));
+	return y.getStealthAddress(), y;
+}).filter((t) => e(t.erc20TokenAddress, d));
 //#endregion
-export { u as getOnChainUtxosFromReceiptSolana };
+export { c as getOnChainUtxosFromReceiptSolana };

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

@@ -1 +1 @@
-require(`./abi.utils.cjs`),require(`./serialize.utils.cjs`),require(`./caseInsensitive.utils.cjs`),require(`./amounts.utils.cjs`),require(`./time.utils.cjs`),require(`./upToDateState.cjs`),require(`./cacheFunctions.cjs`),require(`./enclaveHandshakeService.cjs`),require(`./encryptInputForEnclave.cjs`),require(`./solanaMint.utils.cjs`),require(`./customEnclaveFunctionsRegister.cjs`),require(`./serialize-utxos.utils.cjs`),require(`./addresses.cjs`),require(`./tron.utils.cjs`),require(`./get-signature-header.cjs`),require(`./auth.utils.cjs`),require(`./string.utils.cjs`),require(`./token-check.utils.cjs`),require(`./map.utils.cjs`),require(`./mutexes.utils.cjs`),require(`./erc20tokenFunctions.cjs`),require(`../pre-transaction/outputUtxoProcessing.cjs`),require(`./external-action.utils.cjs`),require(`./bit.operations.cjs`),require(`../pre-transaction/solana.cjs`),require(`../pre-transaction/process-gas-estimates.cjs`),require(`../pre-transaction/getVolatileTransferAmount.cjs`),require(`../pre-transaction/constructAdminData.cjs`),require(`./create-provider.cjs`),require(`../pre-transaction/convert-okx-instructions.cjs`),require(`./process.utils.cjs`),require(`../pre-transaction/sendV0Transaction.cjs`),require(`./bytes32.utils.cjs`),require(`../pre-transaction/recipientUtxoProcessing.cjs`),require(`../pre-transaction/ensureAmountChanges.cjs`),require(`../pre-transaction/getFeeStructure.cjs`),require(`../pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`),require(`../pre-transaction/buildCommitmentValidationData.cjs`),require(`../pre-transaction/index.cjs`),require(`./resolve-sync.utils.cjs`),require(`./convertIntegrationProviderToExternalActionId.cjs`),require(`./evmNetworkFunctions.cjs`),require(`./userAgent.cjs`),require(`./reloadPage.cjs`),require(`./cacheDevice.utils.cjs`),require(`./getBlockExplorerUrl.cjs`),require(`./involves-permit2-op.cjs`),require(`./convertEmporiumOpToCallInfo.cjs`),require(`./getRecipientInfoFromUserKeys.cjs`),require(`./publicBalance.utils.cjs`),require(`./rpc-int-encode.cjs`),require(`./walletBalances.utils.cjs`),require(`./nftTokenFunctions.cjs`),require(`./inLogicMetadata.cjs`),require(`./networks.utils.cjs`),require(`./postToOffscreen.cjs`),require(`./solanaSendPreflight.utils.cjs`),require(`./prepareHinkal.cjs`),require(`./getContractAddress.cjs`),require(`./getUtxosFromReceipt.utils.cjs`),require(`./getUtxosFromReceiptSolana.cjs`),require(`./fees.utils.cjs`),require(`./proxyAvatar.utils.cjs`),require(`./enclave-utxo-storage.cjs`),require(`./enclave-signature-storage.cjs`),require(`./tx-confirmation.utils.cjs`),require(`./buildClaimableDepositPlan.cjs`),require(`./formatter.cjs`),require(`./tronSimulation.utils.cjs`),require(`./getSignerFromContract.cjs`),require(`./deposit-claimable.utils.cjs`),require(`./transfer-claimable.utils.cjs`),require(`./bridge-flow.utils.cjs`),require(`./bridge-claimable.utils.cjs`),require(`./temp-wallet.utils.cjs`),require(`./dispatchBalanceRefreshes.cjs`),require(`./lifi.utils.cjs`),require(`./enclave-recipient-info-storage.cjs`),require(`./solana-memo.cjs`),require(`./mnemonics.cjs`),require(`./nearIntents.utils.cjs`);
+require(`./abi.utils.cjs`),require(`./serialize.utils.cjs`),require(`./caseInsensitive.utils.cjs`),require(`./amounts.utils.cjs`),require(`./time.utils.cjs`),require(`./upToDateState.cjs`),require(`./cacheFunctions.cjs`),require(`./enclaveHandshakeService.cjs`),require(`./encryptInputForEnclave.cjs`),require(`./solanaMint.utils.cjs`),require(`./customEnclaveFunctionsRegister.cjs`),require(`./serialize-utxos.utils.cjs`),require(`./addresses.cjs`),require(`./tron.utils.cjs`),require(`./get-signature-header.cjs`),require(`./legacyKeys.cjs`),require(`./auth.utils.cjs`),require(`./string.utils.cjs`),require(`./token-check.utils.cjs`),require(`./map.utils.cjs`),require(`./mutexes.utils.cjs`),require(`./erc20tokenFunctions.cjs`),require(`../pre-transaction/outputUtxoProcessing.cjs`),require(`./external-action.utils.cjs`),require(`../pre-transaction/solana.cjs`),require(`../pre-transaction/process-gas-estimates.cjs`),require(`../pre-transaction/getVolatileTransferAmount.cjs`),require(`../pre-transaction/constructAdminData.cjs`),require(`./create-provider.cjs`),require(`../pre-transaction/convert-okx-instructions.cjs`),require(`./process.utils.cjs`),require(`../pre-transaction/sendV0Transaction.cjs`),require(`./bytes32.utils.cjs`),require(`../pre-transaction/recipientUtxoProcessing.cjs`),require(`../pre-transaction/ensureAmountChanges.cjs`),require(`../pre-transaction/getFeeStructure.cjs`),require(`../pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`),require(`../pre-transaction/buildCommitmentValidationData.cjs`),require(`../pre-transaction/index.cjs`),require(`./resolve-domain-address.cjs`),require(`./resolve-sync.utils.cjs`),require(`./convertIntegrationProviderToExternalActionId.cjs`),require(`./evmNetworkFunctions.cjs`),require(`./userAgent.cjs`),require(`./reloadPage.cjs`),require(`./cacheDevice.utils.cjs`),require(`./getBlockExplorerUrl.cjs`),require(`./involves-permit2-op.cjs`),require(`./convertEmporiumOpToCallInfo.cjs`),require(`./getRecipientInfoFromUserKeys.cjs`),require(`./publicBalance.utils.cjs`),require(`./rpc-int-encode.cjs`),require(`./walletBalances.utils.cjs`),require(`./nftTokenFunctions.cjs`),require(`./inLogicMetadata.cjs`),require(`./networks.utils.cjs`),require(`./postToOffscreen.cjs`),require(`./solanaSendPreflight.utils.cjs`),require(`./voidWallets.utils.cjs`),require(`./prepareHinkal.cjs`),require(`./getContractAddress.cjs`),require(`./getUtxosFromReceipt.utils.cjs`),require(`./getUtxosFromReceiptSolana.cjs`),require(`./fees.utils.cjs`),require(`./proxyAvatar.utils.cjs`),require(`./enclave-utxo-storage.cjs`),require(`./enclave-signature-storage.cjs`),require(`./tx-confirmation.utils.cjs`),require(`./buildClaimableDepositPlan.cjs`),require(`./formatter.cjs`),require(`./tronSimulation.utils.cjs`),require(`./getSignerFromContract.cjs`),require(`./deposit-claimable.utils.cjs`),require(`./transfer-claimable.utils.cjs`),require(`./bridge-flow.utils.cjs`),require(`./bridge-claimable.utils.cjs`),require(`./temp-wallet.utils.cjs`),require(`./dispatchBalanceRefreshes.cjs`),require(`./lifi.utils.cjs`),require(`./enclave-recipient-info-storage.cjs`),require(`./solana-memo.cjs`),require(`./mnemonics.cjs`),require(`./nearIntents.utils.cjs`),require(`./enclaveSessionSigning.cjs`),require(`./validateWalletAddress.cjs`);

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

@@ -2,6 +2,7 @@ export * from './amounts.utils';
 export * from './abi.utils';
 export * from './cacheFunctions';
 export * from './create-provider';
+export * from './resolve-domain-address';
 export * from './external-action.utils';
 export * from './erc20tokenFunctions';
 export * from './requireEnv';
@@ -73,6 +74,9 @@ export * from './lifi.utils';
 export * from './enclave-recipient-info-storage';
 export * from './solana-memo';
 export * from './mnemonics';
+export * from './legacyKeys';
 export * from './customEnclaveFunctionsRegister';
-export * from './bit.operations';
 export * from './nearIntents.utils';
+export * from './voidWallets.utils';
+export * from './enclaveSessionSigning';
+export * from './validateWalletAddress';

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

@@ -13,6 +13,7 @@ import "./serialize-utxos.utils.mjs";
 import "./addresses.mjs";
 import "./tron.utils.mjs";
 import "./get-signature-header.mjs";
+import "./legacyKeys.mjs";
 import "./auth.utils.mjs";
 import "./string.utils.mjs";
 import "./token-check.utils.mjs";
@@ -21,7 +22,6 @@ import "./mutexes.utils.mjs";
 import "./erc20tokenFunctions.mjs";
 import "../pre-transaction/outputUtxoProcessing.mjs";
 import "./external-action.utils.mjs";
-import "./bit.operations.mjs";
 import "../pre-transaction/solana.mjs";
 import "../pre-transaction/process-gas-estimates.mjs";
 import "../pre-transaction/getVolatileTransferAmount.mjs";
@@ -37,6 +37,7 @@ import "../pre-transaction/getFeeStructure.mjs";
 import "../pre-transaction/waitForDepositedUtxosInMerkleTree.mjs";
 import "../pre-transaction/buildCommitmentValidationData.mjs";
 import "../pre-transaction/index.mjs";
+import "./resolve-domain-address.mjs";
 import "./resolve-sync.utils.mjs";
 import "./convertIntegrationProviderToExternalActionId.mjs";
 import "./evmNetworkFunctions.mjs";
@@ -55,6 +56,7 @@ import "./inLogicMetadata.mjs";
 import "./networks.utils.mjs";
 import "./postToOffscreen.mjs";
 import "./solanaSendPreflight.utils.mjs";
+import "./voidWallets.utils.mjs";
 import "./prepareHinkal.mjs";
 import "./getContractAddress.mjs";
 import "./getUtxosFromReceipt.utils.mjs";
@@ -79,3 +81,5 @@ import "./enclave-recipient-info-storage.mjs";
 import "./solana-memo.mjs";
 import "./mnemonics.mjs";
 import "./nearIntents.utils.mjs";
+import "./enclaveSessionSigning.mjs";
+import "./validateWalletAddress.mjs";

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

@@ -0,0 +1 @@
+const e=require(`../../../../_virtual/_rolldown/runtime.cjs`);require(`../../crypto/poseidon.cjs`);let t=require(`ethers`);require(`@solana/web3.js`);let n=require(`bs58`);n=e.__toESM(n);var r=e=>t.ethers.keccak256(e);exports.generateLegacyShieldedPrivateKey=r;

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

@@ -0,0 +1,10 @@
+interface LegacyAddresses {
+    ethereumAddress: string;
+    solanaPublicKey: string;
+}
+export declare const generateLegacySignatureFromSeedPhrases: (seedPhrases: string[]) => string;
+export declare const generateLegacyShieldedPrivateKey: (legacySignature: string) => string;
+export declare const generateAddressesFromSignature: (signature: string) => LegacyAddresses;
+export declare const generateLegacySignerPrivateKeyFromNonce: (signature: string, walletNonce: bigint) => string;
+export declare const generateLegacySignerSolanaPrivateKeyFromNonce: (signature: string, walletNonce: bigint) => string;
+export {};

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

@@ -0,0 +1,8 @@
+import "../../crypto/poseidon.mjs";
+import { ethers as e } from "ethers";
+import "@solana/web3.js";
+import "bs58";
+//#region libs/shared/common/src/functions/utils/legacyKeys.ts
+var t = (t) => e.keccak256(t);
+//#endregion
+export { t as generateLegacyShieldedPrivateKey };

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

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);let e=require(`ethers`);var t=t=>{let n=t.join(` `),r=e.ethers.toUtf8Bytes(n);return e.ethers.keccak256(r)};exports.generateHashFromSeedPhrases=t;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../crypto/poseidon.cjs`);let t=require(`ethers`);var n=n=>e.poseidonHash(t.ethers.hexlify(t.ethers.toUtf8Bytes(n.join(` `))));exports.generateHashFromSeedPhrases=n;

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

@@ -1,8 +1,6 @@
-import { ethers as e } from "ethers";
+import { poseidonHash as e } from "../../crypto/poseidon.mjs";
+import { ethers as t } from "ethers";
 //#region libs/shared/common/src/functions/utils/mnemonics.ts
-var t = (t) => {
-	let n = t.join(" "), r = e.toUtf8Bytes(n);
-	return e.keccak256(r);
-};
+var n = (n) => e(t.hexlify(t.toUtf8Bytes(n.join(" "))));
 //#endregion
-export { t as generateHashFromSeedPhrases };
+export { n as generateHashFromSeedPhrases };

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

@@ -1 +1 @@
-require(`../../constants/chains.constants.cjs`);const e=require(`../../constants/protocol.constants.cjs`),t=require(`../../types/external-action.types.cjs`);require(`./addresses.cjs`),require(`./tron.utils.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;
+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;

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

@@ -1,8 +1,8 @@
 import "../../constants/chains.constants.mjs";
 import { HINKAL_PRIVATE_SEND_VARIABLE_RATE as e } from "../../constants/protocol.constants.mjs";
-import { ExternalActionId as t } from "../../types/external-action.types.mjs";
 import "./addresses.mjs";
 import "./tron.utils.mjs";
+import { ExternalActionId as t } from "../../types/external-action.types.mjs";
 import "./erc20tokenFunctions.mjs";
 import { getFeeStructure as n } from "../pre-transaction/getFeeStructure.mjs";
 import "../../constants/bridging.constants.mjs";

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

@@ -1 +1,2 @@
 export declare const getNetworkName: (chainId: number) => string;
+export declare const chainMatchesWalletType: (chainId: number, isSolana: boolean, isTron: boolean, isEvm: boolean) => boolean;

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

@@ -1 +1 @@
-require(`../../constants/chains.constants.cjs`),require(`./create-provider.cjs`),require(`../../crypto/preProcessing.cjs`),require(`../../providers/EthersProviderAdapter.cjs`),require(`../../providers/SolanaProviderAdapter.cjs`),require(`ethers`),require(`@solana/web3.js`);
+require(`../../constants/chains.constants.cjs`),require(`./legacyKeys.cjs`),require(`./create-provider.cjs`),require(`../../crypto/preProcessing.cjs`),require(`../../providers/EthersProviderAdapter.cjs`),require(`../../providers/SolanaProviderAdapter.cjs`),require(`./voidWallets.utils.cjs`),require(`ethers`);

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

@@ -1,11 +1,9 @@
 import { ethers } from 'ethers';
 import { IHinkal } from '../../data-structures/Hinkal/IHinkal';
-import { SolanaWallet } from '../../types/solana.types';
 export declare const createSigner: (privateKey: string) => ethers.Wallet;
 export declare const createVoidSigner: (address: string) => ethers.VoidSigner;
 export declare const prepareHinkal: (hinkal: IHinkal, signer: ethers.Wallet) => Promise<void>;
 export declare const prepareEthersProviderAdapter: (hinkal: IHinkal, ethereumAddress: string) => Promise<void>;
-export declare const createVoidSolanaWallet: (hinkal: IHinkal) => SolanaWallet;
-export declare const prepareSolanaProviderAdapter: (hinkal: IHinkal, ethereumAddress: string) => Promise<void>;
+export declare const prepareSolanaProviderAdapter: (hinkal: IHinkal, solanaAddress: string) => Promise<void>;
 export declare const prepareHinkalWithSignature: (hinkal: IHinkal, ethereumAddress: string, signature: string) => Promise<void>;
 export declare const prepareHinkalFromSeedPhrases: (hinkal: IHinkal, seedPhrases: string[]) => Promise<void>;

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

@@ -1,7 +1,8 @@
 import "../../constants/chains.constants.mjs";
+import "./legacyKeys.mjs";
 import "./create-provider.mjs";
 import "../../crypto/preProcessing.mjs";
 import "../../providers/EthersProviderAdapter.mjs";
 import "../../providers/SolanaProviderAdapter.mjs";
+import "./voidWallets.utils.mjs";
 import "ethers";
-import "@solana/web3.js";

package/common/src/functions/utils/resolve-domain-address.cjs

@@ -0,0 +1 @@
+require(`../../constants/chains.constants.cjs`),require(`./create-provider.cjs`),require(`../../API/resolve-sns.cjs`);

package/common/src/functions/utils/resolve-domain-address.d.ts

@@ -0,0 +1,4 @@
+export declare const isEnsDomain: (input: string) => boolean;
+export declare const isSnsDomain: (input: string) => boolean;
+export declare const resolveDomainAddress: (input: string) => Promise<string | null>;
+export declare const resolveRecipientAddressForChain: (recipient: string, chainId: number) => Promise<string | null>;

package/common/src/functions/utils/resolve-domain-address.mjs

@@ -0,0 +1,3 @@
+import "../../constants/chains.constants.mjs";
+import "./create-provider.mjs";
+import "../../API/resolve-sns.mjs";

package/common/src/functions/utils/serialize-utxos.utils.cjs

@@ -1 +1 @@
-var e=e=>{let{randomization:t,H0:n,...r}=e,i=n?[n[0].toString(),n[1].toString()]:void 0;return{...r,amount:e.amount.toString(),spendingPublicKey:e.spendingPublicKey?.map(e=>e.toString()),...e.isNewStyle?{H0:i}:{randomization:t?.toString()}}},t=e=>{let{randomization:t,H0:n,...r}=e,i=n?[BigInt(n[0]),BigInt(n[1])]:void 0;return{...r,amount:BigInt(e.amount),spendingPublicKey:e.spendingPublicKey?.map(e=>BigInt(e)),...e.isNewStyle?{H0:i}:{randomization:t?BigInt(t):void 0}}};exports.deserializeUtxoConstructorParams=t,exports.serializeUtxoConstructorParams=e;
+var e=e=>{let{H0:t,randomization:n,...r}=e;return{...r,amount:e.amount.toString(),spendingPublicKey:e.spendingPublicKey?.map(e=>e.toString()),randomization:n?.toString(),H0:t?[t[0].toString(),t[1].toString()]:void 0}},t=e=>{let{H0:t,randomization:n,...r}=e;return{...r,amount:BigInt(e.amount),spendingPublicKey:e.spendingPublicKey?.map(e=>BigInt(e)),randomization:n?BigInt(n):void 0,H0:t?[BigInt(t[0]),BigInt(t[1])]:void 0}};exports.deserializeUtxoConstructorParams=t,exports.serializeUtxoConstructorParams=e;

package/common/src/functions/utils/serialize-utxos.utils.mjs

@@ -1,19 +1,21 @@
 //#region libs/shared/common/src/functions/utils/serialize-utxos.utils.ts
 var e = (e) => {
-	let { randomization: t, H0: n, ...r } = e, i = n ? [n[0].toString(), n[1].toString()] : void 0;
+	let { H0: t, randomization: n, ...r } = e;
 	return {
 		...r,
 		amount: e.amount.toString(),
 		spendingPublicKey: e.spendingPublicKey?.map((e) => e.toString()),
-		...e.isNewStyle ? { H0: i } : { randomization: t?.toString() }
+		randomization: n?.toString(),
+		H0: t ? [t[0].toString(), t[1].toString()] : void 0
 	};
 }, t = (e) => {
-	let { randomization: t, H0: n, ...r } = e, i = n ? [BigInt(n[0]), BigInt(n[1])] : void 0;
+	let { H0: t, randomization: n, ...r } = e;
 	return {
 		...r,
 		amount: BigInt(e.amount),
 		spendingPublicKey: e.spendingPublicKey?.map((e) => BigInt(e)),
-		...e.isNewStyle ? { H0: i } : { randomization: t ? BigInt(t) : void 0 }
+		randomization: n ? BigInt(n) : void 0,
+		H0: t ? [BigInt(t[0]), BigInt(t[1])] : void 0
 	};
 };
 //#endregion

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(`./caseInsensitive.utils.cjs`),r=require(`../../error-handling/error-codes.constants.cjs`),i=require(`../snarkjs/constant.cjs`),a=require(`../../data-structures/http/HttpClient.cjs`),o=require(`../../externalABIs/index.cjs`),s=require(`../../error-handling/logger.cjs`);let c=require(`ethers`),l=require(`tronweb`);var u=2000n,d=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},f=(t,n)=>{let r=e.networkRegistry[t].fetchRpcUrl,i=n?d(n):void 0,a=i?new l.TronWeb({fullHost:r,privateKey:i}):new l.TronWeb({fullHost:r});return n||a.setAddress(`T9yD14Nj9j7xAB4dbGeiX9h8unkKHxuWwb`),a},p=e=>e?.startsWith(`T`)?e:l.TronWeb.address.fromHex(e),m=e=>e.startsWith(`0x`)?p(e):e,h=e=>{if(e.startsWith(`0x`))return e;if(e.startsWith(`41`))return e.replace(`41`,`0x`);if(e.startsWith(`T`))return h(l.TronWeb.address.toHex(e));throw Error(`Failed to convert address to hex format`)},g=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}`)},_=(e,t)=>e.map(e=>Array.isArray(e)?_(e,t):t(e)),v=(e,t,n)=>{let r=new c.ethers.Interface(e);if(!r.getFunction(t))throw Error(`${t} ABI is missing for Tron call data creation`);let i=_(n,e=>typeof e==`string`&&e.startsWith(`T`)?h(e):e);return r.encodeFunctionData(t,i)},y=(e,t,n)=>e?BigInt(Math.max((e[t]??0)-(e[n]??0),0)):0n,b=(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)},x=async e=>{let t=`${g(e)}/wallet/getchainparameters`,n=await a.httpClient.post(t,{});if(!n?.chainParameter?.length)throw Error(`Failed to fetch Tron chain parameters from wallet RPC`);return n.chainParameter},S=async(e,t)=>{let n=`${g(e)}/wallet/getaccountresource`,r=h(t),i=r.startsWith(`0x`)?`41${r.slice(2)}`:r;return await a.httpClient.post(n,{address:i,visible:!1})},C=async(e,n,r,i,a,o)=>{let s={input:a,callValue:Number(o),feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN},[c,l]=await Promise.all([e.transactionBuilder.estimateEnergy(r,``,s,[],i),e.transactionBuilder.triggerConstantContract(r,``,s,[],i)]),d=await x(n),f=b(d,`getEnergyFee`),p=b(d,`getTransactionFee`),m=await S(n,i),h=BigInt(c?.energy_required??l?.energy_used??0),g=y(m,`EnergyLimit`,`EnergyUsed`),_=(h>g?h-g:0n)*f,v=BigInt(Math.ceil((l?.transaction?.raw_data_hex?.length??0)/2)),C=y(m,`freeNetLimit`,`freeNetUsed`)+y(m,`NetLimit`,`NetUsed`),w=_+(v>C?v-C:0n)*p,T=w+w*u/10000n;return T>BigInt(1e9)?BigInt(t.TRON_DEFAULT_FEE_LIMIT_SUN):T},w=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}},T=(e,t)=>{let n=c.ethers.AbiCoder.defaultAbiCoder().encode([`uint16`,`uint16`,`uint16`,`uint256`],[e.tokenNumber,e.nullifierAmount,e.outputAmount,t]);return BigInt(c.ethers.keccak256(n))},E=async(e,t,n,r,o,s)=>{let l=T(o,s),u=e.map(String),d=n.map(String),f=r.map(String),p={a:u,b:[t[0].map(String),t[1].map(String)],c:d,inputs:f,verifier_id:String(l)},m=await a.httpClient.post(`${i.ENCLAVE_URL}/sign-proof`,p),{v:h,r:g,s:_}=c.ethers.Signature.from(m.signature.trim());return{v:h,r:g,s:_}},D=e=>[e.rootHashHinkal,e.erc20TokenAddresses,e.tokenIds,e.amountChanges,e.onChainCreation,e.slippageValues,e.inputNullifiers,e.outCommitments,e.encryptedOutputs,[e.feeStructure.feeToken,e.feeStructure.flatFee,e.feeStructure.variableRate],e.timeStamp,[e.stealthAddressStructure.extraRandomization,e.stealthAddressStructure.stealthAddress,e.stealthAddressStructure.H0,e.stealthAddressStructure.H1],e.rootHashAccessToken,e.calldataHash,e.publicSignalCount,e.relay,e.externalAddress,e.externalActionId,e.externalActionMetadata,[e.hinkalLogicArgs.hinkalLogicAction,e.hinkalLogicArgs.inHinkalAddress,e.hinkalLogicArgs.executeApprovalChanges,e.hinkalLogicArgs.doPreTxApproval,e.hinkalLogicArgs.useApprovalUtxoData.map(e=>[e.approvalChanges,e.externalApprovalAddresses,e.conversionInHinkalAddress])],[e.hookData.preHookContract,e.hookData.hookContract,e.hookData.preHookMetadata,e.hookData.postHookMetadata],[e.signatureData.v,e.signatureData.r,e.signatureData.s,e.signatureData.accessKey,e.signatureData.nonce,e.signatureData.ethereumAddress],e.originalSender],O=async(e,t,n,r,i=!0)=>{if(e){let{a:e,b:a,c:o,publicSignals:s}=w(t),c=await E(e,a,o,s,n,BigInt(r.externalActionId)),l={v:c.v,r:c.r,s:c.s};return i&&(t[1]=[[t[1][0][1],t[1][0][0]],[t[1][1][1],t[1][1][0]]]),l}},k=(e,r)=>{let i=0n,a=new Map;for(let o=0;o<e.length;o+=1)if(n.caseInsensitiveEqual(e[o].erc20TokenAddress,t.zeroAddress))i+=r[o];else{let t=p(e[o].erc20TokenAddress);a.set(t,(a.get(t)??0n)+r[o])}return{totalTrxValue:i,tokensNeedingApproval:a}},A=async(e,n,i,a,o,c)=>{let l=BigInt(await e.trx.getBalance(a)),u=BigInt(t.TRON_DEFAULT_FEE_LIMIT_SUN);try{u=await C(e,n,i,a,o,c)}catch(e){s.Logger.error(`Error estimating Tron deposit fee`,e)}if(l<c+u)throw Error(r.insufficientResourcesErrorCodes.INSUFFICIENT_TRON_BALANCE_FOR_FEE)},j=async(e,n,r,i)=>{let a=Array.from(i.entries());for(let i=0;i<a.length;i+=1){let[s,c]=a[i],l=await e.contract(o.ERC20ABI,s).allowance(n,r).call({from:n});if(BigInt(String(l))<c){let{transaction:i}=await e.transactionBuilder.triggerSmartContract(s,`approve(address,uint256)`,{feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN},[{type:`address`,value:r},{type:`uint256`,value:c.toString()}],n),a=await e.trx.sign(i),o=await e.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}`)}}}};exports.addressToHexFormat=h,exports.approveTronTokens=j,exports.assertTronSufficientBalance=A,exports.circomDataToArray=D,exports.createTronCallData=v,exports.createTronWeb=f,exports.estimateTronFeeSunWithPadding=C,exports.evmHexToTronBase58Address=p,exports.fetchTronAccountResources=S,exports.fetchTronChainParameters=x,exports.generateProofSignatureRemotely=E,exports.getAvailableResource=y,exports.getChainParameterValue=b,exports.getTronWalletRpcUrl=g,exports.getVerifierId=T,exports.normalizeTronPrivateKey=d,exports.parseZkCalldata=w,exports.reorderZkCallData=O,exports.splitTronTokensByNative=k,exports.toTronBase58IfHex=m;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`./caseInsensitive.utils.cjs`),r=require(`../../error-handling/error-codes.constants.cjs`),i=require(`../snarkjs/constant.cjs`),a=require(`../../data-structures/http/HttpClient.cjs`),o=require(`../../externalABIs/index.cjs`),s=require(`../../error-handling/logger.cjs`);let c=require(`ethers`),l=require(`tronweb`);var u=2000n,d=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},f=(t,n)=>{let r=e.networkRegistry[t].fetchRpcUrl,i=n?d(n):void 0,a=i?new l.TronWeb({fullHost:r,privateKey:i}):new l.TronWeb({fullHost:r});return n||a.setAddress(`T9yD14Nj9j7xAB4dbGeiX9h8unkKHxuWwb`),a},p=e=>e?.startsWith(`T`)?e:l.TronWeb.address.fromHex(e),m=e=>e.startsWith(`0x`)?p(e):e,h=e=>{if(e.startsWith(`0x`))return e;if(e.startsWith(`41`))return e.replace(`41`,`0x`);if(e.startsWith(`T`))return h(l.TronWeb.address.toHex(e));throw Error(`Failed to convert address to hex format`)},g=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}`)},_=(e,t)=>e.map(e=>Array.isArray(e)?_(e,t):t(e)),v=(e,t,n)=>{let r=new c.ethers.Interface(e);if(!r.getFunction(t))throw Error(`${t} ABI is missing for Tron call data creation`);let i=_(n,e=>typeof e==`string`&&e.startsWith(`T`)?h(e):e);return r.encodeFunctionData(t,i)},y=(e,t,n)=>e?BigInt(Math.max((e[t]??0)-(e[n]??0),0)):0n,b=(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)},x=async e=>{let t=`${g(e)}/wallet/getchainparameters`,n=await a.httpClient.post(t,{});if(!n?.chainParameter?.length)throw Error(`Failed to fetch Tron chain parameters from wallet RPC`);return n.chainParameter},S=async(e,t)=>{let n=`${g(e)}/wallet/getaccountresource`,r=h(t),i=r.startsWith(`0x`)?`41${r.slice(2)}`:r;return await a.httpClient.post(n,{address:i,visible:!1})},C=async(e,n,r,i,a,o)=>{let s={input:a,callValue:Number(o),feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN},[c,l]=await Promise.all([e.transactionBuilder.estimateEnergy(r,``,s,[],i),e.transactionBuilder.triggerConstantContract(r,``,s,[],i)]),d=await x(n),f=b(d,`getEnergyFee`),p=b(d,`getTransactionFee`),m=await S(n,i),h=BigInt(c?.energy_required??l?.energy_used??0),g=y(m,`EnergyLimit`,`EnergyUsed`),_=(h>g?h-g:0n)*f,v=BigInt(Math.ceil((l?.transaction?.raw_data_hex?.length??0)/2)),C=y(m,`freeNetLimit`,`freeNetUsed`)+y(m,`NetLimit`,`NetUsed`),w=_+(v>C?v-C:0n)*p,T=w+w*u/10000n;return T>BigInt(1e9)?BigInt(t.TRON_DEFAULT_FEE_LIMIT_SUN):T},w=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}},T=(e,t)=>{let n=c.ethers.AbiCoder.defaultAbiCoder().encode([`uint16`,`uint16`,`uint16`,`uint256`],[e.tokenNumber,e.nullifierAmount,e.outputAmount,t]);return BigInt(c.ethers.keccak256(n))},E=async(e,t,n,r,o,s)=>{let l=T(o,s),u=e.map(String),d=n.map(String),f=r.map(String),p={a:u,b:[t[0].map(String),t[1].map(String)],c:d,inputs:f,verifier_id:String(l)},m=await a.httpClient.post(`${i.ENCLAVE_URL}/sign-proof`,p),{v:h,r:g,s:_}=c.ethers.Signature.from(m.signature.trim());return{v:h,r:g,s:_}},D=e=>[e.rootHashHinkal,e.rootHashHinkalIndex,e.erc20TokenAddresses,e.amountChanges,e.onChainCreation,e.slippageValues,e.inputNullifiers,e.outCommitments,e.encryptedOutputs,[e.feeStructure.feeToken,e.feeStructure.flatFee,e.feeStructure.variableRate],e.timeStamp,[e.stealthAddressStructure.H0x,e.stealthAddressStructure.H0y,e.stealthAddressStructure.H1x,e.stealthAddressStructure.H1y,e.stealthAddressStructure.stealthAddress],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],O=async(e,t,n,r,i=!0)=>{if(e){let{a:e,b:a,c:o,publicSignals:s}=w(t),c=await E(e,a,o,s,n,BigInt(r.externalActionData.externalActionId)),l={v:c.v,r:c.r,s:c.s};return i&&(t[1]=[[t[1][0][1],t[1][0][0]],[t[1][1][1],t[1][1][0]]]),l}},k=(e,r)=>{let i=0n,a=new Map;for(let o=0;o<e.length;o+=1)if(n.caseInsensitiveEqual(e[o].erc20TokenAddress,t.zeroAddress))i+=r[o];else{let t=p(e[o].erc20TokenAddress);a.set(t,(a.get(t)??0n)+r[o])}return{totalTrxValue:i,tokensNeedingApproval:a}},A=async(e,n,i,a,o,c)=>{let l=BigInt(await e.trx.getBalance(a)),u=BigInt(t.TRON_DEFAULT_FEE_LIMIT_SUN);try{u=await C(e,n,i,a,o,c)}catch(e){s.Logger.error(`Error estimating Tron deposit fee`,e)}if(l<c+u)throw Error(r.insufficientResourcesErrorCodes.INSUFFICIENT_TRON_BALANCE_FOR_FEE)},j=async(e,n,r,i)=>{let a=Array.from(i.entries());for(let i=0;i<a.length;i+=1){let[s,c]=a[i],l=await e.contract(o.ERC20ABI,s).allowance(n,r).call({from:n});if(BigInt(String(l))<c){let{transaction:i}=await e.transactionBuilder.triggerSmartContract(s,`approve(address,uint256)`,{feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN},[{type:`address`,value:r},{type:`uint256`,value:c.toString()}],n),a=await e.trx.sign(i),o=await e.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}`)}}}};exports.addressToHexFormat=h,exports.approveTronTokens=j,exports.assertTronSufficientBalance=A,exports.circomDataToArray=D,exports.createTronCallData=v,exports.createTronWeb=f,exports.estimateTronFeeSunWithPadding=C,exports.evmHexToTronBase58Address=p,exports.fetchTronAccountResources=S,exports.fetchTronChainParameters=x,exports.generateProofSignatureRemotely=E,exports.getAvailableResource=y,exports.getChainParameterValue=b,exports.getTronWalletRpcUrl=g,exports.getVerifierId=T,exports.normalizeTronPrivateKey=d,exports.parseZkCalldata=w,exports.reorderZkCallData=O,exports.splitTronTokensByNative=k,exports.toTronBase58IfHex=m;

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

@@ -30,7 +30,7 @@ export declare const generateProofSignatureRemotely: (a: bigint[], b: bigint[][]
     r: string;
     s: string;
 }>;
-export declare const circomDataToArray: (circomData: CircomDataType) => (string | number | bigint | (string | number)[] | string[][] | (string | bigint)[] | (bigint | boolean | import('../..').HinkalLogicAction | bigint[] | (string[] | bigint[])[][])[] | undefined)[];
+export declare const circomDataToArray: (circomData: CircomDataType) => (string | number | bigint | string[][] | boolean[] | (string | bigint)[] | undefined)[];
 export declare const reorderZkCallData: (isTron: boolean, zkCallData: NewZkCallDataType, dimData: DimDataType, circomData: CircomDataType, modifyZkCallData?: boolean) => Promise<{
     v: number;
     r: string;

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

@@ -90,8 +90,8 @@ var f = 2000n, p = (e) => {
 	};
 }, k = (e) => [
 	e.rootHashHinkal,
+	e.rootHashHinkalIndex,
 	e.erc20TokenAddresses,
-	e.tokenIds,
 	e.amountChanges,
 	e.onChainCreation,
 	e.slippageValues,
@@ -105,47 +105,32 @@ var f = 2000n, p = (e) => {
 	],
 	e.timeStamp,
 	[
-		e.stealthAddressStructure.extraRandomization,
-		e.stealthAddressStructure.stealthAddress,
-		e.stealthAddressStructure.H0,
-		e.stealthAddressStructure.H1
+		e.stealthAddressStructure.H0x,
+		e.stealthAddressStructure.H0y,
+		e.stealthAddressStructure.H1x,
+		e.stealthAddressStructure.H1y,
+		e.stealthAddressStructure.stealthAddress
 	],
-	e.rootHashAccessToken,
 	e.calldataHash,
+	e.emporiumMessage,
 	e.publicSignalCount,
 	e.relay,
-	e.externalAddress,
-	e.externalActionId,
-	e.externalActionMetadata,
 	[
-		e.hinkalLogicArgs.hinkalLogicAction,
-		e.hinkalLogicArgs.inHinkalAddress,
-		e.hinkalLogicArgs.executeApprovalChanges,
-		e.hinkalLogicArgs.doPreTxApproval,
-		e.hinkalLogicArgs.useApprovalUtxoData.map((e) => [
-			e.approvalChanges,
-			e.externalApprovalAddresses,
-			e.conversionInHinkalAddress
-		])
+		e.externalActionData.externalAddress,
+		e.externalActionData.externalActionId,
+		e.externalActionData.externalActionMetadata
 	],
 	[
 		e.hookData.preHookContract,
-		e.hookData.hookContract,
+		e.hookData.postHookContract,
 		e.hookData.preHookMetadata,
 		e.hookData.postHookMetadata
 	],
-	[
-		e.signatureData.v,
-		e.signatureData.r,
-		e.signatureData.s,
-		e.signatureData.accessKey,
-		e.signatureData.nonce,
-		e.signatureData.ethereumAddress
-	],
-	e.originalSender
+	e.originalSender,
+	e.extraData
 ], A = async (e, t, n, r, i = !0) => {
 	if (e) {
-		let { a: e, b: a, c: o, publicSignals: s } = E(t), c = await O(e, a, o, s, n, BigInt(r.externalActionId)), l = {
+		let { a: e, b: a, c: o, publicSignals: s } = E(t), c = await O(e, a, o, s, n, BigInt(r.externalActionData.externalActionId)), l = {
 			v: c.v,
 			r: c.r,
 			s: c.s

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

@@ -0,0 +1 @@
+require(`../../constants/chains.constants.cjs`),require(`./addresses.cjs`);

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

@@ -0,0 +1 @@
+export declare const validateWalletAddressForChainId: (walletAddress: string, chainId: number) => void;

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

@@ -0,0 +1,2 @@
+import "../../constants/chains.constants.mjs";
+import "./addresses.mjs";

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

@@ -0,0 +1 @@
+require(`@solana/web3.js`);

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

@@ -0,0 +1,4 @@
+import { SolanaWallet } from '../../types/solana.types';
+import { TronWallet } from '../../types/tron.types';
+export declare const createVoidSolanaWallet: (ethereumAddress: string) => SolanaWallet;
+export declare const createVoidTronWallet: (address: string) => TronWallet;

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

@@ -0,0 +1 @@
+import "@solana/web3.js";

package/common/src/functions/web3/etherFunctions.d.ts

@@ -2,6 +2,7 @@ import { ERC20Token } from '../../types/token.types';
 export declare const ethToWei: (amount: string) => bigint;
 export declare const randomBigInt: (numberOfBytes: number) => bigint;
 export declare const getAmountInToken: (token: ERC20Token, amount: bigint) => string;
+export declare const weiToUsd: (token: ERC20Token, amount: bigint, price: number) => number | undefined;
 export declare const getAmountInWei: (token: ERC20Token, amount: string) => bigint;
 /**
  * Convert a decimal number into bigint through string method and return a bigint and number of decimal places.

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

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

@@ -2,20 +2,18 @@ import { IHinkal } from '../../../data-structures/Hinkal/IHinkal';
 import { UserKeys } from '../../../data-structures/crypto-keys/keys';
 import { Utxo } from '../../../data-structures/utxo/Utxo';
 import { EncryptedOutputWithSign } from '../../../types/commitments.types';
-import { TokenWithId } from '../../../types/token-with-id.types';
 interface IGetInputUtxos {
     hinkal: IHinkal;
     chainId: number;
-    tokenWithId?: TokenWithId | TokenWithId[];
+    tokenWithId?: string | string[];
     minInput?: number;
     sliceIfMore6?: boolean;
-    tokenId?: number;
     passedShieldedPrivateKey?: string;
     passedShieldedPublicKey?: string;
     ethAddress?: string;
     resetCacheBefore?: boolean;
     allowRemoteDecryption?: boolean;
-    ensuredTokensWithId?: TokenWithId[];
+    ensuredTokensWithId?: string[];
     useBlockedUtxos?: boolean;
 }
 export declare const getInputUtxosRemotely: (hinkal: IHinkal, userKeys: UserKeys, currentChainId: number, shieldedPublicKey: string) => Promise<Utxo[]>;