Merge pull request #2629 from w3f/will-v3-0-21

wpank · web-flow · commit 4bf25bf17950 · 2024-02-27T15:43:59.000+01:00
v3.0.21
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.20
+    targetRevision: v3.0.21
     plugin:
       env:
         - name: HELM_VALUES
@@ -43,7 +43,12 @@ spec:
                 "global": {
                   "networkPrefix": 2,
                   "apiEndpoints": [
-                    "wss://kusama-rpc.polkadot.io"
+                    "wss://kusama-rpc-tn.dwellir.com",
+                    "wss://kusama-rpc.dwellir.com",
+                    "wss://kusama.public.curie.radiumblock.xyz/ws",
+                    "wss://rpc.ibp.network/kusama",
+                    "wss://rpc.dotters.network/kusama",
+                    "wss://ksm-rpc.stakeworld.io"
                   ],
                   "candidatesUrl": "https://raw.githubusercontent.com/w3f/1k-validators-be/master/candidates/kusama.json"
                 },
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.20
+    targetRevision: v3.0.21
     plugin:
       env:
         - name: HELM_VALUES
@@ -43,10 +43,13 @@ spec:
                 "global": {
                   "networkPrefix": 0,
                   "apiEndpoints": [
-                    "wss://rpc.polkadot.io",
-                    "wss://polkadot-rpc.dwellir.com"
-                    ],
-                    "candidatesUrl": "https://raw.githubusercontent.com/w3f/1k-validators-be/master/candidates/polkadot.json"
+                    "wss://rpc.dotters.network/polkadot",
+                    "wss://dot-rpc.stakeworld.io",
+                    "wss://polkadot.public.curie.radiumblock.co/ws",
+                    "wss://rpc.ibp.network/polkadot",
+                    "wss://polkadot-rpc-tn.dwellir.com"
+                  ],
+                  "candidatesUrl": "https://raw.githubusercontent.com/w3f/1k-validators-be/master/candidates/polkadot.json"
                 },
                 "constraints": {
                   "skipConnectionTime": false,
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.20
+    targetRevision: v3.0.21
     plugin:
       env:
         - name: HELM_VALUES
@@ -41,9 +41,12 @@ spec:
                 "global": {
                   "networkPrefix": 2,
                   "apiEndpoints": [
-                    "wss://kusama-rpc.polkadot.io",
+                    "wss://kusama-rpc-tn.dwellir.com",
                     "wss://kusama-rpc.dwellir.com",
-                    "wss://kusama.public.curie.radiumblock.xyz/ws"
+                    "wss://kusama.public.curie.radiumblock.xyz/ws",
+                    "wss://rpc.ibp.network/kusama",
+                    "wss://rpc.dotters.network/kusama",
+                    "wss://ksm-rpc.stakeworld.io"
                   ],
                   "candidatesUrl": "https://raw.githubusercontent.com/w3f/1k-validators-be/master/candidates/kusama.json"
                 },
@@ -81,7 +84,7 @@ spec:
                   {{ . }}{{ end }},
                 "scorekeeper": {
                   "candidates": null,
-                  "forceRound": true,
+                  "forceRound": false,
                   "nominating": {{ .Values.kusama.be.nominating }}
                 },
                 "server": {
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.20
+    targetRevision: v3.0.21
     plugin:
       env:
         - name: HELM_VALUES
@@ -41,10 +41,13 @@ spec:
                 "global": {
                   "networkPrefix": 0,
                   "apiEndpoints": [
-                    "wss://rpc.polkadot.io",
-                    "wss://polkadot-rpc.dwellir.com"
-                    ],
-                    "candidatesUrl": "https://raw.githubusercontent.com/w3f/1k-validators-be/master/candidates/polkadot.json"
+                    "wss://rpc.dotters.network/polkadot",
+                    "wss://dot-rpc.stakeworld.io",
+                    "wss://polkadot.public.curie.radiumblock.co/ws",
+                    "wss://rpc.ibp.network/polkadot",
+                    "wss://polkadot-rpc-tn.dwellir.com"
+                  ],
+                  "candidatesUrl": "https://raw.githubusercontent.com/w3f/1k-validators-be/master/candidates/polkadot.json"
                 },
                 "constraints": {
                   "skipConnectionTime": false,
@@ -80,7 +83,7 @@ spec:
                   {{ . }}{{ end }},
                 "scorekeeper": {
                   "candidates": null,
-                  "forceRound": true,
+                  "forceRound": false,
                   "nominating": {{ .Values.polkadot.be.nominating }}
                 },
                 "server": {
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.20
-appVersion: v3.0.20
+version: v3.0.21
+appVersion: v3.0.21
 apiVersion: v2
diff --git a/packages/common/package.json b/packages/common/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@1kv/common",
-  "version": "3.0.20",
+  "version": "3.0.21",
   "description": "Services for running the Thousand Validator Program.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
diff --git a/packages/core/config/polkadot.current.dev.sample.json b/packages/core/config/polkadot.current.dev.sample.json
@@ -3,8 +3,11 @@
     "dryRun": false,
     "networkPrefix": 0,
     "apiEndpoints": [
-      "wss://rpc.polkadot.io",
-      "wss://polkadot-rpc.dwellir.com"
+      "wss://rpc.dotters.network/polkadot",
+      "wss://dot-rpc.stakeworld.io",
+      "wss://polkadot.public.curie.radiumblock.co/ws",
+      "wss://rpc.ibp.network/polkadot",
+      "wss://polkadot-rpc-tn.dwellir.com"
     ],
     "bootstrap": true,
     "kusamaBootstrapEndpoint": "https://kusama.w3f.community",
diff --git a/packages/core/config/polkadot.current.sample.json b/packages/core/config/polkadot.current.sample.json
@@ -3,8 +3,11 @@
     "dryRun": false,
     "networkPrefix": 0,
     "apiEndpoints": [
-      "wss://rpc.polkadot.io",
-      "wss://polkadot-rpc.dwellir.com"
+      "wss://rpc.dotters.network/polkadot",
+      "wss://dot-rpc.stakeworld.io",
+      "wss://polkadot.public.curie.radiumblock.co/ws",
+      "wss://rpc.ibp.network/polkadot",
+      "wss://polkadot-rpc-tn.dwellir.com"
     ],
     "candidatesUrl": "https://raw.githubusercontent.com/w3f/1k-validators-be/master/candidates/polkadot.json"
   },
diff --git a/packages/core/config/polkadot.microservice.dev.sample.json b/packages/core/config/polkadot.microservice.dev.sample.json
@@ -3,8 +3,11 @@
     "dryRun": false,
     "networkPrefix": 0,
     "apiEndpoints": [
-      "wss://rpc.polkadot.io",
-      "wss://polkadot-rpc.dwellir.com"
+      "wss://rpc.dotters.network/polkadot",
+      "wss://dot-rpc.stakeworld.io",
+      "wss://polkadot.public.curie.radiumblock.co/ws",
+      "wss://rpc.ibp.network/polkadot",
+      "wss://polkadot-rpc-tn.dwellir.com"
     ],
     "bootstrap": false,
     "kusamaBootstrapEndpoint": "https://kusama.w3f.community",
diff --git a/packages/core/config/polkadot.microservice.sample.json b/packages/core/config/polkadot.microservice.sample.json
@@ -3,8 +3,11 @@
     "dryRun": false,
     "networkPrefix": 0,
     "apiEndpoints": [
-      "wss://rpc.polkadot.io",
-      "wss://polkadot-rpc.dwellir.com"
+      "wss://rpc.dotters.network/polkadot",
+      "wss://dot-rpc.stakeworld.io",
+      "wss://polkadot.public.curie.radiumblock.co/ws",
+      "wss://rpc.ibp.network/polkadot",
+      "wss://polkadot-rpc-tn.dwellir.com"
     ],
     "bootstrap": false,
     "kusamaBootstrapEndpoint": "https://kusama.w3f.community",
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@1kv/core",
-  "version": "3.0.20",
+  "version": "3.0.21",
   "description": "Services for running the Thousand Validator Program.",
   "main": "index.js",
   "scripts": {
diff --git a/packages/core/src/scorekeeper/jobs/cron/StartCronJobs.ts b/packages/core/src/scorekeeper/jobs/cron/StartCronJobs.ts
@@ -918,7 +918,7 @@ export const startMainScorekeeperJob = async (
         for (const nominator of nomGroup) {
           // Get the current nominations of an address
           const currentTargets = await queries.getCurrentTargets(
-            nominator.controller,
+            nominator.bondedAddress,
           );
           allCurrentTargets.push(currentTargets);
         }
diff --git a/packages/core/src/scorekeeper/scorekeeper.ts b/packages/core/src/scorekeeper/scorekeeper.ts
@@ -156,7 +156,7 @@ export default class ScoreKeeper {
             ? `/ ${Util.addressUrl(n.address, this.config)}`
             : "";
           return `- ${Util.addressUrl(
-            n.controller,
+            n.bondedAddress,
             this.config,
           )} / ${Util.addressUrl(stash, this.config)} (${bal} ${sym}) ${proxy}`;
         }),
@@ -182,7 +182,7 @@ export default class ScoreKeeper {
           });
 
           return `- ${Util.addressUrl(
-            n.controller,
+            n.bondedAddress,
             this.config,
           )} / ${Util.addressUrl(
             stash,
diff --git a/packages/gateway/package.json b/packages/gateway/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@1kv/gateway",
-  "version": "3.0.20",
+  "version": "3.0.21",
   "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.20",
+  "version": "3.0.21",
   "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.20",
+  "version": "3.0.21",
   "description": "Services for running the Thousand Validator Program.",
   "main": "build/index.js",
   "types": "build/index.d.ts",

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@1kv/common",`
`3`		`- "version": "3.0.20",`
	`3`	`+ "version": "3.0.21",`
`4`	`4`	`"description": "Services for running the Thousand Validator Program.",`
`5`	`5`	`"main": "build/index.js",`
`6`	`6`	`"types": "build/index.d.ts",`