@substrate/api-sidecar 20.3.2 → 20.4.0

package/build/src/controllers/pallets/PalletsDispatchablesController.js

@@ -19,6 +19,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const util_1 = require("@polkadot/util");
+const middleware_1 = require("../../middleware");
 const services_1 = require("../../services");
 const AbstractController_1 = __importDefault(require("../AbstractController"));
 /**
@@ -35,41 +36,94 @@ const AbstractController_1 = __importDefault(require("../AbstractController"));
 class PalletsDispatchablesController extends AbstractController_1.default {
     constructor(api) {
         super(api, '/pallets/:palletId/dispatchables', new services_1.PalletsDispatchablesService(api));
-        /**
-         * Note: the `at` parameter is not provided because the call for dispatchables does not exist on the historicApi currently.
-         * Support may be added for this in a future update.
-         */
-        this.getDispatchableById = async ({ query: { metadata }, params: { palletId, dispatchableItemId } }, res) => {
-            const at = undefined;
-            const hash = await this.getHashFromAt(at);
+        this.getDispatchableById = async ({ query: { metadata, at, useRcBlock }, params: { palletId, dispatchableItemId } }, res) => {
             const metadataArg = metadata === 'true';
-            const historicApi = await this.api.at(hash);
-            PalletsDispatchablesController.sanitizedSend(res, await this.service.fetchDispatchableItem(historicApi, {
-                hash,
-                // stringCamelCase ensures we don't have snake case or kebab case
-                palletId: (0, util_1.stringCamelCase)(palletId),
-                dispatchableItemId: (0, util_1.stringCamelCase)(dispatchableItemId),
-                metadata: metadataArg,
-            }));
+            if (useRcBlock === 'true') {
+                const rcAtResults = await this.getHashFromRcAt(at);
+                // Return empty array if no Asset Hub blocks found
+                if (rcAtResults.length === 0) {
+                    PalletsDispatchablesController.sanitizedSend(res, []);
+                    return;
+                }
+                // Process each Asset Hub block found
+                const results = [];
+                for (const { ahHash, rcBlockNumber } of rcAtResults) {
+                    const historicApi = await this.api.at(ahHash);
+                    const result = await this.service.fetchDispatchableItem(historicApi, {
+                        hash: ahHash,
+                        // stringCamelCase ensures we don't have snake case or kebab case
+                        palletId: (0, util_1.stringCamelCase)(palletId),
+                        dispatchableItemId: (0, util_1.stringCamelCase)(dispatchableItemId),
+                        metadata: metadataArg,
+                    });
+                    const apiAt = await this.api.at(ahHash);
+                    const ahTimestamp = await apiAt.query.timestamp.now();
+                    const enhancedResult = {
+                        ...result,
+                        rcBlockNumber,
+                        ahTimestamp: ahTimestamp.toString(),
+                    };
+                    results.push(enhancedResult);
+                }
+                PalletsDispatchablesController.sanitizedSend(res, results);
+            }
+            else {
+                const hash = await this.getHashFromAt(at);
+                const historicApi = await this.api.at(hash);
+                const result = await this.service.fetchDispatchableItem(historicApi, {
+                    hash,
+                    // stringCamelCase ensures we don't have snake case or kebab case
+                    palletId: (0, util_1.stringCamelCase)(palletId),
+                    dispatchableItemId: (0, util_1.stringCamelCase)(dispatchableItemId),
+                    metadata: metadataArg,
+                });
+                PalletsDispatchablesController.sanitizedSend(res, result);
+            }
         };
-        /**
-         * Note: the `at` parameter is not provided because the call for dispatchables does not exist on the historicApi currently.
-         * Support may be added for this in a future update.
-         */
-        this.getDispatchables = async ({ params: { palletId }, query: { onlyIds } }, res) => {
-            const at = undefined;
-            const hash = await this.getHashFromAt(at);
+        this.getDispatchables = async ({ params: { palletId }, query: { onlyIds, at, useRcBlock } }, res) => {
             const onlyIdsArg = onlyIds === 'true';
-            const historicApi = await this.api.at(hash);
-            PalletsDispatchablesController.sanitizedSend(res, await this.service.fetchDispatchables(historicApi, {
-                hash,
-                palletId: (0, util_1.stringCamelCase)(palletId),
-                onlyIds: onlyIdsArg,
-            }));
+            if (useRcBlock === 'true') {
+                const rcAtResults = await this.getHashFromRcAt(at);
+                // Return empty array if no Asset Hub blocks found
+                if (rcAtResults.length === 0) {
+                    PalletsDispatchablesController.sanitizedSend(res, []);
+                    return;
+                }
+                // Process each Asset Hub block found
+                const results = [];
+                for (const { ahHash, rcBlockNumber } of rcAtResults) {
+                    const historicApi = await this.api.at(ahHash);
+                    const result = await this.service.fetchDispatchables(historicApi, {
+                        hash: ahHash,
+                        palletId: (0, util_1.stringCamelCase)(palletId),
+                        onlyIds: onlyIdsArg,
+                    });
+                    const apiAt = await this.api.at(ahHash);
+                    const ahTimestamp = await apiAt.query.timestamp.now();
+                    const enhancedResult = {
+                        ...result,
+                        rcBlockNumber,
+                        ahTimestamp: ahTimestamp.toString(),
+                    };
+                    results.push(enhancedResult);
+                }
+                PalletsDispatchablesController.sanitizedSend(res, results);
+            }
+            else {
+                const hash = await this.getHashFromAt(at);
+                const historicApi = await this.api.at(hash);
+                const result = await this.service.fetchDispatchables(historicApi, {
+                    hash,
+                    palletId: (0, util_1.stringCamelCase)(palletId),
+                    onlyIds: onlyIdsArg,
+                });
+                PalletsDispatchablesController.sanitizedSend(res, result);
+            }
         };
         this.initRoutes();
     }
     initRoutes() {
+        this.router.use(this.path, middleware_1.validateUseRcBlock);
         this.safeMountAsyncGetHandlers([
             ['/:dispatchableItemId', this.getDispatchableById],
             ['/', this.getDispatchables],

package/build/src/controllers/pallets/PalletsDispatchablesController.js.map

@@ -1 +1 @@
-{"version":3,"file":"PalletsDispatchablesController.js","sourceRoot":"","sources":["../../../../src/controllers/pallets/PalletsDispatchablesController.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,yCAAiD;AAGjD,6CAA6D;AAE7D,+EAAuD;AAEvD;;;;;;;;;;GAUG;AACH,MAAqB,8BAA+B,SAAQ,4BAA+C;IAG1G,YAAY,GAAW;QACtB,KAAK,CAAC,GAAG,EAAE,kCAAkC,EAAE,IAAI,sCAA2B,CAAC,GAAG,CAAC,CAAC,CAAC;QAYtF;;;WAGG;QACK,wBAAmB,GAAiE,KAAK,EAChG,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,kBAAkB,EAAE,EAAE,EACjE,GAAG,EACa,EAAE;YAClB,MAAM,EAAE,GAAG,SAAS,CAAC;YACrB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YAC1C,MAAM,WAAW,GAAG,QAAQ,KAAK,MAAM,CAAC;YACxC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;YAE5C,8BAA8B,CAAC,aAAa,CAC3C,GAAG,EACH,MAAM,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,WAAW,EAAE;gBACrD,IAAI;gBACJ,iEAAiE;gBACjE,QAAQ,EAAE,IAAA,sBAAe,EAAC,QAAQ,CAAC;gBACnC,kBAAkB,EAAE,IAAA,sBAAe,EAAC,kBAAkB,CAAC;gBACvD,QAAQ,EAAE,WAAW;aACrB,CAAC,CACF,CAAC;QACH,CAAC,CAAC;QAEF;;;WAGG;QACK,qBAAgB,GAAmB,KAAK,EAC/C,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAC5C,GAAG,EACa,EAAE;YAClB,MAAM,EAAE,GAAG,SAAS,CAAC;YACrB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YAC1C,MAAM,UAAU,GAAG,OAAO,KAAK,MAAM,CAAC;YACtC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;YAE5C,8BAA8B,CAAC,aAAa,CAC3C,GAAG,EACH,MAAM,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,WAAW,EAAE;gBAClD,IAAI;gBACJ,QAAQ,EAAE,IAAA,sBAAe,EAAC,QAAQ,CAAC;gBACnC,OAAO,EAAE,UAAU;aACnB,CAAC,CACF,CAAC;QACH,CAAC,CAAC;QAxDD,IAAI,CAAC,UAAU,EAAE,CAAC;IACnB,CAAC;IAES,UAAU;QACnB,IAAI,CAAC,yBAAyB,CAAC;YAC9B,CAAC,sBAAsB,EAAE,IAAI,CAAC,mBAAqC,CAAC;YACpE,CAAC,GAAG,EAAE,IAAI,CAAC,gBAAgB,CAAC;SAC5B,CAAC,CAAC;IACJ,CAAC;;AAbM,6CAAc,GAAG,sBAAsB,AAAzB,CAA0B;AACxC,8CAAe,GAAG,EAAE,AAAL,CAAM;kBAFR,8BAA8B"}
+{"version":3,"file":"PalletsDispatchablesController.js","sourceRoot":"","sources":["../../../../src/controllers/pallets/PalletsDispatchablesController.ts"],"names":[],"mappings":"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"}

package/build/src/controllers/pallets/PalletsErrorsController.js

@@ -19,6 +19,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const util_1 = require("@polkadot/util");
+const middleware_1 = require("../../middleware");
 const services_1 = require("../../services");
 const AbstractController_1 = __importDefault(require("../AbstractController"));
 /**
@@ -35,31 +36,94 @@ const AbstractController_1 = __importDefault(require("../AbstractController"));
 class PalletsErrorsController extends AbstractController_1.default {
     constructor(api) {
         super(api, '/pallets/:palletId/errors', new services_1.PalletsErrorsService(api));
-        this.getErrorById = async ({ query: { at, metadata }, params: { palletId, errorItemId } }, res) => {
+        this.getErrorById = async ({ query: { at, metadata, useRcBlock }, params: { palletId, errorItemId } }, res) => {
             const metadataArg = metadata === 'true';
-            const hash = await this.getHashFromAt(at);
-            const historicApi = await this.api.at(hash);
-            PalletsErrorsController.sanitizedSend(res, await this.service.fetchErrorItem(historicApi, {
-                hash,
-                // stringCamelCase ensures we don't have snake case or kebab case
-                palletId: (0, util_1.stringCamelCase)(palletId),
-                errorItemId: (0, util_1.stringCamelCase)(errorItemId),
-                metadata: metadataArg,
-            }));
+            if (useRcBlock === 'true') {
+                const rcAtResults = await this.getHashFromRcAt(at);
+                // Return empty array if no Asset Hub blocks found
+                if (rcAtResults.length === 0) {
+                    PalletsErrorsController.sanitizedSend(res, []);
+                    return;
+                }
+                // Process each Asset Hub block found
+                const results = [];
+                for (const { ahHash, rcBlockNumber } of rcAtResults) {
+                    const historicApi = await this.api.at(ahHash);
+                    const result = await this.service.fetchErrorItem(historicApi, {
+                        hash: ahHash,
+                        // stringCamelCase ensures we don't have snake case or kebab case
+                        palletId: (0, util_1.stringCamelCase)(palletId),
+                        errorItemId: (0, util_1.stringCamelCase)(errorItemId),
+                        metadata: metadataArg,
+                    });
+                    const apiAt = await this.api.at(ahHash);
+                    const ahTimestamp = await apiAt.query.timestamp.now();
+                    const enhancedResult = {
+                        ...result,
+                        rcBlockNumber,
+                        ahTimestamp: ahTimestamp.toString(),
+                    };
+                    results.push(enhancedResult);
+                }
+                PalletsErrorsController.sanitizedSend(res, results);
+            }
+            else {
+                const hash = await this.getHashFromAt(at);
+                const historicApi = await this.api.at(hash);
+                const result = await this.service.fetchErrorItem(historicApi, {
+                    hash,
+                    // stringCamelCase ensures we don't have snake case or kebab case
+                    palletId: (0, util_1.stringCamelCase)(palletId),
+                    errorItemId: (0, util_1.stringCamelCase)(errorItemId),
+                    metadata: metadataArg,
+                });
+                PalletsErrorsController.sanitizedSend(res, result);
+            }
         };
-        this.getErrors = async ({ params: { palletId }, query: { at, onlyIds } }, res) => {
+        this.getErrors = async ({ params: { palletId }, query: { at, onlyIds, useRcBlock } }, res) => {
             const onlyIdsArg = onlyIds === 'true';
-            const hash = await this.getHashFromAt(at);
-            const historicApi = await this.api.at(hash);
-            PalletsErrorsController.sanitizedSend(res, await this.service.fetchErrors(historicApi, {
-                hash,
-                palletId: (0, util_1.stringCamelCase)(palletId),
-                onlyIds: onlyIdsArg,
-            }));
+            if (useRcBlock === 'true') {
+                const rcAtResults = await this.getHashFromRcAt(at);
+                // Return empty array if no Asset Hub blocks found
+                if (rcAtResults.length === 0) {
+                    PalletsErrorsController.sanitizedSend(res, []);
+                    return;
+                }
+                // Process each Asset Hub block found
+                const results = [];
+                for (const { ahHash, rcBlockNumber } of rcAtResults) {
+                    const historicApi = await this.api.at(ahHash);
+                    const result = await this.service.fetchErrors(historicApi, {
+                        hash: ahHash,
+                        palletId: (0, util_1.stringCamelCase)(palletId),
+                        onlyIds: onlyIdsArg,
+                    });
+                    const apiAt = await this.api.at(ahHash);
+                    const ahTimestamp = await apiAt.query.timestamp.now();
+                    const enhancedResult = {
+                        ...result,
+                        rcBlockNumber,
+                        ahTimestamp: ahTimestamp.toString(),
+                    };
+                    results.push(enhancedResult);
+                }
+                PalletsErrorsController.sanitizedSend(res, results);
+            }
+            else {
+                const hash = await this.getHashFromAt(at);
+                const historicApi = await this.api.at(hash);
+                const result = await this.service.fetchErrors(historicApi, {
+                    hash,
+                    palletId: (0, util_1.stringCamelCase)(palletId),
+                    onlyIds: onlyIdsArg,
+                });
+                PalletsErrorsController.sanitizedSend(res, result);
+            }
         };
         this.initRoutes();
     }
     initRoutes() {
+        this.router.use(this.path, middleware_1.validateUseRcBlock);
         this.safeMountAsyncGetHandlers([
             ['/:errorItemId', this.getErrorById],
             ['/', this.getErrors],

package/build/src/controllers/pallets/PalletsErrorsController.js.map

@@ -1 +1 @@
-{"version":3,"file":"PalletsErrorsController.js","sourceRoot":"","sources":["../../../../src/controllers/pallets/PalletsErrorsController.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,yCAAiD;AAGjD,6CAAsD;AAEtD,+EAAuD;AAEvD;;;;;;;;;;GAUG;AACH,MAAqB,uBAAwB,SAAQ,4BAAwC;IAG5F,YAAY,GAAW;QACtB,KAAK,CAAC,GAAG,EAAE,2BAA2B,EAAE,IAAI,+BAAoB,CAAC,GAAG,CAAC,CAAC,CAAC;QAYhE,iBAAY,GAA0D,KAAK,EAClF,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,EAAE,EAC9D,GAAG,EACa,EAAE;YAClB,MAAM,WAAW,GAAG,QAAQ,KAAK,MAAM,CAAC;YACxC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YAC1C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;YAE5C,uBAAuB,CAAC,aAAa,CACpC,GAAG,EACH,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,WAAW,EAAE;gBAC9C,IAAI;gBACJ,iEAAiE;gBACjE,QAAQ,EAAE,IAAA,sBAAe,EAAC,QAAQ,CAAC;gBACnC,WAAW,EAAE,IAAA,sBAAe,EAAC,WAAW,CAAC;gBACzC,QAAQ,EAAE,WAAW;aACrB,CAAC,CACF,CAAC;QACH,CAAC,CAAC;QAEM,cAAS,GAAmB,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,GAAG,EAAiB,EAAE;YAClH,MAAM,UAAU,GAAG,OAAO,KAAK,MAAM,CAAC;YACtC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YAC1C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;YAE5C,uBAAuB,CAAC,aAAa,CACpC,GAAG,EACH,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,WAAW,EAAE;gBAC3C,IAAI;gBACJ,QAAQ,EAAE,IAAA,sBAAe,EAAC,QAAQ,CAAC;gBACnC,OAAO,EAAE,UAAU;aACnB,CAAC,CACF,CAAC;QACH,CAAC,CAAC;QA3CD,IAAI,CAAC,UAAU,EAAE,CAAC;IACnB,CAAC;IAES,UAAU;QACnB,IAAI,CAAC,yBAAyB,CAAC;YAC9B,CAAC,eAAe,EAAE,IAAI,CAAC,YAA8B,CAAC;YACtD,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC;SACrB,CAAC,CAAC;IACJ,CAAC;;AAbM,sCAAc,GAAG,eAAe,AAAlB,CAAmB;AACjC,uCAAe,GAAG,EAAE,AAAL,CAAM;kBAFR,uBAAuB"}
+{"version":3,"file":"PalletsErrorsController.js","sourceRoot":"","sources":["../../../../src/controllers/pallets/PalletsErrorsController.ts"],"names":[],"mappings":"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"}

package/build/src/controllers/pallets/PalletsEventsController.js

@@ -19,36 +19,100 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const util_1 = require("@polkadot/util");
+const middleware_1 = require("../../middleware");
 const services_1 = require("../../services");
 const AbstractController_1 = __importDefault(require("../AbstractController"));
 class PalletsEventsController extends AbstractController_1.default {
     constructor(api) {
         super(api, '/pallets/:palletId/events', new services_1.PalletsEventsService(api));
-        this.getEventById = async ({ query: { at, metadata }, params: { palletId, eventItemId } }, res) => {
+        this.getEventById = async ({ query: { at, metadata, useRcBlock }, params: { palletId, eventItemId } }, res) => {
             const metadataArg = metadata === 'true';
-            const hash = await this.getHashFromAt(at);
-            const historicApi = await this.api.at(hash);
-            PalletsEventsController.sanitizedSend(res, await this.service.fetchEventItem(historicApi, {
-                hash,
-                // stringCamelCase ensures we don't have snake case or kebab case
-                palletId: (0, util_1.stringCamelCase)(palletId),
-                eventItemId: (0, util_1.stringCamelCase)(eventItemId),
-                metadata: metadataArg,
-            }));
+            if (useRcBlock === 'true') {
+                const rcAtResults = await this.getHashFromRcAt(at);
+                // Return empty array if no Asset Hub blocks found
+                if (rcAtResults.length === 0) {
+                    PalletsEventsController.sanitizedSend(res, []);
+                    return;
+                }
+                // Process each Asset Hub block found
+                const results = [];
+                for (const { ahHash, rcBlockNumber } of rcAtResults) {
+                    const historicApi = await this.api.at(ahHash);
+                    const result = await this.service.fetchEventItem(historicApi, {
+                        hash: ahHash,
+                        // stringCamelCase ensures we don't have snake case or kebab case
+                        palletId: (0, util_1.stringCamelCase)(palletId),
+                        eventItemId: (0, util_1.stringCamelCase)(eventItemId),
+                        metadata: metadataArg,
+                    });
+                    const apiAt = await this.api.at(ahHash);
+                    const ahTimestamp = await apiAt.query.timestamp.now();
+                    const enhancedResult = {
+                        ...result,
+                        rcBlockNumber,
+                        ahTimestamp: ahTimestamp.toString(),
+                    };
+                    results.push(enhancedResult);
+                }
+                PalletsEventsController.sanitizedSend(res, results);
+            }
+            else {
+                const hash = await this.getHashFromAt(at);
+                const historicApi = await this.api.at(hash);
+                const result = await this.service.fetchEventItem(historicApi, {
+                    hash,
+                    // stringCamelCase ensures we don't have snake case or kebab case
+                    palletId: (0, util_1.stringCamelCase)(palletId),
+                    eventItemId: (0, util_1.stringCamelCase)(eventItemId),
+                    metadata: metadataArg,
+                });
+                PalletsEventsController.sanitizedSend(res, result);
+            }
         };
-        this.getEvents = async ({ params: { palletId }, query: { at, onlyIds } }, res) => {
+        this.getEvents = async ({ params: { palletId }, query: { at, onlyIds, useRcBlock } }, res) => {
             const onlyIdsArg = onlyIds === 'true';
-            const hash = await this.getHashFromAt(at);
-            const historicApi = await this.api.at(hash);
-            PalletsEventsController.sanitizedSend(res, await this.service.fetchEvents(historicApi, {
-                hash,
-                palletId: (0, util_1.stringCamelCase)(palletId),
-                onlyIds: onlyIdsArg,
-            }));
+            if (useRcBlock === 'true') {
+                const rcAtResults = await this.getHashFromRcAt(at);
+                // Return empty array if no Asset Hub blocks found
+                if (rcAtResults.length === 0) {
+                    PalletsEventsController.sanitizedSend(res, []);
+                    return;
+                }
+                // Process each Asset Hub block found
+                const results = [];
+                for (const { ahHash, rcBlockNumber } of rcAtResults) {
+                    const historicApi = await this.api.at(ahHash);
+                    const result = await this.service.fetchEvents(historicApi, {
+                        hash: ahHash,
+                        palletId: (0, util_1.stringCamelCase)(palletId),
+                        onlyIds: onlyIdsArg,
+                    });
+                    const apiAt = await this.api.at(ahHash);
+                    const ahTimestamp = await apiAt.query.timestamp.now();
+                    const enhancedResult = {
+                        ...result,
+                        rcBlockNumber,
+                        ahTimestamp: ahTimestamp.toString(),
+                    };
+                    results.push(enhancedResult);
+                }
+                PalletsEventsController.sanitizedSend(res, results);
+            }
+            else {
+                const hash = await this.getHashFromAt(at);
+                const historicApi = await this.api.at(hash);
+                const result = await this.service.fetchEvents(historicApi, {
+                    hash,
+                    palletId: (0, util_1.stringCamelCase)(palletId),
+                    onlyIds: onlyIdsArg,
+                });
+                PalletsEventsController.sanitizedSend(res, result);
+            }
         };
         this.initRoutes();
     }
     initRoutes() {
+        this.router.use(this.path, middleware_1.validateUseRcBlock);
         this.safeMountAsyncGetHandlers([
             ['/:eventItemId', this.getEventById],
             ['/', this.getEvents],

package/build/src/controllers/pallets/PalletsEventsController.js.map

@@ -1 +1 @@
-{"version":3,"file":"PalletsEventsController.js","sourceRoot":"","sources":["../../../../src/controllers/pallets/PalletsEventsController.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,yCAAiD;AAIjD,6CAAsD;AACtD,+EAAuD;AAEvD,MAAqB,uBAAwB,SAAQ,4BAAwC;IAG5F,YAAY,GAAW;QACtB,KAAK,CAAC,GAAG,EAAE,2BAA2B,EAAE,IAAI,+BAAoB,CAAC,GAAG,CAAC,CAAC,CAAC;QAYhE,iBAAY,GAA0D,KAAK,EAClF,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,EAAE,EAC9D,GAAG,EACa,EAAE;YAClB,MAAM,WAAW,GAAG,QAAQ,KAAK,MAAM,CAAC;YACxC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YAC1C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;YAE5C,uBAAuB,CAAC,aAAa,CACpC,GAAG,EACH,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,WAAW,EAAE;gBAC9C,IAAI;gBACJ,iEAAiE;gBACjE,QAAQ,EAAE,IAAA,sBAAe,EAAC,QAAQ,CAAC;gBACnC,WAAW,EAAE,IAAA,sBAAe,EAAC,WAAW,CAAC;gBACzC,QAAQ,EAAE,WAAW;aACrB,CAAC,CACF,CAAC;QACH,CAAC,CAAC;QAEM,cAAS,GAAmB,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,GAAG,EAAiB,EAAE;YAClH,MAAM,UAAU,GAAG,OAAO,KAAK,MAAM,CAAC;YACtC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YAC1C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;YAE5C,uBAAuB,CAAC,aAAa,CACpC,GAAG,EACH,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,WAAW,EAAE;gBAC3C,IAAI;gBACJ,QAAQ,EAAE,IAAA,sBAAe,EAAC,QAAQ,CAAC;gBACnC,OAAO,EAAE,UAAU;aACnB,CAAC,CACF,CAAC;QACH,CAAC,CAAC;QA3CD,IAAI,CAAC,UAAU,EAAE,CAAC;IACnB,CAAC;IAES,UAAU;QACnB,IAAI,CAAC,yBAAyB,CAAC;YAC9B,CAAC,eAAe,EAAE,IAAI,CAAC,YAA8B,CAAC;YACtD,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC;SACrB,CAAC,CAAC;IACJ,CAAC;;AAbM,sCAAc,GAAG,eAAe,AAAlB,CAAmB;AACjC,uCAAe,GAAG,EAAE,AAAL,CAAM;kBAFR,uBAAuB"}
+{"version":3,"file":"PalletsEventsController.js","sourceRoot":"","sources":["../../../../src/controllers/pallets/PalletsEventsController.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,yCAAiD;AAIjD,iDAAsD;AACtD,6CAAsD;AACtD,+EAAuD;AAEvD,MAAqB,uBAAwB,SAAQ,4BAAwC;IAG5F,YAAY,GAAW;QACtB,KAAK,CAAC,GAAG,EAAE,2BAA2B,EAAE,IAAI,+BAAoB,CAAC,GAAG,CAAC,CAAC,CAAC;QAahE,iBAAY,GAA0D,KAAK,EAClF,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,EAAE,EAC1E,GAAG,EACa,EAAE;YAClB,MAAM,WAAW,GAAG,QAAQ,KAAK,MAAM,CAAC;YAExC,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,uBAAuB,CAAC,aAAa,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;oBAC/C,OAAO;gBACR,CAAC;gBAED,qCAAqC;gBACrC,MAAM,OAAO,GAAG,EAAE,CAAC;gBACnB,KAAK,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,IAAI,WAAW,EAAE,CAAC;oBACrD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;oBAE9C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,WAAW,EAAE;wBAC7D,IAAI,EAAE,MAAM;wBACZ,iEAAiE;wBACjE,QAAQ,EAAE,IAAA,sBAAe,EAAC,QAAQ,CAAC;wBACnC,WAAW,EAAE,IAAA,sBAAe,EAAC,WAAW,CAAC;wBACzC,QAAQ,EAAE,WAAW;qBACrB,CAAC,CAAC;oBAEH,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,aAAa;wBACb,WAAW,EAAE,WAAW,CAAC,QAAQ,EAAE;qBACnC,CAAC;oBAEF,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;gBAC9B,CAAC;gBAED,uBAAuB,CAAC,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YACrD,CAAC;iBAAM,CAAC;gBACP,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;gBAC1C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;gBAE5C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,WAAW,EAAE;oBAC7D,IAAI;oBACJ,iEAAiE;oBACjE,QAAQ,EAAE,IAAA,sBAAe,EAAC,QAAQ,CAAC;oBACnC,WAAW,EAAE,IAAA,sBAAe,EAAC,WAAW,CAAC;oBACzC,QAAQ,EAAE,WAAW;iBACrB,CAAC,CAAC;gBACH,uBAAuB,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YACpD,CAAC;QACF,CAAC,CAAC;QAEM,cAAS,GAAmB,KAAK,EACxC,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,EAC5D,GAAG,EACa,EAAE;YAClB,MAAM,UAAU,GAAG,OAAO,KAAK,MAAM,CAAC;YAEtC,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,uBAAuB,CAAC,aAAa,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;oBAC/C,OAAO;gBACR,CAAC;gBAED,qCAAqC;gBACrC,MAAM,OAAO,GAAG,EAAE,CAAC;gBACnB,KAAK,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,IAAI,WAAW,EAAE,CAAC;oBACrD,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC;oBAE9C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,WAAW,EAAE;wBAC1D,IAAI,EAAE,MAAM;wBACZ,QAAQ,EAAE,IAAA,sBAAe,EAAC,QAAQ,CAAC;wBACnC,OAAO,EAAE,UAAU;qBACnB,CAAC,CAAC;oBAEH,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,aAAa;wBACb,WAAW,EAAE,WAAW,CAAC,QAAQ,EAAE;qBACnC,CAAC;oBAEF,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;gBAC9B,CAAC;gBAED,uBAAuB,CAAC,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YACrD,CAAC;iBAAM,CAAC;gBACP,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;gBAC1C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;gBAE5C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,WAAW,CAAC,WAAW,EAAE;oBAC1D,IAAI;oBACJ,QAAQ,EAAE,IAAA,sBAAe,EAAC,QAAQ,CAAC;oBACnC,OAAO,EAAE,UAAU;iBACnB,CAAC,CAAC;gBACH,uBAAuB,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YACpD,CAAC;QACF,CAAC,CAAC;QArHD,IAAI,CAAC,UAAU,EAAE,CAAC;IACnB,CAAC;IAES,UAAU;QACnB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,+BAAkB,CAAC,CAAC;QAC/C,IAAI,CAAC,yBAAyB,CAAC;YAC9B,CAAC,eAAe,EAAE,IAAI,CAAC,YAA8B,CAAC;YACtD,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,CAAC;SACrB,CAAC,CAAC;IACJ,CAAC;;AAdM,sCAAc,GAAG,eAAe,AAAlB,CAAmB;AACjC,uCAAe,GAAG,EAAE,AAAL,CAAM;kBAFR,uBAAuB"}

package/build/src/controllers/pallets/PalletsForeignAssetsController.d.ts

@@ -6,11 +6,19 @@ import AbstractController from '../AbstractController';
  * Query:
  * - (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.
  *
  * `/pallets/foreign-assets`
  * Returns:
+ * - When using `useRcBlock` parameter: An array of response objects, one for each Asset Hub block found
+ *   in the specified relay chain block. Returns empty array `[]` if no Asset Hub blocks found.
+ * - When using `at` parameter or no query params: A single response object.
+ *
+ * Response object structure:
  * - `at`: Block number and hash at which the call was made.
  * - `items`: An array containing the `AssetDetails` and `AssetMetadata` of every foreign asset.
+ * - `rcBlockNumber`: The relay chain block number used for the query. Only present when `useRcBlock` parameter is used.
+ * - `ahTimestamp`: The Asset Hub block timestamp. Only present when `useRcBlock` parameter is used.
  *
  * Substrate References:
  * - Foreign Assets Pallet Instance in Kusama Asset Hub: https://github.com/paritytech/cumulus/blob/master/parachains/runtimes/assets/asset-hub-kusama/src/lib.rs#L295

package/build/src/controllers/pallets/PalletsForeignAssetsController.js

@@ -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 middleware_1 = require("../../middleware");
 const services_1 = require("../../services");
 const AbstractController_1 = __importDefault(require("../AbstractController"));
 /**
@@ -26,11 +27,19 @@ const AbstractController_1 = __importDefault(require("../AbstractController"));
  * Query:
  * - (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.
  *
  * `/pallets/foreign-assets`
  * Returns:
+ * - When using `useRcBlock` parameter: An array of response objects, one for each Asset Hub block found
+ *   in the specified relay chain block. Returns empty array `[]` if no Asset Hub blocks found.
+ * - When using `at` parameter or no query params: A single response object.
+ *
+ * Response object structure:
  * - `at`: Block number and hash at which the call was made.
  * - `items`: An array containing the `AssetDetails` and `AssetMetadata` of every foreign asset.
+ * - `rcBlockNumber`: The relay chain block number used for the query. Only present when `useRcBlock` parameter is used.
+ * - `ahTimestamp`: The Asset Hub block timestamp. Only present when `useRcBlock` parameter is used.
  *
  * Substrate References:
  * - Foreign Assets Pallet Instance in Kusama Asset Hub: https://github.com/paritytech/cumulus/blob/master/parachains/runtimes/assets/asset-hub-kusama/src/lib.rs#L295
@@ -38,13 +47,39 @@ const AbstractController_1 = __importDefault(require("../AbstractController"));
 class PalletsForeignAssetsController extends AbstractController_1.default {
     constructor(api) {
         super(api, '/pallets/foreign-assets', new services_1.PalletsForeignAssetsService(api));
-        this.getForeignAssets = async ({ query: { at } }, res) => {
-            const hash = await this.getHashFromAt(at);
-            PalletsForeignAssetsController.sanitizedSend(res, await this.service.fetchForeignAssets(hash));
+        this.getForeignAssets = async ({ query: { at, useRcBlock } }, res) => {
+            if (useRcBlock === 'true') {
+                const rcAtResults = await this.getHashFromRcAt(at);
+                // Return empty array if no Asset Hub blocks found
+                if (rcAtResults.length === 0) {
+                    PalletsForeignAssetsController.sanitizedSend(res, []);
+                    return;
+                }
+                // Process each Asset Hub block found
+                const results = [];
+                for (const { ahHash, rcBlockNumber } of rcAtResults) {
+                    const result = await this.service.fetchForeignAssets(ahHash);
+                    const apiAt = await this.api.at(ahHash);
+                    const ahTimestamp = await apiAt.query.timestamp.now();
+                    const enhancedResult = {
+                        ...result,
+                        rcBlockNumber,
+                        ahTimestamp: ahTimestamp.toString(),
+                    };
+                    results.push(enhancedResult);
+                }
+                PalletsForeignAssetsController.sanitizedSend(res, results);
+            }
+            else {
+                const hash = await this.getHashFromAt(at);
+                const result = await this.service.fetchForeignAssets(hash);
+                PalletsForeignAssetsController.sanitizedSend(res, result);
+            }
         };
         this.initRoutes();
     }
     initRoutes() {
+        this.router.use(this.path, middleware_1.validateUseRcBlock);
         this.safeMountAsyncGetHandlers([['', this.getForeignAssets]]);
     }
 }

package/build/src/controllers/pallets/PalletsForeignAssetsController.js.map

@@ -1 +1 @@
-{"version":3,"file":"PalletsForeignAssetsController.js","sourceRoot":"","sources":["../../../../src/controllers/pallets/PalletsForeignAssetsController.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;;;;;AAIxE,6CAA6D;AAC7D,+EAAuD;AAEvD;;;;;;;;;;;;;;GAcG;AACH,MAAqB,8BAA+B,SAAQ,4BAA+C;IAG1G,YAAY,GAAW;QACtB,KAAK,CAAC,GAAG,EAAE,yBAAyB,EAAE,IAAI,sCAA2B,CAAC,GAAG,CAAC,CAAC,CAAC;QAQrE,qBAAgB,GAAmB,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAiB,EAAE;YAC1F,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YAC1C,8BAA8B,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC,CAAC;QAChG,CAAC,CAAC;QAVD,IAAI,CAAC,UAAU,EAAE,CAAC;IACnB,CAAC;IAES,UAAU;QACnB,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAC/D,CAAC;;AATM,6CAAc,GAAG,sBAAsB,AAAzB,CAA0B;AACxC,8CAAe,GAAG,CAAC,CAAC,eAAe,CAAC,CAAC,AAAtB,CAAuB;kBAFzB,8BAA8B"}
+{"version":3,"file":"PalletsForeignAssetsController.js","sourceRoot":"","sources":["../../../../src/controllers/pallets/PalletsForeignAssetsController.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;;;;;AAIxE,iDAAsD;AACtD,6CAA6D;AAC7D,+EAAuD;AAEvD;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,MAAqB,8BAA+B,SAAQ,4BAA+C;IAG1G,YAAY,GAAW;QACtB,KAAK,CAAC,GAAG,EAAE,yBAAyB,EAAE,IAAI,sCAA2B,CAAC,GAAG,CAAC,CAAC,CAAC;QASrE,qBAAgB,GAAmB,KAAK,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,GAAG,EAAiB,EAAE;YACtG,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,8BAA8B,CAAC,aAAa,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;oBACtD,OAAO;gBACR,CAAC;gBAED,qCAAqC;gBACrC,MAAM,OAAO,GAAG,EAAE,CAAC;gBACnB,KAAK,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,IAAI,WAAW,EAAE,CAAC;oBACrD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;oBAE7D,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,aAAa;wBACb,WAAW,EAAE,WAAW,CAAC,QAAQ,EAAE;qBACnC,CAAC;oBAEF,OAAO,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;gBAC9B,CAAC;gBAED,8BAA8B,CAAC,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;YAC5D,CAAC;iBAAM,CAAC;gBACP,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;gBAC1C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAC;gBAC3D,8BAA8B,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAC3D,CAAC;QACF,CAAC,CAAC;QAzCD,IAAI,CAAC,UAAU,EAAE,CAAC;IACnB,CAAC;IAES,UAAU;QACnB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,+BAAkB,CAAC,CAAC;QAC/C,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAC/D,CAAC;;AAVM,6CAAc,GAAG,sBAAsB,AAAzB,CAA0B;AACxC,8CAAe,GAAG,CAAC,CAAC,eAAe,CAAC,CAAC,AAAtB,CAAuB;kBAFzB,8BAA8B"}

package/build/src/controllers/pallets/PalletsNominationPoolsController.js

@@ -18,28 +18,80 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const middleware_1 = require("../../middleware");
 const services_1 = require("../../services");
 const AbstractController_1 = __importDefault(require("../AbstractController"));
 class PalletsNominationPoolController extends AbstractController_1.default {
     constructor(api) {
         super(api, '/pallets/nomination-pools', new services_1.PalletsNominationPoolService(api));
-        this.getNominationPoolById = async ({ params: { poolId }, query: { at, metadata } }, res) => {
+        this.getNominationPoolById = async ({ params: { poolId }, query: { at, useRcBlock, metadata } }, res) => {
             /**
              * Verify our param `poolId` is an integer represented as a string, and return
              * it as an integer
              */
             const index = this.parseNumberOrThrow(poolId, '`poolId` path param is not a number');
             const metadataArg = metadata === 'true';
-            const hash = await this.getHashFromAt(at);
-            PalletsNominationPoolController.sanitizedSend(res, await this.service.fetchNominationPoolById(index, hash, metadataArg));
+            if (useRcBlock === 'true') {
+                const rcAtResults = await this.getHashFromRcAt(at);
+                // Return empty array if no Asset Hub blocks found
+                if (rcAtResults.length === 0) {
+                    PalletsNominationPoolController.sanitizedSend(res, []);
+                    return;
+                }
+                // Process each Asset Hub block found
+                const results = [];
+                for (const { ahHash, rcBlockNumber } of rcAtResults) {
+                    const result = await this.service.fetchNominationPoolById(index, ahHash, metadataArg);
+                    const apiAt = await this.api.at(ahHash);
+                    const ahTimestamp = await apiAt.query.timestamp.now();
+                    const enhancedResult = {
+                        ...result,
+                        rcBlockNumber,
+                        ahTimestamp: ahTimestamp.toString(),
+                    };
+                    results.push(enhancedResult);
+                }
+                PalletsNominationPoolController.sanitizedSend(res, results);
+            }
+            else {
+                const hash = await this.getHashFromAt(at);
+                const result = await this.service.fetchNominationPoolById(index, hash, metadataArg);
+                PalletsNominationPoolController.sanitizedSend(res, result);
+            }
         };
-        this.getNominationPoolInfo = async ({ query: { at } }, res) => {
-            const hash = await this.getHashFromAt(at);
-            PalletsNominationPoolController.sanitizedSend(res, await this.service.fetchNominationPoolInfo(hash));
+        this.getNominationPoolInfo = async ({ query: { at, useRcBlock } }, res) => {
+            if (useRcBlock === 'true') {
+                const rcAtResults = await this.getHashFromRcAt(at);
+                // Return empty array if no Asset Hub blocks found
+                if (rcAtResults.length === 0) {
+                    PalletsNominationPoolController.sanitizedSend(res, []);
+                    return;
+                }
+                // Process each Asset Hub block found
+                const results = [];
+                for (const { ahHash, rcBlockNumber } of rcAtResults) {
+                    const result = await this.service.fetchNominationPoolInfo(ahHash);
+                    const apiAt = await this.api.at(ahHash);
+                    const ahTimestamp = await apiAt.query.timestamp.now();
+                    const enhancedResult = {
+                        ...result,
+                        rcBlockNumber,
+                        ahTimestamp: ahTimestamp.toString(),
+                    };
+                    results.push(enhancedResult);
+                }
+                PalletsNominationPoolController.sanitizedSend(res, results);
+            }
+            else {
+                const hash = await this.getHashFromAt(at);
+                const result = await this.service.fetchNominationPoolInfo(hash);
+                PalletsNominationPoolController.sanitizedSend(res, result);
+            }
         };
         this.initRoutes();
     }
     initRoutes() {
+        this.router.use(this.path, middleware_1.validateUseRcBlock);
         this.safeMountAsyncGetHandlers([
             ['/info', this.getNominationPoolInfo],
             ['/:poolId', this.getNominationPoolById],