Merge pull request #2044 from w3f/will-worker-additions

Refactoring to Accomodate Worker Jobs

.gitignore

@@ -4,6 +4,7 @@ package-lock.json
 config/main.json
 config/secret.json
 *.db
+*.log
 combined.log
 scripts/test
 config.json*
@@ -23,3 +24,5 @@ build
 *.tsbuildinfo
 **/config/main.json
 **/config/secret.json
+
+redis/

Dockerfile-dev

@@ -10,4 +10,4 @@ RUN echo "building ${PACKAGE}... "; \
     echo "yarn install done. Building...." ; \
     yarn workspaces foreach run build ; \
     echo "building ${PACKAGE} done."
-CMD pwd && ls && yarn run start:dev:${PACKAGE}
+CMD yarn run start:dev:${PACKAGE}

charts/otv-backend/Chart.yaml

@@ -1,4 +1,4 @@
 description: 1K Validators Backend
 name: otv-backend
-version: v2.6.87
+version: v2.6.88
 apiVersion: v2

charts/otv-backend/values.yaml

@@ -17,7 +17,7 @@ resources:
 
 image:
   repo: web3f/otv-backend
-  tag: 2.6.87
+  tag: 2.6.88
 
 certificate:
   enabled: true

docker-compose.yml

@@ -144,9 +144,13 @@ services:
         dockerfile: ./Dockerfile-dev
       volumes:
         - .:/app
+      deploy:
+        mode: replicated
+        replicas: 2
+      restart: unless-stopped
       networks:
         testing_net:
-          ipv4_address: 172.28.1.16
+#          ipv4_address: 172.28.1.16
 
 
     telemetry-backend-core:
@@ -227,7 +231,7 @@ services:
       volumes:
         - ./redis:/data
       restart: always
-      command: ["redis-server", "--bind", "redis", "--port", "6379"]
+      command: ["redis-server", "--bind", "172.28.1.13", "--port", "6379"]
       logging:
         driver: "json-file"
         options:

helmfile.d/10-otv-backend.yaml

@@ -12,7 +12,7 @@ releases:
     namespace: kusama
     {{ if eq .Environment.Name "production" }}
     chart: w3f/otv-backend
-    version: v2.6.87
+    version: v2.6.88
     {{ else }}
     chart: ../charts/otv-backend
     {{ end }}
@@ -30,7 +30,7 @@ releases:
     namespace: polkadot
     {{ if eq .Environment.Name "production" }}
     chart: w3f/otv-backend
-    version: v2.6.87
+    version: v2.6.88
     {{ else }}
     chart: ../charts/otv-backend
     {{ end }} 

helmfile.d/config/kusama/otv-backend-ci.yaml.gotmpl

@@ -26,7 +26,10 @@ config: |
       "skipStakedDestination": true,
       "skipClientUpgrade": false,
       "skipUnclaimed": false,
-      "forceClientVersion": "v0.9.16"
+      "forceClientVersion": "v0.9.30",
+      "minSelfStake": 10000000000000000000,
+      "commission": 150000000,
+      "unclaimedEraThreshold": 4
     },
     "cron": {
       "monitor": "0 */15 * * * *"

helmfile.d/config/kusama/otv-backend-local.yaml.gotmpl

@@ -25,7 +25,10 @@ config: |
       "skipStakedDestination": true,
       "skipClientUpgrade": false,
       "skipUnclaimed": false,
-      "forceClientVersion": "v0.9.16"
+      "forceClientVersion": "v0.9.30",
+      "minSelfStake": 10000000000000000000,
+      "commission": 150000000,
+      "unclaimedEraThreshold": 4
     },
     "cron": {
       "monitor": "0 */15 * * * *"

helmfile.d/config/kusama/otv-backend-prod.yaml.gotmpl

@@ -18,15 +18,21 @@ config: |
       "test": false,
       "retroactive": false,
       "historicalNominations": false,
-      "apiEndpoints": []
+      "apiEndpoints": [
+        "wss://kusama-rpc.polkadot.io",
+        "wss://kusama.api.onfinality.io/public-ws"
+      ]
     },
     "constraints": {
       "skipConnectionTime": false,
       "skipIdentity": false,
       "skipStakedDestination": true,
       "skipClientUpgrade": false,
       "skipUnclaimed": true,
-      "forceClientVersion": "v0.9.29"
+      "forceClientVersion": "v0.9.30",
+      "minSelfStake": 10000000000000000000,
+      "commission": 150000000,
+      "unclaimedEraThreshold": 4
     },
     "cron": {
       "monitor": "0 */15 * * * *"

helmfile.d/config/polkadot/otv-backend-ci.yaml.gotmpl

@@ -26,7 +26,10 @@ config: |
       "skipStakedDestination": false,
       "skipClientUpgrade": false,
       "skipUnclaimed": false,
-      "forceClientVersion": "v0.9.16"
+      "forceClientVersion": "v0.9.30",
+      "minSelfStake": 50000000000000,
+      "commission": 50000000,
+      "unclaimedEraThreshold": 1
     },
     "cron": {
       "monitor": "0 */15 * * * *"

helmfile.d/config/polkadot/otv-backend-local.yaml.gotmpl

@@ -25,7 +25,10 @@ config: |
       "skipStakedDestination": false,
       "skipClientUpgrade": false,
       "skipUnclaimed": false,
-      "forceClientVersion": "v0.9.16"
+      "forceClientVersion": "v0.9.30",
+      "minSelfStake": 50000000000000,
+      "commission": 50000000,
+      "unclaimedEraThreshold": 1
     },
     "cron": {
       "monitor": "0 */15 * * * *"

helmfile.d/config/polkadot/otv-backend-prod.yaml.gotmpl

@@ -18,15 +18,21 @@ config: |
       "test": false,
       "retroactive": false,
       "historicalNominations": false,
-      "apiEndpoints": []
+      "apiEndpoints": [
+        "wss://rpc.polkadot.io",
+        "wss://polkadot.api.onfinality.io/public-ws"
+        ]
     },
     "constraints": {
       "skipConnectionTime": false,
       "skipIdentity": false,
       "skipStakedDestination": false,
       "skipClientUpgrade": false,
       "skipUnclaimed": true,
-      "forceClientVersion": "v0.9.29"
+      "forceClientVersion": "v0.9.30",
+      "minSelfStake": 50000000000000,
+      "commission": 50000000,
+      "unclaimedEraThreshold": 1
     },
     "cron": {
       "monitor": "0 */15 * * * *"

package.json

@@ -4,17 +4,18 @@
   "private": true,
   "workspaces": [
     "packages/common",
+    "packages/worker",
     "packages/gateway",
     "packages/telemetry",
-    "packages/core",
-    "packages/worker"
+    "packages/core"
   ],
   "scripts": {
     "create-config:all": "yarn workspaces foreach run create-config",
+    "create-kusama-config:all": "yarn workspaces foreach run create-kusama-config",
     "docker:start": "yarn build:clean && docker-compose up -d --build",
     "lint": "yarn workspaces foreach run lint",
     "lint:fix": "yarn workspaces foreach run lint:fix",
-    "clean": "yarn workspaces foreach run clean",
+    "clean": "rm -rf redis/ && yarn workspaces foreach run clean",
     "build": "yarn workspaces foreach -t run build",
     "build:clean": "yarn workspaces foreach run clean:build",
     "start:dev:gateway": "yarn workspace @1kv/gateway run start:dev",
@@ -27,10 +28,11 @@
     "start:js:worker": "NODE_OPTIONS='--max-old-space-size=6096' node packages/worker/build/index.js start"
   },
   "devDependencies": {
-    "@types/node": "^18.8.4",
-    "@typescript-eslint/eslint-plugin": "^5.40.0",
-    "@typescript-eslint/parser": "^5.40.0",
-    "eslint": "^8.25.0",
+    "@types/eslint": "^8",
+    "@types/node": "^18.11.2",
+    "@typescript-eslint/eslint-plugin": "^5.40.1",
+    "@typescript-eslint/parser": "^5.40.1",
+    "eslint": "8.22.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.2.1",
     "prettier": "^2.7.1"

packages/common/package.json

@@ -30,9 +30,9 @@
     ]
   },
   "dependencies": {
-    "@polkadot/keyring": "^10.1.10",
+    "@polkadot/keyring": "^10.1.11",
     "@types/mongoose": "^5.11.97",
-    "@types/node": "^18.8.4",
+    "@types/node": "^18.11.2",
     "hash.js": "^1.1.7",
     "mongoose": "^6.6.5",
     "typescript": "^4.8.4",

packages/common/src/ApiHandler.ts

@@ -68,13 +68,7 @@ class ApiHandler extends EventEmitter {
     return this._api.isConnected;
   }
 
-  async getApi(): Promise<ApiPromise> {
-    if (this._reconnectLock) {
-      return new Promise((resolve) => {
-        setTimeout(() => resolve(this.getApi()), 2000);
-      });
-    }
-
+  getApi(): ApiPromise {
     return this._api;
   }