@snapshot-labs/snapshot.js 0.4.106 → 0.4.107

package/dist/snapshot.cjs.js

@@ -5,7 +5,7 @@ var address = require('@ethersproject/address');
 var abi = require('@ethersproject/abi');
 var contracts = require('@ethersproject/contracts');
 var units = require('@ethersproject/units');
-var ethEnsNamehash = require('@ensdomains/eth-ens-namehash');
+var hash = require('@ethersproject/hash');
 var jsonToGraphqlQuery = require('json-to-graphql-query');
 var Ajv = require('ajv');
 var addFormats = require('ajv-formats');
@@ -13,7 +13,6 @@ var set = require('lodash.set');
 var providers$1 = require('@ethersproject/providers');
 var bytes = require('@ethersproject/bytes');
 var wallet = require('@ethersproject/wallet');
-var hash = require('@ethersproject/hash');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -1213,19 +1212,29 @@ var Multicaller = /** @class */ (function () {
 }());
 
 var cache = {};
+var expirationTime = 0;
 function getSnapshots(network, snapshot, provider, networks) {
     return __awaiter(this, void 0, void 0, function () {
-        var cacheKey, snapshots, networkIn, block, query, url, data;
+        var snapshots, cacheKey, cachedEntry, now, networkIn, block, query, url, data;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    cacheKey = network + "-" + snapshot + "-" + networks.join('-');
-                    if (cache[cacheKey])
-                        return [2 /*return*/, cache[cacheKey]];
                     snapshots = {};
                     networks.forEach(function (n) { return (snapshots[n] = 'latest'); });
                     if (snapshot === 'latest')
                         return [2 /*return*/, snapshots];
+                    cacheKey = network + "-" + snapshot + "-" + networks.join('-');
+                    cachedEntry = cache[cacheKey];
+                    now = Date.now();
+                    if (cachedEntry && expirationTime > now) {
+                        return [2 /*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;
                     networkIn = Object.keys(snapshots).filter(function (s) { return network !== s; });
                     if (networkIn.length === 0)
@@ -1255,8 +1264,7 @@ function getSnapshots(network, snapshot, provider, networks) {
             }
         });
     });
-}
-setInterval(function () { return (cache = {}); }, 1000 * 60 * 60 * 1); // Clear cache every 1 hour
+}
 
 var providers = {};
 function getProvider(network) {
@@ -4564,7 +4572,7 @@ function getEnsTextRecord(ens, record, network) {
             switch (_a.label) {
                 case 0:
                     ensResolvers = networks[network].ensResolvers || networks['1'].ensResolvers;
-                    ensHash = ethEnsNamehash.hash(ethEnsNamehash.normalize(ens));
+                    ensHash = hash.namehash(hash.ensNormalize(ens));
                     provider = getProvider(network);
                     return [4 /*yield*/, multicall(network, provider, ENS_RESOLVER_ABI, ensResolvers.map(function (address) { return [address, 'text', [ensHash, record]]; }))];
                 case 1:
@@ -4604,7 +4612,7 @@ function getEnsOwner(ens, network) {
                     provider = getProvider(network);
                     ensRegistry = new contracts.Contract(registryAddress, ['function owner(bytes32) view returns (address)'], provider);
                     ensNameWrapper = networks[network].ensNameWrapper;
-                    ensHash = ethEnsNamehash.hash(ethEnsNamehash.normalize(ens));
+                    ensHash = hash.namehash(hash.ensNormalize(ens));
                     return [4 /*yield*/, ensRegistry.owner(ensHash)];
                 case 1:
                     owner = _a.sent();

package/dist/snapshot.esm.js

@@ -3,7 +3,7 @@ import { getAddress, isAddress } from '@ethersproject/address';
 import { Interface } from '@ethersproject/abi';
 import { Contract } from '@ethersproject/contracts';
 import { parseUnits } from '@ethersproject/units';
-import { hash, normalize } from '@ensdomains/eth-ens-namehash';
+import { _TypedDataEncoder, namehash, ensNormalize } from '@ethersproject/hash';
 import { jsonToGraphQLQuery } from 'json-to-graphql-query';
 import Ajv from 'ajv';
 import addFormats from 'ajv-formats';
@@ -11,7 +11,6 @@ import set from 'lodash.set';
 import { StaticJsonRpcProvider } from '@ethersproject/providers';
 import { hexlify, arrayify } from '@ethersproject/bytes';
 import { verifyTypedData } from '@ethersproject/wallet';
-import { _TypedDataEncoder } from '@ethersproject/hash';
 
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation. All rights reserved.
@@ -1204,19 +1203,29 @@ var Multicaller = /** @class */ (function () {
 }());
 
 var cache = {};
+var expirationTime = 0;
 function getSnapshots(network, snapshot, provider, networks) {
     return __awaiter(this, void 0, void 0, function () {
-        var cacheKey, snapshots, networkIn, block, query, url, data;
+        var snapshots, cacheKey, cachedEntry, now, networkIn, block, query, url, data;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    cacheKey = network + "-" + snapshot + "-" + networks.join('-');
-                    if (cache[cacheKey])
-                        return [2 /*return*/, cache[cacheKey]];
                     snapshots = {};
                     networks.forEach(function (n) { return (snapshots[n] = 'latest'); });
                     if (snapshot === 'latest')
                         return [2 /*return*/, snapshots];
+                    cacheKey = network + "-" + snapshot + "-" + networks.join('-');
+                    cachedEntry = cache[cacheKey];
+                    now = Date.now();
+                    if (cachedEntry && expirationTime > now) {
+                        return [2 /*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;
                     networkIn = Object.keys(snapshots).filter(function (s) { return network !== s; });
                     if (networkIn.length === 0)
@@ -1246,8 +1255,7 @@ function getSnapshots(network, snapshot, provider, networks) {
             }
         });
     });
-}
-setInterval(function () { return (cache = {}); }, 1000 * 60 * 60 * 1); // Clear cache every 1 hour
+}
 
 var providers = {};
 function getProvider(network) {
@@ -4555,7 +4563,7 @@ function getEnsTextRecord(ens, record, network) {
             switch (_a.label) {
                 case 0:
                     ensResolvers = networks[network].ensResolvers || networks['1'].ensResolvers;
-                    ensHash = hash(normalize(ens));
+                    ensHash = namehash(ensNormalize(ens));
                     provider = getProvider(network);
                     return [4 /*yield*/, multicall(network, provider, ENS_RESOLVER_ABI, ensResolvers.map(function (address) { return [address, 'text', [ensHash, record]]; }))];
                 case 1:
@@ -4595,7 +4603,7 @@ function getEnsOwner(ens, network) {
                     provider = getProvider(network);
                     ensRegistry = new Contract(registryAddress, ['function owner(bytes32) view returns (address)'], provider);
                     ensNameWrapper = networks[network].ensNameWrapper;
-                    ensHash = hash(normalize(ens));
+                    ensHash = namehash(ensNormalize(ens));
                     return [4 /*yield*/, ensRegistry.owner(ensHash)];
                 case 1:
                     owner = _a.sent();