diff --git a/docs/docs/backend/config.md b/docs/docs/backend/config.md index bb85480b5..4bb83b116 100644 --- a/docs/docs/backend/config.md +++ b/docs/docs/backend/config.md @@ -197,9 +197,6 @@ An example config may look something like: "country": "10", "provider": "100", "nominations": "100", - "delegations": "60", - "openGov": "100", - "openGovDelegation": "100", "rpc": "100", "client": "100", "useInclusion": true, @@ -215,9 +212,6 @@ An example config may look something like: "useCountry": true, "useProvider": true, "useNominations": true, - "useDelegations": true, - "useOpenGov": true, - "useOpenGovDelegation": true, "useRpc": true, "useClient": true }, @@ -494,12 +488,7 @@ An example `core` config run as microservices may look something like: "region": "10", "country": "10", "provider": "100", - "council": "50", - "democracy": "100", - "nominations": "100", - "delegations": "60", - "openGov": "100", - "openGovDelegation": "100" + "nominations": "100" }, "scorekeeper": { "forceRound": false, @@ -614,9 +603,6 @@ An example Worker config run as microservices may look something like: "country": "10", "provider": "100", "nominations": "100", - "delegations": "60", - "openGov": "100", - "openGovDelegation": "100", "rpc": "100", "client": "100", "useInclusion": true, @@ -632,9 +618,6 @@ An example Worker config run as microservices may look something like: "useCountry": true, "useProvider": true, "useNominations": true, - "useDelegations": true, - "useOpenGov": true, - "useOpenGovDelegation": true, "useRpc": true, "useClient": true }, diff --git a/helmfile.d/config/kusama/otv-backend-ci.yaml.gotmpl b/helmfile.d/config/kusama/otv-backend-ci.yaml.gotmpl index 854cb5326..ac36db046 100644 --- a/helmfile.d/config/kusama/otv-backend-ci.yaml.gotmpl +++ b/helmfile.d/config/kusama/otv-backend-ci.yaml.gotmpl @@ -71,10 +71,7 @@ config: | "region": "10", "country": "10", "provider": "50", - "council": "50", - "democracy": "100", - "nominations": "100", - "delegations": "60" + "nominations": "100" }, "scorekeeper": { "forceRound": false, diff --git a/helmfile.d/config/kusama/otv-backend-local.yaml.gotmpl b/helmfile.d/config/kusama/otv-backend-local.yaml.gotmpl index cc9e6fa1e..7b0bb7287 100644 --- a/helmfile.d/config/kusama/otv-backend-local.yaml.gotmpl +++ b/helmfile.d/config/kusama/otv-backend-local.yaml.gotmpl @@ -62,10 +62,7 @@ config: | "region": "10", "country": "10", "provider": "50", - "council": "50", - "democracy": "100", - "nominations": "100", - "delegations": "60" + "nominations": "100" }, "scorekeeper": { "candidates": [ diff --git a/helmfile.d/config/polkadot/otv-backend-ci.yaml.gotmpl b/helmfile.d/config/polkadot/otv-backend-ci.yaml.gotmpl index 27bb1ff75..0f272ee37 100644 --- a/helmfile.d/config/polkadot/otv-backend-ci.yaml.gotmpl +++ b/helmfile.d/config/polkadot/otv-backend-ci.yaml.gotmpl @@ -69,10 +69,7 @@ config: | "region": "10", "country": "10", "provider": "50", - "council": "50", - "democracy": "100", - "nominations": "100", - "delegations": "60" + "nominations": "100" }, "scorekeeper": { "forceRound": true, diff --git a/helmfile.d/config/polkadot/otv-backend-local.yaml.gotmpl b/helmfile.d/config/polkadot/otv-backend-local.yaml.gotmpl index f16e1f0c2..d8a98deaa 100644 --- a/helmfile.d/config/polkadot/otv-backend-local.yaml.gotmpl +++ b/helmfile.d/config/polkadot/otv-backend-local.yaml.gotmpl @@ -61,10 +61,7 @@ config: | "region": "10", "country": "10", "provider": "50", - "council": "50", - "democracy": "100", - "nominations": "100", - "delegations": "60" + "nominations": "100" }, "scorekeeper": { "candidates": [ diff --git a/packages/common/src/config.ts b/packages/common/src/config.ts index 015a700e4..1e9a98f80 100644 --- a/packages/common/src/config.ts +++ b/packages/common/src/config.ts @@ -120,9 +120,6 @@ export type ConfigSchema = { country: number | 0; provider: number | 0; nominations: number | 0; - delegations: number | 0; - openGov: number | 0; - openGovDelegation: number | 0; rpc: number | 0; client: number | 0; useInclusion: boolean; @@ -139,9 +136,6 @@ export type ConfigSchema = { useCountry: boolean; useProvider: boolean; useNominations: boolean; - useDelegations: boolean; - useOpenGov: boolean; - useOpenGovDelegation: boolean; useRpc: boolean; useClient: boolean; }; diff --git a/packages/common/src/db/models.ts b/packages/common/src/db/models.ts index dcd03ea5c..4875de2f2 100644 --- a/packages/common/src/db/models.ts +++ b/packages/common/src/db/models.ts @@ -583,19 +583,9 @@ export interface ValidatorScoreMetadata { countryWeight: number; providerStats: LStats; providerWeight: number; - councilStakeWeight?: number; - councilStakeStats?: Stats; - democracyStats?: Stats; - democracyWeight?: number; nominatorStakeStats?: Stats; nominatorStakeWeight: number; - delegationStats?: Stats; - delegationWeight?: number; - openGovStats?: Stats; - openGovDelegationWeight?: number; - openGovDelegationStats?: Stats; faultsWeight?: number; - openGovWeight?: number; rpcWeight?: number; clientWeight?: number; updated?: number; @@ -856,32 +846,6 @@ export const ValidatorScoreMetadataSchema = new Schema({ standardDeviation: Number, }, providerWeight: Number, - councilStakeWeight: Number, - councilStakeStats: { - values: [Number], - absoluteMin: Number, - absoluteMax: Number, - q10: Number, - q25: Number, - q50: Number, - q75: Number, - q90: Number, - mean: Number, - standardDeviation: Number, - }, - democracyStats: { - values: [Number], - absoluteMin: Number, - absoluteMax: Number, - q10: Number, - q25: Number, - q50: Number, - q75: Number, - q90: Number, - mean: Number, - standardDeviation: Number, - }, - democracyWeight: Number, nominatorStakeStats: { values: [Number], absoluteMin: Number, @@ -895,45 +859,6 @@ export const ValidatorScoreMetadataSchema = new Schema({ standardDeviation: Number, }, nominatorStakeWeight: Number, - delegationStats: { - values: [Number], - absoluteMin: Number, - absoluteMax: Number, - q10: Number, - q25: Number, - q50: Number, - q75: Number, - q90: Number, - mean: Number, - standardDeviation: Number, - }, - delegationWeight: Number, - openGovStats: { - values: [Number], - absoluteMin: Number, - absoluteMax: Number, - q10: Number, - q25: Number, - q50: Number, - q75: Number, - q90: Number, - mean: Number, - standardDeviation: Number, - }, - openGovDelegationWeight: Number, - openGovDelegationStats: { - values: [Number], - absoluteMin: Number, - absoluteMax: Number, - q10: Number, - q25: Number, - q50: Number, - q75: Number, - q90: Number, - mean: Number, - standardDeviation: Number, - }, - openGovWeight: Number, // The last time one was updated updated: Number, }); diff --git a/packages/common/src/db/queries/ValidatorScoreMetadata.ts b/packages/common/src/db/queries/ValidatorScoreMetadata.ts index 5c00df5b8..de3a98693 100644 --- a/packages/common/src/db/queries/ValidatorScoreMetadata.ts +++ b/packages/common/src/db/queries/ValidatorScoreMetadata.ts @@ -34,10 +34,6 @@ export const setValidatorScoreMetadata = async ( providerWeight, nominatorStakeStats, nominatorStakeWeight, - openGovStats, - openGovWeight, - openGovDelegationStats, - openGovDelegationWeight, } = scoreMetadata; const data = await ValidatorScoreMetadataModel.findOne({ @@ -77,10 +73,6 @@ export const setValidatorScoreMetadata = async ( providerWeight, nominatorStakeStats, nominatorStakeWeight, - openGovStats, - openGovWeight, - openGovDelegationStats, - openGovDelegationWeight, updated, }); await validatorScoreMetadata.save(); @@ -122,10 +114,6 @@ export const setValidatorScoreMetadata = async ( providerWeight, nominatorStakeStats, nominatorStakeWeight, - openGovStats, - openGovWeight, - openGovDelegationStats, - openGovDelegationWeight, updated, }, ).exec(); diff --git a/packages/core/config/kusama.current.dev.sample.json b/packages/core/config/kusama.current.dev.sample.json index 93e719485..0b31db92f 100644 --- a/packages/core/config/kusama.current.dev.sample.json +++ b/packages/core/config/kusama.current.dev.sample.json @@ -45,8 +45,6 @@ "unclaimedEras": "0 0-59/1 * * * *", "validatorPref": "0 0-59/1 * * * *", "nominator": "0 0-59/1 * * * *", - "delegation": "0 0-59/1 * * * *", - "democracy": "0 0-59/1 * * * *", "monitorEnabled": true, "clearOfflineEnabled": true, "validityEnabled": true, @@ -111,9 +109,6 @@ "useCountry": true, "useProvider": true, "useNominations": true, - "useDelegations": true, - "useOpenGov": true, - "useOpenGovDelegation": true, "useRpc": true, "useClient": true }, diff --git a/packages/core/config/kusama.current.sample.json b/packages/core/config/kusama.current.sample.json index 13c66d4f7..de7891156 100644 --- a/packages/core/config/kusama.current.sample.json +++ b/packages/core/config/kusama.current.sample.json @@ -93,9 +93,6 @@ "useCountry": true, "useProvider": true, "useNominations": true, - "useDelegations": true, - "useOpenGov": true, - "useOpenGovDelegation": true, "useRpc": true, "useClient": true }, diff --git a/packages/core/config/kusama.microservice.dev.sample.json b/packages/core/config/kusama.microservice.dev.sample.json index 05bf7f1ab..d997d8f28 100644 --- a/packages/core/config/kusama.microservice.dev.sample.json +++ b/packages/core/config/kusama.microservice.dev.sample.json @@ -94,9 +94,6 @@ "useCountry": true, "useProvider": true, "useNominations": true, - "useDelegations": true, - "useOpenGov": true, - "useOpenGovDelegation": true, "useRpc": true, "useClient": true }, diff --git a/packages/core/config/main.sample.json b/packages/core/config/main.sample.json index 99ffad052..95fd6c457 100644 --- a/packages/core/config/main.sample.json +++ b/packages/core/config/main.sample.json @@ -82,10 +82,7 @@ "region": "10", "country": "10", "provider": "50", - "council": "50", - "democracy": "100", - "nominations": "100", - "delegations": "60" + "nominations": "100" }, "scorekeeper": { "candidates": [ diff --git a/packages/core/config/polkadot.current.dev.sample.json b/packages/core/config/polkadot.current.dev.sample.json index 5ae6c494a..592c5c2e0 100644 --- a/packages/core/config/polkadot.current.dev.sample.json +++ b/packages/core/config/polkadot.current.dev.sample.json @@ -92,9 +92,6 @@ "useCountry": true, "useProvider": true, "useNominations": true, - "useDelegations": true, - "useOpenGov": true, - "useOpenGovDelegation": true, "useRpc": true, "useClient": true }, diff --git a/packages/core/config/polkadot.current.sample.json b/packages/core/config/polkadot.current.sample.json index 3912aac70..914fa57ef 100644 --- a/packages/core/config/polkadot.current.sample.json +++ b/packages/core/config/polkadot.current.sample.json @@ -90,9 +90,6 @@ "useCountry": true, "useProvider": true, "useNominations": true, - "useDelegations": true, - "useOpenGov": true, - "useOpenGovDelegation": true, "useRpc": true, "useClient": true }, diff --git a/packages/core/config/polkadot.microservice.dev.sample.json b/packages/core/config/polkadot.microservice.dev.sample.json index 9c542ccea..18eddd76c 100644 --- a/packages/core/config/polkadot.microservice.dev.sample.json +++ b/packages/core/config/polkadot.microservice.dev.sample.json @@ -71,9 +71,6 @@ "useCountry": true, "useProvider": true, "useNominations": true, - "useDelegations": true, - "useOpenGov": true, - "useOpenGovDelegation": true, "useRpc": true, "useClient": true }, diff --git a/packages/core/config/polkadot.microservice.sample.json b/packages/core/config/polkadot.microservice.sample.json index 603658eb7..bb4de7b92 100644 --- a/packages/core/config/polkadot.microservice.sample.json +++ b/packages/core/config/polkadot.microservice.sample.json @@ -71,9 +71,6 @@ "useCountry": true, "useProvider": true, "useNominations": true, - "useDelegations": true, - "useOpenGov": true, - "useOpenGovDelegation": true, "useRpc": true, "useClient": true }, diff --git a/packages/worker/config/kusama.sample.json b/packages/worker/config/kusama.sample.json index f48623a57..ae942c61b 100644 --- a/packages/worker/config/kusama.sample.json +++ b/packages/worker/config/kusama.sample.json @@ -29,9 +29,6 @@ "country": "10", "provider": "100", "nominations": "100", - "delegations": "60", - "openGov": "100", - "openGovDelegation": "100", "rpc": "100", "client": "100", "useInclusion": true, @@ -47,9 +44,6 @@ "useCountry": true, "useProvider": true, "useNominations": true, - "useDelegations": true, - "useOpenGov": true, - "useOpenGovDelegation": true, "useRpc": true, "useClient": true }, diff --git a/packages/worker/config/polkadot.sample.json b/packages/worker/config/polkadot.sample.json index 862534925..8ab392bc5 100644 --- a/packages/worker/config/polkadot.sample.json +++ b/packages/worker/config/polkadot.sample.json @@ -27,9 +27,6 @@ "country": "10", "provider": "100", "nominations": "100", - "delegations": "60", - "openGov": "100", - "openGovDelegation": "100", "rpc": "100", "client": "100", "useInclusion": true, @@ -45,9 +42,6 @@ "useCountry": true, "useProvider": true, "useNominations": true, - "useDelegations": true, - "useOpenGov": true, - "useOpenGovDelegation": true, "useRpc": true, "useClient": true },