@snapshot-labs/snapshot.js 0.4.106 → 0.4.107

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snapshot-labs/snapshot.js",
-  "version": "0.4.106",
+  "version": "0.4.107",
   "repository": "snapshot-labs/snapshot.js",
   "license": "MIT",
   "main": "dist/snapshot.cjs.js",
@@ -13,7 +13,7 @@
     "@ethersproject/address": "^5.6.1",
     "@ethersproject/bytes": "^5.6.1",
     "@ethersproject/contracts": "^5.6.2",
-    "@ethersproject/hash": "^5.6.1",
+    "@ethersproject/hash": "^5.7.0",
     "@ethersproject/providers": "^5.6.8",
     "@ethersproject/units": "^5.7.0",
     "@ethersproject/wallet": "^5.6.2",

package/src/utils/blockfinder.ts

@@ -1,12 +1,28 @@
 import { subgraphRequest } from '../utils';
 
-let cache = {};
+let cache: Record<string, any> = {};
+let expirationTime = 0;
+
 export async function getSnapshots(network, snapshot, provider, networks) {
-  const cacheKey = `${network}-${snapshot}-${networks.join('-')}`;
-  if (cache[cacheKey]) return cache[cacheKey];
+  // If snapshot is latest, return all latest
   const snapshots = {};
   networks.forEach((n) => (snapshots[n] = 'latest'));
   if (snapshot === 'latest') return snapshots;
+
+  // Check if cache is valid
+  const cacheKey = `${network}-${snapshot}-${networks.join('-')}`;
+  const cachedEntry = cache[cacheKey];
+  const now = Date.now();
+  if (cachedEntry && expirationTime > now) {
+    return cachedEntry;
+  }
+  // Reset cache every hour
+  if (expirationTime < now) {
+    cache = {};
+    // Set expiration time to next hour
+    expirationTime = now + 60 * 60 * 1000 - (now % (60 * 60 * 1000));
+  }
+
   snapshots[network] = snapshot;
   const networkIn = Object.keys(snapshots).filter((s) => network !== s);
   if (networkIn.length === 0) return snapshots;
@@ -29,5 +45,3 @@ export async function getSnapshots(network, snapshot, provider, networks) {
   cache[cacheKey] = snapshots;
   return snapshots;
 }
-
-setInterval(() => (cache = {}), 1000 * 60 * 60 * 1); // Clear cache every 1 hour

package/src/utils.ts

@@ -3,7 +3,7 @@ import { Interface } from '@ethersproject/abi';
 import { Contract } from '@ethersproject/contracts';
 import { isAddress } from '@ethersproject/address';
 import { parseUnits } from '@ethersproject/units';
-import { hash, normalize } from '@ensdomains/eth-ens-namehash';
+import { namehash, ensNormalize } from '@ethersproject/hash';
 import { jsonToGraphQLQuery } from 'json-to-graphql-query';
 import Ajv from 'ajv';
 import addFormats from 'ajv-formats';
@@ -324,7 +324,7 @@ export async function getEnsTextRecord(
 ) {
   const ensResolvers =
     networks[network].ensResolvers || networks['1'].ensResolvers;
-  const ensHash = hash(normalize(ens));
+  const ensHash = namehash(ensNormalize(ens));
   const provider = getProvider(network);
 
   const result = await multicall(
@@ -360,7 +360,7 @@ export async function getEnsOwner(
     provider
   );
   const ensNameWrapper = networks[network].ensNameWrapper;
-  const ensHash = hash(normalize(ens));
+  const ensHash = namehash(ensNormalize(ens));
   let owner = await ensRegistry.owner(ensHash);
   // If owner is the ENSNameWrapper contract, resolve the owner of the name
   if (owner === ensNameWrapper) {