diff --git a/charts/otv-backend/Chart.yaml b/charts/otv-backend/Chart.yaml index 539e29aac..37349e1a7 100644 --- a/charts/otv-backend/Chart.yaml +++ b/charts/otv-backend/Chart.yaml @@ -1,4 +1,4 @@ description: 1K Validators Backend name: otv-backend -version: v2.6.19 +version: v2.6.20 apiVersion: v2 diff --git a/charts/otv-backend/values.yaml b/charts/otv-backend/values.yaml index f26425775..ad57e6568 100644 --- a/charts/otv-backend/values.yaml +++ b/charts/otv-backend/values.yaml @@ -17,7 +17,7 @@ resources: image: repo: web3f/otv-backend - tag: v2.6.19 + tag: v2.6.20 certificate: enabled: true diff --git a/helmfile.d/10-otv-backend.yaml b/helmfile.d/10-otv-backend.yaml index 115c48f21..ac5339487 100644 --- a/helmfile.d/10-otv-backend.yaml +++ b/helmfile.d/10-otv-backend.yaml @@ -11,7 +11,7 @@ releases: namespace: kusama {{ if eq .Environment.Name "production" }} chart: w3f/otv-backend - version: v2.6.19 + version: v2.6.20 {{ else }} chart: ../charts/otv-backend {{ end }} @@ -27,7 +27,7 @@ releases: namespace: polkadot {{ if eq .Environment.Name "production" }} chart: w3f/otv-backend - version: v2.6.19 + version: v2.6.20 {{ else }} chart: ../charts/otv-backend {{ end }} diff --git a/helmfile.d/config/kusama/otv-backend-prod.yaml.gotmpl b/helmfile.d/config/kusama/otv-backend-prod.yaml.gotmpl index 799c1cade..899811e79 100644 --- a/helmfile.d/config/kusama/otv-backend-prod.yaml.gotmpl +++ b/helmfile.d/config/kusama/otv-backend-prod.yaml.gotmpl @@ -267,11 +267,6 @@ config: | "stash": "DVasGX5qBMrCwNM8SnLyFrRpeniAwAsWe2noN6jPdx1jjao", "riotHandle": "@agx10000:matrix.org" }, - { - "name": "DrNo-sv-validator-0", - "stash": "HKgfmuxsnMBHGQ3phxiuHgfju5o2aUtYCU3dYhPEzGjFm6U", - "riotHandle": "@goldeneye1:matrix.org" - }, { "name": "NeNa", "stash": "GhNL9Mi5KiL3Ge2jv4jUdncipZNnUFALbzmwg8QqwjxJxcp", @@ -432,11 +427,6 @@ config: | "stash": "FPwa55diVEYwSuhNXwDACk31u4BTe2kgC255BsibKJwFksc", "riotHandle": "@kogeler:matrix.org" }, - { - "name": "DrNo-sv-validator-2", - "stash": "H9fx3m7aXUh8EjTU8Y41dvucSkhP88HKwPYdaYCVJBdeEFZ", - "riotHandle": "@goldeneye1:matrix.org" - }, { "name": "Staker_Space-sv-validator-2", "stash": "Dm64aaAUyy5dvYCSmyzz3njGrWrVaki9F6BvUDSYjDDoqR2", @@ -2939,6 +2929,11 @@ config: | "name": "summerstake", "stash": "Gh86VtoTd3c5fGvCjSRhymndg8AUpR4NZAit8XVGCv985Wf", "riotHandle": "@summerstak3:matrix.org" + }, + { + "name": "Green Cloud In the sky", + "stash": "HLfUw3p1W5mx57wJeDG6n6uRYDR7H22ViRLuCTgbJCirbai", + "riotHandle": "@green-cloud:matrix.org" } ], "forceRound": false, diff --git a/helmfile.d/config/polkadot/otv-backend-prod.yaml.gotmpl b/helmfile.d/config/polkadot/otv-backend-prod.yaml.gotmpl index 6410dbd30..908a93211 100644 --- a/helmfile.d/config/polkadot/otv-backend-prod.yaml.gotmpl +++ b/helmfile.d/config/polkadot/otv-backend-prod.yaml.gotmpl @@ -70,12 +70,6 @@ config: | "kusamaStash": "EXS1FwCt9YvUMpqqrG7BUUonhoFDkqnHXPrHfSCATYvQCUc", "riotHandle": "@xzhang:matrix.org" }, - { - "name": "DrNo-sv-validator-1", - "stash": "14gYRjn6fn5hu45zEAtXodPDbtaditK8twoWUXFi6DsLwd31", - "kusamaStash": "H9fx3m7aXUh8EjTU8Y41dvucSkhP88HKwPYdaYCVJBdeEFZ", - "riotHandle": "@goldeneye1:matrix.org" - }, { "name": "🔱-Masternode24-🔱", "stash": "14Q74NU7dG4uxiHTSCSZii5T1Y368cm7BNVNeRWmEuoDUGXQ", @@ -1146,6 +1140,12 @@ config: | "stash": "1sgm3kyLxWgNWfNMtvnZU7Ammbzhdwbo2TC4hgMPhP91n9M", "kusamaStash": "EVTgjzPPHrQwVx97dc7p55hYkVdW6is1mzMr1kacHpkZDTQ", "riotHandle": "@sakuratech:matrix.org" + }, + { + "name": "Mermaid", + "stash": "126gTJ1q3eJE8fFVjCqkfmz7KKr9g6rZSARXE2yeT1PRpFzj", + "kusamaStash": "Drb5XkyGvm26ph6d1DE4wxbwqiUCKyVXpcThBUSHE4VxrB7", + "riotHandle": "@mermaidonline:matrix.org" } ], "forceRound": false, diff --git a/package.json b/package.json index 341482d61..0b027fcf5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "1k-validators-be", - "version": "2.6.19", + "version": "2.6.20", "description": "Services for running the Thousand Validator Program.", "main": "index.js", "scripts": { diff --git a/src/constants.ts b/src/constants.ts index bd03d1ac2..1fea60996 100644 --- a/src/constants.ts +++ b/src/constants.ts @@ -1,8 +1,8 @@ -/// 10% in per billion type. -export const TEN_PERCENT = 100000000; +/// 15% in per billion type. +export const FIFTEEN_PERCENT = 150000000; -/// 3% in per billion type. -export const THREE_PERCENT = 30000000; +/// 5% in per billion type. +export const FIVE_PERCENT = 50000000; /// 10 KSM with decimals. export const TEN_KSM: number = 10 * 10 ** 12; diff --git a/src/index.ts b/src/index.ts index 51356b3a1..369420b9e 100644 --- a/src/index.ts +++ b/src/index.ts @@ -25,7 +25,7 @@ import { startClearAccumulatedOfflineTimeJob, startMonitorJob } from "./cron"; const isCI = process.env.CI; -const version = "v2.6.19"; +const version = "v2.6.20"; const catchAndQuit = async (fn: any) => { try { diff --git a/src/scorekeeper.ts b/src/scorekeeper.ts index 9dad2a2fb..76de81289 100644 --- a/src/scorekeeper.ts +++ b/src/scorekeeper.ts @@ -10,10 +10,10 @@ import { KUSAMA_FOUR_DAYS_ERAS, POLKADOT_FOUR_DAYS_ERAS, SCOREKEEPER_CRON, - TEN_PERCENT, + FIFTEEN_PERCENT, TEN_THOUSAND_DOT, FIVE_THOUSAND_DOT, - THREE_PERCENT, + FIVE_PERCENT, SIXTEEN_HOURS, TEN_KSM, BALANCE_BUFFER_PERCENT, @@ -284,7 +284,7 @@ export default class ScoreKeeper { this.config.constraints.skipClientUpgrade, this.config.constraints.skipUnclaimed, this.config.global.networkPrefix == 2 ? TEN_KSM : FIVE_THOUSAND_DOT, - this.config.global.networkPrefix == 2 ? TEN_PERCENT : THREE_PERCENT, + this.config.global.networkPrefix == 2 ? FIFTEEN_PERCENT : FIVE_PERCENT, this.config.global.networkPrefix == 2 ? KUSAMA_FOUR_DAYS_ERAS : POLKADOT_FOUR_DAYS_ERAS,