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

package/dist/sign/index.d.ts

@@ -9,20 +9,20 @@ export default class Client {
     readonly address: string;
     readonly options: any;
     constructor(address?: string, options?: {});
-    sign(web3: Web3Provider | Wallet, address: string, message: any, types: any): Promise<unknown>;
-    send(envelop: any): Promise<unknown>;
-    space(web3: Web3Provider | Wallet, address: string, message: Space): Promise<unknown>;
-    proposal(web3: Web3Provider | Wallet, address: string, message: Proposal): Promise<unknown>;
-    updateProposal(web3: Web3Provider | Wallet, address: string, message: UpdateProposal): Promise<unknown>;
-    flagProposal(web3: Web3Provider | Wallet, address: string, message: FlagProposal): Promise<unknown>;
-    cancelProposal(web3: Web3Provider | Wallet, address: string, message: CancelProposal): Promise<unknown>;
-    vote(web3: Web3Provider | Wallet, address: string, message: Vote): Promise<unknown>;
-    follow(web3: Web3Provider | Wallet, address: string, message: Follow): Promise<unknown>;
-    unfollow(web3: Web3Provider | Wallet, address: string, message: Unfollow): Promise<unknown>;
-    subscribe(web3: Web3Provider | Wallet, address: string, message: Subscribe): Promise<unknown>;
-    unsubscribe(web3: Web3Provider | Wallet, address: string, message: Unsubscribe): Promise<unknown>;
-    profile(web3: Web3Provider | Wallet, address: string, message: Profile): Promise<unknown>;
-    statement(web3: Web3Provider | Wallet, address: string, message: Statement): Promise<unknown>;
-    alias(web3: Web3Provider | Wallet, address: string, message: Alias): Promise<unknown>;
-    deleteSpace(web3: Web3Provider | Wallet, address: string, message: DeleteSpace): Promise<unknown>;
+    sign(web3: Web3Provider | Wallet, address: string, message: any, types: any): Promise<any>;
+    send(envelop: any): Promise<any>;
+    space(web3: Web3Provider | Wallet, address: string, message: Space): Promise<any>;
+    proposal(web3: Web3Provider | Wallet, address: string, message: Proposal): Promise<any>;
+    updateProposal(web3: Web3Provider | Wallet, address: string, message: UpdateProposal): Promise<any>;
+    flagProposal(web3: Web3Provider | Wallet, address: string, message: FlagProposal): Promise<any>;
+    cancelProposal(web3: Web3Provider | Wallet, address: string, message: CancelProposal): Promise<any>;
+    vote(web3: Web3Provider | Wallet, address: string, message: Vote): Promise<any>;
+    follow(web3: Web3Provider | Wallet, address: string, message: Follow): Promise<any>;
+    unfollow(web3: Web3Provider | Wallet, address: string, message: Unfollow): Promise<any>;
+    subscribe(web3: Web3Provider | Wallet, address: string, message: Subscribe): Promise<any>;
+    unsubscribe(web3: Web3Provider | Wallet, address: string, message: Unsubscribe): Promise<any>;
+    profile(web3: Web3Provider | Wallet, address: string, message: Profile): Promise<any>;
+    statement(web3: Web3Provider | Wallet, address: string, message: Statement): Promise<any>;
+    alias(web3: Web3Provider | Wallet, address: string, message: Alias): Promise<any>;
+    deleteSpace(web3: Web3Provider | Wallet, address: string, message: DeleteSpace): Promise<any>;
 }

package/dist/snapshot.cjs.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var fetch = require('cross-fetch');
+var ofetch = require('ofetch');
 var address = require('@ethersproject/address');
 var abi = require('@ethersproject/abi');
 var contracts = require('@ethersproject/contracts');
@@ -16,7 +16,6 @@ var wallet = require('@ethersproject/wallet');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-var fetch__default = /*#__PURE__*/_interopDefaultLegacy(fetch);
 var Ajv__default = /*#__PURE__*/_interopDefaultLegacy(Ajv);
 var addFormats__default = /*#__PURE__*/_interopDefaultLegacy(addFormats);
 var set__default = /*#__PURE__*/_interopDefaultLegacy(set);
@@ -371,29 +370,35 @@ var Client = /** @class */ (function () {
         });
     };
     Client.prototype.send = function (envelop) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            var address, init;
-            return __generator(this, function (_a) {
-                address = this.address;
-                if (envelop.sig === '0x' && this.options.relayerURL)
-                    address = this.options.relayerURL;
-                init = {
-                    method: 'POST',
-                    headers: {
-                        Accept: 'application/json',
-                        'Content-Type': 'application/json'
-                    },
-                    body: JSON.stringify(envelop)
-                };
-                return [2 /*return*/, new Promise(function (resolve, reject) {
-                        fetch__default['default'](address, init)
-                            .then(function (res) {
-                            if (res.ok)
-                                return resolve(res.json());
-                            throw res;
-                        })
-                            .catch(function (e) { return e.json().then(function (json) { return reject(json); }); });
-                    })];
+            var address, init, e_1, isSequencerError;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        address = this.address;
+                        if (envelop.sig === '0x' && this.options.relayerURL)
+                            address = this.options.relayerURL;
+                        init = {
+                            method: 'POST',
+                            headers: {
+                                Accept: 'application/json',
+                                'Content-Type': 'application/json'
+                            },
+                            timeout: this.options.timeout || 20e3,
+                            body: envelop
+                        };
+                        _c.label = 1;
+                    case 1:
+                        _c.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, ofetch.ofetch(address, init)];
+                    case 2: return [2 /*return*/, _c.sent()];
+                    case 3:
+                        e_1 = _c.sent();
+                        isSequencerError = ((_a = e_1.data) === null || _a === void 0 ? void 0 : _a.hasOwnProperty('error')) && ((_b = e_1.data) === null || _b === void 0 ? void 0 : _b.hasOwnProperty('error_description'));
+                        return [2 /*return*/, Promise.reject(isSequencerError ? e_1.data : e_1)];
+                    case 4: return [2 /*return*/];
+                }
             });
         });
     };
@@ -4595,32 +4600,50 @@ function multicall(network, provider, abi$1, calls, options) {
     });
 }
 function subgraphRequest(url, query, options) {
-    if (options === void 0) { options = {}; }
+    var _a;
     return __awaiter(this, void 0, void 0, function () {
-        var res, responseData, data;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
-                case 0: return [4 /*yield*/, fetch__default['default'](url, {
+        var init, body, e_3;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _b.trys.push([0, 2, , 3]);
+                    init = {
                         method: 'POST',
                         headers: __assign({ Accept: 'application/json', 'Content-Type': 'application/json' }, options === null || options === void 0 ? void 0 : options.headers),
-                        body: JSON.stringify({ query: jsonToGraphqlQuery.jsonToGraphQLQuery({ query: query }) })
-                    })];
+                        timeout: (options === null || options === void 0 ? void 0 : options.timeout) || 20e3,
+                        body: { query: jsonToGraphqlQuery.jsonToGraphQLQuery({ query: query }) }
+                    };
+                    return [4 /*yield*/, ofetch.ofetch(url, init)];
                 case 1:
-                    res = _a.sent();
-                    return [4 /*yield*/, res.text()];
-                case 2:
-                    responseData = _a.sent();
-                    try {
-                        responseData = JSON.parse(responseData);
+                    body = _b.sent();
+                    if (typeof body === 'string') {
+                        return [2 /*return*/, Promise.reject({
+                                errors: [
+                                    {
+                                        message: 'Body is not a JSON object',
+                                        extensions: { code: 'INVALID_JSON' }
+                                    }
+                                ]
+                            })];
                     }
-                    catch (e) {
-                        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));
+                    if (body.errors) {
+                        return [2 /*return*/, Promise.reject(body)];
                     }
-                    data = responseData.data;
-                    return [2 /*return*/, data || {}];
+                    return [2 /*return*/, body.data];
+                case 2:
+                    e_3 = _b.sent();
+                    return [2 /*return*/, Promise.reject(((_a = e_3.data) === null || _a === void 0 ? void 0 : _a.errors) ? e_3.data
+                            : {
+                                errors: [
+                                    {
+                                        message: e_3.statusText || e_3.toString(),
+                                        extensions: {
+                                            code: e_3.status || 0
+                                        }
+                                    }
+                                ]
+                            })];
+                case 3: return [2 /*return*/];
             }
         });
     });
@@ -4645,20 +4668,39 @@ function getUrl(uri, gateway) {
 function getJSON(uri, options) {
     if (options === void 0) { options = {}; }
     return __awaiter(this, void 0, void 0, function () {
-        var url;
+        var url, body;
         return __generator(this, function (_a) {
-            url = getUrl(uri, options.gateways);
-            return [2 /*return*/, fetch__default['default'](url).then(function (res) { return res.json(); })];
+            switch (_a.label) {
+                case 0:
+                    url = getUrl(uri, options.gateways) || '';
+                    return [4 /*yield*/, ofetch.ofetch(url, {
+                            timeout: options.timeout || 30e3,
+                            headers: __assign({ Accept: 'application/json', 'Content-Type': 'application/json' }, options === null || options === void 0 ? void 0 : options.headers)
+                        })];
+                case 1:
+                    body = _a.sent();
+                    return [2 /*return*/, typeof body === 'string' ? JSON.parse(body) : body];
+            }
         });
     });
 }
-function ipfsGet(gateway, ipfsHash, protocolType) {
+function ipfsGet(gateway, ipfsHash, protocolType, options) {
     if (protocolType === void 0) { protocolType = 'ipfs'; }
+    if (options === void 0) { options = {}; }
     return __awaiter(this, void 0, void 0, function () {
-        var url;
+        var url, body;
         return __generator(this, function (_a) {
-            url = "https://" + gateway + "/" + protocolType + "/" + ipfsHash;
-            return [2 /*return*/, fetch__default['default'](url).then(function (res) { return res.json(); })];
+            switch (_a.label) {
+                case 0:
+                    url = "https://" + gateway + "/" + protocolType + "/" + ipfsHash;
+                    return [4 /*yield*/, ofetch.ofetch(url, {
+                            timeout: options.timeout || 20e3,
+                            headers: __assign({ Accept: 'application/json', 'Content-Type': 'application/json' }, options.headers)
+                        })];
+                case 1:
+                    body = _a.sent();
+                    return [2 /*return*/, typeof body === 'string' ? JSON.parse(body) : body];
+            }
         });
     });
 }
@@ -4684,17 +4726,18 @@ function getScores(space, strategies, network, addresses, snapshot, scoreApiUrl,
     if (snapshot === void 0) { snapshot = 'latest'; }
     if (scoreApiUrl === void 0) { scoreApiUrl = 'https://score.snapshot.org'; }
     if (options === void 0) { options = {}; }
+    var _a;
     return __awaiter(this, void 0, void 0, function () {
-        var url, params, res, obj, e_3;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        var url, params, body, e_4;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
                     url = new URL(scoreApiUrl);
-                    url.pathname = '/api/scores';
+                    url.pathname = options.pathname || '/api/scores';
                     scoreApiUrl = url.toString();
-                    _a.label = 1;
+                    _b.label = 1;
                 case 1:
-                    _a.trys.push([1, 4, , 5]);
+                    _b.trys.push([1, 3, , 4]);
                     params = {
                         space: space,
                         network: network,
@@ -4702,47 +4745,43 @@ function getScores(space, strategies, network, addresses, snapshot, scoreApiUrl,
                         strategies: strategies,
                         addresses: addresses
                     };
-                    return [4 /*yield*/, fetch__default['default'](scoreApiUrl, {
+                    return [4 /*yield*/, ofetch.ofetch(scoreApiUrl, {
                             method: 'POST',
                             headers: scoreApiHeaders,
-                            body: JSON.stringify({ params: params })
+                            timeout: options.timeout || 60e3,
+                            body: { params: params }
                         })];
                 case 2:
-                    res = _a.sent();
-                    return [4 /*yield*/, res.json()];
-                case 3:
-                    obj = _a.sent();
-                    if (obj.error) {
-                        return [2 /*return*/, Promise.reject(obj.error)];
-                    }
+                    body = _b.sent();
                     return [2 /*return*/, options.returnValue === 'all'
-                            ? obj.result
-                            : obj.result[options.returnValue || 'scores']];
-                case 4:
-                    e_3 = _a.sent();
-                    if (e_3.errno) {
-                        return [2 /*return*/, Promise.reject({ code: e_3.errno, message: e_3.toString(), data: '' })];
-                    }
-                    return [2 /*return*/, Promise.reject(e_3)];
-                case 5: return [2 /*return*/];
+                            ? body.result
+                            : body.result[options.returnValue || 'scores']];
+                case 3:
+                    e_4 = _b.sent();
+                    return [2 /*return*/, Promise.reject(((_a = e_4.data) === null || _a === void 0 ? void 0 : _a.error) || {
+                            code: e_4.status || 0,
+                            message: e_4.statusText || e_4.toString(),
+                            data: e_4.data || ''
+                        })];
+                case 4: return [2 /*return*/];
             }
         });
     });
 }
 function getVp(address, network, strategies, snapshot, space, delegation, options) {
+    if (options === void 0) { options = {}; }
+    var _a;
     return __awaiter(this, void 0, void 0, function () {
-        var init, res, json, e_4;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        var url, init, body, e_5;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
-                    if (!options)
-                        options = {};
-                    if (!options.url)
-                        options.url = 'https://score.snapshot.org';
+                    url = options.url || 'https://score.snapshot.org';
                     init = {
                         method: 'POST',
                         headers: scoreApiHeaders,
-                        body: JSON.stringify({
+                        timeout: options.timeout || 60e3,
+                        body: {
                             jsonrpc: '2.0',
                             method: 'get_vp',
                             params: {
@@ -4753,47 +4792,41 @@ function getVp(address, network, strategies, snapshot, space, delegation, option
                                 space: space,
                                 delegation: delegation
                             }
-                        })
+                        }
                     };
-                    _a.label = 1;
+                    _b.label = 1;
                 case 1:
-                    _a.trys.push([1, 4, , 5]);
-                    return [4 /*yield*/, fetch__default['default'](options.url, init)];
+                    _b.trys.push([1, 3, , 4]);
+                    return [4 /*yield*/, ofetch.ofetch(url, init)];
                 case 2:
-                    res = _a.sent();
-                    return [4 /*yield*/, res.json()];
+                    body = _b.sent();
+                    return [2 /*return*/, body.result];
                 case 3:
-                    json = _a.sent();
-                    if (json.error)
-                        return [2 /*return*/, Promise.reject(json.error)];
-                    if (json.result)
-                        return [2 /*return*/, json.result];
-                    return [3 /*break*/, 5];
-                case 4:
-                    e_4 = _a.sent();
-                    if (e_4.errno) {
-                        return [2 /*return*/, Promise.reject({ code: e_4.errno, message: e_4.toString(), data: '' })];
-                    }
-                    return [2 /*return*/, Promise.reject(e_4)];
-                case 5: return [2 /*return*/];
+                    e_5 = _b.sent();
+                    return [2 /*return*/, Promise.reject(((_a = e_5.data) === null || _a === void 0 ? void 0 : _a.error) || {
+                            code: e_5.status || 0,
+                            message: e_5.statusText || e_5.toString(),
+                            data: e_5.data || ''
+                        })];
+                case 4: return [2 /*return*/];
             }
         });
     });
 }
 function validate(validation, author, space, network, snapshot, params, options) {
+    if (options === void 0) { options = {}; }
+    var _a;
     return __awaiter(this, void 0, void 0, function () {
-        var init, res, json, e_5;
-        return __generator(this, function (_a) {
-            switch (_a.label) {
+        var url, init, body, e_6;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
                 case 0:
-                    if (!options)
-                        options = {};
-                    if (!options.url)
-                        options.url = 'https://score.snapshot.org';
+                    url = options.url || 'https://score.snapshot.org';
                     init = {
                         method: 'POST',
                         headers: scoreApiHeaders,
-                        body: JSON.stringify({
+                        timeout: options.timeout || 30e3,
+                        body: {
                             jsonrpc: '2.0',
                             method: 'validate',
                             params: {
@@ -4804,27 +4837,23 @@ function validate(validation, author, space, network, snapshot, params, options)
                                 snapshot: snapshot,
                                 params: params
                             }
-                        })
+                        }
                     };
-                    _a.label = 1;
+                    _b.label = 1;
                 case 1:
-                    _a.trys.push([1, 4, , 5]);
-                    return [4 /*yield*/, fetch__default['default'](options.url, init)];
+                    _b.trys.push([1, 3, , 4]);
+                    return [4 /*yield*/, ofetch.ofetch(url, init)];
                 case 2:
-                    res = _a.sent();
-                    return [4 /*yield*/, res.json()];
+                    body = _b.sent();
+                    return [2 /*return*/, body.result];
                 case 3:
-                    json = _a.sent();
-                    if (json.error)
-                        return [2 /*return*/, Promise.reject(json.error)];
-                    return [2 /*return*/, json.result];
-                case 4:
-                    e_5 = _a.sent();
-                    if (e_5.errno) {
-                        return [2 /*return*/, Promise.reject({ code: e_5.errno, message: e_5.toString(), data: '' })];
-                    }
-                    return [2 /*return*/, Promise.reject(e_5)];
-                case 5: return [2 /*return*/];
+                    e_6 = _b.sent();
+                    return [2 /*return*/, Promise.reject(((_a = e_6.data) === null || _a === void 0 ? void 0 : _a.error) || {
+                            code: e_6.status || 0,
+                            message: e_6.statusText || e_6.toString(),
+                            data: e_6.data || ''
+                        })];
+                case 4: return [2 /*return*/];
             }
         });
     });
@@ -4860,7 +4889,7 @@ function getSpaceUri(id, network, options) {
     if (network === void 0) { network = '1'; }
     if (options === void 0) { options = {}; }
     return __awaiter(this, void 0, void 0, function () {
-        var e_6;
+        var e_7;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
@@ -4868,8 +4897,8 @@ function getSpaceUri(id, network, options) {
                     return [4 /*yield*/, getEnsTextRecord(id, 'snapshot', network, options)];
                 case 1: return [2 /*return*/, _a.sent()];
                 case 2:
-                    e_6 = _a.sent();
-                    console.log(e_6);
+                    e_7 = _a.sent();
+                    console.log(e_7);
                     return [2 /*return*/, null];
                 case 3: return [2 /*return*/];
             }