@kapa123456789/sdk 0.0.65 → 0.0.67

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

@@ -1,54 +1,167 @@
 import { chainIds as e, isTronLike as t } from "../../constants/chains.constants.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";
+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";
 //#region libs/shared/common/src/functions/snarkjs/constructGeneralZkProof.ts
-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,
+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,
 		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(_, 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
+	};
+	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
 	};
 };
 //#endregion
-export { f as constructZkProof };
+export { s 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(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(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;

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

@@ -3,7 +3,12 @@ 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 (o) try {
+	if (console.log("generateZkProof", {
+		chainId: r,
+		verifierName: i,
+		input: a,
+		remotely: o
+	}), o) try {
 		return await t(r, i, a);
 	} catch (t) {
 		e.error("enclave proof error", t);

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=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;
+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;

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

@@ -8,53 +8,174 @@ 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 = 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);
+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;
 	}
-	if (!y && (await a(l, u, w, x, b), O)) {
-		let e = x.map(({ erc20TokenAddress: e }, t) => ({
+	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) => ({
 			tokenAddress: e,
-			requiredAmount: b[t]
+			requiredAmount: w[t]
 		}));
-		await s(l, u, C, r(w), e);
+		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`);
 	}
-	let M = {
-		value: k > 0n ? BigInt(k).toString() : void 0,
+	let I = {
+		value: N > 0n ? BigInt(N).toString() : void 0,
 		gasLimit: void 0
-	}, N, P = [
-		p[0],
-		p[1],
-		p[2],
-		h,
-		m,
+	};
+	console.log(`${l} overrides prepared`, I);
+	let L, R = [
+		_[0],
+		_[1],
+		_[2],
+		y,
+		v,
 		{
-			...M,
-			from: C
+			...I,
+			from: D
 		}
-	], { 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;
+	];
+	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;
 	try {
-		L = y ? await T[E].populateTransaction(...P) : await T[E](...P);
+		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 (!e?.transactionHash) throw e;
-		let t = await i(F.provider, e.transactionHash);
-		if (!t) throw e;
-		L = t;
+		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;
 	}
-	return L;
+	return console.log(`${l} complete`, p(V)), V;
 };
 //#endregion
-export { l as transactCallDirect };
+export { m as transactCallDirect };

package/common/src/webworker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kapa123456789/sdk",
-  "version": "0.0.65",
+  "version": "0.0.67",
   "homepage": "hinkal.io",
   "author": {
     "name": "Hinkal Protocol"

package/common/src/webworker/utxoWorker/utxoWorkerLauncher.ts?worker&url.cjs

@@ -1 +1 @@
-var e=``+(typeof document>`u`?require(`url`).pathToFileURL(__dirname+`/../../../../assets/utxoWorkerLauncher-DCxQ7eXx.js`).href:new URL(`../../../../assets/utxoWorkerLauncher-DCxQ7eXx.js`,document.currentScript&&document.currentScript.tagName.toUpperCase()===`SCRIPT`&&document.currentScript.src||document.baseURI).href);exports.default=e;
+var e=``+(typeof document>`u`?require(`url`).pathToFileURL(__dirname+`/../../../../assets/utxoWorkerLauncher-CDD8QoFQ.js`).href:new URL(`../../../../assets/utxoWorkerLauncher-CDD8QoFQ.js`,document.currentScript&&document.currentScript.tagName.toUpperCase()===`SCRIPT`&&document.currentScript.src||document.baseURI).href);exports.default=e;

package/common/src/webworker/utxoWorker/utxoWorkerLauncher.ts?worker&url.mjs

@@ -1,4 +1,4 @@
 //#region libs/shared/common/src/webworker/utxoWorker/utxoWorkerLauncher.ts?worker&url
-var e = "" + new URL("../../../../assets/utxoWorkerLauncher-DCxQ7eXx.js", import.meta.url).href;
+var e = "" + new URL("../../../../assets/utxoWorkerLauncher-CDD8QoFQ.js", import.meta.url).href;
 //#endregion
 export { e as default };