@hinkal/common 0.3.6 → 0.3.8

package/common/src/data-structures/event-service/evm/BlockchainEventEmitter.mjs

@@ -1,16 +1,21 @@
-import { Logger as e } from "../../../error-handling/logger.mjs";
-import { getProviderFromContract as t } from "../../../functions/utils/getSignerFromContract.mjs";
-import { blockReorgDepth as n } from "../../../constants/reorg-depths.constants.mjs";
-import { getSequence as r, resolveSync as i } from "../../../functions/utils/resolve-sync.utils.mjs";
-import { BlockchainEvent as a } from "../../BlockchainEvent/BlockchainEvent.mjs";
-import { ethers as o } from "ethers";
+import { getNonLocalhostChainId as e } from "../../../constants/chains.constants.mjs";
+import { ContractType as t } from "../../../types/ethereum-network.types.mjs";
+import { Logger as n } from "../../../error-handling/logger.mjs";
+import { getDepositOnChainUtxosAddress as r } from "../../../constants/contracts.constants.mjs";
+import { getContractWithFetcherByChainId as i } from "../../../functions/web3/getContractMetadata.mjs";
+import { getProviderFromContract as a } from "../../../functions/utils/getSignerFromContract.mjs";
+import { getSequence as o, resolveSync as s } from "../../../functions/utils/resolve-sync.utils.mjs";
+import { blockReorgDepth as c } from "../../../constants/reorg-depths.constants.mjs";
+import { BlockchainEvent as l } from "../../BlockchainEvent/BlockchainEvent.mjs";
+import { ethers as u } from "ethers";
 //#region libs/shared/common/src/data-structures/event-service/evm/BlockchainEventEmitter.ts
-var s = class {
+var d = class {
 	RETRY_MIN_PAGE_SIZE = 100;
 	MAX_RETRIES = 20;
 	_chainId;
 	contract;
 	_latestBlockNumber;
+	_blockedUtxosContract;
 	_initialBlockNumber;
 	onEventsProcessed;
 	eventProcessors = /* @__PURE__ */ new Set();
@@ -47,45 +52,54 @@ var s = class {
 	requireReady() {
 		if (!this._isReady) throw Error("Not ready");
 	}
-	async getEventsForSingleContract(e, t, n, r = 0) {
+	async getEventsForSingleContract(e, t, n, r = 0, i = "*") {
 		try {
-			return (await e.queryFilter("*", t, n)).filter((e) => e instanceof o.EventLog);
-		} catch (i) {
+			return (await e.queryFilter(i, t, n)).filter((e) => e instanceof u.EventLog);
+		} catch (a) {
 			if (r < this.MAX_RETRIES && n - t > this.RETRY_MIN_PAGE_SIZE) {
-				let i = Math.floor((t + n) / 2), a = await this.getEventsForSingleContract(e, t, i, r + 1), o = await this.getEventsForSingleContract(e, i + 1, n, r + 1);
-				return [...a, ...o];
+				let a = Math.floor((t + n) / 2), o = await this.getEventsForSingleContract(e, t, a, r + 1, i), s = await this.getEventsForSingleContract(e, a + 1, n, r + 1, i);
+				return [...o, ...s];
 			}
-			throw i;
+			throw a;
 		}
 	}
+	get blockedUtxosContract() {
+		if (this._blockedUtxosContract === void 0) {
+			let n = e(this._chainId);
+			this._blockedUtxosContract = r(n) ? i(n, t.DepositOnChainUtxosContract) : null;
+		}
+		return this._blockedUtxosContract ?? void 0;
+	}
 	addEventProcessorFunction(e) {
 		if (this._isReady) throw Error("Can't add event processor after event emitter initialized");
 		this.eventProcessors.add(e);
 	}
 	async getEventsInRange(e, t) {
 		let n = [];
-		return await i(r(e, t, this.maxPageSize).map(({ from: e, to: t }) => async () => {
+		return await s(o(e, t, this.maxPageSize).map(({ from: e, to: t }) => async () => {
 			let r = await this.getEventsForSingleContract(this.contract, e, t);
 			n.push(...r);
-		})), n.map((e) => a.fromEthers(e));
+			let i = this.blockedUtxosContract;
+			i && n.push(...await this.getEventsForSingleContract(i, e, t, 0, "BlockedUtxosCreated"));
+		})), n.map((e) => l.fromEthers(e));
 	}
 	async getLastBlockNumberForEventRequest() {
-		let e = await t(this.contract).getBlockNumber();
+		let e = await a(this.contract).getBlockNumber();
 		if (!this.isServer) return e;
-		let { chainId: r } = await t(this.contract).getNetwork();
-		return Math.max(this.latestBlockNumber, e - n[Number(r)] + 1);
+		let { chainId: t } = await a(this.contract).getNetwork();
+		return Math.max(this.latestBlockNumber, e - c[Number(t)] + 1);
 	}
-	async retrieveEvents(t, n = !1) {
+	async retrieveEvents(e, t = !1) {
 		return this.requireReady(), await this.eventsFetchingMutex.runExclusive(async () => {
 			try {
-				if (this.inProgress && !n) return !1;
+				if (this.inProgress && !t) return !1;
 				this.inProgress = !0;
-				let e = await this.getLastBlockNumberForEventRequest();
-				if (e < t) return this.inProgress = !1, !1;
-				let r = await this.getEventsInRange(t, e);
-				return await this.processEvents(r, e), this._latestBlockNumber = e, this.inProgress = !1, !0;
-			} catch (t) {
-				return e.error("retrieveEvents error", t), this.inProgress = !1, !1;
+				let n = await this.getLastBlockNumberForEventRequest();
+				if (n < e) return this.inProgress = !1, !1;
+				let r = await this.getEventsInRange(e, n);
+				return await this.processEvents(r, n), this._latestBlockNumber = n, this.inProgress = !1, !0;
+			} catch (e) {
+				return n.error("retrieveEvents error", e), this.inProgress = !1, !1;
 			}
 		});
 	}
@@ -95,4 +109,4 @@ var s = class {
 	}
 };
 //#endregion
-export { s as BlockchainEventEmitter };
+export { d as BlockchainEventEmitter };

package/common/src/data-structures/merkle-tree/MerkleTree.cjs

@@ -1 +1 @@
-const e=require(`../../constants/protocol.constants.cjs`),t=require(`../../error-handling/logError.cjs`),n=require(`./MerkleTreeIncompleteError.cjs`);var r=class r{tree;count;index;reverseTree;static createWithData(e,t,n,i,a,o,s){return new r(a,o,s,e,t,n,i)}static create(t,n,i=e.MERKLE_LEVELS){return new r(t,i,n)}createReverseTree(){let e=new Map;for(let t=this.getStartIndex();t<this.getStartIndex()+this.count;t+=1n){let n=this.tree.get(t);n!==void 0&&e.set(n,t)}return e}constructor(e,t,n,r,i,a,o){this.hashFunction=e,this.levels=t,this.defaultNodeValue=n,this.tree=r??new Map,this.count=o??0n,this.index=a??2n**(t-1n),i?this.reverseTree=i:this.reverseTree=this.createReverseTree()}getStartIndex(){return 2n**(this.levels-1n)}logarithm2(e){let t=0n;for(;2n**t<e;)t+=1n;return t}bigIntMax(e,t){return e>t?e:t}forceInsert(e,t){if(t<this.getStartIndex())throw RangeError();this.tree.set(t,e),this.reverseTree.set(e,t);let n=this.index-this.getStartIndex(),r=this.logarithm2(n),i=t;for(let e=1n;e<=r;e+=1n){i/=2n;let e=this.hashFunction(this.tree.get(i*2n)||this.defaultNodeValue,this.tree.get(i*2n+1n)||this.defaultNodeValue);this.tree.set(i,e)}}insert(e,n){let r=!1;this.tree.has(n)&&(r=!0,t.logError(`Editing commitment index: ${n} `)),r||(this.count+=1n),this.index=this.bigIntMax(this.index,n+1n),this.forceInsert(e,n)}remove(e){this.forceInsert(this.defaultNodeValue,e)}completenessCheck(){if(this.count!==this.index-this.getStartIndex())throw new n.MerkleTreeIncompleteError}getRootHash(){this.completenessCheck();for(let e=1n;e<2n**this.levels;e*=2n)if(this.tree.get(e))return this.tree.get(e);return this.defaultNodeValue}getMerkleData(){return this.completenessCheck(),new Map(this.tree)}getValue(e){return this.tree.get(e)}getSiblingIndex(e){return e===1n?1n:e%2n==1n?e-1n:e+1n}getSiblingHashesForVerification(e){this.completenessCheck();let t=this.reverseTree.get(e);if(t===void 0)return Array(25).fill(0n);let n=[];for(;t!==0n;)n.push(this.tree.get(this.getSiblingIndex(t))??this.defaultNodeValue),t/=2n;return n.slice(0,25)}getSiblingSides(e){this.completenessCheck();let t=this.reverseTree.get(e);if(t===void 0)return Array(25).fill(0n);let n=[];for(;t!==0n;){let e=t%2n==0n?0n:1n;n.push(e),t/=2n}return n.slice(0,25)}toJSON(){let{tree:e,reverseTree:t,count:n,index:r}=this;return{tree:Object.fromEntries(e),reverseTree:Object.fromEntries(t),count:n.toString(),index:r.toString()}}toJSONLite(){let{tree:e,count:t,index:n}=this;return{tree:Object.fromEntries(e),count:t.toString(),index:n.toString()}}clone(){return r.createWithData(new Map(this.tree),new Map(this.reverseTree),this.index,this.count,this.hashFunction,this.levels,this.defaultNodeValue)}getIndex(){return this.index}getInsertionSiblingData(e){let t=[],n=[],r=e;for(;r!==0n;)t.push(this.tree.get(this.getSiblingIndex(r))??this.defaultNodeValue),n.push(r%2n==0n?0n:1n),r/=2n;return{siblings:t.slice(0,25),sides:n.slice(0,25)}}};exports.MerkleTree=r;
+const e=require(`../../constants/protocol.constants.cjs`),t=require(`../../error-handling/logError.cjs`),n=require(`./MerkleTreeIncompleteError.cjs`);var r=class r{tree;count;index;reverseTree;static createWithData(e,t,n,i,a,o,s){return new r(a,o,s,e,t,n,i)}static create(t,n,i=e.MERKLE_LEVELS){return new r(t,i,n)}createReverseTree(){let e=new Map;for(let t=this.getStartIndex();t<this.getStartIndex()+this.count;t+=1n){let n=this.tree.get(t);n!==void 0&&e.set(n,t)}return e}constructor(e,t,n,r,i,a,o){this.hashFunction=e,this.levels=t,this.defaultNodeValue=n,this.tree=r??new Map,this.count=o??0n,this.index=a??2n**(t-1n),i?this.reverseTree=i:this.reverseTree=this.createReverseTree()}getStartIndex(){return 2n**(this.levels-1n)}logarithm2(e){let t=0n;for(;2n**t<e;)t+=1n;return t}bigIntMax(e,t){return e>t?e:t}forceInsert(e,t){if(t<this.getStartIndex())throw RangeError();this.tree.set(t,e),this.reverseTree.set(e,t);let n=this.index-this.getStartIndex(),r=this.logarithm2(n),i=t;for(let e=1n;e<=r;e+=1n){i/=2n;let e=this.hashFunction(this.tree.get(i*2n)||this.defaultNodeValue,this.tree.get(i*2n+1n)||this.defaultNodeValue);this.tree.set(i,e)}}insert(e,n){let r=!1;this.tree.has(n)&&(r=!0,t.logError(`Editing commitment index: ${n} `)),r||(this.count+=1n),this.index=this.bigIntMax(this.index,n+1n),this.forceInsert(e,n)}remove(e){this.forceInsert(this.defaultNodeValue,e)}completenessCheck(){if(this.count!==this.index-this.getStartIndex())throw new n.MerkleTreeIncompleteError}getRootHash(){this.completenessCheck();for(let e=1n;e<2n**this.levels;e*=2n)if(this.tree.get(e))return this.tree.get(e);return this.defaultNodeValue}getMerkleData(){return this.completenessCheck(),new Map(this.tree)}getValue(e){return this.tree.get(e)}contains(e){return this.reverseTree.has(e)}getSiblingIndex(e){return e===1n?1n:e%2n==1n?e-1n:e+1n}getSiblingHashesForVerification(e){this.completenessCheck();let t=this.reverseTree.get(e);if(t===void 0)return Array(25).fill(0n);let n=[];for(;t!==0n;)n.push(this.tree.get(this.getSiblingIndex(t))??this.defaultNodeValue),t/=2n;return n.slice(0,25)}getSiblingSides(e){this.completenessCheck();let t=this.reverseTree.get(e);if(t===void 0)return Array(25).fill(0n);let n=[];for(;t!==0n;){let e=t%2n==0n?0n:1n;n.push(e),t/=2n}return n.slice(0,25)}toJSON(){let{tree:e,reverseTree:t,count:n,index:r}=this;return{tree:Object.fromEntries(e),reverseTree:Object.fromEntries(t),count:n.toString(),index:r.toString()}}toJSONLite(){let{tree:e,count:t,index:n}=this;return{tree:Object.fromEntries(e),count:t.toString(),index:n.toString()}}clone(){return r.createWithData(new Map(this.tree),new Map(this.reverseTree),this.index,this.count,this.hashFunction,this.levels,this.defaultNodeValue)}getIndex(){return this.index}getInsertionSiblingData(e){let t=[],n=[],r=e;for(;r!==0n;)t.push(this.tree.get(this.getSiblingIndex(r))??this.defaultNodeValue),n.push(r%2n==0n?0n:1n),r/=2n;return{siblings:t.slice(0,25),sides:n.slice(0,25)}}};exports.MerkleTree=r;

package/common/src/data-structures/merkle-tree/MerkleTree.d.ts

@@ -63,6 +63,7 @@ export declare class MerkleTree<T> {
     getRootHash(): T | undefined;
     getMerkleData(): Map<bigint, T>;
     getValue(index: bigint): T | undefined;
+    contains(value: T): boolean;
     getSiblingIndex(index: bigint): bigint;
     /**
      * get sibling hashes needed by main.circom

package/common/src/data-structures/merkle-tree/MerkleTree.mjs

@@ -66,6 +66,9 @@ var r = class r {
 	getValue(e) {
 		return this.tree.get(e);
 	}
+	contains(e) {
+		return this.reverseTree.has(e);
+	}
 	getSiblingIndex(e) {
 		return e === 1n ? 1n : e % 2n == 1n ? e - 1n : e + 1n;
 	}

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

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

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

@@ -44,10 +44,7 @@ var u = (e, t) => {
 	}
 }, p = (o, c) => {
 	if (o instanceof a) return s(o, c);
-	if (o instanceof i) {
-		let { amount: e, message: t } = o;
-		return `${t} ${e}`;
-	}
+	if (o instanceof i) return o.message;
 	let u = d(o);
 	if (u && l(u)) return n.INSUFFICIENT_FUNDS;
 	if (u) {

package/common/src/functions/index.cjs

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

package/common/src/functions/index.mjs

@@ -6,6 +6,7 @@ import "./web3/etherFunctions.mjs";
 import "./utils/time.utils.mjs";
 import "./utils/upToDateState.mjs";
 import "./utils/cacheFunctions.mjs";
+import "./utils/encodeTokenWithId.mjs";
 import "./utils/enclaveHandshakeService.mjs";
 import "./utils/encryptInputForEnclave.mjs";
 import "./utils/solanaMint.utils.mjs";
@@ -33,37 +34,39 @@ import "./pre-transaction/constructAdminData.mjs";
 import "./utils/create-provider.mjs";
 import "./pre-transaction/calculateSolanaNullifierCount.mjs";
 import "./pre-transaction/convert-okx-instructions.mjs";
-import "./web3/getSolanaPriorityFee.mjs";
 import "./utils/process.utils.mjs";
 import "./pre-transaction/sendV0Transaction.mjs";
 import "./utils/bytes32.utils.mjs";
 import "./pre-transaction/getFeeStructure.mjs";
 import "./pre-transaction/getExternalSwapAddress.mjs";
-import "./pre-transaction/waitForDepositedUtxosInMerkleTree.mjs";
+import "./pre-transaction/speculativeUtxo.mjs";
 import "./pre-transaction/buildCommitmentValidationData.mjs";
 import "./pre-transaction/index.mjs";
 import "./snarkjs/generateZkProof.mjs";
 import "./snarkjs/generateMainAndCommitmentZkProof.mjs";
+import "./web3/getContractMetadata.mjs";
+import "./utils/solana-program.utils.mjs";
 import "./snarkjs/fetchOnChainRootHashes.mjs";
 import "./utils/getContractAddress.mjs";
 import "./private-wallet/emporium.helpers.mjs";
 import "./snarkjs/constructGeneralZkProof.mjs";
 import "./utils/getSignerFromContract.mjs";
 import "./utils/tronSimulation.utils.mjs";
-import "./utils/tx-confirmation.utils.mjs";
-import "./utils/getUtxosFromReceipt.utils.mjs";
-import "./utils/getRecipientInfoFromUserKeys.mjs";
 import "./utils/resolve-sync.utils.mjs";
 import "./utils/reloadPage.mjs";
 import "./utils/cacheDevice.utils.mjs";
 import "./utils/involves-permit2-op.mjs";
 import "./utils/convertEmporiumOpToCallInfo.mjs";
+import "./utils/getRecipientInfoFromUserKeys.mjs";
 import "./utils/publicBalance.utils.mjs";
 import "./utils/postToOffscreen.mjs";
-import "./utils/getUtxosFromReceiptSolana.mjs";
 import "./utils/fees.utils.mjs";
 import "./utils/proxyAvatar.utils.mjs";
+import "./utils/enclave-utxo-storage.mjs";
 import "./utils/enclave-signature-storage.mjs";
+import "./utils/tx-confirmation.utils.mjs";
+import "./utils/bridge-arrival.utils.mjs";
+import "./utils/solana-sponsored.utils.mjs";
 import "./utils/temp-wallet.utils.mjs";
 import "./utils/mnemonics.mjs";
 import "./utils/nearIntents.utils.mjs";

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

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

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

@@ -25,11 +25,10 @@ var c = 6, l = async (l, u, d, f) => {
 	}
 	if (p.length === 0) return 0;
 	try {
-		let { fetchRpcUrl: e, contractData: n } = t[u], { originalDeployer: r, hinkalIdl: o } = n;
-		if (!e) throw Error("RPC URL not found for chain ID");
+		let { contractData: e, rpcUrl: n } = t[u], { originalDeployer: r, hinkalIdl: o } = e;
 		if (!r) throw Error("Original deployer not found for chain ID");
 		if (!o) throw Error("Hinkal IDL not found for chain ID");
-		let c = a(e), l = new s(r), d = new s(o.address), f = p.map((e) => i(BigInt(e.getNullifier()), l, d));
+		let c = a(n), l = new s(r), d = new s(o.address), f = p.map((e) => i(BigInt(e.getNullifier()), l, d));
 		return (await c.getMultipleAccountsInfo(f)).filter((e) => e === null).length;
 	} catch (e) {
 		return n.error("calculateSolanaNullifierCount: nullifier probe failed, charging for every note", e), p.length;

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

@@ -1 +1 @@
-require(`./outputUtxoProcessing.cjs`),require(`./solana.cjs`),require(`./process-gas-estimates.cjs`),require(`./getVolatileTransferAmount.cjs`),require(`./constructAdminData.cjs`),require(`./calculateSolanaNullifierCount.cjs`),require(`./addressTableLookup.cjs`),require(`./convert-okx-instructions.cjs`),require(`./sendV0Transaction.cjs`),require(`./store-proof.cjs`),require(`./sendInitNullifiersTransaction.cjs`),require(`./store-instructions.cjs`),require(`./ensureAmountChanges.cjs`),require(`./getFeeStructure.cjs`),require(`./getExternalSwapAddress.cjs`),require(`./waitForDepositedUtxosInMerkleTree.cjs`),require(`./buildCommitmentValidationData.cjs`);
+require(`./outputUtxoProcessing.cjs`),require(`./solana.cjs`),require(`./process-gas-estimates.cjs`),require(`./getVolatileTransferAmount.cjs`),require(`./constructAdminData.cjs`),require(`./calculateSolanaNullifierCount.cjs`),require(`./addressTableLookup.cjs`),require(`./convert-okx-instructions.cjs`),require(`./sendV0Transaction.cjs`),require(`./store-proof.cjs`),require(`./sendInitNullifiersTransaction.cjs`),require(`./store-instructions.cjs`),require(`./ensureAmountChanges.cjs`),require(`./getFeeStructure.cjs`),require(`./getExternalSwapAddress.cjs`),require(`./speculativeUtxo.cjs`),require(`./buildCommitmentValidationData.cjs`);

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

@@ -15,4 +15,5 @@ export * from './ensureAmountChanges';
 export * from './getFeeStructure';
 export * from './getExternalSwapAddress';
 export * from './waitForDepositedUtxosInMerkleTree';
+export * from './speculativeUtxo';
 export * from './buildCommitmentValidationData';

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

@@ -13,5 +13,5 @@ import "./store-instructions.mjs";
 import "./ensureAmountChanges.mjs";
 import "./getFeeStructure.mjs";
 import "./getExternalSwapAddress.mjs";
-import "./waitForDepositedUtxosInMerkleTree.mjs";
+import "./speculativeUtxo.mjs";
 import "./buildCommitmentValidationData.mjs";

package/common/src/functions/pre-transaction/merge-with-fee-structure-emporium.cjs

@@ -1 +1 @@
-const e=require(`../../constants/protocol.constants.cjs`),t=require(`../utils/amounts.utils.cjs`),n=require(`../../types/ethereum-network.types.cjs`),r=require(`../private-wallet/emporium.helpers.cjs`),i=require(`./merge-with-fee-structure.cjs`),a=require(`../web3/getPublicAddressBalance.cjs`);var o=async(o,s,c,l,u,d,f,p)=>{let m=0n,h=p<0n?p:0n,g=await a.getPublicAddressBalance(o,s,f.feeToken,c)+h;m=g<0?f.flatFee:t.maxBigInt(f.flatFee-g,0n),m!==0n&&(await i.mergeWithFeeStructure(s,u,d,{...f,flatFee:m}),l.push(r.createTransferToEmporiumOp(f.feeToken===e.zeroAddress?void 0:o.getContractWithFetcher(s,n.ContractType.ERC20Contract,f.feeToken),c,m,!1)))};exports.mergeWithFeeStructureEmporium=o;
+const e=require(`../../constants/protocol.constants.cjs`),t=require(`../utils/amounts.utils.cjs`),n=require(`../../types/ethereum-network.types.cjs`),r=require(`../private-wallet/emporium.helpers.cjs`),i=require(`./merge-with-fee-structure.cjs`),a=require(`../web3/getPublicAddressBalance.cjs`);var o=async(o,s,c,l,u,d,f,p)=>{let m=0n,h=p<0n?p:0n,g=await a.getPublicAddressBalance(s,f.feeToken,c)+h;m=g<0?f.flatFee:t.maxBigInt(f.flatFee-g,0n),m!==0n&&(await i.mergeWithFeeStructure(s,u,d,{...f,flatFee:m}),l.push(r.createTransferToEmporiumOp(f.feeToken===e.zeroAddress?void 0:o.getContractWithFetcherByChainId(s,n.ContractType.ERC20Contract,f.feeToken),c,m,!1)))};exports.mergeWithFeeStructureEmporium=o;

package/common/src/functions/pre-transaction/merge-with-fee-structure-emporium.mjs

@@ -6,11 +6,11 @@ import { mergeWithFeeStructure as i } from "./merge-with-fee-structure.mjs";
 import { getPublicAddressBalance as a } from "../web3/getPublicAddressBalance.mjs";
 //#region libs/shared/common/src/functions/pre-transaction/merge-with-fee-structure-emporium.ts
 var o = async (o, s, c, l, u, d, f, p) => {
-	let m = 0n, h = p < 0n ? p : 0n, g = await a(o, s, f.feeToken, c) + h;
+	let m = 0n, h = p < 0n ? p : 0n, g = await a(s, f.feeToken, c) + h;
 	m = g < 0 ? f.flatFee : t(f.flatFee - g, 0n), m !== 0n && (await i(s, u, d, {
 		...f,
 		flatFee: m
-	}), l.push(r(f.feeToken === e ? void 0 : o.getContractWithFetcher(s, n.ERC20Contract, f.feeToken), c, m, !1)));
+	}), l.push(r(f.feeToken === e ? void 0 : o.getContractWithFetcherByChainId(s, n.ERC20Contract, f.feeToken), c, m, !1)));
 };
 //#endregion
 export { o as mergeWithFeeStructureEmporium };

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

@@ -1,2 +1,2 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../utils/serialize.utils.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../error-handling/logger.cjs`),r=require(`../../data-structures/AccountActions/AccountActions.cjs`),i=require(`../../types/fee.types.cjs`),a=require(`../web3/getSolanaPriorityFee.cjs`),o=require(`../utils/process.utils.cjs`),s=require(`../../error-handling/retrySolanaError.cjs`);let c=require(`@solana/web3.js`);require(`@solana/spl-token`);var l=5e3,u=6e4,d=async(e,t,n=`confirmed`)=>await o.pollForValue(()=>e.getTransaction(t,{commitment:n,maxSupportedTransactionVersion:0}),{timeoutMs:u,intervalMs:l})??null,f=async(r,i,a,o,s=!1)=>{try{let{blockhash:l}=await r.getLatestBlockhash(),u=new c.VersionedTransaction(new c.TransactionMessage({payerKey:i,recentBlockhash:l,instructions:[c.ComputeBudgetProgram.setComputeUnitLimit({units:t.MAX_COMPUTE_UNIT_LIMIT}),...s?[c.ComputeBudgetProgram.requestHeapFrame({bytes:t.MAX_SOLANA_HEAP_FRAME_BYTES})]:[],...a]}).compileToV0Message(o)),d=await r.simulateTransaction(u,{sigVerify:!1,replaceRecentBlockhash:!0});d.value.err&&n.Logger.error(`Solana compute-unit simulation failed:`,{error:e.safeJsonStringify(d.value.err),logs:d.value.logs});let{unitsConsumed:f}=d.value;if(!f)return t.MAX_COMPUTE_UNIT_LIMIT;let p=Math.ceil(f*(1+t.COMPUTE_UNIT_PADDING_PERCENTAGE));return Math.max(t.MIN_COMPUTE_UNIT_LIMIT,Math.min(p,t.MAX_COMPUTE_UNIT_LIMIT))}catch(e){return n.Logger.error(`Solana compute-unit estimation threw:`,e),t.MAX_COMPUTE_UNIT_LIMIT}},p=(e,t,n,r)=>{let i=new Set;return t&&i.add(t.toBase58()),n?.forEach(e=>i.add(e.toBase58())),e.forEach(e=>{i.add(e.programId.toBase58()),e.keys.forEach(e=>{i.add(e.pubkey.toBase58())})}),r&&r.forEach(e=>{i.add(e.key.toBase58()),e.state.addresses.forEach(e=>{i.add(e.toBase58())})}),[...i].map(e=>new c.PublicKey(e))},m=(t,r)=>{if(!t)throw Error(`Failed to fetch Solana transaction details for signature${r?` ${r}`:``}`);if(t.meta?.err){let i=e.safeJsonStringify(t.meta.err),a=t.meta.logMessages?.join(`
-`);n.Logger.error(`Solana transaction failed on-chain`,{signature:r,error:i,logs:t.meta.logMessages});let o=r?` (signature: ${r})`:``;throw Error(a?`Solana transaction failed on-chain${o}: ${i}\n${a}`:`Solana transaction failed on-chain${o}: ${i}`)}},h=async(e,n,r,i,o,s=!1)=>{if(r.some(e=>e.programId.equals(c.ComputeBudgetProgram.programId)))return r.map(e=>e.programId.equals(c.ComputeBudgetProgram.programId)&&e.data[0]===2?c.ComputeBudgetProgram.setComputeUnitLimit({units:t.MAX_COMPUTE_UNIT_LIMIT}):e);let l=r.filter(e=>!e.programId.equals(c.ComputeBudgetProgram.programId)),u=await f(e,n,l,i,s),d=c.ComputeBudgetProgram.setComputeUnitLimit({units:u}),m=e.rpcEndpoint.includes(`helius`)?await a.getSolanaPriorityFee(p(l,n,[c.ComputeBudgetProgram.programId],i),o):0;return[d,c.ComputeBudgetProgram.setComputeUnitPrice({microLamports:m}),...s?[c.ComputeBudgetProgram.requestHeapFrame({bytes:t.MAX_SOLANA_HEAP_FRAME_BYTES})]:[],...l]},g=async({connection:e,chainId:t,subAccount:n,payerPublicKey:a,instructions:o,lookupTableAccounts:l})=>{let u=r.AccountActions.getPrivateKeyFromSubAccount(t,n);if(!u)throw Error(`Private key is not available`);for(let t=0;t<10;t+=1){let n=t===9;try{let t=await h(e,a,o,l,n?i.SolanaPriorityFeeMode.HIGH:i.SolanaPriorityFeeMode.RECOMMENDED),{blockhash:s,lastValidBlockHeight:f}=await e.getLatestBlockhash(),p=new c.VersionedTransaction(new c.TransactionMessage({payerKey:a,recentBlockhash:s,instructions:t}).compileToV0Message(l)),g=await r.AccountActions.sendAndSignSolanaTransactionFromPrivateKey(e,u,p,!0);return await e.confirmTransaction({signature:g,blockhash:s,lastValidBlockHeight:f},`confirmed`),m(await d(e,g),g),g}catch(e){if(s.shouldRetryForSolanaError(e)&&!n)continue;throw e}}throw Error(`Failed to send proxy v0 transaction due to expired blockheight after all retries`)};exports.estimateComputeUnitLimit=f,exports.fetchSolanaTransaction=d,exports.getAccountsFromInstructions=p,exports.sendProxyV0Transaction=g;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../utils/serialize.utils.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../error-handling/logger.cjs`),r=require(`../../data-structures/AccountActions/AccountActions.cjs`),i=require(`../../types/fee.types.cjs`),a=require(`../../API/solana-priority-fee.cjs`),o=require(`../utils/process.utils.cjs`),s=require(`../../error-handling/retrySolanaError.cjs`);let c=require(`@solana/web3.js`);require(`@solana/spl-token`);var l=5e3,u=6e4,d=async(e,t,n=`confirmed`)=>await o.pollForValue(()=>e.getTransaction(t,{commitment:n,maxSupportedTransactionVersion:0}),{timeoutMs:u,intervalMs:l})??null,f=async(r,i,a,o,s=!1)=>{try{let{blockhash:l}=await r.getLatestBlockhash(),u=new c.VersionedTransaction(new c.TransactionMessage({payerKey:i,recentBlockhash:l,instructions:[c.ComputeBudgetProgram.setComputeUnitLimit({units:t.MAX_COMPUTE_UNIT_LIMIT}),...s?[c.ComputeBudgetProgram.requestHeapFrame({bytes:t.MAX_SOLANA_HEAP_FRAME_BYTES})]:[],...a]}).compileToV0Message(o)),d=await r.simulateTransaction(u,{sigVerify:!1,replaceRecentBlockhash:!0});d.value.err&&n.Logger.error(`Solana compute-unit simulation failed:`,{error:e.safeJsonStringify(d.value.err),logs:d.value.logs});let{unitsConsumed:f}=d.value;if(!f)return t.MAX_COMPUTE_UNIT_LIMIT;let p=Math.ceil(f*(1+t.COMPUTE_UNIT_PADDING_PERCENTAGE));return Math.max(t.MIN_COMPUTE_UNIT_LIMIT,Math.min(p,t.MAX_COMPUTE_UNIT_LIMIT))}catch(e){return n.Logger.error(`Solana compute-unit estimation threw:`,e),t.MAX_COMPUTE_UNIT_LIMIT}},p=(e,t,n,r)=>{let i=new Set;return t&&i.add(t.toBase58()),n?.forEach(e=>i.add(e.toBase58())),e.forEach(e=>{i.add(e.programId.toBase58()),e.keys.forEach(e=>{i.add(e.pubkey.toBase58())})}),r&&r.forEach(e=>{i.add(e.key.toBase58()),e.state.addresses.forEach(e=>{i.add(e.toBase58())})}),[...i].map(e=>new c.PublicKey(e))},m=(t,r)=>{if(!t)throw Error(`Failed to fetch Solana transaction details for signature${r?` ${r}`:``}`);if(t.meta?.err){let i=e.safeJsonStringify(t.meta.err),a=t.meta.logMessages?.join(`
+`);n.Logger.error(`Solana transaction failed on-chain`,{signature:r,error:i,logs:t.meta.logMessages});let o=r?` (signature: ${r})`:``;throw Error(a?`Solana transaction failed on-chain${o}: ${i}\n${a}`:`Solana transaction failed on-chain${o}: ${i}`)}},h=async(e,n,r,i,o,s=!1)=>{if(r.some(e=>e.programId.equals(c.ComputeBudgetProgram.programId)))return r.map(e=>e.programId.equals(c.ComputeBudgetProgram.programId)&&e.data[0]===2?c.ComputeBudgetProgram.setComputeUnitLimit({units:t.MAX_COMPUTE_UNIT_LIMIT}):e);let l=r.filter(e=>!e.programId.equals(c.ComputeBudgetProgram.programId)),u=await f(e,n,l,i,s),d=c.ComputeBudgetProgram.setComputeUnitLimit({units:u}),m=await a.getSolanaPriorityFeeFromServer(p(l,n,[c.ComputeBudgetProgram.programId],i),o);return[d,...m>0?[c.ComputeBudgetProgram.setComputeUnitPrice({microLamports:m})]:[],...s?[c.ComputeBudgetProgram.requestHeapFrame({bytes:t.MAX_SOLANA_HEAP_FRAME_BYTES})]:[],...l]},g=async({connection:e,chainId:t,subAccount:n,payerPublicKey:a,instructions:o,lookupTableAccounts:l})=>{let u=r.AccountActions.getPrivateKeyFromSubAccount(t,n);if(!u)throw Error(`Private key is not available`);for(let t=0;t<10;t+=1){let n=t===9;try{let t=await h(e,a,o,l,n?i.SolanaPriorityFeeMode.HIGH:i.SolanaPriorityFeeMode.RECOMMENDED),{blockhash:s,lastValidBlockHeight:f}=await e.getLatestBlockhash(),p=new c.VersionedTransaction(new c.TransactionMessage({payerKey:a,recentBlockhash:s,instructions:t}).compileToV0Message(l)),g=await r.AccountActions.sendAndSignSolanaTransactionFromPrivateKey(e,u,p,!0);return await e.confirmTransaction({signature:g,blockhash:s,lastValidBlockHeight:f},`confirmed`),m(await d(e,g),g),g}catch(e){if(s.shouldRetryForSolanaError(e)&&!n)continue;throw e}}throw Error(`Failed to send proxy v0 transaction due to expired blockheight after all retries`)};exports.estimateComputeUnitLimit=f,exports.fetchSolanaTransaction=d,exports.getAccountsFromInstructions=p,exports.handleSolanaTransactionError=m,exports.sendProxyV0Transaction=g;

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

@@ -1,9 +1,11 @@
-import { AddressLookupTableAccount, Connection, Finality, Keypair, PublicKey, TransactionInstruction, VersionedTransactionResponse } from '@solana/web3.js';
+import { AddressLookupTableAccount, Connection, Finality, Keypair, PublicKey, TransactionInstruction, VersionedTransaction, VersionedTransactionResponse } from '@solana/web3.js';
 import { SubAccount } from '../../types/proxy.types';
 export declare const fetchSolanaTransaction: (connection: Connection, signature: string, finality?: Finality) => Promise<VersionedTransactionResponse | null>;
 export declare const estimateComputeUnitLimit: (connection: Connection, payerKey: PublicKey, instructions: TransactionInstruction[], lookupTableAccounts?: AddressLookupTableAccount[], requestHeapFrame?: boolean) => Promise<number>;
 export declare const getAccountsFromInstructions: (instructions: TransactionInstruction[], payerKey?: PublicKey, additionalAccounts?: PublicKey[], lookupTableAccounts?: AddressLookupTableAccount[]) => PublicKey[];
+export declare const handleSolanaTransactionError: (transactionResponse: VersionedTransactionResponse | null, signature?: string) => void;
 export declare const sendV0Transaction: (connection: Connection, instructions: TransactionInstruction[], payer: Keypair, signers: Keypair[], lookupTableAccounts?: AddressLookupTableAccount[], requestHeapFrame?: boolean) => Promise<string>;
+export declare const sendSignedV0Transaction: (connection: Connection, transaction: VersionedTransaction) => Promise<string>;
 export declare const ensureAtaExists: (connection: Connection, payer: Keypair, mintPubkey: PublicKey | null, owner: PublicKey) => Promise<PublicKey | null>;
 type SendProxyV0TransactionParams = {
     connection: Connection;
@@ -14,5 +16,6 @@ type SendProxyV0TransactionParams = {
     lookupTableAccounts?: AddressLookupTableAccount[];
 };
 export declare const sendProxyV0Transaction: ({ connection, chainId, subAccount, payerPublicKey, instructions, lookupTableAccounts, }: SendProxyV0TransactionParams) => Promise<string>;
-export declare const serializeProxyV0Transaction: (connection: Connection, payerPublicKey: PublicKey, instructions: TransactionInstruction[], lookupTableAccounts?: AddressLookupTableAccount[]) => Promise<string>;
+export declare const buildProxyV0Transaction: (connection: Connection, signerPublicKey: PublicKey, instructions: TransactionInstruction[], lookupTableAccounts?: AddressLookupTableAccount[], feePayerPublicKey?: PublicKey) => Promise<VersionedTransaction>;
+export declare const serializeProxyV0Transaction: (connection: Connection, signerPublicKey: PublicKey, instructions: TransactionInstruction[], lookupTableAccounts?: AddressLookupTableAccount[], feePayerPublicKey?: PublicKey) => Promise<string>;
 export {};

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

@@ -3,7 +3,7 @@ import { COMPUTE_UNIT_PADDING_PERCENTAGE as t, MAX_COMPUTE_UNIT_LIMIT as n, MAX_
 import { Logger as a } from "../../error-handling/logger.mjs";
 import { AccountActions as o } from "../../data-structures/AccountActions/AccountActions.mjs";
 import { SolanaPriorityFeeMode as s } from "../../types/fee.types.mjs";
-import { getSolanaPriorityFee as c } from "../web3/getSolanaPriorityFee.mjs";
+import { getSolanaPriorityFeeFromServer as c } from "../../API/solana-priority-fee.mjs";
 import { pollForValue as l } from "../utils/process.utils.mjs";
 import { shouldRetryForSolanaError as u } from "../../error-handling/retrySolanaError.mjs";
 import { ComputeBudgetProgram as d, PublicKey as f, TransactionMessage as p, VersionedTransaction as m } from "@solana/web3.js";
@@ -65,10 +65,10 @@ var h = 5e3, g = 6e4, _ = async (e, t, n = "confirmed") => await l(() => e.getTr
 	}
 }, x = async (e, t, i, a, o, s = !1) => {
 	if (i.some((e) => e.programId.equals(d.programId))) return i.map((e) => e.programId.equals(d.programId) && e.data[0] === 2 ? d.setComputeUnitLimit({ units: n }) : e);
-	let l = i.filter((e) => !e.programId.equals(d.programId)), u = await v(e, t, l, a, s), f = d.setComputeUnitLimit({ units: u }), p = e.rpcEndpoint.includes("helius") ? await c(y(l, t, [d.programId], a), o) : 0;
+	let l = i.filter((e) => !e.programId.equals(d.programId)), u = await v(e, t, l, a, s), f = d.setComputeUnitLimit({ units: u }), p = await c(y(l, t, [d.programId], a), o);
 	return [
 		f,
-		d.setComputeUnitPrice({ microLamports: p }),
+		...p > 0 ? [d.setComputeUnitPrice({ microLamports: p })] : [],
 		...s ? [d.requestHeapFrame({ bytes: r })] : [],
 		...l
 	];
@@ -96,4 +96,4 @@ var h = 5e3, g = 6e4, _ = async (e, t, n = "confirmed") => await l(() => e.getTr
 	throw Error("Failed to send proxy v0 transaction due to expired blockheight after all retries");
 };
 //#endregion
-export { v as estimateComputeUnitLimit, _ as fetchSolanaTransaction, y as getAccountsFromInstructions, S as sendProxyV0Transaction };
+export { v as estimateComputeUnitLimit, _ as fetchSolanaTransaction, y as getAccountsFromInstructions, b as handleSolanaTransactionError, S as sendProxyV0Transaction };

package/common/src/functions/pre-transaction/solanaTransfer.utils.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`),require(`../../constants/protocol.constants.cjs`);let e=require(`@solana/web3.js`),t=require(`@solana/spl-token`);var n=async(n,r,i,a,o)=>{let{erc20TokenAddress:s,is2022Program:c,decimals:l}=a,u=[];if(s===`11111111111111111111111111111111`)return u.push(e.SystemProgram.transfer({fromPubkey:r,toPubkey:i,lamports:Number(o)})),{instructions:u,programId:e.SystemProgram.programId};let d=c?t.TOKEN_2022_PROGRAM_ID:t.TOKEN_PROGRAM_ID,f=new e.PublicKey(s),p=await(0,t.getAssociatedTokenAddress)(f,r,!0,d),m=await(0,t.getAssociatedTokenAddress)(f,i,!0,d);return await n.getAccountInfo(m)||u.push((0,t.createAssociatedTokenAccountInstruction)(r,m,i,f,d)),c?u.push((0,t.createTransferCheckedInstruction)(p,f,m,r,o,l,[],d)):u.push((0,t.createTransferInstruction)(p,m,r,o,[],d)),{instructions:u,programId:d}};exports.buildSolanaTransferInstructions=n;
+require(`../../../../_virtual/_rolldown/runtime.cjs`),require(`../../constants/protocol.constants.cjs`);const e=require(`../utils/solanaMint.utils.cjs`);let t=require(`@solana/web3.js`),n=require(`@solana/spl-token`);var r=async(r,i,a,o,s)=>{let{erc20TokenAddress:c,is2022Program:l,decimals:u}=o,d=[];if(c===`11111111111111111111111111111111`)return d.push(t.SystemProgram.transfer({fromPubkey:i,toPubkey:a,lamports:Number(s)})),{instructions:d,programId:t.SystemProgram.programId};let f=e.getSolanaTokenProgramId(l),p=new t.PublicKey(c),m=await(0,n.getAssociatedTokenAddress)(p,i,!0,f),h=await(0,n.getAssociatedTokenAddress)(p,a,!0,f);return await r.getAccountInfo(h)||d.push((0,n.createAssociatedTokenAccountInstruction)(i,h,a,p,f)),l?d.push((0,n.createTransferCheckedInstruction)(m,p,h,i,s,u,[],f)):d.push((0,n.createTransferInstruction)(m,h,i,s,[],f)),{instructions:d,programId:f}};exports.buildSolanaTransferInstructions=r;

package/common/src/functions/pre-transaction/solanaTransfer.utils.mjs

@@ -1,22 +1,23 @@
 import "../../constants/protocol.constants.mjs";
-import { PublicKey as e, SystemProgram as t } from "@solana/web3.js";
-import { TOKEN_2022_PROGRAM_ID as n, TOKEN_PROGRAM_ID as r, createAssociatedTokenAccountInstruction as i, createTransferCheckedInstruction as a, createTransferInstruction as o, getAssociatedTokenAddress as s } from "@solana/spl-token";
+import { getSolanaTokenProgramId as e } from "../utils/solanaMint.utils.mjs";
+import { PublicKey as t, SystemProgram as n } from "@solana/web3.js";
+import { createAssociatedTokenAccountInstruction as r, createTransferCheckedInstruction as i, createTransferInstruction as a, getAssociatedTokenAddress as o } from "@solana/spl-token";
 //#region libs/shared/common/src/functions/pre-transaction/solanaTransfer.utils.ts
-var c = async (c, l, u, d, f) => {
-	let { erc20TokenAddress: p, is2022Program: m, decimals: h } = d, g = [];
-	if (p === "11111111111111111111111111111111") return g.push(t.transfer({
-		fromPubkey: l,
-		toPubkey: u,
-		lamports: Number(f)
+var s = async (s, c, l, u, d) => {
+	let { erc20TokenAddress: f, is2022Program: p, decimals: m } = u, h = [];
+	if (f === "11111111111111111111111111111111") return h.push(n.transfer({
+		fromPubkey: c,
+		toPubkey: l,
+		lamports: Number(d)
 	})), {
-		instructions: g,
-		programId: t.programId
+		instructions: h,
+		programId: n.programId
 	};
-	let _ = m ? n : r, v = new e(p), y = await s(v, l, !0, _), b = await s(v, u, !0, _);
-	return await c.getAccountInfo(b) || g.push(i(l, b, u, v, _)), m ? g.push(a(y, v, b, l, f, h, [], _)) : g.push(o(y, b, l, f, [], _)), {
-		instructions: g,
-		programId: _
+	let g = e(p), _ = new t(f), v = await o(_, c, !0, g), y = await o(_, l, !0, g);
+	return await s.getAccountInfo(y) || h.push(r(c, y, l, _, g)), p ? h.push(i(v, _, y, c, d, m, [], g)) : h.push(a(v, y, c, d, [], g)), {
+		instructions: h,
+		programId: g
 	};
 };
 //#endregion
-export { c as buildSolanaTransferInstructions };
+export { s as buildSolanaTransferInstructions };

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

@@ -0,0 +1 @@
+var e=e=>({amount:e.amount.toString(),erc20TokenAddress:e.erc20TokenAddress,mintAddress:e.mintAddress??``,timeStamp:e.timeStamp,stealthAddress:BigInt(e.getStealthAddress()).toString(),isBlocked:e.isBlocked,H0:[(e.H0?.[0]??0n).toString(),(e.H0?.[1]??0n).toString()]}),t=(e,t,n)=>{let r=n.map(BigInt),i=r.filter(t=>e.contains(t)).length;if(i>0&&i!==r.length)throw Error(`Only some pending leaves are already in the Merkle tree`);let a=e;return i!==r.length&&(a=e.clone(),r.forEach(e=>a.insert(e,a.getIndex()))),t.flat().forEach(e=>{if(e.amount>0n&&!a.contains(BigInt(e.getCommitment())))throw Error(`Input commitment ${e.getCommitment()} is not in the speculative Merkle tree`)}),a};exports.speculativeMerkleTree=t,exports.toSpeculativeUtxo=e;

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

@@ -0,0 +1,9 @@
+import { MerkleTree } from '../../data-structures/merkle-tree';
+import { Utxo } from '../../data-structures/utxo/Utxo';
+import { SpeculativeUtxo } from '../../types/remote-tx-build.types';
+export declare const toSpeculativeUtxo: (utxo: Utxo) => SpeculativeUtxo;
+/**
+ * The tree to prove against while the deposit that creates `pendingLeaves` is still in flight:
+ * the live tree with those leaves appended, or the live tree itself once the indexer caught up.
+ */
+export declare const speculativeMerkleTree: (merkleTree: MerkleTree<bigint>, inputUtxosArray: Utxo[][], pendingCommitments: string[]) => MerkleTree<bigint>;

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

@@ -0,0 +1,19 @@
+//#region libs/shared/common/src/functions/pre-transaction/speculativeUtxo.ts
+var e = (e) => ({
+	amount: e.amount.toString(),
+	erc20TokenAddress: e.erc20TokenAddress,
+	mintAddress: e.mintAddress ?? "",
+	timeStamp: e.timeStamp,
+	stealthAddress: BigInt(e.getStealthAddress()).toString(),
+	isBlocked: e.isBlocked,
+	H0: [(e.H0?.[0] ?? 0n).toString(), (e.H0?.[1] ?? 0n).toString()]
+}), t = (e, t, n) => {
+	let r = n.map(BigInt), i = r.filter((t) => e.contains(t)).length;
+	if (i > 0 && i !== r.length) throw Error("Only some pending leaves are already in the Merkle tree");
+	let a = e;
+	return i !== r.length && (a = e.clone(), r.forEach((e) => a.insert(e, a.getIndex()))), t.flat().forEach((e) => {
+		if (e.amount > 0n && !a.contains(BigInt(e.getCommitment()))) throw Error(`Input commitment ${e.getCommitment()} is not in the speculative Merkle tree`);
+	}), a;
+};
+//#endregion
+export { t as speculativeMerkleTree, e as toSpeculativeUtxo };

package/common/src/functions/private-wallet/emporium.helpers.cjs

@@ -1 +1 @@
-require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../utils/caseInsensitive.utils.cjs`),r=require(`../../types/ethereum-network.types.cjs`),i=require(`../../error-handling/logger.cjs`),a=require(`../utils/create-provider.cjs`),o=require(`../../data-structures/AccountActions/AccountActions.cjs`),s=require(`../utils/getContractAddress.cjs`);let c=require(`ethers`);var l=e=>{if(typeof e.target==`string`)return e.target;if(e.address)return e.address;throw Error(`Contract address not found`)},u=`tuple(address endpoint, bool invokeWallet, uint128 value, bytes callData)`,d=`tuple(uint8 v, bytes32 r, bytes32 s, address signerAddress, ${u}[] ops)`,f=e=>{let[t]=c.ethers.AbiCoder.defaultAbiCoder().decode([u],e);return{endpoint:t.endpoint,invokeWallet:t.invokeWallet,value:BigInt(t.value),callData:t.callData}},p=({contract:e,func:t,args:n,callDataString:r,invokeWallet:i,value:a})=>{let o,s=r??`0x`;if(typeof e==`object`){if(o=l(e),r?.length&&r?.length>0)throw Error(`If function and args are providedm no calldata is needed`);t&&n&&!r&&(s=e.interface.encodeFunctionData(t,n))}else o=e;return c.ethers.AbiCoder.defaultAbiCoder().encode([u],[{endpoint:o,invokeWallet:!!i,value:a??0n,callData:s}])},m=async(n,r,i,a,s,l)=>{let u=e.getOnchainChainId(n),p=a.map(f),m=i?await o.AccountActions.signTypedDataFromPrivateKey(u,i,{name:`Emporium`,version:`1.0.0`,chainId:u,verifyingContract:r},{EmporiumSignature:[{name:`message`,type:`uint256`},{name:`ops`,type:`EmporiumOperation[]`}],EmporiumOperation:[{name:`endpoint`,type:`address`},{name:`invokeWallet`,type:`bool`},{name:`value`,type:`uint128`},{name:`callData`,type:`bytes`}]},{message:s,ops:p}):void 0,{v:h,r:g,s:_}=m?c.ethers.Signature.from(m):{v:0,r:c.ethers.ZeroHash,s:c.ethers.ZeroHash};return c.ethers.AbiCoder.defaultAbiCoder().encode([d],[{v:h,r:g,s:_,signerAddress:l??t.zeroAddress,ops:p}])},h=(e,t,n,r)=>p(e?{contract:e,func:`transfer`,args:[t,n],invokeWallet:r}:{contract:t,value:n,invokeWallet:r}),g=(e,i,a,o,c)=>{let l=e.getContractWithFetcher(i,r.ContractType.HinkalContract);return a.map((a,u)=>h(n.caseInsensitiveEqual(a,t.zeroAddress)?void 0:e.getContractWithFetcher(i,r.ContractType.ERC20Contract,a),c??s.getContractAddress(l),o[u],!0))},_=(e,t,n,r)=>p({contract:e,func:`approve`,args:[t,n],invokeWallet:r}),v=(e,i,a,o,s,c,l,u)=>{let d=[];for(let s=0;s<a.length;s+=1){let c=a[s],u=n.caseInsensitiveEqual(c,t.zeroAddress)?void 0:e.getContractWithFetcher(i,r.ContractType.ERC20Contract,c);d.push(h(u,l,o[s],!1))}if(u)for(let a=0;a<s.length;a+=1){let o=s[a];if(!n.caseInsensitiveEqual(o,t.zeroAddress)){let t=e.getContractWithFetcher(i,r.ContractType.ERC20Contract,o);d.push(_(t,u,c[a],!0))}}return d},y=(e,r,i,a,o,s,c,l)=>{let u=[],d=[o],f=[s];l.nativeFee>0n&&!n.caseInsensitiveEqual(o,t.zeroAddress)&&(d.push(t.zeroAddress),f.push(l.nativeFee));let m=v(e,r,d,f,[o],[c],i,a);u.push(...m);let h=l.nativeFee;return n.caseInsensitiveEqual(o,t.zeroAddress)&&(h+=c),u.push(p({contract:a,callDataString:l.calldata,value:h>0n?h:void 0,invokeWallet:!0})),u},b=`0xef0100`,x=async(e,t)=>{try{let n=a.createJsonRpcProvider(e),r=await n.getCode(t);if(r===`0x`||!r)return{delegated:!1,implementation:void 0,nonce:void 0};if(r.toLowerCase().startsWith(b)&&r.length===48){let e=`0x${r.slice(8)}`,i=await n.getTransactionCount(t);return{delegated:!0,implementation:c.ethers.getAddress(e),nonce:i}}else throw Error(`checkEOAWithDelegation: It is a contract`)}catch(e){throw i.Logger.error(`checkEOAWithDelegation error`,{error:e}),e}},S=r=>{let{hinkalWalletAddress:i}=e.networkRegistry[r].contractData;if(!i||n.caseInsensitiveEqual(i,t.zeroAddress))throw Error(`Hinkal Wallet Address is not set`);return i},C=async(t,r)=>{if(t===e.chainIds.localhost||!r)return;let i=e.getOnchainChainId(t),{delegated:a,implementation:s}=await x(t,o.AccountActions.getSignerAddressFromPrivateKey(t,r)),c=S(t);if(!a||!n.caseInsensitiveEqual(s,c)){let e=await o.AccountActions.authorizeDelegation(i,r,c);return{v:e.signature.v.toString(),r:e.signature.r,s:e.signature.s,nonce:e.nonce.toString(),address:c,chainId:String(i)}}};exports.checkEOAWithDelegation=x,exports.createApproveEmporiumOp=_,exports.createLifiBridgeOps=y,exports.createTransaferEmporiumOpsBatch=g,exports.createTransferToEmporiumOp=h,exports.emporiumOp=p,exports.encodeEmporiumMetadata=m,exports.generateFundAndApproveOps=v,exports.getAuthorizationDataIfNeeded=C;
+require(`../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../utils/caseInsensitive.utils.cjs`),r=require(`../../types/ethereum-network.types.cjs`),i=require(`../../error-handling/logger.cjs`),a=require(`../utils/create-provider.cjs`),o=require(`../../data-structures/AccountActions/AccountActions.cjs`),s=require(`../web3/getContractMetadata.cjs`),c=require(`../utils/getContractAddress.cjs`);let l=require(`ethers`);var u=e=>{if(typeof e.target==`string`)return e.target;if(e.address)return e.address;throw Error(`Contract address not found`)},d=`tuple(address endpoint, bool invokeWallet, uint128 value, bytes callData)`,f=`tuple(uint8 v, bytes32 r, bytes32 s, address signerAddress, ${d}[] ops, uint256 maxFee, uint256 deadline)`,p=1200,m=e=>{let[t]=l.ethers.AbiCoder.defaultAbiCoder().decode([d],e);return{endpoint:t.endpoint,invokeWallet:t.invokeWallet,value:BigInt(t.value),callData:t.callData}},h=({contract:e,func:t,args:n,callDataString:r,invokeWallet:i,value:a})=>{let o,s=r??`0x`;if(typeof e==`object`){if(o=u(e),r?.length&&r?.length>0)throw Error(`If function and args are providedm no calldata is needed`);t&&n&&!r&&(s=e.interface.encodeFunctionData(t,n))}else o=e;return l.ethers.AbiCoder.defaultAbiCoder().encode([d],[{endpoint:o,invokeWallet:!!i,value:a??0n,callData:s}])},g=async(n,r,i,a,s,c,u)=>{let d=e.getOnchainChainId(n),h=a.map(m),g=0n,_=i&&c?await(async()=>{if(u===void 0)throw Error(`maxFee required if making tx from emporium`);return g=BigInt(Math.floor(Date.now()/1e3)+p),o.AccountActions.signTypedDataFromPrivateKey(d,i,{name:`Emporium`,version:`1.0.0`,chainId:d,verifyingContract:r},{EmporiumSignature:[{name:`message`,type:`uint256`},{name:`ops`,type:`EmporiumOperation[]`},{name:`maxFee`,type:`uint256`},{name:`deadline`,type:`uint256`}],EmporiumOperation:[{name:`endpoint`,type:`address`},{name:`invokeWallet`,type:`bool`},{name:`value`,type:`uint128`},{name:`callData`,type:`bytes`}]},{message:s,ops:h,maxFee:u,deadline:g})})():void 0,{v,r:y,s:b}=_?l.ethers.Signature.from(_):{v:0,r:l.ethers.ZeroHash,s:l.ethers.ZeroHash};return l.ethers.AbiCoder.defaultAbiCoder().encode([f],[{v,r:y,s:b,signerAddress:c??t.zeroAddress,ops:h,maxFee:u??0n,deadline:g}])},_=(e,t,n,r)=>h(e?{contract:e,func:`transfer`,args:[t,n],invokeWallet:r}:{contract:t,value:n,invokeWallet:r}),v=(e,i,a,o,s)=>{let l=e.getContractWithFetcherByChainId(i,r.ContractType.HinkalContract);return a.map((a,u)=>_(n.caseInsensitiveEqual(a,t.zeroAddress)?void 0:e.getContractWithFetcherByChainId(i,r.ContractType.ERC20Contract,a),s??c.getContractAddress(l),o[u],!0))},y=(e,t,n,r)=>h({contract:e,func:`approve`,args:[t,n],invokeWallet:r}),b=(e,i,a,o,c,l,u)=>{let d=[];for(let o=0;o<i.length;o+=1){let c=i[o],u=n.caseInsensitiveEqual(c,t.zeroAddress)?void 0:s.getContractWithFetcherByChainId(e,r.ContractType.ERC20Contract,c);d.push(_(u,l,a[o],!1))}if(u)for(let i=0;i<o.length;i+=1){let a=o[i];if(!n.caseInsensitiveEqual(a,t.zeroAddress)){let t=s.getContractWithFetcherByChainId(e,r.ContractType.ERC20Contract,a);d.push(y(t,u,c[i],!0))}}return d},x=(e,r,i,a,o,s,c,l)=>{let u=[],d=[o],f=[s];l.nativeFee>0n&&!n.caseInsensitiveEqual(o,t.zeroAddress)&&(d.push(t.zeroAddress),f.push(l.nativeFee));let p=b(r,d,f,[o],[c],i,a);u.push(...p);let m=l.nativeFee;return n.caseInsensitiveEqual(o,t.zeroAddress)&&(m+=c),u.push(h({contract:a,callDataString:l.calldata,value:m>0n?m:void 0,invokeWallet:!0})),u},S=`0xef0100`,C=async(e,t)=>{try{let n=a.createJsonRpcProvider(e),r=await n.getCode(t);if(r===`0x`||!r)return{delegated:!1,implementation:void 0,nonce:void 0};if(r.toLowerCase().startsWith(S)&&r.length===48){let e=`0x${r.slice(8)}`,i=await n.getTransactionCount(t);return{delegated:!0,implementation:l.ethers.getAddress(e),nonce:i}}else throw Error(`checkEOAWithDelegation: It is a contract`)}catch(e){throw i.Logger.error(`checkEOAWithDelegation error`,{error:e}),e}},w=r=>{let{hinkalWalletAddress:i}=e.networkRegistry[r].contractData;if(!i||n.caseInsensitiveEqual(i,t.zeroAddress))throw Error(`Hinkal Wallet Address is not set`);return i},T=async(t,r)=>{if(t===e.chainIds.localhost||!r)return;let i=e.getOnchainChainId(t),{delegated:a,implementation:s}=await C(t,o.AccountActions.getSignerAddressFromPrivateKey(t,r)),c=w(t);if(!a||!n.caseInsensitiveEqual(s,c)){let e=await o.AccountActions.authorizeDelegation(i,r,c);return{v:e.signature.v.toString(),r:e.signature.r,s:e.signature.s,nonce:e.nonce.toString(),address:c,chainId:String(i)}}};exports.checkEOAWithDelegation=C,exports.createApproveEmporiumOp=y,exports.createLifiBridgeOps=x,exports.createTransaferEmporiumOpsBatch=v,exports.createTransferToEmporiumOp=_,exports.emporiumOp=h,exports.encodeEmporiumMetadata=g,exports.generateFundAndApproveOps=b,exports.getAuthorizationDataIfNeeded=T;

package/common/src/functions/private-wallet/emporium.helpers.d.ts

@@ -19,18 +19,25 @@ export declare const emporiumOp: ({ contract, func, args, callDataString, invoke
     invokeWallet?: boolean;
     value?: bigint;
 }) => string;
-export declare const encodeEmporiumMetadata: (chainId: number, emporiumAddress: string, privateKey: string | undefined, ops: string[], emporiumMessage?: bigint, signerAddress?: string) => Promise<string>;
+export declare const encodeEmporiumMetadata: (chainId: number, emporiumAddress: string, privateKey: string | undefined, ops: string[], emporiumMessage?: bigint, signerAddress?: string, maxFee?: bigint) => Promise<string>;
 export declare const decodeEmporiumMetadata: (metadata: string) => {
     v: number;
     r: string;
     s: string;
     signerAddress: string;
     ops: string[];
+    maxFee: bigint;
+    deadline: bigint;
 };
+export declare const signEmporiumCancelMessage: (chainId: number, emporiumAddress: string, privateKey: string, emporiumMessage: bigint) => Promise<{
+    v: number;
+    r: string;
+    s: string;
+}>;
 export declare const createTransferToEmporiumOp: (tokenContract: EncodableContract | undefined, to: string, amount: bigint, invokeWallet: boolean) => string;
 export declare const createTransaferEmporiumOpsBatch: (hinkal: IHinkal, chainId: number, erc20TokenAddresses: string[], amounts: bigint[], to?: string) => string[];
 export declare const createApproveEmporiumOp: (tokenContract: EncodableContract, to: string, amount: bigint, invokeWallet: boolean) => string;
-export declare const generateFundAndApproveOps: (hinkal: IHinkal, chainId: number, erc20AddressesToFund: string[], fundAmounts: bigint[], approveTokenAddresses: string[], approveAmounts: bigint[], walletAddress: string, spenderAddress: string | undefined) => string[];
+export declare const generateFundAndApproveOps: (chainId: number, erc20AddressesToFund: string[], fundAmounts: bigint[], approveTokenAddresses: string[], approveAmounts: bigint[], walletAddress: string, spenderAddress: string | undefined) => string[];
 export declare const createLifiBridgeOps: (hinkal: IHinkal, chainId: number, fromAddress: string, lifiRouterAddress: string, tokenAddress: string, fundAmount: bigint, bridgeAmount: bigint, quote: BridgeQuote) => string[];
 export declare const checkEOAWithDelegation: (chainId: number, eoaAddress: string) => Promise<{
     delegated: boolean;