Merge pull request #3049 from w3f/staging

Staging
w3f · Sep 20, 2024 · 9b6d091 · 9b6d091
2 parents 326f7bf + 3971171
commit 9b6d091
Show file tree

Hide file tree

Showing 11 changed files with 241 additions and 230 deletions.
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.3.4
+    targetRevision: v3.3.5
     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.3.4
+    targetRevision: v3.3.5
     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.3.4
-appVersion: v3.3.4
+version: v3.3.5
+appVersion: v3.3.5
 apiVersion: v2
diff --git a/package.json b/package.json
@@ -81,8 +81,8 @@
     "@1kv/telemetry": "workspace:*",
     "@koa/router": "^12.0.1",
     "@octokit/rest": "^20.0.2",
-    "@polkadot/api": "^12.4.2",
-    "@polkadot/keyring": "^12.6.2",
+    "@polkadot/api": "^13.1.1",
+    "@polkadot/keyring": "^13.1.1",
     "axios": "^1.6.7",
     "chalk": "5.3.0",
     "coingecko-api-v3": "^0.0.29",

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

diff --git a/packages/common/src/scorekeeper/NumNominations.ts b/packages/common/src/scorekeeper/NumNominations.ts
@@ -6,7 +6,7 @@
 import { ApiPromise } from "@polkadot/api";
 import { scorekeeperLabel } from "./scorekeeper";
 import Nominator from "../nominator/nominator";
-import { Constants } from "../index";
+import { Constants, queries } from "../index";
 import logger from "../logger";
 import { NominatorState, NominatorStatus } from "../types";
 
@@ -112,7 +112,11 @@ export const autoNumNominations = async (
   // How many additional validator to nominate above the amount to get in the set
   const additional = 1.05;
 
-  const maxNominations = 24;
+  //Kusama max 24; Polkadot max 16
+  const maxNominations =
+    (await queries.getChainMetadata())?.name.toLowerCase() == "kusama"
+      ? 24
+      : 16;
   // The total amount of validators to nominate
   const adjustedNominationAmount = Math.min(
     Math.ceil(amount * additional),

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

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

diff --git a/packages/scorekeeper-status-ui/package.json b/packages/scorekeeper-status-ui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@1kv/scorekeeper-status-ui",
   "private": true,
-  "version": "3.3.4",
+  "version": "3.3.5",
   "type": "module",
   "scripts": {
     "dev": "vite",

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