handle unbonded nominator

SimonKraus · Feb 14, 2024 · 11ff0f6 · 11ff0f6
1 parent c5e2aeb
commit 11ff0f6
Show file tree

Hide file tree

Showing 11 changed files with 36 additions and 19 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.14
+    targetRevision: v3.0.15
     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.14
+    targetRevision: v3.0.15
     plugin:
       env:
         - name: HELM_VALUES

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

diff --git a/apps/1kv-backend/templates/polkadot-otv-backend.yaml b/apps/1kv-backend/templates/polkadot-otv-backend.yaml
@@ -17,7 +17,7 @@ spec:
   source:
     repoURL: https://w3f.github.io/helm-charts/
     chart: otv-backend
-    targetRevision: v3.0.14
+    targetRevision: v3.0.15
     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.14
-appVersion: v3.0.14
+version: v3.0.15
+appVersion: v3.0.15
 apiVersion: v2
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@1kv/common",
-  "version": "3.0.14",
+  "version": "3.0.15",
   "description": "Services for running the Thousand Validator Program.",
   "main": "build/index.js",
   "types": "build/index.d.ts",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@1kv/core",
-  "version": "3.0.14",
+  "version": "3.0.15",
   "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
@@ -95,15 +95,21 @@ export default class Nominator {
   }
 
   public async stash(): Promise<any> {
-    const api = this.handler.getApi();
-    const ledger = await api.query.staking.ledger(this.controller);
-    if (!ledger.isSome) {
-      logger.warn(`Account ${this.controller} is not a controller account!`);
-      return "0x";
-    }
-    const { stash } = ledger.unwrap();
+    try {
+      const api = this.handler.getApi();
+      const ledger = await api.query.staking.ledger(this.controller);
+      if (!ledger.isSome) {
+        logger.warn(`Account ${this.controller} is not bonded!`);
+        return "0x";
+      }
+      const { stash } = ledger.unwrap();
 
-    return stash;
+      return stash;
+    } catch (e) {
+      logger.error(`Error getting stash for ${this.controller}: ${e}`, label);
+      logger.error(e, label);
+      return this.controller;
+    }
   }
 
   public async payee(): Promise<any> {
@@ -156,6 +162,17 @@ export default class Nominator {
     } else {
       const api = this.handler.getApi();
 
+      try {
+        const controller = await api.query.staking.bonded(this.controller);
+        if (controller.isNone) {
+          logger.warn(`Account ${this.controller} is not bonded!`);
+          return false;
+        }
+      } catch (e) {
+        logger.error(`Error checking if ${this.controller} is bonded: ${e}`);
+        return false;
+      }
+
       let tx: SubmittableExtrinsic<"promise">;
 
       // Start an announcement for a delayed proxy tx

diff --git a/packages/gateway/package.json b/packages/gateway/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@1kv/gateway",
-  "version": "3.0.14",
+  "version": "3.0.15",
   "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.14",
+  "version": "3.0.15",
   "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.14",
+  "version": "3.0.15",
   "description": "Services for running the Thousand Validator Program.",
   "main": "build/index.js",
   "types": "build/index.d.ts",