@substrate/api-sidecar 17.5.1 → 18.0.0

package/build/package.json

@@ -1,5 +1,5 @@
 {
-    "version": "17.5.1",
+    "version": "18.0.0",
     "name": "@substrate/api-sidecar",
     "description": "REST service that makes it easy to interact with blockchain nodes built using Substrate's FRAME framework.",
     "homepage": "https://github.com/paritytech/substrate-api-sidecar#readme",
@@ -50,29 +50,29 @@
         "test:test-release": "yarn build:scripts && node scripts/build/runYarnPack.js"
     },
     "dependencies": {
-        "@polkadot/api": "^10.11.2",
-        "@polkadot/api-contract": "^10.11.2",
+        "@polkadot/api": "^10.12.4",
+        "@polkadot/api-contract": "^10.12.4",
         "@polkadot/util-crypto": "^12.6.2",
         "@substrate/calc": "^0.3.1",
         "argparse": "^2.0.1",
         "confmgr": "^1.0.10",
-        "express": "^4.18.1",
+        "express": "^4.18.3",
         "express-winston": "^4.2.0",
         "http-errors": "^2.0.0",
-        "lru-cache": "^7.13.1",
-        "prom-client": "^14.2.0",
-        "rxjs": "^7.5.6",
-        "winston": "^3.8.1"
+        "lru-cache": "^10.2.0",
+        "prom-client": "^15.1.0",
+        "rxjs": "^7.8.1",
+        "winston": "^3.12.0"
     },
     "devDependencies": {
         "@substrate/dev": "^0.7.1",
-        "@types/argparse": "2.0.10",
-        "@types/express": "^4.17.17",
-        "@types/express-serve-static-core": "^4.17.36",
-        "@types/http-errors": "1.8.2",
+        "@types/argparse": "2.0.15",
+        "@types/express": "^4.17.21",
+        "@types/express-serve-static-core": "^4.17.43",
+        "@types/http-errors": "2.0.4",
         "@types/lru-cache": "^7.10.10",
-        "@types/morgan": "1.9.3",
-        "@types/triple-beam": "^1.3.2",
+        "@types/morgan": "1.9.9",
+        "@types/triple-beam": "^1.3.5",
         "ts-node-dev": "^2.0.0"
     },
     "keywords": [

package/build/src/chains-config/cache/lruCache.d.ts

@@ -1,3 +1,3 @@
-import LRU from 'lru-cache';
+import { LRUCache } from 'lru-cache';
 import { IBlock } from '../../types/responses';
-export declare const initLRUCache: () => LRU<string, IBlock>;
+export declare const initLRUCache: () => LRUCache<string, IBlock>;

package/build/src/chains-config/cache/lruCache.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2017-2022 Parity Technologies (UK) Ltd.
+// Copyright 2017-2024 Parity Technologies (UK) Ltd.
 // This file is part of Substrate API Sidecar.
 //
 // Substrate API Sidecar is free software: you can redistribute it and/or modify
@@ -14,16 +14,13 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initLRUCache = void 0;
-const lru_cache_1 = __importDefault(require("lru-cache"));
+const lru_cache_1 = require("lru-cache");
 const initLRUCache = () => {
     const config = { max: 2 };
     // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
-    const cache = new lru_cache_1.default(config);
+    const cache = new lru_cache_1.LRUCache(config);
     return cache;
 };
 exports.initLRUCache = initLRUCache;

package/build/src/chains-config/cache/lruCache.js.map

@@ -1 +1 @@
-{"version":3,"file":"lruCache.js","sourceRoot":"","sources":["../../../../src/chains-config/cache/lruCache.ts"],"names":[],"mappings":";AAAA,oDAAoD;AACpD,8CAA8C;AAC9C,EAAE;AACF,gFAAgF;AAChF,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,kEAAkE;AAClE,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,oEAAoE;AACpE,wEAAwE;;;;;;AAExE,0DAA4B;AAIrB,MAAM,YAAY,GAAG,GAAwB,EAAE;IACrD,MAAM,MAAM,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;IAC1B,4EAA4E;IAC5E,MAAM,KAAK,GAAG,IAAI,mBAAG,CAAC,MAAM,CAAwB,CAAC;IAErD,OAAO,KAAK,CAAC;AACd,CAAC,CAAC;AANW,QAAA,YAAY,gBAMvB"}
+{"version":3,"file":"lruCache.js","sourceRoot":"","sources":["../../../../src/chains-config/cache/lruCache.ts"],"names":[],"mappings":";AAAA,oDAAoD;AACpD,8CAA8C;AAC9C,EAAE;AACF,gFAAgF;AAChF,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,kEAAkE;AAClE,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,oEAAoE;AACpE,wEAAwE;;;AAExE,yCAAqC;AAI9B,MAAM,YAAY,GAAG,GAA6B,EAAE;IAC1D,MAAM,MAAM,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;IAC1B,4EAA4E;IAC5E,MAAM,KAAK,GAAG,IAAI,oBAAQ,CAAC,MAAM,CAA6B,CAAC;IAE/D,OAAO,KAAK,CAAC;AACd,CAAC,CAAC;AANW,QAAA,YAAY,gBAMvB"}

package/build/src/controllers/accounts/AccountsStakingPayoutsController.js

@@ -1,5 +1,5 @@
 "use strict";
-// Copyright 2017-2022 Parity Technologies (UK) Ltd.
+// Copyright 2017-2024 Parity Technologies (UK) Ltd.
 // This file is part of Substrate API Sidecar.
 //
 // Substrate API Sidecar is free software: you can redistribute it and/or modify
@@ -23,6 +23,7 @@ const bn_js_1 = __importDefault(require("bn.js"));
 const http_errors_1 = require("http-errors");
 const middleware_1 = require("../../middleware");
 const services_1 = require("../../services");
+const kusamaEarlyErasBlockInfo_json_1 = __importDefault(require("../../services/accounts/kusamaEarlyErasBlockInfo.json"));
 const AbstractController_1 = __importDefault(require("../AbstractController"));
 /**
  * GET payout information for a stash account.
@@ -85,11 +86,29 @@ class AccountsStakingPayoutsController extends AbstractController_1.default {
          * @param res Express Response
          */
         this.getStakingPayoutsByAccountId = async ({ params: { address }, query: { depth, era, unclaimedOnly, at } }, res) => {
-            const hash = await this.getHashFromAt(at);
-            const apiAt = await this.api.at(hash);
+            const earlyErasBlockInfo = kusamaEarlyErasBlockInfo_json_1.default;
+            let hash = await this.getHashFromAt(at);
+            let apiAt = await this.api.at(hash);
+            const runtimeInfo = await this.api.rpc.state.getRuntimeVersion(hash);
+            const isKusama = runtimeInfo.specName.toString().toLowerCase() === 'kusama';
             const { eraArg, currentEra } = await this.getEraAndHash(apiAt, this.verifyAndCastOr('era', era, undefined));
+            if (currentEra <= 519 && depth !== undefined && isKusama) {
+                throw new http_errors_1.InternalServerError('The `depth` query parameter is disabled for eras less than 518.');
+            }
+            else if (currentEra <= 519 && era !== undefined && isKusama) {
+                throw new http_errors_1.InternalServerError('The `era` query parameter is disabled for eras less than 518.');
+            }
+            let sanitizedDepth;
+            if (depth && isKusama) {
+                sanitizedDepth = Math.min(Number(depth), currentEra - 518).toString();
+            }
+            if (currentEra < 518 && isKusama) {
+                const eraStartBlock = earlyErasBlockInfo[currentEra].start;
+                hash = await this.getHashFromAt(eraStartBlock.toString());
+                apiAt = await this.api.at(hash);
+            }
             const unclaimedOnlyArg = unclaimedOnly === 'false' ? false : true;
-            AccountsStakingPayoutsController.sanitizedSend(res, await this.service.fetchAccountStakingPayout(hash, address, this.verifyAndCastOr('depth', depth, 1), eraArg, unclaimedOnlyArg, currentEra, apiAt));
+            AccountsStakingPayoutsController.sanitizedSend(res, await this.service.fetchAccountStakingPayout(hash, address, this.verifyAndCastOr('depth', sanitizedDepth, 1), eraArg, unclaimedOnlyArg, currentEra, apiAt));
         };
         this.initRoutes();
     }
@@ -98,15 +117,8 @@ class AccountsStakingPayoutsController extends AbstractController_1.default {
         this.safeMountAsyncGetHandlers([['', this.getStakingPayoutsByAccountId]]);
     }
     async getEraAndHash(apiAt, era) {
-        const [activeEraOption, currentEraMaybeOption] = await Promise.all([
-            apiAt.query.staking.activeEra(),
-            apiAt.query.staking.currentEra(),
-        ]);
-        if (activeEraOption.isNone) {
-            throw new http_errors_1.InternalServerError('ActiveEra is None when Some was expected');
-        }
-        const activeEra = activeEraOption.unwrap().index.toNumber();
         let currentEra;
+        const currentEraMaybeOption = (await apiAt.query.staking.currentEra());
         if (currentEraMaybeOption instanceof types_1.Option) {
             if (currentEraMaybeOption.isNone) {
                 throw new http_errors_1.InternalServerError('CurrentEra is None when Some was expected');
@@ -120,6 +132,36 @@ class AccountsStakingPayoutsController extends AbstractController_1.default {
         else {
             throw new http_errors_1.InternalServerError('Query for current_era returned a non-processable result.');
         }
+        let activeEra;
+        if (apiAt.query.staking.activeEra) {
+            const activeEraOption = await apiAt.query.staking.activeEra();
+            if (activeEraOption.isNone) {
+                const historicActiveEra = await apiAt.query.staking.currentEra();
+                if (historicActiveEra.isNone) {
+                    throw new http_errors_1.InternalServerError('ActiveEra is None when Some was expected');
+                }
+                else {
+                    activeEra = historicActiveEra.unwrap().toNumber();
+                }
+            }
+            else {
+                activeEra = activeEraOption.unwrap().index.toNumber();
+            }
+        }
+        else {
+            const sessionIndex = await apiAt.query.session.currentIndex();
+            const idx = sessionIndex.toNumber() % 6;
+            // https://substrate.stackexchange.com/a/2026/1786
+            if (currentEra < 518) {
+                activeEra = currentEra;
+            }
+            else if (idx > 0) {
+                activeEra = currentEra;
+            }
+            else {
+                activeEra = currentEra - 1;
+            }
+        }
         if (era !== undefined && era > activeEra - 1) {
             throw new http_errors_1.BadRequest(`The specified era (${era}) is too large. ` + `Largest era payout info is available for is ${activeEra - 1}`);
         }

package/build/src/controllers/accounts/AccountsStakingPayoutsController.js.map

@@ -1 +1 @@
-{"version":3,"file":"AccountsStakingPayoutsController.js","sourceRoot":"","sources":["../../../../src/controllers/accounts/AccountsStakingPayoutsController.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AccountsStakingPayoutsController.js","sourceRoot":"","sources":["../../../../src/controllers/accounts/AccountsStakingPayoutsController.ts"],"names":[],"mappings":"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"}

package/build/src/services/accounts/AccountsStakingPayoutsService.d.ts

@@ -1,7 +1,7 @@
 import type { ApiDecoration } from '@polkadot/api/types';
 import type { DeriveEraExposure, DeriveEraExposureNominating } from '@polkadot/api-derive/staking/types';
-import type { Option } from '@polkadot/types';
-import type { BalanceOf, BlockHash, EraIndex, Perbill } from '@polkadot/types/interfaces';
+import { Option } from '@polkadot/types';
+import type { BalanceOf, BlockHash, EraIndex, EraPoints, Perbill } from '@polkadot/types/interfaces';
 import type { PalletStakingEraRewardPoints, PalletStakingStakingLedger } from '@polkadot/types/lookup';
 import type { IAccountStakingPayouts, IEraPayouts } from '../../types/responses';
 import { AbstractService } from '../AbstractService';
@@ -9,7 +9,20 @@ import { AbstractService } from '../AbstractService';
  * General information about an era, in tuple form because we initially get it
  * by destructuring a Promise.all(...)
  */
-type IErasGeneral = [DeriveEraExposure, PalletStakingEraRewardPoints, Option<BalanceOf>];
+type IErasGeneral = [IAdjustedDeriveEraExposure, PalletStakingEraRewardPoints | EraPoints, Option<BalanceOf>];
+/**
+ * Index of the validator for eras previous to 518 in Kusama chain.
+ */
+interface ValidatorIndex {
+    [x: string]: number;
+}
+/**
+ * Adapted AdjustedDeriveEraExposure interface for compatibility with eras
+ * previous to 518 in Kusama chain.
+ */
+interface IAdjustedDeriveEraExposure extends DeriveEraExposure {
+    validatorIndex?: ValidatorIndex;
+}
 /**
  * Commission and staking ledger of a validator
  */
@@ -21,14 +34,28 @@ interface ICommissionAndLedger {
  * All the data we need to calculate payouts for an address at a given era.
  */
 interface IEraData {
-    deriveEraExposure: DeriveEraExposure;
-    eraRewardPoints: PalletStakingEraRewardPoints;
+    deriveEraExposure: IAdjustedDeriveEraExposure;
+    eraRewardPoints: PalletStakingEraRewardPoints | EraPoints;
     erasValidatorRewardOption: Option<BalanceOf>;
     exposuresWithCommission?: (ICommissionAndLedger & {
         validatorId: string;
     })[];
     eraIndex: EraIndex;
 }
+/**
+ * Block information relevant for compatibility with eras previous
+ * to 518 in Kusama chain.
+ */
+interface IBlockInfo {
+    height: string;
+    hash: BlockHash;
+}
+export interface IEarlyErasBlockInfo {
+    [era: string]: {
+        start: number;
+        end: number;
+    };
+}
 export declare class AccountsStakingPayoutsService extends AbstractService {
     /**
      * Fetch and derive payouts for `address`.
@@ -45,22 +72,22 @@ export declare class AccountsStakingPayoutsService extends AbstractService {
     /**
      * Fetch general info about eras in the inclusive range `startEra` .. `era`.
      *
-     * @param api `ApiPromise`
-     * @param hash `BlockHash` to make call at
+     * @param historicApi Historic api for querying past blocks
      * @param startEra first era to get data for
      * @param era the last era to get data for
+     * @param blockNumber block information to ensure compatibility with older eras
      */
-    fetchAllErasGeneral(historicApi: ApiDecoration<'promise'>, startEra: number, era: number): Promise<IErasGeneral[]>;
+    fetchAllErasGeneral(historicApi: ApiDecoration<'promise'>, startEra: number, era: number, blockNumber: IBlockInfo, isKusama: boolean): Promise<IErasGeneral[]>;
+    private fetchHistoricRewardPoints;
     /**
      * Fetch the commission & staking ledger for each `validatorId` in `deriveErasExposures`.
      *
-     * @param api `ApiPromise`
-     * @param hash `BlockHash` to make call at
+     * @param historicApi Historic api for querying past blocks
      * @param address address of the _Stash_  account to get the payouts of
      * @param startEra first era to get data for
      * @param deriveErasExposures exposures per era for `address`
      */
-    fetchAllErasCommissions(historicApi: ApiDecoration<'promise'>, address: string, startEra: number, deriveErasExposures: DeriveEraExposure[]): Promise<ICommissionAndLedger[][]>;
+    fetchAllErasCommissions(historicApi: ApiDecoration<'promise'>, address: string, startEra: number, deriveErasExposures: IAdjustedDeriveEraExposure[], isKusama: boolean): Promise<ICommissionAndLedger[][]>;
     /**
      * Derive all the payouts for `address` at `era`.
      *
@@ -68,16 +95,15 @@ export declare class AccountsStakingPayoutsService extends AbstractService {
      * @param era the era to query
      * @param eraData data about the address and era we are calculating payouts for
      */
-    deriveEraPayouts(address: string, unclaimedOnly: boolean, { deriveEraExposure, eraRewardPoints, erasValidatorRewardOption, exposuresWithCommission, eraIndex }: IEraData): IEraPayouts | {
+    deriveEraPayouts(address: string, unclaimedOnly: boolean, { deriveEraExposure, eraRewardPoints, erasValidatorRewardOption, exposuresWithCommission, eraIndex }: IEraData, isKusama: boolean): IEraPayouts | {
         message: string;
     };
     /**
      * Fetch the `commission` and `StakingLedger` of `validatorId`.
      *
-     * @param api
+     * @param historicApi Historic api for querying past blocks
      * @param validatorId accountId of a validator's _Stash_  account
      * @param era the era to query
-     * @param hash `BlockHash` to make call at
      * @param validatorLedgerCache object mapping validatorId => StakingLedger to limit redundant queries
      */
     private fetchCommissionAndLedger;
@@ -88,8 +114,8 @@ export declare class AccountsStakingPayoutsService extends AbstractService {
      * The original version uses the base ApiDerive implementation which does not include the ApiDecoration implementation.
      * It is required in this version to query older blocks for their historic data.
      *
-     * @param historicApi
-     * @param eraIndex
+     * @param historicApi Historic api for querying past blocks
+     * @param eraIndex index of the era to query
      */
     private deriveEraExposure;
     /**
@@ -97,6 +123,8 @@ export declare class AccountsStakingPayoutsService extends AbstractService {
      *
      * @param eraRewardPoints
      * @param validatorId accountId of a validator's _Stash_  account
+     * @param validatorIndex index of the validator in relation to the `EraPoints`
+     * array
      * */
     private extractTotalValidatorRewardPoints;
     /**
@@ -105,7 +133,7 @@ export declare class AccountsStakingPayoutsService extends AbstractService {
      *
      * @param address address of the _Stash_  account to get the exposure of behind `validatorId`
      * @param validatorId accountId of a validator's _Stash_  account
-     * @param deriveEraExposure
+     * @param deriveEraExposure result of deriveEraExposure
      */
     private extractExposure;
     /**
@@ -115,6 +143,6 @@ export declare class AccountsStakingPayoutsService extends AbstractService {
      * @param address address of the _Stash_  account to get the payouts of
      * @param deriveEraExposure result of deriveEraExposure
      */
-    deriveNominatedExposures(address: string, deriveEraExposure: DeriveEraExposure): DeriveEraExposureNominating[] | undefined;
+    deriveNominatedExposures(address: string, deriveEraExposure: IAdjustedDeriveEraExposure): DeriveEraExposureNominating[] | undefined;
 }
 export {};