@sabaaa1/common 0.0.19 → 0.0.20

package/API/admin-calls.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("../constants/server.constants.cjs"),i=require("./getRelayerURL.cjs"),a=require("tor-stub"),o=(t,e)=>a.httpClient.post(`${i.getRelayerURL(t)}${r.RELAYER_CONFIG.emitTxPublicData}`,{adminData:e});exports.emitTxPublicData=o;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("../constants/server.constants.cjs"),i=require("./getRelayerURL.cjs"),s=require("axios"),c=async(e,t)=>{const{data:a}=await s.post(`${i.getRelayerURL(e)}${r.RELAYER_CONFIG.emitTxPublicData}`,{adminData:t});return a};exports.emitTxPublicData=c;

package/API/admin-calls.d.ts

@@ -1,2 +1,2 @@
 import { AdminDataType } from '../types/admin.types';
-export declare const emitTxPublicData: (chainId: number, adminData: AdminDataType | undefined) => any;
+export declare const emitTxPublicData: (chainId: number, adminData: AdminDataType | undefined) => Promise<any>;

package/API/admin-calls.mjs

@@ -1,7 +1,10 @@
-import { RELAYER_CONFIG as o } from "../constants/server.constants.mjs";
-import { getRelayerURL as e } from "./getRelayerURL.mjs";
-import { httpClient as i } from "tor-stub";
-const l = (t, r) => i.post(`${e(t)}${o.emitTxPublicData}`, { adminData: r });
+import { RELAYER_CONFIG as r } from "../constants/server.constants.mjs";
+import { getRelayerURL as i } from "./getRelayerURL.mjs";
+import m from "axios";
+const s = async (t, a) => {
+  const { data: o } = await m.post(`${i(t)}${r.emitTxPublicData}`, { adminData: a });
+  return o;
+};
 export {
-  l as emitTxPublicData
+  s as emitTxPublicData
 };

package/data-structures/ApprovalDBs/EventsPublicApprovalsDB.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const S=require("ethers"),w=require("idb-keyval"),T=require("async-mutex"),h=require("../../constants/chains.constants.cjs"),P=require("../../error-handling/logger.cjs"),L=require("../../functions/utils/string.utils.cjs"),I=require("../../types/cache.types.cjs"),q=require("tor-stub"),x=require("../../API/API.cjs"),f=require("../../types/approvals.types.cjs"),R=require("../../functions/utils/erc20tokenFunctions.cjs"),M=require("../../functions/utils/create-provider.cjs"),$=require("../../constants/events.constants.cjs"),m=require("../../functions/utils/caseInsensitive.utils.cjs"),_=require("../../constants/protocol.constants.cjs");class B{updateMutexes={};approvalTopic=S.ethers.utils.id("Approval(address,address,uint256)");approvalForAllTopic=S.ethers.utils.id("ApprovalForAll(address,address,bool)");getApprovedSelector=S.ethers.utils.id("getApproved(uint256)").substring(0,10);isApprovedForAllSelector=S.ethers.utils.id("isApprovedForAll(address,address)").substring(0,10);ALCHEMY_URLS={[h.chainIds.ethMainnet]:"eth-mainnet",[h.chainIds.polygon]:"polygon-mainnet",[h.chainIds.arbMainnet]:"arb-mainnet",[h.chainIds.optimism]:"opt-mainnet",[h.chainIds.base]:"base-mainnet",[h.chainIds.arcTestnet]:"arc-testnet",[h.chainIds.avalanche]:"avax-mainnet"};getMutex(t){return this.updateMutexes[t]||(this.updateMutexes[t]=new T.Mutex),this.updateMutexes[t]}getAlchemyUrl(t){const s=this.ALCHEMY_URLS[t];if(!s)throw new Error(`Unsupported chainId for Alchemy: ${t}`);return`https://${s}.g.alchemy.com/v2/${h.ALCHEMY_API_KEY}`}async getApprovals(t,s){const r=L.getStateKey(s,t);return(await w.get(I.StorageKeys.EVENTS_PUBLIC_APPROVALS))?.[r]||[]}async getLastProcessedBlock(t,s){const r=await w.get(I.StorageKeys.PUBLIC_APPROVALS_LAST_PROCESSED_BLOCKS)||{},d=L.getStateKey(s,t);return r[d]||$.EVENTS_INITIAL_BLOCKS[t]}async updateLastProcessedBlock(t,s,r){await w.update(I.StorageKeys.PUBLIC_APPROVALS_LAST_PROCESSED_BLOCKS,(d={})=>{const p=L.getStateKey(s,t);return{...d,[p]:r}})}async getApprovalEvents(t,s){try{const{fetchRpcUrl:r}=h.networkRegistry[s];if(!r)throw Error("No fetchRpcUrl in EventsPublicApprovalsDB");const d=M.createTorRpcProvider(r),p=await this.getLastProcessedBlock(s,t)+1,l=await d.getBlockNumber();if(p>l)return{approvalEvents:[],latestBlock:l};const E=S.ethers.utils.hexZeroPad(t.toLowerCase(),32),c={topics:[[this.approvalTopic,this.approvalForAllTopic],E],fromBlock:p,toBlock:l};return{approvalEvents:await d.getLogs(c),latestBlock:l}}catch(r){return P.Logger.error("Failed to fetch approval events",r),{approvalEvents:[],latestBlock:void 0}}}async checkCurrentAllowances(t,s,r){const d=this.getAlchemyUrl(t),p=`0x${s.substring(2).padStart(64,"0")}`,l=[...new Set(r.map(e=>e.contractAddress))],E=(await x.API.tokensInfoCall(t,l)).filter(e=>!!e),c=new Map(E.map(e=>[e.erc20TokenAddress.toLowerCase(),e])),i=[],k=[];if(r.forEach((e,o)=>{const a=c.get(e.contractAddress.toLowerCase());if(a)if(!R.isNFTToken(a))i.push({jsonrpc:"2.0",id:i.length,method:"alchemy_getTokenAllowance",params:[{contract:e.contractAddress,owner:s,spender:e.spenderAddress}]}),k.push({pairIndex:o,type:f.RevokeType.ERC20});else{const v=`0x${e.spenderAddress.substring(2).padStart(64,"0")}`,y=`${this.isApprovedForAllSelector}${p.substring(2)}${v.substring(2)}`;i.push({jsonrpc:"2.0",id:i.length,method:"eth_call",params:[{to:e.contractAddress,data:y},"latest"]}),k.push({pairIndex:o,type:f.RevokeType.approvedForAll}),e.tokenIds&&e.tokenIds.size>0&&e.tokenIds.forEach(g=>{const b=S.ethers.BigNumber.from(g).toHexString().substring(2).padStart(64,"0"),C=`${this.getApprovedSelector}${b}`;i.push({jsonrpc:"2.0",id:i.length,method:"eth_call",params:[{to:e.contractAddress,data:C},"latest"]}),k.push({pairIndex:o,type:f.RevokeType.tokenId,tokenId:g})})}}),i.length===0)return[];const n=await q.httpClient.post(d,i),u=[],A=new Set;return n.forEach((e,o)=>{const a=k[o];if(!a)return;const v=r[a.pairIndex],y=c.get(v.contractAddress.toLowerCase());if(!(!y||m.caseInsensitiveEqual(v.spenderAddress,_.zeroAddress))&&!e?.error&&e?.result&&e.result!=="0x")try{if(a.type===f.RevokeType.ERC20&&BigInt(e.result)>0n)u.push({token:y,spenderAddress:v.spenderAddress,allowance:BigInt(e.result)});else if(a.type===f.RevokeType.approvedForAll&&BigInt(e.result)===1n)A.add(a.pairIndex),u.push({token:y,spenderAddress:v.spenderAddress,allowance:1n});else if(a.type===f.RevokeType.tokenId&&!A.has(a.pairIndex)){const g=`0x${e.result.substring(26)}`.toLowerCase();!m.caseInsensitiveEqual(g,_.zeroAddress)&&m.caseInsensitiveEqual(g,v.spenderAddress)&&u.push({token:y,spenderAddress:v.spenderAddress,allowance:1n,tokenId:a.tokenId})}}catch(g){P.Logger.error("Error processing approval response",g)}}),u}async fetchAndUpdatePublicApprovals(t,s){const r=L.getStateKey(t,s);await this.getMutex(r).runExclusive(async()=>{try{const{approvalEvents:p,latestBlock:l}=await this.getApprovalEvents(t,s);if(!l)return;const E=await this.getApprovals(s,t),c=new Map;if(E.forEach(n=>{const u=n.token.erc20TokenAddress.toLowerCase(),A=n.spenderAddress.toLowerCase(),e=`${u}_${A}`;let o=c.get(e);o||(o={contractAddress:u,spenderAddress:A,tokenIds:new Set},c.set(e,o)),n.tokenId&&o.tokenIds&&o.tokenIds.add(n.tokenId)}),p.forEach(n=>{if(!n.topics[2])return;const u=n.address.toLowerCase(),A=`0x${n.topics[2].substring(26)}`.toLowerCase();if(m.caseInsensitiveEqual(A,_.zeroAddress))return;const e=`${u}_${A}`;let o=c.get(e);if(o||(o={contractAddress:u,spenderAddress:A,tokenIds:new Set},c.set(e,o)),n.topics.length===4&&o.tokenIds){const a=BigInt(n.topics[3]).toString();o.tokenIds.add(a)}}),c.size===0){await this.updateLastProcessedBlock(s,t,l);return}const i=Array.from(c.values()),k=await this.checkCurrentAllowances(s,t,i);await w.update(I.StorageKeys.EVENTS_PUBLIC_APPROVALS,(n={})=>({...n,[r]:k})),await this.updateLastProcessedBlock(s,t,l)}catch(p){P.Logger.error("Failed to sync approvals",p)}})}}const K=new B;exports.EventsPublicApprovalsDB=B;exports.eventsPublicApprovalsDB=K;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const S=require("ethers"),w=require("idb-keyval"),T=require("async-mutex"),h=require("../../constants/chains.constants.cjs"),P=require("../../error-handling/logger.cjs"),L=require("../../functions/utils/string.utils.cjs"),I=require("../../types/cache.types.cjs"),x=require("../../API/API.cjs"),f=require("../../types/approvals.types.cjs"),q=require("../../functions/utils/erc20tokenFunctions.cjs"),R=require("../../functions/utils/create-provider.cjs"),M=require("../../constants/events.constants.cjs"),m=require("../../functions/utils/caseInsensitive.utils.cjs"),_=require("../../constants/protocol.constants.cjs"),$=require("axios");class B{updateMutexes={};approvalTopic=S.ethers.utils.id("Approval(address,address,uint256)");approvalForAllTopic=S.ethers.utils.id("ApprovalForAll(address,address,bool)");getApprovedSelector=S.ethers.utils.id("getApproved(uint256)").substring(0,10);isApprovedForAllSelector=S.ethers.utils.id("isApprovedForAll(address,address)").substring(0,10);ALCHEMY_URLS={[h.chainIds.ethMainnet]:"eth-mainnet",[h.chainIds.polygon]:"polygon-mainnet",[h.chainIds.arbMainnet]:"arb-mainnet",[h.chainIds.optimism]:"opt-mainnet",[h.chainIds.base]:"base-mainnet",[h.chainIds.arcTestnet]:"arc-testnet",[h.chainIds.avalanche]:"avax-mainnet"};getMutex(t){return this.updateMutexes[t]||(this.updateMutexes[t]=new T.Mutex),this.updateMutexes[t]}getAlchemyUrl(t){const s=this.ALCHEMY_URLS[t];if(!s)throw new Error(`Unsupported chainId for Alchemy: ${t}`);return`https://${s}.g.alchemy.com/v2/${h.ALCHEMY_API_KEY}`}async getApprovals(t,s){const r=L.getStateKey(s,t);return(await w.get(I.StorageKeys.EVENTS_PUBLIC_APPROVALS))?.[r]||[]}async getLastProcessedBlock(t,s){const r=await w.get(I.StorageKeys.PUBLIC_APPROVALS_LAST_PROCESSED_BLOCKS)||{},d=L.getStateKey(s,t);return r[d]||M.EVENTS_INITIAL_BLOCKS[t]}async updateLastProcessedBlock(t,s,r){await w.update(I.StorageKeys.PUBLIC_APPROVALS_LAST_PROCESSED_BLOCKS,(d={})=>{const p=L.getStateKey(s,t);return{...d,[p]:r}})}async getApprovalEvents(t,s){try{const{fetchRpcUrl:r}=h.networkRegistry[s];if(!r)throw Error("No fetchRpcUrl in EventsPublicApprovalsDB");const d=R.createTorRpcProvider(r),p=await this.getLastProcessedBlock(s,t)+1,l=await d.getBlockNumber();if(p>l)return{approvalEvents:[],latestBlock:l};const E=S.ethers.utils.hexZeroPad(t.toLowerCase(),32),c={topics:[[this.approvalTopic,this.approvalForAllTopic],E],fromBlock:p,toBlock:l};return{approvalEvents:await d.getLogs(c),latestBlock:l}}catch(r){return P.Logger.error("Failed to fetch approval events",r),{approvalEvents:[],latestBlock:void 0}}}async checkCurrentAllowances(t,s,r){const d=this.getAlchemyUrl(t),p=`0x${s.substring(2).padStart(64,"0")}`,l=[...new Set(r.map(e=>e.contractAddress))],E=(await x.API.tokensInfoCall(t,l)).filter(e=>!!e),c=new Map(E.map(e=>[e.erc20TokenAddress.toLowerCase(),e])),i=[],k=[];if(r.forEach((e,o)=>{const a=c.get(e.contractAddress.toLowerCase());if(a)if(!q.isNFTToken(a))i.push({jsonrpc:"2.0",id:i.length,method:"alchemy_getTokenAllowance",params:[{contract:e.contractAddress,owner:s,spender:e.spenderAddress}]}),k.push({pairIndex:o,type:f.RevokeType.ERC20});else{const v=`0x${e.spenderAddress.substring(2).padStart(64,"0")}`,y=`${this.isApprovedForAllSelector}${p.substring(2)}${v.substring(2)}`;i.push({jsonrpc:"2.0",id:i.length,method:"eth_call",params:[{to:e.contractAddress,data:y},"latest"]}),k.push({pairIndex:o,type:f.RevokeType.approvedForAll}),e.tokenIds&&e.tokenIds.size>0&&e.tokenIds.forEach(g=>{const b=S.ethers.BigNumber.from(g).toHexString().substring(2).padStart(64,"0"),C=`${this.getApprovedSelector}${b}`;i.push({jsonrpc:"2.0",id:i.length,method:"eth_call",params:[{to:e.contractAddress,data:C},"latest"]}),k.push({pairIndex:o,type:f.RevokeType.tokenId,tokenId:g})})}}),i.length===0)return[];const{data:n}=await $.post(d,i),u=[],A=new Set;return n.forEach((e,o)=>{const a=k[o];if(!a)return;const v=r[a.pairIndex],y=c.get(v.contractAddress.toLowerCase());if(!(!y||m.caseInsensitiveEqual(v.spenderAddress,_.zeroAddress))&&!e?.error&&e?.result&&e.result!=="0x")try{if(a.type===f.RevokeType.ERC20&&BigInt(e.result)>0n)u.push({token:y,spenderAddress:v.spenderAddress,allowance:BigInt(e.result)});else if(a.type===f.RevokeType.approvedForAll&&BigInt(e.result)===1n)A.add(a.pairIndex),u.push({token:y,spenderAddress:v.spenderAddress,allowance:1n});else if(a.type===f.RevokeType.tokenId&&!A.has(a.pairIndex)){const g=`0x${e.result.substring(26)}`.toLowerCase();!m.caseInsensitiveEqual(g,_.zeroAddress)&&m.caseInsensitiveEqual(g,v.spenderAddress)&&u.push({token:y,spenderAddress:v.spenderAddress,allowance:1n,tokenId:a.tokenId})}}catch(g){P.Logger.error("Error processing approval response",g)}}),u}async fetchAndUpdatePublicApprovals(t,s){const r=L.getStateKey(t,s);await this.getMutex(r).runExclusive(async()=>{try{const{approvalEvents:p,latestBlock:l}=await this.getApprovalEvents(t,s);if(!l)return;const E=await this.getApprovals(s,t),c=new Map;if(E.forEach(n=>{const u=n.token.erc20TokenAddress.toLowerCase(),A=n.spenderAddress.toLowerCase(),e=`${u}_${A}`;let o=c.get(e);o||(o={contractAddress:u,spenderAddress:A,tokenIds:new Set},c.set(e,o)),n.tokenId&&o.tokenIds&&o.tokenIds.add(n.tokenId)}),p.forEach(n=>{if(!n.topics[2])return;const u=n.address.toLowerCase(),A=`0x${n.topics[2].substring(26)}`.toLowerCase();if(m.caseInsensitiveEqual(A,_.zeroAddress))return;const e=`${u}_${A}`;let o=c.get(e);if(o||(o={contractAddress:u,spenderAddress:A,tokenIds:new Set},c.set(e,o)),n.topics.length===4&&o.tokenIds){const a=BigInt(n.topics[3]).toString();o.tokenIds.add(a)}}),c.size===0){await this.updateLastProcessedBlock(s,t,l);return}const i=Array.from(c.values()),k=await this.checkCurrentAllowances(s,t,i);await w.update(I.StorageKeys.EVENTS_PUBLIC_APPROVALS,(n={})=>({...n,[r]:k})),await this.updateLastProcessedBlock(s,t,l)}catch(p){P.Logger.error("Failed to sync approvals",p)}})}}const K=new B;exports.EventsPublicApprovalsDB=B;exports.eventsPublicApprovalsDB=K;

package/data-structures/ApprovalDBs/EventsPublicApprovalsDB.mjs

@@ -1,18 +1,18 @@
 import { ethers as k } from "ethers";
-import { get as P, update as I } from "idb-keyval";
+import { get as C, update as I } from "idb-keyval";
 import { Mutex as b } from "async-mutex";
 import { chainIds as f, ALCHEMY_API_KEY as T, networkRegistry as M } from "../../constants/chains.constants.mjs";
 import { Logger as B } from "../../error-handling/logger.mjs";
 import { getStateKey as L } from "../../functions/utils/string.utils.mjs";
 import { StorageKeys as S } from "../../types/cache.types.mjs";
-import { httpClient as R } from "tor-stub";
-import { API as $ } from "../../API/API.mjs";
+import { API as R } from "../../API/API.mjs";
 import { RevokeType as w } from "../../types/approvals.types.mjs";
-import { isNFTToken as U } from "../../functions/utils/erc20tokenFunctions.mjs";
-import { createTorRpcProvider as F } from "../../functions/utils/create-provider.mjs";
-import { EVENTS_INITIAL_BLOCKS as O } from "../../constants/events.constants.mjs";
+import { isNFTToken as $ } from "../../functions/utils/erc20tokenFunctions.mjs";
+import { createTorRpcProvider as U } from "../../functions/utils/create-provider.mjs";
+import { EVENTS_INITIAL_BLOCKS as F } from "../../constants/events.constants.mjs";
 import { caseInsensitiveEqual as y } from "../../functions/utils/caseInsensitive.utils.mjs";
-import { zeroAddress as C } from "../../constants/protocol.constants.mjs";
+import { zeroAddress as P } from "../../constants/protocol.constants.mjs";
+import O from "axios";
 class N {
   updateMutexes = {};
   approvalTopic = k.utils.id("Approval(address,address,uint256)");
@@ -39,11 +39,11 @@ class N {
   }
   async getApprovals(e, s) {
     const r = L(s, e);
-    return (await P(S.EVENTS_PUBLIC_APPROVALS))?.[r] || [];
+    return (await C(S.EVENTS_PUBLIC_APPROVALS))?.[r] || [];
   }
   async getLastProcessedBlock(e, s) {
-    const r = await P(S.PUBLIC_APPROVALS_LAST_PROCESSED_BLOCKS) || {}, d = L(s, e);
-    return r[d] || O[e];
+    const r = await C(S.PUBLIC_APPROVALS_LAST_PROCESSED_BLOCKS) || {}, d = L(s, e);
+    return r[d] || F[e];
   }
   async updateLastProcessedBlock(e, s, r) {
     await I(S.PUBLIC_APPROVALS_LAST_PROCESSED_BLOCKS, (d = {}) => {
@@ -59,57 +59,57 @@ class N {
       const { fetchRpcUrl: r } = M[s];
       if (!r)
         throw Error("No fetchRpcUrl in EventsPublicApprovalsDB");
-      const d = F(r), i = await this.getLastProcessedBlock(s, e) + 1, l = await d.getBlockNumber();
+      const d = U(r), i = await this.getLastProcessedBlock(s, e) + 1, l = await d.getBlockNumber();
       if (i > l)
         return { approvalEvents: [], latestBlock: l };
-      const E = k.utils.hexZeroPad(e.toLowerCase(), 32), p = {
+      const E = k.utils.hexZeroPad(e.toLowerCase(), 32), c = {
         topics: [[this.approvalTopic, this.approvalForAllTopic], E],
         fromBlock: i,
         toBlock: l
       };
-      return { approvalEvents: await d.getLogs(p), latestBlock: l };
+      return { approvalEvents: await d.getLogs(c), latestBlock: l };
     } catch (r) {
       return B.error("Failed to fetch approval events", r), { approvalEvents: [], latestBlock: void 0 };
     }
   }
   async checkCurrentAllowances(e, s, r) {
-    const d = this.getAlchemyUrl(e), i = `0x${s.substring(2).padStart(64, "0")}`, l = [...new Set(r.map((t) => t.contractAddress))], E = (await $.tokensInfoCall(e, l)).filter((t) => !!t), p = new Map(E.map((t) => [t.erc20TokenAddress.toLowerCase(), t])), c = [], v = [];
+    const d = this.getAlchemyUrl(e), i = `0x${s.substring(2).padStart(64, "0")}`, l = [...new Set(r.map((t) => t.contractAddress))], E = (await R.tokensInfoCall(e, l)).filter((t) => !!t), c = new Map(E.map((t) => [t.erc20TokenAddress.toLowerCase(), t])), p = [], v = [];
     if (r.forEach((t, o) => {
-      const a = p.get(t.contractAddress.toLowerCase());
+      const a = c.get(t.contractAddress.toLowerCase());
       if (a)
-        if (!U(a))
-          c.push({
+        if (!$(a))
+          p.push({
             jsonrpc: "2.0",
-            id: c.length,
+            id: p.length,
             method: "alchemy_getTokenAllowance",
             params: [{ contract: t.contractAddress, owner: s, spender: t.spenderAddress }]
           }), v.push({ pairIndex: o, type: w.ERC20 });
         else {
           const m = `0x${t.spenderAddress.substring(2).padStart(64, "0")}`, g = `${this.isApprovedForAllSelector}${i.substring(2)}${m.substring(2)}`;
-          c.push({
+          p.push({
             jsonrpc: "2.0",
-            id: c.length,
+            id: p.length,
             method: "eth_call",
             params: [{ to: t.contractAddress, data: g }, "latest"]
           }), v.push({ pairIndex: o, type: w.approvedForAll }), t.tokenIds && t.tokenIds.size > 0 && t.tokenIds.forEach((h) => {
-            const _ = k.BigNumber.from(h).toHexString().substring(2).padStart(64, "0"), x = `${this.getApprovedSelector}${_}`;
-            c.push({
+            const x = k.BigNumber.from(h).toHexString().substring(2).padStart(64, "0"), _ = `${this.getApprovedSelector}${x}`;
+            p.push({
               jsonrpc: "2.0",
-              id: c.length,
+              id: p.length,
               method: "eth_call",
-              params: [{ to: t.contractAddress, data: x }, "latest"]
+              params: [{ to: t.contractAddress, data: _ }, "latest"]
             }), v.push({ pairIndex: o, type: w.tokenId, tokenId: h });
           });
         }
-    }), c.length === 0)
+    }), p.length === 0)
       return [];
-    const n = await R.post(d, c), u = [], A = /* @__PURE__ */ new Set();
+    const { data: n } = await O.post(d, p), u = [], A = /* @__PURE__ */ new Set();
     return n.forEach((t, o) => {
       const a = v[o];
       if (!a)
         return;
-      const m = r[a.pairIndex], g = p.get(m.contractAddress.toLowerCase());
-      if (!(!g || y(m.spenderAddress, C)) && !t?.error && t?.result && t.result !== "0x")
+      const m = r[a.pairIndex], g = c.get(m.contractAddress.toLowerCase());
+      if (!(!g || y(m.spenderAddress, P)) && !t?.error && t?.result && t.result !== "0x")
         try {
           if (a.type === w.ERC20 && BigInt(t.result) > 0n)
             u.push({ token: g, spenderAddress: m.spenderAddress, allowance: BigInt(t.result) });
@@ -117,7 +117,7 @@ class N {
             A.add(a.pairIndex), u.push({ token: g, spenderAddress: m.spenderAddress, allowance: 1n });
           else if (a.type === w.tokenId && !A.has(a.pairIndex)) {
             const h = `0x${t.result.substring(26)}`.toLowerCase();
-            !y(h, C) && y(h, m.spenderAddress) && u.push({
+            !y(h, P) && y(h, m.spenderAddress) && u.push({
               token: g,
               spenderAddress: m.spenderAddress,
               allowance: 1n,
@@ -136,28 +136,28 @@ class N {
         const { approvalEvents: i, latestBlock: l } = await this.getApprovalEvents(e, s);
         if (!l)
           return;
-        const E = await this.getApprovals(s, e), p = /* @__PURE__ */ new Map();
+        const E = await this.getApprovals(s, e), c = /* @__PURE__ */ new Map();
         if (E.forEach((n) => {
           const u = n.token.erc20TokenAddress.toLowerCase(), A = n.spenderAddress.toLowerCase(), t = `${u}_${A}`;
-          let o = p.get(t);
-          o || (o = { contractAddress: u, spenderAddress: A, tokenIds: /* @__PURE__ */ new Set() }, p.set(t, o)), n.tokenId && o.tokenIds && o.tokenIds.add(n.tokenId);
+          let o = c.get(t);
+          o || (o = { contractAddress: u, spenderAddress: A, tokenIds: /* @__PURE__ */ new Set() }, c.set(t, o)), n.tokenId && o.tokenIds && o.tokenIds.add(n.tokenId);
         }), i.forEach((n) => {
           if (!n.topics[2])
             return;
           const u = n.address.toLowerCase(), A = `0x${n.topics[2].substring(26)}`.toLowerCase();
-          if (y(A, C))
+          if (y(A, P))
             return;
           const t = `${u}_${A}`;
-          let o = p.get(t);
-          if (o || (o = { contractAddress: u, spenderAddress: A, tokenIds: /* @__PURE__ */ new Set() }, p.set(t, o)), n.topics.length === 4 && o.tokenIds) {
+          let o = c.get(t);
+          if (o || (o = { contractAddress: u, spenderAddress: A, tokenIds: /* @__PURE__ */ new Set() }, c.set(t, o)), n.topics.length === 4 && o.tokenIds) {
             const a = BigInt(n.topics[3]).toString();
             o.tokenIds.add(a);
           }
-        }), p.size === 0) {
+        }), c.size === 0) {
           await this.updateLastProcessedBlock(s, e, l);
           return;
         }
-        const c = Array.from(p.values()), v = await this.checkCurrentAllowances(s, e, c);
+        const p = Array.from(c.values()), v = await this.checkCurrentAllowances(s, e, p);
         await I(S.EVENTS_PUBLIC_APPROVALS, (n = {}) => ({
           ...n,
           [r]: v

package/data-structures/TokenDBs/AlchemyPublicTokensDB.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const m=require("idb-keyval"),S=require("../../API/API.cjs"),r=require("../../constants/chains.constants.cjs"),y=require("../../constants/protocol.constants.cjs"),p=require("../../functions/utils/caseInsensitive.utils.cjs"),w=require("../../functions/utils/publicBalance.utils.cjs"),g=require("../../functions/utils/string.utils.cjs"),A=require("../../types/cache.types.cjs"),B=require("./token-visibility-db.cjs"),b=require("tor-stub");class _{fetchedTokens={};ALCHEMY_URLS={[r.chainIds.ethMainnet]:"eth-mainnet",[r.chainIds.polygon]:"polygon-mainnet",[r.chainIds.arbMainnet]:"arb-mainnet",[r.chainIds.optimism]:"opt-mainnet",[r.chainIds.base]:"base-mainnet",[r.chainIds.avalanche]:"avax-mainnet"};KNOWN_GOOD_NFTS={[r.chainIds.base]:["0x20bc8d248fe9c18a947406cea50d716828ab821f"],[r.chainIds.optimism]:["0x3c3e0e73b53a19bcaf4178b8f9c9428fd2a2775e"]};isWhitelistedNFT(t,s){return this.KNOWN_GOOD_NFTS[s]?this.KNOWN_GOOD_NFTS[s].some(n=>p.caseInsensitiveEqual(t,n)):!1}async getPublicTokens(t,s){const n=g.getStateKey(s,t);return(await m.get(A.StorageKeys.ALCHEMY_PUBLIC_TOKENS))?.[n]||[]}getFetchedTokens(t,s){const n=g.getStateKey(s,t);return this.fetchedTokens[n]||[]}async fetchAndUpdatePublicTokens(t,s){const n=g.getStateKey(t,s),l=await this.getERC20TokenAddresses(s,t),a=await this.getNFTTokens(s,t),u=a.map(o=>o.contractAddress),i=[...l,...u];if(!i.length)return;const c=(await S.API.tokensInfoCall(s,i)).map((o,k)=>{if(o)return o;const f=i[k],T=a.find(N=>p.caseInsensitiveEqual(N.contractAddress,f));return T&&T.tokenIds&&T.tokenIds.length>0&&this.isWhitelistedNFT(f,s)?{chainId:s,name:"Unknown NFT",symbol:"NFT",erc20TokenAddress:f,decimals:0,nftTokenType:y.TokenType.ERC721,tokenIds:T.tokenIds}:null}).filter(o=>!!o),d=await B.tokenVisibilityStorage.hideSpamsAndFetchHiddenTokensAddresses(s,c),I=c.filter(o=>!p.lowerCaseIncludes(d,o.erc20TokenAddress)).map(o=>({...o,tokenIds:a.find(k=>p.caseInsensitiveEqual(k.contractAddress,o.erc20TokenAddress))?.tokenIds}));await m.update(A.StorageKeys.ALCHEMY_PUBLIC_TOKENS,(o={})=>{const k={...o,[n]:I};return this.fetchedTokens=k,k})}async getERC20TokenAddresses(t,s){const n=await w.getPublicBalanceByTokenAddress(t,s,y.zeroAddress),l=`https://${this.ALCHEMY_URLS[t]}.g.alchemy.com/v2/${r.ALCHEMY_API_KEY}`,a=[];let u;do{const e=[s,"erc20"];u&&e.push({pageKey:u});const c=await b.httpClient.post(l,{jsonrpc:"2.0",id:1,method:"alchemy_getTokenBalances",params:e}),{result:d}=c;a.push(...d?.tokenBalances??[]),u=d?.pageKey}while(u);n&&n>0n&&a.push({contractAddress:y.zeroAddress,tokenBalance:n.toString()});const i={};return a.forEach(e=>{(!i[e.contractAddress]||BigInt(e.tokenBalance)>0n)&&(i[e.contractAddress]=e)}),Object.keys(i)}async getNFTTokens(t,s){const n=`https://${this.ALCHEMY_URLS[t]}.g.alchemy.com/nft/v3/${r.ALCHEMY_API_KEY}/getNFTsForOwner`,l=[];let a;do{const e=new URLSearchParams({owner:s,withMetadata:"false",pageSize:"100"});a&&e.append("pageKey",a);const c=await b.httpClient.get(`${n}?${e.toString()}`),{ownedNfts:d=[],pageKey:h}=c;l.push(...d),a=h}while(a);const i=l.filter(({contractAddress:e,tokenId:c})=>e&&c).reduce((e,{contractAddress:c,tokenId:d})=>{const h=c.toLowerCase();return e.has(h)||e.set(h,[]),e.get(h)?.push(d),e},new Map);return Array.from(i.entries()).map(([e,c])=>({contractAddress:e,tokenIds:c}))}}const E=new _;exports.AlchemyPublicTokensDB=_;exports.alchemyPublicTokensDB=E;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const m=require("idb-keyval"),S=require("../../API/API.cjs"),r=require("../../constants/chains.constants.cjs"),y=require("../../constants/protocol.constants.cjs"),f=require("../../functions/utils/caseInsensitive.utils.cjs"),w=require("../../functions/utils/publicBalance.utils.cjs"),g=require("../../functions/utils/string.utils.cjs"),A=require("../../types/cache.types.cjs"),B=require("./token-visibility-db.cjs"),b=require("axios");class _{fetchedTokens={};ALCHEMY_URLS={[r.chainIds.ethMainnet]:"eth-mainnet",[r.chainIds.polygon]:"polygon-mainnet",[r.chainIds.arbMainnet]:"arb-mainnet",[r.chainIds.optimism]:"opt-mainnet",[r.chainIds.base]:"base-mainnet",[r.chainIds.avalanche]:"avax-mainnet"};KNOWN_GOOD_NFTS={[r.chainIds.base]:["0x20bc8d248fe9c18a947406cea50d716828ab821f"],[r.chainIds.optimism]:["0x3c3e0e73b53a19bcaf4178b8f9c9428fd2a2775e"]};isWhitelistedNFT(t,s){return this.KNOWN_GOOD_NFTS[s]?this.KNOWN_GOOD_NFTS[s].some(n=>f.caseInsensitiveEqual(t,n)):!1}async getPublicTokens(t,s){const n=g.getStateKey(s,t);return(await m.get(A.StorageKeys.ALCHEMY_PUBLIC_TOKENS))?.[n]||[]}getFetchedTokens(t,s){const n=g.getStateKey(s,t);return this.fetchedTokens[n]||[]}async fetchAndUpdatePublicTokens(t,s){const n=g.getStateKey(t,s),l=await this.getERC20TokenAddresses(s,t),a=await this.getNFTTokens(s,t),u=a.map(o=>o.contractAddress),i=[...l,...u];if(!i.length)return;const c=(await S.API.tokensInfoCall(s,i)).map((o,h)=>{if(o)return o;const p=i[h],T=a.find(N=>f.caseInsensitiveEqual(N.contractAddress,p));return T&&T.tokenIds&&T.tokenIds.length>0&&this.isWhitelistedNFT(p,s)?{chainId:s,name:"Unknown NFT",symbol:"NFT",erc20TokenAddress:p,decimals:0,nftTokenType:y.TokenType.ERC721,tokenIds:T.tokenIds}:null}).filter(o=>!!o),d=await B.tokenVisibilityStorage.hideSpamsAndFetchHiddenTokensAddresses(s,c),I=c.filter(o=>!f.lowerCaseIncludes(d,o.erc20TokenAddress)).map(o=>({...o,tokenIds:a.find(h=>f.caseInsensitiveEqual(h.contractAddress,o.erc20TokenAddress))?.tokenIds}));await m.update(A.StorageKeys.ALCHEMY_PUBLIC_TOKENS,(o={})=>{const h={...o,[n]:I};return this.fetchedTokens=h,h})}async getERC20TokenAddresses(t,s){const n=await w.getPublicBalanceByTokenAddress(t,s,y.zeroAddress),l=`https://${this.ALCHEMY_URLS[t]}.g.alchemy.com/v2/${r.ALCHEMY_API_KEY}`,a=[];let u;do{const e=[s,"erc20"];u&&e.push({pageKey:u});const{data:c}=await b.post(l,{jsonrpc:"2.0",id:1,method:"alchemy_getTokenBalances",params:e}),{result:d}=c;a.push(...d?.tokenBalances??[]),u=d?.pageKey}while(u);n&&n>0n&&a.push({contractAddress:y.zeroAddress,tokenBalance:n.toString()});const i={};return a.forEach(e=>{(!i[e.contractAddress]||BigInt(e.tokenBalance)>0n)&&(i[e.contractAddress]=e)}),Object.keys(i)}async getNFTTokens(t,s){const n=`https://${this.ALCHEMY_URLS[t]}.g.alchemy.com/nft/v3/${r.ALCHEMY_API_KEY}/getNFTsForOwner`,l=[];let a;do{const e=new URLSearchParams({owner:s,withMetadata:"false",pageSize:"100"});a&&e.append("pageKey",a);const{data:c}=await b.get(`${n}?${e.toString()}`),{ownedNfts:d=[],pageKey:k}=c;l.push(...d),a=k}while(a);const i=l.filter(({contractAddress:e,tokenId:c})=>e&&c).reduce((e,{contractAddress:c,tokenId:d})=>{const k=c.toLowerCase();return e.has(k)||e.set(k,[]),e.get(k)?.push(d),e},new Map);return Array.from(i.entries()).map(([e,c])=>({contractAddress:e,tokenIds:c}))}}const E=new _;exports.AlchemyPublicTokensDB=_;exports.alchemyPublicTokensDB=E;

package/data-structures/TokenDBs/AlchemyPublicTokensDB.mjs

@@ -1,13 +1,13 @@
-import { get as B, update as C } from "idb-keyval";
-import { API as E } from "../../API/API.mjs";
+import { get as B, update as E } from "idb-keyval";
+import { API as S } from "../../API/API.mjs";
 import { chainIds as d, ALCHEMY_API_KEY as g } from "../../constants/chains.constants.mjs";
-import { TokenType as S, zeroAddress as y } from "../../constants/protocol.constants.mjs";
-import { caseInsensitiveEqual as h, lowerCaseIncludes as _ } from "../../functions/utils/caseInsensitive.utils.mjs";
+import { TokenType as _, zeroAddress as y } from "../../constants/protocol.constants.mjs";
+import { caseInsensitiveEqual as h, lowerCaseIncludes as C } from "../../functions/utils/caseInsensitive.utils.mjs";
 import { getPublicBalanceByTokenAddress as F } from "../../functions/utils/publicBalance.utils.mjs";
 import { getStateKey as u } from "../../functions/utils/string.utils.mjs";
 import { StorageKeys as A } from "../../types/cache.types.mjs";
 import { tokenVisibilityStorage as K } from "./token-visibility-db.mjs";
-import { httpClient as b } from "tor-stub";
+import b from "axios";
 class L {
   fetchedTokens = {};
   ALCHEMY_URLS = {
@@ -41,66 +41,66 @@ class L {
     return this.fetchedTokens[s] || [];
   }
   async fetchAndUpdatePublicTokens(n, t) {
-    const s = u(n, t), l = await this.getERC20TokenAddresses(t, n), r = await this.getNFTTokens(t, n), m = r.map((o) => o.contractAddress), c = [...l, ...m];
+    const s = u(n, t), l = await this.getERC20TokenAddresses(t, n), a = await this.getNFTTokens(t, n), m = a.map((o) => o.contractAddress), c = [...l, ...m];
     if (!c.length)
       return;
-    const a = (await E.tokensInfoCall(t, c)).map((o, f) => {
+    const r = (await S.tokensInfoCall(t, c)).map((o, k) => {
       if (o)
         return o;
-      const T = c[f], k = r.find((w) => h(w.contractAddress, T));
-      return k && k.tokenIds && k.tokenIds.length > 0 && this.isWhitelistedNFT(T, t) ? {
+      const T = c[k], p = a.find((w) => h(w.contractAddress, T));
+      return p && p.tokenIds && p.tokenIds.length > 0 && this.isWhitelistedNFT(T, t) ? {
         chainId: t,
         name: "Unknown NFT",
         symbol: "NFT",
         erc20TokenAddress: T,
         decimals: 0,
-        nftTokenType: S.ERC721,
-        tokenIds: k.tokenIds
+        nftTokenType: _.ERC721,
+        tokenIds: p.tokenIds
       } : null;
     }).filter((o) => !!o), i = await K.hideSpamsAndFetchHiddenTokensAddresses(
       t,
-      a
-    ), N = a.filter(
-      (o) => !_(i, o.erc20TokenAddress)
+      r
+    ), N = r.filter(
+      (o) => !C(i, o.erc20TokenAddress)
       // filter out hidden tokens
     ).map((o) => ({
       ...o,
-      tokenIds: r.find((f) => h(f.contractAddress, o.erc20TokenAddress))?.tokenIds
+      tokenIds: a.find((k) => h(k.contractAddress, o.erc20TokenAddress))?.tokenIds
     }));
-    await C(A.ALCHEMY_PUBLIC_TOKENS, (o = {}) => {
-      const f = {
+    await E(A.ALCHEMY_PUBLIC_TOKENS, (o = {}) => {
+      const k = {
         ...o,
         [s]: N
       };
-      return this.fetchedTokens = f, f;
+      return this.fetchedTokens = k, k;
     });
   }
   async getERC20TokenAddresses(n, t) {
-    const s = await F(n, t, y), l = `https://${this.ALCHEMY_URLS[n]}.g.alchemy.com/v2/${g}`, r = [];
+    const s = await F(n, t, y), l = `https://${this.ALCHEMY_URLS[n]}.g.alchemy.com/v2/${g}`, a = [];
     let m;
     do {
       const e = [t, "erc20"];
       m && e.push({ pageKey: m });
-      const a = await b.post(l, {
+      const { data: r } = await b.post(l, {
         jsonrpc: "2.0",
         id: 1,
         method: "alchemy_getTokenBalances",
         params: e
-      }), { result: i } = a;
-      r.push(...i?.tokenBalances ?? []), m = i?.pageKey;
+      }), { result: i } = r;
+      a.push(...i?.tokenBalances ?? []), m = i?.pageKey;
     } while (m);
-    s && s > 0n && r.push({
+    s && s > 0n && a.push({
       contractAddress: y,
       tokenBalance: s.toString()
     });
     const c = {};
-    return r.forEach((e) => {
+    return a.forEach((e) => {
       (!c[e.contractAddress] || BigInt(e.tokenBalance) > 0n) && (c[e.contractAddress] = e);
     }), Object.keys(c);
   }
   async getNFTTokens(n, t) {
     const s = `https://${this.ALCHEMY_URLS[n]}.g.alchemy.com/nft/v3/${g}/getNFTsForOwner`, l = [];
-    let r;
+    let a;
     do {
       const e = new URLSearchParams({
         owner: t,
@@ -108,22 +108,22 @@ class L {
         pageSize: "100"
         // max is 100
       });
-      r && e.append("pageKey", r);
-      const a = await b.get(`${s}?${e.toString()}`), { ownedNfts: i = [], pageKey: p } = a;
-      l.push(...i), r = p;
-    } while (r);
-    const c = l.filter(({ contractAddress: e, tokenId: a }) => e && a).reduce((e, { contractAddress: a, tokenId: i }) => {
-      const p = a.toLowerCase();
-      return e.has(p) || e.set(p, []), e.get(p)?.push(i), e;
+      a && e.append("pageKey", a);
+      const { data: r } = await b.get(`${s}?${e.toString()}`), { ownedNfts: i = [], pageKey: f } = r;
+      l.push(...i), a = f;
+    } while (a);
+    const c = l.filter(({ contractAddress: e, tokenId: r }) => e && r).reduce((e, { contractAddress: r, tokenId: i }) => {
+      const f = r.toLowerCase();
+      return e.has(f) || e.set(f, []), e.get(f)?.push(i), e;
     }, /* @__PURE__ */ new Map());
-    return Array.from(c.entries()).map(([e, a]) => ({
+    return Array.from(c.entries()).map(([e, r]) => ({
       contractAddress: e,
-      tokenIds: a
+      tokenIds: r
     }));
   }
 }
-const D = new L();
+const x = new L();
 export {
   L as AlchemyPublicTokensDB,
-  D as alchemyPublicTokensDB
+  x as alchemyPublicTokensDB
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sabaaa1/common",
-  "version": "0.0.19",
+  "version": "0.0.20",
   "homepage": "hinkal.pro",
   "author": {
     "name": "Hinkal Protocol"