Skip to content
This repository was archived by the owner on Mar 18, 2025. It is now read-only.

Commit 5663431

Browse files
ironoaironoa
authored
Merge pull request #2954 from w3f/release-monitor-fix
releaseTagFormat is configurable
2 parents eb00650 + 1a5e396 commit 5663431

29 files changed

+185
-260
lines changed

‎apps/1kv-backend-staging/templates/kusama-otv-backend.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,18 @@ spec:
5656
"constraints": {
5757
"skipConnectionTime": true,
5858
"skipIdentity": false,
59-
"skipClientUpgrade": false,
6059
"skipUnclaimed": true,
60+
"clientUpgrade": {
61+
"skip": false
62+
},
6163
"minSelfStake": 10000000000000,
6264
"commission": 150000000,
6365
"unclaimedEraThreshold": 4,
6466
"sanctionedGeoArea": {
6567
"skip": false,
6668
"sanctionedCountries": ["RU", "IR", "CU", "KP", "SY"],
6769
"sanctionedRegions": ["Crimea", "Autonomous Republic of Crimea", "Republic of Crimea", "Luhansk", "Luhanska Oblast", "Luhanska", "Luganskaya Oblast’", "Luganskaya", "Donetsk", "Donetska Oblast", "Donetskaya Oblast’", "Donetska", "Donetskaya", "Sevastopol City", "Sevastopol", "Gorod Sevastopol"]
68-
},
69-
"forceClientVersion": "v1.10.0"
70+
}
7071
},
7172
"cron": {
7273
"monitor": "0 */15 * * * *",

‎apps/1kv-backend-staging/templates/polkadot-otv-backend.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,17 +55,18 @@ spec:
5555
"constraints": {
5656
"skipConnectionTime": false,
5757
"skipIdentity": false,
58-
"skipClientUpgrade": false,
5958
"skipUnclaimed": true,
59+
"clientUpgrade": {
60+
"skip": false
61+
},
6062
"minSelfStake": 50000000000000,
6163
"commission": 50000000,
6264
"unclaimedEraThreshold": 1,
6365
"sanctionedGeoArea": {
6466
"skip": false,
6567
"sanctionedCountries": ["RU", "IR", "CU", "KP", "SY"],
6668
"sanctionedRegions": ["Crimea", "Autonomous Republic of Crimea", "Republic of Crimea", "Luhansk", "Luhanska Oblast", "Luhanska", "Luganskaya Oblast’", "Luganskaya", "Donetsk", "Donetska Oblast", "Donetskaya Oblast’", "Donetska", "Donetskaya", "Sevastopol City", "Sevastopol", "Gorod Sevastopol"]
67-
},
68-
"forceClientVersion": "v1.10.0"
69+
}
6970
},
7071
"cron": {
7172
"monitor": "0 */15 * * * *",

‎apps/1kv-backend/templates/kusama-otv-backend.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,17 +54,18 @@ spec:
5454
"skipConnectionTime": false,
5555
"skipIdentity": false,
5656
"skipStakedDestination": true,
57-
"skipClientUpgrade": false,
5857
"skipUnclaimed": true,
58+
"clientUpgrade": {
59+
"skip": false
60+
},
5961
"minSelfStake": 10000000000000,
6062
"commission": 150000000,
6163
"unclaimedEraThreshold": 4,
6264
"sanctionedGeoArea": {
6365
"skip": false,
6466
"sanctionedCountries": ["RU", "IR", "CU", "KP", "SY"],
6567
"sanctionedRegions": ["Crimea", "Autonomous Republic of Crimea", "Republic of Crimea", "Luhansk", "Luhanska Oblast", "Luhanska", "Luganskaya Oblast’", "Luganskaya", "Donetsk", "Donetska Oblast", "Donetskaya Oblast’", "Donetska", "Donetskaya", "Sevastopol City", "Sevastopol", "Gorod Sevastopol"]
66-
},
67-
"forceClientVersion": "v1.10.0"
68+
}
6869
},
6970
"cron": {
7071
"monitor": "0 */15 * * * *",

‎apps/1kv-backend/templates/polkadot-otv-backend.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,18 @@ spec:
5353
"skipConnectionTime": false,
5454
"skipIdentity": false,
5555
"skipStakedDestination": true,
56-
"skipClientUpgrade": false,
5756
"skipUnclaimed": true,
57+
"clientUpgrade": {
58+
"skip": false
59+
},
5860
"minSelfStake": 50000000000000,
5961
"commission": 50000000,
6062
"unclaimedEraThreshold": 1,
6163
"sanctionedGeoArea": {
6264
"skip": false,
6365
"sanctionedCountries": ["RU", "IR", "CU", "KP", "SY"],
6466
"sanctionedRegions": ["Crimea", "Autonomous Republic of Crimea", "Republic of Crimea", "Luhansk", "Luhanska Oblast", "Luhanska", "Luganskaya Oblast’", "Luganskaya", "Donetsk", "Donetska Oblast", "Donetskaya Oblast’", "Donetska", "Donetskaya", "Sevastopol City", "Sevastopol", "Gorod Sevastopol"]
65-
},
66-
"forceClientVersion": "v1.10.0"
67+
}
6768
},
6869
"cron": {
6970
"monitor": "0 */15 * * * *",

‎docs/docs/backend/config.md‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,10 @@ An example config may look something like:
5656
"constraints": {
5757
"skipConnectionTime": true,
5858
"skipIdentity": false,
59-
"skipClientUpgrade": false,
6059
"skipUnclaimed": false,
61-
"forceClientVersion": "v0.9.30",
60+
"clientUpgrade": {
61+
"skip": false
62+
},
6263
"minSelfStake": 10000000000000,
6364
"commission": 150000000,
6465
"unclaimedEraThreshold": 4
@@ -69,9 +70,9 @@ The `constraints` section defines validity constraint parameters for validators,
6970

7071
- `skipConnectionTime`: Boolean. Skips checking the 7 day required connection time if set to true. __optional__, defaults to `false`.
7172
- `skipIdentity`: Boolean. Skips the check for a verified identity. __optional__, defaults to `false`.
72-
- `skipClientUpgrade`: Boolean. Skips client version upgrade check. __optional__, defaults to `false`.
7373
- `skipUnclaimed`: Boolean. Skips the check for unclaimed rewards. __optional__, defaults to `false`.
74-
- `forceClientVersion`: String. Specific client version to be enforced. __optional__, if this is set, it will allow versions higher than what is specified.
74+
- `clientUpgrade.skip`: Boolean. Skips client version upgrade check. __optional__, defaults to `false`.
75+
- `clientUpgrade.forceVersion`: String. Specific client version to be enforced. __optional__, if this is set, it will allow versions >= than what is specified.
7576
- `minSelfStake`: Integer. Minimum self-stake required. **required**. This number needs to be specified in `Plancks` (1 DOT = 10^10 Plancks, 1 KSM = 10^12 Plancks).
7677
- `commission`: Integer. Max commission rate. **required**. This number needs to be specified in chain units that have 6 decimal places - for example `150000000` corresponds to 15% commission.
7778
- `unclaimedEraThreshold`: Integer. Threshold for unclaimed eras. **required**. A validator having pending rewards for past eras longer than this threshold will be deemed invalid. This gets skipped if `skipUnclaimed` is set to `true`. This number is speciefied as number of eras, so `4` for example means validators are invalid if they have pending rewards older than 4 eras ago.
@@ -459,9 +460,10 @@ An example `core` config run as microservices may look something like:
459460
"constraints": {
460461
"skipConnectionTime": true,
461462
"skipIdentity": false,
462-
"skipClientUpgrade": false,
463463
"skipUnclaimed": false,
464-
"forceClientVersion": "v0.9.30",
464+
"clientUpgrade": {
465+
"skip": false
466+
},
465467
"minSelfStake": 10000000000000,
466468
"commission": 150000000,
467469
"unclaimedEraThreshold": 4

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,10 @@ config: |
3333
"skipConnectionTime": false,
3434
"skipIdentity": false,
3535
"skipStakedDestination": true,
36-
"skipClientUpgrade": false,
3736
"skipUnclaimed": false,
38-
"forceClientVersion": "v0.9.30",
37+
"clientUpgrade": {
38+
"skip": false
39+
},
3940
"minSelfStake": 10000000000000000000,
4041
"commission": 150000000,
4142
"unclaimedEraThreshold": 4

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ config: |
2424
"skipConnectionTime": false,
2525
"skipIdentity": false,
2626
"skipStakedDestination": true,
27-
"skipClientUpgrade": false,
2827
"skipUnclaimed": false,
29-
"forceClientVersion": "v0.9.30",
28+
"clientUpgrade": {
29+
"skip": false
30+
},
3031
"minSelfStake": 10000000000000000000,
3132
"commission": 150000000,
3233
"unclaimedEraThreshold": 4

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,10 @@ config: |
3232
"skipConnectionTime": false,
3333
"skipIdentity": false,
3434
"skipStakedDestination": false,
35-
"skipClientUpgrade": false,
3635
"skipUnclaimed": false,
37-
"forceClientVersion": "v0.9.30",
36+
"clientUpgrade": {
37+
"skip": false
38+
},
3839
"minSelfStake": 50000000000000,
3940
"commission": 50000000,
4041
"unclaimedEraThreshold": 1

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,10 @@ config: |
2424
"skipConnectionTime": false,
2525
"skipIdentity": false,
2626
"skipStakedDestination": false,
27-
"skipClientUpgrade": false,
2827
"skipUnclaimed": false,
29-
"forceClientVersion": "v0.9.30",
28+
"clientUpgrade": {
29+
"skip": false
30+
},
3031
"minSelfStake": 50000000000000,
3132
"commission": 50000000,
3233
"unclaimedEraThreshold": 1

‎packages/common/src/config.ts‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,13 @@ export type ConfigSchema = {
2424
constraints: {
2525
skipConnectionTime: boolean;
2626
skipIdentity: boolean;
27-
skipClientUpgrade: boolean;
2827
skipUnclaimed: boolean;
2928
skipClaiming: boolean;
30-
forceClientVersion: string;
29+
clientUpgrade: {
30+
skip: boolean;
31+
releaseTagFormat?: string;
32+
forcedVersion?: string;
33+
};
3134
minSelfStake: number;
3235
commission: number;
3336
unclaimedEraThreshold: number;

0 commit comments

Comments
 (0)