@kapa123456789/sdk 0.0.65 → 0.0.67

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

@@ -1 +1 @@
-const e=require(`../../constants/protocol.constants.cjs`),t=require(`../../types/ethereum-network.types.cjs`),n=require(`../../types/admin.types.cjs`);require(`../../types/index.cjs`);const r=require(`../../error-handling/error-codes.constants.cjs`),i=require(`../../functions/utils/time.utils.cjs`),a=require(`../utxo/Utxo.cjs`),o=require(`../../functions/utils/addresses.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/constructAdminData.cjs`),d=require(`../../functions/pre-transaction/getKycAndSignatureData.cjs`),f=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),p=require(`../../functions/web3/functionCalls/transactCallDirect.cjs`),m=require(`../../API/admin-calls.cjs`);var h=async(e,t,n,r)=>{let i=await e.getEthereumAddressByChain(t),{patchAccessTokenMerkleTree:a,signatureData:o}=await d.getKycAndSignatureData(e,t,n,r,i);return{signatureData:o,externalActionData:{externalActionId:0n,externalAddress:i,externalActionMetadata:`0x00`},contractTransaction:void 0,contractToApprove:void 0,patchAccessTokenMerkleTree:a}},g=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}},_=async(r,i,a,o=!0,c=!1)=>{let l=s.validateAndGetChainId(i),d=i.map(e=>e.erc20TokenAddress),[{externalActionData:_,contractTransaction:v,contractToApprove:y,patchAccessTokenMerkleTree:b,signatureData:x},{inputUtxosArray:S,outputUtxosArray:C}]=await Promise.all([h(r,l,d,a),g(r,l,d,a)]),w=`swapperM${a.length.toString()}x${S[0].length}x1`,{zkCallData:T,circomData:E,dimData:D}=await f.constructZkProof(r.merkleTreeHinkalByChain[l],r.merkleTreeAccessTokenByChain[l],S,C,r.userKeys,w,_.externalActionId,_.externalAddress,_.externalActionMetadata,r.generateProofRemotely,e.zeroAddress,l,void 0,void 0,void 0,b,void 0,void 0,r.getContractWithFetcher(l,t.ContractType.HinkalHelperContract),x),O=await p.transactCallDirect(r,l,a,i,T,E,D,y,v,o,c);return m.emitTxPublicData(u.constructAdminData(n.AdminTransactionType.Onboarding,l,d,a,await r.getEthereumAddress())),O},v=async(i,c,l,d,g=!0,_=!1)=>{let v=s.validateAndGetChainId(c),y=c.map(e=>e.erc20TokenAddress),[b,x,S]=d.split(`,`);if(!o.isValidPrivateAddress(d))throw Error(r.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let C=y.map(e=>[new a.Utxo({amount:0n,erc20TokenAddress:e,shieldedPrivateKey:i.userKeys.getShieldedPrivateKey()}),new a.Utxo({amount:0n,erc20TokenAddress:e,shieldedPrivateKey:i.userKeys.getShieldedPrivateKey()})]),w=`swapperM${l.length.toString()}x${C[0].length}x1`,T=y.map((e,t)=>[new a.Utxo({amount:l[t],erc20TokenAddress:e,randomization:BigInt(b),stealthAddress:x,encryptionKey:S})]),{externalActionData:E,contractTransaction:D,contractToApprove:O,patchAccessTokenMerkleTree:k}=await h(i,v,y,l),{zkCallData:A,circomData:j,dimData:M}=await f.constructZkProof(i.merkleTreeHinkalByChain[v],i.merkleTreeAccessTokenByChain[v],C,T,i.userKeys,w,E.externalActionId,E.externalAddress,E.externalActionMetadata,i.generateProofRemotely,e.zeroAddress,v,void 0,void 0,void 0,k,void 0,void 0,i.getContractWithFetcher(v,t.ContractType.HinkalHelperContract)),N=await p.transactCallDirect(i,v,l,c,A,j,M,O,D,g,_);return m.emitTxPublicData(u.constructAdminData(n.AdminTransactionType.PaymentLink,v,y,l,await i.getEthereumAddress())),N};exports.hinkalDeposit=_,exports.hinkalDepositForOther=v;
+const e=require(`../../constants/protocol.constants.cjs`),t=require(`../../types/ethereum-network.types.cjs`),n=require(`../../types/admin.types.cjs`);require(`../../types/index.cjs`);const r=require(`../../error-handling/error-codes.constants.cjs`),i=require(`../../functions/utils/time.utils.cjs`),a=require(`../utxo/Utxo.cjs`),o=require(`../../functions/utils/addresses.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/constructAdminData.cjs`),d=require(`../../functions/pre-transaction/getKycAndSignatureData.cjs`),f=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),p=require(`../../functions/web3/functionCalls/transactCallDirect.cjs`),m=require(`../../API/admin-calls.cjs`);var h=async(e,t,n,r)=>{let i=await e.getEthereumAddressByChain(t),{patchAccessTokenMerkleTree:a,signatureData:o}=await d.getKycAndSignatureData(e,t,n,r,i);return{signatureData:o,externalActionData:{externalActionId:0n,externalAddress:i,externalActionMetadata:`0x00`},contractTransaction:void 0,contractToApprove:void 0,patchAccessTokenMerkleTree:a}},g=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}},_=async(r,i,a,o=!0,c=!1)=>{console.log(`[hinkalDeposit] start`,{tokenCount:i.length,amountChanges:a,preEstimateGas:o,returnTxData:c});let l=s.validateAndGetChainId(i);console.log(`[hinkalDeposit] chainId`,l);let d=i.map(e=>e.erc20TokenAddress);console.log(`[hinkalDeposit] erc20Addresses`,d),console.log(`[hinkalDeposit] loading transaction parameters and utxos`);let[{externalActionData:_,contractTransaction:v,contractToApprove:y,patchAccessTokenMerkleTree:b,signatureData:x},{inputUtxosArray:S,outputUtxosArray:C}]=await Promise.all([h(r,l,d,a),g(r,l,d,a)]);console.log(`[hinkalDeposit] transaction parameters ready`,{externalActionData:_,hasContractTransaction:!!v,hasContractToApprove:!!y,hasPatchAccessTokenMerkleTree:!!b,hasSignatureData:!!x}),console.log(`[hinkalDeposit] utxos ready`,{inputUtxoGroups:S.length,outputUtxoGroups:C.length,inputUtxoSizes:S.map(e=>e.length),outputUtxoSizes:C.map(e=>e.length)});let w=`swapperM${a.length.toString()}x${S[0].length}x1`;console.log(`[hinkalDeposit] circuitName`,w),console.log(`[hinkalDeposit] constructing zk proof`);let{zkCallData:T,circomData:E,dimData:D}=await f.constructZkProof(r.merkleTreeHinkalByChain[l],r.merkleTreeAccessTokenByChain[l],S,C,r.userKeys,w,_.externalActionId,_.externalAddress,_.externalActionMetadata,r.generateProofRemotely,e.zeroAddress,l,void 0,void 0,void 0,b,void 0,void 0,r.getContractWithFetcher(l,t.ContractType.HinkalHelperContract),x);console.log(`[hinkalDeposit] zk proof ready`,{zkCallDataLength:T?.length,circomDataLength:Array.isArray(E)?E.length:void 0,dimDataLength:Array.isArray(D)?D.length:void 0}),console.log(`[hinkalDeposit] calling transactCallDirect`);let O=await p.transactCallDirect(r,l,a,i,T,E,D,y,v,o,c);console.log(`[hinkalDeposit] transactCallDirect result`,O),console.log(`[hinkalDeposit] constructing admin data`);let k=u.constructAdminData(n.AdminTransactionType.Onboarding,l,d,a,await r.getEthereumAddress());return console.log(`[hinkalDeposit] adminData`,k),console.log(`[hinkalDeposit] emitting public tx data`),m.emitTxPublicData(k),console.log(`[hinkalDeposit] complete`),O},v=async(i,c,l,d,g=!0,_=!1)=>{let v=s.validateAndGetChainId(c),y=c.map(e=>e.erc20TokenAddress),[b,x,S]=d.split(`,`);if(!o.isValidPrivateAddress(d))throw Error(r.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let C=y.map(e=>[new a.Utxo({amount:0n,erc20TokenAddress:e,shieldedPrivateKey:i.userKeys.getShieldedPrivateKey()}),new a.Utxo({amount:0n,erc20TokenAddress:e,shieldedPrivateKey:i.userKeys.getShieldedPrivateKey()})]),w=`swapperM${l.length.toString()}x${C[0].length}x1`,T=y.map((e,t)=>[new a.Utxo({amount:l[t],erc20TokenAddress:e,randomization:BigInt(b),stealthAddress:x,encryptionKey:S})]),{externalActionData:E,contractTransaction:D,contractToApprove:O,patchAccessTokenMerkleTree:k}=await h(i,v,y,l),{zkCallData:A,circomData:j,dimData:M}=await f.constructZkProof(i.merkleTreeHinkalByChain[v],i.merkleTreeAccessTokenByChain[v],C,T,i.userKeys,w,E.externalActionId,E.externalAddress,E.externalActionMetadata,i.generateProofRemotely,e.zeroAddress,v,void 0,void 0,void 0,k,void 0,void 0,i.getContractWithFetcher(v,t.ContractType.HinkalHelperContract)),N=await p.transactCallDirect(i,v,l,c,A,j,M,O,D,g,_);return m.emitTxPublicData(u.constructAdminData(n.AdminTransactionType.PaymentLink,v,y,l,await i.getEthereumAddress())),N};exports.hinkalDeposit=_,exports.hinkalDepositForOther=v;

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

@@ -39,8 +39,41 @@ var h = async (e, t, n, r) => {
 		outputUtxosArray: o
 	};
 }, _ = async (r, i, a, o = !0, c = !1) => {
-	let l = s(i), d = i.map((e) => e.erc20TokenAddress), [{ externalActionData: _, contractTransaction: v, contractToApprove: y, patchAccessTokenMerkleTree: b, signatureData: x }, { inputUtxosArray: S, outputUtxosArray: C }] = await Promise.all([h(r, l, d, a), g(r, l, d, a)]), w = `swapperM${a.length.toString()}x${S[0].length}x1`, { zkCallData: T, circomData: E, dimData: D } = await f(r.merkleTreeHinkalByChain[l], r.merkleTreeAccessTokenByChain[l], S, C, r.userKeys, w, _.externalActionId, _.externalAddress, _.externalActionMetadata, r.generateProofRemotely, e, l, void 0, void 0, void 0, b, void 0, void 0, r.getContractWithFetcher(l, t.HinkalHelperContract), x), O = await p(r, l, a, i, T, E, D, y, v, o, c);
-	return m(u(n.Onboarding, l, d, a, await r.getEthereumAddress())), O;
+	console.log("[hinkalDeposit] start", {
+		tokenCount: i.length,
+		amountChanges: a,
+		preEstimateGas: o,
+		returnTxData: c
+	});
+	let l = s(i);
+	console.log("[hinkalDeposit] chainId", l);
+	let d = i.map((e) => e.erc20TokenAddress);
+	console.log("[hinkalDeposit] erc20Addresses", d), console.log("[hinkalDeposit] loading transaction parameters and utxos");
+	let [{ externalActionData: _, contractTransaction: v, contractToApprove: y, patchAccessTokenMerkleTree: b, signatureData: x }, { inputUtxosArray: S, outputUtxosArray: C }] = await Promise.all([h(r, l, d, a), g(r, l, d, a)]);
+	console.log("[hinkalDeposit] transaction parameters ready", {
+		externalActionData: _,
+		hasContractTransaction: !!v,
+		hasContractToApprove: !!y,
+		hasPatchAccessTokenMerkleTree: !!b,
+		hasSignatureData: !!x
+	}), console.log("[hinkalDeposit] utxos ready", {
+		inputUtxoGroups: S.length,
+		outputUtxoGroups: C.length,
+		inputUtxoSizes: S.map((e) => e.length),
+		outputUtxoSizes: C.map((e) => e.length)
+	});
+	let w = `swapperM${a.length.toString()}x${S[0].length}x1`;
+	console.log("[hinkalDeposit] circuitName", w), console.log("[hinkalDeposit] constructing zk proof");
+	let { zkCallData: T, circomData: E, dimData: D } = await f(r.merkleTreeHinkalByChain[l], r.merkleTreeAccessTokenByChain[l], S, C, r.userKeys, w, _.externalActionId, _.externalAddress, _.externalActionMetadata, r.generateProofRemotely, e, l, void 0, void 0, void 0, b, void 0, void 0, r.getContractWithFetcher(l, t.HinkalHelperContract), x);
+	console.log("[hinkalDeposit] zk proof ready", {
+		zkCallDataLength: T?.length,
+		circomDataLength: Array.isArray(E) ? E.length : void 0,
+		dimDataLength: Array.isArray(D) ? D.length : void 0
+	}), console.log("[hinkalDeposit] calling transactCallDirect");
+	let O = await p(r, l, a, i, T, E, D, y, v, o, c);
+	console.log("[hinkalDeposit] transactCallDirect result", O), console.log("[hinkalDeposit] constructing admin data");
+	let k = u(n.Onboarding, l, d, a, await r.getEthereumAddress());
+	return console.log("[hinkalDeposit] adminData", k), console.log("[hinkalDeposit] emitting public tx data"), m(k), console.log("[hinkalDeposit] complete"), O;
 }, v = async (i, c, l, d, g = !0, _ = !1) => {
 	let v = s(c), y = c.map((e) => e.erc20TokenAddress), [b, x, S] = d.split(",");
 	if (!o(d)) throw Error(r.RECIPIENT_FORMAT_INCORRECT);

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

@@ -1 +1 @@
-require(`../../constants/protocol.constants.cjs`);const e=require(`../../types/ethereum-network.types.cjs`),t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`../../functions/utils/time.utils.cjs`),r=require(`../../functions/utils/token-check.utils.cjs`),i=require(`../../functions/web3/events/getShieldedBalance.cjs`),a=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),o=require(`../../functions/pre-transaction/constructAdminData.cjs`),s=require(`../../functions/pre-transaction/getFeeStructure.cjs`),c=require(`../../functions/pre-transaction/getKycAndSignatureData.cjs`),l=require(`../../functions/pre-transaction/buildCommitmentValidationData.cjs`);require(`../../functions/pre-transaction/index.cjs`);const u=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),d=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),f=require(`../../functions/pre-transaction/getExternalSwapAddress.cjs`),p=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var m=async(e,t,r,o)=>{let s=[...await i.addPaddingToUtxos(e,t,r,o)],c=[],l=n.getCurrentTimeInSeconds().toString();for(let t=0;t<r.length;t+=1){let{outputUtxos:n}=a.outputUtxoProcessing(e.userKeys,s[t],o[t],l);c.push(n)}return{inputUtxosArray:s,outputUtxosArray:c}},h=async(n,i,a,h,g,_,v,y)=>{let b=r.validateAndGetChainId(i),x=i.map(e=>e.erc20TokenAddress),S=await n.getEthereumAddressByChain(b),C=v??await s.getFeeStructure(b,_,x,h,void 0,35n);p.mergeWithFeeStructure(b,x,a,C);let w={externalActionId:h,externalAddress:f.getExternalSwapAddress(b,h),externalActionMetadata:g},[T,{patchAccessTokenMerkleTree:E,signatureData:D},{inputUtxosArray:O,outputUtxosArray:k}]=await Promise.all([n.getRandomRelay(b,!0),c.getKycAndSignatureData(n,b,x,a,S),m(n,b,x,a)]);if(!T)throw Error(t.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let A=`swapperM${a.length.toString()}x${O[0].length}x1`,j=[!1,!0,!1].slice(0,a.length),[{zkCallData:M,circomData:N,dimData:P},F]=await Promise.all([u.constructZkProof(n.merkleTreeHinkalByChain[b],n.merkleTreeAccessTokenByChain[b],O,k,n.userKeys,A,w.externalActionId,w.externalAddress,w.externalActionMetadata,n.generateProofRemotely,T,b,j,void 0,void 0,E,void 0,C,n.getContractWithFetcher(b,e.ContractType.HinkalHelperContract),D),l.buildCommitmentValidationData(b,n.userKeys,x,O)]);return await d.transactCallRelayer(b,M,P,N,F,void 0,void 0,o.constructAdminData(y,b,x,a,S,i))};exports.hinkalSwap=h;
+require(`../../constants/protocol.constants.cjs`);const e=require(`../../types/ethereum-network.types.cjs`),t=require(`../../error-handling/error-codes.constants.cjs`),n=require(`../../functions/utils/time.utils.cjs`),r=require(`../../functions/utils/token-check.utils.cjs`),i=require(`../../functions/web3/events/getShieldedBalance.cjs`),a=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),o=require(`../../functions/pre-transaction/constructAdminData.cjs`),s=require(`../../functions/pre-transaction/getFeeStructure.cjs`),c=require(`../../functions/pre-transaction/getKycAndSignatureData.cjs`),l=require(`../../functions/pre-transaction/buildCommitmentValidationData.cjs`);require(`../../functions/pre-transaction/index.cjs`);const u=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),d=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),f=require(`../../functions/pre-transaction/getExternalSwapAddress.cjs`),p=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var m=async(e,t,r,o)=>{let s=[...await i.addPaddingToUtxos(e,t,r,o)],c=[],l=n.getCurrentTimeInSeconds().toString();for(let t=0;t<r.length;t+=1){let{outputUtxos:n}=a.outputUtxoProcessing(e.userKeys,s[t],o[t],l);c.push(n)}return{inputUtxosArray:s,outputUtxosArray:c}},h=async(n,i,a,h,g,_,v,y)=>{console.log(`[hinkalSwap] start`,{tokenCount:i.length,deltaAmounts:a,externalActionId:h,data:g,feeToken:_,hasFeeStructureOverride:!!v,action:y});let b=r.validateAndGetChainId(i);console.log(`[hinkalSwap] chainId`,b);let x=i.map(e=>e.erc20TokenAddress);console.log(`[hinkalSwap] erc20Addresses`,x);let S=await n.getEthereumAddressByChain(b);console.log(`[hinkalSwap] ethereumAddress`,S),console.log(`[hinkalSwap] resolving fee structure`);let C=v??await s.getFeeStructure(b,_,x,h,void 0,35n);console.log(`[hinkalSwap] feeStructure`,C),p.mergeWithFeeStructure(b,x,a,C),console.log(`[hinkalSwap] deltaAmounts after fee merge`,a);let w=f.getExternalSwapAddress(b,h);console.log(`[hinkalSwap] externalAddress`,w);let T={externalActionId:h,externalAddress:w,externalActionMetadata:g};console.log(`[hinkalSwap] externalActionData`,T),console.log(`[hinkalSwap] loading relay, kyc data, and utxos`);let[E,{patchAccessTokenMerkleTree:D,signatureData:O},{inputUtxosArray:k,outputUtxosArray:A}]=await Promise.all([n.getRandomRelay(b,!0),c.getKycAndSignatureData(n,b,x,a,S),m(n,b,x,a)]);if(console.log(`[hinkalSwap] relay and proof inputs ready`,{relay:E,hasPatchAccessTokenMerkleTree:!!D,hasSignatureData:!!O,inputUtxoGroups:k.length,outputUtxoGroups:A.length,inputUtxoSizes:k.map(e=>e.length),outputUtxoSizes:A.map(e=>e.length)}),!E)throw Error(t.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let j=`swapperM${a.length.toString()}x${k[0].length}x1`;console.log(`[hinkalSwap] circuitName`,j);let M=[!1,!0,!1].slice(0,a.length);console.log(`[hinkalSwap] onChainCreation`,M),console.log(`[hinkalSwap] constructing zk proof and commitment validation data`);let[{zkCallData:N,circomData:P,dimData:F},I]=await Promise.all([u.constructZkProof(n.merkleTreeHinkalByChain[b],n.merkleTreeAccessTokenByChain[b],k,A,n.userKeys,j,T.externalActionId,T.externalAddress,T.externalActionMetadata,n.generateProofRemotely,E,b,M,void 0,void 0,D,void 0,C,n.getContractWithFetcher(b,e.ContractType.HinkalHelperContract),O),l.buildCommitmentValidationData(b,n.userKeys,x,k)]);console.log(`[hinkalSwap] proof data ready`,{zkCallDataLength:N?.length,circomDataLength:Array.isArray(P)?P.length:void 0,dimDataLength:Array.isArray(F)?F.length:void 0,commitmentValidationData:I});let L=o.constructAdminData(y,b,x,a,S,i);console.log(`[hinkalSwap] adminData`,L),console.log(`[hinkalSwap] calling transactCallRelayer`);let R=await d.transactCallRelayer(b,N,F,P,I,void 0,void 0,L);return console.log(`[hinkalSwap] txHash`,R),R};exports.hinkalSwap=h;

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

@@ -26,24 +26,64 @@ var m = async (e, t, r, o) => {
 		outputUtxosArray: c
 	};
 }, h = async (n, i, a, h, g, _, v, y) => {
-	let b = r(i), x = i.map((e) => e.erc20TokenAddress), S = await n.getEthereumAddressByChain(b), C = v ?? await s(b, _, x, h, void 0, 35n);
-	p(b, x, a, C);
-	let w = {
+	console.log("[hinkalSwap] start", {
+		tokenCount: i.length,
+		deltaAmounts: a,
 		externalActionId: h,
-		externalAddress: f(b, h),
+		data: g,
+		feeToken: _,
+		hasFeeStructureOverride: !!v,
+		action: y
+	});
+	let b = r(i);
+	console.log("[hinkalSwap] chainId", b);
+	let x = i.map((e) => e.erc20TokenAddress);
+	console.log("[hinkalSwap] erc20Addresses", x);
+	let S = await n.getEthereumAddressByChain(b);
+	console.log("[hinkalSwap] ethereumAddress", S), console.log("[hinkalSwap] resolving fee structure");
+	let C = v ?? await s(b, _, x, h, void 0, 35n);
+	console.log("[hinkalSwap] feeStructure", C), p(b, x, a, C), console.log("[hinkalSwap] deltaAmounts after fee merge", a);
+	let w = f(b, h);
+	console.log("[hinkalSwap] externalAddress", w);
+	let T = {
+		externalActionId: h,
+		externalAddress: w,
 		externalActionMetadata: g
-	}, [T, { patchAccessTokenMerkleTree: E, signatureData: D }, { inputUtxosArray: O, outputUtxosArray: k }] = await Promise.all([
+	};
+	console.log("[hinkalSwap] externalActionData", T), console.log("[hinkalSwap] loading relay, kyc data, and utxos");
+	let [E, { patchAccessTokenMerkleTree: D, signatureData: O }, { inputUtxosArray: k, outputUtxosArray: A }] = await Promise.all([
 		n.getRandomRelay(b, !0),
 		c(n, b, x, a, S),
 		m(n, b, x, a)
 	]);
-	if (!T) throw Error(t.RELAYER_NOT_AVAILABLE);
-	let A = `swapperM${a.length.toString()}x${O[0].length}x1`, j = [
+	if (console.log("[hinkalSwap] relay and proof inputs ready", {
+		relay: E,
+		hasPatchAccessTokenMerkleTree: !!D,
+		hasSignatureData: !!O,
+		inputUtxoGroups: k.length,
+		outputUtxoGroups: A.length,
+		inputUtxoSizes: k.map((e) => e.length),
+		outputUtxoSizes: A.map((e) => e.length)
+	}), !E) throw Error(t.RELAYER_NOT_AVAILABLE);
+	let j = `swapperM${a.length.toString()}x${k[0].length}x1`;
+	console.log("[hinkalSwap] circuitName", j);
+	let M = [
 		!1,
 		!0,
 		!1
-	].slice(0, a.length), [{ zkCallData: M, circomData: N, dimData: P }, F] = await Promise.all([u(n.merkleTreeHinkalByChain[b], n.merkleTreeAccessTokenByChain[b], O, k, n.userKeys, A, w.externalActionId, w.externalAddress, w.externalActionMetadata, n.generateProofRemotely, T, b, j, void 0, void 0, E, void 0, C, n.getContractWithFetcher(b, e.HinkalHelperContract), D), l(b, n.userKeys, x, O)]);
-	return await d(b, M, P, N, F, void 0, void 0, o(y, b, x, a, S, i));
+	].slice(0, a.length);
+	console.log("[hinkalSwap] onChainCreation", M), console.log("[hinkalSwap] constructing zk proof and commitment validation data");
+	let [{ zkCallData: N, circomData: P, dimData: F }, I] = await Promise.all([u(n.merkleTreeHinkalByChain[b], n.merkleTreeAccessTokenByChain[b], k, A, n.userKeys, j, T.externalActionId, T.externalAddress, T.externalActionMetadata, n.generateProofRemotely, E, b, M, void 0, void 0, D, void 0, C, n.getContractWithFetcher(b, e.HinkalHelperContract), O), l(b, n.userKeys, x, k)]);
+	console.log("[hinkalSwap] proof data ready", {
+		zkCallDataLength: N?.length,
+		circomDataLength: Array.isArray(P) ? P.length : void 0,
+		dimDataLength: Array.isArray(F) ? F.length : void 0,
+		commitmentValidationData: I
+	});
+	let L = o(y, b, x, a, S, i);
+	console.log("[hinkalSwap] adminData", L), console.log("[hinkalSwap] calling transactCallRelayer");
+	let R = await d(b, N, F, P, I, void 0, void 0, L);
+	return console.log("[hinkalSwap] txHash", R), R;
 };
 //#endregion
 export { h as hinkalSwap };

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

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../types/ethereum-network.types.cjs`),r=require(`../../types/external-action.types.cjs`);require(`../../types/index.cjs`);const i=require(`../../error-handling/error-codes.constants.cjs`),a=require(`../../functions/utils/time.utils.cjs`),o=require(`../../functions/utils/addresses.cjs`),s=require(`../../functions/utils/tron.utils.cjs`),c=require(`../../functions/utils/token-check.utils.cjs`),l=require(`../../functions/web3/events/getShieldedBalance.cjs`),u=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),d=require(`../../functions/utils/fees.utils.cjs`),f=require(`../../functions/pre-transaction/getVolatileTransferAmount.cjs`),p=require(`../../functions/pre-transaction/constructAdminData.cjs`),m=require(`../../functions/pre-transaction/getFeeStructure.cjs`),h=require(`../../functions/pre-transaction/getKycAndSignatureData.cjs`),g=require(`../../functions/pre-transaction/buildCommitmentValidationData.cjs`);require(`../../functions/pre-transaction/index.cjs`);const _=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),v=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),y=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var b=async(e,t,n,r,i,o)=>{let s=[...await l.addPaddingToUtxos(e,t,n,r)],c=[],d=a.getCurrentTimeInSeconds().toString();for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=u.outputUtxoProcessing(e.userKeys,s[t],r[t],d,void 0,!0,i,t===0?o:0n);c.push(n)}return{inputUtxosArray:s,outputUtxosArray:c}},x=async(a,l,u,x,S,C,w)=>{let T=c.validateAndGetChainId(l),E=e.isTronLike(T);if(!o.isValidPrivateAddress(x))throw Error(i.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);let D=s.addressToHexFormat(await a.getEthereumAddressByChain(T)),O=l.map(e=>e.erc20TokenAddress),k=await f.modifyVolatileTokenAmountChanges(T,l,u),A=C??await m.getFeeStructure(T,S,O,r.ExternalActionId.Transact,[],5n);A.variableRate||=t.HINKAL_PRIVATE_SEND_VARIABLE_RATE;let j=d.calculateTotalFee(-k[0],A),M=-k[0],N={feeToken:A.feeToken,flatFee:j,variableRate:0n};if(y.mergeWithFeeStructure(T,O,k,N),!l[0])throw Error(`Transfer Action: No Token Found`);let[P,{patchAccessTokenMerkleTree:F,signatureData:I},{inputUtxosArray:L,outputUtxosArray:R}]=await Promise.all([a.getRandomRelay(T,!0),h.getKycAndSignatureData(a,T,O,k,D),b(a,T,O,k,x,M)]);if(!P)throw Error(i.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let z={externalActionId:0n,externalAddress:P,externalActionMetadata:`0x00`},B=`swapperM${k.length}x${L[0].length}x2`,[{zkCallData:V,circomData:H,dimData:U},W]=await Promise.all([_.constructZkProof(a.merkleTreeHinkalByChain[T],a.merkleTreeAccessTokenByChain[T],L,R,a.userKeys,B,z.externalActionId,z.externalAddress,z.externalActionMetadata,a.generateProofRemotely,P,T,void 0,void 0,void 0,F,void 0,N,a.getContractWithFetcher(T,n.ContractType.HinkalHelperContract),I),g.buildCommitmentValidationData(T,a.userKeys,O,L)]),G=await s.reorderZkCallData(E,V,U,H);return await v.transactCallRelayer(T,V,U,H,W,void 0,void 0,p.constructAdminData(w,T,O,k,D),G)};exports.hinkalTransfer=x;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../types/ethereum-network.types.cjs`),r=require(`../../types/external-action.types.cjs`);require(`../../types/index.cjs`);const i=require(`../../error-handling/error-codes.constants.cjs`),a=require(`../../functions/utils/time.utils.cjs`),o=require(`../../functions/utils/addresses.cjs`),s=require(`../../functions/utils/tron.utils.cjs`),c=require(`../../functions/utils/token-check.utils.cjs`),l=require(`../../functions/web3/events/getShieldedBalance.cjs`),u=require(`../../functions/pre-transaction/outputUtxoProcessing.cjs`),d=require(`../../functions/utils/fees.utils.cjs`),f=require(`../../functions/pre-transaction/getVolatileTransferAmount.cjs`),p=require(`../../functions/pre-transaction/constructAdminData.cjs`),m=require(`../../functions/pre-transaction/getFeeStructure.cjs`),h=require(`../../functions/pre-transaction/getKycAndSignatureData.cjs`),g=require(`../../functions/pre-transaction/buildCommitmentValidationData.cjs`);require(`../../functions/pre-transaction/index.cjs`);const _=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),v=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),y=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var b=async(e,t,n,r,i,o)=>{let s=[...await l.addPaddingToUtxos(e,t,n,r)],c=[],d=a.getCurrentTimeInSeconds().toString();for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=u.outputUtxoProcessing(e.userKeys,s[t],r[t],d,void 0,!0,i,t===0?o:0n);c.push(n)}return{inputUtxosArray:s,outputUtxosArray:c}},x=async(a,l,u,x,S,C,w)=>{console.log(`[hinkalTransfer] start`,{tokenCount:l.length,amountChangesBase:u,recipientAddress:x,feeToken:S,hasFeeStructureOverride:!!C,action:w});let T=c.validateAndGetChainId(l);console.log(`[hinkalTransfer] chainId`,T);let E=e.isTronLike(T);if(console.log(`[hinkalTransfer] isTron`,E),!o.isValidPrivateAddress(x))throw console.log(`[hinkalTransfer] invalid recipientAddress`,x),Error(i.transactionErrorCodes.RECIPIENT_FORMAT_INCORRECT);console.log(`[hinkalTransfer] recipientAddress validated`);let D=s.addressToHexFormat(await a.getEthereumAddressByChain(T));console.log(`[hinkalTransfer] ethereumAddress`,D);let O=l.map(e=>e.erc20TokenAddress);console.log(`[hinkalTransfer] erc20Addresses`,O);let k=await f.modifyVolatileTokenAmountChanges(T,l,u);console.log(`[hinkalTransfer] amountChanges`,k),console.log(`[hinkalTransfer] resolving fee structure`);let A=C??await m.getFeeStructure(T,S,O,r.ExternalActionId.Transact,[],5n);console.log(`[hinkalTransfer] feeStructure initial`,A),A.variableRate||=t.HINKAL_PRIVATE_SEND_VARIABLE_RATE,console.log(`[hinkalTransfer] feeStructure normalized`,A);let j=d.calculateTotalFee(-k[0],A);console.log(`[hinkalTransfer] totalFee`,j);let M=-k[0];console.log(`[hinkalTransfer] recipientAmount`,M);let N={feeToken:A.feeToken,flatFee:j,variableRate:0n};console.log(`[hinkalTransfer] transferFeeStructure`,N),y.mergeWithFeeStructure(T,O,k,N),console.log(`[hinkalTransfer] amountChanges after fee merge`,k);let P=l[0];if(console.log(`[hinkalTransfer] primary token`,P),!P)throw Error(`Transfer Action: No Token Found`);console.log(`[hinkalTransfer] loading relay, kyc data, and utxos`);let[F,{patchAccessTokenMerkleTree:I,signatureData:L},{inputUtxosArray:R,outputUtxosArray:z}]=await Promise.all([a.getRandomRelay(T,!0),h.getKycAndSignatureData(a,T,O,k,D),b(a,T,O,k,x,M)]);if(console.log(`[hinkalTransfer] relay and proof inputs ready`,{relay:F,hasPatchAccessTokenMerkleTree:!!I,hasSignatureData:!!L,inputUtxoGroups:R.length,outputUtxoGroups:z.length,inputUtxoSizes:R.map(e=>e.length),outputUtxoSizes:z.map(e=>e.length)}),!F)throw Error(i.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let B={externalActionId:0n,externalAddress:F,externalActionMetadata:`0x00`};console.log(`[hinkalTransfer] externalActionData`,B);let V=`swapperM${k.length}x${R[0].length}x2`;console.log(`[hinkalTransfer] circuitName`,V),console.log(`[hinkalTransfer] constructing zk proof and commitment validation data`);let[{zkCallData:H,circomData:U,dimData:W},G]=await Promise.all([_.constructZkProof(a.merkleTreeHinkalByChain[T],a.merkleTreeAccessTokenByChain[T],R,z,a.userKeys,V,B.externalActionId,B.externalAddress,B.externalActionMetadata,a.generateProofRemotely,F,T,void 0,void 0,void 0,I,void 0,N,a.getContractWithFetcher(T,n.ContractType.HinkalHelperContract),L),g.buildCommitmentValidationData(T,a.userKeys,O,R)]);console.log(`[hinkalTransfer] proof data ready`,{zkCallDataLength:H?.length,circomDataLength:Array.isArray(U)?U.length:void 0,dimDataLength:Array.isArray(W)?W.length:void 0,commitmentValidationData:G});let K=await s.reorderZkCallData(E,H,W,U);console.log(`[hinkalTransfer] tronProofSignature`,K);let q=p.constructAdminData(w,T,O,k,D);console.log(`[hinkalTransfer] adminData`,q),console.log(`[hinkalTransfer] calling transactCallRelayer`);let J=await v.transactCallRelayer(T,H,W,U,G,void 0,void 0,q,K);return console.log(`[hinkalTransfer] txHash`,J),J};exports.hinkalTransfer=x;

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

@@ -32,28 +32,75 @@ var x = async (e, t, n, r, i, o) => {
 		outputUtxosArray: c
 	};
 }, S = async (a, u, d, S, C, w, T) => {
-	let E = l(u), D = e(E);
-	if (!o(S)) throw Error(i.RECIPIENT_FORMAT_INCORRECT);
-	let O = s(await a.getEthereumAddressByChain(E)), k = u.map((e) => e.erc20TokenAddress), A = await p(E, u, d), j = w ?? await h(E, C, k, r.Transact, [], 5n);
-	j.variableRate ||= t;
-	let M = f(-A[0], j), N = -A[0], P = {
+	console.log("[hinkalTransfer] start", {
+		tokenCount: u.length,
+		amountChangesBase: d,
+		recipientAddress: S,
+		feeToken: C,
+		hasFeeStructureOverride: !!w,
+		action: T
+	});
+	let E = l(u);
+	console.log("[hinkalTransfer] chainId", E);
+	let D = e(E);
+	if (console.log("[hinkalTransfer] isTron", D), !o(S)) throw console.log("[hinkalTransfer] invalid recipientAddress", S), Error(i.RECIPIENT_FORMAT_INCORRECT);
+	console.log("[hinkalTransfer] recipientAddress validated");
+	let O = s(await a.getEthereumAddressByChain(E));
+	console.log("[hinkalTransfer] ethereumAddress", O);
+	let k = u.map((e) => e.erc20TokenAddress);
+	console.log("[hinkalTransfer] erc20Addresses", k);
+	let A = await p(E, u, d);
+	console.log("[hinkalTransfer] amountChanges", A), console.log("[hinkalTransfer] resolving fee structure");
+	let j = w ?? await h(E, C, k, r.Transact, [], 5n);
+	console.log("[hinkalTransfer] feeStructure initial", j), j.variableRate ||= t, console.log("[hinkalTransfer] feeStructure normalized", j);
+	let M = f(-A[0], j);
+	console.log("[hinkalTransfer] totalFee", M);
+	let N = -A[0];
+	console.log("[hinkalTransfer] recipientAmount", N);
+	let P = {
 		feeToken: j.feeToken,
 		flatFee: M,
 		variableRate: 0n
 	};
-	if (b(E, k, A, P), !u[0]) throw Error("Transfer Action: No Token Found");
-	let [F, { patchAccessTokenMerkleTree: I, signatureData: L }, { inputUtxosArray: R, outputUtxosArray: z }] = await Promise.all([
+	console.log("[hinkalTransfer] transferFeeStructure", P), b(E, k, A, P), console.log("[hinkalTransfer] amountChanges after fee merge", A);
+	let F = u[0];
+	if (console.log("[hinkalTransfer] primary token", F), !F) throw Error("Transfer Action: No Token Found");
+	console.log("[hinkalTransfer] loading relay, kyc data, and utxos");
+	let [I, { patchAccessTokenMerkleTree: L, signatureData: R }, { inputUtxosArray: z, outputUtxosArray: B }] = await Promise.all([
 		a.getRandomRelay(E, !0),
 		g(a, E, k, A, O),
 		x(a, E, k, A, S, N)
 	]);
-	if (!F) throw Error(i.RELAYER_NOT_AVAILABLE);
-	let B = {
+	if (console.log("[hinkalTransfer] relay and proof inputs ready", {
+		relay: I,
+		hasPatchAccessTokenMerkleTree: !!L,
+		hasSignatureData: !!R,
+		inputUtxoGroups: z.length,
+		outputUtxoGroups: B.length,
+		inputUtxoSizes: z.map((e) => e.length),
+		outputUtxoSizes: B.map((e) => e.length)
+	}), !I) throw Error(i.RELAYER_NOT_AVAILABLE);
+	let V = {
 		externalActionId: 0n,
-		externalAddress: F,
+		externalAddress: I,
 		externalActionMetadata: "0x00"
-	}, V = `swapperM${A.length}x${R[0].length}x2`, [{ zkCallData: H, circomData: U, dimData: W }, G] = await Promise.all([v(a.merkleTreeHinkalByChain[E], a.merkleTreeAccessTokenByChain[E], R, z, a.userKeys, V, B.externalActionId, B.externalAddress, B.externalActionMetadata, a.generateProofRemotely, F, E, void 0, void 0, void 0, I, void 0, P, a.getContractWithFetcher(E, n.HinkalHelperContract), L), _(E, a.userKeys, k, R)]), K = await c(D, H, W, U);
-	return await y(E, H, W, U, G, void 0, void 0, m(T, E, k, A, O), K);
+	};
+	console.log("[hinkalTransfer] externalActionData", V);
+	let H = `swapperM${A.length}x${z[0].length}x2`;
+	console.log("[hinkalTransfer] circuitName", H), console.log("[hinkalTransfer] constructing zk proof and commitment validation data");
+	let [{ zkCallData: U, circomData: W, dimData: G }, K] = await Promise.all([v(a.merkleTreeHinkalByChain[E], a.merkleTreeAccessTokenByChain[E], z, B, a.userKeys, H, V.externalActionId, V.externalAddress, V.externalActionMetadata, a.generateProofRemotely, I, E, void 0, void 0, void 0, L, void 0, P, a.getContractWithFetcher(E, n.HinkalHelperContract), R), _(E, a.userKeys, k, z)]);
+	console.log("[hinkalTransfer] proof data ready", {
+		zkCallDataLength: U?.length,
+		circomDataLength: Array.isArray(W) ? W.length : void 0,
+		dimDataLength: Array.isArray(G) ? G.length : void 0,
+		commitmentValidationData: K
+	});
+	let q = await c(D, U, G, W);
+	console.log("[hinkalTransfer] tronProofSignature", q);
+	let J = m(T, E, k, A, O);
+	console.log("[hinkalTransfer] adminData", J), console.log("[hinkalTransfer] calling transactCallRelayer");
+	let Y = await y(E, U, G, W, K, void 0, void 0, J, q);
+	return console.log("[hinkalTransfer] txHash", Y), Y;
 };
 //#endregion
 export { S as hinkalTransfer };

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/ethereum-network.types.cjs`),r=require(`../../types/external-action.types.cjs`);require(`../../types/index.cjs`);const i=require(`../../error-handling/error-codes.constants.cjs`),a=require(`../../functions/utils/time.utils.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/utils/fees.utils.cjs`),d=require(`../../functions/pre-transaction/getVolatileTransferAmount.cjs`),f=require(`../../functions/pre-transaction/constructAdminData.cjs`),p=require(`../../functions/pre-transaction/getFeeStructure.cjs`),m=require(`../../functions/pre-transaction/getKycAndSignatureData.cjs`),h=require(`../../functions/pre-transaction/buildCommitmentValidationData.cjs`);require(`../../functions/pre-transaction/index.cjs`);const g=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),_=require(`../../functions/web3/functionCalls/transactCallDirect.cjs`),v=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),y=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var b=async(e,t,n,r)=>{let i=[...await c.addPaddingToUtxos(e,t,n,r)],o=[],s=a.getCurrentTimeInSeconds().toString();for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=l.outputUtxoProcessing(e.userKeys,i[t],r[t],s);o.push(n)}return{inputUtxosArray:i,outputUtxosArray:o}},x=async(a,c,l,x,S,C,w,T)=>{let E=s.validateAndGetChainId(c),D=e.isTronLike(E),O=o.addressToHexFormat(await a.getEthereumAddressByChain(E)),k=c.map(e=>e.erc20TokenAddress),A=await d.modifyVolatileTokenAmountChanges(E,c,l),j;if(!S){let e=w??await p.getFeeStructure(E,C,k,r.ExternalActionId.Transact),t=u.calculateTotalFee(-A[0],e);j={feeToken:e.feeToken,flatFee:t,variableRate:0n},y.mergeWithFeeStructure(E,k,A,j)}let M=c[0];if(!M)throw Error(`Deposit Action: No Token Found`);let N={externalActionId:0n,externalAddress:o.addressToHexFormat(x),externalActionMetadata:`0x00`},[P,{patchAccessTokenMerkleTree:F,signatureData:I},{inputUtxosArray:L,outputUtxosArray:R}]=await Promise.all([a.getRandomRelay(E,!0),m.getKycAndSignatureData(a,E,k,A,O),b(a,E,k,A)]);if(!S&&!P)throw Error(i.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let z=`swapperM${A.length.toString()}x${L[0].length}x1`,[{zkCallData:B,circomData:V,dimData:H},U]=await Promise.all([g.constructZkProof(a.merkleTreeHinkalByChain[E],a.merkleTreeAccessTokenByChain[E],L,R,a.userKeys,z,N.externalActionId,N.externalAddress,N.externalActionMetadata,a.generateProofRemotely,S?t.zeroAddress:P,E,void 0,void 0,void 0,F,void 0,j,a.getContractWithFetcher(E,n.ContractType.HinkalHelperContract),I,S?O:void 0),h.buildCommitmentValidationData(E,a.userKeys,k,L)]),W=await o.reorderZkCallData(D,B,H,V);if(S){if(!M)throw Error(`Withdraw Action: No Token Found`);return await _.transactCallDirect(a,E,A[0],M,B,V,H)}return await v.transactCallRelayer(E,B,H,V,U,void 0,void 0,f.constructAdminData(T,E,k,A,O),W)};exports.hinkalWithdraw=x;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`),n=require(`../../types/ethereum-network.types.cjs`),r=require(`../../types/external-action.types.cjs`);require(`../../types/index.cjs`);const i=require(`../../error-handling/error-codes.constants.cjs`),a=require(`../../functions/utils/time.utils.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/utils/fees.utils.cjs`),d=require(`../../functions/pre-transaction/getVolatileTransferAmount.cjs`),f=require(`../../functions/pre-transaction/constructAdminData.cjs`),p=require(`../../functions/pre-transaction/getFeeStructure.cjs`),m=require(`../../functions/pre-transaction/getKycAndSignatureData.cjs`),h=require(`../../functions/pre-transaction/buildCommitmentValidationData.cjs`);require(`../../functions/pre-transaction/index.cjs`);const g=require(`../../functions/snarkjs/constructGeneralZkProof.cjs`),_=require(`../../functions/web3/functionCalls/transactCallDirect.cjs`),v=require(`../../functions/web3/functionCalls/transactCallRelayer.cjs`),y=require(`../../functions/pre-transaction/merge-with-fee-structure.cjs`);var b=async(e,t,n,r)=>{let i=[...await c.addPaddingToUtxos(e,t,n,r)],o=[],s=a.getCurrentTimeInSeconds().toString();for(let t=0;t<n.length;t+=1){let{outputUtxos:n}=l.outputUtxoProcessing(e.userKeys,i[t],r[t],s);o.push(n)}return{inputUtxosArray:i,outputUtxosArray:o}},x=async(a,c,l,x,S,C,w,T)=>{console.log(`[hinkalWithdraw] start`,{tokenCount:c.length,deltaAmountsBase:l,recipientAddress:x,isRelayerOff:S,feeToken:C,hasFeeStructureOverride:!!w,action:T});let E=s.validateAndGetChainId(c);console.log(`[hinkalWithdraw] chainId`,E);let D=e.isTronLike(E);console.log(`[hinkalWithdraw] isTron`,D);let O=o.addressToHexFormat(await a.getEthereumAddressByChain(E));console.log(`[hinkalWithdraw] ethereumAddress`,O);let k=c.map(e=>e.erc20TokenAddress);console.log(`[hinkalWithdraw] erc20Addresses`,k);let A=await d.modifyVolatileTokenAmountChanges(E,c,l);console.log(`[hinkalWithdraw] deltaAmounts`,A);let j;if(console.log(`[hinkalWithdraw] feeStructure initialized as undefined`),!S){console.log(`[hinkalWithdraw] resolving relayer fee structure`);let e=w??await p.getFeeStructure(E,C,k,r.ExternalActionId.Transact);console.log(`[hinkalWithdraw] rawFeeStructure`,e);let t=u.calculateTotalFee(-A[0],e);console.log(`[hinkalWithdraw] totalFee`,t),j={feeToken:e.feeToken,flatFee:t,variableRate:0n},console.log(`[hinkalWithdraw] feeStructure`,j),y.mergeWithFeeStructure(E,k,A,j),console.log(`[hinkalWithdraw] deltaAmounts after fee merge`,A)}let M=c[0];if(console.log(`[hinkalWithdraw] primary token`,M),!M)throw Error(`Deposit Action: No Token Found`);let N={externalActionId:0n,externalAddress:o.addressToHexFormat(x),externalActionMetadata:`0x00`};console.log(`[hinkalWithdraw] externalActionData`,N),console.log(`[hinkalWithdraw] loading relay, kyc data, and utxos`);let[P,{patchAccessTokenMerkleTree:F,signatureData:I},{inputUtxosArray:L,outputUtxosArray:R}]=await Promise.all([a.getRandomRelay(E,!0),m.getKycAndSignatureData(a,E,k,A,O),b(a,E,k,A)]);if(console.log(`[hinkalWithdraw] relay and proof inputs ready`,{relay:P,hasPatchAccessTokenMerkleTree:!!F,hasSignatureData:!!I,inputUtxoGroups:L.length,outputUtxoGroups:R.length,inputUtxoSizes:L.map(e=>e.length),outputUtxoSizes:R.map(e=>e.length)}),!S&&!P)throw Error(i.transactionErrorCodes.RELAYER_NOT_AVAILABLE);let z=`swapperM${A.length.toString()}x${L[0].length}x1`;console.log(`[hinkalWithdraw] circuitName`,z),console.log(`[hinkalWithdraw] constructing zk proof and commitment validation data`);let[{zkCallData:B,circomData:V,dimData:H},U]=await Promise.all([g.constructZkProof(a.merkleTreeHinkalByChain[E],a.merkleTreeAccessTokenByChain[E],L,R,a.userKeys,z,N.externalActionId,N.externalAddress,N.externalActionMetadata,a.generateProofRemotely,S?t.zeroAddress:P,E,void 0,void 0,void 0,F,void 0,j,a.getContractWithFetcher(E,n.ContractType.HinkalHelperContract),I,S?O:void 0),h.buildCommitmentValidationData(E,a.userKeys,k,L)]);console.log(`[hinkalWithdraw] proof data ready`,{zkCallDataLength:B?.length,circomDataLength:Array.isArray(V)?V.length:void 0,dimDataLength:Array.isArray(H)?H.length:void 0,commitmentValidationData:U});let W=await o.reorderZkCallData(D,B,H,V);if(console.log(`[hinkalWithdraw] tronProofSignature`,W),S){if(console.log(`[hinkalWithdraw] relayer disabled, using direct transaction path`),!M)throw Error(`Withdraw Action: No Token Found`);let e=await _.transactCallDirect(a,E,A[0],M,B,V,H);return console.log(`[hinkalWithdraw] direct transaction result`,e),e}let G=f.constructAdminData(T,E,k,A,O);console.log(`[hinkalWithdraw] adminData`,G),console.log(`[hinkalWithdraw] calling transactCallRelayer`);let K=await v.transactCallRelayer(E,B,H,V,U,void 0,void 0,G,W);return console.log(`[hinkalWithdraw] txHash`,K),K};exports.hinkalWithdraw=x;

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

@@ -32,33 +32,78 @@ var x = async (e, t, n, r) => {
 		outputUtxosArray: o
 	};
 }, S = async (a, l, u, S, C, w, T, E) => {
-	let D = c(l), O = e(D), k = o(await a.getEthereumAddressByChain(D)), A = l.map((e) => e.erc20TokenAddress), j = await f(D, l, u), M;
-	if (!C) {
-		let e = T ?? await m(D, w, A, r.Transact), t = d(-j[0], e);
-		M = {
+	console.log("[hinkalWithdraw] start", {
+		tokenCount: l.length,
+		deltaAmountsBase: u,
+		recipientAddress: S,
+		isRelayerOff: C,
+		feeToken: w,
+		hasFeeStructureOverride: !!T,
+		action: E
+	});
+	let D = c(l);
+	console.log("[hinkalWithdraw] chainId", D);
+	let O = e(D);
+	console.log("[hinkalWithdraw] isTron", O);
+	let k = o(await a.getEthereumAddressByChain(D));
+	console.log("[hinkalWithdraw] ethereumAddress", k);
+	let A = l.map((e) => e.erc20TokenAddress);
+	console.log("[hinkalWithdraw] erc20Addresses", A);
+	let j = await f(D, l, u);
+	console.log("[hinkalWithdraw] deltaAmounts", j);
+	let M;
+	if (console.log("[hinkalWithdraw] feeStructure initialized as undefined"), !C) {
+		console.log("[hinkalWithdraw] resolving relayer fee structure");
+		let e = T ?? await m(D, w, A, r.Transact);
+		console.log("[hinkalWithdraw] rawFeeStructure", e);
+		let t = d(-j[0], e);
+		console.log("[hinkalWithdraw] totalFee", t), M = {
 			feeToken: e.feeToken,
 			flatFee: t,
 			variableRate: 0n
-		}, b(D, A, j, M);
+		}, console.log("[hinkalWithdraw] feeStructure", M), b(D, A, j, M), console.log("[hinkalWithdraw] deltaAmounts after fee merge", j);
 	}
 	let N = l[0];
-	if (!N) throw Error("Deposit Action: No Token Found");
+	if (console.log("[hinkalWithdraw] primary token", N), !N) throw Error("Deposit Action: No Token Found");
 	let P = {
 		externalActionId: 0n,
 		externalAddress: o(S),
 		externalActionMetadata: "0x00"
-	}, [F, { patchAccessTokenMerkleTree: I, signatureData: L }, { inputUtxosArray: R, outputUtxosArray: z }] = await Promise.all([
+	};
+	console.log("[hinkalWithdraw] externalActionData", P), console.log("[hinkalWithdraw] loading relay, kyc data, and utxos");
+	let [F, { patchAccessTokenMerkleTree: I, signatureData: L }, { inputUtxosArray: R, outputUtxosArray: z }] = await Promise.all([
 		a.getRandomRelay(D, !0),
 		h(a, D, A, j, k),
 		x(a, D, A, j)
 	]);
-	if (!C && !F) throw Error(i.RELAYER_NOT_AVAILABLE);
-	let B = `swapperM${j.length.toString()}x${R[0].length}x1`, [{ zkCallData: V, circomData: H, dimData: U }, W] = await Promise.all([_(a.merkleTreeHinkalByChain[D], a.merkleTreeAccessTokenByChain[D], R, z, a.userKeys, B, P.externalActionId, P.externalAddress, P.externalActionMetadata, a.generateProofRemotely, C ? t : F, D, void 0, void 0, void 0, I, void 0, M, a.getContractWithFetcher(D, n.HinkalHelperContract), L, C ? k : void 0), g(D, a.userKeys, A, R)]), G = await s(O, V, U, H);
-	if (C) {
-		if (!N) throw Error("Withdraw Action: No Token Found");
-		return await v(a, D, j[0], N, V, H, U);
+	if (console.log("[hinkalWithdraw] relay and proof inputs ready", {
+		relay: F,
+		hasPatchAccessTokenMerkleTree: !!I,
+		hasSignatureData: !!L,
+		inputUtxoGroups: R.length,
+		outputUtxoGroups: z.length,
+		inputUtxoSizes: R.map((e) => e.length),
+		outputUtxoSizes: z.map((e) => e.length)
+	}), !C && !F) throw Error(i.RELAYER_NOT_AVAILABLE);
+	let B = `swapperM${j.length.toString()}x${R[0].length}x1`;
+	console.log("[hinkalWithdraw] circuitName", B), console.log("[hinkalWithdraw] constructing zk proof and commitment validation data");
+	let [{ zkCallData: V, circomData: H, dimData: U }, W] = await Promise.all([_(a.merkleTreeHinkalByChain[D], a.merkleTreeAccessTokenByChain[D], R, z, a.userKeys, B, P.externalActionId, P.externalAddress, P.externalActionMetadata, a.generateProofRemotely, C ? t : F, D, void 0, void 0, void 0, I, void 0, M, a.getContractWithFetcher(D, n.HinkalHelperContract), L, C ? k : void 0), g(D, a.userKeys, A, R)]);
+	console.log("[hinkalWithdraw] proof data ready", {
+		zkCallDataLength: V?.length,
+		circomDataLength: Array.isArray(H) ? H.length : void 0,
+		dimDataLength: Array.isArray(U) ? U.length : void 0,
+		commitmentValidationData: W
+	});
+	let G = await s(O, V, U, H);
+	if (console.log("[hinkalWithdraw] tronProofSignature", G), C) {
+		if (console.log("[hinkalWithdraw] relayer disabled, using direct transaction path"), !N) throw Error("Withdraw Action: No Token Found");
+		let e = await v(a, D, j[0], N, V, H, U);
+		return console.log("[hinkalWithdraw] direct transaction result", e), e;
 	}
-	return await y(D, V, U, H, W, void 0, void 0, p(E, D, A, j, k), G);
+	let K = p(E, D, A, j, k);
+	console.log("[hinkalWithdraw] adminData", K), console.log("[hinkalWithdraw] calling transactCallRelayer");
+	let q = await y(D, V, U, H, W, void 0, void 0, K, G);
+	return console.log("[hinkalWithdraw] txHash", q), q;
 };
 //#endregion
 export { S as hinkalWithdraw };

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

@@ -1 +1 @@
-const e=require(`../constants/vite.constants.cjs`),t=require(`./logError.cjs`);var n=class{static log(...t){e.isNotClientProduction&&console.log(...t)}static logObject(t){e.isNotClientProduction&&console.dir(t,{depth:null,colors:!0})}static error(...e){t.logError(e)}};exports.Logger=n;
+const e=require(`./logError.cjs`);var t=class{static log(...e){}static logObject(e){}static error(...t){e.logError(t)}};exports.Logger=t;

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

@@ -1,19 +1,11 @@
-import { isNotClientProduction as e } from "../constants/vite.constants.mjs";
-import { logError as t } from "./logError.mjs";
+import { logError as e } from "./logError.mjs";
 //#region libs/shared/common/src/error-handling/logger.ts
-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);
+var t = class {
+	static log(...e) {}
+	static logObject(e) {}
+	static error(...t) {
+		e(t);
 	}
 };
 //#endregion
-export { n as Logger };
+export { t as Logger };

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

@@ -1 +1 @@
-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;
+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;