@hinkal/common 0.2.33 → 0.2.35

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

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

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

@@ -12,7 +12,8 @@ var u = (e) => {
 	if (typeof e == "object" && e) {
 		if ("response" in e && typeof e.response == "object" && e.response !== null && "data" in e.response && typeof e.response.data == "object" && e.response.data !== null && "message" in e.response.data && typeof e.response.data.message == "string") return e.response.data.message;
 		if ("data" in e && typeof e.data == "object" && e.data !== null && "message" in e.data && typeof e.data.message == "string") return e.data.message;
-		if ("message" in e && typeof e.message == "string") return e.message;
+		if ("message" in e && typeof e.message == "string" && e.message) return e.message;
+		if ("error" in e && typeof e.error == "string" && e.error) return e.error;
 	}
 	if (e instanceof Error) return e.message;
 	if (typeof e == "string") return e;

package/functions/index.cjs

@@ -1 +1 @@
-require(`./utils/serialize.utils.cjs`),require(`./utils/get-signature-header.cjs`),require(`./utils/caseInsensitive.utils.cjs`),require(`./utils/addresses.cjs`),require(`./utils/auth.utils.cjs`),require(`./kyc/openDefaultPassportWindow.cjs`),require(`./web3/etherFunctions.cjs`),require(`./utils/amounts.utils.cjs`),require(`./utils/erc20tokenFunctions.cjs`),require(`./utils/bytes32.utils.cjs`),require(`./utils/time.utils.cjs`),require(`./utils/bit.operations.cjs`),require(`./utils/upToDateState.cjs`),require(`./utils/getDataFromTransaction.cjs`),require(`./utils/cacheFunctions.cjs`),require(`./utils/encryptInputForEnclave.cjs`),require(`./utils/solanaMint.utils.cjs`),require(`./utils/customEnclaveFunctionsRegister.cjs`),require(`./utils/tron.utils.cjs`),require(`./web3/events/getInputUtxoAndBalance.cjs`),require(`./utils/string.utils.cjs`),require(`./utils/token-check.utils.cjs`),require(`./utils/mutexes.utils.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(`./snarkjs/generateZkProof.cjs`),require(`./utils/serialize-utxos.utils.cjs`),require(`./utils/create-provider.cjs`),require(`./utils/requireEnv.cjs`),require(`./utils/resolve-sync.utils.cjs`),require(`./utils/convertIntegrationProviderToExternalActionId.cjs`),require(`./pre-transaction/interaction-to-action.cjs`),require(`./pre-transaction/process-gas-estimates.cjs`),require(`./pre-transaction/getFlatFees.cjs`),require(`./pre-transaction/getVolatileTransferAmount.cjs`),require(`./pre-transaction/constructAdminData.cjs`),require(`./pre-transaction/calculateSolanaNullifierCount.cjs`),require(`./pre-transaction/addressTableLookup.cjs`),require(`./pre-transaction/solana-public-signals.cjs`),require(`./pre-transaction/convert-okx-instructions.cjs`),require(`./web3/getSolanaPriorityFee.cjs`),require(`./utils/process.utils.cjs`),require(`./pre-transaction/sendV0Transaction.cjs`),require(`./pre-transaction/store-proof.cjs`),require(`./pre-transaction/sendInitNullifiersTransaction.cjs`),require(`./pre-transaction/recipientUtxoProcessing.cjs`),require(`./pre-transaction/store-instructions.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(`./utils/evmNetworkFunctions.cjs`),require(`./utils/userAgent.cjs`),require(`./utils/reloadPage.cjs`),require(`./utils/nickname.utils.cjs`),require(`./utils/cacheDevice.utils.cjs`),require(`./utils/getBlockExplorerUrl.cjs`),require(`./utils/involves-permit2-op.cjs`),require(`./utils/convertEmporiumOpToCallInfo.cjs`),require(`./utils/getRecipientInfoFromUserKeys.cjs`),require(`./utils/publicBalance.utils.cjs`),require(`./utils/rpc-int-encode.cjs`),require(`./utils/arraysMatch.cjs`),require(`./utils/trimFieldValues.cjs`),require(`./utils/walletBalances.utils.cjs`),require(`./utils/nftTokenFunctions.cjs`),require(`./utils/inLogicMetadata.cjs`),require(`./utils/networks.utils.cjs`),require(`./utils/is-valid-url.cjs`),require(`./utils/postToOffscreen.cjs`),require(`./utils/solanaSendPreflight.utils.cjs`),require(`./utils/prepareHinkal.cjs`),require(`./utils/getContractAddress.cjs`),require(`./utils/getUtxosFromReceipt.utils.cjs`),require(`./utils/getUtxosFromReceiptSolana.cjs`),require(`./utils/fees.utils.cjs`),require(`./utils/proxyAvatar.utils.cjs`),require(`./utils/validateUsername.cjs`),require(`./utils/enclave-utxo-storage.cjs`),require(`./utils/enclave-signature-storage.cjs`),require(`./utils/tx-confirmation.utils.cjs`),require(`./utils/buildClaimableDepositPlan.cjs`),require(`./utils/pay-routing.utils.cjs`),require(`./utils/formatter.cjs`),require(`./utils/tronSimulation.utils.cjs`),require(`./utils/getSignerFromContract.cjs`),require(`./utils/deposit-claimable.utils.cjs`),require(`./utils/transfer-claimable.utils.cjs`),require(`./utils/getWalletGroupKey.utils.cjs`),require(`./web3/events/balanceChangedHandler.cjs`),require(`./utils/dispatchBalanceRefreshes.cjs`),require(`./utils/lifi.utils.cjs`),require(`./utils/enclave-recipient-info-storage.cjs`),require(`./utils/solana-memo.cjs`),require(`./utils/mnemonics.cjs`),require(`./utils/index.cjs`),require(`./snarkjs/fetchOnChainRootHashes.cjs`),require(`./private-wallet/emporium.helpers.cjs`),require(`./snarkjs/constructGeneralZkProof.cjs`),require(`./web3/events/getTransactionLogEvents.cjs`),require(`./web3/uniswapAPI.cjs`),require(`./web3/odosAPI.cjs`),require(`./web3/oneInchAPI.cjs`),require(`./web3/lifiAPI.cjs`),require(`./web3/okxAPI.cjs`),require(`./web3/runContractFunction.cjs`),require(`./web3/getTokenHolder.cjs`),require(`./web3/EIP-712.cjs`),require(`./web3/signAndSendSerializedTransaction.cjs`),require(`./web3/connectors.utils.cjs`),require(`./web3/crypto.cjs`),require(`./web3/index.cjs`),require(`./snarkjs/constructSolanaZkProof.cjs`),require(`./snarkjs/verifyCommitmentValidationData.cjs`),require(`./snarkjs/index.cjs`),require(`./kyc/passportHelper.cjs`),require(`./kyc/checkTokenLimitsUSD.cjs`),require(`./kyc/index.cjs`),require(`./private-wallet/opProducer.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/serialize.utils.cjs`),require(`./utils/get-signature-header.cjs`),require(`./utils/caseInsensitive.utils.cjs`),require(`./utils/addresses.cjs`),require(`./utils/auth.utils.cjs`),require(`./kyc/openDefaultPassportWindow.cjs`),require(`./web3/etherFunctions.cjs`),require(`./utils/amounts.utils.cjs`),require(`./utils/erc20tokenFunctions.cjs`),require(`./utils/bytes32.utils.cjs`),require(`./utils/time.utils.cjs`),require(`./utils/bit.operations.cjs`),require(`./utils/upToDateState.cjs`),require(`./utils/getDataFromTransaction.cjs`),require(`./utils/cacheFunctions.cjs`),require(`./utils/encryptInputForEnclave.cjs`),require(`./utils/solanaMint.utils.cjs`),require(`./utils/customEnclaveFunctionsRegister.cjs`),require(`./utils/tron.utils.cjs`),require(`./web3/events/getInputUtxoAndBalance.cjs`),require(`./utils/string.utils.cjs`),require(`./utils/token-check.utils.cjs`),require(`./utils/mutexes.utils.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/interaction-to-action.cjs`),require(`./pre-transaction/process-gas-estimates.cjs`),require(`./pre-transaction/getFlatFees.cjs`),require(`./pre-transaction/getVolatileTransferAmount.cjs`),require(`./pre-transaction/constructAdminData.cjs`),require(`./utils/create-provider.cjs`),require(`./pre-transaction/calculateSolanaNullifierCount.cjs`),require(`./pre-transaction/addressTableLookup.cjs`),require(`./pre-transaction/solana-public-signals.cjs`),require(`./pre-transaction/convert-okx-instructions.cjs`),require(`./web3/getSolanaPriorityFee.cjs`),require(`./utils/process.utils.cjs`),require(`./pre-transaction/sendV0Transaction.cjs`),require(`./pre-transaction/store-proof.cjs`),require(`./pre-transaction/sendInitNullifiersTransaction.cjs`),require(`./pre-transaction/recipientUtxoProcessing.cjs`),require(`./pre-transaction/store-instructions.cjs`),require(`./pre-transaction/ensureAmountChanges.cjs`),require(`./pre-transaction/getFeeStructure.cjs`),require(`./pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`),require(`./pre-transaction/buildCommitmentValidationData.cjs`),require(`./pre-transaction/index.cjs`),require(`./snarkjs/generateZkProof.cjs`),require(`./snarkjs/generateMainAndCommitmentZkProof.cjs`),require(`./utils/serialize-utxos.utils.cjs`),require(`./utils/requireEnv.cjs`),require(`./utils/resolve-sync.utils.cjs`),require(`./utils/convertIntegrationProviderToExternalActionId.cjs`),require(`./utils/evmNetworkFunctions.cjs`),require(`./utils/userAgent.cjs`),require(`./utils/reloadPage.cjs`),require(`./utils/nickname.utils.cjs`),require(`./utils/cacheDevice.utils.cjs`),require(`./utils/getBlockExplorerUrl.cjs`),require(`./utils/involves-permit2-op.cjs`),require(`./utils/convertEmporiumOpToCallInfo.cjs`),require(`./utils/getRecipientInfoFromUserKeys.cjs`),require(`./utils/publicBalance.utils.cjs`),require(`./utils/rpc-int-encode.cjs`),require(`./utils/arraysMatch.cjs`),require(`./utils/trimFieldValues.cjs`),require(`./utils/walletBalances.utils.cjs`),require(`./utils/nftTokenFunctions.cjs`),require(`./utils/inLogicMetadata.cjs`),require(`./utils/networks.utils.cjs`),require(`./utils/is-valid-url.cjs`),require(`./utils/postToOffscreen.cjs`),require(`./utils/solanaSendPreflight.utils.cjs`),require(`./utils/prepareHinkal.cjs`),require(`./utils/getContractAddress.cjs`),require(`./utils/getUtxosFromReceipt.utils.cjs`),require(`./utils/getUtxosFromReceiptSolana.cjs`),require(`./utils/fees.utils.cjs`),require(`./utils/proxyAvatar.utils.cjs`),require(`./utils/validateUsername.cjs`),require(`./utils/enclave-utxo-storage.cjs`),require(`./utils/enclave-signature-storage.cjs`),require(`./utils/tx-confirmation.utils.cjs`),require(`./utils/buildClaimableDepositPlan.cjs`),require(`./utils/pay-routing.utils.cjs`),require(`./utils/formatter.cjs`),require(`./utils/tronSimulation.utils.cjs`),require(`./utils/getSignerFromContract.cjs`),require(`./utils/deposit-claimable.utils.cjs`),require(`./utils/transfer-claimable.utils.cjs`),require(`./utils/getWalletGroupKey.utils.cjs`),require(`./web3/events/balanceChangedHandler.cjs`),require(`./utils/dispatchBalanceRefreshes.cjs`),require(`./utils/lifi.utils.cjs`),require(`./utils/enclave-recipient-info-storage.cjs`),require(`./utils/solana-memo.cjs`),require(`./utils/mnemonics.cjs`),require(`./utils/nearIntents.utils.cjs`),require(`./utils/index.cjs`),require(`./snarkjs/fetchOnChainRootHashes.cjs`),require(`./private-wallet/emporium.helpers.cjs`),require(`./snarkjs/constructGeneralZkProof.cjs`),require(`./web3/events/getTransactionLogEvents.cjs`),require(`./web3/uniswapAPI.cjs`),require(`./web3/odosAPI.cjs`),require(`./web3/oneInchAPI.cjs`),require(`./web3/lifiAPI.cjs`),require(`./web3/okxAPI.cjs`),require(`./web3/runContractFunction.cjs`),require(`./web3/getTokenHolder.cjs`),require(`./web3/EIP-712.cjs`),require(`./web3/signAndSendSerializedTransaction.cjs`),require(`./web3/connectors.utils.cjs`),require(`./web3/crypto.cjs`),require(`./web3/index.cjs`),require(`./snarkjs/constructSolanaZkProof.cjs`),require(`./snarkjs/verifyCommitmentValidationData.cjs`),require(`./snarkjs/index.cjs`),require(`./kyc/passportHelper.cjs`),require(`./kyc/checkTokenLimitsUSD.cjs`),require(`./kyc/index.cjs`),require(`./private-wallet/opProducer.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/functions/index.mjs

@@ -27,17 +27,12 @@ import "./utils/external-action.utils.mjs";
 import "./snarkjs/common.snarkjs.mjs";
 import "./pre-transaction/solana.mjs";
 import "./snarkjs/signedMessageHash.mjs";
-import "./snarkjs/generateZkProof.mjs";
-import "./utils/serialize-utxos.utils.mjs";
-import "./utils/create-provider.mjs";
-import "./utils/requireEnv.mjs";
-import "./utils/resolve-sync.utils.mjs";
-import "./utils/convertIntegrationProviderToExternalActionId.mjs";
 import "./pre-transaction/interaction-to-action.mjs";
 import "./pre-transaction/process-gas-estimates.mjs";
 import "./pre-transaction/getFlatFees.mjs";
 import "./pre-transaction/getVolatileTransferAmount.mjs";
 import "./pre-transaction/constructAdminData.mjs";
+import "./utils/create-provider.mjs";
 import "./pre-transaction/calculateSolanaNullifierCount.mjs";
 import "./pre-transaction/addressTableLookup.mjs";
 import "./pre-transaction/solana-public-signals.mjs";
@@ -54,6 +49,12 @@ import "./pre-transaction/getFeeStructure.mjs";
 import "./pre-transaction/waitForDepositedUtxosInMerkleTree.mjs";
 import "./pre-transaction/buildCommitmentValidationData.mjs";
 import "./pre-transaction/index.mjs";
+import "./snarkjs/generateZkProof.mjs";
+import "./snarkjs/generateMainAndCommitmentZkProof.mjs";
+import "./utils/serialize-utxos.utils.mjs";
+import "./utils/requireEnv.mjs";
+import "./utils/resolve-sync.utils.mjs";
+import "./utils/convertIntegrationProviderToExternalActionId.mjs";
 import "./utils/evmNetworkFunctions.mjs";
 import "./utils/userAgent.mjs";
 import "./utils/reloadPage.mjs";
@@ -98,6 +99,7 @@ import "./utils/lifi.utils.mjs";
 import "./utils/enclave-recipient-info-storage.mjs";
 import "./utils/solana-memo.mjs";
 import "./utils/mnemonics.mjs";
+import "./utils/nearIntents.utils.mjs";
 import "./utils/index.mjs";
 import "./snarkjs/fetchOnChainRootHashes.mjs";
 import "./private-wallet/emporium.helpers.mjs";

package/functions/pre-transaction/buildCommitmentValidationData.cjs

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`),t=require(`../../data-structures/crypto-keys/keys.cjs`),n=require(`../utils/solanaMint.utils.cjs`),r=require(`../snarkjs/common.snarkjs.cjs`),i=require(`../../webworker/worker.registry.cjs`),a=require(`../../webworker/performTaskWithWorker.cjs`),o=require(`../snarkjs/generateZkProof.cjs`),s=require(`../../webworker/zkProofWorker/zkProofWorker.types.cjs`);var c=async(c,l,u,d)=>{let f=e.isSolanaLike(c),p=d.map(e=>e.map(e=>e.amount.toString())),m=d.map(e=>e.map(e=>e.timeStamp)),h=d.map(e=>e.map(e=>r.getUtxoCircuitInRandomization(e))),g=d.map(e=>e.map(e=>e.getConstructableParams())),_=d.map(e=>e.map(e=>e.amount===0n?`0`:BigInt(e.getCommitment()).toString())),v=await a.performTaskWithWorker({type:i.WorkerVariant.ZKProof,payload:{type:s.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:g}}}),y=l.getShieldedPrivateKey(),b=l.getSpendingKeyPair().pubSpendingBJJPoint,x=f?u.map(e=>{let{compressedAddress:t}=n.formatMintAddress(e);return BigInt(t).toString()}):u.map(e=>BigInt(e).toString());d.forEach((e,n)=>{e.forEach((e,r)=>{let i=e.getStealthAddress(),a=e.spendingPublicKey??b,o=e.isNewStyle&&e.H0?t.UserKeys.getStealthAddressNewStyle(e.H0,y,a):t.UserKeys.getStealthAddress(BigInt(e.randomization),y);if(BigInt(i).toString()!==BigInt(o).toString())throw Error(`Commitment validation stealth mismatch at tokenIdx=${n}, utxoIdx=${r}`)})});let S={nullifyingPrivateKey:y,spendingPublicKey:b,erc20TokenAddresses:x,inAmounts:p,inRandomizations:h,inH0Ax:d.map(e=>e.map(e=>r.getUtxoCircuitH0Coords(e)[0].toString())),inH0Ay:d.map(e=>e.map(e=>r.getUtxoCircuitH0Coords(e)[1].toString())),isNewStyle:d.map(e=>e.map(e=>!!e.isNewStyle)),inTimeStamps:m,inCommitments:_,inNullifiers:v};if(!u.length||!d[0]?.length)return;let{zkCallData:C}=await o.generateZkProof(c,`commitmentCalculator${u.length}x${d[0].length}`,S,!1);if(!Array.isArray(C?.[0])||!Array.isArray(C?.[1])||!Array.isArray(C?.[2]))throw Error(`Invalid zkCallData shape for commitment validation`);return{tokenAddresses:x,inAmounts:p,inTimeStamps:m,inRandomizations:h,inCommitments:_,inNullifiers:v,proof:{a:C[0],b:C[1],c:C[2]}}};exports.buildCommitmentValidationData=c;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../data-structures/crypto-keys/keys.cjs`),n=require(`../utils/solanaMint.utils.cjs`),r=require(`../snarkjs/common.snarkjs.cjs`),i=require(`../../webworker/worker.registry.cjs`),a=require(`../../webworker/performTaskWithWorker.cjs`),o=require(`../../webworker/zkProofWorker/zkProofWorker.types.cjs`);var s=async(s,c,l,u)=>{let d=e.isSolanaLike(s),f=u.map(e=>e.map(e=>e.amount.toString())),p=u.map(e=>e.map(e=>e.timeStamp)),m=u.map(e=>e.map(e=>r.getUtxoCircuitInRandomization(e))),h=u.map(e=>e.map(e=>e.getConstructableParams())),g=u.map(e=>e.map(e=>e.amount===0n?`0`:BigInt(e.getCommitment()).toString())),_=await a.performTaskWithWorker({type:i.WorkerVariant.ZKProof,payload:{type:o.ZKProofWorkerActionType.BUILD_IN_NULLIFIERS,data:{inputUtxosSerialized:h}}}),v=c.getShieldedPrivateKey(),y=c.getSpendingKeyPair().pubSpendingBJJPoint,b=d?l.map(e=>{let{compressedAddress:t}=n.formatMintAddress(e);return BigInt(t).toString()}):l.map(e=>BigInt(e).toString());u.forEach((e,n)=>{e.forEach((e,r)=>{let i=e.getStealthAddress(),a=e.spendingPublicKey??y,o=e.isNewStyle&&e.H0?t.UserKeys.getStealthAddressNewStyle(e.H0,v,a):t.UserKeys.getStealthAddress(BigInt(e.randomization),v);if(BigInt(i).toString()!==BigInt(o).toString())throw Error(`Commitment validation stealth mismatch at tokenIdx=${n}, utxoIdx=${r}`)})});let x={nullifyingPrivateKey:v,spendingPublicKey:y,erc20TokenAddresses:b,inAmounts:f,inRandomizations:m,inH0Ax:u.map(e=>e.map(e=>r.getUtxoCircuitH0Coords(e)[0].toString())),inH0Ay:u.map(e=>e.map(e=>r.getUtxoCircuitH0Coords(e)[1].toString())),isNewStyle:u.map(e=>e.map(e=>!!e.isNewStyle)),inTimeStamps:p,inCommitments:g,inNullifiers:_};if(!(!l.length||!u[0]?.length))return{tokenAddresses:b,inAmounts:f,inTimeStamps:p,inRandomizations:m,inCommitments:g,inNullifiers:_,verifierName:`commitmentCalculator${l.length}x${u[0].length}`,commitmentInput:x}},c=(e,t)=>{if(!(!e||!t))return{tokenAddresses:e.tokenAddresses,inAmounts:e.inAmounts,inTimeStamps:e.inTimeStamps,inRandomizations:e.inRandomizations,inCommitments:e.inCommitments,inNullifiers:e.inNullifiers,proof:{a:t.zkCallData[0],b:t.zkCallData[1],c:t.zkCallData[2]}}};exports.buildCommitmentValidationData=s,exports.buildCommitmentValidationDataFromProof=c;

package/functions/pre-transaction/buildCommitmentValidationData.d.ts

@@ -1,4 +1,14 @@
 import { UserKeys } from '../../data-structures/crypto-keys/keys';
 import { Utxo } from '../../data-structures/utxo/Utxo';
-import { CommitmentValidationDataType } from '../../types';
-export declare const buildCommitmentValidationData: (chainId: number, userKeys: UserKeys, erc20Addresses: string[], inputUtxosArray: Utxo[][]) => Promise<CommitmentValidationDataType | undefined>;
+import { CommitmentValidationDataType } from '../../types/circom-data.types';
+import { NewZkCallDataType } from '../../types/snark.types';
+interface BuildCommitmentValidationData extends Omit<CommitmentValidationDataType, 'proof'> {
+    verifierName: string;
+    commitmentInput: any;
+}
+export declare const buildCommitmentValidationData: (chainId: number, userKeys: UserKeys, erc20Addresses: string[], inputUtxosArray: Utxo[][]) => Promise<BuildCommitmentValidationData | undefined>;
+export declare const buildCommitmentValidationDataFromProof: (commitmentValidationData: BuildCommitmentValidationData | undefined, commitmentValidationProofResponse: {
+    zkCallData: NewZkCallDataType;
+    publicSignals: string[];
+} | undefined) => CommitmentValidationDataType | undefined;
+export {};

package/functions/pre-transaction/buildCommitmentValidationData.mjs

@@ -4,55 +4,62 @@ import { formatMintAddress as n } from "../utils/solanaMint.utils.mjs";
 import { getUtxoCircuitH0Coords as r, getUtxoCircuitInRandomization as i } from "../snarkjs/common.snarkjs.mjs";
 import { WorkerVariant as a } from "../../webworker/worker.registry.mjs";
 import { performTaskWithWorker as o } from "../../webworker/performTaskWithWorker.mjs";
-import { generateZkProof as s } from "../snarkjs/generateZkProof.mjs";
-import { ZKProofWorkerActionType as c } from "../../webworker/zkProofWorker/zkProofWorker.types.mjs";
+import { ZKProofWorkerActionType as s } from "../../webworker/zkProofWorker/zkProofWorker.types.mjs";
 //#region libs/shared/common/src/functions/pre-transaction/buildCommitmentValidationData.ts
-var l = async (l, u, d, f) => {
-	let p = e(l), m = f.map((e) => e.map((e) => e.amount.toString())), h = f.map((e) => e.map((e) => e.timeStamp)), g = f.map((e) => e.map((e) => i(e))), _ = f.map((e) => e.map((e) => e.getConstructableParams())), v = f.map((e) => e.map((e) => e.amount === 0n ? "0" : BigInt(e.getCommitment()).toString())), y = await o({
+var c = async (c, l, u, d) => {
+	let f = e(c), p = d.map((e) => e.map((e) => e.amount.toString())), m = d.map((e) => e.map((e) => e.timeStamp)), h = d.map((e) => e.map((e) => i(e))), g = d.map((e) => e.map((e) => e.getConstructableParams())), _ = d.map((e) => e.map((e) => e.amount === 0n ? "0" : BigInt(e.getCommitment()).toString())), v = await o({
 		type: a.ZKProof,
 		payload: {
-			type: c.BUILD_IN_NULLIFIERS,
-			data: { inputUtxosSerialized: _ }
+			type: s.BUILD_IN_NULLIFIERS,
+			data: { inputUtxosSerialized: g }
 		}
-	}), b = u.getShieldedPrivateKey(), x = u.getSpendingKeyPair().pubSpendingBJJPoint, S = p ? d.map((e) => {
+	}), y = l.getShieldedPrivateKey(), b = l.getSpendingKeyPair().pubSpendingBJJPoint, x = f ? u.map((e) => {
 		let { compressedAddress: t } = n(e);
 		return BigInt(t).toString();
-	}) : d.map((e) => BigInt(e).toString());
-	f.forEach((e, n) => {
+	}) : u.map((e) => BigInt(e).toString());
+	d.forEach((e, n) => {
 		e.forEach((e, r) => {
-			let i = e.getStealthAddress(), a = e.spendingPublicKey ?? x, o = e.isNewStyle && e.H0 ? t.getStealthAddressNewStyle(e.H0, b, a) : t.getStealthAddress(BigInt(e.randomization), b);
+			let i = e.getStealthAddress(), a = e.spendingPublicKey ?? b, o = e.isNewStyle && e.H0 ? t.getStealthAddressNewStyle(e.H0, y, a) : t.getStealthAddress(BigInt(e.randomization), y);
 			if (BigInt(i).toString() !== BigInt(o).toString()) throw Error(`Commitment validation stealth mismatch at tokenIdx=${n}, utxoIdx=${r}`);
 		});
 	});
-	let C = {
-		nullifyingPrivateKey: b,
-		spendingPublicKey: x,
-		erc20TokenAddresses: S,
-		inAmounts: m,
-		inRandomizations: g,
-		inH0Ax: f.map((e) => e.map((e) => r(e)[0].toString())),
-		inH0Ay: f.map((e) => e.map((e) => r(e)[1].toString())),
-		isNewStyle: f.map((e) => e.map((e) => !!e.isNewStyle)),
-		inTimeStamps: h,
-		inCommitments: v,
-		inNullifiers: y
+	let S = {
+		nullifyingPrivateKey: y,
+		spendingPublicKey: b,
+		erc20TokenAddresses: x,
+		inAmounts: p,
+		inRandomizations: h,
+		inH0Ax: d.map((e) => e.map((e) => r(e)[0].toString())),
+		inH0Ay: d.map((e) => e.map((e) => r(e)[1].toString())),
+		isNewStyle: d.map((e) => e.map((e) => !!e.isNewStyle)),
+		inTimeStamps: m,
+		inCommitments: _,
+		inNullifiers: v
 	};
-	if (!d.length || !f[0]?.length) return;
-	let { zkCallData: w } = await s(l, `commitmentCalculator${d.length}x${f[0].length}`, C, !1);
-	if (!Array.isArray(w?.[0]) || !Array.isArray(w?.[1]) || !Array.isArray(w?.[2])) throw Error("Invalid zkCallData shape for commitment validation");
-	return {
-		tokenAddresses: S,
-		inAmounts: m,
-		inTimeStamps: h,
-		inRandomizations: g,
-		inCommitments: v,
-		inNullifiers: y,
+	if (!(!u.length || !d[0]?.length)) return {
+		tokenAddresses: x,
+		inAmounts: p,
+		inTimeStamps: m,
+		inRandomizations: h,
+		inCommitments: _,
+		inNullifiers: v,
+		verifierName: `commitmentCalculator${u.length}x${d[0].length}`,
+		commitmentInput: S
+	};
+}, l = (e, t) => {
+	if (!(!e || !t)) return {
+		tokenAddresses: e.tokenAddresses,
+		inAmounts: e.inAmounts,
+		inTimeStamps: e.inTimeStamps,
+		inRandomizations: e.inRandomizations,
+		inCommitments: e.inCommitments,
+		inNullifiers: e.inNullifiers,
 		proof: {
-			a: w[0],
-			b: w[1],
-			c: w[2]
+			a: t.zkCallData[0],
+			b: t.zkCallData[1],
+			c: t.zkCallData[2]
 		}
 	};
 };
 //#endregion
-export { l as buildCommitmentValidationData };
+export { c as buildCommitmentValidationData, l as buildCommitmentValidationDataFromProof };

package/functions/pre-transaction/sendV0Transaction.cjs

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

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

@@ -1,9 +1,9 @@
 import { AddressLookupTableAccount, Connection, Finality, Keypair, PublicKey, TransactionInstruction, 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[]) => Promise<number>;
+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 sendV0Transaction: (connection: Connection, instructions: TransactionInstruction[], payer: Keypair, signers: Keypair[], lookupTableAccounts?: AddressLookupTableAccount[]) => Promise<string>;
+export declare const sendV0Transaction: (connection: Connection, instructions: TransactionInstruction[], payer: Keypair, signers: Keypair[], lookupTableAccounts?: AddressLookupTableAccount[], requestHeapFrame?: boolean) => Promise<string>;
 export declare const ensureAtaExists: (connection: Connection, payer: Keypair, mintPubkey: PublicKey | null, owner: PublicKey) => Promise<PublicKey | null>;
 type SendProxyV0TransactionParams = {
     connection: Connection;

package/functions/pre-transaction/sendV0Transaction.mjs

@@ -1,36 +1,40 @@
 import { safeJsonStringify as e } from "../utils/serialize.utils.mjs";
-import { COMPUTE_UNIT_PADDING_PERCENTAGE as t, MAX_COMPUTE_UNIT_LIMIT as n, MIN_COMPUTE_UNIT_LIMIT as r } from "../../constants/protocol.constants.mjs";
-import { AccountActions as i } from "../../data-structures/AccountActions/AccountActions.mjs";
-import { SolanaPriorityFeeMode as a } from "../../types/fee.types.mjs";
-import { getSolanaPriorityFee as o } from "../web3/getSolanaPriorityFee.mjs";
-import { pollForValue as s } from "../utils/process.utils.mjs";
-import { shouldRetryForSolanaError as c } from "../../error-handling/retrySolanaError.mjs";
-import { ComputeBudgetProgram as l, PublicKey as u, TransactionMessage as d, VersionedTransaction as f } from "@solana/web3.js";
-import { ASSOCIATED_TOKEN_PROGRAM_ID as p, TOKEN_PROGRAM_ID as m, createAssociatedTokenAccountInstruction as h, getAssociatedTokenAddress as g } from "@solana/spl-token";
+import { COMPUTE_UNIT_PADDING_PERCENTAGE as t, MAX_COMPUTE_UNIT_LIMIT as n, MAX_SOLANA_HEAP_FRAME_BYTES as r, MIN_COMPUTE_UNIT_LIMIT as i } from "../../constants/protocol.constants.mjs";
+import { AccountActions as a } from "../../data-structures/AccountActions/AccountActions.mjs";
+import { SolanaPriorityFeeMode as o } from "../../types/fee.types.mjs";
+import { getSolanaPriorityFee as s } from "../web3/getSolanaPriorityFee.mjs";
+import { pollForValue as c } from "../utils/process.utils.mjs";
+import { shouldRetryForSolanaError as l } from "../../error-handling/retrySolanaError.mjs";
+import { ComputeBudgetProgram as u, PublicKey as d, TransactionMessage as f, VersionedTransaction as p } from "@solana/web3.js";
+import { ASSOCIATED_TOKEN_PROGRAM_ID as m, TOKEN_PROGRAM_ID as h, createAssociatedTokenAccountInstruction as g, getAssociatedTokenAddress as _ } from "@solana/spl-token";
 //#region libs/shared/common/src/functions/pre-transaction/sendV0Transaction.ts
-var _ = 5e3, v = 6e4, y = 7, b = async (e, t, n = "confirmed") => await s(() => e.getTransaction(t, {
+var v = 5e3, y = 6e4, b = 7, x = async (e, t, n = "confirmed") => await c(() => e.getTransaction(t, {
 	commitment: n,
 	maxSupportedTransactionVersion: 0
 }), {
-	timeoutMs: v,
-	intervalMs: _
-}) ?? null, x = async (e, i, a, o) => {
+	timeoutMs: y,
+	intervalMs: v
+}) ?? null, S = async (e, a, o, s, c = !1) => {
 	try {
-		let { blockhash: s } = await e.getLatestBlockhash(), c = new f(new d({
-			payerKey: i,
-			recentBlockhash: s,
-			instructions: [l.setComputeUnitLimit({ units: n }), ...a]
-		}).compileToV0Message(o)), { unitsConsumed: u } = (await e.simulateTransaction(c, {
+		let { blockhash: l } = await e.getLatestBlockhash(), d = new p(new f({
+			payerKey: a,
+			recentBlockhash: l,
+			instructions: [
+				u.setComputeUnitLimit({ units: n }),
+				...c ? [u.requestHeapFrame({ bytes: r })] : [],
+				...o
+			]
+		}).compileToV0Message(s)), { unitsConsumed: m } = (await e.simulateTransaction(d, {
 			sigVerify: !1,
 			replaceRecentBlockhash: !0
 		})).value;
-		if (!u) return n;
-		let p = Math.ceil(u * (1 + t));
-		return Math.max(r, Math.min(p, n));
+		if (!m) return n;
+		let h = Math.ceil(m * (1 + t));
+		return Math.max(i, Math.min(h, n));
 	} catch {
 		return n;
 	}
-}, S = (e, t, n, r) => {
+}, C = (e, t, n, r) => {
 	let i = /* @__PURE__ */ 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) => {
@@ -40,77 +44,78 @@ var _ = 5e3, v = 6e4, y = 7, b = async (e, t, n = "confirmed") => await s(() =>
 		i.add(e.key.toBase58()), e.state.addresses.forEach((e) => {
 			i.add(e.toBase58());
 		});
-	}), [...i].map((e) => new u(e));
-}, C = (t) => {
+	}), [...i].map((e) => new d(e));
+}, w = (t) => {
 	if (!t) throw Error("Failed to fetch Solana transaction details for signature");
 	if (t.meta?.err) {
-		let n = e(t.meta.err);
-		throw Error(`Solana transaction failed on-chain: ${n}`);
+		let n = e(t.meta.err), r = t.meta.logMessages?.join("\n");
+		throw Error(r ? `Solana transaction failed on-chain: ${n}\n${r}` : `Solana transaction failed on-chain: ${n}`);
 	}
-}, w = async (e, t, r, i, a) => {
-	if (r.some((e) => e.programId.equals(l.programId))) return r.map((e) => e.programId.equals(l.programId) && e.data[0] === 2 ? l.setComputeUnitLimit({ units: n }) : e);
-	let s = r.filter((e) => !e.programId.equals(l.programId)), c = await x(e, t, s, i), u = l.setComputeUnitLimit({ units: c }), d = e.rpcEndpoint.includes("helius") ? await o(S(s, t, [l.programId], i), a) : 0;
+}, T = async (e, t, i, a, o, c = !1) => {
+	if (i.some((e) => e.programId.equals(u.programId))) return i.map((e) => e.programId.equals(u.programId) && e.data[0] === 2 ? u.setComputeUnitLimit({ units: n }) : e);
+	let l = i.filter((e) => !e.programId.equals(u.programId)), d = await S(e, t, l, a, c), f = u.setComputeUnitLimit({ units: d }), p = e.rpcEndpoint.includes("helius") ? await s(C(l, t, [u.programId], a), o) : 0;
 	return [
-		u,
-		l.setComputeUnitPrice({ microLamports: d }),
-		...s
+		f,
+		u.setComputeUnitPrice({ microLamports: p }),
+		...c ? [u.requestHeapFrame({ bytes: r })] : [],
+		...l
 	];
-}, T = async (e, t, n, r, i) => {
+}, E = async (e, t, n, r, i, a = !1) => {
 	if (t.length === 0) return "";
-	for (let o = 0; o < 10; o += 1) {
-		let s = o === 9;
+	for (let s = 0; s < 10; s += 1) {
+		let c = s === 9;
 		try {
-			let s = await w(e, n.publicKey, t, i, o >= y ? a.HIGH : a.RECOMMENDED), { blockhash: c, lastValidBlockHeight: l } = await e.getLatestBlockhash(), u = new f(new d({
+			let c = await T(e, n.publicKey, t, i, s >= b ? o.HIGH : o.RECOMMENDED, a), { blockhash: l, lastValidBlockHeight: u } = await e.getLatestBlockhash(), d = new p(new f({
 				payerKey: n.publicKey,
-				instructions: s,
-				recentBlockhash: c
+				instructions: c,
+				recentBlockhash: l
 			}).compileToV0Message(i));
-			u.sign(r);
-			let p = await e.sendTransaction(u);
+			d.sign(r);
+			let m = await e.sendTransaction(d);
 			return await e.confirmTransaction({
-				signature: p,
-				blockhash: c,
-				lastValidBlockHeight: l
-			}, "confirmed"), C(await b(e, p)), p;
+				signature: m,
+				blockhash: l,
+				lastValidBlockHeight: u
+			}, "confirmed"), w(await x(e, m)), m;
 		} catch (e) {
-			if (c(e) && !s) continue;
+			if (l(e) && !c) continue;
 			throw e;
 		}
 	}
 	return "";
-}, E = async (e, t, n, r) => {
+}, D = async (e, t, n, r) => {
 	if (!n) return null;
-	let i = await g(n, r, !0, m, p);
-	return await e.getAccountInfo(i) || await T(e, [h(t.publicKey, i, r, n, m, p)], t, [t]), i;
-}, D = async ({ connection: e, chainId: t, subAccount: n, payerPublicKey: r, instructions: o, lookupTableAccounts: s }) => {
-	let l = i.getPrivateKeyFromSubAccount(t, n);
-	if (!l) throw Error("Private key is not available");
+	let i = await _(n, r, !0, h, m);
+	return await e.getAccountInfo(i) || await E(e, [g(t.publicKey, i, r, n, h, m)], t, [t]), i;
+}, O = async ({ connection: e, chainId: t, subAccount: n, payerPublicKey: r, instructions: i, lookupTableAccounts: s }) => {
+	let c = a.getPrivateKeyFromSubAccount(t, n);
+	if (!c) throw Error("Private key is not available");
 	for (let t = 0; t < 10; t += 1) {
 		let n = t === 9;
 		try {
-			let t = await w(e, r, o, s, n ? a.HIGH : a.RECOMMENDED), { blockhash: c, lastValidBlockHeight: u } = await e.getLatestBlockhash(), p = new f(new d({
+			let t = await T(e, r, i, s, n ? o.HIGH : o.RECOMMENDED), { blockhash: l, lastValidBlockHeight: u } = await e.getLatestBlockhash(), d = new p(new f({
 				payerKey: r,
-				recentBlockhash: c,
+				recentBlockhash: l,
 				instructions: t
-			}).compileToV0Message(s)), m = await i.sendAndSignSolanaTransactionFromPrivateKey(e, l, p, !0);
+			}).compileToV0Message(s)), m = await a.sendAndSignSolanaTransactionFromPrivateKey(e, c, d, !0);
 			return await e.confirmTransaction({
 				signature: m,
-				blockhash: c,
+				blockhash: l,
 				lastValidBlockHeight: u
-			}, "confirmed"), C(await b(e, m)), m;
+			}, "confirmed"), w(await x(e, m)), m;
 		} catch (e) {
-			if (c(e) && !n) continue;
+			if (l(e) && !n) continue;
 			throw e;
 		}
 	}
 	throw Error("Failed to send proxy v0 transaction due to expired blockheight after all retries");
-}, O = async (e, t, n, r) => {
-	let { blockhash: i } = await e.getLatestBlockhash(), a = new f(new d({
+}, k = async (e, t, n, r) => {
+	let { blockhash: i } = await e.getLatestBlockhash(), a = new p(new f({
 		payerKey: t,
 		recentBlockhash: i,
-		instructions: await w(e, t, n, r)
+		instructions: await T(e, t, n, r)
 	}).compileToV0Message(r));
 	return Buffer.from(a.serialize()).toString("base64");
 };
 //#endregion
-export { E as ensureAtaExists, x as estimateComputeUnitLimit, b as fetchSolanaTransaction, S as getAccountsFromInstructions, D as sendProxyV0Transaction, T as sendV0Transaction, O as serializeProxyV0Transaction };
+export { D as ensureAtaExists, S as estimateComputeUnitLimit, x as fetchSolanaTransaction, C as getAccountsFromInstructions, O as sendProxyV0Transaction, E as sendV0Transaction, k as serializeProxyV0Transaction };

package/functions/snarkjs/constructGeneralZkProof.cjs

@@ -1 +1 @@
-const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../constants/protocol.constants.cjs`),r=require(`../web3/etherFunctions.cjs`),ee=require(`../../crypto/poseidon.cjs`),te=require(`../../data-structures/crypto-keys/keys.cjs`),ne=require(`../utils/time.utils.cjs`),i=require(`../utils/bit.operations.cjs`),a=require(`../../error-handling/logger.cjs`),o=require(`./common.snarkjs.cjs`),s=require(`./signedMessageHash.cjs`),c=require(`./generateCircomData.cjs`),l=require(`./generateZkProof.cjs`),u=require(`../../data-structures/AccountActions/AccountActions.cjs`),d=require(`./getMerkleTreeSiblingsAndRootHashes.cjs`),f=require(`../private-wallet/emporium.helpers.cjs`);var p=async(p,m,h,g,_,v,y,b,x,S=n.zeroAddress,C=t.chainIds.localhost,w=m.map(()=>!1),T=void 0,E,D)=>{let O=o.getZkProofVerifierName(m,h),k=o.calcAmountChanges(m,h),A=m.map(e=>e[0].erc20TokenAddress),j=o.calcEncryptedOutputs(h),M=n.defaultSignatureData,N=g.getShieldedPrivateKey(),{pubSpendingBJJPoint:P}=g.getSpendingKeyPair(),F=o.calcStealthAddressStructure(te.UserKeys.findCorrectRandomization(r.randomBigInt(31),N),N,g.getSpendingKeyPair().pubSpendingBJJPoint),{inCommitmentSiblings:I,inCommitmentSiblingSides:re,rootHashHinkal:L,inNullifiers:R}=await d.getDataFromWorkers(C,p,m.map(e=>e.map(e=>e.getConstructableParams()))),z=o.buildOutCommitments(h),B=r.randomBigInt(31),V=ee.poseidonFunction(B),H=BigInt(h.length>0?h[0][0].timeStamp:ne.getCurrentTimeInSeconds()),U={rootHashHinkal:L,spendingPublicKey:P,nullifyingPrivateKey:N,erc20TokenAddresses:A,amountChanges:k,inAmounts:m.map(e=>e.map(e=>e.amount.toString())),inRandomizations:m.map(e=>e.map(e=>o.getUtxoCircuitInRandomization(e))),inH0Ax:m.map(e=>e.map(e=>o.getUtxoCircuitH0Coords(e)[0].toString())),inH0Ay:m.map(e=>e.map(e=>o.getUtxoCircuitH0Coords(e)[1].toString())),isNewStyle:m.map(e=>e.map(e=>!!e.isNewStyle)),inTimeStamps:m.map(e=>e.map(e=>e.timeStamp)),inNullifiers:R,inCommitmentSiblings:I,inCommitmentSiblingSides:re,outAmounts:h.map(e=>e.map(e=>e.amount.toString())),outTimeStamp:H,outPublicKeys:h.map(e=>e.map(e=>e.getStealthAddress())),outCommitments:z,calldataHash:0n,messageSeed:B,H0Ax:i.takeOffHighestBit(F.extraRandomization),H0Ay:F.H0},W=o.calcPublicSignalCount(O,U.erc20TokenAddresses,U.amountChanges,U.inNullifiers,U.outCommitments),G=o.calcAmountChanges(m,h,!0),K=o.getSlippageValues(G);a.Logger.log({publicSignalCount:W});let q=Array.isArray(y)?y:[y],J=t.getOnchainChainId(C),Y=D?u.AccountActions.getSignerAddressFromPrivateKey(J,D):void 0,X=_===e.ExternalActionId.Emporium?await f.encodeEmporiumMetadata(C,v??n.zeroAddress,D,q,V,Y):await f.encodeEmporiumMetadata(C,n.zeroAddress,void 0,_===0n?[]:q,V,n.zeroAddress);U.calldataHash=o.createCallDataHash(W,S,v,_,X,j,T,K,w,x,M,E);let Z=s.computeSignedMessageHashEvm({rootHashHinkal:L,erc20TokenAddresses:A,amountChanges:k,outTimeStamp:H,inNullifiers:R,outCommitments:z,calldataHash:U.calldataHash,message:V,outH1Ay:F.H1,H0Ax:U.H0Ax,H0Ay:F.H0}),{R8:Q,S:ie}=g.signEddsa(Z);U.eddsaSignature=[Q[0],Q[1],ie],U.signedMessageHash=Z;let $=O.startsWith(`mainEVMCircuitMin0`),ae={outTimeStamp:H,calldataHash:U.calldataHash,messageSeed:B},{zkCallData:oe}=await l.generateZkProof(C,O,$?ae:U,b);return{zkCallData:oe,circomData:c.generateCircomData(z,R,L,G,A,h,j,W,_,v,X,S,U.calldataHash,F,w,T,$?Number(H):void 0,K,x,M,E),dimData:{tokenNumber:m.length,nullifierAmount:m.length>0?m[0].length:0,outputAmount:h.length>0?h[0].length:0},encryptedOutputs:j}};exports.constructZkProof=p;
+const e=require(`../../types/external-action.types.cjs`),t=require(`../../constants/chains.constants.cjs`),n=require(`../../constants/protocol.constants.cjs`),r=require(`../web3/etherFunctions.cjs`),ee=require(`../../crypto/poseidon.cjs`),te=require(`../../data-structures/crypto-keys/keys.cjs`),ne=require(`../utils/time.utils.cjs`),i=require(`../utils/bit.operations.cjs`),a=require(`../../error-handling/logger.cjs`),o=require(`./common.snarkjs.cjs`),s=require(`./signedMessageHash.cjs`),c=require(`./generateCircomData.cjs`),l=require(`../../data-structures/AccountActions/AccountActions.cjs`),u=require(`./generateMainAndCommitmentZkProof.cjs`),d=require(`./getMerkleTreeSiblingsAndRootHashes.cjs`),f=require(`../private-wallet/emporium.helpers.cjs`);var p=async(p,m,h,g,_,v,y,b,x,S=n.zeroAddress,C=t.chainIds.localhost,w=m.map(()=>!1),T=void 0,E,D)=>{let O=o.getZkProofVerifierName(m,h),k=o.calcAmountChanges(m,h),A=m.map(e=>e[0].erc20TokenAddress),j=o.calcEncryptedOutputs(h),M=n.defaultSignatureData,N=g.getShieldedPrivateKey(),{pubSpendingBJJPoint:P}=g.getSpendingKeyPair(),F=o.calcStealthAddressStructure(te.UserKeys.findCorrectRandomization(r.randomBigInt(31),N),N,g.getSpendingKeyPair().pubSpendingBJJPoint),{inCommitmentSiblings:I,inCommitmentSiblingSides:re,rootHashHinkal:L,inNullifiers:R}=await d.getDataFromWorkers(C,p,m.map(e=>e.map(e=>e.getConstructableParams()))),z=o.buildOutCommitments(h),B=r.randomBigInt(31),V=ee.poseidonFunction(B),H=BigInt(h.length>0?h[0][0].timeStamp:ne.getCurrentTimeInSeconds()),U={rootHashHinkal:L,spendingPublicKey:P,nullifyingPrivateKey:N,erc20TokenAddresses:A,amountChanges:k,inAmounts:m.map(e=>e.map(e=>e.amount.toString())),inRandomizations:m.map(e=>e.map(e=>o.getUtxoCircuitInRandomization(e))),inH0Ax:m.map(e=>e.map(e=>o.getUtxoCircuitH0Coords(e)[0].toString())),inH0Ay:m.map(e=>e.map(e=>o.getUtxoCircuitH0Coords(e)[1].toString())),isNewStyle:m.map(e=>e.map(e=>!!e.isNewStyle)),inTimeStamps:m.map(e=>e.map(e=>e.timeStamp)),inNullifiers:R,inCommitmentSiblings:I,inCommitmentSiblingSides:re,outAmounts:h.map(e=>e.map(e=>e.amount.toString())),outTimeStamp:H,outPublicKeys:h.map(e=>e.map(e=>e.getStealthAddress())),outCommitments:z,calldataHash:0n,messageSeed:B,H0Ax:i.takeOffHighestBit(F.extraRandomization),H0Ay:F.H0},W=o.calcPublicSignalCount(O,U.erc20TokenAddresses,U.amountChanges,U.inNullifiers,U.outCommitments),G=o.calcAmountChanges(m,h,!0),K=o.getSlippageValues(G);a.Logger.log({publicSignalCount:W});let q=Array.isArray(y)?y:[y],J=t.getOnchainChainId(C),Y=D?l.AccountActions.getSignerAddressFromPrivateKey(J,D):void 0,X=_===e.ExternalActionId.Emporium?await f.encodeEmporiumMetadata(C,v??n.zeroAddress,D,q,V,Y):await f.encodeEmporiumMetadata(C,n.zeroAddress,void 0,_===0n?[]:q,V,n.zeroAddress);U.calldataHash=o.createCallDataHash(W,S,v,_,X,j,T,K,w,x,M,E);let Z=s.computeSignedMessageHashEvm({rootHashHinkal:L,erc20TokenAddresses:A,amountChanges:k,outTimeStamp:H,inNullifiers:R,outCommitments:z,calldataHash:U.calldataHash,message:V,outH1Ay:F.H1,H0Ax:U.H0Ax,H0Ay:F.H0}),{R8:Q,S:ie}=g.signEddsa(Z);U.eddsaSignature=[Q[0],Q[1],ie],U.signedMessageHash=Z;let $=O.startsWith(`mainEVMCircuitMin0`),ae={outTimeStamp:H,calldataHash:U.calldataHash,messageSeed:B},{zkCallData:oe,commitmentValidationData:se}=await u.generateMainAndCommitmentZkProof(C,g,A,m,O,$?ae:U,b);return{zkCallData:oe,circomData:c.generateCircomData(z,R,L,G,A,h,j,W,_,v,X,S,U.calldataHash,F,w,T,$?Number(H):void 0,K,x,M,E),dimData:{tokenNumber:m.length,nullifierAmount:m.length>0?m[0].length:0,outputAmount:h.length>0?h[0].length:0},encryptedOutputs:j,commitmentValidationData:se}};exports.constructZkProof=p;

package/functions/snarkjs/constructGeneralZkProof.d.ts

@@ -9,4 +9,5 @@ export declare const constructZkProof: <T = CircomDataType>(merkleTree: MerkleTr
     circomData: T;
     dimData: DimDataType;
     encryptedOutputs: string[][];
+    commitmentValidationData: import('../..').CommitmentValidationDataType | undefined;
 }>;

package/functions/snarkjs/constructGeneralZkProof.mjs

@@ -10,8 +10,8 @@ import { Logger as ie } from "../../error-handling/logger.mjs";
 import { buildOutCommitments as ae, calcAmountChanges as o, calcEncryptedOutputs as s, calcPublicSignalCount as c, calcStealthAddressStructure as l, createCallDataHash as u, getSlippageValues as d, getUtxoCircuitH0Coords as f, getUtxoCircuitInRandomization as oe, getZkProofVerifierName as se } from "./common.snarkjs.mjs";
 import { computeSignedMessageHashEvm as ce } from "./signedMessageHash.mjs";
 import { generateCircomData as le } from "./generateCircomData.mjs";
-import { generateZkProof as ue } from "./generateZkProof.mjs";
-import { AccountActions as de } from "../../data-structures/AccountActions/AccountActions.mjs";
+import { AccountActions as ue } from "../../data-structures/AccountActions/AccountActions.mjs";
+import { generateMainAndCommitmentZkProof as de } from "./generateMainAndCommitmentZkProof.mjs";
 import { getDataFromWorkers as p } from "./getMerkleTreeSiblingsAndRootHashes.mjs";
 import { encodeEmporiumMetadata as m } from "../private-wallet/emporium.helpers.mjs";
 //#region libs/shared/common/src/functions/snarkjs/constructGeneralZkProof.ts
@@ -41,7 +41,7 @@ var h = async (h, g, _, v, y, b, x, fe, S, C = i, w = t.localhost, T = g.map(()
 		H0Ay: I.H0
 	}, K = c(k, G.erc20TokenAddresses, G.amountChanges, G.inNullifiers, G.outCommitments), q = o(g, _, !0), J = d(q);
 	ie.log({ publicSignalCount: K });
-	let Y = Array.isArray(x) ? x : [x], pe = n(w), me = O ? de.getSignerAddressFromPrivateKey(pe, O) : void 0, X = y === e.Emporium ? await m(w, b ?? i, O, Y, U, me) : await m(w, i, void 0, y === 0n ? [] : Y, U, i);
+	let Y = Array.isArray(x) ? x : [x], pe = n(w), me = O ? ue.getSignerAddressFromPrivateKey(pe, O) : void 0, X = y === e.Emporium ? await m(w, b ?? i, O, Y, U, me) : await m(w, i, void 0, y === 0n ? [] : Y, U, i);
 	G.calldataHash = u(K, C, b, y, X, M, E, J, T, S, N, D);
 	let Z = ce({
 		rootHashHinkal: z,
@@ -65,7 +65,7 @@ var h = async (h, g, _, v, y, b, x, fe, S, C = i, w = t.localhost, T = g.map(()
 		outTimeStamp: W,
 		calldataHash: G.calldataHash,
 		messageSeed: H
-	}, { zkCallData: _e } = await ue(w, k, $ ? ge : G, fe);
+	}, { zkCallData: _e, commitmentValidationData: ve } = await de(w, v, j, g, k, $ ? ge : G, fe);
 	return {
 		zkCallData: _e,
 		circomData: le(V, B, z, q, j, _, M, K, y, b, X, C, G.calldataHash, I, T, E, $ ? Number(W) : void 0, J, S, N, D),
@@ -74,7 +74,8 @@ var h = async (h, g, _, v, y, b, x, fe, S, C = i, w = t.localhost, T = g.map(()
 			nullifierAmount: g.length > 0 ? g[0].length : 0,
 			outputAmount: _.length > 0 ? _[0].length : 0
 		},
-		encryptedOutputs: M
+		encryptedOutputs: M,
+		commitmentValidationData: ve
 	};
 };
 //#endregion

package/functions/snarkjs/constructSolanaZkProof.cjs

@@ -1 +1 @@
-require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../web3/etherFunctions.cjs`),n=require(`../../crypto/poseidon.cjs`),r=require(`../utils/bit.operations.cjs`),i=require(`../utils/solanaMint.utils.cjs`),a=require(`./common.snarkjs.cjs`),o=require(`../pre-transaction/solana.cjs`),s=require(`./signedMessageHash.cjs`),c=require(`./generateZkProof.cjs`);require(`../pre-transaction/index.cjs`),require(`../utils/index.cjs`);const l=require(`./getMerkleTreeSiblingsAndRootHashes.cjs`),u=require(`../pre-transaction/getSolanaCalldataHash.cjs`);require(`../web3/index.cjs`);let d=require(`@solana/web3.js`);var f=async(f,p,m,h,g,_,v,y,b,x,S,C,w,T=e.chainIds.solanaLocalnet,E=[],D=[],O=0n)=>{let k=new d.PublicKey(x),A=new d.PublicKey(S),j=m.getShieldedPrivateKey(),{pubSpendingBJJPoint:M}=m.getSpendingKeyPair(),N=a.calcStealthAddressStructure(v,j,m.getSpendingKeyPair().pubSpendingBJJPoint),P=t.randomBigInt(31),F=n.poseidonFunction(P),I=n.poseidonFunction(O),L=h.map(e=>i.formatMintAddress(e)),R=L.map(e=>e.mintAccountPart1),z=L.map(e=>e.mintAccountPart2),B=u.getSolanaCalldataHash(C,k,A,w,y,b,E,D),V=`${C.tokenNumber}x${C.nullifierAmount}x${C.outputAmount}`,H=a.calcAmountChanges(g,_),{inCommitmentSiblings:U,inCommitmentSiblingSides:W,rootHashHinkal:G,inNullifiers:K}=await l.getDataFromWorkers(T,p,g.map(e=>e.map(e=>e.getConstructableParams()))),q=a.buildOutCommitments(_),J=r.takeOffHighestBit(N.extraRandomization),Y=N.H0,X=s.computeSignedMessageHashSolana({rootHashHinkal:G,mintAccountPart1:R,mintAccountPart2:z,amountChanges:H,outTimeStamp:BigInt(_[0][0].timeStamp),inNullifiers:K,outCommitments:q,calldataHash:B,message:F,swapperAccountAdditionalSeed:I,outH1Ay:N.H1,H0Ax:J,H0Ay:Y}),{R8:Z,S:Q}=m.signEddsa(X),$={rootHashHinkal:G,spendingPublicKey:M,eddsaSignature:[Z[0],Z[1],Q],signedMessageHash:X,nullifyingPrivateKey:j,mintAccountPart1:R,mintAccountPart2:z,amountChanges:H,inAmounts:g.map(e=>e.map(e=>e.amount.toString())),inRandomizations:g.map(e=>e.map(e=>a.getUtxoCircuitInRandomization(e))),inH0Ax:g.map(e=>e.map(e=>a.getUtxoCircuitH0Coords(e)[0].toString())),inH0Ay:g.map(e=>e.map(e=>a.getUtxoCircuitH0Coords(e)[1].toString())),isNewStyle:g.map(e=>e.map(e=>!!e.isNewStyle)),inTimeStamps:g.map(e=>e.map(e=>e.timeStamp)),inNullifiers:K,inCommitmentSiblings:U,inCommitmentSiblingSides:W,outAmounts:_.map(e=>e.map(e=>e.amount.toString())),outTimeStamp:BigInt(_[0][0].timeStamp),outPublicKeys:_.map(e=>e.map(e=>e.getStealthAddress())),outCommitments:q,calldataHash:B,messageSeed:P,swapperAccountSalt:O,H0Ax:J,H0Ay:Y},{publicSignals:ee,zkCallData:te}=await c.generateZkProof(T,`mainSolanaCircuit${V}`,$,f),[ne,re,ie]=te;return{proofAArr:ne.map(BigInt).map(o.encodeToByte32Array).flat(),proofBArr:re.flat().map(BigInt).map(o.encodeToByte32Array).flat(),proofCArr:ie.map(BigInt).map(o.encodeToByte32Array).flat(),publicInputsArr:ee.map(BigInt).map(o.encodeToByte32Array)}};exports.constructSolanaZkProof=f;
+require(`../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../constants/chains.constants.cjs`),t=require(`../web3/etherFunctions.cjs`),n=require(`../../crypto/poseidon.cjs`),r=require(`../utils/bit.operations.cjs`),i=require(`../utils/solanaMint.utils.cjs`),a=require(`./common.snarkjs.cjs`),o=require(`../pre-transaction/solana.cjs`),s=require(`./signedMessageHash.cjs`);require(`../pre-transaction/index.cjs`);const c=require(`./generateMainAndCommitmentZkProof.cjs`);require(`../utils/index.cjs`);const l=require(`./getMerkleTreeSiblingsAndRootHashes.cjs`),u=require(`../pre-transaction/getSolanaCalldataHash.cjs`);require(`../web3/index.cjs`);let d=require(`@solana/web3.js`);var f=async(f,p,m,h,g,_,v,y,b,x,S,C,w,T=e.chainIds.solanaLocalnet,E=[],D=[],O=0n)=>{let k=new d.PublicKey(x),A=new d.PublicKey(S),j=m.getShieldedPrivateKey(),{pubSpendingBJJPoint:M}=m.getSpendingKeyPair(),N=a.calcStealthAddressStructure(v,j,m.getSpendingKeyPair().pubSpendingBJJPoint),P=t.randomBigInt(31),F=n.poseidonFunction(P),I=n.poseidonFunction(O),L=h.map(e=>i.formatMintAddress(e)),R=L.map(e=>e.mintAccountPart1),z=L.map(e=>e.mintAccountPart2),B=u.getSolanaCalldataHash(C,k,A,w,y,b,E,D),V=`${C.tokenNumber}x${C.nullifierAmount}x${C.outputAmount}`,H=a.calcAmountChanges(g,_),{inCommitmentSiblings:U,inCommitmentSiblingSides:W,rootHashHinkal:G,inNullifiers:K}=await l.getDataFromWorkers(T,p,g.map(e=>e.map(e=>e.getConstructableParams()))),q=a.buildOutCommitments(_),J=r.takeOffHighestBit(N.extraRandomization),Y=N.H0,X=s.computeSignedMessageHashSolana({rootHashHinkal:G,mintAccountPart1:R,mintAccountPart2:z,amountChanges:H,outTimeStamp:BigInt(_[0][0].timeStamp),inNullifiers:K,outCommitments:q,calldataHash:B,message:F,swapperAccountAdditionalSeed:I,outH1Ay:N.H1,H0Ax:J,H0Ay:Y}),{R8:Z,S:Q}=m.signEddsa(X),$={rootHashHinkal:G,spendingPublicKey:M,eddsaSignature:[Z[0],Z[1],Q],signedMessageHash:X,nullifyingPrivateKey:j,mintAccountPart1:R,mintAccountPart2:z,amountChanges:H,inAmounts:g.map(e=>e.map(e=>e.amount.toString())),inRandomizations:g.map(e=>e.map(e=>a.getUtxoCircuitInRandomization(e))),inH0Ax:g.map(e=>e.map(e=>a.getUtxoCircuitH0Coords(e)[0].toString())),inH0Ay:g.map(e=>e.map(e=>a.getUtxoCircuitH0Coords(e)[1].toString())),isNewStyle:g.map(e=>e.map(e=>!!e.isNewStyle)),inTimeStamps:g.map(e=>e.map(e=>e.timeStamp)),inNullifiers:K,inCommitmentSiblings:U,inCommitmentSiblingSides:W,outAmounts:_.map(e=>e.map(e=>e.amount.toString())),outTimeStamp:BigInt(_[0][0].timeStamp),outPublicKeys:_.map(e=>e.map(e=>e.getStealthAddress())),outCommitments:q,calldataHash:B,messageSeed:P,swapperAccountSalt:O,H0Ax:J,H0Ay:Y},{zkCallData:ee,publicSignals:te,commitmentValidationData:ne}=await c.generateMainAndCommitmentZkProof(T,m,h,g,`mainSolanaCircuit${V}`,$,f),[re,ie,ae]=ee;return{proofAArr:re.map(BigInt).map(o.encodeToByte32Array).flat(),proofBArr:ie.flat().map(BigInt).map(o.encodeToByte32Array).flat(),proofCArr:ae.map(BigInt).map(o.encodeToByte32Array).flat(),publicInputsArr:te.map(BigInt).map(o.encodeToByte32Array),commitmentValidationData:ne}};exports.constructSolanaZkProof=f;

package/functions/snarkjs/constructSolanaZkProof.d.ts

@@ -9,4 +9,5 @@ export declare const constructSolanaZkProof: (generateProofRemotely: boolean, me
     proofBArr: number[];
     proofCArr: number[];
     publicInputsArr: number[][];
+    commitmentValidationData: import('../..').CommitmentValidationDataType | undefined;
 }>;