npm - @substrate/api-sidecar - Versions diffs - 20.12.0 → 20.13.0 - Mend

@substrate/api-sidecar 20.12.0 → 20.13.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (27) hide show

package/build/package.json CHANGED Viewed

@@ -1,5 +1,5 @@
 {
-    "version": "20.12.0",
+    "version": "20.13.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",
@@ -61,17 +61,17 @@
         "@substrate/calc": "0.3.1",
         "argparse": "^2.0.1",
         "confmgr": "^1.1.0",
-        "express": "^5.1.0",
+        "express": "^5.2.0",
         "express-winston": "^4.2.0",
         "http-errors": "^2.0.1",
-        "lru-cache": "^11.2.2",
+        "lru-cache": "^11.2.4",
         "prom-client": "^15.1.3",
         "rxjs": "^7.8.2",
-        "winston": "^3.18.3",
+        "winston": "^3.19.0",
         "winston-loki": "^6.1.3"
     },
     "devDependencies": {
-        "@acala-network/chopsticks-testing": "^1.2.4",
+        "@acala-network/chopsticks-testing": "^1.2.5",
         "@substrate/dev": "^0.9.0",
         "@types/argparse": "2.0.17",
         "@types/express": "^5.0.5",

package/build/src/controllers/accounts/AccountsVestingInfoController.d.ts CHANGED Viewed

@@ -9,7 +9,12 @@ import AbstractController from '../AbstractController';
  * Query params:
  * - (Optional)`at`: Block at which to retrieve runtime version information at. Block
  * 		identifier, as the block height or block hash. Defaults to most recent block.
- * - (Optional)`useRcBlock`: When set to 'true', uses the relay chain block specified in the 'at' parameter to determine corresponding Asset Hub block(s). Only supported for Asset Hub endpoints.
+ * - (Optional)`includeClaimable`: When set to 'true', calculates and includes vested
+ *      amounts for each vesting schedule plus the claimable amount. This may require a
+ *      relay chain connection for Asset Hub post-migration queries. Defaults to 'false'.
+ * - (Optional)`useRcBlock`: When set to 'true', uses the relay chain block specified in the
+ *      'at' parameter to determine corresponding Asset Hub block(s). Only supported for
+ *      Asset Hub endpoints.
  *
  * Returns:
  * - When using `useRcBlock` parameter: An array of response objects, one for each Asset Hub block found
@@ -18,13 +23,23 @@ import AbstractController from '../AbstractController';
  *
  * Response object structure:
  * - `at`: Block number and hash at which the call was made.
- * - `vesting`: Vesting schedule for an account.
+ * - `vesting`: Array of vesting schedules for an account.
  *   - `locked`: Number of tokens locked at start.
  *   - `perBlock`: Number of tokens that gets unlocked every block after `startingBlock`.
  *   - `startingBlock`: Starting block for unlocking(vesting).
- * - `rcBlockNumber`: The relay chain block number used for the query. Only present when `useRcBlock` parameter is used.
+ *   - `vested`: (Only when `includeClaimable=true`) Amount that has vested based on time elapsed.
+ * - `vestedBalance`: (Only when `includeClaimable=true`) Total vested across all schedules.
+ * - `vestingTotal`: (Only when `includeClaimable=true`) Total locked across all schedules.
+ * - `vestedClaimable`: (Only when `includeClaimable=true`) Actual amount that can be claimed now.
+ * - `blockNumberForCalculation`: (Only when `includeClaimable=true`) The block number used for calculations.
+ * - `blockNumberSource`: (Only when `includeClaimable=true`) Which chain's block number was used ('relay' or 'self').
+ * - `rcBlockHash`: The relay chain block hash. Only present when `useRcBlock` parameter is used.
+ * - `rcBlockNumber`: The relay chain block number. Only present when `useRcBlock` parameter is used.
  * - `ahTimestamp`: The Asset Hub block timestamp. Only present when `useRcBlock` parameter is used.
  *
+ * Note: When `includeClaimable=true` for Asset Hub post-migration queries, a relay chain
+ * connection is required since vesting schedules use relay chain block numbers.
+ *
  * Substrate Reference:
  * - Vesting Pallet: https://crates.parity.io/pallet_vesting/index.html
  * - `VestingInfo`: https://crates.parity.io/pallet_vesting/struct.VestingInfo.html

package/build/src/controllers/accounts/AccountsVestingInfoController.js CHANGED Viewed

@@ -18,6 +18,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const bn_js_1 = __importDefault(require("bn.js"));
 const middleware_1 = require("../../middleware");
 const services_1 = require("../../services");
 const AbstractController_1 = __importDefault(require("../AbstractController"));
@@ -30,7 +31,12 @@ const AbstractController_1 = __importDefault(require("../AbstractController"));
  * Query params:
  * - (Optional)`at`: Block at which to retrieve runtime version information at. Block
  * 		identifier, as the block height or block hash. Defaults to most recent block.
- * - (Optional)`useRcBlock`: When set to 'true', uses the relay chain block specified in the 'at' parameter to determine corresponding Asset Hub block(s). Only supported for Asset Hub endpoints.
+ * - (Optional)`includeClaimable`: When set to 'true', calculates and includes vested
+ *      amounts for each vesting schedule plus the claimable amount. This may require a
+ *      relay chain connection for Asset Hub post-migration queries. Defaults to 'false'.
+ * - (Optional)`useRcBlock`: When set to 'true', uses the relay chain block specified in the
+ *      'at' parameter to determine corresponding Asset Hub block(s). Only supported for
+ *      Asset Hub endpoints.
  *
  * Returns:
  * - When using `useRcBlock` parameter: An array of response objects, one for each Asset Hub block found
@@ -39,13 +45,23 @@ const AbstractController_1 = __importDefault(require("../AbstractController"));
  *
  * Response object structure:
  * - `at`: Block number and hash at which the call was made.
- * - `vesting`: Vesting schedule for an account.
+ * - `vesting`: Array of vesting schedules for an account.
  *   - `locked`: Number of tokens locked at start.
  *   - `perBlock`: Number of tokens that gets unlocked every block after `startingBlock`.
  *   - `startingBlock`: Starting block for unlocking(vesting).
- * - `rcBlockNumber`: The relay chain block number used for the query. Only present when `useRcBlock` parameter is used.
+ *   - `vested`: (Only when `includeClaimable=true`) Amount that has vested based on time elapsed.
+ * - `vestedBalance`: (Only when `includeClaimable=true`) Total vested across all schedules.
+ * - `vestingTotal`: (Only when `includeClaimable=true`) Total locked across all schedules.
+ * - `vestedClaimable`: (Only when `includeClaimable=true`) Actual amount that can be claimed now.
+ * - `blockNumberForCalculation`: (Only when `includeClaimable=true`) The block number used for calculations.
+ * - `blockNumberSource`: (Only when `includeClaimable=true`) Which chain's block number was used ('relay' or 'self').
+ * - `rcBlockHash`: The relay chain block hash. Only present when `useRcBlock` parameter is used.
+ * - `rcBlockNumber`: The relay chain block number. Only present when `useRcBlock` parameter is used.
  * - `ahTimestamp`: The Asset Hub block timestamp. Only present when `useRcBlock` parameter is used.
  *
+ * Note: When `includeClaimable=true` for Asset Hub post-migration queries, a relay chain
+ * connection is required since vesting schedules use relay chain block numbers.
+ *
  * Substrate Reference:
  * - Vesting Pallet: https://crates.parity.io/pallet_vesting/index.html
  * - `VestingInfo`: https://crates.parity.io/pallet_vesting/struct.VestingInfo.html
@@ -59,7 +75,8 @@ class AccountsVestingInfoController extends AbstractController_1.default {
          * @param req Express Request
          * @param res Express Response
          */
-        this.getAccountVestingInfo = async ({ params: { address }, query: { at, useRcBlock } }, res) => {
+        this.getAccountVestingInfo = async ({ params: { address }, query: { at, useRcBlock, includeClaimable } }, res) => {
+            const shouldIncludeClaimable = includeClaimable === 'true';
             if (useRcBlock === 'true') {
                 const rcAtResults = await this.getHashFromRcAt(at);
                 // Return empty array if no Asset Hub blocks found
@@ -70,7 +87,8 @@ class AccountsVestingInfoController extends AbstractController_1.default {
                 // Process each Asset Hub block found
                 const results = [];
                 for (const { ahHash, rcBlockHash, rcBlockNumber } of rcAtResults) {
-                    const result = await this.service.fetchAccountVestingInfo(ahHash, address);
+                    // Pass rcBlockNumber to skip relay block search when includeClaimable is used
+                    const result = await this.service.fetchAccountVestingInfo(ahHash, address, shouldIncludeClaimable, new bn_js_1.default(rcBlockNumber));
                     const apiAt = await this.api.at(ahHash);
                     const ahTimestamp = await apiAt.query.timestamp.now();
                     const enhancedResult = {
@@ -85,7 +103,7 @@ class AccountsVestingInfoController extends AbstractController_1.default {
             }
             else {
                 const hash = await this.getHashFromAt(at);
-                const result = await this.service.fetchAccountVestingInfo(hash, address);
+                const result = await this.service.fetchAccountVestingInfo(hash, address, shouldIncludeClaimable);
                 AccountsVestingInfoController.sanitizedSend(res, result);
             }
         };

package/build/src/controllers/accounts/AccountsVestingInfoController.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"AccountsVestingInfoController.js","sourceRoot":"","sources":["../../../../src/controllers/accounts/AccountsVestingInfoController.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;;;;;~~AAKxE~~,iDAAuE;AACvE,6CAA4D;AAC5D,+EAAuD;AAEvD~~;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG~~;AACH,MAAqB,6BAA8B,SAAQ,4BAA8C;IAIxG,YAAY,GAAW;QACtB,KAAK,CAAC,GAAG,EAAE,iCAAiC,EAAE,IAAI,qCAA0B,CAAC,GAAG,CAAC,CAAC,CAAC;QAUpF;;;;;WAKG;QACK,0BAAqB,GAAkC,KAAK,EACnE,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,~~EAClD~~,GAAG,EACa,EAAE;YAClB,IAAI,UAAU,KAAK,MAAM,EAAE,CAAC;gBAC3B,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;gBAEnD,kDAAkD;gBAClD,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBAC9B,6BAA6B,CAAC,aAAa,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;oBACrD,OAAO;gBACR,CAAC;gBAED,qCAAqC;gBACrC,MAAM,OAAO,GAAG,EAAE,CAAC;gBACnB,KAAK,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,IAAI,WAAW,EAAE,CAAC;oBAClE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,uBAAuB,~~CAAC~~,MAAM,~~EAAE~~,OAAO,CAAC,CAAC;~~oBAE3E~~,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;oBACxC,MAAM,WAAW,GAAG,MAAM,KAAK,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;oBAEtD,MAAM,cAAc,GAAG;wBACtB,GAAG,MAAM;wBACT,WAAW,EAAE,WAAW,CAAC,QAAQ,EAAE;wBACnC,aAAa;wBACb,WAAW,EAAE,WAAW,CAAC,QAAQ,EAAE;qBACnC,CAAC;oBAEF,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;gBAC9B,CAAC;gBAED,6BAA6B,CAAC,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAC3D,CAAC;iBAAM,CAAC;gBACP,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;gBAC1C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;~~gBACzE~~,6BAA6B,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAC1D,CAAC;QACF,CAAC,CAAC;~~QApDD~~,IAAI,CAAC,UAAU,EAAE,CAAC;IACnB,CAAC;IAES,UAAU;QACnB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,4BAAe,EAAE,+BAAkB,CAAC,CAAC;QAEhE,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IACpE,CAAC;;AAZM,4CAAc,GAAG,qBAAqB,AAAxB,CAAyB;AACvC,6CAAe,GAAG,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC,AAArC,CAAsC;kBAFxC,6BAA6B"}
1	+ {"version":3,"file":"AccountsVestingInfoController.js","sourceRoot":"","sources":["../../../../src/controllers/accounts/AccountsVestingInfoController.ts"],"names":[],"mappings":"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"}

package/build/src/controllers/rc/accounts/RcAccountsVestingInfoController.d.ts CHANGED Viewed

@@ -9,13 +9,24 @@ import AbstractController from '../../AbstractController';
  * Query params:
  * - (Optional)`at`: Block at which to retrieve vesting information at. Block
  * 		identifier, as the block height or block hash. Defaults to most recent block.
+ * - (Optional)`includeClaimable`: When set to 'true', calculates and includes vested
+ *      amounts for each vesting schedule plus the claimable amount. Defaults to 'false'.
  *
  * Returns:
  * - `at`: Block number and hash at which the call was made.
- * - `vesting`: Vesting schedule for an account.
+ * - `vesting`: Array of vesting schedules for an account.
  *   - `locked`: Number of tokens locked at start.
  *   - `perBlock`: Number of tokens that gets unlocked every block after `startingBlock`.
  *   - `startingBlock`: Starting block for unlocking(vesting).
+ *   - `vested`: (Only when `includeClaimable=true`) Amount that has vested based on time elapsed.
+ * - `vestedBalance`: (Only when `includeClaimable=true`) Total vested across all schedules.
+ * - `vestingTotal`: (Only when `includeClaimable=true`) Total locked across all schedules.
+ * - `vestedClaimable`: (Only when `includeClaimable=true`) Actual amount that can be claimed now.
+ * - `blockNumberForCalculation`: (Only when `includeClaimable=true`) The block number used for calculations.
+ * - `blockNumberSource`: (Only when `includeClaimable=true`) Which chain's block number was used ('relay' or 'self').
+ *
+ * Note: For relay chain pre-migration queries, vested amounts are calculated using the relay
+ * chain's own block number. Post-migration, vesting has moved to Asset Hub.
  *
  * Substrate Reference:
  * - Vesting Pallet: https://crates.parity.io/pallet_vesting/index.html

package/build/src/controllers/rc/accounts/RcAccountsVestingInfoController.js CHANGED Viewed

@@ -31,13 +31,24 @@ const AbstractController_1 = __importDefault(require("../../AbstractController")
  * Query params:
  * - (Optional)`at`: Block at which to retrieve vesting information at. Block
  * 		identifier, as the block height or block hash. Defaults to most recent block.
+ * - (Optional)`includeClaimable`: When set to 'true', calculates and includes vested
+ *      amounts for each vesting schedule plus the claimable amount. Defaults to 'false'.
  *
  * Returns:
  * - `at`: Block number and hash at which the call was made.
- * - `vesting`: Vesting schedule for an account.
+ * - `vesting`: Array of vesting schedules for an account.
  *   - `locked`: Number of tokens locked at start.
  *   - `perBlock`: Number of tokens that gets unlocked every block after `startingBlock`.
  *   - `startingBlock`: Starting block for unlocking(vesting).
+ *   - `vested`: (Only when `includeClaimable=true`) Amount that has vested based on time elapsed.
+ * - `vestedBalance`: (Only when `includeClaimable=true`) Total vested across all schedules.
+ * - `vestingTotal`: (Only when `includeClaimable=true`) Total locked across all schedules.
+ * - `vestedClaimable`: (Only when `includeClaimable=true`) Actual amount that can be claimed now.
+ * - `blockNumberForCalculation`: (Only when `includeClaimable=true`) The block number used for calculations.
+ * - `blockNumberSource`: (Only when `includeClaimable=true`) Which chain's block number was used ('relay' or 'self').
+ *
+ * Note: For relay chain pre-migration queries, vested amounts are calculated using the relay
+ * chain's own block number. Post-migration, vesting has moved to Asset Hub.
  *
  * Substrate Reference:
  * - Vesting Pallet: https://crates.parity.io/pallet_vesting/index.html
@@ -58,14 +69,15 @@ class RcAccountsVestingInfoController extends AbstractController_1.default {
          * @param req Express Request
          * @param res Express Response
          */
-        this.getAccountVestingInfo = async ({ params: { address }, query: { at } }, res) => {
+        this.getAccountVestingInfo = async ({ params: { address }, query: { at, includeClaimable } }, res) => {
             var _a;
             const rcApi = (_a = apiRegistry_1.ApiPromiseRegistry.getApiByType('relay')[0]) === null || _a === void 0 ? void 0 : _a.api;
             if (!rcApi) {
                 throw new Error('Relay chain API not found, please use SAS_SUBSTRATE_MULTI_CHAIN_URL env variable');
             }
+            const shouldIncludeClaimable = includeClaimable === 'true';
             const hash = await this.getHashFromAt(at, { api: rcApi });
-            const result = await this.service.fetchAccountVestingInfo(hash, address);
+            const result = await this.service.fetchAccountVestingInfo(hash, address, shouldIncludeClaimable);
             RcAccountsVestingInfoController.sanitizedSend(res, result);
         };
         this.initRoutes();

package/build/src/controllers/rc/accounts/RcAccountsVestingInfoController.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"RcAccountsVestingInfoController.js","sourceRoot":"","sources":["../../../../../src/controllers/rc/accounts/RcAccountsVestingInfoController.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;;;;;AAKxE,sDAA0D;AAC1D,oDAAsD;AACtD,gDAA+D;AAC/D,kFAA0D;AAE1D~~;;;;;;;;;;;;;;;;;;;;GAoBG~~;AACH,MAAqB,+BAAgC,SAAQ,4BAA8C;IAI1G,YAAY,IAAY;;QACvB,MAAM,aAAa,GAAG,MAAA,gCAAkB,CAAC,iBAAiB,CAAC,OAAO,CAAC,0CAAE,MAAM,EAAE,CAAC;QAC9E,MAAM,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC5E,IAAI,CAAC,UAAU,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;QAC9D,CAAC;QACD,KAAK,CAAC,UAAU,EAAE,oCAAoC,EAAE,IAAI,qCAA0B,CAAC,UAAU,CAAC,CAAC,CAAC;QAUrG;;;;;WAKG;QACK,0BAAqB,GAAkC,KAAK,EACnE,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,~~EACtC~~,GAAG,EACa,EAAE;;YAClB,MAAM,KAAK,GAAG,MAAA,gCAAkB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,0CAAE,GAAG,CAAC;YAE/D,IAAI,CAAC,KAAK,EAAE,CAAC;gBACZ,MAAM,IAAI,KAAK,CAAC,kFAAkF,CAAC,CAAC;YACrG,CAAC;YAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;YAC1D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;~~YAEzE~~,+BAA+B,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAC5D,CAAC,CAAC;~~QA7BD~~,IAAI,CAAC,UAAU,EAAE,CAAC;IACnB,CAAC;IAES,UAAU;QACnB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,4BAAe,CAAC,CAAC;QAE5C,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IACpE,CAAC;;AAjBM,8CAAc,GAAG,uBAAuB,AAA1B,CAA2B;AACzC,+CAAe,GAAG,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC,AAArC,CAAsC;kBAFxC,+BAA+B"}
1	+ {"version":3,"file":"RcAccountsVestingInfoController.js","sourceRoot":"","sources":["../../../../../src/controllers/rc/accounts/RcAccountsVestingInfoController.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;;;;;AAKxE,sDAA0D;AAC1D,oDAAsD;AACtD,gDAA+D;AAC/D,kFAA0D;AAE1D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,MAAqB,+BAAgC,SAAQ,4BAA8C;IAI1G,YAAY,IAAY;;QACvB,MAAM,aAAa,GAAG,MAAA,gCAAkB,CAAC,iBAAiB,CAAC,OAAO,CAAC,0CAAE,MAAM,EAAE,CAAC;QAC9E,MAAM,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC5E,IAAI,CAAC,UAAU,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;QAC9D,CAAC;QACD,KAAK,CAAC,UAAU,EAAE,oCAAoC,EAAE,IAAI,qCAA0B,CAAC,UAAU,CAAC,CAAC,CAAC;QAUrG;;;;;WAKG;QACK,0BAAqB,GAAkC,KAAK,EACnE,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,gBAAgB,EAAE,EAAE,EACxD,GAAG,EACa,EAAE;;YAClB,MAAM,KAAK,GAAG,MAAA,gCAAkB,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,0CAAE,GAAG,CAAC;YAE/D,IAAI,CAAC,KAAK,EAAE,CAAC;gBACZ,MAAM,IAAI,KAAK,CAAC,kFAAkF,CAAC,CAAC;YACrG,CAAC;YAED,MAAM,sBAAsB,GAAG,gBAAgB,KAAK,MAAM,CAAC;YAC3D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAC;YAC1D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAAC,IAAI,EAAE,OAAO,EAAE,sBAAsB,CAAC,CAAC;YAEjG,+BAA+B,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAC5D,CAAC,CAAC;QA9BD,IAAI,CAAC,UAAU,EAAE,CAAC;IACnB,CAAC;IAES,UAAU;QACnB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,4BAAe,CAAC,CAAC;QAE5C,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IACpE,CAAC;;AAjBM,8CAAc,GAAG,uBAAuB,AAA1B,CAA2B;AACzC,+CAAe,GAAG,CAAC,CAAC,SAAS,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC,AAArC,CAAsC;kBAFxC,+BAA+B"}

package/build/src/services/accounts/AccountsVestingInfoService.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
 import { BlockHash } from '@polkadot/types/interfaces';
+import BN from 'bn.js';
 import { IAccountVestingInfo } from 'src/types/responses';
 import { AbstractService } from '../AbstractService';
 export declare class AccountsVestingInfoService extends AbstractService {
@@ -7,6 +8,46 @@ export declare class AccountsVestingInfoService extends AbstractService {
      *
      * @param hash `BlockHash` to make call at
      * @param address address of the account to get the vesting info of
+     * @param includeVested whether to calculate and include vested amounts (default: false)
+     * @param knownRelayBlockNumber optional relay block number to use for calculations (skips search when provided)
      */
-    fetchAccountVestingInfo(hash: BlockHash, address: string): Promise<IAccountVestingInfo>;
+    fetchAccountVestingInfo(hash: BlockHash, address: string, includeVested?: boolean, knownRelayBlockNumber?: BN): Promise<IAccountVestingInfo>;
+    /**
+     * Get the vesting lock amount from balances.locks.
+     * Returns 0 if no vesting lock exists.
+     */
+    private getVestingLocked;
+    /**
+     * Calculate vested amounts for vesting schedules.
+     * Returns null if calculation cannot be performed (e.g., during migration window).
+     */
+    private calculateVestingAmounts;
+    /**
+     * Calculate vested amounts for Asset Hub chains.
+     * Post-migration: uses relay chain inclusion block number for calculations.
+     * If knownRelayBlockNumber is provided, uses it directly instead of searching.
+     */
+    private calculateForAssetHub;
+    /**
+     * Calculate vested amounts for relay chains.
+     * Pre-migration: uses the chain's own block number for calculations.
+     */
+    private calculateForRelayChain;
+    /**
+     * Perform the actual vesting calculation for vesting schedules.
+     */
+    private performCalculation;
+    /**
+     * Create a result with zero claimable for all schedules.
+     * Used during migration windows or post-migration on relay chain.
+     */
+    private createZeroClaimableResult;
+    /**
+     * Determine migration state for an Asset Hub block.
+     */
+    private getAssetHubMigrationState;
+    /**
+     * Determine migration state for a relay chain block.
+     */
+    private getRelayChainMigrationState;
 }

package/build/src/services/accounts/AccountsVestingInfoService.js CHANGED Viewed

@@ -14,18 +14,38 @@
 //
 // 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.AccountsVestingInfoService = void 0;
+const bn_js_1 = __importDefault(require("bn.js"));
 const http_errors_1 = require("http-errors");
+const apiRegistry_1 = require("../../apiRegistry");
+const chains_config_1 = require("../../chains-config");
+const getRelayParentNumber_1 = require("../../util/relay/getRelayParentNumber");
+const vestingCalculations_1 = require("../../util/vesting/vestingCalculations");
 const AbstractService_1 = require("../AbstractService");
+const consts_1 = require("../consts");
+/**
+ * Asset Hub parachain ID on relay chains
+ */
+const ASSET_HUB_PARA_ID = 1000;
+/**
+ * Vesting lock ID used in balances.locks
+ * This is "vesting " padded to 8 bytes (0x76657374696e6720)
+ */
+const VESTING_ID = '0x76657374696e6720';
 class AccountsVestingInfoService extends AbstractService_1.AbstractService {
     /**
      * Fetch vesting information for an account at a given block.
      *
      * @param hash `BlockHash` to make call at
      * @param address address of the account to get the vesting info of
+     * @param includeVested whether to calculate and include vested amounts (default: false)
+     * @param knownRelayBlockNumber optional relay block number to use for calculations (skips search when provided)
      */
-    async fetchAccountVestingInfo(hash, address) {
+    async fetchAccountVestingInfo(hash, address, includeVested = false, knownRelayBlockNumber) {
         const { api } = this;
         const historicApi = await api.at(hash);
         if (!historicApi.query.vesting) {
@@ -37,9 +57,10 @@ class AccountsVestingInfoService extends AbstractService_1.AbstractService {
         ]).catch((err) => {
             throw this.createHttpErrorForAddr(address, err);
         });
+        const blockNumber = number.unwrap().toNumber();
         const at = {
             hash,
-            height: number.unwrap().toString(10),
+            height: blockNumber.toString(10),
         };
         if (vesting.isNone) {
             return {
@@ -47,13 +68,223 @@ class AccountsVestingInfoService extends AbstractService_1.AbstractService {
                 vesting: [],
             };
         }
-        else {
-            const unwrapVesting = vesting.unwrap();
+        const unwrapVesting = vesting.unwrap();
+        const vestingArray = Array.isArray(unwrapVesting) ? unwrapVesting : [unwrapVesting];
+        // If includeVested is not requested, return raw vesting data
+        if (!includeVested) {
             return {
                 at,
-                vesting: Array.isArray(unwrapVesting) ? unwrapVesting : [unwrapVesting],
+                vesting: vestingArray,
             };
         }
+        // Get the on-chain vesting lock amount from balances.locks
+        const vestingLocked = await this.getVestingLocked(historicApi, address);
+        // Calculate vested amounts based on chain type and migration state
+        const vestingResult = await this.calculateVestingAmounts(hash, blockNumber, vestingArray, vestingLocked, knownRelayBlockNumber);
+        if (vestingResult === null) {
+            // Unable to calculate (e.g., during migration or missing relay connection)
+            // Return raw vesting data without calculations
+            return {
+                at,
+                vesting: vestingArray,
+            };
+        }
+        return {
+            at,
+            vesting: vestingResult.schedules,
+            vestedBalance: vestingResult.vestedBalance,
+            vestingTotal: vestingResult.vestingTotal,
+            vestedClaimable: vestingResult.vestedClaimable,
+            blockNumberForCalculation: vestingResult.blockNumberForCalculation,
+            blockNumberSource: vestingResult.blockNumberSource,
+        };
+    }
+    /**
+     * Get the vesting lock amount from balances.locks.
+     * Returns 0 if no vesting lock exists.
+     */
+    async getVestingLocked(historicApi, address) {
+        var _a;
+        if (!((_a = historicApi.query.balances) === null || _a === void 0 ? void 0 : _a.locks)) {
+            return new bn_js_1.default(0);
+        }
+        const locks = await historicApi.query.balances.locks(address);
+        for (const lock of locks) {
+            if (lock.id.toHex() === VESTING_ID) {
+                return new bn_js_1.default(lock.amount.toString());
+            }
+        }
+        return new bn_js_1.default(0);
+    }
+    /**
+     * Calculate vested amounts for vesting schedules.
+     * Returns null if calculation cannot be performed (e.g., during migration window).
+     */
+    async calculateVestingAmounts(hash, blockNumber, vestingArray, vestingLocked, knownRelayBlockNumber) {
+        const specName = this.specName;
+        const isAssetHub = chains_config_1.assetHubSpecNames.has(specName);
+        if (isAssetHub) {
+            return this.calculateForAssetHub(hash, blockNumber, vestingArray, vestingLocked, knownRelayBlockNumber);
+        }
+        else {
+            return this.calculateForRelayChain(blockNumber, vestingArray, vestingLocked);
+        }
+    }
+    /**
+     * Calculate vested amounts for Asset Hub chains.
+     * Post-migration: uses relay chain inclusion block number for calculations.
+     * If knownRelayBlockNumber is provided, uses it directly instead of searching.
+     */
+    async calculateForAssetHub(hash, blockNumber, vestingArray, vestingLocked, knownRelayBlockNumber) {
+        const specName = this.specName;
+        const boundaries = consts_1.MIGRATION_BOUNDARIES[specName];
+        if (!boundaries) {
+            // No migration boundaries defined for this Asset Hub - can't calculate
+            return null;
+        }
+        const migrationState = this.getAssetHubMigrationState(blockNumber, boundaries);
+        if (migrationState === 'during-migration') {
+            // During migration window, return 0 for claimable
+            return this.createZeroClaimableResult(vestingArray, vestingLocked, blockNumber.toString(), 'self');
+        }
+        if (migrationState === 'pre-migration') {
+            // Pre-migration: vesting didn't exist on Asset Hub
+            return null;
+        }
+        // Post-migration: need relay chain block number for calculations
+        // If knownRelayBlockNumber is provided (e.g., from useRcBlock), use it directly
+        if (knownRelayBlockNumber !== undefined) {
+            return this.performCalculation(vestingArray, vestingLocked, knownRelayBlockNumber, 'relay');
+        }
+        // Otherwise, search for the relay chain inclusion block number
+        const relayApis = apiRegistry_1.ApiPromiseRegistry.getApiByType('relay');
+        if (relayApis.length === 0) {
+            throw new http_errors_1.InternalServerError('Relay chain connection required for vesting calculations on Asset Hub post-migration. ' +
+                'Please configure MULTI_CHAIN_URL with a relay chain endpoint.');
+        }
+        const rcApi = relayApis[0].api;
+        const inclusionResult = await (0, getRelayParentNumber_1.getInclusionBlockNumber)(this.api, rcApi, hash, ASSET_HUB_PARA_ID);
+        if (!inclusionResult.found || inclusionResult.inclusionBlockNumber === null) {
+            // Inclusion not found within search depth
+            // Fall back to relay parent number for calculation
+            return this.performCalculation(vestingArray, vestingLocked, new bn_js_1.default(inclusionResult.relayParentNumber), 'relay');
+        }
+        return this.performCalculation(vestingArray, vestingLocked, new bn_js_1.default(inclusionResult.inclusionBlockNumber), 'relay');
+    }
+    /**
+     * Calculate vested amounts for relay chains.
+     * Pre-migration: uses the chain's own block number for calculations.
+     */
+    calculateForRelayChain(blockNumber, vestingArray, vestingLocked) {
+        const specName = this.specName;
+        const assetHubSpec = consts_1.relayToSpecMapping.get(specName);
+        if (!assetHubSpec) {
+            // Not a known relay chain with migration boundaries
+            // Use single-chain calculation
+            return this.performCalculation(vestingArray, vestingLocked, new bn_js_1.default(blockNumber), 'self');
+        }
+        const boundaries = consts_1.MIGRATION_BOUNDARIES[assetHubSpec];
+        if (!boundaries) {
+            // No boundaries defined, use single-chain calculation
+            return this.performCalculation(vestingArray, vestingLocked, new bn_js_1.default(blockNumber), 'self');
+        }
+        const migrationState = this.getRelayChainMigrationState(blockNumber, boundaries);
+        if (migrationState === 'during-migration') {
+            // During migration window, return 0 for claimable
+            return this.createZeroClaimableResult(vestingArray, vestingLocked, blockNumber.toString(), 'self');
+        }
+        if (migrationState === 'post-migration') {
+            // Post-migration: vesting no longer exists on relay chain
+            // Return 0 for claimable since vesting has migrated
+            return this.createZeroClaimableResult(vestingArray, vestingLocked, blockNumber.toString(), 'self');
+        }
+        // Pre-migration: use relay chain's own block number
+        return this.performCalculation(vestingArray, vestingLocked, new bn_js_1.default(blockNumber), 'self');
+    }
+    /**
+     * Perform the actual vesting calculation for vesting schedules.
+     */
+    performCalculation(vestingArray, vestingLocked, currentBlock, source) {
+        // Convert VestingInfo to calculation interface
+        const calcSchedules = vestingArray.map((v) => ({
+            locked: new bn_js_1.default(v.locked.toString()),
+            perBlock: new bn_js_1.default(v.perBlock.toString()),
+            startingBlock: new bn_js_1.default(v.startingBlock.toString()),
+        }));
+        // Calculate vested for each schedule
+        const schedules = vestingArray.map((v, idx) => ({
+            locked: v.locked.toString(),
+            perBlock: v.perBlock.toString(),
+            startingBlock: v.startingBlock.toString(),
+            vested: (0, vestingCalculations_1.calculateVested)(currentBlock, calcSchedules[idx]).toString(),
+        }));
+        // Calculate aggregate values
+        const vestedBalance = (0, vestingCalculations_1.calculateTotalVested)(currentBlock, calcSchedules);
+        const vestingTotal = (0, vestingCalculations_1.calculateVestingTotal)(calcSchedules);
+        const vestedClaimable = (0, vestingCalculations_1.calculateVestedClaimable)(vestingLocked, vestingTotal, vestedBalance);
+        return {
+            schedules,
+            vestedBalance: vestedBalance.toString(),
+            vestingTotal: vestingTotal.toString(),
+            vestedClaimable: vestedClaimable.toString(),
+            blockNumberForCalculation: currentBlock.toString(),
+            blockNumberSource: source,
+        };
+    }
+    /**
+     * Create a result with zero claimable for all schedules.
+     * Used during migration windows or post-migration on relay chain.
+     */
+    createZeroClaimableResult(vestingArray, _vestingLocked, blockNumber, source) {
+        // Convert VestingInfo to calculation interface
+        const calcSchedules = vestingArray.map((v) => ({
+            locked: new bn_js_1.default(v.locked.toString()),
+            perBlock: new bn_js_1.default(v.perBlock.toString()),
+            startingBlock: new bn_js_1.default(v.startingBlock.toString()),
+        }));
+        const vestingTotal = (0, vestingCalculations_1.calculateVestingTotal)(calcSchedules);
+        const schedules = vestingArray.map((v) => ({
+            locked: v.locked.toString(),
+            perBlock: v.perBlock.toString(),
+            startingBlock: v.startingBlock.toString(),
+            vested: '0',
+        }));
+        return {
+            schedules,
+            vestedBalance: '0',
+            vestingTotal: vestingTotal.toString(),
+            vestedClaimable: '0',
+            blockNumberForCalculation: blockNumber,
+            blockNumberSource: source,
+        };
+    }
+    /**
+     * Determine migration state for an Asset Hub block.
+     */
+    getAssetHubMigrationState(blockNumber, boundaries) {
+        if (blockNumber < boundaries.assetHubMigrationStartedAt) {
+            return 'pre-migration';
+        }
+        else if (blockNumber >= boundaries.assetHubMigrationEndedAt) {
+            return 'post-migration';
+        }
+        else {
+            return 'during-migration';
+        }
+    }
+    /**
+     * Determine migration state for a relay chain block.
+     */
+    getRelayChainMigrationState(blockNumber, boundaries) {
+        if (blockNumber < boundaries.relayMigrationStartedAt) {
+            return 'pre-migration';
+        }
+        else if (blockNumber >= boundaries.relayMigrationEndedAt) {
+            return 'post-migration';
+        }
+        else {
+            return 'during-migration';
+        }
     }
 }
 exports.AccountsVestingInfoService = AccountsVestingInfoService;

package/build/src/services/accounts/AccountsVestingInfoService.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"AccountsVestingInfoService.js","sourceRoot":"","sources":["../../../../src/services/accounts/AccountsVestingInfoService.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~~;;;AAGxE~~,~~6CAAyC~~;~~AAGzC~~,wDAAqD;~~AAErD~~,MAAa,0BAA2B,SAAQ,iCAAe;IAC9D~~;;;;;OAKG~~;IACH,KAAK,CAAC,uBAAuB,~~CAAC~~,IAAe,~~EAAE~~,OAAe;~~QAC7D~~,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;QAErB,MAAM,WAAW,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;QAEvC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;YAChC,MAAM,IAAI,wBAAU,CAAC,uEAAuE,CAAC,CAAC;QAC/F,CAAC;QAED,MAAM,CAAC,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC/C,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC;YAC7B,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC;SAC1C,CAAC,CAAC,KAAK,CAAC,CAAC,GAAU,EAAE,EAAE;YACvB,MAAM,IAAI,CAAC,sBAAsB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;QAEH,MAAM,EAAE,GAAG;YACV,IAAI;YACJ,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,~~QAAQ~~,CAAC,EAAE,CAAC;~~SACpC~~,CAAC;~~QAEF~~,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;~~YACpB~~,OAAO;gBACN,EAAE;gBACF,OAAO,EAAE,~~EAAE~~;~~aACX~~,CAAC;QACH,CAAC;aAAM,CAAC;YACP,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;~~YAEvC~~,OAAO;~~gBACN~~,EAAE;~~gBACF~~,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;~~aACvE~~,CAAC;~~QACH~~,CAAC;IACF,CAAC;CACD;~~AA1CD~~,~~gEA0CC~~"}
1	+ {"version":3,"file":"AccountsVestingInfoService.js","sourceRoot":"","sources":["../../../../src/services/accounts/AccountsVestingInfoService.ts"],"names":[],"mappings":"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"}

package/build/src/services/paras/ParasInclusionService.d.ts CHANGED Viewed

@@ -7,18 +7,10 @@ export declare class ParasInclusionService extends AbstractService {
     /**
      * Find the relay chain inclusion information for a specific parachain block.
      *
-     * @param hash - The relay chain block hash to start searching from
-     * @param blockNumber - The parachain block number
+     * @param hash - The parachain block hash
+     * @param paraId - The parachain ID
+     * @param number - The parachain block number
      * @param depth - Search depth (defaults to 10)
      */
     getParachainInclusion(hash: BlockHash, paraId: u32, number: string, depth?: number): Promise<IParachainInclusion>;
-    /**
-     * Search relay chain blocks for inclusion of a specific parachain block
-     * Uses optimized candidate_events runtime API when available, falls back to system events for historical support
-     */
-    private searchForInclusion;
-    /**
-     * Search using system events
-     */
-    private searchWithSystemEvents;
 }