Merge pull request #1992 from w3f/will-deps

bump version to v2.6.60
w3f · Sep 27, 2022 · 07939fc · 07939fc
2 parents 2701a4c + e83a9b9
commit 07939fc
Show file tree

Hide file tree

Showing 8 changed files with 508 additions and 436 deletions.
diff --git a/charts/otv-backend/Chart.yaml b/charts/otv-backend/Chart.yaml
@@ -1,4 +1,4 @@
 description: 1K Validators Backend
 name: otv-backend
-version: v2.6.59
+version: v2.6.60
 apiVersion: v2
diff --git a/charts/otv-backend/values.yaml b/charts/otv-backend/values.yaml
@@ -17,7 +17,7 @@ resources:
 
 image:
   repo: web3f/otv-backend
-  tag: v2.6.59
+  tag: v2.6.60
 
 certificate:
   enabled: true

diff --git a/helmfile.d/10-otv-backend.yaml b/helmfile.d/10-otv-backend.yaml
@@ -11,7 +11,7 @@ releases:
     namespace: kusama
     {{ if eq .Environment.Name "production" }}
     chart: w3f/otv-backend
-    version: v2.6.59
+    version: v2.6.60
     {{ else }}
     chart: ../charts/otv-backend
     {{ end }}
@@ -27,7 +27,7 @@ releases:
     namespace: polkadot
     {{ if eq .Environment.Name "production" }}
     chart: w3f/otv-backend
-    version: v2.6.59
+    version: v2.6.60
     {{ else }}
     chart: ../charts/otv-backend
     {{ end }} 

diff --git a/helmfile.d/config/kusama/otv-backend-prod.yaml.gotmpl b/helmfile.d/config/kusama/otv-backend-prod.yaml.gotmpl
@@ -2764,6 +2764,51 @@ config: |
               "name": "LongNode",
               "stash": "DizXV8fnNYr1HqBm9M3h4fUa8EdCTZWRyYpXF18s9JmWxh1",
               "riotHandle": "@rdovgan:matrix.org"
+          },
+          {
+              "name": "BlockCtrl-2",
+              "stash": "Cx8jJMMwTcEwTMHSQDdwTwFJCmmTsMVz25auV95WkFBZnZv",
+              "riotHandle": "@alberto_bc:matrix.org"
+          },
+          {
+              "name": "Vel_Validator_02",
+              "stash": "HnidBVNsn5MdboWwHRRoVHuzzFEZZFgenQb3KmgEoRt3tTJ",
+              "riotHandle": "@vda0390:matrix.org"
+          },
+          {
+              "name": "bigTuna",
+              "stash": "FntXNA6GesCTLJQZUt1LjyUCxkTbhCYny4Y6UdT8et1aqNt",
+              "riotHandle": "@tunabig:matrix.org"
+          },
+          {
+              "name": "KYB-validator-2",
+              "stash": "CmS4wQk2P9DboQ3SVAJct1j948QbNhbJJmSrqvFMUSLATNZ",
+              "riotHandle": "@kostyayesikov:matrix.org"
+          },
+          {
+              "name": "Swiss Bond/2",
+              "stash": "E2gCFEisQ3k4LmaJHBysj8f1SRoG6jCo5ffFdX9XidqsjDC",
+              "riotHandle": "@matteo_swissbond:matrix.org"
+          },
+          {
+              "name": "Darkstar Ω Muladhara",
+              "stash": "HKskSdW3uDspu9x8Q9ph8tiKvbLE7Rd2n5cCKaG5rHL7DUv",
+              "riotHandle": "@darkstar/forklessnation:matrix.org"
+          },
+          {
+              "name": "metaspan-ksm2",
+              "stash": "FAR296Aqh9i8W5bi7BS7a8Bkhbw5LX5xCXP22c1Jvc2tM5v",
+              "riotHandle": "@metaspan:matrix.org"
+          },
+          {
+              "name": "anvel",
+              "stash": "EPbpqewHLsudtHdJnyMSR3SqP3fwUSSGssP18qsW1UABaFr",
+              "riotHandle": "@anvel:matrix.org"
+          },
+          {
+              "name": "Rekt Street Capital",
+              "stash": "FkrektytDeepNHKZMMiPYZsrmgrVum9cqZmE4fsz4cotKs9",
+              "riotHandle": "@rektstreet:matrix.org"
           }
       ],
       "forceRound": false,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "1k-validators-be",
-  "version": "2.6.59",
+  "version": "2.6.60",
   "description": "Services for running the Thousand Validator Program.",
   "main": "index.js",
   "scripts": {
@@ -21,48 +21,48 @@
   "author": "Web3 Foundation <teched@web3.foundation>",
   "license": "GPL-3.0",
   "dependencies": {
-    "@koa/router": "^10.1.1",
-    "@octokit/rest": "^18.12.0",
-    "@polkadot/api": "^8.8.1",
-    "@polkadot/keyring": "^9.4.1",
+    "@koa/router": "^12.0.0",
+    "@octokit/rest": "^19.0.4",
+    "@polkadot/api": "^8.14.1",
+    "@polkadot/keyring": "^10.1.9",
     "@types/cron": "^2.0.0",
-    "@types/koa": "^2.13.4",
-    "@types/koa-bodyparser": "^4.3.7",
-    "@types/node": "^17.0.42",
-    "@types/semver": "^7.3.9",
+    "@types/koa": "^2.13.5",
+    "@types/koa-bodyparser": "^4.3.8",
+    "@types/node": "^18.7.23",
+    "@types/semver": "^7.3.12",
     "@types/ws": "^8.5.3",
     "axios": "^0.27.2",
-    "bree": "^9.0.1",
+    "bree": "^9.1.2",
     "bs58": "^5.0.0",
-    "commander": "^9.3.0",
-    "cron": "^2.0.0",
+    "commander": "^9.4.0",
+    "cron": "^2.1.0",
     "eslint-config-prettier": "^8.5.0",
-    "eslint-plugin-prettier": "^4.0.0",
+    "eslint-plugin-prettier": "^4.2.1",
     "eventemitter3": "^4.0.7",
     "hash.js": "^1.1.7",
     "koa": "^2.13.4",
     "koa-bodyparser": "^4.3.0",
-    "koa-cash": "^4.1.0",
+    "koa-cash": "^4.1.1",
     "koa2-cors": "^2.0.6",
-    "matrix-js-sdk": "^16.0.1",
-    "mongodb": "4.7.0",
-    "mongodb-memory-server": "^8.6.0",
-    "mongoose": "^6.3.6",
-    "prettier": "^2.6.2",
+    "matrix-js-sdk": "^19.5.0",
+    "mongodb": "4.10.0",
+    "mongodb-memory-server": "^8.9.3",
+    "mongoose": "^6.6.2",
+    "prettier": "^2.7.1",
     "reconnecting-websocket": "^4.4.0",
     "semver": "^7.3.7",
-    "ts-node": "^10.8.1",
-    "typescript": "^4.7.3",
-    "winston": "^3.7.2",
-    "ws": "^8.8.0"
+    "ts-node": "^10.9.1",
+    "typescript": "^4.8.3",
+    "winston": "^3.8.2",
+    "ws": "^8.9.0"
   },
   "devDependencies": {
     "@ava/typescript": "^3.0.1",
-    "@typescript-eslint/eslint-plugin": "^5.27.1",
-    "@typescript-eslint/parser": "^5.27.1",
-    "ava": "^4.3.0",
-    "concurrently": "^7.2.1",
-    "eslint": "^8.17.0",
+    "@typescript-eslint/eslint-plugin": "^5.38.1",
+    "@typescript-eslint/parser": "^5.38.1",
+    "ava": "^4.3.3",
+    "concurrently": "^7.4.0",
+    "eslint": "^8.24.0",
     "eslint-plugin-security": "^1.5.0",
     "nodemon": "^2.0.16",
     "open-cli": "^7.0.1"

diff --git a/src/index.ts b/src/index.ts
@@ -25,7 +25,7 @@ import { startClearAccumulatedOfflineTimeJob, startMonitorJob } from "./cron";
 
 const isCI = process.env.CI;
 
-const version = "v2.6.59";
+const version = "v2.6.60";
 
 const catchAndQuit = async (fn: any) => {
   try {

diff --git a/src/matrix.ts b/src/matrix.ts
@@ -69,30 +69,30 @@ export default class MatrixBot {
     );
   }
 
-  sendMessage(msg: string): Promise<boolean> {
+  sendMessage(msg: string): any {
     const content = {
       body: msg,
       msgtype: "m.text",
       format: "org.matrix.custom.html",
       formatted_body: msg,
     };
 
-    return new Promise((resolve: any, reject: any) => {
-      try {
-        this.client.sendEvent(
-          this.conf.matrix.room,
-          "m.room.message",
-          content,
-          "",
-          (err: any) => {
-            if (err) reject(err);
-            resolve(true);
-          }
-        );
-      } catch (e) {
-        logger.info(`{Matrix::error}`);
-        logger.warn(e);
-      }
-    });
+    // return new Promise((resolve: any, reject: any) => {
+    //   try {
+    //     this.client.sendEvent(
+    //       this.conf.matrix.room,
+    //       "m.room.message",
+    //       content,
+    //       "",
+    //       (err: any) => {
+    //         if (err) reject(err);
+    //         resolve(true);
+    //       }
+    //     );
+    //   } catch (e) {
+    //     logger.info(`{Matrix::error}`);
+    //     logger.warn(e);
+    //   }
+    // });
   }
 }