diff --git a/docker-compose.yml b/docker-compose.yml index 46c4867..a18657a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,7 +18,7 @@ services: retries: 5 subquery-node-avail: - image: onfinality/subql-node:v2.2.1 + image: onfinality/subql-node:v5.2.2 depends_on: "postgres": condition: service_healthy @@ -45,7 +45,7 @@ services: retries: 10 subquery-node-vara: - image: onfinality/subql-node:v2.2.1 + image: onfinality/subql-node:v5.2.2 depends_on: "postgres": condition: service_healthy @@ -72,7 +72,7 @@ services: retries: 10 subquery-node-dock: - image: onfinality/subql-node:v2.2.1 + image: onfinality/subql-node:v5.2.2 depends_on: "postgres": condition: service_healthy @@ -91,7 +91,7 @@ services: - --db-schema=app - --disable-historical - --query-limit=1000000 - - --batch-size=30 + - --batch-size=10 healthcheck: test: [ "CMD", "curl", "-f", "http://subquery-node-dock:3000/ready" ] interval: 3s @@ -99,7 +99,7 @@ services: retries: 10 subquery-node-joystream: - image: onfinality/subql-node:v2.2.1 + image: onfinality/subql-node:v5.2.2 depends_on: "postgres": condition: service_healthy @@ -118,7 +118,7 @@ services: - --db-schema=app - --disable-historical - --query-limit=1000000 - - --batch-size=30 + - --batch-size=10 healthcheck: test: [ "CMD", "curl", "-f", "http://subquery-node-joystream:3000/ready" ] interval: 3s @@ -126,7 +126,7 @@ services: retries: 10 subquery-node-polimec: - image: onfinality/subql-node:v2.2.1 + image: onfinality/subql-node:v5.2.2 depends_on: "postgres": condition: service_healthy @@ -145,7 +145,7 @@ services: - --db-schema=app - --disable-historical - --query-limit=1000000 - - --batch-size=30 + - --batch-size=10 healthcheck: test: [ "CMD", "curl", "-f", "http://subquery-node-polimec:3000/ready" ] interval: 3s @@ -153,7 +153,7 @@ services: retries: 10 subquery-node-polkadot: - image: onfinality/subql-node:v2.2.1 + image: onfinality/subql-node:v5.2.2 depends_on: "postgres": condition: service_healthy @@ -172,7 +172,7 @@ services: - --db-schema=app - --disable-historical - --query-limit=1000000 - - --batch-size=30 + - --batch-size=10 healthcheck: test: ["CMD", "curl", "-f", "http://subquery-node-polkadot:3000/ready"] interval: 3s @@ -180,7 +180,7 @@ services: retries: 10 subquery-node-kusama: - image: onfinality/subql-node:v2.2.1 + image: onfinality/subql-node:v5.2.2 depends_on: "postgres": condition: service_healthy @@ -199,7 +199,7 @@ services: - --db-schema=app - --disable-historical - --query-limit=1000000 - - --batch-size=30 + - --batch-size=10 healthcheck: test: [ "CMD", "curl", "-f", "http://subquery-node-kusama:3000/ready" ] interval: 3s @@ -207,7 +207,7 @@ services: retries: 10 subquery-node-manta: - image: onfinality/subql-node:v2.2.1 + image: onfinality/subql-node:v5.2.2 depends_on: "postgres": condition: service_healthy @@ -226,7 +226,7 @@ services: - --db-schema=app - --disable-historical - --query-limit=1000000 - - --batch-size=30 + - --batch-size=10 healthcheck: test: [ "CMD", "curl", "-f", "http://subquery-node-manta:3000/ready" ] interval: 3s @@ -234,7 +234,7 @@ services: retries: 10 subquery-node-moonbeam: - image: onfinality/subql-node:v2.2.1 + image: onfinality/subql-node:v5.2.2 depends_on: "postgres": condition: service_healthy @@ -253,7 +253,7 @@ services: - --db-schema=app - --disable-historical - --query-limit=1000000 - - --batch-size=30 + - --batch-size=10 healthcheck: test: [ "CMD", "curl", "-f", "http://subquery-node-moonbeam:3000/ready" ] interval: 3s @@ -261,7 +261,7 @@ services: retries: 10 subquery-node-moonriver: - image: onfinality/subql-node:v2.2.1 + image: onfinality/subql-node:v5.2.2 depends_on: "postgres": condition: service_healthy @@ -280,7 +280,7 @@ services: - --db-schema=app - --disable-historical - --query-limit=1000000 - - --batch-size=30 + - --batch-size=10 healthcheck: test: [ "CMD", "curl", "-f", "http://subquery-node-moonriver:3000/ready" ] interval: 3s @@ -288,7 +288,7 @@ services: retries: 10 subquery-node-aleph-zero: - image: onfinality/subql-node:v2.2.1 + image: onfinality/subql-node:v5.2.2 depends_on: "postgres": condition: service_healthy @@ -307,7 +307,7 @@ services: - --db-schema=app - --disable-historical - --query-limit=1000000 - - --batch-size=30 + - --batch-size=10 healthcheck: test: [ "CMD", "curl", "-f", "http://subquery-node-aleph-zero:3000/ready" ] interval: 3s @@ -315,7 +315,7 @@ services: retries: 10 subquery-node-zeitgeist: - image: onfinality/subql-node:v2.2.1 + image: onfinality/subql-node:v5.2.2 depends_on: "postgres": condition: service_healthy @@ -334,7 +334,7 @@ services: - --db-schema=app - --disable-historical - --query-limit=1000000 - - --batch-size=30 + - --batch-size=10 healthcheck: test: [ "CMD", "curl", "-f", "http://subquery-node-zeitgeist:3000/ready" ] interval: 3s @@ -342,7 +342,7 @@ services: retries: 10 subquery-node-westend: - image: onfinality/subql-node:v2.2.1 + image: onfinality/subql-node:v5.2.2 depends_on: "postgres": condition: service_healthy @@ -361,7 +361,7 @@ services: - --db-schema=app - --disable-historical - --query-limit=1000000 - - --batch-size=30 + - --batch-size=10 healthcheck: test: [ "CMD", "curl", "-f", "http://subquery-node-westend:3000/ready" ] interval: 3s @@ -369,7 +369,7 @@ services: retries: 10 subquery-node-turing: - image: onfinality/subql-node:v2.2.1 + image: onfinality/subql-node:v5.2.2 depends_on: "postgres": condition: service_healthy @@ -388,7 +388,7 @@ services: - --db-schema=app - --disable-historical - --query-limit=1000000 - - --batch-size=30 + - --batch-size=10 healthcheck: test: [ "CMD", "curl", "-f", "http://subquery-node-turing:3000/ready" ] interval: 3s @@ -396,7 +396,7 @@ services: retries: 10 subquery-node-ternoa: - image: onfinality/subql-node:v2.2.1 + image: onfinality/subql-node:v5.2.2 depends_on: "postgres": condition: service_healthy @@ -415,7 +415,7 @@ services: - --db-schema=app - --disable-historical - --query-limit=1000000 - - --batch-size=30 + - --batch-size=10 healthcheck: test: [ "CMD", "curl", "-f", "http://subquery-node-ternoa:3000/ready" ] interval: 3s @@ -423,7 +423,7 @@ services: retries: 10 subquery-node-polkadex: - image: onfinality/subql-node:v2.2.1 + image: onfinality/subql-node:v5.2.2 depends_on: "postgres": condition: service_healthy @@ -442,7 +442,7 @@ services: - --db-schema=app - --disable-historical - --query-limit=1000000 - - --batch-size=30 + - --batch-size=10 healthcheck: test: [ "CMD", "curl", "-f", "http://subquery-node-ternoa:3000/ready" ] interval: 3s @@ -450,7 +450,7 @@ services: retries: 10 subquery-node-calamari: - image: onfinality/subql-node:v2.2.1 + image: onfinality/subql-node:v5.2.2 depends_on: "postgres": condition: service_healthy @@ -469,7 +469,7 @@ services: - --db-schema=app - --disable-historical - --query-limit=1000000 - - --batch-size=30 + - --batch-size=10 healthcheck: test: [ "CMD", "curl", "-f", "http://subquery-node-calamari:3000/ready" ] interval: 3s diff --git a/src/mappings/polkadot.ts b/src/mappings/polkadot.ts index d0353e2..41cfc6c 100644 --- a/src/mappings/polkadot.ts +++ b/src/mappings/polkadot.ts @@ -1,6 +1,6 @@ import {SubstrateEvent} from "@subql/types"; import {handleNewEra, handleNewSession, POOLED_STAKING_TYPE} from "./common"; -import {createRewardCurveConfig, CustomRelaychainRewardCalculator} from "./rewards/Relaychain"; +import {CustomPolkadotRewardCalculator} from "./rewards/Relaychain"; import {NominationPoolRewardCalculator} from "./rewards/NominationPoolRewardCalculator"; import {ValidatorStakingRewardCalculator} from "./rewards/ValidatorStakingRewardCalculator"; import {ValidatorEraInfoDataSource} from "./era/ValidatorEraInfoDataSource"; @@ -18,11 +18,8 @@ const POLKADOT_GENESIS = "0x91b171bb158e2d3848fa23a9f1c25182fb8e20313b2c1eb49219 const DIRECT_STAKING_TYPE = "relaychain" export async function PolkadotRewardCalculator(eraInfoDataSource: EraInfoDataSource): Promise { - const config = await createRewardCurveConfig({ - parachainReservedSupplyFraction: 0.2, - }) - - return CustomRelaychainRewardCalculator(eraInfoDataSource, config) + + return CustomPolkadotRewardCalculator(eraInfoDataSource) } export async function handlePolkadotNewEra(_: SubstrateEvent): Promise { diff --git a/src/mappings/rewards/Relaychain.ts b/src/mappings/rewards/Relaychain.ts index 5e3c010..52d0336 100644 --- a/src/mappings/rewards/Relaychain.ts +++ b/src/mappings/rewards/Relaychain.ts @@ -5,6 +5,7 @@ import {ValidatorStakingRewardCalculator} from "./ValidatorStakingRewardCalculat import {Inflation, StakedInfo} from "./inflation/Inflation"; import Big from "big.js"; import {EraInfoDataSource} from "../era/EraInfoDataSource"; +import {PolkadotStakingInflation} from "./inflation/PolkadotNewStakingInflation"; const LOWEST_PUBLIC_ID = 2000 @@ -51,6 +52,12 @@ export function CustomRelaychainRewardCalculator(eraInfoDataSource: EraInfoDataS return new DefaultValidatorStakingRewardCalculator(inflation, eraInfoDataSource) } +export function CustomPolkadotRewardCalculator(eraInfoDataSource: EraInfoDataSource): ValidatorStakingRewardCalculator { + let inflation = new PolkadotStakingInflation() + + return new DefaultValidatorStakingRewardCalculator(inflation, eraInfoDataSource) +} + export async function RelaychainRewardCalculator(eraInfoDataSource: EraInfoDataSource): Promise { return CustomRelaychainRewardCalculator(eraInfoDataSource, await createRewardCurveConfig()) } diff --git a/src/mappings/rewards/inflation/PolkadotNewStakingInflation.ts b/src/mappings/rewards/inflation/PolkadotNewStakingInflation.ts new file mode 100644 index 0000000..798f526 --- /dev/null +++ b/src/mappings/rewards/inflation/PolkadotNewStakingInflation.ts @@ -0,0 +1,12 @@ +import {Inflation, StakedInfo} from "./Inflation"; +import Big from "big.js"; + +export class PolkadotStakingInflation implements Inflation { + + async from(stakedInfo: StakedInfo): Promise { + let era_mint = Big(2_794_778_104_198_508) + let inflation = era_mint.mul(365).div(stakedInfo.totalIssuance).toNumber() + + return inflation + } +}