@hinkal/common 0.2.22 → 0.2.23

package/functions/web3/events/balanceChangedCustomHandler.mjs

@@ -1,13 +1,12 @@
 import "../../../types/circom-data.types.mjs";
 import { EventType as o } from "../../../types/hinkal.types.mjs";
-import "../../../types/transactions.types.mjs";
 import "../../../types/activities.types.mjs";
-const p = (t) => {
-  const n = o.BalanceChange, e = new CustomEvent(n, {
-    detail: t
+const m = (n) => {
+  const t = o.BalanceChange, e = new CustomEvent(t, {
+    detail: n
   });
   typeof document < "u" ? document.dispatchEvent(e) : process?.emit("message", e, void 0);
 };
 export {
-  p as balanceChangedCustomHandler
+  m as balanceChangedCustomHandler
 };

package/functions/web3/events/balanceChangedHandler.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../../types/circom-data.types.cjs");const n=require("../../../types/hinkal.types.cjs");require("../../../types/transactions.types.cjs");require("../../../types/activities.types.cjs");const t=()=>{const e=n.EventType.BalanceChange;typeof document<"u"?document.dispatchEvent(new Event(e)):process?.emit("message",e,void 0)};exports.balanceChangedHandler=t;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});require("../../../types/circom-data.types.cjs");const n=require("../../../types/hinkal.types.cjs");require("../../../types/activities.types.cjs");const t=()=>{const e=n.EventType.BalanceChange;typeof document<"u"?document.dispatchEvent(new Event(e)):process?.emit("message",e,void 0)};exports.balanceChangedHandler=t;

package/functions/web3/events/balanceChangedHandler.mjs

@@ -1,11 +1,10 @@
 import "../../../types/circom-data.types.mjs";
 import { EventType as n } from "../../../types/hinkal.types.mjs";
-import "../../../types/transactions.types.mjs";
 import "../../../types/activities.types.mjs";
-const i = () => {
+const p = () => {
   const e = n.BalanceChange;
   typeof document < "u" ? document.dispatchEvent(new Event(e)) : process?.emit("message", e, void 0);
 };
 export {
-  i as balanceChangedHandler
+  p as balanceChangedHandler
 };

package/functions/web3/events/getApprovedBalance.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const A=require("../../utils/caseInsensitive.utils.cjs"),l=require("../../utils/cacheFunctions.cjs"),k=require("async-mutex"),y=require("ethers"),I=require("../../utils/erc20tokenFunctions.cjs"),g=require("../../../data-structures/TokenDBs/PrivateTokensDB.cjs"),m=require("../../../constants/vite.constants.cjs"),h=new k.Mutex,f=(e,c,n)=>(e.forEach(t=>{t.inHinkalAddress===n&&c.push(t)}),c),v=(e,c=!1)=>{const{userKeys:n}=e,t=e.getCurrentChainId();c&&l.resetInHinkalAddressesCache(e,t,n.getShieldedPublicKey());const{approvals:o}=e,r=l.getInHinkalAddressesCache(e,t,n.getShieldedPublicKey());let i=[];return o.forEach((d,u)=>{const s=r[u];let a;s?a=BigInt(s):(a=n.getInHinkalAddress(u),r[u]=a.toString()),i=f(d.map(p=>({...p,interactionAddress:u})),i,a)}),l.setInHinkalAddressesCache(r,e,t,n.getShieldedPublicKey()),i},x=(e,c,n)=>v(e,n).filter(o=>A.caseInsensitiveEqual(o.tokenAddress,c)).sort((o,r)=>o.amount===r.amount?0:o.amount>r.amount?-1:1),E=async(e,c,n)=>{const t=e.getCurrentChainId(),o=await e.getEthereumAddress();let r=[];const i=new Map;return await h.runExclusive(async()=>{const d=v(e,c);n&&m.isExtension&&await g.privateTokensDB.fetchAndUpdatePrivateTokens(d.map(s=>s.tokenAddress),t,o),r=(m.isExtension?await g.privateTokensDB.getPrivateTokens(t,o):I.getErc20TokensForChain(t)).map(s=>({token:s,balance:d.reduce((a,p)=>A.caseInsensitiveEqual(s.erc20TokenAddress,p.tokenAddress)?a+p.amount:a,0n),timestamp:"0",nfts:[]})),r.forEach(s=>{i.set(s.token.erc20TokenAddress.toLowerCase(),s)})}),i},T=(e,c,n)=>{const{userKeys:t,approvals:o}=e,r=y.ethers.utils.getAddress(c),i=o.get(r)??[],d=t.getInHinkalAddress(r);return i.reduce((s,a)=>A.caseInsensitiveEqual(a.tokenAddress,n)&&a.inHinkalAddress===d?s+a.amount:s,0n)};exports.getApprovedBalance=E;exports.getApprovedUtxos=v;exports.getApprovedUtxosForToken=x;exports.getMyApprovalAmountForInteraction=T;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const A=require("../../utils/caseInsensitive.utils.cjs"),l=require("../../utils/cacheFunctions.cjs"),k=require("async-mutex"),y=require("ethers"),I=require("../../utils/erc20tokenFunctions.cjs"),g=require("../../../data-structures/TokenDBs/PrivateTokensDB.cjs"),m=require("../../../constants/vite.constants.cjs"),h=new k.Mutex,f=(e,c,n)=>(e.forEach(t=>{t.inHinkalAddress===n&&c.push(t)}),c),v=(e,c=!1)=>{const{userKeys:n}=e,t=e.getCurrentChainId();c&&l.resetInHinkalAddressesCache(e,t,n.getShieldedPublicKey());const{approvals:o}=e,r=l.getInHinkalAddressesCache(e,t,n.getShieldedPublicKey());let i=[];return o.forEach((d,u)=>{const s=r[u];let a;s?a=BigInt(s):(a=n.getInHinkalAddress(u),r[u]=a.toString()),i=f(d.map(p=>({...p,interactionAddress:u})),i,a)}),l.setInHinkalAddressesCache(r,e,t,n.getShieldedPublicKey()),i},x=(e,c,n)=>v(e,n).filter(o=>A.caseInsensitiveEqual(o.tokenAddress,c)).sort((o,r)=>o.amount===r.amount?0:o.amount>r.amount?-1:1),E=async(e,c,n)=>{const t=e.getCurrentChainId(),o=await e.getEthereumAddress();let r=[];const i=new Map;return await h.runExclusive(async()=>{const d=v(e,c);n&&m.isExtension&&await g.privateTokensDB.fetchAndUpdatePrivateTokens(d.map(s=>s.tokenAddress),t,o),r=(m.isExtension?await g.privateTokensDB.getPrivateTokens(t,o):I.getErc20TokensForChain(t)).map(s=>({token:s,balance:d.reduce((a,p)=>A.caseInsensitiveEqual(s.erc20TokenAddress,p.tokenAddress)?a+p.amount:a,0n),timestamp:"0",nfts:[]})),r.forEach(s=>{i.set(s.token.erc20TokenAddress.toLowerCase(),s)})}),i},T=(e,c,n)=>{const{userKeys:t,approvals:o}=e,r=y.ethers.getAddress(c),i=o.get(r)??[],d=t.getInHinkalAddress(r);return i.reduce((s,a)=>A.caseInsensitiveEqual(a.tokenAddress,n)&&a.inHinkalAddress===d?s+a.amount:s,0n)};exports.getApprovedBalance=E;exports.getApprovedUtxos=v;exports.getApprovedUtxosForToken=x;exports.getMyApprovalAmountForInteraction=T;

package/functions/web3/events/getApprovedBalance.mjs

@@ -43,7 +43,7 @@ const C = new h(), H = (e, d, r) => (e.forEach((t) => {
     });
   }), i;
 }, U = (e, d, r) => {
-  const { userKeys: t, approvals: o } = e, n = y.utils.getAddress(d), i = o.get(n) ?? [], c = t.getInHinkalAddress(n);
+  const { userKeys: t, approvals: o } = e, n = y.getAddress(d), i = o.get(n) ?? [], c = t.getInHinkalAddress(n);
   return i.reduce((s, a) => u(a.tokenAddress, r) && a.inHinkalAddress === c ? s + a.amount : s, 0n);
 };
 export {

package/functions/web3/events/getInputUtxosEnclave.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("ethers"),g=require("../../../data-structures/utxo/Utxo.cjs"),x=require("../../../data-structures/crypto-keys/keys.cjs"),A=require("../../utils/encryptInputForEnclave.cjs"),k=require("../../../constants/chains.constants.cjs"),U=require("../../utils/solanaMint.utils.cjs"),f=require("@solana/web3.js"),E=s=>{if(!s)return;const t=a.ethers.utils.arrayify(s);if(t.length!==32)return;const r=new f.PublicKey(t),n=r.toBase58(),{compressedAddress:i}=U.formatMintAddress(r);return{mintBase58:n,compressedAddress:i}},P=async(s,t,r)=>{const n=r.getShieldedPrivateKey(),{privateKey:i,publicKey:d}=x.UserKeys.getEncryptionKeyPair(n),u=a.ethers.utils.solidityPack(["uint256","uint256","uint256"],[d,i,n]),l=a.ethers.utils.arrayify(u),{keyCiphertext:y,inputCiphertext:p}=await A.makeEnclaveHandshakeAndEncryptUint8Array(l),{utxos:m,lastOutput:v,encryptedOutputs:h}=await s.getAPI().decryptUtxoEnclaveCall(t,y,p);return{utxos:m.map(c=>{let e=c;if(k.isSolanaLike(t)){const o=E(c.mintAddress);if(!o)throw new Error("Invalid mint address");e={...e,erc20TokenAddress:o.compressedAddress,mintAddress:o.mintBase58}}return new g.Utxo({...e,amount:BigInt(e.amount),randomization:e.randomization?BigInt(e.randomization):void 0,shieldedPrivateKey:n})}),encryptedOutputs:h,lastOutput:v}};exports.getInputUtxosEnclave=P;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const a=require("ethers"),h=require("../../../data-structures/utxo/Utxo.cjs"),x=require("../../../data-structures/crypto-keys/keys.cjs"),A=require("../../utils/encryptInputForEnclave.cjs"),k=require("../../../constants/chains.constants.cjs"),U=require("../../utils/solanaMint.utils.cjs"),E=require("@solana/web3.js"),P=s=>{if(!s)return;const t=a.ethers.getBytes(s);if(t.length!==32)return;const r=new E.PublicKey(t),n=r.toBase58(),{compressedAddress:i}=U.formatMintAddress(r);return{mintBase58:n,compressedAddress:i}},q=async(s,t,r)=>{const n=r.getShieldedPrivateKey(),{privateKey:i,publicKey:d}=x.UserKeys.getEncryptionKeyPair(n),u=a.ethers.solidityPacked(["uint256","uint256","uint256"],[d,i,n]),l=a.ethers.getBytes(u),{keyCiphertext:y,inputCiphertext:p}=await A.makeEnclaveHandshakeAndEncryptUint8Array(l),{utxos:m,lastOutput:v,encryptedOutputs:g}=await s.getAPI().decryptUtxoEnclaveCall(t,y,p);return{utxos:m.map(c=>{let e=c;if(k.isSolanaLike(t)){const o=P(c.mintAddress);if(!o)throw new Error("Invalid mint address");e={...e,erc20TokenAddress:o.compressedAddress,mintAddress:o.mintBase58}}return new h.Utxo({...e,amount:BigInt(e.amount),randomization:e.randomization?BigInt(e.randomization):void 0,shieldedPrivateKey:n})}),encryptedOutputs:g,lastOutput:v}};exports.getInputUtxosEnclave=q;

package/functions/web3/events/getInputUtxosEnclave.mjs

@@ -1,41 +1,41 @@
 import { ethers as a } from "ethers";
 import { Utxo as A } from "../../../data-structures/utxo/Utxo.mjs";
-import { UserKeys as x } from "../../../data-structures/crypto-keys/keys.mjs";
-import { makeEnclaveHandshakeAndEncryptUint8Array as h } from "../../utils/encryptInputForEnclave.mjs";
-import { isSolanaLike as k } from "../../../constants/chains.constants.mjs";
-import { formatMintAddress as g } from "../../utils/solanaMint.utils.mjs";
-import { PublicKey as K } from "@solana/web3.js";
-const P = (n) => {
-  if (!n)
+import { UserKeys as g } from "../../../data-structures/crypto-keys/keys.mjs";
+import { makeEnclaveHandshakeAndEncryptUint8Array as x } from "../../utils/encryptInputForEnclave.mjs";
+import { isSolanaLike as h } from "../../../constants/chains.constants.mjs";
+import { formatMintAddress as k } from "../../utils/solanaMint.utils.mjs";
+import { PublicKey as B } from "@solana/web3.js";
+const K = (r) => {
+  if (!r)
     return;
-  const e = a.utils.arrayify(n);
+  const e = a.getBytes(r);
   if (e.length !== 32)
     return;
-  const i = new K(e), r = i.toBase58(), { compressedAddress: o } = g(i);
-  return { mintBase58: r, compressedAddress: o };
-}, S = async (n, e, i) => {
-  const r = i.getShieldedPrivateKey(), { privateKey: o, publicKey: c } = x.getEncryptionKeyPair(r), m = a.utils.solidityPack(
+  const o = new B(e), n = o.toBase58(), { compressedAddress: s } = k(o);
+  return { mintBase58: n, compressedAddress: s };
+}, S = async (r, e, o) => {
+  const n = o.getShieldedPrivateKey(), { privateKey: s, publicKey: c } = g.getEncryptionKeyPair(n), m = a.solidityPacked(
     ["uint256", "uint256", "uint256"],
-    [c, o, r]
-  ), u = a.utils.arrayify(m), { keyCiphertext: l, inputCiphertext: p } = await h(u), { utxos: y, lastOutput: f, encryptedOutputs: v } = await n.getAPI().decryptUtxoEnclaveCall(e, l, p);
+    [c, s, n]
+  ), p = a.getBytes(m), { keyCiphertext: u, inputCiphertext: l } = await x(p), { utxos: y, lastOutput: f, encryptedOutputs: v } = await r.getAPI().decryptUtxoEnclaveCall(e, u, l);
   return {
     utxos: y.map((d) => {
       let t = d;
-      if (k(e)) {
-        const s = P(d.mintAddress);
-        if (!s)
+      if (h(e)) {
+        const i = K(d.mintAddress);
+        if (!i)
           throw new Error("Invalid mint address");
         t = {
           ...t,
-          erc20TokenAddress: s.compressedAddress,
-          mintAddress: s.mintBase58
+          erc20TokenAddress: i.compressedAddress,
+          mintAddress: i.mintBase58
         };
       }
       return new A({
         ...t,
         amount: BigInt(t.amount),
         randomization: t.randomization ? BigInt(t.randomization) : void 0,
-        shieldedPrivateKey: r
+        shieldedPrivateKey: n
       });
     }),
     encryptedOutputs: v,

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("../../../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=(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"});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

@@ -18,7 +18,6 @@ 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";
@@ -37,9 +36,11 @@ import "../../utils/userAgent.mjs";
 import "multiformats";
 import "../../../API/tenderly.api.mjs";
 const f = (e, n) => {
-  const p = new a.utils.Interface(n);
+  const p = new a.Interface(n);
   try {
     const o = p.parseLog(e);
+    if (!o)
+      throw new Error("Could not parse log");
     return {
       name: o.name,
       args: o.args
@@ -48,7 +49,7 @@ const f = (e, n) => {
     return console.warn("Could not decode log"), null;
   }
 };
-async function Z(e, n, p, o) {
+async function Y(e, n, p, o) {
   try {
     const t = s[e].fetchRpcUrl;
     if (!t)
@@ -60,7 +61,7 @@ async function Z(e, n, p, o) {
       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);
     return {
-      transactionHash: r.transactionHash,
+      transactionHash: r.hash,
       from: r.from,
       to: r.to,
       blockNumber: r.blockNumber,
@@ -71,5 +72,5 @@ async function Z(e, n, p, o) {
   }
 }
 export {
-  Z 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("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 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,14 +1,13 @@
-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";
@@ -36,10 +35,10 @@ import "../../constants/events.constants.mjs";
 import "../utils/userAgent.mjs";
 import "multiformats";
 import "../../API/tenderly.api.mjs";
-const Q = async (r, m) => {
+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 {
-  Q 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 r=require("../../../types/ethereum-network.types.cjs");require("../../../types/transactions.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).functions.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;
+"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.mjs

@@ -1,15 +1,14 @@
 import "../../../types/circom-data.types.mjs";
 import { ContractType as r } from "../../../types/ethereum-network.types.mjs";
-import "../../../types/transactions.types.mjs";
 import "../../../types/activities.types.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 y = async (c) => (await c.getContractWithFetcher(r.AccessTokenContract).functions.hasToken(c.userKeys.getAccessKey()))[0], m = async (c) => {
-  const { hinkalIdl: t, originalDeployer: e } = i[c.getCurrentChainId()].contractData;
-  if (!t || !e)
+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 o = new u(e), n = c.getSolanaProgram(t), s = k(
+  const o = new u(t), n = c.getSolanaProgram(e), s = k(
     BigInt(c.userKeys.getAccessKey()),
     n.programId,
     o
@@ -18,16 +17,16 @@ const y = async (c) => (await c.getContractWithFetcher(r.AccessTokenContract).fu
     return !1;
   const { isAdded: a } = await n.account.accesskeyAccount.fetch(s);
   return a;
-}, w = async (c) => g(c.getCurrentChainId()) ? m(c) : y(c), I = async (c, t, e) => {
+}, C = async (c) => g(c.getCurrentChainId()) ? l(c) : y(c), w = async (c, e, t) => {
   const o = c.getContractWithSigner(r.AccessTokenContract), n = {
     value: 0n,
-    ...e && { type: 0 }
+    ...t && { type: 0 }
   };
-  return await o.addToken(t, n);
+  return await o.addToken(e, n);
 };
 export {
-  w as checkHinkalAccessToken,
+  C as checkHinkalAccessToken,
   y as checkHinkalAccessTokenEVM,
-  m as checkHinkalAccessTokenSolana,
-  I as mintAccessToken
+  l as checkHinkalAccessTokenSolana,
+  w as mintAccessToken
 };

package/functions/web3/functionCalls/approveToken.cjs

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

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

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"),g=require("../../private-wallet/emporium.helpers.cjs"),i=require("../../../constants/chains.constants.cjs"),m=async(r,t,c,s,n)=>{const{hinkalAddress:h,hinkalABI:u}=i.networkRegistry[r.getCurrentChainId()].contractData,d=new a.ethers.JsonRpcProvider(i.networkRegistry[r.getCurrentChainId()].fetchRpcUrl),l=new a.ethers.Contract(h,u,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;
+"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;

package/functions/web3/functionCalls/estimateGasRelayer.mjs

@@ -1,4 +1,4 @@
-import { ethers as a } from "ethers-v6h";
+import { ethers as a } from "ethers";
 import { recoverAuthorizationData as u } from "../../private-wallet/emporium.helpers.mjs";
 import { networkRegistry as i } from "../../../constants/chains.constants.mjs";
 const C = async (e, t, c, o, s) => {

package/functions/web3/functionCalls/inHinkalApprovalCalls.cjs

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