@hinkal/common 0.2.21 → 0.2.23

package/functions/web3/events/getTransactionLogEvents.cjs

@@ -1 +1 @@
-"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;
+"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/activities.types.cjs");require("circomlibjs-hinkal-fork");require("../../../data-structures/crypto-keys/keys.cjs");require("../../../data-structures/http/HttpClient.cjs");require("axios");require("../../../API/getServerURL.cjs");require("libsodium-wrappers");require("process");require("buffer");require("../../../constants/save-depths.cjs");require("../../utils/mutexes.utils.cjs");require("@coral-xyz/anchor");require("@solana/web3.js");require("@solana/spl-token");require("../../utils/userAgent.cjs");require("multiformats");require("../../../API/tenderly.api.cjs");const l=(i,n)=>{const u=new a.ethers.Interface(n);try{const e=u.parseLog(i);if(!e)throw new Error("Could not parse log");return{name:e.name,args:e.args}}catch{return console.warn("Could not decode log"),null}};async function d(i,n,u,e){try{const t=c.networkRegistry[i].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(o=>o.address.toLowerCase()===u.toLowerCase()).map(o=>l(o,e)).filter(o=>o!==null);return{transactionHash:r.hash,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;

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

@@ -1,13 +1,13 @@
 import { ethers } from 'ethers';
-type ABIType = ConstructorParameters<typeof ethers.utils.Interface>[0];
+type ABIType = ConstructorParameters<typeof ethers.Interface>[0];
 export declare function getTransactionLogEvents(chainId: number, txHash: string, contractAddress: string, contractABI: ABIType): Promise<{
     transactionHash: string;
     from: string;
-    to: string;
+    to: string | null;
     blockNumber: number;
     events: {
         name: string;
-        args: ethers.utils.Result;
+        args: ethers.Result;
     }[];
 }>;
 export {};

package/functions/web3/events/getTransactionLogEvents.mjs

@@ -1,75 +1,76 @@
+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 "../../../constants/chains.constants.mjs";
-import { createCustomRpcProvider as s } from "../../utils/create-provider.mjs";
-import "../../../constants/token-data/index.mjs";
+import { createCustomRpcProvider as c } from "../../utils/create-provider.mjs";
 import "../../../error-handling/error-codes.constants.mjs";
 import "../../utils/convertIntegrationProviderToExternalActionId.mjs";
 import "../../../types/circom-data.types.mjs";
-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 "../../../API/getServerURL.mjs";
+import "libsodium-wrappers";
+import "process";
+import "buffer";
+import "../../../constants/save-depths.mjs";
+import "../../utils/mutexes.utils.mjs";
 import "@coral-xyz/anchor";
+import "@solana/web3.js";
 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 "process";
-import "../../../providers/EthersProviderAdapter.mjs";
-const c = (i, e) => {
-  const m = new a.utils.Interface(e);
+import "../../../API/tenderly.api.mjs";
+const f = (e, n) => {
+  const p = new a.Interface(n);
   try {
-    const t = m.parseLog(i);
+    const o = p.parseLog(e);
+    if (!o)
+      throw new Error("Could not parse log");
     return {
-      name: t.name,
-      args: t.args
+      name: o.name,
+      args: o.args
     };
   } catch {
     return console.warn("Could not decode log"), null;
   }
 };
-async function _(i, e, m, t) {
+async function Y(e, n, p, o) {
   try {
-    const r = await s(i).getTransactionReceipt(e);
+    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);
     if (!r)
       throw new Error("Transaction receipt not found");
     if (r.status !== 1)
       throw new Error("Transaction failed");
-    const n = r.logs.filter((o) => o.address.toLowerCase() === m.toLowerCase()).map((o) => c(o, t)).filter((o) => o !== null);
+    const m = r.logs.filter((i) => i.address.toLowerCase() === p.toLowerCase()).map((i) => f(i, o)).filter((i) => i !== null);
     return {
-      transactionHash: r.transactionHash,
+      transactionHash: r.hash,
       from: r.from,
       to: r.to,
       blockNumber: r.blockNumber,
-      events: n
+      events: m
     };
-  } catch (p) {
-    throw console.error("Error retrieving transaction events:", p), p;
+  } catch (t) {
+    throw console.error("Error retrieving transaction events:", t), t;
   }
 }
 export {
-  _ as getTransactionLogEvents
+  Y as getTransactionLogEvents
 };

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

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

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");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;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("idb-keyval");require("../../constants/chains.constants.cjs");require("@solana/web3.js");require("../../data-structures/http/HttpClient.cjs");require("../../constants/vite.constants.cjs");require("ethers");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/activities.types.cjs");require("circomlibjs-hinkal-fork");require("../../data-structures/crypto-keys/keys.cjs");require("../../constants/server.constants.cjs");require("axios");require("../../API/getServerURL.cjs");require("libsodium-wrappers");require("process");require("buffer");require("../../constants/save-depths.cjs");require("../../constants/reorg-depths.constants.cjs");require("../utils/mutexes.utils.cjs");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/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/tenderly.api.cjs");const o=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 r.convertBytes32ToBigInt(t)};exports.fetchSolanaMerkleTreeRootHash=o;

package/functions/web3/fetchSolanaMerkleTreeRootHash.d.ts

@@ -1,4 +1,3 @@
 import { Program } from '@coral-xyz/anchor';
 import { PublicKey } from '@solana/web3.js';
-import { ethers } from 'ethers';
-export declare const fetchSolanaMerkleTreeRootHash: (hinkalProgram: Program, merkleTreePublicKey: PublicKey) => Promise<ethers.BigNumber>;
+export declare const fetchSolanaMerkleTreeRootHash: (hinkalProgram: Program, merkleTreePublicKey: PublicKey) => Promise<bigint>;

package/functions/web3/fetchSolanaMerkleTreeRootHash.mjs

@@ -1,30 +1,31 @@
-import { ethers as e } from "ethers";
 import "idb-keyval";
 import "../../constants/chains.constants.mjs";
 import "@solana/web3.js";
 import "../../data-structures/http/HttpClient.mjs";
 import "../../constants/vite.constants.mjs";
+import "ethers";
 import "../../constants/token-data/index.mjs";
 import "../../error-handling/error-codes.constants.mjs";
 import "../utils/convertIntegrationProviderToExternalActionId.mjs";
 import "../../types/circom-data.types.mjs";
-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 "axios";
+import "../../API/getServerURL.mjs";
+import "libsodium-wrappers";
+import "process";
+import "buffer";
+import "../../constants/save-depths.mjs";
+import "../../constants/reorg-depths.constants.mjs";
+import "../utils/mutexes.utils.mjs";
 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";
 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";
@@ -32,17 +33,12 @@ 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 "process";
-import "buffer";
-import "../../providers/EthersProviderAdapter.mjs";
-const W = async (r, m) => {
+import "../../API/tenderly.api.mjs";
+const O = 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());
+  return t(p);
 };
 export {
-  W as fetchSolanaMerkleTreeRootHash
+  O as fetchSolanaMerkleTreeRootHash
 };

package/functions/web3/functionCalls/accessTokenCalls.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../../types/circom-data.types.cjs");const u=require("../../../types/ethereum-network.types.cjs");require("../../../types/transactions.types.cjs");require("../../../types/activities.types.cjs");const r=require("../../../constants/chains.constants.cjs"),k=require("../../pre-transaction/solana.cjs"),l=require("@solana/web3.js"),g=async(e,c)=>(await e.getContractWithFetcher(c,u.ContractType.AccessTokenContract).functions.hasToken(e.userKeys.getAccessKey()))[0],y=async(e,c)=>{const{hinkalIdl:n,originalDeployer:t}=r.networkRegistry[c].contractData;if(!n||!t)throw new Error("missing hinkal data");const a=new l.PublicKey(t),o=e.getSolanaProgram(n),s=k.getAccessTokenAccountPublicKey(BigInt(e.userKeys.getAccessKey()),o.programId,a);if(!await o.provider.connection.getAccountInfo(s))return!1;const{isAdded:i}=await o.account.accesskeyAccount.fetch(s);return i},A=async(e,c)=>r.isSolanaLike(c)?y(e,c):g(e,c);exports.checkHinkalAccessToken=A;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../../types/circom-data.types.cjs");const r=require("../../../types/ethereum-network.types.cjs");require("../../../types/activities.types.cjs");const a=require("../../../constants/chains.constants.cjs"),l=require("../../pre-transaction/solana.cjs"),g=require("@solana/web3.js"),i=async e=>(await e.getContractWithFetcher(r.ContractType.AccessTokenContract).hasToken(e.userKeys.getAccessKey()))[0],k=async e=>{const{hinkalIdl:c,originalDeployer:n}=a.networkRegistry[e.getCurrentChainId()].contractData;if(!c||!n)throw new Error("missing hinkal data");const o=new g.PublicKey(n),t=e.getSolanaProgram(c),s=l.getAccessTokenAccountPublicKey(BigInt(e.userKeys.getAccessKey()),t.programId,o);if(!await t.provider.connection.getAccountInfo(s))return!1;const{isAdded:u}=await t.account.accesskeyAccount.fetch(s);return u},y=async e=>a.isSolanaLike(e.getCurrentChainId())?k(e):i(e),T=async(e,c,n)=>{const o=e.getContractWithSigner(r.ContractType.AccessTokenContract),t={value:0n,...n&&{type:0}};return await o.addToken(c,t)};exports.checkHinkalAccessToken=y;exports.checkHinkalAccessTokenEVM=i;exports.checkHinkalAccessTokenSolana=k;exports.mintAccessToken=T;

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

@@ -1,2 +1,7 @@
+import { ethers } from 'ethers';
 import { IHinkal } from '../../../data-structures/Hinkal/IHinkal';
-export declare const checkHinkalAccessToken: (hinkal: IHinkal, chainId: number) => Promise<any>;
+import { SignatureData } from '../../../types';
+export declare const checkHinkalAccessTokenEVM: (hinkal: IHinkal) => Promise<any>;
+export declare const checkHinkalAccessTokenSolana: (hinkal: IHinkal) => Promise<any>;
+export declare const checkHinkalAccessToken: (hinkal: IHinkal) => Promise<any>;
+export declare const mintAccessToken: (hinkal: IHinkal, signatureData: SignatureData, fromWallet?: boolean) => Promise<ethers.ContractTransaction>;

package/functions/web3/functionCalls/accessTokenCalls.mjs

@@ -1,24 +1,32 @@
 import "../../../types/circom-data.types.mjs";
-import { ContractType as i } from "../../../types/ethereum-network.types.mjs";
-import "../../../types/transactions.types.mjs";
+import { ContractType as r } from "../../../types/ethereum-network.types.mjs";
 import "../../../types/activities.types.mjs";
-import { isSolanaLike as k, networkRegistry as g } from "../../../constants/chains.constants.mjs";
-import { getAccessTokenAccountPublicKey as l } from "../../pre-transaction/solana.mjs";
+import { networkRegistry as i, isSolanaLike as g } from "../../../constants/chains.constants.mjs";
+import { getAccessTokenAccountPublicKey as k } from "../../pre-transaction/solana.mjs";
 import { PublicKey as u } from "@solana/web3.js";
-const m = async (c, o) => (await c.getContractWithFetcher(o, i.AccessTokenContract).functions.hasToken(c.userKeys.getAccessKey()))[0], y = async (c, o) => {
-  const { hinkalIdl: e, originalDeployer: t } = g[o].contractData;
+const y = async (c) => (await c.getContractWithFetcher(r.AccessTokenContract).hasToken(c.userKeys.getAccessKey()))[0], l = async (c) => {
+  const { hinkalIdl: e, originalDeployer: t } = i[c.getCurrentChainId()].contractData;
   if (!e || !t)
     throw new Error("missing hinkal data");
-  const s = new u(t), n = c.getSolanaProgram(e), r = l(
+  const o = new u(t), n = c.getSolanaProgram(e), s = k(
     BigInt(c.userKeys.getAccessKey()),
     n.programId,
-    s
+    o
   );
-  if (!await n.provider.connection.getAccountInfo(r))
+  if (!await n.provider.connection.getAccountInfo(s))
     return !1;
-  const { isAdded: a } = await n.account.accesskeyAccount.fetch(r);
+  const { isAdded: a } = await n.account.accesskeyAccount.fetch(s);
   return a;
-}, D = async (c, o) => k(o) ? y(c, o) : m(c, o);
+}, C = async (c) => g(c.getCurrentChainId()) ? l(c) : y(c), w = async (c, e, t) => {
+  const o = c.getContractWithSigner(r.AccessTokenContract), n = {
+    value: 0n,
+    ...t && { type: 0 }
+  };
+  return await o.addToken(e, n);
+};
 export {
-  D as checkHinkalAccessToken
+  C as checkHinkalAccessToken,
+  y as checkHinkalAccessTokenEVM,
+  l as checkHinkalAccessTokenSolana,
+  w as mintAccessToken
 };

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

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

@@ -1,4 +1,4 @@
 import { ethers } from 'ethers';
 import { IHinkal } from '../../../data-structures/Hinkal/IHinkal';
 import { ERC20Token } from '../../../types/token.types';
-export declare const approveTokenToHinkal: (hinkal: IHinkal, chainId: number, contractToApprove: ethers.Contract, amount: bigint, token: ERC20Token) => Promise<Uint8Array | undefined>;
+export declare const approveTokenToHinkal: (hinkal: IHinkal, contractToApprove: ethers.Contract, amount: bigint, token: ERC20Token) => Promise<Uint8Array | undefined>;

package/functions/web3/functionCalls/approveToken.mjs

@@ -1,64 +1,63 @@
-import { ethers as s } from "ethers";
-import { chainIds as C, getNonLocalhostChainId as b } from "../../../constants/chains.constants.mjs";
-import { permitSignatureValidFor as F } from "../../../constants/protocol.constants.mjs";
-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 (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)
+import { ethers as n } from "ethers";
+import { chainIds as f, getNonLocalhostChainId as x } from "../../../constants/chains.constants.mjs";
+import { permitSignatureValidFor as A } from "../../../constants/protocol.constants.mjs";
+import { ApprovalType as d } from "../../../types/token.types.mjs";
+import { ContractType as l } from "../../../types/ethereum-network.types.mjs";
+import { recoverTransactionFromError as b } from "./recoverTransactionFromError.mjs";
+import { getProviderFromContract as F, getSignerFromContract as v } from "../../utils/getSignerFromContract.mjs";
+const B = async (e, a, o) => {
+  const t = v(o);
+  return await o.allowance(await t.getAddress(), a.target) >= e;
+}, P = async (e, a, o, t) => {
+  if (x(e.getCurrentChainId()) !== f.ethMainnet || o.symbol.toLowerCase() !== "usdt" || BigInt(
+    await t.allowance(await v(t).getAddress(), a.target)
   ) === 0n)
     return;
-  const o = await n.approve(a.address, 0n);
-  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))
+  const c = await t.approve(a.target, 0n);
+  c && "hash" in c && await e.waitForTransaction(c.hash);
+}, V = async (e, a, o, t) => {
+  const i = e.getContractWithSigner(l.ERC20Contract, t.erc20TokenAddress), c = t.approvalType ?? d.Classic;
+  if (c === d.Classic || !e.isPermitterAvailable()) {
+    if (await B(o, a, i))
       return;
-    await B(r, e, a, n, d);
-    const g = e === C.base ? 2 : 1;
+    await P(e, a, t, i);
+    const C = e.getCurrentChainId() === f.base ? 2 : 1;
     try {
-      const i = await d.approve(
-        a.address,
-        c
+      const s = await i.approve(
+        a.target,
+        o
         // { gasLimit: 10000000 }
       );
-      i && "hash" in i && await r.waitForTransaction(e, i.hash, g);
-    } catch (i) {
-      if (!i?.transactionHash)
-        throw i;
-      const { provider: A } = d;
-      if (!await E(A, i.transactionHash, g))
-        throw i;
+      s && "hash" in s && await e.waitForTransaction(s.hash, C);
+    } catch (s) {
+      if (!s?.transactionHash || !await b(
+        F(i),
+        s.transactionHash,
+        C
+      ))
+        throw s;
     }
     return;
   }
-  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 = {
+  const p = await e.getEthereumAddress(), h = e.getContract(l.PermitterContract), I = await e.getContractWithFetcher(l.ContractWithNonces, t.erc20TokenAddress).nonces(p), m = BigInt(Date.now() + A) / 1000n, r = {
     owner: p,
     holder: p,
-    spender: T.address,
-    value: c,
-    nonce: h,
-    deadline: u,
-    expiry: u,
+    spender: h.target,
+    value: o,
+    nonce: I,
+    deadline: m,
+    expiry: m,
     allowed: !0
-  }, { v: m, r: w, s: f } = s.utils.splitSignature(
-    await r.signTypedData(
+  }, { v: y, r: w, s: u } = n.Signature.from(
+    await e.signTypedData(
       {
-        name: await d.name(),
-        chainId: e,
+        name: await i.name(),
+        chainId: e.getCurrentChainId(),
         version: "1",
-        verifyingContract: n.erc20TokenAddress
+        verifyingContract: t.erc20TokenAddress
       },
       {
-        Permit: o === l.ERC20Permit ? [
+        Permit: c === d.ERC20Permit ? [
           {
             name: "owner",
             type: "address"
@@ -102,41 +101,41 @@ const P = async (r, e, a) => BigInt(
           }
         ]
       },
-      t
+      r
     )
   );
-  if (o === l.ERC20Permit) {
-    const v = new s.utils.Interface([
+  if (c === d.ERC20Permit) {
+    const g = new n.Interface([
       "function permit(address owner,address spender,uint256 value,uint256 deadline,uint8 v,bytes32 r,bytes32 s) external"
     ]);
-    return s.utils.arrayify(
-      v.encodeFunctionData("permit", [
-        t.owner,
-        t.spender,
-        t.value,
-        t.deadline,
-        m,
-        s.utils.arrayify(w),
-        s.utils.arrayify(f)
+    return n.getBytesCopy(
+      g.encodeFunctionData("permit", [
+        r.owner,
+        r.spender,
+        r.value,
+        r.deadline,
+        y,
+        n.getBytesCopy(w),
+        n.getBytesCopy(u)
       ])
     ).slice(4);
   }
-  const x = new s.utils.Interface([
+  const T = new n.Interface([
     "function permit(address holder,address spender,uint256 nonce,uint256 expiry,bool allowed,uint8 v,bytes32 r,bytes32 s) external"
   ]);
-  return s.utils.arrayify(
-    x.encodeFunctionData("permit", [
-      t.holder,
-      t.spender,
-      t.nonce,
-      t.expiry,
-      t.allowed,
-      m,
-      s.utils.arrayify(w),
-      s.utils.arrayify(f)
+  return n.getBytesCopy(
+    T.encodeFunctionData("permit", [
+      r.holder,
+      r.spender,
+      r.nonce,
+      r.expiry,
+      r.allowed,
+      y,
+      n.getBytesCopy(w),
+      n.getBytesCopy(u)
     ])
   ).slice(4);
 };
 export {
-  M as approveTokenToHinkal
+  V as approveTokenToHinkal
 };

package/functions/web3/functionCalls/approveTokensToHinkal.cjs

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

@@ -1,4 +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, chainId: number, contractForApproval: ethers.Contract, tokensToApprove: ERC20Token[], amounts: bigint[]) => Promise<void>;
+export declare const approveTokensToHinkal: (hinkal: IHinkal, contractForApproval: ethers.Contract, tokensToApprove: ERC20Token[], amounts: bigint[]) => Promise<void>;

package/functions/web3/functionCalls/approveTokensToHinkal.mjs

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

package/functions/web3/functionCalls/constructBatchCall.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const u=require("ethers"),f=require("../../../externalABIs/index.cjs"),v=(e,t)=>new u.ethers.utils.Interface(f.ERC20ABI).encodeFunctionData("approve",[e,t]),A=(e,t,n,r)=>r.encodeFunctionData("transact",[e[0],e[1],e[2],t,n]),h=(e,t,n,r,i,l,p,o)=>{const a=[];for(let s=0;s<e.length;s+=1){const c=e[s],d=t[s];c!==u.ethers.constants.AddressZero&&d>0n&&a.push({to:c,value:"0x0",data:v(n,d)})}return a.push({to:r.address,value:o>0n?`0x${o.toString(16)}`:"0x0",data:A(i,l,p,r.interface)}),a};exports.buildApproveAndTransactCalls=h;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const i=require("ethers"),f=require("../../../externalABIs/index.cjs"),v=(e,t)=>new i.ethers.Interface(f.ERC20ABI).encodeFunctionData("approve",[e,t]),g=(e,t,n,r)=>r.encodeFunctionData("transact",[e[0],e[1],e[2],t,n]),h=async(e,t,n,r,u,l,p,o)=>{const s=[];for(let a=0;a<e.length;a+=1){const c=e[a],d=t[a];c!==i.ethers.ZeroAddress&&d>0n&&s.push({to:c,value:"0x0",data:v(n,d)})}const A=await r.getAddress();return s.push({to:A,value:o>0n?`0x${o.toString(16)}`:"0x0",data:g(u,l,p,r.interface)}),s};exports.buildApproveAndTransactCalls=h;

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

@@ -1,5 +1,5 @@
-import { Contract } from 'ethers';
+import { ethers } from 'ethers';
 import { CircomDataBaseType, DimDataType } from '../../../types/circom-data.types';
 import { NewZkCallDataType } from '../../../types/snark.types';
 import { Call } from '../../../types/eip5792.types';
-export declare const buildApproveAndTransactCalls: (tokenAddresses: string[], amounts: bigint[], spenderAddress: string, contractForTransaction: Contract, zkCallData: NewZkCallDataType, dimData: DimDataType, circomData: CircomDataBaseType, ethValue: bigint) => Call[];
+export declare const buildApproveAndTransactCalls: (tokenAddresses: string[], amounts: bigint[], spenderAddress: string, contractForTransaction: ethers.Contract, zkCallData: NewZkCallDataType, dimData: DimDataType, circomData: CircomDataBaseType, ethValue: bigint) => Promise<Call[]>;

package/functions/web3/functionCalls/constructBatchCall.mjs

@@ -1,19 +1,20 @@
 import { ethers as i } from "ethers";
-import { ERC20ABI as f } from "../../../externalABIs/index.mjs";
-const m = (t, n) => new i.utils.Interface(f).encodeFunctionData("approve", [t, n]), v = (t, n, e, o) => o.encodeFunctionData("transact", [t[0], t[1], t[2], n, e]), h = (t, n, e, o, p, u, l, s) => {
+import { ERC20ABI as A } from "../../../externalABIs/index.mjs";
+const m = (t, e) => new i.Interface(A).encodeFunctionData("approve", [t, e]), v = (t, e, n, o) => o.encodeFunctionData("transact", [t[0], t[1], t[2], e, n]), h = async (t, e, n, o, p, u, f, c) => {
   const r = [];
   for (let a = 0; a < t.length; a += 1) {
-    const c = t[a], d = n[a];
-    c !== i.constants.AddressZero && d > 0n && r.push({
-      to: c,
+    const s = t[a], d = e[a];
+    s !== i.ZeroAddress && d > 0n && r.push({
+      to: s,
       value: "0x0",
-      data: m(e, d)
+      data: m(n, d)
     });
   }
+  const l = await o.getAddress();
   return r.push({
-    to: o.address,
-    value: s > 0n ? `0x${s.toString(16)}` : "0x0",
-    data: v(p, u, l, o.interface)
+    to: l,
+    value: c > 0n ? `0x${c.toString(16)}` : "0x0",
+    data: v(p, u, f, o.interface)
   }), r;
 };
 export {

package/functions/web3/functionCalls/estimateGasRelayer.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("ethers-v6h"),p=require("../../private-wallet/emporium.helpers.cjs"),i=require("../../../constants/chains.constants.cjs"),d=async(r,t,c,s,o)=>{const{hinkalAddress:h,hinkalABI:u}=i.networkRegistry[r].contractData,l=new a.ethers.JsonRpcProvider(i.networkRegistry[r].fetchRpcUrl),y=new a.ethers.Contract(h,u,l),m="transact";let e={from:s.relay};if(o){const n=p.recoverAuthorizationData(o);n&&(e={...e,authorizationList:[n],type:4})}return await y[m].estimateGas(t[0],t[1],t[2],c,s,e)};exports.estimateGasRelayer=d;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("ethers"),g=require("../../private-wallet/emporium.helpers.cjs"),i=require("../../../constants/chains.constants.cjs"),m=async(r,t,c,s,n)=>{const{hinkalAddress:u,hinkalABI:h}=i.networkRegistry[r.getCurrentChainId()].contractData,d=new a.ethers.JsonRpcProvider(i.networkRegistry[r.getCurrentChainId()].fetchRpcUrl),l=new a.ethers.Contract(u,h,d),y="transact";let e={from:s.relay};if(n){const o=g.recoverAuthorizationData(n);o&&(e={...e,authorizationList:[o],type:4})}return await l[y].estimateGas(t[0],t[1],t[2],c,s,e)};exports.estimateGasRelayer=m;