@kapa123456789/sdk 0.0.81 → 0.0.82

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

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

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

@@ -1 +1 @@
-const e=require(`../pre-transaction/buildCommitmentValidationData.cjs`);require(`../pre-transaction/index.cjs`);const t=require(`./generateZkProof.cjs`);var n=async(n,r,i,a,o,s,c)=>{let l=await e.buildCommitmentValidationData(n,r,i,a),u=[o],d=[s];l&&(u.push(l.verifierName),d.push(l.commitmentInput));let f=await t.generateZkProof(n,u,d,c),{zkCallData:p,publicSignals:m}=f[0];return{zkCallData:p,publicSignals:m,commitmentValidationData:e.buildCommitmentValidationDataFromProof(l,f[1])}};exports.generateMainAndCommitmentZkProof=n;
+const e=require(`../pre-transaction/buildCommitmentValidationData.cjs`);require(`../pre-transaction/index.cjs`);const t=require(`./generateZkProof.cjs`);var n=async(n,r,i,a,o,s,c)=>{console.log(`[generateMainAndCommitmentZkProof] start`,{chainId:n,mainVerifierName:o});try{console.log(`[generateMainAndCommitmentZkProof] buildCommitmentValidationData`);let l=await e.buildCommitmentValidationData(n,r,i,a),u=[o],d=[s];l&&(u.push(l.verifierName),d.push(l.commitmentInput)),console.log(`[generateMainAndCommitmentZkProof] generateZkProof`);let f=await t.generateZkProof(n,u,d,c),{zkCallData:p,publicSignals:m}=f[0],h=e.buildCommitmentValidationDataFromProof(l,f[1]);return console.log(`[generateMainAndCommitmentZkProof] success`),{zkCallData:p,publicSignals:m,commitmentValidationData:h}}catch(e){throw console.log(`[generateMainAndCommitmentZkProof] error`,e),e}};exports.generateMainAndCommitmentZkProof=n;

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

@@ -3,14 +3,23 @@ import "../pre-transaction/index.mjs";
 import { generateZkProof as n } from "./generateZkProof.mjs";
 //#region libs/shared/common/src/functions/snarkjs/generateMainAndCommitmentZkProof.ts
 var r = async (r, i, a, o, s, c, l) => {
-	let u = await e(r, i, a, o), d = [s], f = [c];
-	u && (d.push(u.verifierName), f.push(u.commitmentInput));
-	let p = await n(r, d, f, l), { zkCallData: m, publicSignals: h } = p[0];
-	return {
-		zkCallData: m,
-		publicSignals: h,
-		commitmentValidationData: t(u, p[1])
-	};
+	console.log("[generateMainAndCommitmentZkProof] start", {
+		chainId: r,
+		mainVerifierName: s
+	});
+	try {
+		console.log("[generateMainAndCommitmentZkProof] buildCommitmentValidationData");
+		let u = await e(r, i, a, o), d = [s], f = [c];
+		u && (d.push(u.verifierName), f.push(u.commitmentInput)), console.log("[generateMainAndCommitmentZkProof] generateZkProof");
+		let p = await n(r, d, f, l), { zkCallData: m, publicSignals: h } = p[0], g = t(u, p[1]);
+		return console.log("[generateMainAndCommitmentZkProof] success"), {
+			zkCallData: m,
+			publicSignals: h,
+			commitmentValidationData: g
+		};
+	} catch (e) {
+		throw console.log("[generateMainAndCommitmentZkProof] error", e), e;
+	}
 };
 //#endregion
 export { r as generateMainAndCommitmentZkProof };

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

@@ -1 +1 @@
-const e=require(`../utils/customEnclaveFunctionsRegister.cjs`),t=require(`../../error-handling/logger.cjs`),n=require(`./getZKFiles.cjs`),r=require(`./generateZkProofEnclave.cjs`),i=require(`./generateZkProofSelf.cjs`);var a=async(a,o,s,c)=>{if(c)try{let t=e.getCustomProofGenerator();return t?(await t(s,o.map(e=>n.getWASMFile(e,a)),o.map(e=>n.getZKeyFile(e,a)))).map(({zkCallData:e,publicSignals:t})=>({zkCallData:e,publicSignals:t})):await r.generateZkProofEnclave(a,o,s)}catch(e){t.Logger.error(`enclave proof error`,e)}return Promise.all(o.map((e,t)=>i.generateZkProofSelf(a,e,s[t])))};exports.generateZkProof=a;
+const e=require(`../utils/customEnclaveFunctionsRegister.cjs`),t=require(`../../error-handling/logger.cjs`),n=require(`./getZKFiles.cjs`),r=require(`./generateZkProofEnclave.cjs`),i=require(`./generateZkProofSelf.cjs`);var a=async(a,o,s,c)=>{console.log(`[generateZkProof] start`,{chainId:a,verifierNames:o,remotely:c});try{if(c)try{let t=e.getCustomProofGenerator();if(t){console.log(`[generateZkProof] custom proof generator`);let e=await t(s,o.map(e=>n.getWASMFile(e,a)),o.map(e=>n.getZKeyFile(e,a)));return console.log(`[generateZkProof] success (custom)`),e.map(({zkCallData:e,publicSignals:t})=>({zkCallData:e,publicSignals:t}))}console.log(`[generateZkProof] generateZkProofEnclave`);let i=await r.generateZkProofEnclave(a,o,s);return console.log(`[generateZkProof] success (enclave)`),i}catch(e){t.Logger.error(`enclave proof error`,e),console.log(`[generateZkProof] enclave failed, falling back to self`)}console.log(`[generateZkProof] generateZkProofSelf`);let l=await Promise.all(o.map((e,t)=>i.generateZkProofSelf(a,e,s[t])));return console.log(`[generateZkProof] success (self)`),l}catch(e){throw console.log(`[generateZkProof] error`,e),e}};exports.generateZkProof=a;

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

@@ -5,16 +5,34 @@ import { generateZkProofEnclave as i } from "./generateZkProofEnclave.mjs";
 import { generateZkProofSelf as a } from "./generateZkProofSelf.mjs";
 //#region libs/shared/common/src/functions/snarkjs/generateZkProof.ts
 var o = async (o, s, c, l) => {
-	if (l) try {
-		let t = e();
-		return t ? (await t(c, s.map((e) => n(e, o)), s.map((e) => r(e, o)))).map(({ zkCallData: e, publicSignals: t }) => ({
-			zkCallData: e,
-			publicSignals: t
-		})) : await i(o, s, c);
+	console.log("[generateZkProof] start", {
+		chainId: o,
+		verifierNames: s,
+		remotely: l
+	});
+	try {
+		if (l) try {
+			let t = e();
+			if (t) {
+				console.log("[generateZkProof] custom proof generator");
+				let e = await t(c, s.map((e) => n(e, o)), s.map((e) => r(e, o)));
+				return console.log("[generateZkProof] success (custom)"), e.map(({ zkCallData: e, publicSignals: t }) => ({
+					zkCallData: e,
+					publicSignals: t
+				}));
+			}
+			console.log("[generateZkProof] generateZkProofEnclave");
+			let a = await i(o, s, c);
+			return console.log("[generateZkProof] success (enclave)"), a;
+		} catch (e) {
+			t.error("enclave proof error", e), console.log("[generateZkProof] enclave failed, falling back to self");
+		}
+		console.log("[generateZkProof] generateZkProofSelf");
+		let u = await Promise.all(s.map((e, t) => a(o, e, c[t])));
+		return console.log("[generateZkProof] success (self)"), u;
 	} catch (e) {
-		t.error("enclave proof error", e);
+		throw console.log("[generateZkProof] error", e), e;
 	}
-	return Promise.all(s.map((e, t) => a(o, e, c[t])));
 };
 //#endregion
 export { o as generateZkProof };

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

@@ -1 +1 @@
-require(`../../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../../constants/protocol.constants.cjs`),t=require(`../../../types/ethereum-network.types.cjs`),n=require(`../../utils/time.utils.cjs`),r=require(`../../utils/getContractAddress.cjs`),i=require(`./recoverTransactionFromError.cjs`),a=require(`./approveTokensToHinkal.cjs`),o=require(`./constructBatchCall.cjs`),s=require(`./waitForErc20Approvals.cjs`);let c=require(`ethers`);var l=async(l,u,d,f,p,m,h,g,_,v=!0,y=!1)=>{let b=Array.isArray(d)?d:[d],x=Array.isArray(f)?f:[f];if(b.length!==x.length)throw Error(`token and amount length mismatch`);let S=l.getContractWithSigner(u,t.ContractType.HinkalContract),C=await l.getEthereumAddressByChain(u),w=g??S,T=_??S,E=`transact`,D=x.findIndex(({erc20TokenAddress:t})=>t===e.zeroAddress),O=x.some(({erc20TokenAddress:t})=>t!==e.zeroAddress),k=D===-1?0n:b[D],A=l.getProviderAdapter(u),j=await A.supportsBatchCall?.(u);if(!y&&O&&j&&A.sendBatchCallsTransaction){let e=o.buildApproveAndTransactCalls(x.map(e=>e.erc20TokenAddress),b,r.getContractAddress(w),T,p,h,m,k);return await A.sendBatchCallsTransaction(u,e)}if(!y&&(await a.approveTokensToHinkal(l,u,w,x,b),O)){let e=x.map(({erc20TokenAddress:e},t)=>({tokenAddress:e,requiredAmount:b[t]}));await s.waitForErc20Approvals(l,u,C,r.getContractAddress(w),e)}let M={value:k>0n?BigInt(k).toString():void 0,gasLimit:void 0},N,P=[p[0],p[1],p[2],h,m,{...M,from:C}],{runner:F}=T;if(!(F instanceof c.ethers.AbstractSigner))throw Error(`expected signer`);if(v)try{N=Number(await T[E].estimateGas(...P))}catch(e){console.log(`hinkalDeposit: gas estimation error`,{err:e})}let I=N&&N>=0?Math.ceil(N*12/10):void 0;I&&(P[5].gasLimit=I),await n.waitLittle();let L;try{L=y?await T[E].populateTransaction(...P):await T[E](...P)}catch(e){if(!e?.transactionHash)throw e;let t=await i.recoverTransactionFromError(F.provider,e.transactionHash);if(!t)throw e;L=t}return L};exports.transactCallDirect=l;
+require(`../../../../../_virtual/_rolldown/runtime.cjs`);const e=require(`../../../constants/protocol.constants.cjs`),t=require(`../../../types/ethereum-network.types.cjs`),n=require(`../../utils/time.utils.cjs`),r=require(`../../utils/getContractAddress.cjs`),i=require(`./recoverTransactionFromError.cjs`),a=require(`./approveTokensToHinkal.cjs`),o=require(`./constructBatchCall.cjs`),s=require(`./waitForErc20Approvals.cjs`);let c=require(`ethers`);var l=async(l,u,d,f,p,m,h,g,_,v=!0,y=!1)=>{console.log(`[transactCallDirect] start`,{chainId:u,preEstimateGas:v,returnTxData:y});try{let b=Array.isArray(d)?d:[d],x=Array.isArray(f)?f:[f];if(b.length!==x.length)throw Error(`token and amount length mismatch`);console.log(`[transactCallDirect] getContractWithSigner`);let S=l.getContractWithSigner(u,t.ContractType.HinkalContract),C=await l.getEthereumAddressByChain(u),w=g??S,T=_??S,E=`transact`,D=x.findIndex(({erc20TokenAddress:t})=>t===e.zeroAddress),O=x.some(({erc20TokenAddress:t})=>t!==e.zeroAddress),k=D===-1?0n:b[D];console.log(`[transactCallDirect] supportsBatchCall`);let A=l.getProviderAdapter(u),j=await A.supportsBatchCall?.(u);if(!y&&O&&j&&A.sendBatchCallsTransaction){console.log(`[transactCallDirect] sendBatchCallsTransaction`);let e=o.buildApproveAndTransactCalls(x.map(e=>e.erc20TokenAddress),b,r.getContractAddress(w),T,p,h,m,k),t=await A.sendBatchCallsTransaction(u,e);return console.log(`[transactCallDirect] success (batch)`,{tx:t}),t}if(!y&&(console.log(`[transactCallDirect] approveTokensToHinkal`),await a.approveTokensToHinkal(l,u,w,x,b),O)){console.log(`[transactCallDirect] waitForErc20Approvals`);let e=x.map(({erc20TokenAddress:e},t)=>({tokenAddress:e,requiredAmount:b[t]}));await s.waitForErc20Approvals(l,u,C,r.getContractAddress(w),e)}let M={value:k>0n?BigInt(k).toString():void 0,gasLimit:void 0},N,P=[p[0],p[1],p[2],h,m,{...M,from:C}],{runner:F}=T;if(!(F instanceof c.ethers.AbstractSigner))throw Error(`expected signer`);if(v){console.log(`[transactCallDirect] estimateGas`);try{N=Number(await T[E].estimateGas(...P))}catch(e){console.log(`[transactCallDirect] gas estimation error`,{err:e})}}let I=N&&N>=0?Math.ceil(N*12/10):void 0;I&&(P[5].gasLimit=I),await n.waitLittle();let L;try{console.log(`[transactCallDirect] send transaction`,{returnTxData:y}),L=y?await T[E].populateTransaction(...P):await T[E](...P)}catch(e){if(!e?.transactionHash)throw e;console.log(`[transactCallDirect] recoverTransactionFromError`,{hash:e.transactionHash});let t=await i.recoverTransactionFromError(F.provider,e.transactionHash);if(!t)throw e;L=t}return console.log(`[transactCallDirect] success`,{tx:L}),L}catch(e){throw console.log(`[transactCallDirect] error`,e),e}};exports.transactCallDirect=l;

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

@@ -9,52 +9,70 @@ import { waitForErc20Approvals as s } from "./waitForErc20Approvals.mjs";
 import { ethers as c } from "ethers";
 //#region libs/shared/common/src/functions/web3/functionCalls/transactCallDirect.ts
 var l = async (l, u, d, f, p, m, h, g, _, v = !0, y = !1) => {
-	let b = Array.isArray(d) ? d : [d], x = Array.isArray(f) ? f : [f];
-	if (b.length !== x.length) throw Error("token and amount length mismatch");
-	let S = l.getContractWithSigner(u, t.HinkalContract), C = await l.getEthereumAddressByChain(u), w = g ?? S, T = _ ?? S, E = "transact", D = x.findIndex(({ erc20TokenAddress: t }) => t === e), O = x.some(({ erc20TokenAddress: t }) => t !== e), k = D === -1 ? 0n : b[D], A = l.getProviderAdapter(u), j = await A.supportsBatchCall?.(u);
-	if (!y && O && j && A.sendBatchCallsTransaction) {
-		let e = o(x.map((e) => e.erc20TokenAddress), b, r(w), T, p, h, m, k);
-		return await A.sendBatchCallsTransaction(u, e);
-	}
-	if (!y && (await a(l, u, w, x, b), O)) {
-		let e = x.map(({ erc20TokenAddress: e }, t) => ({
-			tokenAddress: e,
-			requiredAmount: b[t]
-		}));
-		await s(l, u, C, r(w), e);
-	}
-	let M = {
-		value: k > 0n ? BigInt(k).toString() : void 0,
-		gasLimit: void 0
-	}, N, P = [
-		p[0],
-		p[1],
-		p[2],
-		h,
-		m,
-		{
-			...M,
-			from: C
-		}
-	], { runner: F } = T;
-	if (!(F instanceof c.AbstractSigner)) throw Error("expected signer");
-	if (v) try {
-		N = Number(await T[E].estimateGas(...P));
-	} catch (e) {
-		console.log("hinkalDeposit: gas estimation error", { err: e });
-	}
-	let I = N && N >= 0 ? Math.ceil(N * 12 / 10) : void 0;
-	I && (P[5].gasLimit = I), await n();
-	let L;
+	console.log("[transactCallDirect] start", {
+		chainId: u,
+		preEstimateGas: v,
+		returnTxData: y
+	});
 	try {
-		L = y ? await T[E].populateTransaction(...P) : await T[E](...P);
+		let b = Array.isArray(d) ? d : [d], x = Array.isArray(f) ? f : [f];
+		if (b.length !== x.length) throw Error("token and amount length mismatch");
+		console.log("[transactCallDirect] getContractWithSigner");
+		let S = l.getContractWithSigner(u, t.HinkalContract), C = await l.getEthereumAddressByChain(u), w = g ?? S, T = _ ?? S, E = "transact", D = x.findIndex(({ erc20TokenAddress: t }) => t === e), O = x.some(({ erc20TokenAddress: t }) => t !== e), k = D === -1 ? 0n : b[D];
+		console.log("[transactCallDirect] supportsBatchCall");
+		let A = l.getProviderAdapter(u), j = await A.supportsBatchCall?.(u);
+		if (!y && O && j && A.sendBatchCallsTransaction) {
+			console.log("[transactCallDirect] sendBatchCallsTransaction");
+			let e = o(x.map((e) => e.erc20TokenAddress), b, r(w), T, p, h, m, k), t = await A.sendBatchCallsTransaction(u, e);
+			return console.log("[transactCallDirect] success (batch)", { tx: t }), t;
+		}
+		if (!y && (console.log("[transactCallDirect] approveTokensToHinkal"), await a(l, u, w, x, b), O)) {
+			console.log("[transactCallDirect] waitForErc20Approvals");
+			let e = x.map(({ erc20TokenAddress: e }, t) => ({
+				tokenAddress: e,
+				requiredAmount: b[t]
+			}));
+			await s(l, u, C, r(w), e);
+		}
+		let M = {
+			value: k > 0n ? BigInt(k).toString() : void 0,
+			gasLimit: void 0
+		}, N, P = [
+			p[0],
+			p[1],
+			p[2],
+			h,
+			m,
+			{
+				...M,
+				from: C
+			}
+		], { runner: F } = T;
+		if (!(F instanceof c.AbstractSigner)) throw Error("expected signer");
+		if (v) {
+			console.log("[transactCallDirect] estimateGas");
+			try {
+				N = Number(await T[E].estimateGas(...P));
+			} catch (e) {
+				console.log("[transactCallDirect] gas estimation error", { err: e });
+			}
+		}
+		let I = N && N >= 0 ? Math.ceil(N * 12 / 10) : void 0;
+		I && (P[5].gasLimit = I), await n();
+		let L;
+		try {
+			console.log("[transactCallDirect] send transaction", { returnTxData: y }), L = y ? await T[E].populateTransaction(...P) : await T[E](...P);
+		} catch (e) {
+			if (!e?.transactionHash) throw e;
+			console.log("[transactCallDirect] recoverTransactionFromError", { hash: e.transactionHash });
+			let t = await i(F.provider, e.transactionHash);
+			if (!t) throw e;
+			L = t;
+		}
+		return console.log("[transactCallDirect] success", { tx: L }), L;
 	} catch (e) {
-		if (!e?.transactionHash) throw e;
-		let t = await i(F.provider, e.transactionHash);
-		if (!t) throw e;
-		L = t;
+		throw console.log("[transactCallDirect] error", e), e;
 	}
-	return L;
 };
 //#endregion
 export { l as transactCallDirect };

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

@@ -1 +1 @@
-const e=require(`../../../constants/chains.constants.cjs`),t=require(`../../../constants/protocol.constants.cjs`),n=require(`../../utils/caseInsensitive.utils.cjs`),r=require(`../../../error-handling/error-codes.constants.cjs`),i=require(`../../../externalABIs/index.cjs`),a=require(`../../../error-handling/logger.cjs`),o=require(`../../utils/tron.utils.cjs`),s=require(`../../utils/tronSimulation.utils.cjs`),c=require(`./waitForErc20Approvals.cjs`);var l=async(l,u,d,f,p,m,h,g,_,v=!0)=>{let y=Array.isArray(d)?d:[d],b=Array.isArray(f)?f:[f];if(y.length!==b.length)throw Error(`token and amount length mismatch`);let x=l.getTronWeb(),S=await l.getEthereumAddressByChain(u),{hinkalAddress:C,hinkalABI:w}=e.networkRegistry[u].contractData,T=x.contract(w,o.evmHexToTronBase58Address(C)),E=g??T,D=_??T;if(!E.address)throw Error(`contractForApproval address not set`);if(!D.address)throw Error(`contractForTransaction address not set`);let O=b.findIndex(({erc20TokenAddress:e})=>n.caseInsensitiveEqual(e,t.zeroAddress)),k=O===-1?0n:y[O],A=k>0n?k:0n;if(b.some(({erc20TokenAddress:e},r)=>!n.caseInsensitiveEqual(e,t.zeroAddress)&&y[r]>0n)){let e=E.address;if(!e)throw Error(`token approval spender not set`);let r=[];for(let a=0;a<b.length;a+=1){let s=b[a],c=y[a];if(c>0n&&!n.caseInsensitiveEqual(s.erc20TokenAddress,t.zeroAddress)){let n=o.evmHexToTronBase58Address(s.erc20TokenAddress),a=await x.contract(i.ERC20ABI,n).allowance(S,e).call({from:S});if(BigInt(String(a))<c){let{transaction:i}=await x.transactionBuilder.triggerSmartContract(n,`approve(address,uint256)`,{feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN},[{type:`address`,value:e},{type:`uint256`,value:c.toString()}],S),a=await x.trx.sign(i),o=await x.trx.sendRawTransaction(a);if(!o.result){let e=o.code??`UNKNOWN`,t=o.message?Buffer.from(o.message,`hex`).toString():`no message`;throw Error(`Tron token approval failed: ${e} - ${t}`)}r.push({tokenAddress:n,requiredAmount:c})}}}r.length>0&&await c.waitForTronErc20Approvals(x,S,e,r)}let{a:j,b:M,c:N}=o.parseZkCalldata(p),P=await o.reorderZkCallData(!0,p,h,m,!1);if(!P)throw Error(`Tron proof signature not found`);let F=[P.v,P.r,P.s],I=[h.tokenNumber,h.nullifierAmount,h.outputAmount],L=o.circomDataToArray(m);if(v){await s.simulateTronTransaction(u,D.address,`transact`,D.abi,[F,j,M,N,I,L],S,A);let e=BigInt(await x.trx.getBalance(S)),n=BigInt(t.TRON_DEFAULT_FEE_LIMIT_SUN);try{let e=o.createTronCallData(D.abi,`transact`,[F,j,M,N,I,L]);n=await o.estimateTronFeeSunWithPadding(x,u,D.address,S,e,A)}catch(e){a.Logger.error(`Error estimating Tron transact fee`,e)}if(e<A+n)throw Error(r.insufficientResourcesErrorCodes.INSUFFICIENT_TRON_BALANCE_FOR_FEE)}let R=await D.transact(F,j,M,N,I,L).send({feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN,callValue:Number(A)}),z=typeof R==`string`?R:R?.txid??R?.transaction?.txID??R?.transaction?.txid;if(!z)throw Error(`Tron transact failed (missing txid)`);return z};exports.transactCallDirectTron=l;
+const e=require(`../../../constants/chains.constants.cjs`),t=require(`../../../constants/protocol.constants.cjs`),n=require(`../../utils/caseInsensitive.utils.cjs`),r=require(`../../../error-handling/error-codes.constants.cjs`),i=require(`../../../externalABIs/index.cjs`),a=require(`../../../error-handling/logger.cjs`),o=require(`../../utils/tron.utils.cjs`),s=require(`../../utils/tronSimulation.utils.cjs`),c=require(`./waitForErc20Approvals.cjs`);var l=async(l,u,d,f,p,m,h,g,_,v=!0)=>{console.log(`[transactCallDirectTron] start`,{chainId:u});try{let y=Array.isArray(d)?d:[d],b=Array.isArray(f)?f:[f];if(y.length!==b.length)throw Error(`token and amount length mismatch`);let x=l.getTronWeb(),S=await l.getEthereumAddressByChain(u),{hinkalAddress:C,hinkalABI:w}=e.networkRegistry[u].contractData,T=x.contract(w,o.evmHexToTronBase58Address(C)),E=g??T,D=_??T;if(!E.address)throw Error(`contractForApproval address not set`);if(!D.address)throw Error(`contractForTransaction address not set`);let O=b.findIndex(({erc20TokenAddress:e})=>n.caseInsensitiveEqual(e,t.zeroAddress)),k=O===-1?0n:y[O],A=k>0n?k:0n;if(b.some(({erc20TokenAddress:e},r)=>!n.caseInsensitiveEqual(e,t.zeroAddress)&&y[r]>0n)){console.log(`[transactCallDirectTron] token approvals`);let e=E.address;if(!e)throw Error(`token approval spender not set`);let r=[];for(let a=0;a<b.length;a+=1){let s=b[a],c=y[a];if(c>0n&&!n.caseInsensitiveEqual(s.erc20TokenAddress,t.zeroAddress)){let n=o.evmHexToTronBase58Address(s.erc20TokenAddress),a=await x.contract(i.ERC20ABI,n).allowance(S,e).call({from:S});if(BigInt(String(a))<c){let{transaction:i}=await x.transactionBuilder.triggerSmartContract(n,`approve(address,uint256)`,{feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN},[{type:`address`,value:e},{type:`uint256`,value:c.toString()}],S),a=await x.trx.sign(i),o=await x.trx.sendRawTransaction(a);if(!o.result){let e=o.code??`UNKNOWN`,t=o.message?Buffer.from(o.message,`hex`).toString():`no message`;throw Error(`Tron token approval failed: ${e} - ${t}`)}r.push({tokenAddress:n,requiredAmount:c})}}}r.length>0&&await c.waitForTronErc20Approvals(x,S,e,r)}console.log(`[transactCallDirectTron] reorderZkCallData`);let{a:j,b:M,c:N}=o.parseZkCalldata(p),P=await o.reorderZkCallData(!0,p,h,m,!1);if(!P)throw Error(`Tron proof signature not found`);let F=[P.v,P.r,P.s],I=[h.tokenNumber,h.nullifierAmount,h.outputAmount],L=o.circomDataToArray(m);if(v){console.log(`[transactCallDirectTron] simulateTronTransaction`),await s.simulateTronTransaction(u,D.address,`transact`,D.abi,[F,j,M,N,I,L],S,A);let e=BigInt(await x.trx.getBalance(S)),n=BigInt(t.TRON_DEFAULT_FEE_LIMIT_SUN);try{let e=o.createTronCallData(D.abi,`transact`,[F,j,M,N,I,L]);n=await o.estimateTronFeeSunWithPadding(x,u,D.address,S,e,A)}catch(e){a.Logger.error(`Error estimating Tron transact fee`,e)}if(e<A+n)throw Error(r.insufficientResourcesErrorCodes.INSUFFICIENT_TRON_BALANCE_FOR_FEE)}console.log(`[transactCallDirectTron] contract.transact.send`);let R=await D.transact(F,j,M,N,I,L).send({feeLimit:t.TRON_DEFAULT_FEE_LIMIT_SUN,callValue:Number(A)}),z=typeof R==`string`?R:R?.txid??R?.transaction?.txID??R?.transaction?.txid;if(!z)throw Error(`Tron transact failed (missing txid)`);return console.log(`[transactCallDirectTron] success`,{txid:z}),z}catch(e){throw console.log(`[transactCallDirectTron] error`,e),e}};exports.transactCallDirectTron=l;

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

@@ -9,83 +9,91 @@ import { simulateTronTransaction as p } from "../../utils/tronSimulation.utils.m
 import { waitForTronErc20Approvals as m } from "./waitForErc20Approvals.mjs";
 //#region libs/shared/common/src/functions/web3/functionCalls/transactCallDirectTron.ts
 var h = async (h, g, _, v, y, b, x, S, C, w = !0) => {
-	let T = Array.isArray(_) ? _ : [_], E = Array.isArray(v) ? v : [v];
-	if (T.length !== E.length) throw Error("token and amount length mismatch");
-	let D = h.getTronWeb(), O = await h.getEthereumAddressByChain(g), { hinkalAddress: k, hinkalABI: A } = e[g].contractData, j = D.contract(A, u(k)), M = S ?? j, N = C ?? j;
-	if (!M.address) throw Error("contractForApproval address not set");
-	if (!N.address) throw Error("contractForTransaction address not set");
-	let P = E.findIndex(({ erc20TokenAddress: e }) => r(e, n)), F = P === -1 ? 0n : T[P], I = F > 0n ? F : 0n;
-	if (E.some(({ erc20TokenAddress: e }, t) => !r(e, n) && T[t] > 0n)) {
-		let e = M.address;
-		if (!e) throw Error("token approval spender not set");
-		let i = [];
-		for (let o = 0; o < E.length; o += 1) {
-			let s = E[o], c = T[o];
-			if (c > 0n && !r(s.erc20TokenAddress, n)) {
-				let n = u(s.erc20TokenAddress), r = await D.contract(a, n).allowance(O, e).call({ from: O });
-				if (BigInt(String(r)) < c) {
-					let { transaction: r } = await D.transactionBuilder.triggerSmartContract(n, "approve(address,uint256)", { feeLimit: t }, [{
-						type: "address",
-						value: e
-					}, {
-						type: "uint256",
-						value: c.toString()
-					}], O), a = await D.trx.sign(r), o = await D.trx.sendRawTransaction(a);
-					if (!o.result) {
-						let e = o.code ?? "UNKNOWN", t = o.message ? Buffer.from(o.message, "hex").toString() : "no message";
-						throw Error(`Tron token approval failed: ${e} - ${t}`);
+	console.log("[transactCallDirectTron] start", { chainId: g });
+	try {
+		let T = Array.isArray(_) ? _ : [_], E = Array.isArray(v) ? v : [v];
+		if (T.length !== E.length) throw Error("token and amount length mismatch");
+		let D = h.getTronWeb(), O = await h.getEthereumAddressByChain(g), { hinkalAddress: k, hinkalABI: A } = e[g].contractData, j = D.contract(A, u(k)), M = S ?? j, N = C ?? j;
+		if (!M.address) throw Error("contractForApproval address not set");
+		if (!N.address) throw Error("contractForTransaction address not set");
+		let P = E.findIndex(({ erc20TokenAddress: e }) => r(e, n)), F = P === -1 ? 0n : T[P], I = F > 0n ? F : 0n;
+		if (E.some(({ erc20TokenAddress: e }, t) => !r(e, n) && T[t] > 0n)) {
+			console.log("[transactCallDirectTron] token approvals");
+			let e = M.address;
+			if (!e) throw Error("token approval spender not set");
+			let i = [];
+			for (let o = 0; o < E.length; o += 1) {
+				let s = E[o], c = T[o];
+				if (c > 0n && !r(s.erc20TokenAddress, n)) {
+					let n = u(s.erc20TokenAddress), r = await D.contract(a, n).allowance(O, e).call({ from: O });
+					if (BigInt(String(r)) < c) {
+						let { transaction: r } = await D.transactionBuilder.triggerSmartContract(n, "approve(address,uint256)", { feeLimit: t }, [{
+							type: "address",
+							value: e
+						}, {
+							type: "uint256",
+							value: c.toString()
+						}], O), a = await D.trx.sign(r), o = await D.trx.sendRawTransaction(a);
+						if (!o.result) {
+							let e = o.code ?? "UNKNOWN", t = o.message ? Buffer.from(o.message, "hex").toString() : "no message";
+							throw Error(`Tron token approval failed: ${e} - ${t}`);
+						}
+						i.push({
+							tokenAddress: n,
+							requiredAmount: c
+						});
 					}
-					i.push({
-						tokenAddress: n,
-						requiredAmount: c
-					});
 				}
 			}
+			i.length > 0 && await m(D, O, e, i);
 		}
-		i.length > 0 && await m(D, O, e, i);
-	}
-	let { a: L, b: R, c: z } = d(y), B = await f(!0, y, x, b, !1);
-	if (!B) throw Error("Tron proof signature not found");
-	let V = [
-		B.v,
-		B.r,
-		B.s
-	], H = [
-		x.tokenNumber,
-		x.nullifierAmount,
-		x.outputAmount
-	], U = s(b);
-	if (w) {
-		await p(g, N.address, "transact", N.abi, [
-			V,
-			L,
-			R,
-			z,
-			H,
-			U
-		], O, I);
-		let e = BigInt(await D.trx.getBalance(O)), n = BigInt(t);
-		try {
-			let e = c(N.abi, "transact", [
+		console.log("[transactCallDirectTron] reorderZkCallData");
+		let { a: L, b: R, c: z } = d(y), B = await f(!0, y, x, b, !1);
+		if (!B) throw Error("Tron proof signature not found");
+		let V = [
+			B.v,
+			B.r,
+			B.s
+		], H = [
+			x.tokenNumber,
+			x.nullifierAmount,
+			x.outputAmount
+		], U = s(b);
+		if (w) {
+			console.log("[transactCallDirectTron] simulateTronTransaction"), await p(g, N.address, "transact", N.abi, [
 				V,
 				L,
 				R,
 				z,
 				H,
 				U
-			]);
-			n = await l(D, g, N.address, O, e, I);
-		} catch (e) {
-			o.error("Error estimating Tron transact fee", e);
+			], O, I);
+			let e = BigInt(await D.trx.getBalance(O)), n = BigInt(t);
+			try {
+				let e = c(N.abi, "transact", [
+					V,
+					L,
+					R,
+					z,
+					H,
+					U
+				]);
+				n = await l(D, g, N.address, O, e, I);
+			} catch (e) {
+				o.error("Error estimating Tron transact fee", e);
+			}
+			if (e < I + n) throw Error(i.INSUFFICIENT_TRON_BALANCE_FOR_FEE);
 		}
-		if (e < I + n) throw Error(i.INSUFFICIENT_TRON_BALANCE_FOR_FEE);
+		console.log("[transactCallDirectTron] contract.transact.send");
+		let W = await N.transact(V, L, R, z, H, U).send({
+			feeLimit: t,
+			callValue: Number(I)
+		}), G = typeof W == "string" ? W : W?.txid ?? W?.transaction?.txID ?? W?.transaction?.txid;
+		if (!G) throw Error("Tron transact failed (missing txid)");
+		return console.log("[transactCallDirectTron] success", { txid: G }), G;
+	} catch (e) {
+		throw console.log("[transactCallDirectTron] error", e), e;
 	}
-	let W = await N.transact(V, L, R, z, H, U).send({
-		feeLimit: t,
-		callValue: Number(I)
-	}), G = typeof W == "string" ? W : W?.txid ?? W?.transaction?.txID ?? W?.transaction?.txid;
-	if (!G) throw Error("Tron transact failed (missing txid)");
-	return G;
 };
 //#endregion
 export { h as transactCallDirectTron };

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

@@ -1 +1 @@
-const e=require(`../../../error-handling/customErrors/ErrorWithTx.cjs`),t=require(`../../../constants/server.constants.cjs`),n=require(`../../../API/getServerURL.cjs`),r=require(`../../../data-structures/http/HttpClient.cjs`),i=require(`../../../API/callRelayer.cjs`),a=require(`../../snarkjs/common.snarkjs.cjs`);require(`../../../error-handling/index.cjs`),require(`../../snarkjs/index.cjs`);var o=t=>{if(t.status===`success`)return t.message;throw t.message&&t.error?new e.ErrorWithRelayerTransaction(t.error,t.message):Error(t.error)},s=async(e,t,n,r,s,c,l,u,d)=>{let f=a.serializeCircomData(r);return o(await i.callRelayerTransactAPI({chainId:e,a:t[0],b:t[1],c:t[2],dimData:n,circomData:f,withUniswapWorkAround:c,authorizationData:l,adminData:u,tronProofSignature:d,commitmentValidationData:s}))},c=async e=>o(await r.httpClient.post(`${n.RELAYER_URL}${t.RELAYER_CONFIG.SOLANA_TRANSACT}`,e)),l=e=>{if(e.status===`success`)return e.message.scheduleId;throw Error(e.error||`Batch transaction failed`)},u=async(e,t,n,r,o,s)=>{let c=t.map(e=>a.serializeCircomData(e.circomData));return l(await i.callRelayerTransactBatchAPI({chainId:e,transactions:t.map((t,n)=>({chainId:e,a:t.zkCallData[0],b:t.zkCallData[1],c:t.zkCallData[2],dimData:t.dimData,circomData:c[n],commitmentValidationData:t.commitmentValidationData,withUniswapWorkAround:t.withUniswapWorkAround,authorizationData:t.authorizationData,adminData:t.adminData,recipientAddress:t.recipientAddress,tronProofSignature:t.tronProofSignature})),txCompletionTime:r,hashedEthereumAddress:n,ref:o,hashedDashboardAccountId:s}))},d=async(e,t,n,r,a,o)=>l(await i.callRelayerSolanaTransactBatchAPI({chainId:e,transactions:t,hashedEthereumAddress:n,txCompletionTime:r,ref:a,hashedDashboardAccountId:o}));exports.solanaTransactCallRelayer=c,exports.solanaTransactCallRelayerBatch=d,exports.transactCallRelayer=s,exports.transactCallRelayerBatch=u;
+const e=require(`../../../error-handling/customErrors/ErrorWithTx.cjs`),t=require(`../../../constants/server.constants.cjs`),n=require(`../../../API/getServerURL.cjs`),r=require(`../../../data-structures/http/HttpClient.cjs`),i=require(`../../../API/callRelayer.cjs`),a=require(`../../snarkjs/common.snarkjs.cjs`);require(`../../../error-handling/index.cjs`),require(`../../snarkjs/index.cjs`);var o=t=>{if(t.status===`success`)return t.message;throw t.message&&t.error?new e.ErrorWithRelayerTransaction(t.error,t.message):Error(t.error)},s=async(e,t,n,r,s,c,l,u,d)=>{console.log(`[transactCallRelayer] start`,{chainId:e});try{console.log(`[transactCallRelayer] serializeCircomData`);let f=a.serializeCircomData(r);console.log(`[transactCallRelayer] callRelayerTransactAPI`);let p=o(await i.callRelayerTransactAPI({chainId:e,a:t[0],b:t[1],c:t[2],dimData:n,circomData:f,withUniswapWorkAround:c,authorizationData:l,adminData:u,tronProofSignature:d,commitmentValidationData:s}));return console.log(`[transactCallRelayer] success`,{txHash:p}),p}catch(e){throw console.log(`[transactCallRelayer] error`,e),e}},c=async e=>o(await r.httpClient.post(`${n.RELAYER_URL}${t.RELAYER_CONFIG.SOLANA_TRANSACT}`,e)),l=e=>{if(e.status===`success`)return e.message.scheduleId;throw Error(e.error||`Batch transaction failed`)},u=async(e,t,n,r,o,s)=>{let c=t.map(e=>a.serializeCircomData(e.circomData));return l(await i.callRelayerTransactBatchAPI({chainId:e,transactions:t.map((t,n)=>({chainId:e,a:t.zkCallData[0],b:t.zkCallData[1],c:t.zkCallData[2],dimData:t.dimData,circomData:c[n],commitmentValidationData:t.commitmentValidationData,withUniswapWorkAround:t.withUniswapWorkAround,authorizationData:t.authorizationData,adminData:t.adminData,recipientAddress:t.recipientAddress,tronProofSignature:t.tronProofSignature})),txCompletionTime:r,hashedEthereumAddress:n,ref:o,hashedDashboardAccountId:s}))},d=async(e,t,n,r,a,o)=>l(await i.callRelayerSolanaTransactBatchAPI({chainId:e,transactions:t,hashedEthereumAddress:n,txCompletionTime:r,ref:a,hashedDashboardAccountId:o}));exports.solanaTransactCallRelayer=c,exports.solanaTransactCallRelayerBatch=d,exports.transactCallRelayer=s,exports.transactCallRelayerBatch=u;

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

@@ -11,20 +11,28 @@ var c = (t) => {
 	if (t.status === "success") return t.message;
 	throw t.message && t.error ? new e(t.error, t.message) : Error(t.error);
 }, l = async (e, t, n, r, i, o, l, u, d) => {
-	let f = s(r);
-	return c(await a({
-		chainId: e,
-		a: t[0],
-		b: t[1],
-		c: t[2],
-		dimData: n,
-		circomData: f,
-		withUniswapWorkAround: o,
-		authorizationData: l,
-		adminData: u,
-		tronProofSignature: d,
-		commitmentValidationData: i
-	}));
+	console.log("[transactCallRelayer] start", { chainId: e });
+	try {
+		console.log("[transactCallRelayer] serializeCircomData");
+		let f = s(r);
+		console.log("[transactCallRelayer] callRelayerTransactAPI");
+		let p = c(await a({
+			chainId: e,
+			a: t[0],
+			b: t[1],
+			c: t[2],
+			dimData: n,
+			circomData: f,
+			withUniswapWorkAround: o,
+			authorizationData: l,
+			adminData: u,
+			tronProofSignature: d,
+			commitmentValidationData: i
+		}));
+		return console.log("[transactCallRelayer] success", { txHash: p }), p;
+	} catch (e) {
+		throw console.log("[transactCallRelayer] error", e), e;
+	}
 }, u = async (e) => c(await r.post(`${n}${t.SOLANA_TRANSACT}`, e)), d = (e) => {
 	if (e.status === "success") return e.message.scheduleId;
 	throw Error(e.error || "Batch transaction failed");