@hinkal/common 0.2.12 → 0.2.14

package/functions/web3/events/getShieldedBalance.mjs

@@ -1,94 +1,91 @@
-import { Mutex as A } from "async-mutex";
-import { getERC20Registry as w } from "../../../constants/token-data/ERC20Registry.mjs";
-import { getERC20Token as k } from "../../utils/erc20tokenFunctions.mjs";
-import { caseInsensitiveEqual as u } from "../../utils/caseInsensitive.utils.mjs";
-import { patchRegistry as I } from "../../utils/volatile-patcher.utils.mjs";
-import { Utxo as U } from "../../../data-structures/utxo/Utxo.mjs";
-import { customTokenRegistry as b } from "../../../data-structures/custom-token-registry/CustomTokenRegistry.mjs";
-import { VolatileHelper as P } from "../../../data-structures/volatile-helper/VolatileHelper.mjs";
-import { getAmountWithPrecision as x } from "../etherFunctions.mjs";
+import { Mutex as x } from "async-mutex";
+import { getErc20TokensForChain as A, getERC20Token as U } from "../../utils/erc20tokenFunctions.mjs";
+import { caseInsensitiveEqual as g } from "../../utils/caseInsensitive.utils.mjs";
+import { patchRegistry as P } from "../../utils/volatile-patcher.utils.mjs";
+import { Utxo as E } from "../../../data-structures/utxo/Utxo.mjs";
+import { getAmountWithPrecision as M } from "../etherFunctions.mjs";
 import { ErrorWithAmount as S } from "../../../error-handling/customErrors/ErrorWithAmount.mjs";
-import { getInputUtxoAndBalance as y } from "./getInputUtxoAndBalance.mjs";
-const C = new A(), O = async (i) => {
-  const a = await C.acquire();
-  try {
-    const { inputUtxos: s } = await y({ hinkal: i, sliceIfMore6: !1 }), r = i.getCurrentChainId(), m = [...w(r), ...b.getCustomTokens(r)];
-    await I(r);
-    const p = m.map((e) => ({
-      token: e,
-      balance: s.reduce((t, d) => {
-        const o = e.isVolatile ? e.sharedAddress : e.erc20TokenAddress;
-        return u(o, d.erc20TokenAddress) ? t + d.amount : t;
-      }, 0n),
-      timestamp: s.filter(
-        (t) => u(t.erc20TokenAddress, e.erc20TokenAddress)
-      )[0]?.timeStamp,
-      nfts: s.filter(
-        (t) => u(t.erc20TokenAddress, e.erc20TokenAddress) && t.tokenId !== 0
-      ).map((t) => ({ tokenId: t.tokenId, timestamp: t.timeStamp }))
-    }));
-    return await Promise.all(
-      p.map(async (e) => {
-        if (!e.token.isVolatile)
-          return e;
-        e.token?.sharedAddress || console.log("VolatileToken must have a corresponding sharedAddress");
-        let t = 0n;
-        return e.balance > 0n && (t = await P.getVolatileTokenBalance(
-          r,
-          e.token.sharedAddress,
-          e.balance
-        )), {
-          ...e,
-          balance: BigInt(t)
-        };
-      })
-    );
-  } catch (s) {
-    console.log("Error while processing shielded balance:", s);
-  } finally {
-    a();
-  }
-  return [];
-}, X = async (i, a, s, r = 6, m = a.map(() => 0), p = !1) => {
-  const { userKeys: g } = i, e = [], t = [];
+import "../../../error-handling/error-codes.constants.mjs";
+import { getInputUtxoAndBalance as v, getInputUtxoAndBalancePerToken as I } from "./getInputUtxoAndBalance.mjs";
+import { privateTokensDB as w } from "../../../data-structures/TokenDBs/PrivateTokensDB.mjs";
+import { isExtension as h } from "../../../constants/vite.constants.mjs";
+import { encodeTokenWithId as B } from "../../utils/encodeTokenWithId.mjs";
+const b = new x(), $ = async (f, n, l, a, i, p = !1, u, c = !1) => b.runExclusive(async () => {
+  const { inputUtxos: r } = await v({
+    hinkal: f,
+    sliceIfMore6: !1,
+    chainId: n,
+    passedShieldedPrivateKey: l,
+    passedShieldedPublicKey: a,
+    ethAddress: i,
+    resetCacheBefore: p,
+    allowRemoteDecryption: u
+  });
+  c && h && await w.fetchAndUpdatePrivateTokens(
+    r.map((e) => e.erc20TokenAddress),
+    n,
+    i
+  );
+  const k = h ? await w.getPrivateTokens(n, i) : A(n);
+  h || await P(n);
+  const d = k.map((e) => ({
+    token: e,
+    balance: r.reduce((t, s) => {
+      const m = e.erc20TokenAddress;
+      return g(m, s.erc20TokenAddress) ? t + s.amount : t;
+    }, 0n),
+    timestamp: r.filter(
+      (t) => g(t.erc20TokenAddress, e.erc20TokenAddress)
+    )[0]?.timeStamp,
+    nfts: r.filter(
+      (t) => g(t.erc20TokenAddress, e.erc20TokenAddress) && t.tokenId !== 0
+    ).map((t) => ({ tokenId: t.tokenId, timestamp: t.timeStamp }))
+  })), o = /* @__PURE__ */ new Map();
+  return d.forEach((e) => {
+    o.set(e.token.erc20TokenAddress.toLowerCase(), e);
+  }), o;
+}), j = async (f, n, l, a = 6, i = n.map(() => 0), p = !1) => {
+  const { userKeys: u } = f, c = [], r = [], k = await I({
+    hinkal: f,
+    sliceIfMore6: !1,
+    ensuredTokensWithId: n.map((o, e) => ({ erc20TokenAddress: n[e], tokenId: i[e] })),
+    allowRemoteDecryption: !1
+  });
   let d = 0;
-  for (let o = 0; o < a.length; o += 1)
+  for (let o = 0; o < n.length; o += 1)
     if (p === !1) {
-      const { inputUtxos: n } = await y({
-        hinkal: i,
-        erc20TokenAddress: a[o],
-        tokenId: m[o],
-        sliceIfMore6: !1
-      });
-      d = Math.max(n.length, d), t.push(n);
+      const e = k.get(B({ erc20TokenAddress: n[o], tokenId: i[o] })) ?? [];
+      if (!e)
+        throw new Error("Missing utxos for token");
+      d = Math.max(e.length, d), r.push(e);
     } else
-      t.push([]);
-  return d === 2 ? t : (t.forEach((o, n) => {
-    if (o.length > r) {
-      const l = o.slice(0, r), c = l.reduce((f, h) => f + h.amount, 0n);
-      if (s[n] < 0n && c < -s[n]) {
-        const f = k(a[n], i.getCurrentChainId()), h = Number(x(c, f, 2)), T = `Unfortunately your transaction did not go through due to UTXOs limitations. 
- Please try again with ${f.symbol}`;
-        throw new S(h, T);
+      r.push([]);
+  return d === 2 ? r : (r.forEach((o, e) => {
+    if (o.length > a) {
+      const t = o.slice(0, a), s = t.reduce((m, T) => m + T.amount, 0n);
+      if (l[e] < 0n && s < -l[e]) {
+        const m = U(n[e], f.getCurrentChainId()), T = Number(M(s, m, 2)), y = `Unfortunately your transaction did not go through due to UTXOs limitations. 
+ Please try again with ${m.symbol}`;
+        throw new S(T, y);
       }
-      e.push(l);
-    } else if (o.length <= r) {
-      const l = [...o];
-      let c = r - o.length;
-      for (; c > 0; )
-        c -= 1, l.push(
-          new U({
+      c.push(t);
+    } else if (o.length <= a) {
+      const t = [...o];
+      let s = a - o.length;
+      for (; s > 0; )
+        s -= 1, t.push(
+          new E({
             amount: 0n,
-            erc20TokenAddress: a[n],
-            shieldedPrivateKey: g.getShieldedPrivateKey(),
-            tokenId: m[n]
+            erc20TokenAddress: n[e],
+            shieldedPrivateKey: u.getShieldedPrivateKey(),
+            tokenId: i[e]
           })
         );
-      e.push(l);
+      c.push(t);
     }
-  }), e);
+  }), c);
 };
 export {
-  X as addPaddingToUtxos,
-  O as getShieldedBalance
+  j as addPaddingToUtxos,
+  $ as getShieldedBalance
 };

package/functions/web3/events/index.d.ts

@@ -2,3 +2,5 @@ export * from './getInputUtxoAndBalance';
 export * from './getShieldedBalance';
 export * from './web3RetrieveEvents';
 export * from './balanceChangedHandler';
+export * from './balanceChangedCustomHandler';
+export * from './getApprovedBalance';

package/functions/web3/functionCalls/accessTokenCalls.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("../../../constants/chains.constants.cjs");require("../../../types/circom-data.types.cjs");const r=require("../../../types/ethereum-network.types.cjs");require("../../../types/transactions.types.cjs");require("../../../types/curve.types.cjs");const T=require("../etherFunctions.cjs"),g=async e=>(await e.getContractWithFetcher(r.ContractType.CrossChainAccessTokenManagerContract).functions.hasToken(e.userKeys.getAccessKey()))[0],y=async(e,n)=>{const t=e.getContractWithSigner(r.ContractType.CrossChainAccessTokenManagerContract),s=i.networkRegistry[e.getCurrentChainId()].accessTokenMintingFee??"0",c={value:T.ethToWei(s)};return await t.addToken(n,c)},d=async(e,n,t)=>{const s=e.getContractWithSigner(r.ContractType.CrossChainAccessTokenContract),a=i.networkRegistry[e.getCurrentChainId()].accessTokenMintingFee??"0",c=T.ethToWei(a),o=t.reduce((k,h)=>k+h.messageFee,0n),u={chains:t,totalMessageFees:o},C={value:c+o};return await s.addTokenCrossChain(n,u,C)};exports.checkHinkalAccessToken=g;exports.mintAccessToken=y;exports.mintTokenCrossChain=d;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../../types/circom-data.types.cjs");const r=require("../../../types/ethereum-network.types.cjs");require("../../../constants/vite.constants.cjs");require("../../../types/transactions.types.cjs");require("../../../types/curve.types.cjs");require("../../../types/activities.types.cjs");const u=async e=>(await e.getContractWithFetcher(r.ContractType.AccessTokenContract).functions.hasToken(e.userKeys.getAccessKey()))[0],C=async(e,s,t)=>{const c=e.getContractWithSigner(r.ContractType.AccessTokenContract),n={value:0n,...t&&{type:0}};return await c.addToken(s,n)},y=async(e,s,t,c)=>{const n=e.getContractWithSigner(r.ContractType.AccessTokenContract),o=t.reduce((k,T)=>k+T.messageFee,0n),a={chains:t,totalMessageFees:o},i={value:o,...c&&{type:0}};return await n.addTokenCrossChain(s,a,i)};exports.checkHinkalAccessToken=u;exports.mintAccessToken=C;exports.mintTokenCrossChain=y;

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

@@ -2,5 +2,5 @@ import { ethers } from 'ethers';
 import { IHinkal } from '../../../data-structures/Hinkal/IHinkal';
 import { AxelarMigrationInfo, SignatureData } from '../../../types';
 export declare const checkHinkalAccessToken: (hinkal: IHinkal) => Promise<any>;
-export declare const mintAccessToken: (hinkal: IHinkal, signatureData: SignatureData) => Promise<ethers.ContractTransaction>;
-export declare const mintTokenCrossChain: (hinkal: IHinkal, signatureData: SignatureData, axelarMigrationInfos: AxelarMigrationInfo[]) => Promise<ethers.ContractTransaction>;
+export declare const mintAccessToken: (hinkal: IHinkal, signatureData: SignatureData, fromWallet?: boolean) => Promise<ethers.ContractTransaction>;
+export declare const mintTokenCrossChain: (hinkal: IHinkal, signatureData: SignatureData, axelarMigrationInfos: AxelarMigrationInfo[], fromWallet?: boolean) => Promise<ethers.ContractTransaction>;

package/functions/web3/functionCalls/accessTokenCalls.mjs

@@ -1,28 +1,30 @@
-import { networkRegistry as i } from "../../../constants/chains.constants.mjs";
 import "../../../types/circom-data.types.mjs";
 import { ContractType as a } from "../../../types/ethereum-network.types.mjs";
+import "../../../constants/vite.constants.mjs";
 import "../../../types/transactions.types.mjs";
 import "../../../types/curve.types.mjs";
-import { ethToWei as C } from "../etherFunctions.mjs";
-const y = async (e) => (await e.getContractWithFetcher(a.CrossChainAccessTokenManagerContract).functions.hasToken(e.userKeys.getAccessKey()))[0], W = async (e, n) => {
-  const t = e.getContractWithSigner(a.CrossChainAccessTokenManagerContract), s = i[e.getCurrentChainId()].accessTokenMintingFee ?? "0", o = {
-    value: C(s)
+import "../../../types/activities.types.mjs";
+const g = async (t) => (await t.getContractWithFetcher(a.AccessTokenContract).functions.hasToken(t.userKeys.getAccessKey()))[0], x = async (t, s, e) => {
+  const c = t.getContractWithSigner(a.AccessTokenContract), n = {
+    value: 0n,
+    ...e && { type: 0 }
   };
-  return await t.addToken(n, o);
-}, A = async (e, n, t) => {
-  const s = e.getContractWithSigner(a.CrossChainAccessTokenContract), r = i[e.getCurrentChainId()].accessTokenMintingFee ?? "0", o = C(r), c = t.reduce(
-    (k, g) => k + g.messageFee,
+  return await c.addToken(s, n);
+}, A = async (t, s, e, c) => {
+  const n = t.getContractWithSigner(a.AccessTokenContract), o = e.reduce(
+    (k, T) => k + T.messageFee,
     0n
-  ), T = {
-    chains: t,
-    totalMessageFees: c
-  }, u = {
-    value: o + c
+  ), r = {
+    chains: e,
+    totalMessageFees: o
+  }, i = {
+    value: o,
+    ...c && { type: 0 }
   };
-  return await s.addTokenCrossChain(n, T, u);
+  return await n.addTokenCrossChain(s, r, i);
 };
 export {
-  y as checkHinkalAccessToken,
-  W as mintAccessToken,
+  g as checkHinkalAccessToken,
+  x as mintAccessToken,
   A as mintTokenCrossChain
 };

package/functions/web3/functionCalls/approveToken.cjs

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

package/functions/web3/functionCalls/approveToken.mjs

@@ -23,22 +23,23 @@ const T = async (e, n, s) => {
     await x(e, n, t, o);
     const p = await o.approve(
       n.address,
-      s
+      s,
       // { gasLimit: 10000000 }
+      { type: 0 }
     );
     p && "hash" in p && await e.waitForTransaction(p.hash);
     return;
   }
-  const c = await e.getEthereumAddress(), g = e.getContract(l.PermitterContract), C = await e.getContractWithFetcher(l.ContractWithNonces, t.erc20TokenAddress).nonces(c), u = BigInt(Date.now() + A) / 1000n, r = {
+  const c = await e.getEthereumAddress(), g = e.getContract(l.PermitterContract), C = await e.getContractWithFetcher(l.ContractWithNonces, t.erc20TokenAddress).nonces(c), y = BigInt(Date.now() + A) / 1000n, r = {
     owner: c,
     holder: c,
     spender: g.address,
     value: s,
     nonce: C,
-    deadline: u,
-    expiry: u,
+    deadline: y,
+    expiry: y,
     allowed: !0
-  }, { v: y, r: m, s: w } = a.utils.splitSignature(
+  }, { v: u, r: m, s: w } = a.utils.splitSignature(
     await e.signTypedData(
       {
         name: await o.name(),
@@ -104,7 +105,7 @@ const T = async (e, n, s) => {
         r.spender,
         r.value,
         r.deadline,
-        y,
+        u,
         a.utils.arrayify(m),
         a.utils.arrayify(w)
       ])
@@ -120,7 +121,7 @@ const T = async (e, n, s) => {
       r.nonce,
       r.expiry,
       r.allowed,
-      y,
+      u,
       a.utils.arrayify(m),
       a.utils.arrayify(w)
     ])

package/functions/web3/functionCalls/approveTokensToHinkal.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("../../../constants/protocol.constants.cjs"),i=require("./approveToken.cjs"),p=async(t,s,c,o)=>{for(let e=0;e<o.length;e+=1){const n=o[e],r=c[e];n>0n&&r.erc20TokenAddress!==a.zeroAddress&&await i.approveTokenToHinkal(t,s,n,r)}};exports.approveTokensToHinkal=p;

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

@@ -0,0 +1,4 @@
+import { ethers } from 'ethers';
+import { IHinkal } from '../../../data-structures/Hinkal/IHinkal';
+import { ERC20Token } from '../../../types/token.types';
+export declare const approveTokensToHinkal: (hinkal: IHinkal, contractForApproval: ethers.Contract, tokensToApprove: ERC20Token[], amounts: bigint[]) => Promise<void>;

package/functions/web3/functionCalls/approveTokensToHinkal.mjs

@@ -0,0 +1,11 @@
+import { zeroAddress as i } from "../../../constants/protocol.constants.mjs";
+import { approveTokenToHinkal as p } from "./approveToken.mjs";
+const T = async (t, s, c, r) => {
+  for (let o = 0; o < r.length; o += 1) {
+    const e = r[o], n = c[o];
+    e > 0n && n.erc20TokenAddress !== i && await p(t, s, e, n);
+  }
+};
+export {
+  T as approveTokensToHinkal
+};

package/functions/web3/functionCalls/estimateGasRelayer.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("../../../types/ethereum-network.types.cjs"),i=async(n,t,a,e)=>{const r=n.getContractWithFetcher(o.ContractType.HinkalContract),s=e.externalActionId===0n?"transact":"transactWithExternalAction";return(await r.estimateGas[s](t[0],t[1],t[2],a,e,{from:e.relay})).toBigInt()};exports.estimateGasRelayer=i;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("../../../types/ethereum-network.types.cjs"),a=async(n,t,s,e)=>{const o=n.getContractWithFetcher(i.ContractType.HinkalContract),r="transact",c=await o.populateTransaction[r](t[0],t[1],t[2],s,e);return console.log(c),(await o.estimateGas[r](t[0],t[1],t[2],s,e,{from:e.relay})).toBigInt()};exports.estimateGasRelayer=a;

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

@@ -1,4 +1,4 @@
 import { IHinkal } from '../../../data-structures/Hinkal/IHinkal';
-import { CircomDataType, DimDataType } from '../../../types/circom-data.types';
+import { CircomDataBaseType, DimDataType } from '../../../types/circom-data.types';
 import { NewZkCallDataType } from '../../../types/snark.types';
-export declare const estimateGasRelayer: (hinkal: IHinkal, newZkCallData: NewZkCallDataType, dimData: DimDataType, circomData: CircomDataType) => Promise<bigint>;
+export declare const estimateGasRelayer: (hinkal: IHinkal, newZkCallData: NewZkCallDataType, dimData: DimDataType, circomData: CircomDataBaseType) => Promise<bigint>;

package/functions/web3/functionCalls/estimateGasRelayer.mjs

@@ -1,15 +1,21 @@
-import { ContractType as o } from "../../../types/ethereum-network.types.mjs";
-const m = async (a, t, e, n) => {
-  const r = a.getContractWithFetcher(o.HinkalContract), s = n.externalActionId === 0n ? "transact" : "transactWithExternalAction";
-  return (await r.estimateGas[s](
+import { ContractType as i } from "../../../types/ethereum-network.types.mjs";
+const g = async (e, t, s, o) => {
+  const n = e.getContractWithFetcher(i.HinkalContract), r = "transact", c = await n.populateTransaction[r](
     t[0],
     t[1],
     t[2],
-    e,
-    n,
-    { from: n.relay }
+    s,
+    o
+  );
+  return console.log(c), (await n.estimateGas[r](
+    t[0],
+    t[1],
+    t[2],
+    s,
+    o,
+    { from: o.relay }
   )).toBigInt();
 };
 export {
-  m as estimateGasRelayer
+  g as estimateGasRelayer
 };

package/functions/web3/functionCalls/inHinkalApprovalCalls.cjs

@@ -0,0 +1 @@
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("../../../types/ethereum-network.types.cjs"),s=async(n,o)=>{const r=await n.getContractWithFetcher(a.ContractType.HinkalContract).callStatic.getInteractionApprovals(o);if(!r)throw Error("getInteractionApprovals fail: no approved utxos fetched");return r.map(t=>{const c=t;return{amount:c.amount.toBigInt(),inHinkalAddress:c.inHinkalAddress.toBigInt(),tokenAddress:c.tokenAddress}})},l=async(n,o,e)=>{const r=n.getContractWithFetcher(a.ContractType.HinkalContract),t=await n.getContractWithFetcher(a.ContractType.ERC20Contract,o).callStatic.allowance(r.address,e);if(t===void 0)throw Error("checkExistingApprovalFromHinkal Error, no allowance fetched");return t.toBigInt()},p=async(n,o,e,r)=>{const t=await n.getContractWithFetcher(a.ContractType.HinkalContract).callStatic.getBufferEntry(o,e,r);if(t===void 0)throw Error("getBufferEntry Fail: No amount fatched");return t.toBigInt()};exports.checkExistingApprovalFromHinkal=l;exports.getBufferEntry=p;exports.getInteractionApprovals=s;

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

@@ -0,0 +1,5 @@
+import { type IHinkal } from '../../../data-structures/Hinkal/IHinkal';
+import { type ApprovedUtxo } from '../../../types';
+export declare const getInteractionApprovals: (hinkal: IHinkal, interactionAddress: string) => Promise<ApprovedUtxo[]>;
+export declare const checkExistingApprovalFromHinkal: (hinkal: IHinkal, erc20Address: string, interactionAddress: string) => Promise<bigint>;
+export declare const getBufferEntry: (hinkal: IHinkal, approveTo: string, tokenAddress: string, inHinkalAddress: bigint) => Promise<bigint>;

package/functions/web3/functionCalls/inHinkalApprovalCalls.mjs

@@ -0,0 +1,32 @@
+import { ContractType as e } from "../../../types/ethereum-network.types.mjs";
+const l = async (n, r) => {
+  const o = await n.getContractWithFetcher(e.HinkalContract).callStatic.getInteractionApprovals(r);
+  if (!o)
+    throw Error("getInteractionApprovals fail: no approved utxos fetched");
+  return o.map((t) => {
+    const c = t;
+    return {
+      amount: c.amount.toBigInt(),
+      inHinkalAddress: c.inHinkalAddress.toBigInt(),
+      tokenAddress: c.tokenAddress
+    };
+  });
+}, p = async (n, r, a) => {
+  const o = n.getContractWithFetcher(e.HinkalContract), t = await n.getContractWithFetcher(e.ERC20Contract, r).callStatic.allowance(
+    o.address,
+    a
+  );
+  if (t === void 0)
+    throw Error("checkExistingApprovalFromHinkal Error, no allowance fetched");
+  return t.toBigInt();
+}, h = async (n, r, a, o) => {
+  const t = await n.getContractWithFetcher(e.HinkalContract).callStatic.getBufferEntry(r, a, o);
+  if (t === void 0)
+    throw Error("getBufferEntry Fail: No amount fatched");
+  return t.toBigInt();
+};
+export {
+  p as checkExistingApprovalFromHinkal,
+  h as getBufferEntry,
+  l as getInteractionApprovals
+};

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

@@ -1,17 +1,3 @@
 import { ethers } from 'ethers';
-export interface RelayEntryData {
-    relayAddress: string;
-    url: string;
-    priority: number;
-}
-export interface RelayEntryWithIndex extends RelayEntryData {
-    lowerIndex: number;
-}
 export declare const getRelayPercentage: (contract: ethers.Contract) => Promise<bigint>;
-export declare const chooseRandomRelay: (entries: RelayEntryData[]) => {
-    lowerIndex: number;
-    relayAddress: string;
-    url: string;
-    priority: number;
-};
-export declare const getRelay: (hinkalHelperContract: ethers.Contract) => Promise<RelayEntryWithIndex>;
+export declare const getRelay: (hinkalHelperContract: ethers.Contract) => Promise<string>;

package/functions/web3/functionCalls/transactCallDirect.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const m=require("../../../constants/protocol.constants.cjs"),I=require("../../../types/ethereum-network.types.cjs"),S=require("./approveToken.cjs"),f=require("../../utils/time.utils.cjs");require("../../../constants/chains.constants.cjs");require("../../../constants/vite.constants.cjs");require("axios");require("../../../constants/coingecko.constants.cjs");const b=require("../../../API/API.cjs");require("ethers");require("../../../types/curve.types.cjs");require("../../../constants/token-data/index.cjs");require("../../../constants/contracts.constants.cjs");require("../../../constants/kyc.constants.cjs");require("../../../constants/axelar.constants.cjs");require("../../../constants/rewards.constants.cjs");require("../../../constants/reorg-depths.constants.cjs");const x=async(e,t,o,i,A,y,C,T,n=!0)=>{const p=e.getCurrentChainId(),a=e.getContractWithSigner(I.ContractType.HinkalContract),u=await e.getEthereumAddress(),v=C??a,d=T??a,h=e.userKeys.getAccessKey(),g=n?"transact":"addTokenAndTransact";t>0n&&o.erc20TokenAddress!==m.zeroAddress&&await S.approveTokenToHinkal(e,v,t,o);const q={value:t>0n&&o.erc20TokenAddress===m.zeroAddress?BigInt(t).toString():void 0};let r;const l=[i[0],i[1],i[2],y,A,{...q,from:u}];let s=[];if(n)s=l;else{const{signatureData:c}=await b.API.getAccessTokenSignature(p,u,h);s=[c,...l]}try{r=(await d.estimateGas[g](...s)).toNumber()}catch(c){console.log("hinkalDeposit: gas estimation error",{err:c})}const w=r&&r>=0?Math.ceil(r*12/10):void 0;return q.gasLimit=w,await f.waitLittle(),await d[g](...s)};exports.transactCallDirect=x;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const T=require("../../../constants/protocol.constants.cjs"),x=require("../../../types/ethereum-network.types.cjs"),I=require("../../utils/time.utils.cjs"),f=require("./approveTokensToHinkal.cjs"),q=async(e,o,s,n,p,w,y,A)=>{const a=Array.isArray(o)?o:[o],i=Array.isArray(s)?s:[s];if(a.length!==i.length)throw new Error("token and amount length mismatch");const d=e.getContractWithSigner(x.ContractType.HinkalContract),v=await e.getEthereumAddress(),C=y??d,r=A??d,l="transact";await f.approveTokensToHinkal(e,C,i,a);const g=i.findIndex(({erc20TokenAddress:c})=>c===T.zeroAddress),h=g===-1?0n:a[g],u={value:h>0n?BigInt(h).toString():void 0};let t;const m=[n[0],n[1],n[2],w,p,{...u,from:v,type:0}];try{t=(await r.estimateGas[l](...m)).toNumber(),console.log({gasCosts:t}),console.log({signerAddress:await r.signer.getAddress(),chainIdHinkal:e.getCurrentChainId(),ethersNetwork:await r.provider.getNetwork()})}catch(c){console.log("hinkalDeposit: gas estimation error",{err:c})}const k=t&&t>=0?Math.ceil(t*12/10):void 0;return u.gasLimit=k,await I.waitLittle(),await r[l](...m)};exports.transactCallDirect=q;

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

@@ -1,6 +1,6 @@
 import { ethers } from 'ethers';
 import { IHinkal } from '../../../data-structures/Hinkal/IHinkal';
-import { CircomDataType, DimDataType } from '../../../types/circom-data.types';
+import { CircomDataBaseType, DimDataType } from '../../../types/circom-data.types';
 import { ERC20Token } from '../../../types/token.types';
 import { NewZkCallDataType } from '../../../types/snark.types';
-export declare const transactCallDirect: (hinkal: IHinkal, amount: bigint, tokenToApprove: ERC20Token, newZkCallData: NewZkCallDataType, circomData: CircomDataType, dimData: DimDataType, contractApproval?: ethers.Contract, contractTransaction?: ethers.Contract, hasAccessToken?: boolean) => Promise<any>;
+export declare const transactCallDirect: (hinkal: IHinkal, amount: bigint | bigint[], tokenToApprove: ERC20Token | ERC20Token[], newZkCallData: NewZkCallDataType, circomData: CircomDataBaseType, dimData: DimDataType, contractApproval?: ethers.Contract, contractTransaction?: ethers.Contract) => Promise<any>;

package/functions/web3/functionCalls/transactCallDirect.mjs

@@ -1,50 +1,37 @@
-import { zeroAddress as f } from "../../../constants/protocol.constants.mjs";
-import { ContractType as x } from "../../../types/ethereum-network.types.mjs";
-import { approveTokenToHinkal as I } from "./approveToken.mjs";
-import { waitLittle as K } from "../../utils/time.utils.mjs";
-import "../../../constants/chains.constants.mjs";
-import "../../../constants/vite.constants.mjs";
-import "axios";
-import "../../../constants/coingecko.constants.mjs";
-import { API as S } from "../../../API/API.mjs";
-import "ethers";
-import "../../../types/curve.types.mjs";
-import "../../../constants/token-data/index.mjs";
-import "../../../constants/contracts.constants.mjs";
-import "../../../constants/kyc.constants.mjs";
-import "../../../constants/axelar.constants.mjs";
-import "../../../constants/rewards.constants.mjs";
-import "../../../constants/reorg-depths.constants.mjs";
-const Q = async (t, r, s, i, u, A, C, y, c = !0) => {
-  const T = t.getCurrentChainId(), n = t.getContractWithSigner(x.HinkalContract), m = await t.getEthereumAddress(), h = C ?? n, d = y ?? n, v = t.userKeys.getAccessKey(), p = c ? "transact" : "addTokenAndTransact";
-  r > 0n && s.erc20TokenAddress !== f && await I(t, h, r, s);
-  const g = {
-    value: r > 0n && s.erc20TokenAddress === f ? BigInt(r).toString() : void 0
+import { zeroAddress as x } from "../../../constants/protocol.constants.mjs";
+import { ContractType as I } from "../../../types/ethereum-network.types.mjs";
+import { waitLittle as k } from "../../utils/time.utils.mjs";
+import { approveTokensToHinkal as H } from "./approveTokensToHinkal.mjs";
+const L = async (r, e, s, n, w, A, y, f) => {
+  const a = Array.isArray(e) ? e : [e], i = Array.isArray(s) ? s : [s];
+  if (a.length !== i.length)
+    throw new Error("token and amount length mismatch");
+  const d = r.getContractWithSigner(I.HinkalContract), u = await r.getEthereumAddress(), v = y ?? d, o = f ?? d, g = "transact";
+  await H(r, v, i, a);
+  const m = i.findIndex(({ erc20TokenAddress: c }) => c === x), l = m === -1 ? 0n : a[m], h = {
+    value: l > 0n ? BigInt(l).toString() : void 0
   };
-  let o;
-  const l = [
-    i[0],
-    i[1],
-    i[2],
+  let t;
+  const p = [
+    n[0],
+    n[1],
+    n[2],
     A,
-    u,
-    { ...g, from: m }
+    w,
+    { ...h, from: u, type: 0 }
   ];
-  let e = [];
-  if (c)
-    e = l;
-  else {
-    const { signatureData: a } = await S.getAccessTokenSignature(T, m, v);
-    e = [a, ...l];
-  }
   try {
-    o = (await d.estimateGas[p](...e)).toNumber();
-  } catch (a) {
-    console.log("hinkalDeposit: gas estimation error", { err: a });
+    t = (await o.estimateGas[g](...p)).toNumber(), console.log({ gasCosts: t }), console.log({
+      signerAddress: await o.signer.getAddress(),
+      chainIdHinkal: r.getCurrentChainId(),
+      ethersNetwork: await o.provider.getNetwork()
+    });
+  } catch (c) {
+    console.log("hinkalDeposit: gas estimation error", { err: c });
   }
-  const w = o && o >= 0 ? Math.ceil(o * 12 / 10) : void 0;
-  return g.gasLimit = w, await K(), await d[p](...e);
+  const C = t && t >= 0 ? Math.ceil(t * 12 / 10) : void 0;
+  return h.gasLimit = C, await k(), await o[g](...p);
 };
 export {
-  Q as transactCallDirect
+  L as transactCallDirect
 };

package/functions/web3/functionCalls/transactCallRelayer.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("../../../API/callRelayer.cjs");require("../../../constants/chains.constants.cjs");require("ethers");require("circomlibjs-hinkal-fork");require("libsodium-wrappers");require("../../../constants/vite.constants.cjs");const u=require("../../snarkjs/common.snarkjs.cjs");require("../../../types/circom-data.types.cjs");require("../../utils/external-action.utils.cjs");require("node-forge");require("axios");const n=async(a,r,s,c,t)=>{const i=u.serializeCircomData(c),e=await o.callRelayerTransactAPI(a,{a:r[0],b:r[1],c:r[2],dimData:s,circomData:i,withPrivateMempool:t});if(e.status==="success")return e.message;throw new Error(e.error)};exports.transactCallRelayer=n;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const t=require("../../../API/callRelayer.cjs");require("../../../constants/chains.constants.cjs");require("ethers");require("circomlibjs-hinkal-fork");require("../../../error-handling/error-codes.constants.cjs");require("../../../data-structures/crypto-keys/keys.cjs");require("../../../constants/vite.constants.cjs");const o=require("../../snarkjs/common.snarkjs.cjs");require("../../../types/circom-data.types.cjs");require("../../utils/external-action.utils.cjs");require("axios");require("node-forge");require("libsodium-wrappers");require("../../../constants/contracts.constants.cjs");require("idb-keyval");require("../../../constants/token-data/index.cjs");require("../../utils/convertIntegrationProviderToExternalActionId.cjs");require("../../../types/transactions.types.cjs");require("../../../types/curve.types.cjs");require("../../../types/activities.types.cjs");require("process");require("buffer");require("../../../constants/reorg-depths.constants.cjs");require("../../../constants/kyc.constants.cjs");require("../../../constants/coingecko.constants.cjs");require("../../../constants/axelar.constants.cjs");require("../../../constants/rewards.constants.cjs");require("../../../constants/addresses.constants.cjs");require("../../../constants/token.limits.constants.cjs");require("../../utils/userAgent.cjs");require("../../../data-structures/volatile-helper/VolatileHelper.cjs");const n=async(i,r,u,q,a,s)=>{const c=o.serializeCircomData(q),e=await t.callRelayerTransactAPI(i,{a:r[0],b:r[1],c:r[2],dimData:u,circomData:c,withPrivateMempool:a,withUniswapWorkAround:s});if(e.status==="success")return e.message;throw new Error(e.error)};exports.transactCallRelayer=n;

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

@@ -1,7 +1,7 @@
-import { CircomDataType, DimDataType, NewZkCallDataType, RelayerTransaction } from '../../../types';
+import { CircomDataBaseType, DimDataType, NewZkCallDataType, RelayerTransaction } from '../../../types';
 export interface RelayerResponseInterface {
     status: string;
     message: RelayerTransaction;
     error?: string;
 }
-export declare const transactCallRelayer: (chainId: number, newZkCallData: NewZkCallDataType, dimData: DimDataType, circomData: CircomDataType, withPrivateMempool?: boolean) => Promise<RelayerTransaction>;
+export declare const transactCallRelayer: (chainId: number, newZkCallData: NewZkCallDataType, dimData: DimDataType, circomData: CircomDataBaseType, withPrivateMempool?: boolean, withUniswapWorkAround?: boolean) => Promise<RelayerTransaction>;