@kapa123456789/sdk 0.0.67 → 0.0.69

package/common/src/error-handling/logger.mjs

@@ -1,11 +1,19 @@
-import { logError as e } from "./logError.mjs";
+import { isNotClientProduction as e } from "../constants/vite.constants.mjs";
+import { logError as t } from "./logError.mjs";
 //#region libs/shared/common/src/error-handling/logger.ts
-var t = class {
-	static log(...e) {}
-	static logObject(e) {}
-	static error(...t) {
-		e(t);
+var n = class {
+	static log(...t) {
+		e && console.log(...t);
+	}
+	static logObject(t) {
+		e && console.dir(t, {
+			depth: null,
+			colors: !0
+		});
+	}
+	static error(...e) {
+		t(e);
 	}
 };
 //#endregion
-export { t as Logger };
+export { n as Logger };

package/common/src/functions/index.cjs

@@ -1 +1 @@
-require(`./utils/serialize.utils.cjs`),require(`./utils/amounts.utils.cjs`),require(`./pre-transaction/solana.cjs`),require(`./web3/functionCalls/accessTokenCalls.cjs`),require(`./web3/etherFunctions.cjs`),require(`./utils/erc20tokenFunctions.cjs`),require(`./utils/caseInsensitive.utils.cjs`),require(`./utils/time.utils.cjs`),require(`./utils/upToDateState.cjs`),require(`./utils/getContractAddress.cjs`),require(`./utils/cacheFunctions.cjs`),require(`./utils/encryptInputForEnclave.cjs`),require(`./utils/solanaMint.utils.cjs`),require(`./utils/addresses.cjs`),require(`./utils/tron.utils.cjs`),require(`./web3/events/getInputUtxoAndBalance.cjs`),require(`./utils/get-signature-header.cjs`),require(`./utils/auth.utils.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(`./snarkjs/generateZkProof.cjs`),require(`./utils/fees.utils.cjs`),require(`./utils/create-provider.cjs`),require(`./utils/resolve-sync.utils.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/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/recipientUtxoProcessing.cjs`),require(`./pre-transaction/ensureAmountChanges.cjs`),require(`./pre-transaction/getFeeStructure.cjs`),require(`./pre-transaction/getKycAndSignatureData.cjs`),require(`./pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`),require(`./pre-transaction/buildCommitmentValidationData.cjs`),require(`./pre-transaction/index.cjs`),require(`./kyc/openDefaultPassportWindow.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/getUtxosFromReceipt.utils.cjs`),require(`./utils/getUtxosFromReceiptSolana.cjs`),require(`./utils/tx-confirmation.utils.cjs`),require(`./utils/tronSimulation.utils.cjs`),require(`./utils/getSignerFromContract.cjs`),require(`./web3/events/balanceChangedHandler.cjs`),require(`./utils/index.cjs`),require(`./snarkjs/fetchOnChainRootHashes.cjs`),require(`./snarkjs/constructGeneralZkProof.cjs`),require(`./private-wallet/emporium.helpers.cjs`),require(`./snarkjs/constructEmporiumProof.cjs`),require(`./snarkjs/constructSolanaZkProof.cjs`),require(`./snarkjs/index.cjs`),require(`./web3/uniswapAPI.cjs`),require(`./web3/odosAPI.cjs`),require(`./web3/oneInchAPI.cjs`),require(`./web3/lifiAPI.cjs`),require(`./web3/okxAPI.cjs`),require(`./web3/signAndSendSerializedTransaction.cjs`),require(`./web3/index.cjs`),require(`./kyc/checkTokenLimitsUSD.cjs`),require(`./kyc/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/serialize.utils.cjs`),require(`./utils/amounts.utils.cjs`),require(`./pre-transaction/solana.cjs`),require(`./web3/functionCalls/accessTokenCalls.cjs`),require(`./web3/etherFunctions.cjs`),require(`./utils/erc20tokenFunctions.cjs`),require(`./utils/caseInsensitive.utils.cjs`),require(`./utils/bigint-math.utils.cjs`),require(`./utils/time.utils.cjs`),require(`./utils/upToDateState.cjs`),require(`./utils/getContractAddress.cjs`),require(`./utils/cacheFunctions.cjs`),require(`./utils/encryptInputForEnclave.cjs`),require(`./utils/solanaMint.utils.cjs`),require(`./utils/addresses.cjs`),require(`./utils/tron.utils.cjs`),require(`./web3/events/getInputUtxoAndBalance.cjs`),require(`./utils/get-signature-header.cjs`),require(`./utils/auth.utils.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(`./snarkjs/generateZkProof.cjs`),require(`./utils/fees.utils.cjs`),require(`./utils/create-provider.cjs`),require(`./utils/resolve-sync.utils.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/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/recipientUtxoProcessing.cjs`),require(`./pre-transaction/ensureAmountChanges.cjs`),require(`./pre-transaction/getFeeStructure.cjs`),require(`./pre-transaction/getKycAndSignatureData.cjs`),require(`./pre-transaction/waitForDepositedUtxosInMerkleTree.cjs`),require(`./pre-transaction/buildCommitmentValidationData.cjs`),require(`./pre-transaction/index.cjs`),require(`./kyc/openDefaultPassportWindow.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/getUtxosFromReceipt.utils.cjs`),require(`./utils/getUtxosFromReceiptSolana.cjs`),require(`./utils/tx-confirmation.utils.cjs`),require(`./utils/tronSimulation.utils.cjs`),require(`./utils/getSignerFromContract.cjs`),require(`./web3/events/balanceChangedHandler.cjs`),require(`./utils/index.cjs`),require(`./snarkjs/fetchOnChainRootHashes.cjs`),require(`./snarkjs/constructGeneralZkProof.cjs`),require(`./private-wallet/emporium.helpers.cjs`),require(`./snarkjs/constructEmporiumProof.cjs`),require(`./snarkjs/constructSolanaZkProof.cjs`),require(`./snarkjs/index.cjs`),require(`./web3/uniswapAPI.cjs`),require(`./web3/odosAPI.cjs`),require(`./web3/oneInchAPI.cjs`),require(`./web3/lifiAPI.cjs`),require(`./web3/okxAPI.cjs`),require(`./web3/signAndSendSerializedTransaction.cjs`),require(`./web3/index.cjs`),require(`./kyc/checkTokenLimitsUSD.cjs`),require(`./kyc/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

@@ -5,6 +5,7 @@ import "./web3/functionCalls/accessTokenCalls.mjs";
 import "./web3/etherFunctions.mjs";
 import "./utils/erc20tokenFunctions.mjs";
 import "./utils/caseInsensitive.utils.mjs";
+import "./utils/bigint-math.utils.mjs";
 import "./utils/time.utils.mjs";
 import "./utils/upToDateState.mjs";
 import "./utils/getContractAddress.mjs";

package/common/src/functions/snarkjs/constructGeneralZkProof.cjs

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),ee=require(`../../types/hinkal.types.cjs`),te=require(`../web3/etherFunctions.cjs`),ne=require(`../../data-structures/utxo/Utxo.cjs`),re=require(`../../error-handling/logger.cjs`),n=require(`./common.snarkjs.cjs`),ie=require(`./generateCircomData.cjs`),ae=require(`./generateZkProof.cjs`),oe=require(`../utils/fees.utils.cjs`),r=require(`../../data-structures/Hinkal/hinkalCheckTokenRegistry.cjs`),se=require(`./getMerkleTreeSiblingsAndRootHashes.cjs`);var i=`[constructZkProof]`,a=e=>typeof e==`bigint`?e.toString():e,o=e=>({tokenGroupCount:e.length,groupSizes:e.map(e=>e.length),tokenAddresses:e.map(e=>e[0]?.erc20TokenAddress),amounts:e.map(e=>e.map(e=>e.amount.toString()))}),ce=e=>e?{feeToken:e.feeToken,flatFee:e.flatFee.toString(),variableRate:e.variableRate.toString()}:void 0,s=async(s,le,c,l,u,d,f,p,m,h,g=t.zeroAddress,_=e.chainIds.localhost,v=c.map(()=>!1),y=c.map(()=>0n),b=void 0,x=!1,S,C=void 0,w,T=t.defaultSignatureData,E)=>{console.log(`${i} start`,{chainId:_,verifierName:d,externalActionId:a(f),externalAddress:p,externalActionMetadataLength:m?.length,generateProofRemotely:h,relay:g,patchAccessTokenMerkleTree:x,onChainCreation:v,flatFees:y.map(e=>e.toString()),hasHookData:!!b,hasHinkalHelper:!!w,hasOriginalSender:!!E,inputUtxos:o(c),outputUtxos:o(l)});let D=n.calcAmountChanges(c,l),O=c.map(e=>e[0].erc20TokenAddress),k=n.calcEncryptedOutputs(l);console.log(`${i} derived base values`,{amountChanges:D.map(e=>e.toString()),erc20TokenAddresses:O,encryptedOutputGroupCount:k.length,encryptedOutputSizes:k.map(e=>e.length)});let A=u.getShieldedPrivateKey();console.log(`${i} shielded key ready`,{shieldedPrivateKeyLength:A?.toString()?.length});let j=ne.Utxo.findCorrectRandomization(te.randomBigInt(31),A);console.log(`${i} extra randomization ready`,{extraRandomization:j.toString()});let M=n.calcAmountChanges(c,l,!0);console.log(`${i} token registry check start`,{isTronLike:e.isTronLike(_),erc20TokenAddresses:O,signedAmountChanges:M.map(e=>e.toString())});let N=e.isTronLike(_)?await r.hinkalCheckTronTokenRegistry(O,M,_):await r.hinkalCheckTokenRegistry(w??r.createHinkalHelperFromData(_),O,M);console.log(`${i} token registry check complete`,{kycRequired:N});let P=e.isTronLike(_)?x||N:x;console.log(`${i} effective access token patch flag`,{effectivePatchAccessTokenMerkleTree:P});let F=c.map(e=>e.map(e=>e.getConstructableParams()));console.log(`${i} input utxos serialized`,{serializedGroupCount:F.length,serializedGroupSizes:F.map(e=>e.length)}),console.log(`${i} worker data fetch start`);let{inCommitmentSiblings:I,inCommitmentSiblingSides:L,accessTokenSiblings:R,accessTokenSiblingSides:z,rootHashHinkal:B,rootHashAccessToken:V,inNullifiers:H}=await se.getDataFromWorkers(_,s,le,u,F,P,N);console.log(`${i} worker data fetch complete`,{inNullifierGroupCount:H.length,inNullifierSizes:H.map(e=>e.length),inCommitmentSiblingGroupCount:I.length,inCommitmentSiblingSizes:I.map(e=>e.length),accessTokenSiblingGroupCount:R.length,accessTokenSiblingSizes:R.map(e=>e.length),rootHashHinkal:a(B),rootHashAccessToken:a(V),inCommitmentSiblingSidesGroupCount:L.length,accessTokenSiblingSidesGroupCount:z.length});let U=n.buildOutCommitments(l);console.log(`${i} out commitments built`,{outCommitmentGroupCount:U.length,outCommitmentSizes:U.map(e=>e.length)});let W={rootHashHinkal:B,shieldedPrivateKey:A,erc20TokenAddresses:O,inAmounts:c.map(e=>e.map(e=>e.amount.toString())),inTimeStamps:c.map(e=>e.map(e=>e.timeStamp)),inRandomizations:c.map(e=>e.map(e=>e.randomization)),inNullifiers:H,inCommitmentSiblings:I,inCommitmentSiblingSides:L,outAmounts:l.map(e=>e.map(e=>e.amount.toString())),outTimeStamp:BigInt(l[0][0].timeStamp),outPublicKeys:l.map(e=>e.map(e=>e.getStealthAddress())),extraRandomization:j,amountChanges:D,outCommitments:U,rootHashAccessToken:V,accessTokenSiblings:R,accessTokenSiblingSides:z,calldataHash:0n};console.log(`${i} proof input prepared`,{inAmountGroupCount:W.inAmounts.length,outAmountGroupCount:W.outAmounts.length,outTimeStamp:W.outTimeStamp.toString(),extraRandomization:W.extraRandomization.toString(),amountChanges:W.amountChanges.map(e=>e.toString())});let G=c.map(e=>e[0].tokenId??0),K=G.reduce((e,t)=>e+t,0)>0?G.length:0;K>0&&(W.tokenIds=G),console.log(`${i} token ids analyzed`,{tokenIds:G,tokenIdsPositive:K});let q=n.calcPublicSignalCount(d,W.erc20TokenAddresses,W.amountChanges,W.inNullifiers,W.outCommitments,K);console.log(`${i} public signal count ready`,{publicSignalCount:q});let J=ee.defaultHinkalLogicArgs(D.length,u);W.interactionAddress=J.interactionAddress,W.externalApprovalAddresses=J.useApprovalUtxoData?.map(({externalApprovalAddresses:e})=>e),console.log(`${i} hinkal logic args ready`,{interactionAddress:J.interactionAddress,externalApprovalAddressesCount:W.externalApprovalAddresses?.length}),C||=(console.log(`${i} generating fee structure`),oe.generateFeeStructure(y,c.map(e=>e[0].erc20TokenAddress))),console.log(`${i} fee structure ready`,ce(C));let Y=M;console.log(`${i} signed amount changes ready`,{amountChangesBased:Y.map(e=>e.toString())}),S||=(console.log(`${i} generating slippage values`),n.getSlippageValues(Y)),console.log(`${i} slippage values ready`,{slippageValues:S.map(e=>e.toString())}),re.Logger.log({publicSignalCount:q}),console.log(`${i} calldata hash start`),W.calldataHash=n.createCallDataHash(q,g,p,f,m,k,y,b,S,v,J,C,T,E),console.log(`${i} calldata hash complete`,{calldataHash:W.calldataHash.toString()}),console.log(`${i} generateZkProof start`);let{zkCallData:X}=await ae.generateZkProof(_,d,W,h);console.log(`${i} generateZkProof complete`,{aLength:X?.[0]?.length,bOuterLength:X?.[1]?.length,bInnerLengths:X?.[1]?.map(e=>e.length),cLength:X?.[2]?.length,inputLength:X?.[3]?.length});let Z=n.calcStealthAddressStructure(j,A);console.log(`${i} stealth address structure ready`,{extraRandomization:a(Z.extraRandomization),stealthAddress:a(Z.stealthAddress)});let Q=ie.generateCircomData(U,H,B,V,Y,O,l,k,q,f,p,m,g,W.calldataHash,G,Z,v,b,void 0,J,S,C,T,E);console.log(`${i} circom data ready`,{tokenCount:Q.erc20TokenAddresses.length,amountChanges:Q.amountChanges.map(e=>e.toString()),inputNullifierGroupCount:Q.inputNullifiers.length,outCommitmentGroupCount:Q.outCommitments.length,encryptedOutputGroupCount:Q.encryptedOutputs.length,rootHashHinkal:a(Q.rootHashHinkal),rootHashAccessToken:a(Q.rootHashAccessToken),relay:Q.relay,externalAddress:Q.externalAddress,externalActionId:a(Q.externalActionId),calldataHash:a(Q.calldataHash)});let $={tokenNumber:c.length,nullifierAmount:c[0].length,outputAmount:l[0].length};return console.log(`${i} dim data ready`,$),console.log(`${i} complete`),{zkCallData:X,circomData:Q,dimData:$,encryptedOutputs:k}};exports.constructZkProof=s;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../types/hinkal.types.cjs`),r=require(`../web3/etherFunctions.cjs`),i=require(`../../data-structures/utxo/Utxo.cjs`),a=require(`../../error-handling/logger.cjs`),o=require(`./common.snarkjs.cjs`),s=require(`./generateCircomData.cjs`),c=require(`./generateZkProof.cjs`),l=require(`../utils/fees.utils.cjs`),u=require(`../../data-structures/Hinkal/hinkalCheckTokenRegistry.cjs`),d=require(`./getMerkleTreeSiblingsAndRootHashes.cjs`);var f=async(f,p,m,h,g,_,v,y,b,x,S=t.zeroAddress,C=e.chainIds.localhost,w=m.map(()=>!1),T=m.map(()=>0n),E=void 0,D=!1,O,k=void 0,A,j=t.defaultSignatureData,M)=>{let N=o.calcAmountChanges(m,h),P=m.map(e=>e[0].erc20TokenAddress),F=o.calcEncryptedOutputs(h),I=g.getShieldedPrivateKey(),L=i.Utxo.findCorrectRandomization(r.randomBigInt(31),I),R=e.isTronLike(C)?await u.hinkalCheckTronTokenRegistry(P,o.calcAmountChanges(m,h,!0),C):await u.hinkalCheckTokenRegistry(A??u.createHinkalHelperFromData(C),P,o.calcAmountChanges(m,h,!0)),z=e.isTronLike(C)?D||R:D,{inCommitmentSiblings:B,inCommitmentSiblingSides:V,accessTokenSiblings:H,accessTokenSiblingSides:U,rootHashHinkal:W,rootHashAccessToken:G,inNullifiers:K}=await d.getDataFromWorkers(C,f,p,g,m.map(e=>e.map(e=>e.getConstructableParams())),z,R),q=o.buildOutCommitments(h),J={rootHashHinkal:W,shieldedPrivateKey:I,erc20TokenAddresses:P,inAmounts:m.map(e=>e.map(e=>e.amount.toString())),inTimeStamps:m.map(e=>e.map(e=>e.timeStamp)),inRandomizations:m.map(e=>e.map(e=>e.randomization)),inNullifiers:K,inCommitmentSiblings:B,inCommitmentSiblingSides:V,outAmounts:h.map(e=>e.map(e=>e.amount.toString())),outTimeStamp:BigInt(h[0][0].timeStamp),outPublicKeys:h.map(e=>e.map(e=>e.getStealthAddress())),extraRandomization:L,amountChanges:N,outCommitments:q,rootHashAccessToken:G,accessTokenSiblings:H,accessTokenSiblingSides:U,calldataHash:0n},Y=m.map(e=>e[0].tokenId??0),X=Y.reduce((e,t)=>e+t,0)>0?Y.length:0;X>0&&(J.tokenIds=Y);let Z=o.calcPublicSignalCount(_,J.erc20TokenAddresses,J.amountChanges,J.inNullifiers,J.outCommitments,X),Q=n.defaultHinkalLogicArgs(N.length,g);J.interactionAddress=Q.interactionAddress,J.externalApprovalAddresses=Q.useApprovalUtxoData?.map(({externalApprovalAddresses:e})=>e),k||=l.generateFeeStructure(T,m.map(e=>e[0].erc20TokenAddress));let $=o.calcAmountChanges(m,h,!0);O||=o.getSlippageValues($),a.Logger.log({publicSignalCount:Z}),J.calldataHash=o.createCallDataHash(Z,S,y,v,b,F,T,E,O,w,Q,k,j,M);let{zkCallData:ee}=await c.generateZkProof(C,_,J,x),te=o.calcStealthAddressStructure(L,I);return{zkCallData:ee,circomData:s.generateCircomData(q,K,W,G,$,P,h,F,Z,v,y,b,S,J.calldataHash,Y,te,w,E,void 0,Q,O,k,j,M),dimData:{tokenNumber:m.length,nullifierAmount:m[0].length,outputAmount:h[0].length},encryptedOutputs:F}};exports.constructZkProof=f;

package/common/src/functions/snarkjs/constructGeneralZkProof.mjs

@@ -1,167 +1,54 @@
 import { chainIds as e, isTronLike as t } from "../../constants/chains.constants.mjs";
-import { defaultSignatureData as ee, zeroAddress as te } from "../../constants/protocol.constants.mjs";
-import { defaultHinkalLogicArgs as ne } from "../../types/hinkal.types.mjs";
-import { randomBigInt as re } from "../web3/etherFunctions.mjs";
-import { Utxo as ie } from "../../data-structures/utxo/Utxo.mjs";
-import { Logger as ae } from "../../error-handling/logger.mjs";
-import { buildOutCommitments as oe, calcAmountChanges as n, calcEncryptedOutputs as se, calcPublicSignalCount as ce, calcStealthAddressStructure as le, createCallDataHash as ue, getSlippageValues as de } from "./common.snarkjs.mjs";
-import { generateCircomData as fe } from "./generateCircomData.mjs";
-import { generateZkProof as r } from "./generateZkProof.mjs";
-import { generateFeeStructure as pe } from "../utils/fees.utils.mjs";
-import { createHinkalHelperFromData as me, hinkalCheckTokenRegistry as he, hinkalCheckTronTokenRegistry as ge } from "../../data-structures/Hinkal/hinkalCheckTokenRegistry.mjs";
-import { getDataFromWorkers as _e } from "./getMerkleTreeSiblingsAndRootHashes.mjs";
+import { defaultSignatureData as n, zeroAddress as r } from "../../constants/protocol.constants.mjs";
+import { defaultHinkalLogicArgs as ee } from "../../types/hinkal.types.mjs";
+import { randomBigInt as te } from "../web3/etherFunctions.mjs";
+import { Utxo as ne } from "../../data-structures/utxo/Utxo.mjs";
+import { Logger as re } from "../../error-handling/logger.mjs";
+import { buildOutCommitments as ie, calcAmountChanges as i, calcEncryptedOutputs as a, calcPublicSignalCount as o, calcStealthAddressStructure as s, createCallDataHash as ae, getSlippageValues as c } from "./common.snarkjs.mjs";
+import { generateCircomData as oe } from "./generateCircomData.mjs";
+import { generateZkProof as se } from "./generateZkProof.mjs";
+import { generateFeeStructure as ce } from "../utils/fees.utils.mjs";
+import { createHinkalHelperFromData as l, hinkalCheckTokenRegistry as u, hinkalCheckTronTokenRegistry as le } from "../../data-structures/Hinkal/hinkalCheckTokenRegistry.mjs";
+import { getDataFromWorkers as d } from "./getMerkleTreeSiblingsAndRootHashes.mjs";
 //#region libs/shared/common/src/functions/snarkjs/constructGeneralZkProof.ts
-var i = "[constructZkProof]", a = (e) => typeof e == "bigint" ? e.toString() : e, o = (e) => ({
-	tokenGroupCount: e.length,
-	groupSizes: e.map((e) => e.length),
-	tokenAddresses: e.map((e) => e[0]?.erc20TokenAddress),
-	amounts: e.map((e) => e.map((e) => e.amount.toString()))
-}), ve = (e) => e ? {
-	feeToken: e.feeToken,
-	flatFee: e.flatFee.toString(),
-	variableRate: e.variableRate.toString()
-} : void 0, s = async (s, ye, c, l, u, d, f, p, m, h, g = te, _ = e.localhost, v = c.map(() => !1), y = c.map(() => 0n), b = void 0, x = !1, S, C = void 0, w, T = ee, E) => {
-	console.log(`${i} start`, {
-		chainId: _,
-		verifierName: d,
-		externalActionId: a(f),
-		externalAddress: p,
-		externalActionMetadataLength: m?.length,
-		generateProofRemotely: h,
-		relay: g,
-		patchAccessTokenMerkleTree: x,
-		onChainCreation: v,
-		flatFees: y.map((e) => e.toString()),
-		hasHookData: !!b,
-		hasHinkalHelper: !!w,
-		hasOriginalSender: !!E,
-		inputUtxos: o(c),
-		outputUtxos: o(l)
-	});
-	let D = n(c, l), O = c.map((e) => e[0].erc20TokenAddress), k = se(l);
-	console.log(`${i} derived base values`, {
-		amountChanges: D.map((e) => e.toString()),
-		erc20TokenAddresses: O,
-		encryptedOutputGroupCount: k.length,
-		encryptedOutputSizes: k.map((e) => e.length)
-	});
-	let A = u.getShieldedPrivateKey();
-	console.log(`${i} shielded key ready`, { shieldedPrivateKeyLength: A?.toString()?.length });
-	let j = ie.findCorrectRandomization(re(31), A);
-	console.log(`${i} extra randomization ready`, { extraRandomization: j.toString() });
-	let M = n(c, l, !0);
-	console.log(`${i} token registry check start`, {
-		isTronLike: t(_),
-		erc20TokenAddresses: O,
-		signedAmountChanges: M.map((e) => e.toString())
-	});
-	let N = t(_) ? await ge(O, M, _) : await he(w ?? me(_), O, M);
-	console.log(`${i} token registry check complete`, { kycRequired: N });
-	let P = t(_) ? x || N : x;
-	console.log(`${i} effective access token patch flag`, { effectivePatchAccessTokenMerkleTree: P });
-	let F = c.map((e) => e.map((e) => e.getConstructableParams()));
-	console.log(`${i} input utxos serialized`, {
-		serializedGroupCount: F.length,
-		serializedGroupSizes: F.map((e) => e.length)
-	}), console.log(`${i} worker data fetch start`);
-	let { inCommitmentSiblings: I, inCommitmentSiblingSides: L, accessTokenSiblings: R, accessTokenSiblingSides: z, rootHashHinkal: B, rootHashAccessToken: V, inNullifiers: H } = await _e(_, s, ye, u, F, P, N);
-	console.log(`${i} worker data fetch complete`, {
-		inNullifierGroupCount: H.length,
-		inNullifierSizes: H.map((e) => e.length),
-		inCommitmentSiblingGroupCount: I.length,
-		inCommitmentSiblingSizes: I.map((e) => e.length),
-		accessTokenSiblingGroupCount: R.length,
-		accessTokenSiblingSizes: R.map((e) => e.length),
-		rootHashHinkal: a(B),
-		rootHashAccessToken: a(V),
-		inCommitmentSiblingSidesGroupCount: L.length,
-		accessTokenSiblingSidesGroupCount: z.length
-	});
-	let U = oe(l);
-	console.log(`${i} out commitments built`, {
-		outCommitmentGroupCount: U.length,
-		outCommitmentSizes: U.map((e) => e.length)
-	});
-	let W = {
-		rootHashHinkal: B,
-		shieldedPrivateKey: A,
-		erc20TokenAddresses: O,
-		inAmounts: c.map((e) => e.map((e) => e.amount.toString())),
-		inTimeStamps: c.map((e) => e.map((e) => e.timeStamp)),
-		inRandomizations: c.map((e) => e.map((e) => e.randomization)),
-		inNullifiers: H,
-		inCommitmentSiblings: I,
-		inCommitmentSiblingSides: L,
-		outAmounts: l.map((e) => e.map((e) => e.amount.toString())),
-		outTimeStamp: BigInt(l[0][0].timeStamp),
-		outPublicKeys: l.map((e) => e.map((e) => e.getStealthAddress())),
-		extraRandomization: j,
-		amountChanges: D,
-		outCommitments: U,
-		rootHashAccessToken: V,
-		accessTokenSiblings: R,
-		accessTokenSiblingSides: z,
+var f = async (f, p, m, h, g, _, v, y, b, x, S = r, C = e.localhost, w = m.map(() => !1), T = m.map(() => 0n), E = void 0, D = !1, O, k = void 0, A, j = n, M) => {
+	let N = i(m, h), P = m.map((e) => e[0].erc20TokenAddress), F = a(h), I = g.getShieldedPrivateKey(), L = ne.findCorrectRandomization(te(31), I), R = t(C) ? await le(P, i(m, h, !0), C) : await u(A ?? l(C), P, i(m, h, !0)), z = t(C) ? D || R : D, { inCommitmentSiblings: B, inCommitmentSiblingSides: V, accessTokenSiblings: H, accessTokenSiblingSides: U, rootHashHinkal: W, rootHashAccessToken: G, inNullifiers: K } = await d(C, f, p, g, m.map((e) => e.map((e) => e.getConstructableParams())), z, R), q = ie(h), J = {
+		rootHashHinkal: W,
+		shieldedPrivateKey: I,
+		erc20TokenAddresses: P,
+		inAmounts: m.map((e) => e.map((e) => e.amount.toString())),
+		inTimeStamps: m.map((e) => e.map((e) => e.timeStamp)),
+		inRandomizations: m.map((e) => e.map((e) => e.randomization)),
+		inNullifiers: K,
+		inCommitmentSiblings: B,
+		inCommitmentSiblingSides: V,
+		outAmounts: h.map((e) => e.map((e) => e.amount.toString())),
+		outTimeStamp: BigInt(h[0][0].timeStamp),
+		outPublicKeys: h.map((e) => e.map((e) => e.getStealthAddress())),
+		extraRandomization: L,
+		amountChanges: N,
+		outCommitments: q,
+		rootHashAccessToken: G,
+		accessTokenSiblings: H,
+		accessTokenSiblingSides: U,
 		calldataHash: 0n
-	};
-	console.log(`${i} proof input prepared`, {
-		inAmountGroupCount: W.inAmounts.length,
-		outAmountGroupCount: W.outAmounts.length,
-		outTimeStamp: W.outTimeStamp.toString(),
-		extraRandomization: W.extraRandomization.toString(),
-		amountChanges: W.amountChanges.map((e) => e.toString())
-	});
-	let G = c.map((e) => e[0].tokenId ?? 0), K = G.reduce((e, t) => e + t, 0) > 0 ? G.length : 0;
-	K > 0 && (W.tokenIds = G), console.log(`${i} token ids analyzed`, {
-		tokenIds: G,
-		tokenIdsPositive: K
-	});
-	let q = ce(d, W.erc20TokenAddresses, W.amountChanges, W.inNullifiers, W.outCommitments, K);
-	console.log(`${i} public signal count ready`, { publicSignalCount: q });
-	let J = ne(D.length, u);
-	W.interactionAddress = J.interactionAddress, W.externalApprovalAddresses = J.useApprovalUtxoData?.map(({ externalApprovalAddresses: e }) => e), console.log(`${i} hinkal logic args ready`, {
-		interactionAddress: J.interactionAddress,
-		externalApprovalAddressesCount: W.externalApprovalAddresses?.length
-	}), C ||= (console.log(`${i} generating fee structure`), pe(y, c.map((e) => e[0].erc20TokenAddress))), console.log(`${i} fee structure ready`, ve(C));
-	let Y = M;
-	console.log(`${i} signed amount changes ready`, { amountChangesBased: Y.map((e) => e.toString()) }), S ||= (console.log(`${i} generating slippage values`), de(Y)), console.log(`${i} slippage values ready`, { slippageValues: S.map((e) => e.toString()) }), ae.log({ publicSignalCount: q }), console.log(`${i} calldata hash start`), W.calldataHash = ue(q, g, p, f, m, k, y, b, S, v, J, C, T, E), console.log(`${i} calldata hash complete`, { calldataHash: W.calldataHash.toString() }), console.log(`${i} generateZkProof start`);
-	let { zkCallData: X } = await r(_, d, W, h);
-	console.log(`${i} generateZkProof complete`, {
-		aLength: X?.[0]?.length,
-		bOuterLength: X?.[1]?.length,
-		bInnerLengths: X?.[1]?.map((e) => e.length),
-		cLength: X?.[2]?.length,
-		inputLength: X?.[3]?.length
-	});
-	let Z = le(j, A);
-	console.log(`${i} stealth address structure ready`, {
-		extraRandomization: a(Z.extraRandomization),
-		stealthAddress: a(Z.stealthAddress)
-	});
-	let Q = fe(U, H, B, V, Y, O, l, k, q, f, p, m, g, W.calldataHash, G, Z, v, b, void 0, J, S, C, T, E);
-	console.log(`${i} circom data ready`, {
-		tokenCount: Q.erc20TokenAddresses.length,
-		amountChanges: Q.amountChanges.map((e) => e.toString()),
-		inputNullifierGroupCount: Q.inputNullifiers.length,
-		outCommitmentGroupCount: Q.outCommitments.length,
-		encryptedOutputGroupCount: Q.encryptedOutputs.length,
-		rootHashHinkal: a(Q.rootHashHinkal),
-		rootHashAccessToken: a(Q.rootHashAccessToken),
-		relay: Q.relay,
-		externalAddress: Q.externalAddress,
-		externalActionId: a(Q.externalActionId),
-		calldataHash: a(Q.calldataHash)
-	});
-	let $ = {
-		tokenNumber: c.length,
-		nullifierAmount: c[0].length,
-		outputAmount: l[0].length
-	};
-	return console.log(`${i} dim data ready`, $), console.log(`${i} complete`), {
-		zkCallData: X,
-		circomData: Q,
-		dimData: $,
-		encryptedOutputs: k
+	}, Y = m.map((e) => e[0].tokenId ?? 0), X = Y.reduce((e, t) => e + t, 0) > 0 ? Y.length : 0;
+	X > 0 && (J.tokenIds = Y);
+	let Z = o(_, J.erc20TokenAddresses, J.amountChanges, J.inNullifiers, J.outCommitments, X), Q = ee(N.length, g);
+	J.interactionAddress = Q.interactionAddress, J.externalApprovalAddresses = Q.useApprovalUtxoData?.map(({ externalApprovalAddresses: e }) => e), k ||= ce(T, m.map((e) => e[0].erc20TokenAddress));
+	let $ = i(m, h, !0);
+	O ||= c($), re.log({ publicSignalCount: Z }), J.calldataHash = ae(Z, S, y, v, b, F, T, E, O, w, Q, k, j, M);
+	let { zkCallData: ue } = await se(C, _, J, x), de = s(L, I);
+	return {
+		zkCallData: ue,
+		circomData: oe(q, K, W, G, $, P, h, F, Z, v, y, b, S, J.calldataHash, Y, de, w, E, void 0, Q, O, k, j, M),
+		dimData: {
+			tokenNumber: m.length,
+			nullifierAmount: m[0].length,
+			outputAmount: h[0].length
+		},
+		encryptedOutputs: F
 	};
 };
 //#endregion
-export { s as constructZkProof };
+export { f as constructZkProof };

package/common/src/functions/snarkjs/generateZkProof.cjs

@@ -1 +1 @@
-const e=require(`../../error-handling/logger.cjs`),t=require(`./generateZkProofEnclave.cjs`),n=require(`./generateZkProofSelf.cjs`);var r=async(r,i,a,o)=>{if(console.log(`generateZkProof`,{chainId:r,verifierName:i,input:a,remotely:o}),o)try{return await t.generateZkProofEnclave(r,i,a)}catch(t){e.Logger.error(`enclave proof error`,t)}return n.generateZkProofSelf(r,i,a)};exports.generateZkProof=r;
+const e=require(`../../error-handling/logger.cjs`),t=require(`./generateZkProofEnclave.cjs`),n=require(`./generateZkProofSelf.cjs`);var r=async(r,i,a,o)=>{if(o)try{return await t.generateZkProofEnclave(r,i,a)}catch(t){e.Logger.error(`enclave proof error`,t)}return n.generateZkProofSelf(r,i,a)};exports.generateZkProof=r;

package/common/src/functions/snarkjs/generateZkProof.mjs

@@ -3,12 +3,7 @@ import { generateZkProofEnclave as t } from "./generateZkProofEnclave.mjs";
 import { generateZkProofSelf as n } from "./generateZkProofSelf.mjs";
 //#region libs/shared/common/src/functions/snarkjs/generateZkProof.ts
 var r = async (r, i, a, o) => {
-	if (console.log("generateZkProof", {
-		chainId: r,
-		verifierName: i,
-		input: a,
-		remotely: o
-	}), o) try {
+	if (o) try {
 		return await t(r, i, a);
 	} catch (t) {
 		e.error("enclave proof error", t);

package/common/src/functions/utils/bigint-math.utils.cjs

@@ -0,0 +1 @@
+const e=require(`../../constants/protocol.constants.cjs`);var t=(t,n=e.CIRCOM_P)=>{let r=t%n;return r>=0n?r:r+n},n=(e,n,r)=>{let i=1n,a=t(e,r),o=n;for(;o>0n;)o%2n==1n&&(i=i*a%r),o/=2n,a=a*a%r;return i};exports.mod=t,exports.modpow=n;

package/common/src/functions/utils/bigint-math.utils.d.ts

@@ -0,0 +1,2 @@
+export declare const mod: (value: bigint, m?: bigint) => bigint;
+export declare const modpow: (b: bigint, e: bigint, m: bigint) => bigint;

package/common/src/functions/utils/bigint-math.utils.mjs

@@ -0,0 +1,12 @@
+import { CIRCOM_P as e } from "../../constants/protocol.constants.mjs";
+//#region libs/shared/common/src/functions/utils/bigint-math.utils.ts
+var t = (t, n = e) => {
+	let r = t % n;
+	return r >= 0n ? r : r + n;
+}, n = (e, n, r) => {
+	let i = 1n, a = t(e, r), o = n;
+	for (; o > 0n;) o % 2n == 1n && (i = i * a % r), o /= 2n, a = a * a % r;
+	return i;
+};
+//#endregion
+export { t as mod, n as modpow };

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

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

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

@@ -1,4 +1,5 @@
 export * from './amounts.utils';
+export * from './bigint-math.utils';
 export * from './cacheFunctions';
 export * from './create-provider';
 export * from './external-action.utils';

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

@@ -3,6 +3,7 @@ import "./amounts.utils.mjs";
 import "../pre-transaction/solana.mjs";
 import "./erc20tokenFunctions.mjs";
 import "./caseInsensitive.utils.mjs";
+import "./bigint-math.utils.mjs";
 import "./time.utils.mjs";
 import "./upToDateState.mjs";
 import "./getContractAddress.mjs";

package/common/src/functions/web3/functionCalls/transactCallDirect.cjs

@@ -1 +1 @@
-require(`../../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../../constants/protocol.constants.cjs`),t=require(`../../../types/ethereum-network.types.cjs`),n=require(`../../utils/time.utils.cjs`),r=require(`../../utils/getContractAddress.cjs`),i=require(`./recoverTransactionFromError.cjs`),a=require(`./approveTokensToHinkal.cjs`),o=require(`./constructBatchCall.cjs`),s=require(`./waitForErc20Approvals.cjs`);let c=require(`ethers`);var l=`[transactCallDirect]`,u=e=>typeof e==`bigint`?e.toString():void 0,d=e=>({aLength:e?.[0]?.length,bOuterLength:e?.[1]?.length,bInnerLengths:e?.[1]?.map(e=>e.length),cLength:e?.[2]?.length,inputLength:e?.[3]?.length}),f=e=>({tokenCount:e.erc20TokenAddresses?.length,tokenAddresses:e.erc20TokenAddresses,amountChanges:e.amountChanges?.map(e=>e.toString()),inputNullifierGroupCount:e.inputNullifiers?.length,inputNullifierSizes:e.inputNullifiers?.map(e=>e.length),outCommitmentGroupCount:e.outCommitments?.length,outCommitmentSizes:e.outCommitments?.map(e=>e.length),encryptedOutputGroupCount:e.encryptedOutputs?.length,encryptedOutputSizes:e.encryptedOutputs?.map(e=>e.length),rootHashHinkal:u(e.rootHashHinkal),rootHashAccessToken:u(e.rootHashAccessToken),relay:e.relay,externalAddress:e.externalAddress,externalActionId:u(e.externalActionId),calldataHash:u(e.calldataHash),publicSignalCount:e.publicSignalCount,originalSender:e.originalSender}),p=e=>({hash:`hash`in e?e.hash:void 0,to:e.to,from:e.from,nonce:e.nonce,value:typeof e.value==`bigint`?e.value.toString():e.value,gasLimit:typeof e.gasLimit==`bigint`?e.gasLimit.toString():e.gasLimit,dataLength:typeof e.data==`string`?e.data.length:void 0}),m=async(u,m,h,g,_,v,y,b,x,S=!0,C=!1)=>{console.log(`${l} start`,{chainId:m,preEstimateGas:S,returnTxData:C,amountIsArray:Array.isArray(h),tokenIsArray:Array.isArray(g),zkCallData:d(_),dimData:y,circomData:f(v)});let w=Array.isArray(h)?h:[h],T=Array.isArray(g)?g:[g];if(console.log(`${l} normalized inputs`,{amounts:w.map(e=>e.toString()),tokenAddresses:T.map(({erc20TokenAddress:e})=>e),tokenSymbols:T.map(({symbol:e})=>e)}),w.length!==T.length)throw Error(`token and amount length mismatch`);console.log(`${l} fetching signer contract`);let E=u.getContractWithSigner(m,t.ContractType.HinkalContract);console.log(`${l} signer contract ready`,{hinkalContractAddress:r.getContractAddress(E)}),console.log(`${l} fetching ethereum address`);let D=await u.getEthereumAddressByChain(m);console.log(`${l} ethereum address ready`,{ethereumAddress:D});let O=b??E,k=x??E;console.log(`${l} contracts resolved`,{approvalContractAddress:r.getContractAddress(O),transactionContractAddress:r.getContractAddress(k),usedCustomApprovalContract:!!b,usedCustomTransactionContract:!!x});let A=`transact`,j=T.findIndex(({erc20TokenAddress:t})=>t===e.zeroAddress),M=T.some(({erc20TokenAddress:t})=>t!==e.zeroAddress),N=j===-1?0n:w[j];console.log(`${l} token analysis`,{ethIndex:j,needsApproval:M,ethAmount:N.toString()}),console.log(`${l} fetching provider adapter`);let P=u.getProviderAdapter(m);console.log(`${l} provider adapter ready`,{providerAdapterType:P?.constructor?.name}),console.log(`${l} checking batch support`);let F=await P.supportsBatchCall?.(m);if(console.log(`${l} batch support resolved`,{supportsBatchCall:F,hasSendBatchCallsTransaction:!!P.sendBatchCallsTransaction}),!C&&M&&F&&P.sendBatchCallsTransaction){console.log(`${l} entering batch call path`);let e=T.map(e=>e.erc20TokenAddress),t=o.buildApproveAndTransactCalls(e,w,r.getContractAddress(O),k,_,y,v,N);console.log(`${l} batch calls built`,{batchCallCount:t.length,tokenAddresses:e,approvalContractAddress:r.getContractAddress(O),transactionContractAddress:r.getContractAddress(k)}),console.log(`${l} sending batch calls transaction`);let n=await P.sendBatchCallsTransaction(m,t);return console.log(`${l} batch calls transaction sent`,p(n)),n}if(!C&&(console.log(`${l} approving tokens start`),await a.approveTokensToHinkal(u,m,O,T,w),console.log(`${l} approving tokens complete`),M)){let e=T.map(({erc20TokenAddress:e},t)=>({tokenAddress:e,requiredAmount:w[t]}));console.log(`${l} waiting for approvals start`,{ownerAddress:D,spenderAddress:r.getContractAddress(O),requirements:e.map(({tokenAddress:e,requiredAmount:t})=>({tokenAddress:e,requiredAmount:t.toString()}))}),await s.waitForErc20Approvals(u,m,D,r.getContractAddress(O),e),console.log(`${l} waiting for approvals complete`)}let I={value:N>0n?BigInt(N).toString():void 0,gasLimit:void 0};console.log(`${l} overrides prepared`,I);let L,R=[_[0],_[1],_[2],y,v,{...I,from:D}];console.log(`${l} call data prepared`,{method:A,dimData:y,transactionContractAddress:r.getContractAddress(k),from:D,value:I.value,zkCallData:d(_)});let{runner:z}=k;if(console.log(`${l} runner resolved`,{runnerType:z?.constructor?.name,hasProvider:!!z?.provider}),!(z instanceof c.ethers.AbstractSigner))throw console.log(`${l} runner is not a signer`,{runnerType:z?.constructor?.name}),Error(`expected signer`);if(S){console.log(`${l} estimateGas start`);try{L=Number(await k[A].estimateGas(...R)),console.log(`${l} estimateGas success`,{gasCosts:L})}catch(e){console.log(`${l} estimateGas error`,{message:e?.message,code:e?.code,shortMessage:e?.shortMessage,reason:e?.reason,data:e?.data,error:e})}}else console.log(`${l} estimateGas skipped`);let B=L&&L>=0?Math.ceil(L*12/10):void 0;B&&(R[5].gasLimit=B),console.log(`${l} gas configuration final`,{gasCosts:L,extendedGasCosts:B,finalOverrides:R[5]}),console.log(`${l} waitLittle start`),await n.waitLittle(),console.log(`${l} waitLittle complete`);let V;try{C?(console.log(`${l} populateTransaction start`),V=await k[A].populateTransaction(...R),console.log(`${l} populateTransaction success`,p(V))):(console.log(`${l} contract call start`),V=await k[A](...R),console.log(`${l} contract call success`,p(V)))}catch(e){if(console.log(`${l} contract call error`,{message:e?.message,code:e?.code,shortMessage:e?.shortMessage,reason:e?.reason,transactionHash:e?.transactionHash,data:e?.data,error:e}),!e?.transactionHash)throw e;console.log(`${l} recoverTransactionFromError start`,{transactionHash:e.transactionHash});let t=await i.recoverTransactionFromError(z.provider,e.transactionHash);if(!t)throw console.log(`${l} recoverTransactionFromError failed`),e;console.log(`${l} recoverTransactionFromError success`,p(t)),V=t}return console.log(`${l} complete`,p(V)),V};exports.transactCallDirect=m;
+require(`../../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../../constants/protocol.constants.cjs`),t=require(`../../../types/ethereum-network.types.cjs`),n=require(`../../utils/time.utils.cjs`),r=require(`../../utils/getContractAddress.cjs`),i=require(`./recoverTransactionFromError.cjs`),a=require(`./approveTokensToHinkal.cjs`),o=require(`./constructBatchCall.cjs`),s=require(`./waitForErc20Approvals.cjs`);let c=require(`ethers`);var l=async(l,u,d,f,p,m,h,g,_,v=!0,y=!1)=>{let b=Array.isArray(d)?d:[d],x=Array.isArray(f)?f:[f];if(b.length!==x.length)throw Error(`token and amount length mismatch`);let S=l.getContractWithSigner(u,t.ContractType.HinkalContract),C=await l.getEthereumAddressByChain(u),w=g??S,T=_??S,E=`transact`,D=x.findIndex(({erc20TokenAddress:t})=>t===e.zeroAddress),O=x.some(({erc20TokenAddress:t})=>t!==e.zeroAddress),k=D===-1?0n:b[D],A=l.getProviderAdapter(u),j=await A.supportsBatchCall?.(u);if(!y&&O&&j&&A.sendBatchCallsTransaction){let e=o.buildApproveAndTransactCalls(x.map(e=>e.erc20TokenAddress),b,r.getContractAddress(w),T,p,h,m,k);return await A.sendBatchCallsTransaction(u,e)}if(!y&&(await a.approveTokensToHinkal(l,u,w,x,b),O)){let e=x.map(({erc20TokenAddress:e},t)=>({tokenAddress:e,requiredAmount:b[t]}));await s.waitForErc20Approvals(l,u,C,r.getContractAddress(w),e)}let M={value:k>0n?BigInt(k).toString():void 0,gasLimit:void 0},N,P=[p[0],p[1],p[2],h,m,{...M,from:C}],{runner:F}=T;if(!(F instanceof c.ethers.AbstractSigner))throw Error(`expected signer`);if(v)try{N=Number(await T[E].estimateGas(...P))}catch(e){console.log(`hinkalDeposit: gas estimation error`,{err:e})}let I=N&&N>=0?Math.ceil(N*12/10):void 0;I&&(P[5].gasLimit=I),await n.waitLittle();let L;try{L=y?await T[E].populateTransaction(...P):await T[E](...P)}catch(e){if(!e?.transactionHash)throw e;let t=await i.recoverTransactionFromError(F.provider,e.transactionHash);if(!t)throw e;L=t}return L};exports.transactCallDirect=l;

package/common/src/functions/web3/functionCalls/transactCallDirect.mjs

@@ -8,174 +8,53 @@ import { buildApproveAndTransactCalls as o } from "./constructBatchCall.mjs";
 import { waitForErc20Approvals as s } from "./waitForErc20Approvals.mjs";
 import { ethers as c } from "ethers";
 //#region libs/shared/common/src/functions/web3/functionCalls/transactCallDirect.ts
-var l = "[transactCallDirect]", u = (e) => typeof e == "bigint" ? e.toString() : void 0, d = (e) => ({
-	aLength: e?.[0]?.length,
-	bOuterLength: e?.[1]?.length,
-	bInnerLengths: e?.[1]?.map((e) => e.length),
-	cLength: e?.[2]?.length,
-	inputLength: e?.[3]?.length
-}), f = (e) => ({
-	tokenCount: e.erc20TokenAddresses?.length,
-	tokenAddresses: e.erc20TokenAddresses,
-	amountChanges: e.amountChanges?.map((e) => e.toString()),
-	inputNullifierGroupCount: e.inputNullifiers?.length,
-	inputNullifierSizes: e.inputNullifiers?.map((e) => e.length),
-	outCommitmentGroupCount: e.outCommitments?.length,
-	outCommitmentSizes: e.outCommitments?.map((e) => e.length),
-	encryptedOutputGroupCount: e.encryptedOutputs?.length,
-	encryptedOutputSizes: e.encryptedOutputs?.map((e) => e.length),
-	rootHashHinkal: u(e.rootHashHinkal),
-	rootHashAccessToken: u(e.rootHashAccessToken),
-	relay: e.relay,
-	externalAddress: e.externalAddress,
-	externalActionId: u(e.externalActionId),
-	calldataHash: u(e.calldataHash),
-	publicSignalCount: e.publicSignalCount,
-	originalSender: e.originalSender
-}), p = (e) => ({
-	hash: "hash" in e ? e.hash : void 0,
-	to: e.to,
-	from: e.from,
-	nonce: e.nonce,
-	value: typeof e.value == "bigint" ? e.value.toString() : e.value,
-	gasLimit: typeof e.gasLimit == "bigint" ? e.gasLimit.toString() : e.gasLimit,
-	dataLength: typeof e.data == "string" ? e.data.length : void 0
-}), m = async (u, m, h, g, _, v, y, b, x, S = !0, C = !1) => {
-	console.log(`${l} start`, {
-		chainId: m,
-		preEstimateGas: S,
-		returnTxData: C,
-		amountIsArray: Array.isArray(h),
-		tokenIsArray: Array.isArray(g),
-		zkCallData: d(_),
-		dimData: y,
-		circomData: f(v)
-	});
-	let w = Array.isArray(h) ? h : [h], T = Array.isArray(g) ? g : [g];
-	if (console.log(`${l} normalized inputs`, {
-		amounts: w.map((e) => e.toString()),
-		tokenAddresses: T.map(({ erc20TokenAddress: e }) => e),
-		tokenSymbols: T.map(({ symbol: e }) => e)
-	}), w.length !== T.length) throw Error("token and amount length mismatch");
-	console.log(`${l} fetching signer contract`);
-	let E = u.getContractWithSigner(m, t.HinkalContract);
-	console.log(`${l} signer contract ready`, { hinkalContractAddress: r(E) }), console.log(`${l} fetching ethereum address`);
-	let D = await u.getEthereumAddressByChain(m);
-	console.log(`${l} ethereum address ready`, { ethereumAddress: D });
-	let O = b ?? E, k = x ?? E;
-	console.log(`${l} contracts resolved`, {
-		approvalContractAddress: r(O),
-		transactionContractAddress: r(k),
-		usedCustomApprovalContract: !!b,
-		usedCustomTransactionContract: !!x
-	});
-	let A = "transact", j = T.findIndex(({ erc20TokenAddress: t }) => t === e), M = T.some(({ erc20TokenAddress: t }) => t !== e), N = j === -1 ? 0n : w[j];
-	console.log(`${l} token analysis`, {
-		ethIndex: j,
-		needsApproval: M,
-		ethAmount: N.toString()
-	}), console.log(`${l} fetching provider adapter`);
-	let P = u.getProviderAdapter(m);
-	console.log(`${l} provider adapter ready`, { providerAdapterType: P?.constructor?.name }), console.log(`${l} checking batch support`);
-	let F = await P.supportsBatchCall?.(m);
-	if (console.log(`${l} batch support resolved`, {
-		supportsBatchCall: F,
-		hasSendBatchCallsTransaction: !!P.sendBatchCallsTransaction
-	}), !C && M && F && P.sendBatchCallsTransaction) {
-		console.log(`${l} entering batch call path`);
-		let e = T.map((e) => e.erc20TokenAddress), t = o(e, w, r(O), k, _, y, v, N);
-		console.log(`${l} batch calls built`, {
-			batchCallCount: t.length,
-			tokenAddresses: e,
-			approvalContractAddress: r(O),
-			transactionContractAddress: r(k)
-		}), console.log(`${l} sending batch calls transaction`);
-		let n = await P.sendBatchCallsTransaction(m, t);
-		return console.log(`${l} batch calls transaction sent`, p(n)), n;
+var l = async (l, u, d, f, p, m, h, g, _, v = !0, y = !1) => {
+	let b = Array.isArray(d) ? d : [d], x = Array.isArray(f) ? f : [f];
+	if (b.length !== x.length) throw Error("token and amount length mismatch");
+	let S = l.getContractWithSigner(u, t.HinkalContract), C = await l.getEthereumAddressByChain(u), w = g ?? S, T = _ ?? S, E = "transact", D = x.findIndex(({ erc20TokenAddress: t }) => t === e), O = x.some(({ erc20TokenAddress: t }) => t !== e), k = D === -1 ? 0n : b[D], A = l.getProviderAdapter(u), j = await A.supportsBatchCall?.(u);
+	if (!y && O && j && A.sendBatchCallsTransaction) {
+		let e = o(x.map((e) => e.erc20TokenAddress), b, r(w), T, p, h, m, k);
+		return await A.sendBatchCallsTransaction(u, e);
 	}
-	if (!C && (console.log(`${l} approving tokens start`), await a(u, m, O, T, w), console.log(`${l} approving tokens complete`), M)) {
-		let e = T.map(({ erc20TokenAddress: e }, t) => ({
+	if (!y && (await a(l, u, w, x, b), O)) {
+		let e = x.map(({ erc20TokenAddress: e }, t) => ({
 			tokenAddress: e,
-			requiredAmount: w[t]
+			requiredAmount: b[t]
 		}));
-		console.log(`${l} waiting for approvals start`, {
-			ownerAddress: D,
-			spenderAddress: r(O),
-			requirements: e.map(({ tokenAddress: e, requiredAmount: t }) => ({
-				tokenAddress: e,
-				requiredAmount: t.toString()
-			}))
-		}), await s(u, m, D, r(O), e), console.log(`${l} waiting for approvals complete`);
+		await s(l, u, C, r(w), e);
 	}
-	let I = {
-		value: N > 0n ? BigInt(N).toString() : void 0,
+	let M = {
+		value: k > 0n ? BigInt(k).toString() : void 0,
 		gasLimit: void 0
-	};
-	console.log(`${l} overrides prepared`, I);
-	let L, R = [
-		_[0],
-		_[1],
-		_[2],
-		y,
-		v,
+	}, N, P = [
+		p[0],
+		p[1],
+		p[2],
+		h,
+		m,
 		{
-			...I,
-			from: D
+			...M,
+			from: C
 		}
-	];
-	console.log(`${l} call data prepared`, {
-		method: A,
-		dimData: y,
-		transactionContractAddress: r(k),
-		from: D,
-		value: I.value,
-		zkCallData: d(_)
-	});
-	let { runner: z } = k;
-	if (console.log(`${l} runner resolved`, {
-		runnerType: z?.constructor?.name,
-		hasProvider: !!z?.provider
-	}), !(z instanceof c.AbstractSigner)) throw console.log(`${l} runner is not a signer`, { runnerType: z?.constructor?.name }), Error("expected signer");
-	if (S) {
-		console.log(`${l} estimateGas start`);
-		try {
-			L = Number(await k[A].estimateGas(...R)), console.log(`${l} estimateGas success`, { gasCosts: L });
-		} catch (e) {
-			console.log(`${l} estimateGas error`, {
-				message: e?.message,
-				code: e?.code,
-				shortMessage: e?.shortMessage,
-				reason: e?.reason,
-				data: e?.data,
-				error: e
-			});
-		}
-	} else console.log(`${l} estimateGas skipped`);
-	let B = L && L >= 0 ? Math.ceil(L * 12 / 10) : void 0;
-	B && (R[5].gasLimit = B), console.log(`${l} gas configuration final`, {
-		gasCosts: L,
-		extendedGasCosts: B,
-		finalOverrides: R[5]
-	}), console.log(`${l} waitLittle start`), await n(), console.log(`${l} waitLittle complete`);
-	let V;
+	], { runner: F } = T;
+	if (!(F instanceof c.AbstractSigner)) throw Error("expected signer");
+	if (v) try {
+		N = Number(await T[E].estimateGas(...P));
+	} catch (e) {
+		console.log("hinkalDeposit: gas estimation error", { err: e });
+	}
+	let I = N && N >= 0 ? Math.ceil(N * 12 / 10) : void 0;
+	I && (P[5].gasLimit = I), await n();
+	let L;
 	try {
-		C ? (console.log(`${l} populateTransaction start`), V = await k[A].populateTransaction(...R), console.log(`${l} populateTransaction success`, p(V))) : (console.log(`${l} contract call start`), V = await k[A](...R), console.log(`${l} contract call success`, p(V)));
+		L = y ? await T[E].populateTransaction(...P) : await T[E](...P);
 	} catch (e) {
-		if (console.log(`${l} contract call error`, {
-			message: e?.message,
-			code: e?.code,
-			shortMessage: e?.shortMessage,
-			reason: e?.reason,
-			transactionHash: e?.transactionHash,
-			data: e?.data,
-			error: e
-		}), !e?.transactionHash) throw e;
-		console.log(`${l} recoverTransactionFromError start`, { transactionHash: e.transactionHash });
-		let t = await i(z.provider, e.transactionHash);
-		if (!t) throw console.log(`${l} recoverTransactionFromError failed`), e;
-		console.log(`${l} recoverTransactionFromError success`, p(t)), V = t;
+		if (!e?.transactionHash) throw e;
+		let t = await i(F.provider, e.transactionHash);
+		if (!t) throw e;
+		L = t;
 	}
-	return console.log(`${l} complete`, p(V)), V;
+	return L;
 };
 //#endregion
-export { m as transactCallDirect };
+export { l as transactCallDirect };