Merge pull request #2614 from w3f/will-v3.0.20

v3.0.20
w3f · Feb 19, 2024 · 8a3cc83 · 8a3cc83
2 parents ce25b97 + 3341c41
commit 8a3cc83
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 17 deletions.
diff --git a/apps/1kv-backend-staging/templates/kusama-otv-backend.yaml b/apps/1kv-backend-staging/templates/kusama-otv-backend.yaml
@@ -17,7 +17,7 @@ spec:
   source:
     repoURL: https://w3f.github.io/helm-charts/
     chart: otv-backend
-    targetRevision: v3.0.19
+    targetRevision: v3.0.20
     plugin:
       env:
         - name: HELM_VALUES

diff --git a/apps/1kv-backend-staging/templates/polkadot-otv-backend.yaml b/apps/1kv-backend-staging/templates/polkadot-otv-backend.yaml
@@ -17,7 +17,7 @@ spec:
   source:
     repoURL: https://w3f.github.io/helm-charts/
     chart: otv-backend
-    targetRevision: v3.0.19
+    targetRevision: v3.0.20
     plugin:
       env:
         - name: HELM_VALUES

diff --git a/charts/otv-backend/Chart.yaml b/charts/otv-backend/Chart.yaml
@@ -1,5 +1,5 @@
 description: 1K Validators Backend
 name: otv-backend
-version: v3.0.19
-appVersion: v3.0.19
+version: v3.0.20
+appVersion: v3.0.20
 apiVersion: v2
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@1kv/common",
-  "version": "3.0.19",
+  "version": "3.0.20",
   "description": "Services for running the Thousand Validator Program.",
   "main": "build/index.js",
   "types": "build/index.d.ts",

diff --git a/packages/common/src/db/queries/Nominator.ts b/packages/common/src/db/queries/Nominator.ts
@@ -69,6 +69,8 @@ export const addNominator = async (nominator: Nominator): Promise<boolean> => {
     );
   } catch (e) {
     logger.info(JSON.stringify(e));
+    logger.error(`Could not add nominator: ${e}`);
+    logger.error(`Could not add nominator: ${JSON.stringify(nominator)}`);
   }
 };
 

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@1kv/core",
-  "version": "3.0.19",
+  "version": "3.0.20",
   "description": "Services for running the Thousand Validator Program.",
   "main": "index.js",
   "scripts": {

diff --git a/packages/core/src/nominator.ts b/packages/core/src/nominator.ts
@@ -90,7 +90,7 @@ export default class Nominator {
     return this._proxyDelay;
   }
 
-  public async stash(): Promise<any> {
+  public async stash(): Promise<string> {
     try {
       const api = this.handler.getApi();
       const ledger = await api.query.staking.ledger(this.bondedAddress);
@@ -100,7 +100,7 @@ export default class Nominator {
       }
       const { stash } = ledger.unwrap();
 
-      return stash;
+      return stash.toString();
     } catch (e) {
       logger.error(
         `Error getting stash for ${this.bondedAddress}: ${e}`,
@@ -111,7 +111,7 @@ export default class Nominator {
     }
   }
 
-  public async payee(): Promise<any> {
+  public async payee(): Promise<string> {
     const api = this.handler.getApi();
     try {
       const ledger = await api.query.staking.ledger(this.bondedAddress);

diff --git a/packages/core/src/scorekeeper/Round.ts b/packages/core/src/scorekeeper/Round.ts
@@ -55,12 +55,12 @@ export const endRound = async (
   // Gets adds candidates we nominated to the list
   for (const nomGroup of nominatorGroups) {
     for (const nominator of nomGroup) {
-      const current = await queries.getCurrentTargets(nominator.controller);
+      const current = await queries.getCurrentTargets(nominator.bondedAddress);
 
       // If not nominating any... then return.
       if (!current.length) {
         logger.info(
-          `${nominator.controller} is not nominating any targets.`,
+          `${nominator.bondedAddress} is not nominating any targets.`,
           scorekeeperLabel,
         );
         continue;

diff --git a/packages/core/src/scorekeeper/scorekeeper.ts b/packages/core/src/scorekeeper/scorekeeper.ts
@@ -109,7 +109,7 @@ export default class ScoreKeeper {
           address: nom.bondedAddress,
           stash: stash,
           proxy: proxy,
-          bonded: bonded,
+          bonded: Number(bonded),
           now: now,
           proxyDelay: proxyDelay,
           rewardDestination: payee,
@@ -138,7 +138,7 @@ export default class ScoreKeeper {
         group.map(async (n) => {
           const stash = await n.stash();
           const proxy = (await n._isProxy) ? `/ ${n.address}` : "";
-          return `- ${n.controller} / ${stash} ${proxy}`;
+          return `- ${n.bondedAddress} / ${stash} ${proxy}`;
         }),
       )
     ).join("\n");
@@ -163,7 +163,7 @@ export default class ScoreKeeper {
       )
     ).join("<br>");
     logger.info(
-      `Nominator group added! Nominator addresses (Controller / Stash / Proxy):\n${nominatorGroupString}`,
+      `Nominator group added! Nominator addresses (Bonded Address / Stash / Proxy):\n${nominatorGroupString}`,
       scorekeeperLabel,
     );
 

diff --git a/packages/gateway/package.json b/packages/gateway/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@1kv/gateway",
-  "version": "3.0.19",
+  "version": "3.0.20",
   "description": "Services for running the Thousand Validator Program.",
   "main": "build/index.js",
   "types": "build/index.d.ts",

diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@1kv/telemetry",
-  "version": "3.0.19",
+  "version": "3.0.20",
   "description": "Services for running the Thousand Validator Program.",
   "main": "build/index.js",
   "types": "build/index.d.ts",

diff --git a/packages/worker/package.json b/packages/worker/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@1kv/worker",
-  "version": "3.0.19",
+  "version": "3.0.20",
   "description": "Services for running the Thousand Validator Program.",
   "main": "build/index.js",
   "types": "build/index.d.ts",