Merge pull request #2586 from w3f/will-v3.0.14

v3.0.19
w3f · Feb 19, 2024 · ce25b97 · ce25b97
2 parents fead15a + d4eaded
commit ce25b97
Show file tree

Hide file tree

Showing 113 changed files with 8,041 additions and 9,678 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -34,6 +34,18 @@ jobs:
           command: |
             yarn set version 3.2.2 && yarn install && yarn build && yarn workspace @1kv/core lint
 
+  testCore:
+    docker:
+      - image: node:18
+    resource_class: large
+    steps:
+      - checkout
+      - run:
+          environment:
+            YARN_ENABLE_IMMUTABLE_INSTALLS: false
+          command: |
+            yarn set version 3.2.2 && yarn install && yarn build && yarn workspace @1kv/core test
+
   helmLint:
     docker:
       - image: web3f/ci-commons:v3.2.3
@@ -175,10 +187,10 @@ workflows:
           filters:
             tags:
               only: /.*/
-#      - unitTests:
-#          filters:
-#            tags:
-#              only: /.*/
+      - testCore:
+          filters:
+            tags:
+              only: /.*/
       - helmLint:
           filters:
             tags:

diff --git a/.gitignore b/.gitignore
@@ -30,3 +30,6 @@ redis/
 docs/.DS_Store
 /packages/core/kusama-matrix.txt
 /packages/core/polkadot-matrix.txt
+/packages/common/kusama-slots.json
+/packages/common/polkadot-slots.json
+/packages/core/coverage/
diff --git a/apps/1kv-backend-staging/config/kusama-score.json b/apps/1kv-backend-staging/config/kusama-score.json
@@ -2,7 +2,7 @@
   "inclusion": "220",
   "spanInclusion": "220",
   "discovered": "5",
-  "nominated": "30",
+  "nominated": "80",
   "rank": "5",
   "bonded": "50",
   "faults": "5",
@@ -11,10 +11,5 @@
   "region": "10",
   "country": "10",
   "provider": "100",
-  "council": "10",
-  "democracy": "30",
-  "nominations": "100",
-  "delegations": "0",
-  "openGov": "0",
-  "openGovDelegation": "0"
+  "nominations": "100"
 }
diff --git a/apps/1kv-backend-staging/config/polkadot-score.json b/apps/1kv-backend-staging/config/polkadot-score.json
@@ -2,7 +2,7 @@
   "inclusion": "220",
   "spanInclusion": "220",
   "discovered": "5",
-  "nominated": "30",
+  "nominated": "80",
   "rank": "5",
   "bonded": "50",
   "faults": "5",
@@ -11,10 +11,5 @@
   "region": "10",
   "country": "10",
   "provider": "100",
-  "council": "10",
-  "democracy": "30",
-  "nominations": "100",
-  "delegations": "0",
-  "openGov": "0",
-  "openGovDelegation": "0"
+  "nominations": "100"
 }
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.18
+    targetRevision: v3.0.19
     plugin:
       env:
         - name: HELM_VALUES
@@ -41,7 +41,6 @@ spec:
             config: |
               {
                 "global": {
-                  "dryRun": false,
                   "networkPrefix": 2,
                   "apiEndpoints": [
                     "wss://kusama-rpc.polkadot.io"

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.18
+    targetRevision: v3.0.19
     plugin:
       env:
         - name: HELM_VALUES
@@ -41,7 +41,6 @@ spec:
             config: |
               {
                 "global": {
-                  "dryRun": false,
                   "networkPrefix": 0,
                   "apiEndpoints": [
                     "wss://rpc.polkadot.io",

diff --git a/apps/1kv-backend/config/kusama-score.json b/apps/1kv-backend/config/kusama-score.json
@@ -2,7 +2,7 @@
   "inclusion": "220",
   "spanInclusion": "220",
   "discovered": "5",
-  "nominated": "30",
+  "nominated": "80",
   "rank": "5",
   "bonded": "50",
   "faults": "5",
@@ -11,10 +11,5 @@
   "region": "10",
   "country": "10",
   "provider": "100",
-  "council": "10",
-  "democracy": "30",
-  "nominations": "100",
-  "delegations": "0",
-  "openGov": "0",
-  "openGovDelegation": "0"
+  "nominations": "100"
 }
diff --git a/apps/1kv-backend/config/polkadot-score.json b/apps/1kv-backend/config/polkadot-score.json
@@ -2,7 +2,7 @@
   "inclusion": "220",
   "spanInclusion": "220",
   "discovered": "5",
-  "nominated": "30",
+  "nominated": "80",
   "rank": "5",
   "bonded": "50",
   "faults": "5",
@@ -11,10 +11,5 @@
   "region": "10",
   "country": "10",
   "provider": "100",
-  "council": "10",
-  "democracy": "30",
-  "nominations": "100",
-  "delegations": "0",
-  "openGov": "0",
-  "openGovDelegation": "0"
+  "nominations": "100"
 }
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.18
+    targetRevision: v3.0.19
     plugin:
       env:
         - name: HELM_VALUES
@@ -39,11 +39,7 @@ spec:
             config: |
               {
                 "global": {
-                  "dryRun": false,
                   "networkPrefix": 2,
-                  "test": false,
-                  "retroactive": false,
-                  "historicalNominations": false,
                   "apiEndpoints": [
                     "wss://kusama-rpc.polkadot.io",
                     "wss://kusama-rpc.dwellir.com",

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.18
+    targetRevision: v3.0.19
     plugin:
       env:
         - name: HELM_VALUES
@@ -39,11 +39,7 @@ spec:
             config: |
               {
                 "global": {
-                  "dryRun": false,
                   "networkPrefix": 0,
-                  "test": false,
-                  "retroactive": false,
-                  "historicalNominations": false,
                   "apiEndpoints": [
                     "wss://rpc.polkadot.io",
                     "wss://polkadot-rpc.dwellir.com"

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.18
-appVersion: v3.0.18
+version: v3.0.19
+appVersion: v3.0.19
 apiVersion: v2
diff --git a/package.json b/package.json
@@ -49,11 +49,13 @@
     "start:dev:telemetry": "yarn workspace @1kv/telemetry run start:dev",
     "start:js:telemetry": "NODE_OPTIONS='--max-old-space-size=10096' yarn workspace @1kv/telemetry run js:start",
     "start:dev:worker": "yarn workspace @1kv/worker run start:dev",
-    "start:js:worker": "NODE_OPTIONS='--max-old-space-size=10096' yarn workspace @1kv/worker run js:start"
+    "start:js:worker": "NODE_OPTIONS='--max-old-space-size=10096' yarn workspace @1kv/worker run js:start",
+    "test:core": "yarn workspace @1kv/core run test"
   },
   "devDependencies": {
     "@types/coingecko-api": "^1.0.13",
     "@types/eslint": "^8.44.7",
+    "@types/jest": "^29.5.12",
     "@types/koa-mount": "^4.0.5",
     "@types/node": "^20.11.5",
     "@types/request": "^2.48.12",
@@ -63,7 +65,8 @@
     "eslint": "8.42.0",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-prettier": "5.0.0",
-    "prettier": "^3.2.4"
+    "prettier": "^3.2.4",
+    "ts-jest": "^29.1.2"
   },
   "dependencies": {
     "axios": "^1.6.7",
@@ -73,6 +76,7 @@
     "koa-mount": "^4.0.0",
     "koa-static": "^5.0.0",
     "koa-swagger-decorator": "^1.8.7",
+    "lru-cache": "latest",
     "node-fetch": "3.3.2",
     "request": "^2.88.2",
     "swagger-jsdoc": "^6.2.8",

diff --git a/packages/common/package.json b/packages/common/package.json
@@ -1,16 +1,17 @@
 {
   "name": "@1kv/common",
-  "version": "3.0.18",
+  "version": "3.0.19",
   "description": "Services for running the Thousand Validator Program.",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "scripts": {
     "build": "tsc --build tsconfig.json",
     "docker": "docker-compose rm -f; docker-compose build --no-cache; docker-compose up -d",
     "lint": "tsc --noEmit && eslint 'src/**/*.{js,ts,tsx}' --quiet",
-    "lint:fix": "tsc --noEmit && eslint 'src/**/*.{js,ts,tsx}' --quiet --fix",
+    "lint:fix": "tsc --noEmit && eslint 'src/**/*.{js,ts,tsx, json}' --quiet --fix",
     "clean": "../../node_modules/.bin/rimraf ./build tsconfig.tsbuildinfo combined.log",
-    "clean:build": "yarn clean && yarn build"
+    "clean:build": "yarn clean && yarn build",
+    "writeCandidatesFile": "ts-node src/scripts/writeCandidatesFile.ts && yarn lint:fix"
   },
   "author": "Web3 Foundation <[email protected]>",
   "license": "GPL-3.0",
@@ -30,11 +31,11 @@
     ]
   },
   "dependencies": {
-    "@polkadot/keyring": "^12.6.2",
     "@types/mongoose": "^5.11.97",
     "@types/node": "^20.11.5",
     "hash.js": "^1.1.7",
     "mongoose": "^8.1.1",
+    "ts-node": "^10.9.2",
     "typescript": "^5.3.3",
     "winston": "^3.11.0"
   }