@kapa123456789/sdk 0.0.82 → 0.0.84

package/common/src/data-structures/crypto-keys/keys.mjs

@@ -46,8 +46,14 @@ var p = new i(), m = new i(), h = new i(), g = class {
 	};
 	signEddsa = (e) => {
 		this.requireSignature();
-		let t = n(), i = r(), a = Buffer.from(o.getBytes(this.getSpendingKeyPair().privSpendingKey)), s = t.F.e(e), c = i.signPoseidon(a, s);
-		return {
+		let t = n(), i = r();
+		console.log("message", e), console.log("this.getSpendingKeyPair().privSpendingKey", this.getSpendingKeyPair().privSpendingKey);
+		let a = Buffer.from(o.getBytes(this.getSpendingKeyPair().privSpendingKey));
+		console.log("prvBytes", a);
+		let s = t.F.e(e);
+		console.log("msgF", s);
+		let c = i.signPoseidon(a, s);
+		return console.log("sig", c), {
 			R8: [BigInt(t.F.toString(c.R8[0])), BigInt(t.F.toString(c.R8[1]))],
 			S: BigInt(c.S)
 		};

package/common/src/data-structures/token-price-fetcher/TokenChecker.cjs

@@ -1 +1 @@
-const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`);var n=class{static isBeefyStakeToken=e=>e.name.includes(`-Boost`)&&e.symbol.includes(`-Boost`);static isStakeToken=e=>this.isBeefyStakeToken(e);static isAaveToken=e=>e.aaveToken;static isKinzaToken=e=>e.name.startsWith(`Kinza`);static isPotentiallyVolatile=n=>n.erc20TokenAddress===t.zeroAddress?!1:n.isVolatile||!e.isSolanaLike(n.chainId)&&(n.balanceStorageOffset===void 0||n.allowanceStorageOffset===void 0);static isPotentiallySpamToken(e){let{name:t,symbol:n}=e,r=`${t} ${n}`,i=/(?:https?:\/\/|www\.)/i,a=/\.(?:com|io|app|org|net|co|xyz|link|site|top|in|ru|cn|me|biz|info|online|club|tech|to|cloud)(?=[^\w]|$)/i,o=/\b(?:t\.me|discord\.(?:gg|com)|twitter\.com|x\.com|telegram\.(?:me|org))\b/i,s=/@[^\s]+\.[^\s]+/i,c=/\p{Extended_Pictographic}/u,l=/[\u{1F1E6}-\u{1F1FF}]{2}/u,u=/[#*0-9]\uFE0F?\u20E3/u,d=i.test(r),f=a.test(r),p=o.test(r),m=s.test(r),h=c.test(r)||l.test(r)||u.test(r);return d||f||p||m||h}};exports.TokenChecker=n;
+const e=require(`../../constants/chains.constants.cjs`),t=require(`../../constants/protocol.constants.cjs`);var n=class{static isBeefyStakeToken=e=>e.name.includes(`-Boost`)&&e.symbol.includes(`-Boost`);static isStakeToken=e=>this.isBeefyStakeToken(e);static isAaveToken=e=>e.aaveToken;static isKinzaToken=e=>e.name.startsWith(`Kinza`);static isPotentiallyVolatile=n=>n.erc20TokenAddress===t.zeroAddress?!1:n.isVolatile||!e.isSolanaLike(n.chainId)&&!e.isTronLike(n.chainId)&&(n.balanceStorageOffset===void 0||n.allowanceStorageOffset===void 0);static isPotentiallySpamToken(e){let{name:t,symbol:n}=e,r=`${t} ${n}`,i=/(?:https?:\/\/|www\.)/i,a=/\.(?:com|io|app|org|net|co|xyz|link|site|top|in|ru|cn|me|biz|info|online|club|tech|to|cloud)(?=[^\w]|$)/i,o=/\b(?:t\.me|discord\.(?:gg|com)|twitter\.com|x\.com|telegram\.(?:me|org))\b/i,s=/@[^\s]+\.[^\s]+/i,c=/\p{Extended_Pictographic}/u,l=/[\u{1F1E6}-\u{1F1FF}]{2}/u,u=/[#*0-9]\uFE0F?\u20E3/u,d=i.test(r),f=a.test(r),p=o.test(r),m=s.test(r),h=c.test(r)||l.test(r)||u.test(r);return d||f||p||m||h}};exports.TokenChecker=n;

package/common/src/data-structures/token-price-fetcher/TokenChecker.mjs

@@ -1,16 +1,16 @@
-import { isSolanaLike as e } from "../../constants/chains.constants.mjs";
-import { zeroAddress as t } from "../../constants/protocol.constants.mjs";
+import { isSolanaLike as e, isTronLike as t } from "../../constants/chains.constants.mjs";
+import { zeroAddress as n } from "../../constants/protocol.constants.mjs";
 //#region libs/shared/common/src/data-structures/token-price-fetcher/TokenChecker.ts
-var n = class {
+var r = class {
 	static isBeefyStakeToken = (e) => e.name.includes("-Boost") && e.symbol.includes("-Boost");
 	static isStakeToken = (e) => this.isBeefyStakeToken(e);
 	static isAaveToken = (e) => e.aaveToken;
 	static isKinzaToken = (e) => e.name.startsWith("Kinza");
-	static isPotentiallyVolatile = (n) => n.erc20TokenAddress === t ? !1 : n.isVolatile || !e(n.chainId) && (n.balanceStorageOffset === void 0 || n.allowanceStorageOffset === void 0);
+	static isPotentiallyVolatile = (r) => r.erc20TokenAddress === n ? !1 : r.isVolatile || !e(r.chainId) && !t(r.chainId) && (r.balanceStorageOffset === void 0 || r.allowanceStorageOffset === void 0);
 	static isPotentiallySpamToken(e) {
 		let { name: t, symbol: n } = e, r = `${t} ${n}`, i = /(?:https?:\/\/|www\.)/i, a = /\.(?:com|io|app|org|net|co|xyz|link|site|top|in|ru|cn|me|biz|info|online|club|tech|to|cloud)(?=[^\w]|$)/i, o = /\b(?:t\.me|discord\.(?:gg|com)|twitter\.com|x\.com|telegram\.(?:me|org))\b/i, s = /@[^\s]+\.[^\s]+/i, c = /\p{Extended_Pictographic}/u, l = /[\u{1F1E6}-\u{1F1FF}]{2}/u, u = /[#*0-9]\uFE0F?\u20E3/u, d = i.test(r), f = a.test(r), p = o.test(r), m = s.test(r), h = c.test(r) || l.test(r) || u.test(r);
 		return d || f || p || m || h;
 	}
 };
 //#endregion
-export { n as TokenChecker };
+export { r as TokenChecker };

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

@@ -1 +1 @@
-const e=require(`../../constants/fees.constants.cjs`),t=require(`../utils/caseInsensitive.utils.cjs`),n=require(`../../error-handling/logger.cjs`),r=require(`../utils/erc20tokenFunctions.cjs`),i=require(`./process-gas-estimates.cjs`);var a=async(a,o,s,c,l=[],u=0n,d)=>{console.log(`[getFeeStructure] start`,{chainId:a,feeTokenAddress:o,externalActionId:c});try{let f=await r.getErc20TokenFromAPI(a,o??e.defaultFeeToken);if(!f)throw Error(`failed to find feeToken`);let p=s.some(e=>t.caseInsensitiveEqual(e,o))?s.length+1:s.length;console.log(`[getFeeStructure] processGasEstimates`);let{priceOfTransactionInToken:m}=await i.processGasEstimates(a,f,c,p,void 0,l,d);if(m===void 0)throw Error(`failed to process gas estimates`);let h={feeToken:f.erc20TokenAddress,flatFee:m,variableRate:u};return n.Logger.log(h),console.log(`[getFeeStructure] success`,{feeStructure:h}),h}catch(e){throw console.log(`[getFeeStructure] error`,e),e}};exports.getFeeStructure=a;
+const e=require(`../../constants/fees.constants.cjs`),t=require(`../utils/caseInsensitive.utils.cjs`),n=require(`../../error-handling/logger.cjs`),r=require(`../utils/erc20tokenFunctions.cjs`),i=require(`./process-gas-estimates.cjs`);var a=async(a,o,s,c,l=[],u=0n,d)=>{let f=await r.getErc20TokenFromAPI(a,o??e.defaultFeeToken);if(!f)throw Error(`failed to find feeToken`);let{priceOfTransactionInToken:p}=await i.processGasEstimates(a,f,c,s.some(e=>t.caseInsensitiveEqual(e,o))?s.length+1:s.length,void 0,l,d);if(p===void 0)throw Error(`failed to process gas estimates`);let m={feeToken:f.erc20TokenAddress,flatFee:p,variableRate:u};return n.Logger.log(m),m};exports.getFeeStructure=a;

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

@@ -5,27 +5,16 @@ import { getErc20TokenFromAPI as r } from "../utils/erc20tokenFunctions.mjs";
 import { processGasEstimates as i } from "./process-gas-estimates.mjs";
 //#region libs/shared/common/src/functions/pre-transaction/getFeeStructure.ts
 var a = async (a, o, s, c, l = [], u = 0n, d) => {
-	console.log("[getFeeStructure] start", {
-		chainId: a,
-		feeTokenAddress: o,
-		externalActionId: c
-	});
-	try {
-		let f = await r(a, o ?? e);
-		if (!f) throw Error("failed to find feeToken");
-		let p = s.some((e) => t(e, o)) ? s.length + 1 : s.length;
-		console.log("[getFeeStructure] processGasEstimates");
-		let { priceOfTransactionInToken: m } = await i(a, f, c, p, void 0, l, d);
-		if (m === void 0) throw Error("failed to process gas estimates");
-		let h = {
-			feeToken: f.erc20TokenAddress,
-			flatFee: m,
-			variableRate: u
-		};
-		return n.log(h), console.log("[getFeeStructure] success", { feeStructure: h }), h;
-	} catch (e) {
-		throw console.log("[getFeeStructure] error", e), e;
-	}
+	let f = await r(a, o ?? e);
+	if (!f) throw Error("failed to find feeToken");
+	let { priceOfTransactionInToken: p } = await i(a, f, c, s.some((e) => t(e, o)) ? s.length + 1 : s.length, void 0, l, d);
+	if (p === void 0) throw Error("failed to process gas estimates");
+	let m = {
+		feeToken: f.erc20TokenAddress,
+		flatFee: p,
+		variableRate: u
+	};
+	return n.log(m), m;
 };
 //#endregion
 export { a as getFeeStructure };

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

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

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

@@ -1,100 +1,82 @@
-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 { 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 { 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 = 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 = {
+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: {
 			tokenNumber: h.length,
 			nullifierAmount: h.length > 0 ? h[0].length : 0,
 			outputAmount: g.length > 0 ? g[0].length : 0
-		};
-		return console.log("[constructZkProof] success"), {
-			zkCallData: _e,
-			circomData: ye,
-			dimData: be,
-			encryptedOutputs: A,
-			commitmentValidationData: ve
-		};
-	} catch (e) {
-		throw console.log("[constructZkProof] error", e), e;
-	}
+		},
+		encryptedOutputs: j,
+		commitmentValidationData: ve
+	};
 };
 //#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)=>{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;
+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;

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

@@ -3,23 +3,14 @@ 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) => {
-	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;
-	}
+	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])
+	};
 };
 //#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)=>{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;
+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;

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

@@ -5,34 +5,16 @@ 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) => {
-	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;
+	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);
 	} catch (e) {
-		throw console.log("[generateZkProof] error", e), e;
+		t.error("enclave proof error", e);
 	}
+	return Promise.all(s.map((e, t) => a(o, e, c[t])));
 };
 //#endregion
 export { o as generateZkProof };

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

@@ -1 +1 @@
-require(`../../constants/index.cjs`);
+const e=require(`../../types/chains.types.cjs`);require(`../../types/index.cjs`),require(`../../constants/index.cjs`),e.EthereumNetworkType.Mainnet,e.EthereumNetworkType.Testnet,e.EthereumNetworkType.Local;

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

@@ -1,3 +1,4 @@
 import { EthereumNetwork, EthereumNetworkType } from '../../types';
 export declare const getNetworkObject: (chainId: number) => EthereumNetwork;
 export declare const getNetworkType: (network: EthereumNetwork) => EthereumNetworkType;
+export declare const compareNetworksByTypeAndPriority: (network1: EthereumNetwork, network2: EthereumNetwork) => number;

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

@@ -1 +1,5 @@
+import { EthereumNetworkType as e } from "../../types/chains.types.mjs";
+import "../../types/index.mjs";
 import "../../constants/index.mjs";
+e.Mainnet, e.Testnet, e.Local;
+//#endregion

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

@@ -1 +1 @@
-var e=e=>new Promise(t=>{setTimeout(t,e)}),t=async(e,t=1e4)=>{let n,r=new Promise((e,r)=>{n=setTimeout(()=>r(Error(`Timeout after ${t}ms`)),t)});try{return await Promise.race([e,r])}finally{clearTimeout(n)}},n=async(t,n={})=>{let r=n.intervalMs??5e3,i=n.timeoutMs??6e4,a=Math.floor(i/r)+1;for(let n=0;n<a;n+=1){try{let e=await t();if(e!=null)return e}catch{}n<a-1&&await e(r)}};exports.pollForValue=n,exports.wait=e,exports.withTimeout=t;
+var e=e=>new Promise(t=>{setTimeout(t,e)}),t=async(e,t=1e4)=>Promise.race([e,new Promise((n,r)=>{let i=setTimeout(()=>{r(Error(`Timeout after ${t}ms`))},t);e.finally(()=>clearTimeout(i))})]),n=async(t,n={})=>{let r=n.intervalMs??5e3,i=n.timeoutMs??6e4,a=Math.floor(i/r)+1;for(let n=0;n<a;n+=1){try{let e=await t();if(e!=null)return e}catch{}n<a-1&&await e(r)}};exports.pollForValue=n,exports.wait=e,exports.withTimeout=t;

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

@@ -1,16 +1,12 @@
 //#region libs/shared/common/src/functions/utils/process.utils.ts
 var e = (e) => new Promise((t) => {
 	setTimeout(t, e);
-}), t = async (e, t = 1e4) => {
-	let n, r = new Promise((e, r) => {
-		n = setTimeout(() => r(/* @__PURE__ */ Error(`Timeout after ${t}ms`)), t);
-	});
-	try {
-		return await Promise.race([e, r]);
-	} finally {
-		clearTimeout(n);
-	}
-}, n = async (t, n = {}) => {
+}), t = async (e, t = 1e4) => Promise.race([e, new Promise((n, r) => {
+	let i = setTimeout(() => {
+		r(/* @__PURE__ */ Error(`Timeout after ${t}ms`));
+	}, t);
+	e.finally(() => clearTimeout(i));
+})]), n = async (t, n = {}) => {
 	let r = n.intervalMs ?? 5e3, i = n.timeoutMs ?? 6e4, a = Math.floor(i / r) + 1;
 	for (let n = 0; n < a; n += 1) {
 		try {

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

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

@@ -9,70 +9,52 @@ 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) => {
-	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.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;
+	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
 		}
-		return console.log("[transactCallDirect] success", { tx: L }), L;
+	], { runner: F } = T;
+	if (!(F instanceof c.AbstractSigner)) throw Error("expected signer");
+	if (v) try {
+		N = Number(await T[E].estimateGas(...P));
+	} catch (e) {
+		console.log("hinkalDeposit: gas estimation error", { err: e });
+	}
+	let I = N && N >= 0 ? Math.ceil(N * 12 / 10) : void 0;
+	I && (P[5].gasLimit = I), await n();
+	let L;
+	try {
+		L = y ? await T[E].populateTransaction(...P) : await T[E](...P);
 	} catch (e) {
-		throw console.log("[transactCallDirect] error", e), e;
+		if (!e?.transactionHash) throw e;
+		let t = await i(F.provider, e.transactionHash);
+		if (!t) throw e;
+		L = t;
 	}
+	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)=>{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;
+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;