@hinkal/common 0.2.28 → 0.2.30

package/functions/web3/functionCalls/transactCallDirect.mjs

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

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

package/functions/web3/functionCalls/transactCallDirectTron.d.ts

@@ -2,5 +2,8 @@ import { IHinkal } from '../../../data-structures/Hinkal/IHinkal';
 import { CircomDataType, DimDataType } from '../../../types/circom-data.types';
 import { NewZkCallDataType } from '../../../types/snark.types';
 import { ERC20Token } from '../../../types/token.types';
-import { ContractInstance } from 'tronweb/lib/esm/types';
-export declare const transactCallDirectTron: (hinkal: IHinkal, chainId: number, amount: bigint, tokenToApprove: ERC20Token, newZkCallData: NewZkCallDataType, circomData: CircomDataType, dimData: DimDataType, contractApproval?: ContractInstance<any>, contractTransaction?: ContractInstance<any>, preEstimateGas?: boolean) => Promise<string>;
+import { Types as TronWebTypes } from 'tronweb';
+export declare const transactCallDirectTron: (hinkal: IHinkal, chainId: number, amount: bigint, tokenToApprove: ERC20Token, // in hex format
+newZkCallData: NewZkCallDataType, circomData: CircomDataType, dimData: DimDataType, contractApproval?: TronWebTypes.ContractInstance<any>, // in base58 format
+contractTransaction?: TronWebTypes.ContractInstance<any>, // in base58 format
+preEstimateGas?: boolean) => Promise<string>;

package/functions/web3/functionCalls/transactCallDirectTron.mjs

@@ -1,63 +1,81 @@
-import { networkRegistry as W } from "../../../constants/chains.constants.mjs";
-import { simulateTronTransaction as z } from "../../utils/tronSimulation.utils.mjs";
-import { evmHexToTronBase58Address as B, parseZkCalldata as H, reorderZkCallData as P, circomDataToArray as V } from "../../utils/tron.utils.mjs";
-import { caseInsensitiveEqual as Z } from "../../utils/caseInsensitive.utils.mjs";
-import { ERC20ABI as j } from "../../../externalABIs/index.mjs";
-import { waitForTronErc20Approvals as D } from "./waitForErc20Approvals.mjs";
-import { zeroAddress as G } from "../../../constants/protocol.constants.mjs";
-const or = async (w, c, n, f, u, m, e, y, R, b = !0) => {
-  const r = w.getTronWeb(), S = "transact", p = B(f.erc20TokenAddress), t = await w.getEthereumAddressByChain(c), { hinkalAddress: F, hinkalABI: I } = W[c].contractData, A = r.contract(I, B(F)), v = y ?? A, a = R ?? A;
-  if (!v.address)
-    throw new Error("contractForApproval address not set");
-  if (!a.address)
-    throw new Error("contractForTransaction address not set");
-  const d = Z(f.erc20TokenAddress, G);
-  if (!d && n > 0n) {
-    const i = v.address;
-    if (!i)
-      throw new Error("token approval spender not set");
-    const l = n, q = await r.contract(j, p).allowance(t, i).call({
-      from: t
-    });
-    if (BigInt(String(q)) < l) {
-      const { transaction: L } = await r.transactionBuilder.triggerSmartContract(
-        p,
-        "approve(address,uint256)",
-        { feeLimit: 1e8 },
-        [
-          { type: "address", value: i },
-          { type: "uint256", value: l.toString() }
-        ],
-        t
-      ), N = await r.trx.sign(L);
-      if (!(await r.trx.sendRawTransaction(N)).result)
-        throw new Error("Tron token approval failed");
-      await D(r, t, i, [
-        { tokenAddress: p, requiredAmount: l }
-      ]);
-    }
-  }
-  const { a: g, b: T, c: k } = H(u), s = await P(!0, u, e, m, !1);
-  if (!s)
-    throw new Error("Tron proof signature not found");
-  const x = [s.v, s.r, s.s], E = [e.tokenNumber, e.nullifierAmount, e.outputAmount], h = V(m);
-  b && await z(
-    c,
-    a.address,
-    S,
-    a.abi,
-    [x, g, T, k, E, h],
-    t,
-    d ? n : 0n
-  );
-  const o = await a.transact(x, g, T, k, E, h).send({
-    feeLimit: 1e9,
-    callValue: d ? Number(n) : 0
-  }), C = typeof o == "string" ? o : o?.txid ?? o?.transaction?.txID ?? o?.transaction?.txid;
-  if (!C)
-    throw new Error("Tron transact failed (missing txid)");
-  return C;
-};
-export {
-  or as transactCallDirectTron
+import { networkRegistry as e } from "../../../constants/chains.constants.mjs";
+import { TRON_DEFAULT_FEE_LIMIT_SUN as t, zeroAddress as n } from "../../../constants/protocol.constants.mjs";
+import { caseInsensitiveEqual as r } from "../../utils/caseInsensitive.utils.mjs";
+import { ERC20ABI as i } from "../../../externalABIs/index.mjs";
+import { insufficientResourcesErrorCodes as a } from "../../../error-handling/error-codes.constants.mjs";
+import { circomDataToArray as o, createTronCallData as s, estimateTronFeeSunWithPadding as c, evmHexToTronBase58Address as l, parseZkCalldata as u, reorderZkCallData as d } from "../../utils/tron.utils.mjs";
+import { Logger as f } from "../../../error-handling/logger.mjs";
+import { simulateTronTransaction as p } from "../../utils/tronSimulation.utils.mjs";
+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 = h.getTronWeb(), E = l(v.erc20TokenAddress), D = await h.getEthereumAddressByChain(g), { hinkalAddress: O, hinkalABI: k } = e[g].contractData, A = T.contract(k, l(O)), j = S ?? A, M = C ?? A;
+	if (!j.address) throw Error("contractForApproval address not set");
+	if (!M.address) throw Error("contractForTransaction address not set");
+	let N = r(v.erc20TokenAddress, n);
+	if (!N && _ > 0n) {
+		let e = j.address;
+		if (!e) throw Error("token approval spender not set");
+		let n = _, r = await T.contract(i, E).allowance(D, e).call({ from: D });
+		if (BigInt(String(r)) < n) {
+			let { transaction: r } = await T.transactionBuilder.triggerSmartContract(E, "approve(address,uint256)", { feeLimit: t }, [{
+				type: "address",
+				value: e
+			}, {
+				type: "uint256",
+				value: n.toString()
+			}], D), i = await T.trx.sign(r), a = await T.trx.sendRawTransaction(i);
+			if (!a.result) {
+				let e = a.code ?? "UNKNOWN", t = a.message ? Buffer.from(a.message, "hex").toString() : "no message";
+				throw Error(`Tron token approval failed: ${e} - ${t}`);
+			}
+			await m(T, D, e, [{
+				tokenAddress: E,
+				requiredAmount: n
+			}]);
+		}
+	}
+	let { a: P, b: F, c: I } = u(y), L = await d(!0, y, x, b, !1);
+	if (!L) throw Error("Tron proof signature not found");
+	let R = [
+		L.v,
+		L.r,
+		L.s
+	], z = [
+		x.tokenNumber,
+		x.nullifierAmount,
+		x.outputAmount
+	], B = o(b);
+	if (w && (await p(g, M.address, "transact", M.abi, [
+		R,
+		P,
+		F,
+		I,
+		z,
+		B
+	], D, N ? _ : 0n), N)) {
+		let e = BigInt(await T.trx.getBalance(D)), n = BigInt(t);
+		try {
+			let e = s(M.abi, "transact", [
+				R,
+				P,
+				F,
+				I,
+				z,
+				B
+			]);
+			n = await c(T, g, M.address, D, e, _);
+		} catch (e) {
+			f.error("Error estimating Tron transact fee", e);
+		}
+		if (e < _ + n) throw Error(a.INSUFFICIENT_TRON_BALANCE_FOR_FEE);
+	}
+	let V = await M.transact(R, P, F, I, z, B).send({
+		feeLimit: t,
+		callValue: N ? Number(_) : 0
+	}), H = typeof V == "string" ? V : V?.txid ?? V?.transaction?.txID ?? V?.transaction?.txid;
+	if (!H) throw Error("Tron transact failed (missing txid)");
+	return H;
 };
+//#endregion
+export { h as transactCallDirectTron };

package/functions/web3/functionCalls/transactCallRelayer.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../../error-handling/error-codes.constants.cjs");require("ethers");const y=require("../../../error-handling/customErrors/ErrorWithTx.cjs");require("../../../types/circom-data.types.cjs");require("../../../constants/chains.constants.cjs");require("../../../types/activities.types.cjs");require("../../../constants/vite.constants.cjs");const l=require("../../../API/callRelayer.cjs");require("circomlibjs-hinkal-fork");require("../../../data-structures/crypto-keys/keys.cjs");const q=require("../../snarkjs/common.snarkjs.cjs");require("node-forge");require("libsodium-wrappers");const R=require("../../../data-structures/http/HttpClient.cjs");require("axios");require("../../../constants/token-data/index.cjs");require("../../../constants/tokens.constants.cjs");require("idb-keyval");require("@solana/web3.js");require("../../utils/convertIntegrationProviderToExternalActionId.cjs");const d=require("../../../constants/server.constants.cjs"),C=require("../../../API/getServerURL.cjs");require("tronweb");require("@coral-xyz/anchor");require("@solana/spl-token");require("tweetnacl");require("bs58");require("buffer");require("lodash");require("../../../API/enclaveUtxoCalls.cjs");require("../../../constants/contracts.constants.cjs");require("../../../constants/kyc.constants.cjs");require("../../../constants/coingecko.constants.cjs");require("../../../constants/reorg-depths.constants.cjs");require("../../../constants/addresses.constants.cjs");require("../../../constants/token.limits.constants.cjs");require("../../../constants/presale.constants.cjs");require("../../../constants/activity.constants.cjs");require("../../../constants/tasks.constants.cjs");require("../../../constants/events.constants.cjs");require("../../../constants/schedule.constants.cjs");require("../../utils/userAgent.cjs");require("multiformats");require("async-mutex");require("process");require("../../../providers/EthersProviderAdapter.cjs");const m=r=>{if(r.status==="success")return r.message;throw r.message&&r.error?new y.ErrorWithRelayerTransaction(r.error,r.message):new Error(r.error)},A=async(r,a,t,i,c,s,n,o)=>{const e=q.serializeCircomData(i),u=await l.callRelayerTransactAPI({chainId:r,a:a[0],b:a[1],c:a[2],dimData:t,circomData:e,withUniswapWorkAround:c,authorizationData:s,adminData:n,tronProofSignature:o});return m(u)},D=async r=>{const a=await R.httpClient.post(`${C.RELAYER_URL}${d.RELAYER_CONFIG.SOLANA_TRANSACT}`,r);return m(a)},h=r=>{if(r.status==="success")return r.message.scheduleId;throw new Error(r.error||"Batch transaction failed")},T=async(r,a,t,i,c)=>{const s=a.map(e=>q.serializeCircomData(e.circomData)),n={chainId:r,transactions:a.map((e,u)=>({chainId:r,a:e.zkCallData[0],b:e.zkCallData[1],c:e.zkCallData[2],dimData:e.dimData,circomData:s[u],withUniswapWorkAround:e.withUniswapWorkAround,authorizationData:e.authorizationData,adminData:e.adminData,recipientAddress:e.recipientAddress,tronProofSignature:e.tronProofSignature})),txCompletionTime:i,hashedEthereumAddress:t,ref:c},o=await l.callRelayerTransactBatchAPI(n);return h(o)},w=async(r,a,t,i,c)=>{const s={chainId:r,transactions:a,hashedEthereumAddress:t,txCompletionTime:i,ref:c},n=await l.callRelayerSolanaTransactBatchAPI(s);return h(n)};exports.solanaTransactCallRelayer=D;exports.solanaTransactCallRelayerBatch=w;exports.transactCallRelayer=A;exports.transactCallRelayerBatch=T;
+const e=require(`../../../constants/server.constants.cjs`),t=require(`../../../API/getServerURL.cjs`),n=require(`../../../data-structures/http/HttpClient.cjs`),r=require(`../../../API/callRelayer.cjs`),i=require(`../../../error-handling/customErrors/ErrorWithTx.cjs`),a=require(`../../snarkjs/common.snarkjs.cjs`);require(`../../../error-handling/index.cjs`),require(`../../snarkjs/index.cjs`);var o=e=>{if(e.status===`success`)return e.message;throw e.message&&e.error?new i.ErrorWithRelayerTransaction(e.error,e.message):Error(e.error)},s=async(e,t,n,i,s,c,l,u)=>{let d=a.serializeCircomData(i);return o(await r.callRelayerTransactAPI({chainId:e,a:t[0],b:t[1],c:t[2],dimData:n,circomData:d,withUniswapWorkAround:s,authorizationData:c,adminData:l,tronProofSignature:u}))},c=async r=>o(await n.httpClient.post(`${t.RELAYER_URL}${e.RELAYER_CONFIG.SOLANA_TRANSACT}`,r)),l=e=>{if(e.status===`success`)return e.message.scheduleId;throw Error(e.error||`Batch transaction failed`)},u=async(e,t,n,i,o)=>{let s=t.map(e=>a.serializeCircomData(e.circomData));return l(await r.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:s[n],withUniswapWorkAround:t.withUniswapWorkAround,authorizationData:t.authorizationData,adminData:t.adminData,recipientAddress:t.recipientAddress,tronProofSignature:t.tronProofSignature})),txCompletionTime:i,hashedEthereumAddress:n,ref:o}))},d=async(e,t,n,i,a)=>l(await r.callRelayerSolanaTransactBatchAPI({chainId:e,transactions:t,hashedEthereumAddress:n,txCompletionTime:i,ref:a}));exports.solanaTransactCallRelayer=c,exports.solanaTransactCallRelayerBatch=d,exports.transactCallRelayer=s,exports.transactCallRelayerBatch=u;

package/functions/web3/functionCalls/transactCallRelayer.mjs

@@ -1,108 +1,59 @@
-import "../../../error-handling/error-codes.constants.mjs";
-import "ethers";
-import { ErrorWithRelayerTransaction as d } from "../../../error-handling/customErrors/ErrorWithTx.mjs";
-import "../../../types/circom-data.types.mjs";
-import "../../../constants/chains.constants.mjs";
-import "../../../types/activities.types.mjs";
-import "../../../constants/vite.constants.mjs";
-import { callRelayerTransactAPI as h, callRelayerTransactBatchAPI as A, callRelayerSolanaTransactBatchAPI as D } from "../../../API/callRelayer.mjs";
-import "circomlibjs-hinkal-fork";
-import "../../../data-structures/crypto-keys/keys.mjs";
-import { serializeCircomData as e } from "../../snarkjs/common.snarkjs.mjs";
-import "node-forge";
-import "libsodium-wrappers";
-import { httpClient as f } from "../../../data-structures/http/HttpClient.mjs";
-import "axios";
-import "../../../constants/token-data/index.mjs";
-import "../../../constants/tokens.constants.mjs";
-import "idb-keyval";
-import "@solana/web3.js";
-import "../../utils/convertIntegrationProviderToExternalActionId.mjs";
-import { RELAYER_CONFIG as w } from "../../../constants/server.constants.mjs";
-import { RELAYER_URL as y } from "../../../API/getServerURL.mjs";
-import "tronweb";
-import "@coral-xyz/anchor";
-import "@solana/spl-token";
-import "tweetnacl";
-import "bs58";
-import "buffer";
-import "lodash";
-import "../../../API/enclaveUtxoCalls.mjs";
-import "../../../constants/contracts.constants.mjs";
-import "../../../constants/kyc.constants.mjs";
-import "../../../constants/coingecko.constants.mjs";
-import "../../../constants/reorg-depths.constants.mjs";
-import "../../../constants/addresses.constants.mjs";
-import "../../../constants/token.limits.constants.mjs";
-import "../../../constants/presale.constants.mjs";
-import "../../../constants/activity.constants.mjs";
-import "../../../constants/tasks.constants.mjs";
-import "../../../constants/events.constants.mjs";
-import "../../../constants/schedule.constants.mjs";
-import "../../utils/userAgent.mjs";
-import "multiformats";
-import "async-mutex";
-import "process";
-import "../../../providers/EthersProviderAdapter.mjs";
-const l = (r) => {
-  if (r.status === "success")
-    return r.message;
-  throw r.message && r.error ? new d(r.error, r.message) : new Error(r.error);
-}, ur = async (r, o, a, i, m, s, c, p) => {
-  const t = e(i), n = await h({
-    chainId: r,
-    a: o[0],
-    b: o[1],
-    c: o[2],
-    dimData: a,
-    circomData: t,
-    withUniswapWorkAround: m,
-    authorizationData: s,
-    adminData: c,
-    tronProofSignature: p
-  });
-  return l(n);
-}, dr = async (r) => {
-  const o = await f.post(`${y}${w.SOLANA_TRANSACT}`, r);
-  return l(o);
-}, u = (r) => {
-  if (r.status === "success")
-    return r.message.scheduleId;
-  throw new Error(r.error || "Batch transaction failed");
-}, hr = async (r, o, a, i, m) => {
-  const s = o.map((t) => e(t.circomData)), c = {
-    chainId: r,
-    transactions: o.map((t, n) => ({
-      chainId: r,
-      a: t.zkCallData[0],
-      b: t.zkCallData[1],
-      c: t.zkCallData[2],
-      dimData: t.dimData,
-      circomData: s[n],
-      withUniswapWorkAround: t.withUniswapWorkAround,
-      authorizationData: t.authorizationData,
-      adminData: t.adminData,
-      recipientAddress: t.recipientAddress,
-      tronProofSignature: t.tronProofSignature
-    })),
-    txCompletionTime: i,
-    hashedEthereumAddress: a,
-    ref: m
-  }, p = await A(c);
-  return u(p);
-}, Ar = async (r, o, a, i, m) => {
-  const c = await D({
-    chainId: r,
-    transactions: o,
-    hashedEthereumAddress: a,
-    txCompletionTime: i,
-    ref: m
-  });
-  return u(c);
-};
-export {
-  dr as solanaTransactCallRelayer,
-  Ar as solanaTransactCallRelayerBatch,
-  ur as transactCallRelayer,
-  hr as transactCallRelayerBatch
-};
+import { RELAYER_CONFIG as e } from "../../../constants/server.constants.mjs";
+import { RELAYER_URL as t } from "../../../API/getServerURL.mjs";
+import { httpClient as n } from "../../../data-structures/http/HttpClient.mjs";
+import { callRelayerSolanaTransactBatchAPI as r, callRelayerTransactAPI as i, callRelayerTransactBatchAPI as a } from "../../../API/callRelayer.mjs";
+import { ErrorWithRelayerTransaction as o } from "../../../error-handling/customErrors/ErrorWithTx.mjs";
+import { serializeCircomData as s } from "../../snarkjs/common.snarkjs.mjs";
+import "../../../error-handling/index.mjs";
+import "../../snarkjs/index.mjs";
+//#region libs/shared/common/src/functions/web3/functionCalls/transactCallRelayer.ts
+var c = (e) => {
+	if (e.status === "success") return e.message;
+	throw e.message && e.error ? new o(e.error, e.message) : Error(e.error);
+}, l = async (e, t, n, r, a, o, l, u) => {
+	let d = s(r);
+	return c(await i({
+		chainId: e,
+		a: t[0],
+		b: t[1],
+		c: t[2],
+		dimData: n,
+		circomData: d,
+		withUniswapWorkAround: a,
+		authorizationData: o,
+		adminData: l,
+		tronProofSignature: u
+	}));
+}, u = async (r) => c(await n.post(`${t}${e.SOLANA_TRANSACT}`, r)), d = (e) => {
+	if (e.status === "success") return e.message.scheduleId;
+	throw Error(e.error || "Batch transaction failed");
+}, f = async (e, t, n, r, i) => {
+	let o = t.map((e) => s(e.circomData));
+	return d(await a({
+		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: o[n],
+			withUniswapWorkAround: t.withUniswapWorkAround,
+			authorizationData: t.authorizationData,
+			adminData: t.adminData,
+			recipientAddress: t.recipientAddress,
+			tronProofSignature: t.tronProofSignature
+		})),
+		txCompletionTime: r,
+		hashedEthereumAddress: n,
+		ref: i
+	}));
+}, p = async (e, t, n, i, a) => d(await r({
+	chainId: e,
+	transactions: t,
+	hashedEthereumAddress: n,
+	txCompletionTime: i,
+	ref: a
+}));
+//#endregion
+export { u as solanaTransactCallRelayer, p as solanaTransactCallRelayerBatch, l as transactCallRelayer, f as transactCallRelayerBatch };

package/functions/web3/functionCalls/waitForErc20Approvals.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const C=require("../../../types/ethereum-network.types.cjs"),g=require("../../../constants/protocol.constants.cjs"),m=require("../../utils/time.utils.cjs"),v=require("../../utils/caseInsensitive.utils.cjs"),d=require("../../../externalABIs/index.cjs"),k=async(l,i,c,s,u,p=30,a=1e3)=>{const r=u.filter(({tokenAddress:t,requiredAmount:n})=>n>0n&&!v.caseInsensitiveEqual(t,g.zeroAddress));if(r.length===0)return;const e=r.map(({tokenAddress:t})=>l.getContractWithSigner(i,C.ContractType.ERC20Contract,t));for(let t=0;t<p;t+=1){let n=!0;for(let o=0;o<r.length;o+=1){const{requiredAmount:f}=r[o],w=e[o];if(BigInt(await w.allowance(c,s))<f){n=!1;break}}if(n)break;await m.waitLittle(a)}},A=async(l,i,c,s,u=30,p=1e3)=>{const a=s.filter(({tokenAddress:e,requiredAmount:t})=>t>0n&&!v.caseInsensitiveEqual(e,g.zeroAddress)&&!!e);if(a.length===0)return;const r=await Promise.all(a.map(async({tokenAddress:e})=>l.contract(d.ERC20ABI,e)));for(let e=0;e<u;e+=1){let t=!0;for(let n=0;n<a.length;n+=1){const{requiredAmount:o}=a[n],w=await r[n].allowance(i,c).call({from:i});if(BigInt(String(w))<o){t=!1;break}}if(t)break;await m.waitLittle(p)}};exports.waitForErc20Approvals=k;exports.waitForTronErc20Approvals=A;
+const e=require(`../../../types/ethereum-network.types.cjs`),t=require(`../../../constants/protocol.constants.cjs`),n=require(`../../utils/caseInsensitive.utils.cjs`),r=require(`../../../externalABIs/index.cjs`),i=require(`../../utils/time.utils.cjs`);var a=async(r,a,o,s,c,l=30,u=1e3)=>{let d=c.filter(({tokenAddress:e,requiredAmount:r})=>r>0n&&!n.caseInsensitiveEqual(e,t.zeroAddress));if(d.length===0)return;let f=d.map(({tokenAddress:t})=>r.getContractWithSigner(a,e.ContractType.ERC20Contract,t));for(let e=0;e<l;e+=1){let e=!0;for(let t=0;t<d.length;t+=1){let{requiredAmount:n}=d[t],r=f[t];if(BigInt(await r.allowance(o,s))<n){e=!1;break}}if(e)break;await i.waitLittle(u)}},o=async(e,a,o,s,c=30,l=1e3)=>{let u=s.filter(({tokenAddress:e,requiredAmount:r})=>r>0n&&!n.caseInsensitiveEqual(e,t.zeroAddress)&&!!e);if(u.length===0)return;let d=await Promise.all(u.map(async({tokenAddress:t})=>e.contract(r.ERC20ABI,t)));for(let e=0;e<c;e+=1){let e=!0;for(let t=0;t<u.length;t+=1){let{requiredAmount:n}=u[t],r=await d[t].allowance(a,o).call({from:a});if(BigInt(String(r))<n){e=!1;break}}if(e)break;await i.waitLittle(l)}};exports.waitForErc20Approvals=a,exports.waitForTronErc20Approvals=o;

package/functions/web3/functionCalls/waitForErc20Approvals.d.ts

@@ -5,5 +5,7 @@ type ApprovalRequirement = {
     requiredAmount: bigint;
 };
 export declare const waitForErc20Approvals: (hinkal: IHinkal, chainId: number, ownerAddress: string, spenderAddress: string, requirements: ApprovalRequirement[], maxAttempts?: number, intervalMs?: number) => Promise<void>;
-export declare const waitForTronErc20Approvals: (tronWeb: TronWeb, ownerAddress: string, spenderAddress: string, requirements: ApprovalRequirement[], maxAttempts?: number, intervalMs?: number) => Promise<void>;
+export declare const waitForTronErc20Approvals: (tronWeb: TronWeb, ownerAddress: string, // Tron base58 owner address
+spenderAddress: string, // Tron base58 spender address
+requirements: ApprovalRequirement[], maxAttempts?: number, intervalMs?: number) => Promise<void>;
 export {};