@hinkal/common 0.2.19 → 0.2.21

package/functions/web3/events/getInputUtxoAndBalance.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const q=require("../../../data-structures/utxo/Utxo.cjs"),B=require("../../utils/upToDateState.cjs"),O=require("../../utils/cacheFunctions.cjs"),C=require("../../utils/caseInsensitive.utils.cjs"),k=require("../../utils/encodeTokenWithId.cjs"),N=require("./getInputUtxosEnclave.cjs"),K=require("../../utils/solanaMint.utils.cjs"),L=require("../../../constants/chains.constants.cjs"),R=require("../../utils/addresses.cjs"),M=require("../../../API/unspent-utxos-calls.cjs"),P=async(t,e,s,r,o,u,c,n,d)=>{d+=1;const g=u.slice(d),{lastOutput:w,additionalEncryptedOutputs:f}=await t.utxoUtils.batchProcess(g,n,e,s),p=[...c,...f];return await B.checkAddressNotUpdated(t,r),O.setHinkalCache({lastOutput:w,encryptedOutputs:p},t,s,o),await t.utxoUtils.buildBatchProcess(p,e,s)},S=async(t,e,s,r)=>{const{utxos:o,encryptedOutputs:u,lastOutput:c}=await N.getInputUtxosEnclave(t,s,e);return O.setHinkalCache({encryptedOutputs:u,lastOutput:c},t,s,r),o},b=async(t,e,s,r,o,u,c,n,d)=>{try{return await S(t,e,s,o)}catch{return P(t,e,s,r,o,u,c,n,d)}},z=t=>{if(Array.isArray(t))return t;if(t!==void 0)return[t]},F=async(t,e,s)=>await t.utxoUtils.batchFilterUtxosWithNullifier(e,s),H=(t,e,s,r,o,u,c)=>{for(t.sort((n,d)=>n.amount<=d.amount?1:-1);t.length<e||t.length>e&&t.length<6;)if(t.push(new q.Utxo({amount:0n,erc20TokenAddress:o,mintAddress:c,shieldedPrivateKey:r,tokenId:u})),s)for(;t.length>6;)t.splice(t.length-1)},I=async({hinkal:t,chainId:e,passedShieldedPublicKey:s=void 0,ethAddress:r=void 0,resetCacheBefore:o=!1,allowRemoteDecryption:u=!1})=>{const c=r??await t.getEthereumAddress(),n=s??t.userKeys.getShieldedPublicKey(),{userKeys:d}=t,g=t.encryptedOutputsByChain[e],w=t.nullifiersByChain[e],f=Array.from(g);o&&O.resetCache(t,e,n);let{encryptedOutputs:p,lastOutput:y}=O.getHinkalCache(t,e,n);await B.checkAddressNotUpdated(t,c);const x=y!=="",a=f.findIndex(E=>E.value===y),i=a>-1,l=!x&&a===-1,A=t.areMerkleTreeUpdatesDisabled(),U=!A&&(i||!u&&l),m=!A&&u&&l,T=!U&&!m;let v=[];return U?v=await P(t,d,e,c,n,f,p,y,a):m?v=await b(t,d,e,c,n,f,p,y,a):T&&(v=await t.utxoUtils.buildBatchProcess(p,d,e)),await B.checkAddressNotUpdated(t,c),{inputUtxos:(await F(t,v,w)).filter(E=>!E.isBlocked)}},h=async({hinkal:t,chainId:e,ethAddress:s=void 0})=>{const r=s??await t.getEthereumAddress(),o=R.hashEthereumAddress(r);return{inputUtxos:(await M.getUnspentUtxos(e,o)).utxos.map(({utxo:n})=>new q.Utxo({...n,amount:BigInt(n.amount),randomization:n.randomization?BigInt(n.randomization):void 0}))}},_=async({hinkal:t,tokenWithId:e,minInput:s=2,sliceIfMore6:r=!0,chainId:o,passedShieldedPrivateKey:u=void 0,passedShieldedPublicKey:c=void 0,ethAddress:n=void 0,resetCacheBefore:d=!1,ensuredTokensWithId:g,useBlockedUtxos:w=!1})=>{const f=u??t.userKeys.getShieldedPrivateKey(),{inputUtxos:p}=w?await h({hinkal:t,chainId:o,ethAddress:n}):await I({hinkal:t,tokenWithId:e,minInput:s,sliceIfMore6:r,chainId:o,passedShieldedPrivateKey:u,passedShieldedPublicKey:c,ethAddress:n,resetCacheBefore:d}),y=z(e),x=new Map;p.forEach(a=>{const i=a.getTokenAddress(o);if(y&&!y.some(U=>C.caseInsensitiveEqual(U.erc20TokenAddress,i)&&U.tokenId===a.tokenId))return;const l=k.encodeTokenWithId(o,{erc20TokenAddress:i,tokenId:a.tokenId}),A=x.get(l)??[];x.set(l,[...A,a])}),g?.forEach(a=>{const i=k.encodeTokenWithId(o,{erc20TokenAddress:a.erc20TokenAddress,tokenId:a.tokenId});x.set(i,x.get(i)??[])});for(const[a,i]of x){const l=a.split("-")[0],A=Number(a.split("-")[1]),U=L.isSolanaLike(o),m=U?l:void 0,T=U?K.formatMintAddress(l).compressedAddress.toLowerCase():l.toLowerCase();H(i,s,r,f,T,A,m)}return x};exports.attemptGetInputUtxosRemotely=b;exports.getInputUtxoAndBalance=I;exports.getInputUtxoAndBalanceOfStuckUtxos=h;exports.getInputUtxoAndBalancePerToken=_;exports.getInputUtxosRemotely=S;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const P=require("../../../data-structures/utxo/Utxo.cjs"),B=require("../../utils/upToDateState.cjs"),O=require("../../utils/cacheFunctions.cjs"),I=require("../../utils/caseInsensitive.utils.cjs"),q=require("../../utils/encodeTokenWithId.cjs"),K=require("./getInputUtxosEnclave.cjs"),L=require("../../utils/solanaMint.utils.cjs"),M=require("../../../constants/chains.constants.cjs"),N=require("../../utils/addresses.cjs"),R=require("../../../API/unspent-utxos-calls.cjs"),F=require("async-mutex"),z=new F.Mutex,k=async(t,e,s,r,o,a,c,n,d)=>z.runExclusive(async()=>{d+=1;const A=a.slice(d),{lastOutput:w,additionalEncryptedOutputs:f}=await t.utxoUtils.batchProcess(A,n,e,s),p=[...c,...f];return await B.checkAddressNotUpdated(t,r),O.setHinkalCache({lastOutput:w,encryptedOutputs:p},t,s,o),await t.utxoUtils.buildBatchProcess(p,e,s)}),S=async(t,e,s,r)=>{const{utxos:o,encryptedOutputs:a,lastOutput:c}=await K.getInputUtxosEnclave(t,s,e);return O.setHinkalCache({encryptedOutputs:a,lastOutput:c},t,s,r),o},h=async(t,e,s,r,o,a,c,n,d)=>{try{return await S(t,e,s,o)}catch{return k(t,e,s,r,o,a,c,n,d)}},H=t=>{if(Array.isArray(t))return t;if(t!==void 0)return[t]},_=async(t,e,s)=>await t.utxoUtils.batchFilterUtxosWithNullifier(e,s),G=(t,e,s,r,o,a,c)=>{for(t.sort((n,d)=>n.amount<=d.amount?1:-1);t.length<e||t.length>e&&t.length<6;)if(t.push(new P.Utxo({amount:0n,erc20TokenAddress:o,mintAddress:c,shieldedPrivateKey:r,tokenId:a})),s)for(;t.length>6;)t.splice(t.length-1)},b=async({hinkal:t,chainId:e,passedShieldedPublicKey:s=void 0,ethAddress:r=void 0,resetCacheBefore:o=!1,allowRemoteDecryption:a=!1})=>{const c=r??await t.getEthereumAddress(),n=s??t.userKeys.getShieldedPublicKey(),{userKeys:d}=t,A=t.encryptedOutputsByChain[e],w=t.nullifiersByChain[e],f=Array.from(A);o&&O.resetCache(t,e,n);let{encryptedOutputs:p,lastOutput:y}=O.getHinkalCache(t,e,n);await B.checkAddressNotUpdated(t,c);const x=y!=="",u=f.findIndex(T=>T.value===y),i=u>-1,l=!x&&u===-1,g=t.areMerkleTreeUpdatesDisabled(),U=!g&&(i||!a&&l),m=!g&&a&&l,E=!U&&!m;let v=[];return U?v=await k(t,d,e,c,n,f,p,y,u):m?v=await h(t,d,e,c,n,f,p,y,u):E&&(v=await t.utxoUtils.buildBatchProcess(p,d,e)),await B.checkAddressNotUpdated(t,c),{inputUtxos:(await _(t,v,w)).filter(T=>!T.isBlocked)}},C=async({hinkal:t,chainId:e,ethAddress:s=void 0})=>{const r=s??await t.getEthereumAddressByChain(e),o=N.hashEthereumAddress(r);return{inputUtxos:(await R.getUnspentUtxos(e,o)).utxos.map(({utxo:n})=>new P.Utxo({...n,amount:BigInt(n.amount),randomization:n.randomization?BigInt(n.randomization):void 0,shieldedPrivateKey:t.userKeys.getShieldedPrivateKey()}))}},j=async({hinkal:t,tokenWithId:e,minInput:s=2,sliceIfMore6:r=!0,chainId:o,passedShieldedPrivateKey:a=void 0,passedShieldedPublicKey:c=void 0,ethAddress:n=void 0,resetCacheBefore:d=!1,ensuredTokensWithId:A,useBlockedUtxos:w=!1})=>{const f=a??t.userKeys.getShieldedPrivateKey(),{inputUtxos:p}=w?await C({hinkal:t,chainId:o,ethAddress:n}):await b({hinkal:t,tokenWithId:e,minInput:s,sliceIfMore6:r,chainId:o,passedShieldedPrivateKey:a,passedShieldedPublicKey:c,ethAddress:n,resetCacheBefore:d}),y=H(e),x=new Map;p.forEach(u=>{const i=u.getTokenAddress(o);if(y&&!y.some(U=>I.caseInsensitiveEqual(U.erc20TokenAddress,i)&&U.tokenId===u.tokenId))return;const l=q.encodeTokenWithId(o,{erc20TokenAddress:i,tokenId:u.tokenId}),g=x.get(l)??[];x.set(l,[...g,u])}),A?.forEach(u=>{const i=q.encodeTokenWithId(o,{erc20TokenAddress:u.erc20TokenAddress,tokenId:u.tokenId});x.set(i,x.get(i)??[])});for(const[u,i]of x){const l=u.split("-")[0],g=Number(u.split("-")[1]),U=M.isSolanaLike(o),m=U?l:void 0,E=U?L.formatMintAddress(l).compressedAddress.toLowerCase():l.toLowerCase();G(i,s,r,f,E,g,m)}return x};exports.attemptGetInputUtxosRemotely=h;exports.getInputUtxoAndBalance=b;exports.getInputUtxoAndBalanceOfStuckUtxos=C;exports.getInputUtxoAndBalancePerToken=j;exports.getInputUtxosRemotely=S;

package/functions/web3/events/getInputUtxoAndBalance.mjs

@@ -1,22 +1,23 @@
 import { Utxo as P } from "../../../data-structures/utxo/Utxo.mjs";
-import { checkAddressNotUpdated as T } from "../../utils/upToDateState.mjs";
-import { setHinkalCache as b, resetCache as S, getHinkalCache as K } from "../../utils/cacheFunctions.mjs";
+import { checkAddressNotUpdated as B } from "../../utils/upToDateState.mjs";
+import { setHinkalCache as K, resetCache as C, getHinkalCache as S } from "../../utils/cacheFunctions.mjs";
 import { caseInsensitiveEqual as L } from "../../utils/caseInsensitive.utils.mjs";
-import { encodeTokenWithId as B } from "../../utils/encodeTokenWithId.mjs";
+import { encodeTokenWithId as T } from "../../utils/encodeTokenWithId.mjs";
 import { getInputUtxosEnclave as k } from "./getInputUtxosEnclave.mjs";
 import { formatMintAddress as N } from "../../utils/solanaMint.utils.mjs";
-import { isSolanaLike as z } from "../../../constants/chains.constants.mjs";
-import { hashEthereumAddress as R } from "../../utils/addresses.mjs";
+import { isSolanaLike as h } from "../../../constants/chains.constants.mjs";
+import { hashEthereumAddress as z } from "../../utils/addresses.mjs";
 import { getUnspentUtxos as F } from "../../../API/unspent-utxos-calls.mjs";
-const C = async (t, e, s, n, o, u, c, r, d) => {
+import { Mutex as M } from "async-mutex";
+const R = new M(), b = async (t, e, s, n, o, a, c, r, d) => R.runExclusive(async () => {
   d += 1;
-  const w = u.slice(d), { lastOutput: A, additionalEncryptedOutputs: x } = await t.utxoUtils.batchProcess(
-    w,
+  const U = a.slice(d), { lastOutput: A, additionalEncryptedOutputs: x } = await t.utxoUtils.batchProcess(
+    U,
     r,
     e,
     s
   ), l = [...c, ...x];
-  return await T(t, n), b(
+  return await B(t, n), K(
     {
       lastOutput: A,
       encryptedOutputs: l
@@ -25,62 +26,62 @@ const C = async (t, e, s, n, o, u, c, r, d) => {
     s,
     o
   ), await t.utxoUtils.buildBatchProcess(l, e, s);
-}, H = async (t, e, s, n) => {
+}), H = async (t, e, s, n) => {
   const {
     utxos: o,
-    encryptedOutputs: u,
+    encryptedOutputs: a,
     lastOutput: c
   } = await k(t, s, e);
-  return b(
+  return K(
     {
-      encryptedOutputs: u,
+      encryptedOutputs: a,
       lastOutput: c
     },
     t,
     s,
     n
   ), o;
-}, M = async (t, e, s, n, o, u, c, r, d) => {
+}, q = async (t, e, s, n, o, a, c, r, d) => {
   try {
     return await H(t, e, s, o);
   } catch {
-    return C(
+    return b(
       t,
       e,
       s,
       n,
       o,
-      u,
+      a,
       c,
       r,
       d
     );
   }
-}, h = (t) => {
+}, G = (t) => {
   if (Array.isArray(t))
     return t;
   if (t !== void 0)
     return [t];
-}, q = async (t, e, s) => await t.utxoUtils.batchFilterUtxosWithNullifier(e, s), G = (t, e, s, n, o, u, c) => {
+}, j = async (t, e, s) => await t.utxoUtils.batchFilterUtxosWithNullifier(e, s), D = (t, e, s, n, o, a, c) => {
   for (t.sort((r, d) => r.amount <= d.amount ? 1 : -1); t.length < e || t.length > e && t.length < 6; )
-    if (t.push(new P({ amount: 0n, erc20TokenAddress: o, mintAddress: c, shieldedPrivateKey: n, tokenId: u })), s)
+    if (t.push(new P({ amount: 0n, erc20TokenAddress: o, mintAddress: c, shieldedPrivateKey: n, tokenId: a })), s)
       for (; t.length > 6; )
         t.splice(t.length - 1);
-}, j = async ({
+}, J = async ({
   hinkal: t,
   chainId: e,
   passedShieldedPublicKey: s = void 0,
   ethAddress: n = void 0,
   resetCacheBefore: o = !1,
-  allowRemoteDecryption: u = !1
+  allowRemoteDecryption: a = !1
 }) => {
-  const c = n ?? await t.getEthereumAddress(), r = s ?? t.userKeys.getShieldedPublicKey(), { userKeys: d } = t, w = t.encryptedOutputsByChain[e], A = t.nullifiersByChain[e], x = Array.from(w);
-  o && S(t, e, r);
-  let { encryptedOutputs: l, lastOutput: m } = K(t, e, r);
-  await T(t, c);
-  const f = m !== "", a = x.findIndex((E) => E.value === m), i = a > -1, p = !f && a === -1, U = t.areMerkleTreeUpdatesDisabled(), y = !U && (i || !u && p), g = !U && u && p, O = !y && !g;
+  const c = n ?? await t.getEthereumAddress(), r = s ?? t.userKeys.getShieldedPublicKey(), { userKeys: d } = t, U = t.encryptedOutputsByChain[e], A = t.nullifiersByChain[e], x = Array.from(U);
+  o && C(t, e, r);
+  let { encryptedOutputs: l, lastOutput: m } = S(t, e, r);
+  await B(t, c);
+  const y = m !== "", u = x.findIndex((E) => E.value === m), i = u > -1, p = !y && u === -1, w = t.areMerkleTreeUpdatesDisabled(), f = !w && (i || !a && p), g = !w && a && p, O = !f && !g;
   let v = [];
-  return y ? v = await C(
+  return f ? v = await b(
     t,
     d,
     e,
@@ -89,8 +90,8 @@ const C = async (t, e, s, n, o, u, c, r, d) => {
     x,
     l,
     m,
-    a
-  ) : g ? v = await M(
+    u
+  ) : g ? v = await q(
     t,
     d,
     e,
@@ -99,74 +100,75 @@ const C = async (t, e, s, n, o, u, c, r, d) => {
     x,
     l,
     m,
-    a
-  ) : O && (v = await t.utxoUtils.buildBatchProcess(l, d, e)), await T(t, c), { inputUtxos: (await q(t, v, A)).filter((E) => !E.isBlocked) };
-}, D = async ({
+    u
+  ) : O && (v = await t.utxoUtils.buildBatchProcess(l, d, e)), await B(t, c), { inputUtxos: (await j(t, v, A)).filter((E) => !E.isBlocked) };
+}, Q = async ({
   hinkal: t,
   chainId: e,
   ethAddress: s = void 0
 }) => {
-  const n = s ?? await t.getEthereumAddress(), o = R(n);
+  const n = s ?? await t.getEthereumAddressByChain(e), o = z(n);
   return { inputUtxos: (await F(e, o)).utxos.map(
     ({ utxo: r }) => new P({
       ...r,
       amount: BigInt(r.amount),
-      randomization: r.randomization ? BigInt(r.randomization) : void 0
+      randomization: r.randomization ? BigInt(r.randomization) : void 0,
+      shieldedPrivateKey: t.userKeys.getShieldedPrivateKey()
     })
   ) };
-}, st = async ({
+}, nt = async ({
   hinkal: t,
   tokenWithId: e,
   minInput: s = 2,
   sliceIfMore6: n = !0,
   chainId: o,
-  passedShieldedPrivateKey: u = void 0,
+  passedShieldedPrivateKey: a = void 0,
   passedShieldedPublicKey: c = void 0,
   ethAddress: r = void 0,
   resetCacheBefore: d = !1,
-  ensuredTokensWithId: w,
+  ensuredTokensWithId: U,
   useBlockedUtxos: A = !1
 }) => {
-  const x = u ?? t.userKeys.getShieldedPrivateKey(), { inputUtxos: l } = A ? await D({
+  const x = a ?? t.userKeys.getShieldedPrivateKey(), { inputUtxos: l } = A ? await Q({
     hinkal: t,
     chainId: o,
     ethAddress: r
-  }) : await j({
+  }) : await J({
     hinkal: t,
     tokenWithId: e,
     minInput: s,
     sliceIfMore6: n,
     chainId: o,
-    passedShieldedPrivateKey: u,
+    passedShieldedPrivateKey: a,
     passedShieldedPublicKey: c,
     ethAddress: r,
     resetCacheBefore: d
-  }), m = h(e), f = /* @__PURE__ */ new Map();
-  l.forEach((a) => {
-    const i = a.getTokenAddress(o);
+  }), m = G(e), y = /* @__PURE__ */ new Map();
+  l.forEach((u) => {
+    const i = u.getTokenAddress(o);
     if (m && !m.some(
-      (y) => L(y.erc20TokenAddress, i) && y.tokenId === a.tokenId
+      (f) => L(f.erc20TokenAddress, i) && f.tokenId === u.tokenId
     ))
       return;
-    const p = B(o, { erc20TokenAddress: i, tokenId: a.tokenId }), U = f.get(p) ?? [];
-    f.set(p, [...U, a]);
-  }), w?.forEach((a) => {
-    const i = B(o, {
-      erc20TokenAddress: a.erc20TokenAddress,
-      tokenId: a.tokenId
+    const p = T(o, { erc20TokenAddress: i, tokenId: u.tokenId }), w = y.get(p) ?? [];
+    y.set(p, [...w, u]);
+  }), U?.forEach((u) => {
+    const i = T(o, {
+      erc20TokenAddress: u.erc20TokenAddress,
+      tokenId: u.tokenId
     });
-    f.set(i, f.get(i) ?? []);
+    y.set(i, y.get(i) ?? []);
   });
-  for (const [a, i] of f) {
-    const p = a.split("-")[0], U = Number(a.split("-")[1]), y = z(o), g = y ? p : void 0, O = y ? N(p).compressedAddress.toLowerCase() : p.toLowerCase();
-    G(i, s, n, x, O, U, g);
+  for (const [u, i] of y) {
+    const p = u.split("-")[0], w = Number(u.split("-")[1]), f = h(o), g = f ? p : void 0, O = f ? N(p).compressedAddress.toLowerCase() : p.toLowerCase();
+    D(i, s, n, x, O, w, g);
   }
-  return f;
+  return y;
 };
 export {
-  M as attemptGetInputUtxosRemotely,
-  j as getInputUtxoAndBalance,
-  D as getInputUtxoAndBalanceOfStuckUtxos,
-  st as getInputUtxoAndBalancePerToken,
+  q as attemptGetInputUtxosRemotely,
+  J as getInputUtxoAndBalance,
+  Q as getInputUtxoAndBalanceOfStuckUtxos,
+  nt as getInputUtxoAndBalancePerToken,
   H as getInputUtxosRemotely
 };

package/functions/web3/events/getTransactionLogEvents.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../../constants/token-data/index.cjs");const c=require("../../../constants/chains.constants.cjs");require("../../../constants/contracts.constants.cjs");require("../../../constants/kyc.constants.cjs");require("../../../constants/server.constants.cjs");require("../../../constants/vite.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");const a=require("ethers");require("idb-keyval");const q=require("../../utils/create-provider.cjs");require("../../../error-handling/error-codes.constants.cjs");require("../../utils/convertIntegrationProviderToExternalActionId.cjs");require("../../../types/circom-data.types.cjs");require("../../../types/transactions.types.cjs");require("../../../types/activities.types.cjs");require("circomlibjs-hinkal-fork");require("../../../data-structures/crypto-keys/keys.cjs");require("../../../API/getServerURL.cjs");require("../../../data-structures/http/HttpClient.cjs");require("axios");require("@solana/web3.js");require("@coral-xyz/anchor");require("@solana/spl-token");require("../../utils/userAgent.cjs");require("libsodium-wrappers");require("multiformats");require("async-mutex");require("../../../API/tenderly.api.cjs");require("process");require("buffer");require("../../../providers/EthersProviderAdapter.cjs");const l=(o,n)=>{const u=new a.ethers.utils.Interface(n);try{const e=u.parseLog(o);return{name:e.name,args:e.args}}catch{return console.warn("Could not decode log"),null}};async function d(o,n,u,e){try{const t=c.networkRegistry[o].fetchRpcUrl;if(!t)throw new Error("RPC URL not found for the specified chain ID");const r=await q.createCustomRpcProvider(t).getTransactionReceipt(n);if(!r)throw new Error("Transaction receipt not found");if(r.status!==1)throw new Error("Transaction failed");const s=r.logs.filter(i=>i.address.toLowerCase()===u.toLowerCase()).map(i=>l(i,e)).filter(i=>i!==null);return{transactionHash:r.transactionHash,from:r.from,to:r.to,blockNumber:r.blockNumber,events:s}}catch(t){throw console.error("Error retrieving transaction events:",t),t}}exports.getTransactionLogEvents=d;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("ethers");require("idb-keyval");require("../../../constants/chains.constants.cjs");const q=require("../../utils/create-provider.cjs");require("../../../constants/token-data/index.cjs");require("../../../error-handling/error-codes.constants.cjs");require("../../utils/convertIntegrationProviderToExternalActionId.cjs");require("../../../types/circom-data.types.cjs");require("../../../types/transactions.types.cjs");require("../../../types/activities.types.cjs");require("circomlibjs-hinkal-fork");require("../../../data-structures/crypto-keys/keys.cjs");require("../../../constants/server.constants.cjs");require("../../../API/getServerURL.cjs");require("../../../data-structures/http/HttpClient.cjs");require("axios");require("../../../constants/vite.constants.cjs");require("@solana/web3.js");require("@coral-xyz/anchor");require("@solana/spl-token");require("ethers-v6h");require("tweetnacl");require("bs58");require("buffer");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("../../utils/userAgent.cjs");require("libsodium-wrappers");require("multiformats");require("../../../API/enclaveCalls.cjs");require("async-mutex");require("process");require("../../../providers/EthersProviderAdapter.cjs");const c=(t,o)=>{const u=new a.ethers.utils.Interface(o);try{const e=u.parseLog(t);return{name:e.name,args:e.args}}catch{return console.warn("Could not decode log"),null}};async function l(t,o,u,e){try{const r=await q.createCustomRpcProvider(t).getTransactionReceipt(o);if(!r)throw new Error("Transaction receipt not found");if(r.status!==1)throw new Error("Transaction failed");const s=r.logs.filter(i=>i.address.toLowerCase()===u.toLowerCase()).map(i=>c(i,e)).filter(i=>i!==null);return{transactionHash:r.transactionHash,from:r.from,to:r.to,blockNumber:r.blockNumber,events:s}}catch(n){throw console.error("Error retrieving transaction events:",n),n}}exports.getTransactionLogEvents=l;

package/functions/web3/events/getTransactionLogEvents.mjs

@@ -1,20 +1,8 @@
-import "../../../constants/token-data/index.mjs";
-import { networkRegistry as s } from "../../../constants/chains.constants.mjs";
-import "../../../constants/contracts.constants.mjs";
-import "../../../constants/kyc.constants.mjs";
-import "../../../constants/server.constants.mjs";
-import "../../../constants/vite.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 { ethers as a } from "ethers";
 import "idb-keyval";
-import { createCustomRpcProvider as c } from "../../utils/create-provider.mjs";
+import "../../../constants/chains.constants.mjs";
+import { createCustomRpcProvider as s } from "../../utils/create-provider.mjs";
+import "../../../constants/token-data/index.mjs";
 import "../../../error-handling/error-codes.constants.mjs";
 import "../../utils/convertIntegrationProviderToExternalActionId.mjs";
 import "../../../types/circom-data.types.mjs";
@@ -22,54 +10,66 @@ import "../../../types/transactions.types.mjs";
 import "../../../types/activities.types.mjs";
 import "circomlibjs-hinkal-fork";
 import "../../../data-structures/crypto-keys/keys.mjs";
+import "../../../constants/server.constants.mjs";
 import "../../../API/getServerURL.mjs";
 import "../../../data-structures/http/HttpClient.mjs";
 import "axios";
+import "../../../constants/vite.constants.mjs";
 import "@solana/web3.js";
 import "@coral-xyz/anchor";
 import "@solana/spl-token";
+import "ethers-v6h";
+import "tweetnacl";
+import "bs58";
+import "buffer";
+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 "../../utils/userAgent.mjs";
 import "libsodium-wrappers";
 import "multiformats";
+import "../../../API/enclaveCalls.mjs";
 import "async-mutex";
-import "../../../API/tenderly.api.mjs";
 import "process";
-import "buffer";
 import "../../../providers/EthersProviderAdapter.mjs";
-const f = (e, n) => {
-  const p = new a.utils.Interface(n);
+const c = (i, e) => {
+  const m = new a.utils.Interface(e);
   try {
-    const o = p.parseLog(e);
+    const t = m.parseLog(i);
     return {
-      name: o.name,
-      args: o.args
+      name: t.name,
+      args: t.args
     };
   } catch {
     return console.warn("Could not decode log"), null;
   }
 };
-async function Z(e, n, p, o) {
+async function _(i, e, m, t) {
   try {
-    const t = s[e].fetchRpcUrl;
-    if (!t)
-      throw new Error("RPC URL not found for the specified chain ID");
-    const r = await c(t).getTransactionReceipt(n);
+    const r = await s(i).getTransactionReceipt(e);
     if (!r)
       throw new Error("Transaction receipt not found");
     if (r.status !== 1)
       throw new Error("Transaction failed");
-    const m = r.logs.filter((i) => i.address.toLowerCase() === p.toLowerCase()).map((i) => f(i, o)).filter((i) => i !== null);
+    const n = r.logs.filter((o) => o.address.toLowerCase() === m.toLowerCase()).map((o) => c(o, t)).filter((o) => o !== null);
     return {
       transactionHash: r.transactionHash,
       from: r.from,
       to: r.to,
       blockNumber: r.blockNumber,
-      events: m
+      events: n
     };
-  } catch (t) {
-    throw console.error("Error retrieving transaction events:", t), t;
+  } catch (p) {
+    throw console.error("Error retrieving transaction events:", p), p;
   }
 }
 export {
-  Z as getTransactionLogEvents
+  _ as getTransactionLogEvents
 };

package/functions/web3/fetchSolanaMerkleTreeRootHash.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("ethers");require("idb-keyval");require("../../constants/chains.constants.cjs");require("@solana/web3.js");require("../../data-structures/http/HttpClient.cjs");require("../../constants/vite.constants.cjs");require("../../constants/token-data/index.cjs");require("../../error-handling/error-codes.constants.cjs");require("../utils/convertIntegrationProviderToExternalActionId.cjs");require("../../types/circom-data.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");require("circomlibjs-hinkal-fork");require("../../data-structures/crypto-keys/keys.cjs");require("../../constants/server.constants.cjs");require("../../API/getServerURL.cjs");require("axios");require("@coral-xyz/anchor");require("@solana/spl-token");const r=require("../utils/bytes32.utils.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("../utils/userAgent.cjs");require("libsodium-wrappers");require("multiformats");require("async-mutex");require("../../API/tenderly.api.cjs");require("process");require("buffer");require("../../providers/EthersProviderAdapter.cjs");const n=async(i,u)=>{const e=await i.account.merkle.fetch(u,"confirmed"),q=Number(r.convertBytes32ToBigInt(e.rootIndex)),t=e.roots.at(q-1);return o.ethers.BigNumber.from(r.convertBytes32ToBigInt(t).toString())};exports.fetchSolanaMerkleTreeRootHash=n;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("ethers");require("idb-keyval");require("../../constants/chains.constants.cjs");require("@solana/web3.js");require("../../data-structures/http/HttpClient.cjs");require("../../constants/vite.constants.cjs");require("../../constants/token-data/index.cjs");require("../../error-handling/error-codes.constants.cjs");require("../utils/convertIntegrationProviderToExternalActionId.cjs");require("../../types/circom-data.types.cjs");require("../../types/transactions.types.cjs");require("../../types/activities.types.cjs");require("circomlibjs-hinkal-fork");require("../../data-structures/crypto-keys/keys.cjs");require("../../constants/server.constants.cjs");require("../../API/getServerURL.cjs");require("axios");require("@coral-xyz/anchor");require("@solana/spl-token");require("ethers-v6h");require("tweetnacl");require("bs58");const r=require("../utils/bytes32.utils.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("../utils/userAgent.cjs");require("libsodium-wrappers");require("multiformats");require("../../API/enclaveCalls.cjs");require("async-mutex");require("process");require("buffer");require("../../providers/EthersProviderAdapter.cjs");const n=async(i,u)=>{const e=await i.account.merkle.fetch(u,"confirmed"),q=Number(r.convertBytes32ToBigInt(e.rootIndex)),t=e.roots.at(q-1);return o.ethers.BigNumber.from(r.convertBytes32ToBigInt(t).toString())};exports.fetchSolanaMerkleTreeRootHash=n;

package/functions/web3/fetchSolanaMerkleTreeRootHash.mjs

@@ -17,6 +17,9 @@ import "../../API/getServerURL.mjs";
 import "axios";
 import "@coral-xyz/anchor";
 import "@solana/spl-token";
+import "ethers-v6h";
+import "tweetnacl";
+import "bs58";
 import { convertBytes32ToBigInt as t } from "../utils/bytes32.utils.mjs";
 import "../../constants/contracts.constants.mjs";
 import "../../constants/kyc.constants.mjs";
@@ -31,15 +34,15 @@ import "../../constants/events.constants.mjs";
 import "../utils/userAgent.mjs";
 import "libsodium-wrappers";
 import "multiformats";
+import "../../API/enclaveCalls.mjs";
 import "async-mutex";
-import "../../API/tenderly.api.mjs";
 import "process";
 import "buffer";
 import "../../providers/EthersProviderAdapter.mjs";
-const Q = async (r, m) => {
+const W = async (r, m) => {
   const o = await r.account.merkle.fetch(m, "confirmed"), i = Number(t(o.rootIndex)), p = o.roots.at(i - 1);
   return e.BigNumber.from(t(p).toString());
 };
 export {
-  Q as fetchSolanaMerkleTreeRootHash
+  W as fetchSolanaMerkleTreeRootHash
 };

package/functions/web3/functionCalls/approveToken.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("ethers"),u=require("../../../constants/chains.constants.cjs"),x=require("../../../constants/protocol.constants.cjs"),p=require("../../../types/token.types.cjs"),y=require("../../../types/ethereum-network.types.cjs"),F=require("./recoverTransactionFromError.cjs"),q=async(e,r,a)=>BigInt(await a.allowance(await a.signer.getAddress(),r.address))>=e,E=async(e,r,a,c,n)=>{if(u.getNonLocalhostChainId(r)!==u.chainIds.ethMainnet||c.symbol.toLowerCase()!=="usdt"||BigInt(await n.allowance(await n.signer.getAddress(),a.address))===0n)return;const i=await n.approve(a.address,0n);i&&"hash"in i&&await e.waitForTransaction(r,i.hash)},P=async(e,r,a,c,n)=>{const d=e.getContractWithSigner(r,y.ContractType.ERC20Contract,n.erc20TokenAddress),i=n.approvalType??p.ApprovalType.Classic;if(i===p.ApprovalType.Classic||!e.isPermitterAvailable()){if(await q(c,a,d))return;await E(e,r,a,n,d);const T=r===u.chainIds.base?2:1;try{const o=await d.approve(a.address,c);o&&"hash"in o&&await e.waitForTransaction(r,o.hash,T)}catch(o){if(!o?.transactionHash)throw o;const{provider:b}=d;if(!await F.recoverTransactionFromError(b,o.transactionHash,T))throw o}return}const l=await e.getEthereumAddress(),g=e.getContract(r,y.ContractType.PermitterContract),C=await e.getContractWithFetcher(r,y.ContractType.ContractWithNonces,n.erc20TokenAddress).nonces(l),w=BigInt(Date.now()+x.permitSignatureValidFor)/1000n,t={owner:l,holder:l,spender:g.address,value:c,nonce:C,deadline:w,expiry:w,allowed:!0},{v:m,r:v,s:f}=s.ethers.utils.splitSignature(await e.signTypedData({name:await d.name(),chainId:r,version:"1",verifyingContract:n.erc20TokenAddress},{Permit:i===p.ApprovalType.ERC20Permit?[{name:"owner",type:"address"},{name:"spender",type:"address"},{name:"value",type:"uint256"},{name:"nonce",type:"uint256"},{name:"deadline",type:"uint256"}]:[{name:"holder",type:"address"},{name:"spender",type:"address"},{name:"nonce",type:"uint256"},{name:"expiry",type:"uint256"},{name:"allowed",type:"bool"}]},t));if(i===p.ApprovalType.ERC20Permit){const h=new s.ethers.utils.Interface(["function permit(address owner,address spender,uint256 value,uint256 deadline,uint8 v,bytes32 r,bytes32 s) external"]);return s.ethers.utils.arrayify(h.encodeFunctionData("permit",[t.owner,t.spender,t.value,t.deadline,m,s.ethers.utils.arrayify(v),s.ethers.utils.arrayify(f)])).slice(4)}const A=new s.ethers.utils.Interface(["function permit(address holder,address spender,uint256 nonce,uint256 expiry,bool allowed,uint8 v,bytes32 r,bytes32 s) external"]);return s.ethers.utils.arrayify(A.encodeFunctionData("permit",[t.holder,t.spender,t.nonce,t.expiry,t.allowed,m,s.ethers.utils.arrayify(v),s.ethers.utils.arrayify(f)])).slice(4)};exports.approveTokenToHinkal=P;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const s=require("ethers"),u=require("../../../constants/chains.constants.cjs"),x=require("../../../constants/protocol.constants.cjs"),p=require("../../../types/token.types.cjs"),y=require("../../../types/ethereum-network.types.cjs"),F=require("./recoverTransactionFromError.cjs"),q=async(r,e,a)=>BigInt(await a.allowance(await a.signer.getAddress(),e.address))>=r,E=async(r,e,a,c,n)=>{if(u.getNonLocalhostChainId(e)!==u.chainIds.ethMainnet||c.symbol.toLowerCase()!=="usdt"||BigInt(await n.allowance(await n.signer.getAddress(),a.address))===0n)return;const i=await n.approve(a.address,0n);i&&"hash"in i&&await r.waitForTransaction(e,i.hash)},P=async(r,e,a,c,n)=>{const d=r.getContractWithSigner(e,y.ContractType.ERC20Contract,n.erc20TokenAddress),i=n.approvalType??p.ApprovalType.Classic;if(i===p.ApprovalType.Classic||!r.isPermitterAvailable(e)){if(await q(c,a,d))return;await E(r,e,a,n,d);const T=e===u.chainIds.base?2:1;try{const o=await d.approve(a.address,c);o&&"hash"in o&&await r.waitForTransaction(e,o.hash,T)}catch(o){if(!o?.transactionHash)throw o;const{provider:b}=d;if(!await F.recoverTransactionFromError(b,o.transactionHash,T))throw o}return}const l=await r.getEthereumAddressByChain(e),g=r.getContract(e,y.ContractType.PermitterContract),C=await r.getContractWithFetcher(e,y.ContractType.ContractWithNonces,n.erc20TokenAddress).nonces(l),w=BigInt(Date.now()+x.permitSignatureValidFor)/1000n,t={owner:l,holder:l,spender:g.address,value:c,nonce:C,deadline:w,expiry:w,allowed:!0},{v:m,r:v,s:f}=s.ethers.utils.splitSignature(await r.signTypedData({name:await d.name(),chainId:e,version:"1",verifyingContract:n.erc20TokenAddress},{Permit:i===p.ApprovalType.ERC20Permit?[{name:"owner",type:"address"},{name:"spender",type:"address"},{name:"value",type:"uint256"},{name:"nonce",type:"uint256"},{name:"deadline",type:"uint256"}]:[{name:"holder",type:"address"},{name:"spender",type:"address"},{name:"nonce",type:"uint256"},{name:"expiry",type:"uint256"},{name:"allowed",type:"bool"}]},t));if(i===p.ApprovalType.ERC20Permit){const h=new s.ethers.utils.Interface(["function permit(address owner,address spender,uint256 value,uint256 deadline,uint8 v,bytes32 r,bytes32 s) external"]);return s.ethers.utils.arrayify(h.encodeFunctionData("permit",[t.owner,t.spender,t.value,t.deadline,m,s.ethers.utils.arrayify(v),s.ethers.utils.arrayify(f)])).slice(4)}const A=new s.ethers.utils.Interface(["function permit(address holder,address spender,uint256 nonce,uint256 expiry,bool allowed,uint8 v,bytes32 r,bytes32 s) external"]);return s.ethers.utils.arrayify(A.encodeFunctionData("permit",[t.holder,t.spender,t.nonce,t.expiry,t.allowed,m,s.ethers.utils.arrayify(v),s.ethers.utils.arrayify(f)])).slice(4)};exports.approveTokenToHinkal=P;

package/functions/web3/functionCalls/approveToken.mjs

@@ -4,29 +4,29 @@ import { permitSignatureValidFor as F } from "../../../constants/protocol.consta
 import { ApprovalType as l } from "../../../types/token.types.mjs";
 import { ContractType as y } from "../../../types/ethereum-network.types.mjs";
 import { recoverTransactionFromError as E } from "./recoverTransactionFromError.mjs";
-const P = async (e, r, a) => BigInt(
-  await a.allowance(await a.signer.getAddress(), r.address)
-) >= e, D = async (e, r, a, c, n) => {
-  if (b(r) !== C.ethMainnet || c.symbol.toLowerCase() !== "usdt" || BigInt(
+const P = async (r, e, a) => BigInt(
+  await a.allowance(await a.signer.getAddress(), e.address)
+) >= r, B = async (r, e, a, c, n) => {
+  if (b(e) !== C.ethMainnet || c.symbol.toLowerCase() !== "usdt" || BigInt(
     await n.allowance(await n.signer.getAddress(), a.address)
   ) === 0n)
     return;
   const o = await n.approve(a.address, 0n);
-  o && "hash" in o && await e.waitForTransaction(r, o.hash);
-}, M = async (e, r, a, c, n) => {
-  const d = e.getContractWithSigner(r, y.ERC20Contract, n.erc20TokenAddress), o = n.approvalType ?? l.Classic;
-  if (o === l.Classic || !e.isPermitterAvailable()) {
+  o && "hash" in o && await r.waitForTransaction(e, o.hash);
+}, M = async (r, e, a, c, n) => {
+  const d = r.getContractWithSigner(e, y.ERC20Contract, n.erc20TokenAddress), o = n.approvalType ?? l.Classic;
+  if (o === l.Classic || !r.isPermitterAvailable(e)) {
     if (await P(c, a, d))
       return;
-    await D(e, r, a, n, d);
-    const g = r === C.base ? 2 : 1;
+    await B(r, e, a, n, d);
+    const g = e === C.base ? 2 : 1;
     try {
       const i = await d.approve(
         a.address,
         c
         // { gasLimit: 10000000 }
       );
-      i && "hash" in i && await e.waitForTransaction(r, i.hash, g);
+      i && "hash" in i && await r.waitForTransaction(e, i.hash, g);
     } catch (i) {
       if (!i?.transactionHash)
         throw i;
@@ -36,24 +36,24 @@ const P = async (e, r, a) => BigInt(
     }
     return;
   }
-  const p = await e.getEthereumAddress(), h = e.getContract(r, y.PermitterContract), T = await e.getContractWithFetcher(
-    r,
+  const p = await r.getEthereumAddressByChain(e), T = r.getContract(e, y.PermitterContract), h = await r.getContractWithFetcher(
+    e,
     y.ContractWithNonces,
     n.erc20TokenAddress
   ).nonces(p), u = BigInt(Date.now() + F) / 1000n, t = {
     owner: p,
     holder: p,
-    spender: h.address,
+    spender: T.address,
     value: c,
-    nonce: T,
+    nonce: h,
     deadline: u,
     expiry: u,
     allowed: !0
   }, { v: m, r: w, s: f } = s.utils.splitSignature(
-    await e.signTypedData(
+    await r.signTypedData(
       {
         name: await d.name(),
-        chainId: r,
+        chainId: e,
         version: "1",
         verifyingContract: n.erc20TokenAddress
       },

package/functions/web3/functionCalls/transactCallDirect.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const x=require("../../../constants/protocol.constants.cjs"),F=require("../../../types/ethereum-network.types.cjs"),S=require("../../utils/time.utils.cjs"),_=require("./approveTokensToHinkal.cjs"),z=require("./constructBatchCall.cjs"),G=require("./recoverTransactionFromError.cjs"),L=async(e,o,i,d,s,v,A,q,b)=>{const n=Array.isArray(i)?i:[i],r=Array.isArray(d)?d:[d];if(n.length!==r.length)throw new Error("token and amount length mismatch");const g=e.getContractWithSigner(o,F.ContractType.HinkalContract),B=await e.getEthereumAddress(),T=q??g,a=b??g,w="transact",y=r.findIndex(({erc20TokenAddress:t})=>t===x.zeroAddress),H=r.some(({erc20TokenAddress:t})=>t!==x.zeroAddress),l=y===-1?0n:n[y],u=e.getProviderAdapter();if(H&&await u.supportsBatchCall?.(o)&&u.sendBatchCallsTransaction){const t=r.map(E=>E.erc20TokenAddress),p=z.buildApproveAndTransactCalls(t,n,T.address,a,s,A,v,l);return await u.sendBatchCallsTransaction(o,p)}await _.approveTokensToHinkal(e,o,T,r,n);const C={value:l>0n?BigInt(l).toString():void 0};let c;const f=[s[0],s[1],s[2],A,v,{...C,from:B}];try{c=(await a.estimateGas[w](...f)).toNumber()}catch(t){console.log("hinkalDeposit: gas estimation error",{err:t})}const k=c&&c>=0?Math.ceil(c*12/10):void 0;C.gasLimit=k,await S.waitLittle();let h;try{h=await a[w](...f)}catch(t){if(!t?.transactionHash)throw t;const{provider:p}=a,m=await G.recoverTransactionFromError(p,t.transactionHash);if(!m)throw t;h=m}return h};exports.transactCallDirect=L;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const x=require("../../../constants/protocol.constants.cjs"),F=require("../../../types/ethereum-network.types.cjs"),S=require("../../utils/time.utils.cjs"),_=require("./approveTokensToHinkal.cjs"),z=require("./constructBatchCall.cjs"),G=require("./recoverTransactionFromError.cjs"),L=async(o,r,i,d,s,v,A,q,B)=>{const n=Array.isArray(i)?i:[i],e=Array.isArray(d)?d:[d];if(n.length!==e.length)throw new Error("token and amount length mismatch");const g=o.getContractWithSigner(r,F.ContractType.HinkalContract),b=await o.getEthereumAddressByChain(r),T=q??g,a=B??g,y="transact",C=e.findIndex(({erc20TokenAddress:t})=>t===x.zeroAddress),H=e.some(({erc20TokenAddress:t})=>t!==x.zeroAddress),l=C===-1?0n:n[C],u=o.getProviderAdapter(r);if(H&&await u.supportsBatchCall?.(r)&&u.sendBatchCallsTransaction){const t=e.map(E=>E.erc20TokenAddress),h=z.buildApproveAndTransactCalls(t,n,T.address,a,s,A,v,l);return await u.sendBatchCallsTransaction(r,h)}await _.approveTokensToHinkal(o,r,T,e,n);const w={value:l>0n?BigInt(l).toString():void 0};let c;const f=[s[0],s[1],s[2],A,v,{...w,from:b}];try{c=(await a.estimateGas[y](...f)).toNumber()}catch(t){console.log("hinkalDeposit: gas estimation error",{err:t})}const k=c&&c>=0?Math.ceil(c*12/10):void 0;w.gasLimit=k,await S.waitLittle();let p;try{p=await a[y](...f)}catch(t){if(!t?.transactionHash)throw t;const{provider:h}=a,m=await G.recoverTransactionFromError(h,t.transactionHash);if(!m)throw t;p=m}return p};exports.transactCallDirect=L;

package/functions/web3/functionCalls/transactCallDirect.mjs

@@ -1,16 +1,16 @@
-import { zeroAddress as y } from "../../../constants/protocol.constants.mjs";
+import { zeroAddress as x } from "../../../constants/protocol.constants.mjs";
 import { ContractType as L } from "../../../types/ethereum-network.types.mjs";
 import { waitLittle as S } from "../../utils/time.utils.mjs";
 import { approveTokensToHinkal as k } from "./approveTokensToHinkal.mjs";
 import { buildApproveAndTransactCalls as z } from "./constructBatchCall.mjs";
 import { recoverTransactionFromError as M } from "./recoverTransactionFromError.mjs";
-const J = async (o, s, i, d, e, g, v, B, H) => {
-  const a = Array.isArray(i) ? i : [i], r = Array.isArray(d) ? d : [d];
-  if (a.length !== r.length)
+const K = async (s, r, i, d, e, g, v, B, H) => {
+  const a = Array.isArray(i) ? i : [i], o = Array.isArray(d) ? d : [d];
+  if (a.length !== o.length)
     throw new Error("token and amount length mismatch");
-  const f = o.getContractWithSigner(s, L.HinkalContract), b = await o.getEthereumAddress(), w = B ?? f, n = H ?? f, u = "transact", C = r.findIndex(({ erc20TokenAddress: t }) => t === y), E = r.some(({ erc20TokenAddress: t }) => t !== y), m = C === -1 ? 0n : a[C], l = o.getProviderAdapter();
-  if (E && await l.supportsBatchCall?.(s) && l.sendBatchCallsTransaction) {
-    const t = r.map((G) => G.erc20TokenAddress), h = z(
+  const f = s.getContractWithSigner(r, L.HinkalContract), b = await s.getEthereumAddressByChain(r), w = B ?? f, n = H ?? f, C = "transact", u = o.findIndex(({ erc20TokenAddress: t }) => t === x), E = o.some(({ erc20TokenAddress: t }) => t !== x), m = u === -1 ? 0n : a[u], l = s.getProviderAdapter(r);
+  if (E && await l.supportsBatchCall?.(r) && l.sendBatchCallsTransaction) {
+    const t = o.map((G) => G.erc20TokenAddress), h = z(
       t,
       a,
       w.address,
@@ -20,31 +20,31 @@ const J = async (o, s, i, d, e, g, v, B, H) => {
       g,
       m
     );
-    return await l.sendBatchCallsTransaction(s, h);
+    return await l.sendBatchCallsTransaction(r, h);
   }
-  await k(o, s, w, r, a);
-  const T = {
+  await k(s, r, w, o, a);
+  const y = {
     value: m > 0n ? BigInt(m).toString() : void 0
   };
   let c;
-  const x = [
+  const T = [
     e[0],
     e[1],
     e[2],
     v,
     g,
-    { ...T, from: b }
+    { ...y, from: b }
   ];
   try {
-    c = (await n.estimateGas[u](...x)).toNumber();
+    c = (await n.estimateGas[C](...T)).toNumber();
   } catch (t) {
     console.log("hinkalDeposit: gas estimation error", { err: t });
   }
   const F = c && c >= 0 ? Math.ceil(c * 12 / 10) : void 0;
-  T.gasLimit = F, await S();
+  y.gasLimit = F, await S();
   let p;
   try {
-    p = await n[u](...x);
+    p = await n[C](...T);
   } catch (t) {
     if (!t?.transactionHash)
       throw t;
@@ -56,5 +56,5 @@ const J = async (o, s, i, d, e, g, v, B, H) => {
   return p;
 };
 export {
-  J as transactCallDirect
+  K as transactCallDirect
 };

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("../../../types/transactions.types.cjs");require("../../../types/activities.types.cjs");require("../../../constants/vite.constants.cjs");const u=require("../../../API/callRelayer.cjs");require("../../../constants/chains.constants.cjs");require("circomlibjs-hinkal-fork");require("../../../data-structures/crypto-keys/keys.cjs");const l=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("idb-keyval");require("@solana/web3.js");require("../../utils/convertIntegrationProviderToExternalActionId.cjs");const C=require("../../../constants/server.constants.cjs"),w=require("../../../API/getServerURL.cjs");require("@coral-xyz/anchor");require("@solana/spl-token");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("../../utils/userAgent.cjs");require("multiformats");require("async-mutex");require("../../../API/tenderly.api.cjs");require("process");require("buffer");require("../../../providers/EthersProviderAdapter.cjs");require("ethers-v6h");const q=r=>{if(r.status==="success")return r.message;throw r.message&&r.error?new y.ErrorWithRelayerTransaction(r.error,r.message):new Error(r.error)},D=async(r,a,t,i,c,s,o,e)=>{const n=l.serializeCircomData(i),h=await u.callRelayerTransactAPI({chainId:r,a:a[0],b:a[1],c:a[2],dimData:t,circomData:n,withPrivateMempool:c,withUniswapWorkAround:s,authorizationData:o,adminData:e});return q(h)},T=async r=>{const a=await R.httpClient.post(`${w.RELAYER_URL}${C.RELAYER_CONFIG.SOLANA_TRANSACT}`,r);return q(a)},m=r=>{if(r.status==="success")return r.message.scheduleId;throw new Error(r.error||"Batch transaction failed")},d=async(r,a,t,i)=>{const c=a.map(e=>l.serializeCircomData(e.circomData)),s={chainId:r,transactions:a.map((e,n)=>({chainId:r,a:e.zkCallData[0],b:e.zkCallData[1],c:e.zkCallData[2],dimData:e.dimData,circomData:c[n],withPrivateMempool:e.withPrivateMempool,withUniswapWorkAround:e.withUniswapWorkAround,authorizationData:e.authorizationData,adminData:e.adminData})),txCompletionTime:i,hashedEthereumAddress:t},o=await u.callRelayerTransactBatchAPI(s);return m(o)},A=async(r,a,t,i)=>{const c={chainId:r,transactions:a,hashedEthereumAddress:t,txCompletionTime:i},s=await u.callRelayerSolanaTransactBatchAPI(c);return m(s)};exports.solanaTransactCallRelayer=T;exports.solanaTransactCallRelayerBatch=A;exports.transactCallRelayer=D;exports.transactCallRelayerBatch=d;
+"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("../../../types/transactions.types.cjs");require("../../../types/activities.types.cjs");require("../../../constants/vite.constants.cjs");const u=require("../../../API/callRelayer.cjs");require("../../../constants/chains.constants.cjs");require("circomlibjs-hinkal-fork");require("../../../data-structures/crypto-keys/keys.cjs");const l=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("idb-keyval");require("@solana/web3.js");require("../../utils/convertIntegrationProviderToExternalActionId.cjs");const C=require("../../../constants/server.constants.cjs"),w=require("../../../API/getServerURL.cjs");require("@coral-xyz/anchor");require("@solana/spl-token");require("ethers-v6h");require("tweetnacl");require("bs58");require("buffer");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("../../utils/userAgent.cjs");require("multiformats");require("../../../API/enclaveCalls.cjs");require("async-mutex");require("process");require("../../../providers/EthersProviderAdapter.cjs");const q=r=>{if(r.status==="success")return r.message;throw r.message&&r.error?new y.ErrorWithRelayerTransaction(r.error,r.message):new Error(r.error)},D=async(r,a,t,i,c,s,o,e)=>{const n=l.serializeCircomData(i),h=await u.callRelayerTransactAPI({chainId:r,a:a[0],b:a[1],c:a[2],dimData:t,circomData:n,withPrivateMempool:c,withUniswapWorkAround:s,authorizationData:o,adminData:e});return q(h)},T=async r=>{const a=await R.httpClient.post(`${w.RELAYER_URL}${C.RELAYER_CONFIG.SOLANA_TRANSACT}`,r);return q(a)},m=r=>{if(r.status==="success")return r.message.scheduleId;throw new Error(r.error||"Batch transaction failed")},d=async(r,a,t,i)=>{const c=a.map(e=>l.serializeCircomData(e.circomData)),s={chainId:r,transactions:a.map((e,n)=>({chainId:r,a:e.zkCallData[0],b:e.zkCallData[1],c:e.zkCallData[2],dimData:e.dimData,circomData:c[n],withPrivateMempool:e.withPrivateMempool,withUniswapWorkAround:e.withUniswapWorkAround,authorizationData:e.authorizationData,adminData:e.adminData})),txCompletionTime:i,hashedEthereumAddress:t},o=await u.callRelayerTransactBatchAPI(s);return m(o)},A=async(r,a,t,i)=>{const c={chainId:r,transactions:a,hashedEthereumAddress:t,txCompletionTime:i},s=await u.callRelayerSolanaTransactBatchAPI(c);return m(s)};exports.solanaTransactCallRelayer=T;exports.solanaTransactCallRelayerBatch=A;exports.transactCallRelayer=D;exports.transactCallRelayerBatch=d;