Merge pull request #114 from bensig/v3.3.5

Helpful Scripts
Remove changes to run.sh
2022-09-11 16:25:48 -03:00 · 2022-08-12 21:52:19 -07:00 · 2022-08-12 21:45:28 -07:00 · 2022-08-12 20:56:07 -07:00 · 2022-08-12 01:35:45 -07:00 · 2022-08-12 01:30:59 -07:00
18 changed files with 1169 additions and 712 deletions
@@ -1,3 +1,5 @@
+# elastic
+elastic_pass.txt
 # Logs
 logs
 *.log
@@ -308,6 +308,7 @@ var KeyType;
 (function (KeyType) {
    KeyType[KeyType["k1"] = 0] = "k1";
    KeyType[KeyType["r1"] = 1] = "r1";
+    KeyType[KeyType["wa"] = 2] = "wa";
 })(KeyType = exports.KeyType || (exports.KeyType = {}));
 /** Public key data size, excluding type field */
 exports.publicKeyDataSize = 33;
@@ -459,6 +460,8 @@ function signatureToString(signature) {
        return keyToString(signature, 'K1', 'SIG_K1_');
    } else if (signature.type === KeyType.r1) {
        return keyToString(signature, 'R1', 'SIG_R1_');
+    } else if (signature.type === KeyType.wa) {
+	return keyToString(signature, 'WA', 'SIG_WA_');
    } else {
        throw new Error('unrecognized signature format');
    }
@@ -15,6 +15,9 @@ import {extendedActions} from "./routes/v2-history/get_actions/definitions";
 import {io, Socket} from "socket.io-client";
 import {CacheManager} from "./helpers/cacheManager";

+import {bootstrap} from 'global-agent';
+bootstrap();
+
 class HyperionApiServer {

    private hub: Socket;
@@ -87,7 +90,7 @@ class HyperionApiServer {
        this.fastify.decorate('allowedActionQueryParamSet', extendedActionsSet);

        // define chain api url for /v1/chain/ redirects
-        let chainApiUrl: string = this.conf.api.push_api;
+        let chainApiUrl: string = this.conf.api.chain_api;
        if (chainApiUrl === null || chainApiUrl === "") {
            chainApiUrl = this.manager.conn.chains[this.chain].http;
        }
@@ -44,6 +44,9 @@ import Gauge from "@pm2/io/build/main/utils/metrics/gauge";
 import moment = require("moment");
 import Timeout = NodeJS.Timeout;

+import {bootstrap} from 'global-agent';
+bootstrap();
+
 interface RevBlock {
    num: number;
    id: string;
@@ -30,6 +30,7 @@
        "fastify-redis": "^4.3.3",
        "fastify-swagger": "^4.12.6",
        "flatstr": "^1.0.12",
+        "global-agent": "^3.0.0",
        "got": "11.8.3",
        "ioredis": "^4.28.1",
        "lodash": "^4.17.21",
@@ -46,6 +47,7 @@
      "devDependencies": {
        "@types/amqplib": "^0.8.2",
        "@types/async": "^3.2.10",
+        "@types/global-agent": "^2.1.1",
        "@types/ioredis": "^4.28.1",
        "@types/lodash": "^4.14.177",
        "@types/node": "^16.11.10",
@@ -249,6 +251,12 @@
      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz",
      "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw=="
    },
+    "node_modules/@types/global-agent": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@types/global-agent/-/global-agent-2.1.1.tgz",
+      "integrity": "sha512-sVox8Phk1UKgP6LQPAdeRxfww6vHKt7Bf59dXzYLsQBUEMEn8S10a+ESp/yO0i4fJ3WS4+CIuz42hgJcuA+3mA==",
+      "dev": true
+    },
    "node_modules/@types/http-cache-semantics": {
      "version": "4.0.1",
      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
@@ -496,6 +504,11 @@
      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
      "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw=="
    },
+    "node_modules/boolean": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.1.4.tgz",
+      "integrity": "sha512-3hx0kwU3uzG6ReQ3pnaFQPSktpBw6RHN3/ivDKEuU8g1XSfafowyvDnadjv1xp8IZqhtSukxlwv9bF6FhX8m0w=="
+    },
    "node_modules/brace-expansion": {
      "version": "1.1.11",
      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -726,6 +739,17 @@
        "node": ">=10"
      }
    },
+    "node_modules/define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "dependencies": {
+        "object-keys": "^1.0.12"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
    "node_modules/denque": {
      "version": "1.5.1",
      "resolved": "https://registry.npmjs.org/denque/-/denque-1.5.1.tgz",
@@ -747,6 +771,11 @@
      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
    },
+    "node_modules/detect-node": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
+      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="
+    },
    "node_modules/ee-first": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
@@ -901,11 +930,27 @@
        "pako": "2.0.3"
      }
    },
+    "node_modules/es6-error": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
+      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg=="
+    },
    "node_modules/escape-html": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
    },
+    "node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
    "node_modules/etag": {
      "version": "1.8.1",
      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
@@ -1253,6 +1298,50 @@
        "url": "https://github.com/sponsors/isaacs"
      }
    },
+    "node_modules/global-agent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz",
+      "integrity": "sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==",
+      "dependencies": {
+        "boolean": "^3.0.1",
+        "es6-error": "^4.1.1",
+        "matcher": "^3.0.0",
+        "roarr": "^2.15.3",
+        "semver": "^7.3.2",
+        "serialize-error": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=10.0"
+      }
+    },
+    "node_modules/global-agent/node_modules/semver": {
+      "version": "7.3.5",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+      "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/globalthis": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.2.tgz",
+      "integrity": "sha512-ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ==",
+      "dependencies": {
+        "define-properties": "^1.1.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
    "node_modules/got": {
      "version": "11.8.3",
      "resolved": "https://registry.npmjs.org/got/-/got-11.8.3.tgz",
@@ -1446,6 +1535,11 @@
      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
    },
+    "node_modules/json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+    },
    "node_modules/keyv": {
      "version": "4.0.3",
      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.0.3.tgz",
@@ -1566,6 +1660,17 @@
        "node": ">=10"
      }
    },
+    "node_modules/matcher": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz",
+      "integrity": "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==",
+      "dependencies": {
+        "escape-string-regexp": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
    "node_modules/mime": {
      "version": "1.6.0",
      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
@@ -1723,6 +1828,14 @@
        "node": ">=0.10.0"
      }
    },
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
    "node_modules/on-finished": {
      "version": "2.3.0",
      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
@@ -2102,6 +2215,22 @@
      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
      "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA=="
    },
+    "node_modules/roarr": {
+      "version": "2.15.4",
+      "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz",
+      "integrity": "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==",
+      "dependencies": {
+        "boolean": "^3.0.1",
+        "detect-node": "^2.0.4",
+        "globalthis": "^1.0.1",
+        "json-stringify-safe": "^5.0.1",
+        "semver-compare": "^1.0.0",
+        "sprintf-js": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
    "node_modules/safe-buffer": {
      "version": "5.2.1",
      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -2158,6 +2287,11 @@
        "semver": "bin/semver.js"
      }
    },
+    "node_modules/semver-compare": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
+      "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w="
+    },
    "node_modules/semver-store": {
      "version": "0.3.0",
      "resolved": "https://registry.npmjs.org/semver-store/-/semver-store-0.3.0.tgz",
@@ -2204,6 +2338,20 @@
      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
      "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="
    },
+    "node_modules/serialize-error": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz",
+      "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==",
+      "dependencies": {
+        "type-fest": "^0.13.1"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
    "node_modules/set-cookie-parser": {
      "version": "2.4.8",
      "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.4.8.tgz",
@@ -2315,6 +2463,11 @@
        "flatstr": "^1.0.12"
      }
    },
+    "node_modules/sprintf-js": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
+      "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="
+    },
    "node_modules/standard-as-callback": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz",
@@ -2381,6 +2534,17 @@
      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
      "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
    },
+    "node_modules/type-fest": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
+      "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
    "node_modules/typegram": {
      "version": "3.4.3",
      "resolved": "https://registry.npmjs.org/typegram/-/typegram-3.4.3.tgz",
@@ -2664,6 +2828,12 @@
      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.12.tgz",
      "integrity": "sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw=="
    },
+    "@types/global-agent": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@types/global-agent/-/global-agent-2.1.1.tgz",
+      "integrity": "sha512-sVox8Phk1UKgP6LQPAdeRxfww6vHKt7Bf59dXzYLsQBUEMEn8S10a+ESp/yO0i4fJ3WS4+CIuz42hgJcuA+3mA==",
+      "dev": true
+    },
    "@types/http-cache-semantics": {
      "version": "4.0.1",
      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz",
@@ -2884,6 +3054,11 @@
      "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.0.tgz",
      "integrity": "sha512-D7iWRBvnZE8ecXiLj/9wbxH7Tk79fAh8IHaTNq1RWRixsS02W+5qS+iE9yq6RYl0asXx5tw0bLhmT5pIfbSquw=="
    },
+    "boolean": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/boolean/-/boolean-3.1.4.tgz",
+      "integrity": "sha512-3hx0kwU3uzG6ReQ3pnaFQPSktpBw6RHN3/ivDKEuU8g1XSfafowyvDnadjv1xp8IZqhtSukxlwv9bF6FhX8m0w=="
+    },
    "brace-expansion": {
      "version": "1.1.11",
      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
@@ -3069,6 +3244,14 @@
      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.1.tgz",
      "integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg=="
    },
+    "define-properties": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
+      "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==",
+      "requires": {
+        "object-keys": "^1.0.12"
+      }
+    },
    "denque": {
      "version": "1.5.1",
      "resolved": "https://registry.npmjs.org/denque/-/denque-1.5.1.tgz",
@@ -3084,6 +3267,11 @@
      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
      "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
    },
+    "detect-node": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
+      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="
+    },
    "ee-first": {
      "version": "1.1.1",
      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
@@ -3204,11 +3392,21 @@
        "pako": "2.0.3"
      }
    },
+    "es6-error": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz",
+      "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg=="
+    },
    "escape-html": {
      "version": "1.0.3",
      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
    },
+    "escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA=="
+    },
    "etag": {
      "version": "1.8.1",
      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
@@ -3507,6 +3705,37 @@
        "path-is-absolute": "^1.0.0"
      }
    },
+    "global-agent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/global-agent/-/global-agent-3.0.0.tgz",
+      "integrity": "sha512-PT6XReJ+D07JvGoxQMkT6qji/jVNfX/h364XHZOWeRzy64sSFr+xJ5OX7LI3b4MPQzdL4H8Y8M0xzPpsVMwA8Q==",
+      "requires": {
+        "boolean": "^3.0.1",
+        "es6-error": "^4.1.1",
+        "matcher": "^3.0.0",
+        "roarr": "^2.15.3",
+        "semver": "^7.3.2",
+        "serialize-error": "^7.0.1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "7.3.5",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+          "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+          "requires": {
+            "lru-cache": "^6.0.0"
+          }
+        }
+      }
+    },
+    "globalthis": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.2.tgz",
+      "integrity": "sha512-ZQnSFO1la8P7auIOQECnm0sSuoMeaSq0EEdXMBFF2QJO4uNcwbyhSgG3MruWNbFTqCLmxVwGOl7LZ9kASvHdeQ==",
+      "requires": {
+        "define-properties": "^1.1.3"
+      }
+    },
    "got": {
      "version": "11.8.3",
      "resolved": "https://registry.npmjs.org/got/-/got-11.8.3.tgz",
@@ -3666,6 +3895,11 @@
      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
+    },
    "keyv": {
      "version": "4.0.3",
      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.0.3.tgz",
@@ -3769,6 +4003,14 @@
        "yallist": "^4.0.0"
      }
    },
+    "matcher": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/matcher/-/matcher-3.0.0.tgz",
+      "integrity": "sha512-OkeDaAZ/bQCxeFAozM55PKcKU0yJMPGifLwV4Qgjitu+5MoAfSQN4lsLJeXZ1b8w0x+/Emda6MZgXS1jvsapng==",
+      "requires": {
+        "escape-string-regexp": "^4.0.0"
+      }
+    },
    "mime": {
      "version": "1.6.0",
      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
@@ -3879,6 +4121,11 @@
      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM="
    },
+    "object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA=="
+    },
    "on-finished": {
      "version": "2.3.0",
      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
@@ -4166,6 +4413,19 @@
      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.3.0.tgz",
      "integrity": "sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA=="
    },
+    "roarr": {
+      "version": "2.15.4",
+      "resolved": "https://registry.npmjs.org/roarr/-/roarr-2.15.4.tgz",
+      "integrity": "sha512-CHhPh+UNHD2GTXNYhPWLnU8ONHdI+5DI+4EYIAOaiD63rHeYlZvyh8P+in5999TTSFgUYuKUAjzRI4mdh/p+2A==",
+      "requires": {
+        "boolean": "^3.0.1",
+        "detect-node": "^2.0.4",
+        "globalthis": "^1.0.1",
+        "json-stringify-safe": "^5.0.1",
+        "semver-compare": "^1.0.0",
+        "sprintf-js": "^1.1.2"
+      }
+    },
    "safe-buffer": {
      "version": "5.2.1",
      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
@@ -4202,6 +4462,11 @@
      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
      "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw=="
    },
+    "semver-compare": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
+      "integrity": "sha1-De4hahyUGrN+nvsXiPavxf9VN/w="
+    },
    "semver-store": {
      "version": "0.3.0",
      "resolved": "https://registry.npmjs.org/semver-store/-/semver-store-0.3.0.tgz",
@@ -4249,6 +4514,14 @@
        }
      }
    },
+    "serialize-error": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz",
+      "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==",
+      "requires": {
+        "type-fest": "^0.13.1"
+      }
+    },
    "set-cookie-parser": {
      "version": "2.4.8",
      "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.4.8.tgz",
@@ -4349,6 +4622,11 @@
        "flatstr": "^1.0.12"
      }
    },
+    "sprintf-js": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.1.2.tgz",
+      "integrity": "sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug=="
+    },
    "standard-as-callback": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz",
@@ -4400,6 +4678,11 @@
      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz",
      "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
    },
+    "type-fest": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz",
+      "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg=="
+    },
    "typegram": {
      "version": "3.4.3",
      "resolved": "https://registry.npmjs.org/typegram/-/typegram-3.4.3.tgz",
@@ -44,6 +44,7 @@
    "fastify-redis": "^4.3.3",
    "fastify-swagger": "^4.12.6",
    "flatstr": "^1.0.12",
+    "global-agent": "^3.0.0",
    "got": "11.8.3",
    "ioredis": "^4.28.1",
    "lodash": "^4.17.21",
@@ -65,6 +66,7 @@
    "@types/lodash": "^4.14.177",
    "@types/node": "^16.11.10",
    "@types/nodemailer": "^6.4.4",
+    "@types/global-agent": "^2.1.1",
    "@types/ws": "^8.2.0"
  },
  "optionalDependencies": {
@@ -8,25 +8,25 @@
 ### Install

 ```
-pip3 install sh
-pip3 install elasticsearch==7.15.2
+pip3 install -r requirements.txt
 ```

-### Update config files accordingly in python file
+### Update the following 2 config lines in the python code.
+
+Please set the Chain to whatever your chain in chains/"chain".config.json is named
+This script supports Hyperion versions 3.3.1, 3.3.3, or 3.3.5 - which you must enter as: '3.1', '3.3', or '3.5' because that's how Charles likes it.

 ```
-filepath="chains/wax.config.json"
-indexer_stop = ["pm2", "trigger", "wax-indexer", "stop"]
-indexer_start = ["./run.sh", "wax-indexer"]
-indexer_log_file = "/home/charles/.pm2/logs/wax-indexer-out.log"
-# Please set the version of Hyperion to either 3.1 or 3.3 to take into account changes to no blocks processed text in log file. 
-hyperion_version = '3.3'  #'3.1' or '3.3'
+chain = "libre"  
+hyperion_version = '3.5'  
 ```

 ### RUN

+You should run this from your Hyperion directory by using the following command and indicating the user, pass from your elastic_pass.txt and url to your elasticsearch (default is 127.0.0.1):
+
 ```
-python3 fix-missing-blocks.py http://elasticusername:elasticpasswordD@127.0.0.1
+python3 ./scripts/fix-missing-blocks.py http://elasticusername:elasticpasswordD@127.0.0.1
 ```


@@ -0,0 +1,2 @@
+elasticsearch==7.15.2
+sh==1.14.3
@@ -192,7 +192,7 @@ async function newChain(shortName, options) {
    }
    const fullNameArr = [];
    shortName.split('-').forEach((word) => {
-        fullNameArr.push(word.at(0).toUpperCase() + word.substr(1));
+        fullNameArr.push(word[0].toUpperCase() + word.substr(1));
    });
    const fullChainName = fullNameArr.join(' ');
    jsonData.api.chain_name = fullChainName;
@@ -0,0 +1,47 @@
+#!/bin/bash
+#
+# syncbyrange.sh - Bash script for synchronizing Hyperion EOS in spans 
+# Save this in your Hyperion folder and add to cron 
+# to run this every 10 minutes... just add this to your cron
+# */10 * * * * /opt/eosio/src/Hyperion-History-API/scripts/sync-by=range.sh
+#
+# You can modify the CHAINNAME variable to match your chains/$CHAINNAME.config.json
+#
+# variables that need to be set based on your configuration
+
+PM2="/home/eosio/.npm-global/bin/pm2"
+HYPERIONPATH="/opt/eosio/src/Hyperion-History-API"
+BLOCKSPAN="1000000"
+CHAINNAME="proton"
+CHAINCONF="$HYPERIONPATH/chains/$CHAINNAME.config.json"
+
+# variables that probably don't need to change
+INDEXER="$CHAINNAME-indexer"
+LOGFILE=$HYPERIONPATH/logs/$CHAINNAME-sync.log
+echo `date` >> $LOGFILE
+
+# Get logs from pm2 and lastblock from config file
+LOG=`$PM2 log $INDEXER --nostream --lines 4`
+LASTBLOCK=`cat $CHAINCONF |jq '.indexer.stop_on'|tr -d '"'`
+
+# if the log contains "No blocks are being processed" then update the configs for the next block span
+if echo $LOG | grep -q "No blocks are being processed"; then 
+    echo "Updating configs to next span" >> $LOGFILE
+    timeout 10 $PM2 trigger "$INDEXER" stop
+    LASTBLOCK=`cat $CHAINCONF |jq '.indexer.stop_on'|tr -d '"'`
+    STARTBLOCK=`echo $LASTBLOCK`
+    STOPBLOCK=`expr $LASTBLOCK + $BLOCKSPAN`
+    echo "Updating $CHAINCONF to $STARTBLOCK:$STOPBLOCK" >> $LOGFILE
+    jq --argjson STARTBLOCK "$STARTBLOCK" '.indexer.start_on = $STARTBLOCK' $CHAINCONF > $CHAINCONF.tmp
+    jq --argjson STOPBLOCK "$STOPBLOCK" '.indexer.stop_on = $STOPBLOCK' $CHAINCONF.tmp > $CHAINCONF.tmp2
+    cp $CHAINCONF.tmp2 $CHAINCONF
+    echo "Updated config to sync $CHAIN from $STARTBLOCK to $STOPBLOCK" >> $LOGFILE
+    echo -e "\n-->> Starting $1..."
+    cd $HYPERIONPATH
+    $PM2 start --only "$INDEXER" --update-env --silent
+    $PM2 save
+else
+    LASTBLOCK=`cat $CHAINCONF |jq '.indexer.stop_on'|tr -d '"'`
+    STARTBLOCK=`cat $CHAINCONF |jq '.indexer.start_on'|tr -d '"'`
+   echo "Still synchronizing $CHAIN from $STARTBLOCK to $LASTBLOCK" >> $LOGFILE
+fi 
@@ -0,0 +1,42 @@
+#!/bin/bash
+#
+# fixmissing.sh - Bash script for finding missing blocks in the pm2 logs 
+# Update paths and then you can run this as a test if you have missing blocks in the log 
+# to run this every 2 minutes... just add this to your cron
+# */2 * * * * /opt/eosio/src/Hyperion-History-API/scripts/watch-missing-blocks.sh
+#
+# You can modify the CHAINNAME variable to match your chains/$CHAINNAME.config.json
+#
+# variables that need to be set based on your configuration
+PM2="/home/eosio/.npm-global/bin/pm2"
+HYPERIONPATH="/opt/eosio/src/Hyperion-History-API"
+BLOCKSPAN="1000000"
+CHAINNAME="proton"
+CHAINCONF="$HYPERIONPATH/chains/$CHAINNAME.config.json"
+PM2USER="eosio"
+PM2HOME="`eval echo ~$PM2USER`/.pm2/logs"
+
+# variables that probably don't need to change
+INDEXER="$CHAINNAME-indexer"
+PM2LOG=$PM2HOME/$INDEXER-out.log
+LOGFILE=$HYPERIONPATH/logs/$CHAINNAME-fixmissing.log
+echo `date` >> $LOGFILE
+
+# Check pm2 logs to see if there is a "Mising block:" and then set that as the new STARTBLOCK
+if tail -n 100 $PM2LOG | grep -q "Missing block:"; then 
+    timeout 10 $PM2 trigger "$INDEXER" stop
+    echo "Missed block found" >> $LOGFILE
+    STARTBLOCK=`tail -n 100 $PM2LOG|grep 'Missing block:'|awk '{print $7}'|head -n 1`
+    echo "Updating $CHAINCONF to reindex $STARTBLOCK" >> $LOGFILE
+    jq --argjson STARTBLOCK "$STARTBLOCK" '.indexer.start_on = $STARTBLOCK' $CHAINCONF > $CHAINCONF.tmp3
+    cp $CHAINCONF.tmp3 $CHAINCONF
+    echo "Updated config to sync $CHAIN to reindex $STARTBLOCK" >> $LOGFILE
+    echo -e "\n-->> Starting $INDEXER..."
+    cd $HYPERIONPATH
+    $PM2 start --only "$INDEXER" --update-env --silent
+    $PM2 save
+else
+    LASTBLOCK=`cat $CHAINCONF |jq '.indexer.stop_on'|tr -d '"'`
+    STARTBLOCK=`cat $CHAINCONF |jq '.indexer.start_on'|tr -d '"'`
+   echo "No missed blocks on $CHAIN from $STARTBLOCK to $LASTBLOCK" >> $LOGFILE
+fi
Author	SHA1	Message	Date
Igor Lins e Silva	d7c372654c	Merge pull request #114 from bensig/v3.3.5 Helpful Scripts	2022-09-11 16:25:48 -03:00
Ben Sigman	360f09b3df	Remove changes to run.sh	2022-08-12 21:52:19 -07:00
Ben Sigman	5b4b7e7a22	Update scripts + add error catch to python paths	2022-08-12 21:45:28 -07:00
Ben Sigman	c6d0da9ed8	Update fix-missing-blocks.py to work for any user	2022-08-12 20:56:07 -07:00
Ben Sigman	af242f4297	Cleanup scripts	2022-08-12 01:35:45 -07:00
Ben Sigman	ef257e6f4c	Add useful scripts	2022-08-12 01:30:59 -07:00
Ben Sigman	93b22c46aa	Merge remote-tracking 'upstream/v3.3.5' v3.3.5	2022-08-12 01:25:17 -07:00
Ben Sigman	f6c669519c	Update syncbyrange to use 1,000,000 block span	2022-04-12 23:51:58 -04:00
Ben Sigman	9b7beceef1	Add sync by range and fixmissing scripts	2022-04-12 13:29:35 -04:00
Igor Lins e Silva	9e2e48e6ed	fix wrong api assignment	2022-04-07 04:57:45 -03:00
Ben Sigman	089a7e99ae	add syncbyrange.sh	2022-04-05 03:48:23 -04:00
Igor Lins e Silva	2cec16e22f	Update state-reader.ts	2022-04-05 03:40:16 -03:00
Igor Lins e Silva	f8f349b982	retry removal every 5 seconds for 30s	2022-04-05 03:28:36 -03:00
Igor Lins e Silva	1f8f81411c	more robust fork handling	2022-04-05 02:38:39 -03:00
Igor Lins e Silva	d1ce1b22af	Merge pull request #93 from ankh2054/v3.3.5 path updates to python config to make it easier to start & Allow ES pattern to be set in config for multi chain use	2022-04-05 01:30:44 -03:00
Ben Sigman	4f87c1a2e1	Update scripts and addons eosjs	2022-04-03 23:29:00 -04:00
Charles Holtzkampf	9331fa8ef3	Merge branch 'eosrio:v3.3.5' into v3.3.5	2022-03-30 10:08:25 +01:00
Charles Holtzkampf	638ae1ea80	set ES pattern based on config for multichain use	2022-03-30 10:07:38 +01:00
Charles Holtzkampf	23ca3ef943	path updates	2022-03-02 13:57:31 +00:00
Igor Lins e Silva	3f9217e741	add global-agent support	2022-02-15 23:20:28 -03:00