@snapshot-labs/snapshot.js 0.8.0-beta.0 → 0.8.1

package/dist/utils.d.ts

@@ -5,8 +5,6 @@ import { signMessage, getBlockNumber } from './utils/web3';
 import { getHash, verify } from './sign/utils';
 interface Options {
     url?: string;
-    timeout?: number;
-    headers?: any;
 }
 interface Strategy {
     name: string;
@@ -25,19 +23,14 @@ export declare const SNAPSHOT_SUBGRAPH_URL: {
 };
 export declare function call(provider: any, abi: any[], call: any[], options?: any): Promise<any>;
 export declare function multicall(network: string, provider: any, abi: any[], calls: any[], options?: any): Promise<any>;
-export declare function subgraphRequest(url: string, query: any, options?: Options): Promise<any>;
-export declare function getUrl(uri: string, gateway?: string): string | null;
-export declare function getJSON(uri: string, options?: Options & {
-    gateways?: string;
-}): Promise<any>;
-export declare function ipfsGet(gateway: string, ipfsHash: string, protocolType?: string, options?: Options): Promise<any>;
+export declare function subgraphRequest(url: string, query: any, options?: any): Promise<any>;
+export declare function getUrl(uri: any, gateway?: string): any;
+export declare function getJSON(uri: any, options?: any): Promise<any>;
+export declare function ipfsGet(gateway: string, ipfsHash: string, protocolType?: string): Promise<any>;
 export declare function sendTransaction(web3: any, contractAddress: string, abi: any[], action: string, params: any[], overrides?: {}): Promise<any>;
-export declare function getScores(space: string, strategies: Strategy[], network: string, addresses: string[], snapshot?: number | string, scoreApiUrl?: string, options?: Options & {
-    returnValue?: string;
-    pathname?: string;
-}): Promise<any>;
+export declare function getScores(space: string, strategies: Strategy[], network: string, addresses: string[], snapshot?: number | string, scoreApiUrl?: string, options?: any): Promise<any>;
 export declare function getVp(address: string, network: string, strategies: Strategy[], snapshot: number | 'latest', space: string, delegation: boolean, options?: Options): Promise<any>;
-export declare function validate(validation: string, author: string, space: string, network: string, snapshot: number | 'latest', params: any, options?: Options): Promise<any>;
+export declare function validate(validation: string, author: string, space: string, network: string, snapshot: number | 'latest', params: any, options: any): Promise<any>;
 export declare function validateSchema(schema: any, data: any): true | import("ajv").ErrorObject<string, Record<string, any>, unknown>[] | null | undefined;
 export declare function getEnsTextRecord(ens: string, record: string, network?: string, options?: any): Promise<any>;
 export declare function getSpaceUri(id: string, network?: string, options?: any): Promise<string | null>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snapshot-labs/snapshot.js",
-  "version": "0.8.0-beta.0",
+  "version": "0.8.1",
   "repository": "snapshot-labs/snapshot.js",
   "license": "MIT",
   "main": "dist/snapshot.cjs.js",
@@ -19,9 +19,9 @@
     "@ethersproject/wallet": "^5.6.2",
     "ajv": "^8.11.0",
     "ajv-formats": "^2.1.1",
+    "cross-fetch": "^3.1.6",
     "json-to-graphql-query": "^2.2.4",
-    "lodash.set": "^4.3.2",
-    "ofetch": "^1.3.3"
+    "lodash.set": "^4.3.2"
   },
   "devDependencies": {
     "@rollup/plugin-commonjs": "^18.1.0",

package/src/networks.json

@@ -292,7 +292,7 @@
     "name": "XDC Apothem.network",
     "shortName": "XDC",
     "chainId": 51,
-    "network": "testnet",
+    "network": "xdc",
     "multicall": "0x3b353b02a8b42ee4222ea4be0836629b1f40c8db",
     "rpc": [
       "https://apothemrpc.blocksscan.io"
@@ -449,6 +449,20 @@
     "start": 10780012,
     "logo": "ipfs://QmXAKaNsyv6ctuRenYRJuZ1V4kn1eFwkUtjrjzX6jiKTqe"
   },
+  "75": {
+    "key": "75",
+    "name": "Decimal",
+    "shortName": "mainnet",
+    "chainId": 75,
+    "network": "mainnet",
+    "multicall": "0x949d1A0757803C51F2EfFFEb5472C861A898B8E8",
+    "rpc": [],
+    "explorer": {
+      "url": "https://explorer.decimalchain.com"
+    },
+    "start": 16031065,
+    "logo": "ipfs://bafkreihkdhbce5rkogl63xegaarlirjrvbfarxbtbf5mqme3s5grvbjyxm"
+  },
   "80": {
     "key": "80",
     "name": "GeneChain",
@@ -680,7 +694,7 @@
   },
   "137": {
     "key": "137",
-    "name": "Polygon Mainnet",
+    "name": "Polygon PoS",
     "shortName": "Polygon",
     "chainId": 137,
     "network": "mainnet",
@@ -699,7 +713,7 @@
       "apiUrl": "https://api.polygonscan.com"
     },
     "start": 9834491,
-    "logo": "ipfs://QmaGokGqgjknfa4xnXKnnwC5ZyXzUjQ7p6KEe4D8G5uFFE"
+    "logo": "ipfs://bafkreihgr7zy7vi5kqddybfaezwuhvssg57qluwmyan4qq7l57nr7w7wey"
   },
   "144": {
     "key": "144",
@@ -747,6 +761,20 @@
     "start": 4720651,
     "logo": "ipfs://bafkreiabhsxuq35pp4kmrbptdeypd6clhcy3ue7ydpppo6onoo4igcjqia"
   },
+  "204": {
+    "key": "204",
+    "name": "opBNB",
+    "shortName": "mainnet",
+    "chainId": 204,
+    "network": "mainnet",
+    "multicall": "0xcA11bde05977b3631167028862bE2a173976CA11",
+    "rpc": [],
+    "explorer": {
+      "url": "http://opbnbscan.com/"
+    },
+    "start": 512881,
+    "logo": "ipfs://bafkreibll4la7wqerzs7zwxjne2j7ayynbg2wlenemssoahxxj5rbt6c64"
+  },
   "246": {
     "key": "246",
     "name": "Energy Web Chain",
@@ -807,7 +835,6 @@
     "shortName": "HPB",
     "chainId": 269,
     "network": "mainnet",
-    "testnet": false,
     "multicall": "0x67D0f263aef2F6167FA77353695D75b582Ff4Bca",
     "rpc": [
       "https://hpbnode.com"
@@ -854,6 +881,20 @@
     "start": 74,
     "logo": "ipfs://QmNc7QZFpPDue3Ef4SsuX55RHkqXxUxSyTCpoASeg2hW6d"
   },
+  "314": {
+    "key": "314",
+    "name": "Filecoin",
+    "shortName": "mainnet",
+    "chainId": 314,
+    "network": "mainnet",
+    "multicall": "0xcA11bde05977b3631167028862bE2a173976CA11",
+    "rpc": [],
+    "explorer": {
+      "url": "https://filfox.io"
+    },
+    "start": 3328594,
+    "logo": "ipfs://bafybeibyvjfmk6aqlfdrczvth55jkmnoadtrch7ht3rdmvqmy2bfxynecm"
+  },
   "321": {
     "key": "321",
     "name": "KCC Mainnet",
@@ -1144,6 +1185,7 @@
     "shortName": "pulsechain",
     "chainId": 940,
     "network": "Testnet",
+    "testnet": true,
     "multicall": "0x5e67901C2Dd1915E9Ef49aF39B62C28DF8C2c529",
     "rpc": [
       "https://rpc.testnet.pulsedisco.net"
@@ -1163,6 +1205,7 @@
     "shortName": "pulsechain",
     "chainId": 941,
     "network": "Testnet v2B",
+    "testnet": true,
     "multicall": "0x959a437F1444DaDaC8aF997E71EAF0479c810267",
     "rpc": [
       "https://rpc.testnet.pulsedisco.net"
@@ -1182,6 +1225,7 @@
     "shortName": "Boabab",
     "chainId": 1001,
     "network": "testnet",
+    "testnet": true,
     "multicall": "0x40643B8Aeaaca0b87Ea1A1E596e64a0e14B1d244",
     "rpc": [
       "https://archive-en.baobab.klaytn.net"
@@ -1190,7 +1234,7 @@
       "wss://archive-en.baobab.klaytn.net/ws"
     ],
     "explorer": {
-      "url": "https://baobab.scope.klaytn.com/"
+      "url": "https://baobab.scope.klaytn.com"
     },
     "logo": "ipfs://QmYACyZcidcFtMo4Uf9H6ZKUxTP2TQPjGzNjcUjqYa64dt"
   },
@@ -1242,6 +1286,20 @@
     "start": 451,
     "logo": "ipfs://QmYeskHqrEvWHqeAuqett64LxfH52HUXZi2T9BAMmgKvBF"
   },
+  "1101": {
+    "key": "1101",
+    "name": "Polygon zkEVM",
+    "shortName": "mainnet",
+    "chainId": 1101,
+    "network": "mainnet",
+    "multicall": "0xcA11bde05977b3631167028862bE2a173976CA11",
+    "rpc": [],
+    "explorer": {
+      "url": "https://zkevm.polygonscan.com"
+    },
+    "start": 57746,
+    "logo": "ipfs://bafkreibfiyvhqnme2vbxxfcku7qkxgjpkg6ywdkplxh4oxlkqsbznyorfm"
+  },
   "1116": {
     "key": "1116",
     "name": "Core Chain Mainnet ",
@@ -1359,6 +1417,7 @@
     "shortName": "Gobi",
     "chainId": 1663,
     "network": "testnet",
+    "testnet": true,
     "multicall": "0xC743e4910Bdd4e5aBacCA38F74cdA270281C5eef",
     "rpc": [
       "https://gobi-testnet.horizenlabs.io/ethv1"
@@ -1391,7 +1450,6 @@
     "shortName": "cube",
     "chainId": 1818,
     "network": "mainnet",
-    "testnet": false,
     "multicall": "0x28d2ebdb36369db1c51355cdc0898754d1a1c3c5",
     "rpc": [
       "https://http-mainnet-archive.cube.network"
@@ -1532,6 +1590,20 @@
     "start": 2607889,
     "logo": "ipfs://QmPXPCBho3kGLt5rhG9JGkKmzdtLvqZmJqGzzijVCuggWY"
   },
+  "4337": {
+    "key": "4337",
+    "name": "Beam",
+    "shortName": "Beam",
+    "chainId": 4337,
+    "network": "mainnet",
+    "multicall": "0x4956F15eFdc3dC16645e90Cc356eAFA65fFC65Ec",
+    "rpc": [],
+    "explorer": {
+      "url": "https://subnets.avax.network/beam/"
+    },
+    "start": 1,
+    "logo": "ipfs://QmaKRLxXPdeTsLx7MFLS3CJbhpSbResgoeL4fCgHB1mTsF"
+  },
   "4689": {
     "key": "4689",
     "name": "IoTeX Mainnet",
@@ -1616,6 +1688,7 @@
     "name": "Ontology Testnet",
     "chainId": 5851,
     "network": "testnet",
+    "testnet": true,
     "multicall": "0x381445710b5e73d34aF196c53A3D5cDa58EDBf7A",
     "rpc": [
       "https://polaris1.ont.io:10339",
@@ -1667,7 +1740,6 @@
     "shortName": "Shyft",
     "chainId": 7341,
     "network": "mainnet",
-    "testnet": false,
     "multicall": "0xceb10e9133D771cA93c8002Be527A465E85381a2",
     "rpc": [
       "https://rpc.shyft.network"
@@ -1724,7 +1796,7 @@
       "wss://archive-en.cypress.klaytn.net/ws"
     ],
     "explorer": {
-      "url": "https://scope.klaytn.com/"
+      "url": "https://scope.klaytn.com"
     },
     "logo": "ipfs://QmYACyZcidcFtMo4Uf9H6ZKUxTP2TQPjGzNjcUjqYa64dt"
   },
@@ -1768,7 +1840,6 @@
     "shortName": "Evmos",
     "chainId": 9001,
     "network": "mainnet",
-    "testnet": false,
     "multicall": "0x37763d16f8dBf6F185368E0f256350cAb7E24b26",
     "rpc": [
       "https://eth.bd.evmos.org:8545"
@@ -1881,6 +1952,21 @@
     "start": 79516,
     "logo": "ipfs://QmTogMDLmDgJjDjUKDHDuc2KVTVDbXf8bXJLFiVe8PRxgo"
   },
+  "13337": {
+    "key": "13337",
+    "name": "Beam Testnet",
+    "shortName": "testnet",
+    "chainId": 13337,
+    "network": "testnet",
+    "multicall": "0x9BF49b704EE2A095b95c1f2D4EB9010510c41C9E",
+    "rpc": [],
+    "explorer": {
+      "url": "https://subnets-test.avax.network/beam/"
+    },
+    "start": 3,
+    "logo": "ipfs://QmaKRLxXPdeTsLx7MFLS3CJbhpSbResgoeL4fCgHB1mTsF",
+    "testnet": true
+  },
   "16718": {
     "key": "16718",
     "name": "AirDAO Mainnet",
@@ -2119,6 +2205,7 @@
     "shortName": "ThinkiumTest1",
     "chainId": 60001,
     "network": "thinkiumtest1",
+    "testnet": true,
     "multicall": "0xc49bc485d4f943b287edadbce45eb1a1220ffdfe",
     "rpc": [
       "https://test1.thinkiumrpc.net"
@@ -2216,7 +2303,7 @@
   },
   "80001": {
     "key": "80001",
-    "name": "Matic Mumbai",
+    "name": "Polygon Mumbai",
     "chainId": 80001,
     "network": "testnet",
     "testnet": true,
@@ -2233,7 +2320,7 @@
       "apiUrl": "https://api-mumbai.polygonscan.com"
     },
     "start": 12011090,
-    "logo": "ipfs://QmaGokGqgjknfa4xnXKnnwC5ZyXzUjQ7p6KEe4D8G5uFFE"
+    "logo": "ipfs://bafkreihgr7zy7vi5kqddybfaezwuhvssg57qluwmyan4qq7l57nr7w7wey"
   },
   "84531": {
     "key": "84531",
@@ -2289,6 +2376,7 @@
     "shortName": "Vpioneer",
     "chainId": 666666,
     "network": "testnet",
+    "testnet": true,
     "multicall": "0xb6E748D6632305E1c12D8369CC6B3eF4AA8A3c85",
     "rpc": [
       "https://vpioneer.infragrid.v.network/ethereum/compatible"

package/src/sign/index.ts

@@ -1,4 +1,4 @@
-import { ofetch as fetch } from 'ofetch';
+import fetch from 'cross-fetch';
 import { Web3Provider } from '@ethersproject/providers';
 import { Wallet } from '@ethersproject/wallet';
 import { getAddress } from '@ethersproject/address';
@@ -89,18 +89,16 @@ export default class Client {
         Accept: 'application/json',
         'Content-Type': 'application/json'
       },
-      timeout: this.options.timeout || 20e3,
-      body: envelop
+      body: JSON.stringify(envelop)
     };
-
-    try {
-      return await fetch(address, init);
-    } catch (e) {
-      const isSequencerError =
-        e.data?.hasOwnProperty('error') &&
-        e.data?.hasOwnProperty('error_description');
-      return Promise.reject(isSequencerError ? e.data : e);
-    }
+    return new Promise((resolve, reject) => {
+      fetch(address, init)
+        .then((res) => {
+          if (res.ok) return resolve(res.json());
+          throw res;
+        })
+        .catch((e) => e.json().then((json) => reject(json)));
+    });
   }
 
   async space(web3: Web3Provider | Wallet, address: string, message: Space) {

package/src/utils.ts

@@ -1,4 +1,4 @@
-import { ofetch as fetch } from 'ofetch';
+import fetch from 'cross-fetch';
 import { Interface } from '@ethersproject/abi';
 import { Contract } from '@ethersproject/contracts';
 import { isAddress } from '@ethersproject/address';
@@ -19,8 +19,6 @@ import voting from './voting';
 
 interface Options {
   url?: string;
-  timeout?: number;
-  headers?: any;
 }
 
 interface Strategy {
@@ -137,56 +135,38 @@ export async function multicall(
   }
 }
 
-export async function subgraphRequest(url: string, query, options?: Options) {
+export async function subgraphRequest(url: string, query, options: any = {}) {
+  const res = await fetch(url, {
+    method: 'POST',
+    headers: {
+      Accept: 'application/json',
+      'Content-Type': 'application/json',
+      ...options?.headers
+    },
+    body: JSON.stringify({ query: jsonToGraphQLQuery({ query }) })
+  });
+  let responseData: any = await res.text();
   try {
-    const init = {
-      method: 'POST',
-      headers: {
-        Accept: 'application/json',
-        'Content-Type': 'application/json',
-        ...options?.headers
-      },
-      timeout: options?.timeout || 20e3,
-      body: { query: jsonToGraphQLQuery({ query }) }
-    };
-
-    const body = await fetch(url, init);
-
-    if (typeof body === 'string') {
-      return Promise.reject({
-        errors: [
-          {
-            message: 'Body is not a JSON object',
-            extensions: { code: 'INVALID_JSON' }
-          }
-        ]
-      });
-    }
-
-    if (body.errors) {
-      return Promise.reject(body);
-    }
-
-    return body.data;
+    responseData = JSON.parse(responseData);
   } catch (e) {
-    return Promise.reject(
-      e.data?.errors
-        ? e.data
-        : {
-            errors: [
-              {
-                message: e.statusText || e.toString(),
-                extensions: {
-                  code: e.status || 0
-                }
-              }
-            ]
-          }
+    throw new Error(
+      `Errors found in subgraphRequest: URL: ${url}, Status: ${
+        res.status
+      }, Response: ${responseData.substring(0, 400)}`
+    );
+  }
+  if (responseData.errors) {
+    throw new Error(
+      `Errors found in subgraphRequest: URL: ${url}, Status: ${
+        res.status
+      },  Response: ${JSON.stringify(responseData.errors).substring(0, 400)}`
     );
   }
+  const { data } = responseData;
+  return data || {};
 }
 
-export function getUrl(uri: string, gateway = gateways[0]) {
+export function getUrl(uri, gateway = gateways[0]) {
   const ipfsGateway = `https://${gateway}`;
   if (!uri) return null;
   if (
@@ -204,40 +184,18 @@ export function getUrl(uri: string, gateway = gateways[0]) {
   return uri;
 }
 
-export async function getJSON(
-  uri: string,
-  options: Options & { gateways?: string } = {}
-) {
-  const url = getUrl(uri, options.gateways) || '';
-  const body = await fetch(url, {
-    timeout: options.timeout || 30e3,
-    headers: {
-      Accept: 'application/json',
-      'Content-Type': 'application/json',
-      ...options?.headers
-    }
-  });
-
-  return typeof body === 'string' ? JSON.parse(body) : body;
+export async function getJSON(uri, options: any = {}) {
+  const url = getUrl(uri, options.gateways);
+  return fetch(url).then((res) => res.json());
 }
 
 export async function ipfsGet(
   gateway: string,
   ipfsHash: string,
-  protocolType = 'ipfs',
-  options: Options = {}
+  protocolType = 'ipfs'
 ) {
   const url = `https://${gateway}/${protocolType}/${ipfsHash}`;
-  const body = await fetch(url, {
-    timeout: options.timeout || 20e3,
-    headers: {
-      Accept: 'application/json',
-      'Content-Type': 'application/json',
-      ...options.headers
-    }
-  });
-
-  return typeof body === 'string' ? JSON.parse(body) : body;
+  return fetch(url).then((res) => res.json());
 }
 
 export async function sendTransaction(
@@ -262,10 +220,10 @@ export async function getScores(
   addresses: string[],
   snapshot: number | string = 'latest',
   scoreApiUrl = 'https://score.snapshot.org',
-  options: Options & { returnValue?: string; pathname?: string } = {}
+  options: any = {}
 ) {
   const url = new URL(scoreApiUrl);
-  url.pathname = options.pathname || '/api/scores';
+  url.pathname = '/api/scores';
   scoreApiUrl = url.toString();
 
   try {
@@ -276,25 +234,25 @@ export async function getScores(
       strategies,
       addresses
     };
-
-    const body = await fetch(scoreApiUrl, {
+    const res = await fetch(scoreApiUrl, {
       method: 'POST',
       headers: scoreApiHeaders,
-      timeout: options.timeout || 60e3,
-      body: { params }
+      body: JSON.stringify({ params })
     });
+    const obj = await res.json();
+
+    if (obj.error) {
+      return Promise.reject(obj.error);
+    }
 
     return options.returnValue === 'all'
-      ? body.result
-      : body.result[options.returnValue || 'scores'];
+      ? obj.result
+      : obj.result[options.returnValue || 'scores'];
   } catch (e) {
-    return Promise.reject(
-      e.data?.error || {
-        code: e.status || 0,
-        message: e.statusText || e.toString(),
-        data: e.data || ''
-      }
-    );
+    if (e.errno) {
+      return Promise.reject({ code: e.errno, message: e.toString(), data: '' });
+    }
+    return Promise.reject(e);
   }
 }
 
@@ -305,14 +263,14 @@ export async function getVp(
   snapshot: number | 'latest',
   space: string,
   delegation: boolean,
-  options: Options = {}
+  options?: Options
 ) {
-  const url = options.url || 'https://score.snapshot.org';
+  if (!options) options = {};
+  if (!options.url) options.url = 'https://score.snapshot.org';
   const init = {
     method: 'POST',
     headers: scoreApiHeaders,
-    timeout: options.timeout || 60e3,
-    body: {
+    body: JSON.stringify({
       jsonrpc: '2.0',
       method: 'get_vp',
       params: {
@@ -323,20 +281,19 @@ export async function getVp(
         space,
         delegation
       }
-    }
+    })
   };
 
   try {
-    const body = await fetch(url, init);
-    return body.result;
+    const res = await fetch(options.url, init);
+    const json = await res.json();
+    if (json.error) return Promise.reject(json.error);
+    if (json.result) return json.result;
   } catch (e) {
-    return Promise.reject(
-      e.data?.error || {
-        code: e.status || 0,
-        message: e.statusText || e.toString(),
-        data: e.data || ''
-      }
-    );
+    if (e.errno) {
+      return Promise.reject({ code: e.errno, message: e.toString(), data: '' });
+    }
+    return Promise.reject(e);
   }
 }
 
@@ -347,14 +304,14 @@ export async function validate(
   network: string,
   snapshot: number | 'latest',
   params: any,
-  options: Options = {}
+  options: any
 ) {
-  const url = options.url || 'https://score.snapshot.org';
+  if (!options) options = {};
+  if (!options.url) options.url = 'https://score.snapshot.org';
   const init = {
     method: 'POST',
     headers: scoreApiHeaders,
-    timeout: options.timeout || 30e3,
-    body: {
+    body: JSON.stringify({
       jsonrpc: '2.0',
       method: 'validate',
       params: {
@@ -365,20 +322,19 @@ export async function validate(
         snapshot,
         params
       }
-    }
+    })
   };
 
   try {
-    const body = await fetch(url, init);
-    return body.result;
+    const res = await fetch(options.url, init);
+    const json = await res.json();
+    if (json.error) return Promise.reject(json.error);
+    return json.result;
   } catch (e) {
-    return Promise.reject(
-      e.data?.error || {
-        code: e.status || 0,
-        message: e.statusText || e.toString(),
-        data: e.data || ''
-      }
-    );
+    if (e.errno) {
+      return Promise.reject({ code: e.errno, message: e.toString(), data: '' });
+    }
+    return Promise.reject(e);
   }
 }