@gurge/sdk 0.3.30 → 0.3.31

package/common/src/data-structures/Hinkal/hinkalWithdraw.cjs

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../types/hinkal.types.cjs`),r=require(`../../error-handling/error-codes.constants.cjs`),i=require(`../../functions/utils/time.utils.cjs`),a=require(`../../types/external-action.types.cjs`),o=require(`../../functions/utils/tron.utils.cjs`),s=require(`../../functions/utils/token-check.utils.cjs`),c=require(`../../functions/web3/events/getShieldedBalance.cjs`),l=require(`../../functions/utils/hinkalTiming.utils.cjs`),u=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),d=require(`../../functions/pre-transaction/getVolatileTransferAmount.cjs`),f=require(`../../functions/pre-transaction/constructAdminData.cjs`),p=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const m=require(`../../functions/utils/fees.utils.cjs`),h=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),g=require(`../../functions/web3/functionCalls/transactCallDirect.cjs`),_=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),v=require(`../../functions/web3/functionCalls/transactCallDirectTron.cjs`),y=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var b=async(e,t,n,r)=>{let a=l.createRnDeltaTiming(`withdraw.utxoPrep`),o=[...await c.addPaddingToUtxos(e,t,n,r)];a.log(`padding-done`,{inputCounts:o.map(e=>e.length)});let s=[],d=i.getCurrentTimeInSeconds().toString();for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=u.outputUtxoProcessing(e.userKeys,o[t],r[t],d);s.push(n)}return a.log(`outputUtxos-done`,{outputCounts:s.map(e=>e.length)}),{inputUtxosArray:o,outputUtxosArray:s}},x=async(i,c,u,x,S,C,w,T)=>{let E=s.validateAndGetChainId(c),D=e.isTronLike(E),O=o.addressToHexFormat(await i.getEthereumAddressByChain(E)),k=c.map(e=>e.erc20TokenAddress),A=await d.modifyVolatileTokenAmountChanges(E,c,u),j=c[0];if(!j)throw Error(`Deposit Action: No Token Found`);let M;if(!S){let e=w??await p.getFeeStructure(E,C,k,a.ExternalActionId.Transact);M=await m.calculateModifiedFeeStructure(E,j,-A[0],e),await y.mergeWithFeeStructure(E,k,A,M)}let N={externalActionId:0n,externalAddress:o.addressToHexFormat(x),externalActionMetadata:`0x00`},[P,{inputUtxosArray:F,outputUtxosArray:I}]=await Promise.all([i.getRandomRelay(E,!0),b(i,E,k,A)]);if(!S&&!P)throw Error(r.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let L=l.createRnDeltaTiming(`withdraw.constructZkProof`),{zkCallData:R,circomData:z,dimData:B,commitmentValidationData:V}=await h.constructZkProof(i.merkleTreeHinkalByChain[E],F,I,i.userKeys,N.externalActionId,N.externalAddress,N.externalActionMetadata,i.generateProofRemotely,M??n.zeroFeeStructure,S?t.zeroAddress:P,E,void 0,void 0,S?O:void 0);L.log(`done`);let H=D&&S?void 0:await o.reorderZkCallData(D,R,B,z);if(S){if(!j)throw Error(`Withdraw Action: No Token Found`);return D?await v.transactCallDirectTron(i,E,A[0],j,R,z,B):await g.transactCallDirect(i,E,A[0],j,R,z,B)}let U=f.constructAdminData(T,E,k,A,O),W=l.createRnDeltaTiming(`withdraw.relayer`),G=await _.transactCallRelayer(E,R,B,z,V,void 0,void 0,U,H);return W.log(`done`,{txHash:G}),G};exports.hinkalWithdraw=x;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../types/hinkal.types.cjs`),r=require(`../../error-handling/error-codes.constants.cjs`),i=require(`../../functions/utils/time.utils.cjs`),a=require(`../../types/external-action.types.cjs`),o=require(`../../functions/utils/tron.utils.cjs`),s=require(`../../functions/utils/token-check.utils.cjs`),c=require(`../../functions/web3/events/getShieldedBalance.cjs`),l=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),u=require(`../../functions/pre-transaction/getVolatileTransferAmount.cjs`),d=require(`../../functions/pre-transaction/constructAdminData.cjs`),f=require(`../../functions/pre-transaction/getFeeStructure.cjs`);require(`../../functions/pre-transaction/index.cjs`);const p=require(`../../functions/utils/fees.utils.cjs`),m=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),h=require(`../../functions/web3/functionCalls/transactCallDirect.cjs`),g=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),_=require(`../../functions/web3/functionCalls/transactCallDirectTron.cjs`),v=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var y=async(e,t,n,r)=>{let a=[...await c.addPaddingToUtxos(e,t,n,r)],o=[],s=i.getCurrentTimeInSeconds().toString();for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=l.outputUtxoProcessing(e.userKeys,a[t],r[t],s);o.push(n)}return{inputUtxosArray:a,outputUtxosArray:o}},b=async(i,c,l,b,x,S,C,w)=>{let T=s.validateAndGetChainId(c),E=e.isTronLike(T),D=o.addressToHexFormat(await i.getEthereumAddressByChain(T)),O=c.map(e=>e.erc20TokenAddress),k=await u.modifyVolatileTokenAmountChanges(T,c,l),A=c[0];if(!A)throw Error(`Deposit Action: No Token Found`);let j;if(!x){let e=C??await f.getFeeStructure(T,S,O,a.ExternalActionId.Transact);j=await p.calculateModifiedFeeStructure(T,A,-k[0],e),await v.mergeWithFeeStructure(T,O,k,j)}let M={externalActionId:0n,externalAddress:o.addressToHexFormat(b),externalActionMetadata:`0x00`},[N,{inputUtxosArray:P,outputUtxosArray:F}]=await Promise.all([i.getRandomRelay(T,!0),y(i,T,O,k)]);if(!x&&!N)throw Error(r.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let{zkCallData:I,circomData:L,dimData:R,commitmentValidationData:z}=await m.constructZkProof(i.merkleTreeHinkalByChain[T],P,F,i.userKeys,M.externalActionId,M.externalAddress,M.externalActionMetadata,i.generateProofRemotely,j??n.zeroFeeStructure,x?t.zeroAddress:N,T,void 0,void 0,x?D:void 0),B=E&&x?void 0:await o.reorderZkCallData(E,I,R,L);if(x){if(!A)throw Error(`Withdraw Action: No Token Found`);return E?await _.transactCallDirectTron(i,T,k[0],A,I,L,R):await h.transactCallDirect(i,T,k[0],A,I,L,R)}return await g.transactCallRelayer(T,I,R,L,z,void 0,void 0,d.constructAdminData(w,T,O,k,D),B)};exports.hinkalWithdraw=b;

package/common/src/data-structures/Hinkal/hinkalWithdraw.mjs

@@ -7,54 +7,48 @@ import { ExternalActionId as a } from "../../types/external-action.types.mjs";
 import { addressToHexFormat as o, reorderZkCallData as s } from "../../functions/utils/tron.utils.mjs";
 import { validateAndGetChainId as c } from "../../functions/utils/token-check.utils.mjs";
 import { addPaddingToUtxos as l } from "../../functions/web3/events/getShieldedBalance.mjs";
-import { createRnDeltaTiming as u } from "../../functions/utils/hinkalTiming.utils.mjs";
-import { outputUtxoProcessing as d } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
-import { modifyVolatileTokenAmountChanges as f } from "../../functions/pre-transaction/getVolatileTransferAmount.mjs";
-import { constructAdminData as p } from "../../functions/pre-transaction/constructAdminData.mjs";
-import { getFeeStructure as m } from "../../functions/pre-transaction/getFeeStructure.mjs";
+import { outputUtxoProcessing as u } from "../../functions/pre-transaction/outputUtxoProcessing.mjs";
+import { modifyVolatileTokenAmountChanges as d } from "../../functions/pre-transaction/getVolatileTransferAmount.mjs";
+import { constructAdminData as f } from "../../functions/pre-transaction/constructAdminData.mjs";
+import { getFeeStructure as p } from "../../functions/pre-transaction/getFeeStructure.mjs";
 import "../../functions/pre-transaction/index.mjs";
-import { calculateModifiedFeeStructure as h } from "../../functions/utils/fees.utils.mjs";
-import { constructZkProof as g } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
-import { transactCallDirect as _ } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
-import { transactCallRelayer as v } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
-import { transactCallDirectTron as y } from "../../functions/web3/functionCalls/transactCallDirectTron.mjs";
-import { mergeWithFeeStructure as b } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
+import { calculateModifiedFeeStructure as m } from "../../functions/utils/fees.utils.mjs";
+import { constructZkProof as h } from "../../functions/snarkjs/constructGeneralZkProof.mjs";
+import { transactCallDirect as g } from "../../functions/web3/functionCalls/transactCallDirect.mjs";
+import { transactCallRelayer as _ } from "../../functions/web3/functionCalls/transactCallRelayer.mjs";
+import { transactCallDirectTron as v } from "../../functions/web3/functionCalls/transactCallDirectTron.mjs";
+import { mergeWithFeeStructure as y } from "../../functions/pre-transaction/merge-with-fee-structure.mjs";
 //#region libs/shared/common/src/data-structures/Hinkal/hinkalWithdraw.ts
-var x = async (e, t, n, r) => {
-	let a = u("withdraw.utxoPrep"), o = [...await l(e, t, n, r)];
-	a.log("padding-done", { inputCounts: o.map((e) => e.length) });
-	let s = [], c = i().toString();
+var b = async (e, t, n, r) => {
+	let a = [...await l(e, t, n, r)], o = [], s = i().toString();
 	for (let t = 0; t < n.length; t += 1) {
-		let { outputUtxos: n } = d(e.userKeys, o[t], r[t], c);
-		s.push(n);
+		let { outputUtxos: n } = u(e.userKeys, a[t], r[t], s);
+		o.push(n);
 	}
-	return a.log("outputUtxos-done", { outputCounts: s.map((e) => e.length) }), {
-		inputUtxosArray: o,
-		outputUtxosArray: s
+	return {
+		inputUtxosArray: a,
+		outputUtxosArray: o
 	};
-}, S = async (i, l, d, S, C, w, T, E) => {
-	let D = c(l), O = e(D), k = o(await i.getEthereumAddressByChain(D)), A = l.map((e) => e.erc20TokenAddress), j = await f(D, l, d), M = l[0];
-	if (!M) throw Error("Deposit Action: No Token Found");
-	let N;
-	if (!C) {
-		let e = T ?? await m(D, w, A, a.Transact);
-		N = await h(D, M, -j[0], e), await b(D, A, j, N);
+}, x = async (i, l, u, x, S, C, w, T) => {
+	let E = c(l), D = e(E), O = o(await i.getEthereumAddressByChain(E)), k = l.map((e) => e.erc20TokenAddress), A = await d(E, l, u), j = l[0];
+	if (!j) throw Error("Deposit Action: No Token Found");
+	let M;
+	if (!S) {
+		let e = w ?? await p(E, C, k, a.Transact);
+		M = await m(E, j, -A[0], e), await y(E, k, A, M);
 	}
-	let P = {
+	let N = {
 		externalActionId: 0n,
-		externalAddress: o(S),
+		externalAddress: o(x),
 		externalActionMetadata: "0x00"
-	}, [F, { inputUtxosArray: I, outputUtxosArray: L }] = await Promise.all([i.getRandomRelay(D, !0), x(i, D, A, j)]);
-	if (!C && !F) throw Error(r.RELAYER_NOT_AVAILABLE);
-	let R = u("withdraw.constructZkProof"), { zkCallData: z, circomData: B, dimData: V, commitmentValidationData: H } = await g(i.merkleTreeHinkalByChain[D], I, L, i.userKeys, P.externalActionId, P.externalAddress, P.externalActionMetadata, i.generateProofRemotely, N ?? n, C ? t : F, D, void 0, void 0, C ? k : void 0);
-	R.log("done");
-	let U = O && C ? void 0 : await s(O, z, V, B);
-	if (C) {
-		if (!M) throw Error("Withdraw Action: No Token Found");
-		return O ? await y(i, D, j[0], M, z, B, V) : await _(i, D, j[0], M, z, B, V);
+	}, [P, { inputUtxosArray: F, outputUtxosArray: I }] = await Promise.all([i.getRandomRelay(E, !0), b(i, E, k, A)]);
+	if (!S && !P) throw Error(r.RELAYER_NOT_AVAILABLE);
+	let { zkCallData: L, circomData: R, dimData: z, commitmentValidationData: B } = await h(i.merkleTreeHinkalByChain[E], F, I, i.userKeys, N.externalActionId, N.externalAddress, N.externalActionMetadata, i.generateProofRemotely, M ?? n, S ? t : P, E, void 0, void 0, S ? O : void 0), V = D && S ? void 0 : await s(D, L, z, R);
+	if (S) {
+		if (!j) throw Error("Withdraw Action: No Token Found");
+		return D ? await v(i, E, A[0], j, L, R, z) : await g(i, E, A[0], j, L, R, z);
 	}
-	let W = p(E, D, A, j, k), G = u("withdraw.relayer"), K = await v(D, z, V, B, H, void 0, void 0, W, U);
-	return G.log("done", { txHash: K }), K;
+	return await _(E, L, z, R, B, void 0, void 0, f(T, E, k, A, O), V);
 };
 //#endregion
-export { S as hinkalWithdraw };
+export { x as hinkalWithdraw };

package/common/src/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(`../utils/hinkalTiming.utils.cjs`),i=require(`../snarkjs/common.snarkjs.cjs`),a=require(`../../webworker/worker.registry.cjs`),o=require(`../../webworker/performTaskWithWorker.cjs`),s=require(`../../webworker/zkProofWorker/zkProofWorker.types.cjs`);var c=async(c,l,u,d)=>{if(i.hasOnlyZeroAmounts(d))return;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=>i.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 o.performTaskWithWorker({type:a.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()),S=r.createRnDeltaTiming(`withdraw.stealthValidation`),C=0;d.forEach((e,n)=>{e.forEach((e,r)=>{C+=1;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}`)})}),S.log(`done`,{stealthChecks:C});let w={nullifyingPrivateKey:y,spendingPublicKey:b,erc20TokenAddresses:x,inAmounts:p,inRandomizations:h,inH0Ax:d.map(e=>e.map(e=>i.getUtxoCircuitH0Coords(e)[0].toString())),inH0Ay:d.map(e=>e.map(e=>i.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{tokenAddresses:x,inAmounts:p,inTimeStamps:m,inRandomizations:h,inCommitments:_,inNullifiers:v,verifierName:`commitmentCalculator${u.length}x${d[0].length}`,commitmentInput:w}},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:t.zkCallData[0],b:t.zkCallData[1],c:t.zkCallData[2]}}};exports.buildCommitmentValidationData=c,exports.buildCommitmentValidationDataFromProof=l;
+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)=>{if(r.hasOnlyZeroAmounts(u))return;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/common/src/functions/pre-transaction/buildCommitmentValidationData.mjs

@@ -1,55 +1,53 @@
 import { isSolanaLike as e } from "../../constants/chains.constants.mjs";
 import { UserKeys as t } from "../../data-structures/crypto-keys/keys.mjs";
 import { formatMintAddress as n } from "../utils/solanaMint.utils.mjs";
-import { createRnDeltaTiming as r } from "../utils/hinkalTiming.utils.mjs";
-import { getUtxoCircuitH0Coords as i, getUtxoCircuitInRandomization as a, hasOnlyZeroAmounts as o } from "../snarkjs/common.snarkjs.mjs";
-import { WorkerVariant as s } from "../../webworker/worker.registry.mjs";
-import { performTaskWithWorker as c } from "../../webworker/performTaskWithWorker.mjs";
-import { ZKProofWorkerActionType as l } from "../../webworker/zkProofWorker/zkProofWorker.types.mjs";
+import { getUtxoCircuitH0Coords as r, getUtxoCircuitInRandomization as i, hasOnlyZeroAmounts as a } from "../snarkjs/common.snarkjs.mjs";
+import { WorkerVariant as o } from "../../webworker/worker.registry.mjs";
+import { performTaskWithWorker as s } from "../../webworker/performTaskWithWorker.mjs";
+import { ZKProofWorkerActionType as c } from "../../webworker/zkProofWorker/zkProofWorker.types.mjs";
 //#region libs/shared/common/src/functions/pre-transaction/buildCommitmentValidationData.ts
-var u = async (u, d, f, p) => {
-	if (o(p)) return;
-	let m = e(u), h = p.map((e) => e.map((e) => e.amount.toString())), g = p.map((e) => e.map((e) => e.timeStamp)), _ = p.map((e) => e.map((e) => a(e))), v = p.map((e) => e.map((e) => e.getConstructableParams())), y = p.map((e) => e.map((e) => e.amount === 0n ? "0" : BigInt(e.getCommitment()).toString())), b = await c({
-		type: s.ZKProof,
+var l = async (l, u, d, f) => {
+	if (a(f)) return;
+	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 s({
+		type: o.ZKProof,
 		payload: {
-			type: l.BUILD_IN_NULLIFIERS,
-			data: { inputUtxosSerialized: v }
+			type: c.BUILD_IN_NULLIFIERS,
+			data: { inputUtxosSerialized: _ }
 		}
-	}), x = d.getShieldedPrivateKey(), S = d.getSpendingKeyPair().pubSpendingBJJPoint, C = m ? f.map((e) => {
+	}), b = u.getShieldedPrivateKey(), x = u.getSpendingKeyPair().pubSpendingBJJPoint, S = p ? d.map((e) => {
 		let { compressedAddress: t } = n(e);
 		return BigInt(t).toString();
-	}) : f.map((e) => BigInt(e).toString()), w = r("withdraw.stealthValidation"), T = 0;
-	p.forEach((e, n) => {
+	}) : d.map((e) => BigInt(e).toString());
+	f.forEach((e, n) => {
 		e.forEach((e, r) => {
-			T += 1;
-			let i = e.getStealthAddress(), a = e.spendingPublicKey ?? S, o = e.isNewStyle && e.H0 ? t.getStealthAddressNewStyle(e.H0, x, a) : t.getStealthAddress(BigInt(e.randomization), x);
+			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);
 			if (BigInt(i).toString() !== BigInt(o).toString()) throw Error(`Commitment validation stealth mismatch at tokenIdx=${n}, utxoIdx=${r}`);
 		});
-	}), w.log("done", { stealthChecks: T });
-	let E = {
-		nullifyingPrivateKey: x,
-		spendingPublicKey: S,
-		erc20TokenAddresses: C,
-		inAmounts: h,
-		inRandomizations: _,
-		inH0Ax: p.map((e) => e.map((e) => i(e)[0].toString())),
-		inH0Ay: p.map((e) => e.map((e) => i(e)[1].toString())),
-		isNewStyle: p.map((e) => e.map((e) => !!e.isNewStyle)),
-		inTimeStamps: g,
-		inCommitments: y,
-		inNullifiers: b
+	});
+	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
 	};
-	if (!(!f.length || !p[0]?.length)) return {
-		tokenAddresses: C,
-		inAmounts: h,
-		inTimeStamps: g,
-		inRandomizations: _,
-		inCommitments: y,
-		inNullifiers: b,
-		verifierName: `commitmentCalculator${f.length}x${p[0].length}`,
-		commitmentInput: E
+	if (!(!d.length || !f[0]?.length)) return {
+		tokenAddresses: S,
+		inAmounts: m,
+		inTimeStamps: h,
+		inRandomizations: g,
+		inCommitments: v,
+		inNullifiers: y,
+		verifierName: `commitmentCalculator${d.length}x${f[0].length}`,
+		commitmentInput: C
 	};
-}, d = (e, t) => {
+}, u = (e, t) => {
 	if (!(!e || !t)) return {
 		tokenAddresses: e.tokenAddresses,
 		inAmounts: e.inAmounts,
@@ -65,4 +63,4 @@ var u = async (u, d, f, p) => {
 	};
 };
 //#endregion
-export { u as buildCommitmentValidationData, d as buildCommitmentValidationDataFromProof };
+export { l as buildCommitmentValidationData, u as buildCommitmentValidationDataFromProof };

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

@@ -1 +1 @@
-const e=require(`../utils/amounts.utils.cjs`),t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`../../data-structures/utxo/Utxo.cjs`),r=require(`../utils/hinkalTiming.utils.cjs`);var i=(i,a,o,s,c=!0,l,u)=>{let d=e.countTotalAmountInUtxos(a),{erc20TokenAddress:f,mintAddress:p}=a[0];if(c&&o<0n&&d+o<0n)throw Error(t.transactionErrorCodes.INSUFFICIENT_FUNDS_TO_TRANSACT);let m=r.createRnDeltaTiming(`withdraw.outputUtxo`),h=[new n.Utxo({amount:e.bigintMax(d+o,0n),erc20TokenAddress:f,mintAddress:p,nullifyingKey:i.getShieldedPrivateKey(),timeStamp:s,spendingPublicKey:i.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0})];if(m.log(`newUtxo-change`),l!==void 0&&u!==void 0){let[e,t,r,,i]=l.split(`,`);h.push(new n.Utxo({amount:u,erc20TokenAddress:f,mintAddress:p,H0:[BigInt(t),BigInt(r)],stealthAddress:e,encryptionKey:i,timeStamp:s,isNewStyle:!0}))}return{outputUtxos:h}};exports.outputUtxoProcessing=i;
+const e=require(`../utils/amounts.utils.cjs`),t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`../../data-structures/utxo/Utxo.cjs`);var r=(r,i,a,o,s=!0,c,l)=>{let u=e.countTotalAmountInUtxos(i),{erc20TokenAddress:d,mintAddress:f}=i[0];if(s&&a<0n&&u+a<0n)throw Error(t.transactionErrorCodes.INSUFFICIENT_FUNDS_TO_TRANSACT);let p=[new n.Utxo({amount:e.bigintMax(u+a,0n),erc20TokenAddress:d,mintAddress:f,nullifyingKey:r.getShieldedPrivateKey(),timeStamp:o,spendingPublicKey:r.getSpendingKeyPair().pubSpendingBJJPoint,isNewStyle:!0})];if(c!==void 0&&l!==void 0){let[e,t,r,,i]=c.split(`,`);p.push(new n.Utxo({amount:l,erc20TokenAddress:d,mintAddress:f,H0:[BigInt(t),BigInt(r)],stealthAddress:e,encryptionKey:i,timeStamp:o,isNewStyle:!0}))}return{outputUtxos:p}};exports.outputUtxoProcessing=r;

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

@@ -1,34 +1,33 @@
 import { bigintMax as e, countTotalAmountInUtxos as t } from "../utils/amounts.utils.mjs";
 import { transactionErrorCodes as n } from "../../error-handling/error-codes.constants.mjs";
 import { Utxo as r } from "../../data-structures/utxo/Utxo.mjs";
-import { createRnDeltaTiming as i } from "../utils/hinkalTiming.utils.mjs";
 //#region libs/shared/common/src/functions/pre-transaction/outputUtxoProcessing.ts
-var a = (a, o, s, c, l = !0, u, d) => {
-	let f = t(o), { erc20TokenAddress: p, mintAddress: m } = o[0];
-	if (l && s < 0n && f + s < 0n) throw Error(n.INSUFFICIENT_FUNDS_TO_TRANSACT);
-	let h = i("withdraw.outputUtxo"), g = [new r({
-		amount: e(f + s, 0n),
-		erc20TokenAddress: p,
-		mintAddress: m,
-		nullifyingKey: a.getShieldedPrivateKey(),
-		timeStamp: c,
-		spendingPublicKey: a.getSpendingKeyPair().pubSpendingBJJPoint,
+var i = (i, a, o, s, c = !0, l, u) => {
+	let d = t(a), { erc20TokenAddress: f, mintAddress: p } = a[0];
+	if (c && o < 0n && d + o < 0n) throw Error(n.INSUFFICIENT_FUNDS_TO_TRANSACT);
+	let m = [new r({
+		amount: e(d + o, 0n),
+		erc20TokenAddress: f,
+		mintAddress: p,
+		nullifyingKey: i.getShieldedPrivateKey(),
+		timeStamp: s,
+		spendingPublicKey: i.getSpendingKeyPair().pubSpendingBJJPoint,
 		isNewStyle: !0
 	})];
-	if (h.log("newUtxo-change"), u !== void 0 && d !== void 0) {
-		let [e, t, n, , i] = u.split(",");
-		g.push(new r({
-			amount: d,
-			erc20TokenAddress: p,
-			mintAddress: m,
+	if (l !== void 0 && u !== void 0) {
+		let [e, t, n, , i] = l.split(",");
+		m.push(new r({
+			amount: u,
+			erc20TokenAddress: f,
+			mintAddress: p,
 			H0: [BigInt(t), BigInt(n)],
 			stealthAddress: e,
 			encryptionKey: i,
-			timeStamp: c,
+			timeStamp: s,
 			isNewStyle: !0
 		}));
 	}
-	return { outputUtxos: g };
+	return { outputUtxos: m };
 };
 //#endregion
-export { a as outputUtxoProcessing };
+export { i as outputUtxoProcessing };

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

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

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

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

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

@@ -1,4 +1,2 @@
 export declare const mod: (value: bigint, m?: bigint) => bigint;
-export declare const modpow: (b: bigint, e: bigint, m: bigint) => bigint;
-/** Modular inverse via extended Euclidean algorithm (much faster than Fermat modpow on RN). */
 export declare const modInverse: (value: bigint, m?: bigint) => bigint;

package/common/src/webworker/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gurge/sdk",
-  "version": "0.3.30",
+  "version": "0.3.31",
   "homepage": "hinkal.io",
   "author": {
     "name": "Hinkal Protocol"

package/common/src/webworker/viteWorkerURL.constant.cjs

@@ -14,8 +14,8 @@
   var e = /* @__PURE__ */ ((r) => (r.ZKProof = "ZKProof", r.SnarkJS = "SnarkJS", r.UTXO = "UTXO", r))(e || {});
 
   const n = async () => ({
-    [e.ZKProof]: await getWorkerURL(domain + '/0.3.30/' + 'zkProofWorkerLauncher.js'),
-    [e.SnarkJS]: await getWorkerURL(domain + '/0.3.30/' + 'snarkjsWorkerLauncher.js'),
-    [e.UTXO]: await getWorkerURL(domain + '/0.3.30/' + 'utxoWorkerLauncher.js'),
+    [e.ZKProof]: await getWorkerURL(domain + '/0.3.31/' + 'zkProofWorkerLauncher.js'),
+    [e.SnarkJS]: await getWorkerURL(domain + '/0.3.31/' + 'snarkjsWorkerLauncher.js'),
+    [e.UTXO]: await getWorkerURL(domain + '/0.3.31/' + 'utxoWorkerLauncher.js'),
   });
   exports.getWorkerViteURL = n;

package/common/src/webworker/viteWorkerURL.constant.mjs

@@ -14,8 +14,8 @@
   var e = /* @__PURE__ */ ((r) => (r.ZKProof = "ZKProof", r.SnarkJS = "SnarkJS", r.UTXO = "UTXO", r))(e || {});
 
   const n = async () => ({
-    [e.ZKProof]: await getWorkerURL(domain + '/0.3.30/' + 'zkProofWorkerLauncher.js'),
-    [e.SnarkJS]: await getWorkerURL(domain + '/0.3.30/' + 'snarkjsWorkerLauncher.js'),
-    [e.UTXO]: await getWorkerURL(domain + '/0.3.30/' + 'utxoWorkerLauncher.js'),
+    [e.ZKProof]: await getWorkerURL(domain + '/0.3.31/' + 'zkProofWorkerLauncher.js'),
+    [e.SnarkJS]: await getWorkerURL(domain + '/0.3.31/' + 'snarkjsWorkerLauncher.js'),
+    [e.UTXO]: await getWorkerURL(domain + '/0.3.31/' + 'utxoWorkerLauncher.js'),
   });
   export { n as getWorkerViteURL };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gurge/sdk",
-  "version": "0.3.30",
+  "version": "0.3.31",
   "homepage": "hinkal.io",
   "author": {
     "name": "Hinkal Protocol"

package/sdk/package.json.cjs

@@ -1 +1 @@
-var e={name:`@gurge/sdk`,version:`0.3.29`,homepage:`hinkal.io`,author:{name:`Hinkal Protocol`},keywords:[`blockchain`,`privacy`,`zero-knowledge`,`stealth addresses`],exports:{".":{types:`./index.d.ts`,"react-native":`./index.cjs`,import:`./index.mjs`,default:`./index.cjs`},"./providers/WagmiProviderAdapter":{types:`./providers/WagmiProviderAdapter.d.ts`,"react-native":`./providers/WagmiProviderAdapter.cjs`,import:`./providers/WagmiProviderAdapter.mjs`,default:`./providers/WagmiProviderAdapter.cjs`},"./providers/EthersProviderAdapter":{types:`./providers/EthersProviderAdapter.d.ts`,"react-native":`./providers/EthersProviderAdapter.cjs`,import:`./providers/EthersProviderAdapter.mjs`,default:`./providers/EthersProviderAdapter.cjs`},"./providers/TronProviderAdapter":{types:`./providers/TronProviderAdapter.d.ts`,"react-native":`./providers/TronProviderAdapter.cjs`,import:`./providers/TronProviderAdapter.mjs`,default:`./providers/TronProviderAdapter.cjs`},"./providers/SolanaProviderAdapter":{types:`./providers/SolanaProviderAdapter.d.ts`,"react-native":`./providers/SolanaProviderAdapter.cjs`,import:`./providers/SolanaProviderAdapter.mjs`,default:`./providers/SolanaProviderAdapter.cjs`},"./providers/prepareEthersHinkal":{types:`./providers/prepareEthersHinkal.d.ts`,"react-native":`./providers/prepareEthersHinkal.cjs`,import:`./providers/prepareEthersHinkal.mjs`,default:`./providers/prepareEthersHinkal.cjs`},"./providers/prepareWagmiHinkal":{types:`./providers/prepareWagmiHinkal.d.ts`,"react-native":`./providers/prepareWagmiHinkal.cjs`,import:`./providers/prepareWagmiHinkal.mjs`,default:`./providers/prepareWagmiHinkal.cjs`},"./providers/prepareTronHinkal":{types:`./providers/prepareTronHinkal.d.ts`,"react-native":`./providers/prepareTronHinkal.cjs`,import:`./providers/prepareTronHinkal.mjs`,default:`./providers/prepareTronHinkal.cjs`},"./providers/prepareSolanaHinkal":{types:`./providers/prepareSolanaHinkal.d.ts`,"react-native":`./providers/prepareSolanaHinkal.cjs`,import:`./providers/prepareSolanaHinkal.mjs`,default:`./providers/prepareSolanaHinkal.cjs`},"./react-native/HinkalWebViewWorker":{types:`./react-native/HinkalWebViewWorker.d.ts`,"react-native":`./react-native/HinkalWebViewWorker.cjs`,import:`./react-native/HinkalWebViewWorker.mjs`,default:`./react-native/HinkalWebViewWorker.cjs`},"./react-native/metro-config":`./react-native/metro-config.js`,"./react-native/shims/*":`./react-native/shims/*`},types:`./index.d.ts`,scripts:{prebuild:`nx prebuild:workers`,build:`nx build`,lint:`nx lint`,test:`nx test`},devDependencies:{nx:`22.6.4`,vite:`^8.0.4`,"vite-plugin-dts":`^4.5.4`,"vite-tsconfig-paths":`^6.1.1`},dependencies:{"@coral-xyz/anchor":`^0.31.0`,"@solana/spl-token":`^0.4.14`,"@solana/web3.js":`^1.98.4`,"@solana/wallet-adapter-react":`^0.15.39`,axios:`^1.15.0`,"async-mutex":`^0.4.0`,bs58:`^6.0.0`,buffer:`6.0.3`,"circomlibjs-hinkal-fork":`^0.0.10`,dotenv:`^16.4.5`,ethers:`^6.15.0`,"idb-keyval":`6.2.1`,multiformats:`^9.4.2`,snarkjs:`0.7.5`,"libsodium-wrappers":`^0.8.2`,lodash:`^4.17.21`,tweetnacl:`^1.0.3`,process:`0.11.10`,"ua-parser-js":`^1.0.37`,uuid:`^9.0.1`,"node-forge":`^1.3.1`,"poseidon-lite":`^0.3.0`,tronweb:`^6.2.0`},peerDependencies:{wagmi:`2.13.3`,"@walletconnect/utils":`^2.17.2`,react:`*`,"react-native":`*`,"react-native-webview":`*`},peerDependenciesMeta:{wagmi:{optional:!0},"@walletconnect/utils":{optional:!0},react:{optional:!0},"react-native":{optional:!0},"react-native-webview":{optional:!0}}};exports.default=e;
+var e={name:`@gurge/sdk`,version:`0.3.30`,homepage:`hinkal.io`,author:{name:`Hinkal Protocol`},keywords:[`blockchain`,`privacy`,`zero-knowledge`,`stealth addresses`],exports:{".":{types:`./index.d.ts`,"react-native":`./index.cjs`,import:`./index.mjs`,default:`./index.cjs`},"./providers/WagmiProviderAdapter":{types:`./providers/WagmiProviderAdapter.d.ts`,"react-native":`./providers/WagmiProviderAdapter.cjs`,import:`./providers/WagmiProviderAdapter.mjs`,default:`./providers/WagmiProviderAdapter.cjs`},"./providers/EthersProviderAdapter":{types:`./providers/EthersProviderAdapter.d.ts`,"react-native":`./providers/EthersProviderAdapter.cjs`,import:`./providers/EthersProviderAdapter.mjs`,default:`./providers/EthersProviderAdapter.cjs`},"./providers/TronProviderAdapter":{types:`./providers/TronProviderAdapter.d.ts`,"react-native":`./providers/TronProviderAdapter.cjs`,import:`./providers/TronProviderAdapter.mjs`,default:`./providers/TronProviderAdapter.cjs`},"./providers/SolanaProviderAdapter":{types:`./providers/SolanaProviderAdapter.d.ts`,"react-native":`./providers/SolanaProviderAdapter.cjs`,import:`./providers/SolanaProviderAdapter.mjs`,default:`./providers/SolanaProviderAdapter.cjs`},"./providers/prepareEthersHinkal":{types:`./providers/prepareEthersHinkal.d.ts`,"react-native":`./providers/prepareEthersHinkal.cjs`,import:`./providers/prepareEthersHinkal.mjs`,default:`./providers/prepareEthersHinkal.cjs`},"./providers/prepareWagmiHinkal":{types:`./providers/prepareWagmiHinkal.d.ts`,"react-native":`./providers/prepareWagmiHinkal.cjs`,import:`./providers/prepareWagmiHinkal.mjs`,default:`./providers/prepareWagmiHinkal.cjs`},"./providers/prepareTronHinkal":{types:`./providers/prepareTronHinkal.d.ts`,"react-native":`./providers/prepareTronHinkal.cjs`,import:`./providers/prepareTronHinkal.mjs`,default:`./providers/prepareTronHinkal.cjs`},"./providers/prepareSolanaHinkal":{types:`./providers/prepareSolanaHinkal.d.ts`,"react-native":`./providers/prepareSolanaHinkal.cjs`,import:`./providers/prepareSolanaHinkal.mjs`,default:`./providers/prepareSolanaHinkal.cjs`},"./react-native/HinkalWebViewWorker":{types:`./react-native/HinkalWebViewWorker.d.ts`,"react-native":`./react-native/HinkalWebViewWorker.cjs`,import:`./react-native/HinkalWebViewWorker.mjs`,default:`./react-native/HinkalWebViewWorker.cjs`},"./react-native/metro-config":`./react-native/metro-config.js`,"./react-native/shims/*":`./react-native/shims/*`},types:`./index.d.ts`,scripts:{prebuild:`nx prebuild:workers`,build:`nx build`,lint:`nx lint`,test:`nx test`},devDependencies:{nx:`22.6.4`,vite:`^8.0.4`,"vite-plugin-dts":`^4.5.4`,"vite-tsconfig-paths":`^6.1.1`},dependencies:{"@coral-xyz/anchor":`^0.31.0`,"@solana/spl-token":`^0.4.14`,"@solana/web3.js":`^1.98.4`,"@solana/wallet-adapter-react":`^0.15.39`,axios:`^1.15.0`,"async-mutex":`^0.4.0`,bs58:`^6.0.0`,buffer:`6.0.3`,"circomlibjs-hinkal-fork":`^0.0.10`,dotenv:`^16.4.5`,ethers:`^6.15.0`,"idb-keyval":`6.2.1`,multiformats:`^9.4.2`,snarkjs:`0.7.5`,"libsodium-wrappers":`^0.8.2`,lodash:`^4.17.21`,tweetnacl:`^1.0.3`,process:`0.11.10`,"ua-parser-js":`^1.0.37`,uuid:`^9.0.1`,"node-forge":`^1.3.1`,"poseidon-lite":`^0.3.0`,tronweb:`^6.2.0`},peerDependencies:{wagmi:`2.13.3`,"@walletconnect/utils":`^2.17.2`,react:`*`,"react-native":`*`,"react-native-webview":`*`},peerDependenciesMeta:{wagmi:{optional:!0},"@walletconnect/utils":{optional:!0},react:{optional:!0},"react-native":{optional:!0},"react-native-webview":{optional:!0}}};exports.default=e;

package/sdk/package.json.mjs

@@ -1,6 +1,6 @@
 var e = {
 	name: "@gurge/sdk",
-	version: "0.3.29",
+	version: "0.3.30",
 	homepage: "hinkal.io",
 	author: { name: "Hinkal Protocol" },
 	keywords: [

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

@@ -1 +0,0 @@
-const e=require(`../../constants/vite.constants.cjs`);var t=t=>{let n=Date.now(),r=n;return{log(i,a){if(!e.isReactNative)return;let o=Date.now();console.log(`[HinkalRnDelta] at=${o} [${t}] ${i}`,{ms:o-r,totalMs:o-n,...a}),r=o}}};exports.createRnDeltaTiming=t;

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

@@ -1,5 +0,0 @@
-/** RN withdraw profiling — no-op on web. */
-export declare const logRnDelta: (scope: string, phase: string, extra?: Record<string, unknown>) => void;
-export declare const createRnDeltaTiming: (scope: string) => {
-    log(phase: string, extra?: Record<string, unknown>): void;
-};

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

@@ -1,16 +0,0 @@
-import { isReactNative as e } from "../../constants/vite.constants.mjs";
-//#region libs/shared/common/src/functions/utils/hinkalTiming.utils.ts
-var t = (t) => {
-	let n = Date.now(), r = n;
-	return { log(i, a) {
-		if (!e) return;
-		let o = Date.now();
-		console.log(`[HinkalRnDelta] at=${o} [${t}] ${i}`, {
-			ms: o - r,
-			totalMs: o - n,
-			...a
-		}), r = o;
-	} };
-};
-//#endregion
-export { t as createRnDeltaTiming };