npm - @substrate/api-sidecar - Versions diffs - 20.13.3 → 20.14.0 - Mend

@substrate/api-sidecar 20.13.3 → 20.14.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 (101) hide show

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

@@ -83,12 +83,19 @@ const AbstractController_1 = __importDefault(require("../AbstractController"));
 class AccountsPoolAssetsController extends AbstractController_1.default {
     constructor(api) {
         super(api, '/accounts/:address', new accounts_1.AccountsPoolAssetsService(api));
-        this.getPoolAssetBalances = async ({ params: { address }, query: { at, useRcBlock, assets } }, res) => {
+        this.getPoolAssetBalances = async ({ params: { address }, query: { at, useRcBlock, useRcBlockFormat, assets } }, res) => {
+            const useObjectFormat = useRcBlockFormat === 'object';
             if (useRcBlock === 'true') {
                 const rcAtResults = await this.getHashFromRcAt(at);
-                // Return empty array if no Asset Hub blocks found
+                // Handle empty results based on format
                 if (rcAtResults.length === 0) {
-                    AccountsPoolAssetsController.sanitizedSend(res, []);
+                    if (useObjectFormat) {
+                        const rcBlockInfo = await this.getRcBlockInfo(at);
+                        AccountsPoolAssetsController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, []));
+                    }
+                    else {
+                        AccountsPoolAssetsController.sanitizedSend(res, []);
+                    }
                     return;
                 }
                 const assetsArray = Array.isArray(assets) ? this.parseQueryParamArrayOrThrow(assets) : [];
@@ -106,7 +113,14 @@ class AccountsPoolAssetsController extends AbstractController_1.default {
                     };
                     results.push(enhancedResult);
                 }
-                AccountsPoolAssetsController.sanitizedSend(res, results);
+                // Send response based on format
+                if (useObjectFormat) {
+                    const rcBlockInfo = await this.getRcBlockInfo(at);
+                    AccountsPoolAssetsController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, results));
+                }
+                else {
+                    AccountsPoolAssetsController.sanitizedSend(res, results);
+                }
             }
             else {
                 const hash = await this.getHashFromAt(at);
@@ -115,16 +129,23 @@ class AccountsPoolAssetsController extends AbstractController_1.default {
                 AccountsPoolAssetsController.sanitizedSend(res, result);
             }
         };
-        this.getPoolAssetApprovals = async ({ params: { address }, query: { at, useRcBlock, delegate, assetId } }, res) => {
+        this.getPoolAssetApprovals = async ({ params: { address }, query: { at, useRcBlock, useRcBlockFormat, delegate, assetId } }, res) => {
             if (typeof delegate !== 'string' || typeof assetId !== 'string') {
                 throw new http_errors_1.BadRequest('Must include a `delegate` and `assetId` query param');
             }
             const id = this.parseNumberOrThrow(assetId, '`assetId` provided is not a number.');
+            const useObjectFormat = useRcBlockFormat === 'object';
             if (useRcBlock === 'true') {
                 const rcAtResults = await this.getHashFromRcAt(at);
-                // Return empty array if no Asset Hub blocks found
+                // Handle empty results based on format
                 if (rcAtResults.length === 0) {
-                    AccountsPoolAssetsController.sanitizedSend(res, []);
+                    if (useObjectFormat) {
+                        const rcBlockInfo = await this.getRcBlockInfo(at);
+                        AccountsPoolAssetsController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, []));
+                    }
+                    else {
+                        AccountsPoolAssetsController.sanitizedSend(res, []);
+                    }
                     return;
                 }
                 // Process each Asset Hub block found
@@ -141,7 +162,14 @@ class AccountsPoolAssetsController extends AbstractController_1.default {
                     };
                     results.push(enhancedResult);
                 }
-                AccountsPoolAssetsController.sanitizedSend(res, results);
+                // Send response based on format
+                if (useObjectFormat) {
+                    const rcBlockInfo = await this.getRcBlockInfo(at);
+                    AccountsPoolAssetsController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, results));
+                }
+                else {
+                    AccountsPoolAssetsController.sanitizedSend(res, results);
+                }
             }
             else {
                 const hash = await this.getHashFromAt(at);

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

	@@ -1 +1 @@
1	- {"version":3,"file":"AccountsPoolAssetsController.js","sourceRoot":"","sources":["../../../../src/controllers/accounts/AccountsPoolAssetsController.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;AAEzC,iDAAuE;AACvE,sDAAoE;AACpE,+EAAuD;AAEvD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAyDG;AACH,MAAqB,4BAA6B,SAAQ,4BAA6C;IAGtG,YAAY,GAAW;QACtB,KAAK,CAAC,GAAG,EAAE,oBAAoB,EAAE,IAAI,oCAAyB,CAAC,GAAG,CAAC,CAAC,CAAC;QAa9D,yBAAoB,GAAmB,KAAK,EACnD,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,~~EAC1D~~,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,4BAA4B,CAAC,aAAa,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;~~oBACpD~~,OAAO;gBACR,CAAC;gBAED,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,2BAA2B,CAAC,MAAkB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBAEtG,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,sBAAsB,CAAC,MAAM,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;oBAEvF,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,4BAA4B,CAAC,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;~~YAC1D~~,CAAC;iBAAM,CAAC;gBACP,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;gBAC1C,MAAM,WAAW,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,2BAA2B,CAAC,MAAkB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACtG,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,sBAAsB,CAAC,IAAI,EAAE,OAAO,EAAE,WAAW,CAAC,CAAC;gBACrF,4BAA4B,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YACzD,CAAC;QACF,CAAC,CAAC;QAEM,0BAAqB,GAAmB,KAAK,EACpD,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,EAAE,~~EACrE~~,GAAG,EACa,EAAE;YAClB,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;gBACjE,MAAM,IAAI,wBAAU,CAAC,qDAAqD,CAAC,CAAC;YAC7E,CAAC;YAED,MAAM,EAAE,GAAG,IAAI,CAAC,kBAAkB,CAAC,OAAO,EAAE,qCAAqC,CAAC,CAAC;~~YAEnF~~,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,4BAA4B,CAAC,aAAa,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;~~oBACpD~~,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,EAAE,EAAE,EAAE,QAAQ,CAAC,CAAC;oBAEzF,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,4BAA4B,CAAC,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;~~YAC1D~~,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,EAAE,EAAE,EAAE,QAAQ,CAAC,CAAC;gBACvF,4BAA4B,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YACzD,CAAC;QACF,CAAC,CAAC;~~QAjGD~~,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;YAC9B,CAAC,sBAAsB,EAAE,IAAI,CAAC,oBAAoB,CAAC;YACnD,CAAC,uBAAuB,EAAE,IAAI,CAAC,qBAAqB,CAAC;SACrD,CAAC,CAAC;IACJ,CAAC;;AAdM,2CAAc,GAAG,oBAAoB,AAAvB,CAAwB;AACtC,4CAAe,GAAG,CAAC,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAC,AAA7B,CAA8B;kBAFhC,4BAA4B"}
1	+ {"version":3,"file":"AccountsPoolAssetsController.js","sourceRoot":"","sources":["../../../../src/controllers/accounts/AccountsPoolAssetsController.ts"],"names":[],"mappings":"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"}

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

@@ -30,12 +30,19 @@ class AccountsProxyInfoController extends AbstractController_1.default {
          * @param req Express Request
          * @param res Express Response
          */
-        this.getAccountProxyInfo = async ({ params: { address }, query: { at, useRcBlock } }, res) => {
+        this.getAccountProxyInfo = async ({ params: { address }, query: { at, useRcBlock, useRcBlockFormat } }, res) => {
+            const useObjectFormat = useRcBlockFormat === 'object';
             if (useRcBlock === 'true') {
                 const rcAtResults = await this.getHashFromRcAt(at);
-                // Return empty array if no Asset Hub blocks found
+                // Handle empty results based on format
                 if (rcAtResults.length === 0) {
-                    AccountsProxyInfoController.sanitizedSend(res, []);
+                    if (useObjectFormat) {
+                        const rcBlockInfo = await this.getRcBlockInfo(at);
+                        AccountsProxyInfoController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, []));
+                    }
+                    else {
+                        AccountsProxyInfoController.sanitizedSend(res, []);
+                    }
                     return;
                 }
                 // Process each Asset Hub block found
@@ -52,7 +59,14 @@ class AccountsProxyInfoController extends AbstractController_1.default {
                     };
                     results.push(enhancedResult);
                 }
-                AccountsProxyInfoController.sanitizedSend(res, results);
+                // Send response based on format
+                if (useObjectFormat) {
+                    const rcBlockInfo = await this.getRcBlockInfo(at);
+                    AccountsProxyInfoController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, results));
+                }
+                else {
+                    AccountsProxyInfoController.sanitizedSend(res, results);
+                }
             }
             else {
                 const hash = await this.getHashFromAt(at);

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

	@@ -1 +1 @@
1	- {"version":3,"file":"AccountsProxyInfoController.js","sourceRoot":"","sources":["../../../../src/controllers/accounts/AccountsProxyInfoController.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,6CAA0D;AAC1D,+EAAuD;AAEvD,MAAqB,2BAA4B,SAAQ,4BAA4C;IAGpG,YAAY,GAAW;QACtB,KAAK,CAAC,GAAG,EAAE,+BAA+B,EAAE,IAAI,mCAAwB,CAAC,GAAG,CAAC,CAAC,CAAC;QAUhF;;;;;WAKG;QACK,wBAAmB,GAAkC,KAAK,EACjE,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,2BAA2B,CAAC,aAAa,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;~~oBACnD~~,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,qBAAqB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;oBAEzE,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,2BAA2B,CAAC,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;~~YACzD~~,CAAC;iBAAM,CAAC;gBACP,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;gBAC1C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;gBACvE,2BAA2B,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YACxD,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,mBAAmB,CAAC,CAAC,CAAC,CAAC;IAClE,CAAC;;AAXM,0CAAc,GAAG,mBAAmB,AAAtB,CAAuB;AACrC,2CAAe,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,AAAd,CAAe;kBAFjB,2BAA2B"}
1	+ {"version":3,"file":"AccountsProxyInfoController.js","sourceRoot":"","sources":["../../../../src/controllers/accounts/AccountsProxyInfoController.ts"],"names":[],"mappings":"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"}

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

@@ -87,14 +87,21 @@ class AccountsStakingInfoController extends AbstractController_1.default {
          * @param req Express Request
          * @param res Express Response
          */
-        this.getAccountStakingInfo = async ({ params: { address }, query: { at, useRcBlock, includeClaimedRewards } }, res) => {
+        this.getAccountStakingInfo = async ({ params: { address }, query: { at, useRcBlock, useRcBlockFormat, includeClaimedRewards } }, res) => {
             const { isAssetHubMigrated } = apiRegistry_1.ApiPromiseRegistry.assetHubInfo;
             const includeClaimedRewardsArg = includeClaimedRewards !== 'false';
+            const useObjectFormat = useRcBlockFormat === 'object';
             if (useRcBlock === 'true') {
                 const rcAtResults = await this.getHashFromRcAt(at);
-                // Return empty array if no Asset Hub blocks found
+                // Handle empty results based on format
                 if (rcAtResults.length === 0) {
-                    AccountsStakingInfoController.sanitizedSend(res, []);
+                    if (useObjectFormat) {
+                        const rcBlockInfo = await this.getRcBlockInfo(at);
+                        AccountsStakingInfoController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, []));
+                    }
+                    else {
+                        AccountsStakingInfoController.sanitizedSend(res, []);
+                    }
                     return;
                 }
                 // Process each Asset Hub block found
@@ -117,7 +124,14 @@ class AccountsStakingInfoController extends AbstractController_1.default {
                     };
                     results.push(enhancedResult);
                 }
-                AccountsStakingInfoController.sanitizedSend(res, results);
+                // Send response based on format
+                if (useObjectFormat) {
+                    const rcBlockInfo = await this.getRcBlockInfo(at);
+                    AccountsStakingInfoController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, results));
+                }
+                else {
+                    AccountsStakingInfoController.sanitizedSend(res, results);
+                }
             }
             else {
                 const hash = await this.getHashFromAt(at);

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

	@@ -1 +1 @@
1	- {"version":3,"file":"AccountsStakingInfoController.js","sourceRoot":"","sources":["../../../../src/controllers/accounts/AccountsStakingInfoController.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;;;;;AAMxE,mDAAuD;AACvD,iDAAwF;AACxF,6CAA4D;AAC5D,+EAAuD;AAEvD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuDG;AACH,MAAqB,6BAA8B,SAAQ,4BAA8C;IAUxG,YAAY,GAAW,EAAE,OAA0B;QAClD,KAAK,CAAC,GAAG,EAAE,iCAAiC,EAAE,IAAI,qCAA0B,CAAC,GAAG,CAAC,CAAC,CAAC;QAWpF;;;;;WAKG;QACK,0BAAqB,GAAkC,KAAK,EACnE,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,qBAAqB,EAAE,EAAE,~~EACzE~~,GAAG,EACa,EAAE;YAClB,MAAM,EAAE,kBAAkB,EAAE,GAAG,gCAAkB,CAAC,YAAY,CAAC;YAC/D,MAAM,wBAAwB,GAAG,qBAAqB,KAAK,OAAO,CAAC;~~YAEnE~~,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,IAAI,MAAM,CAAC;oBACX,IAAI,kBAAkB,EAAE,CAAC;wBACxB,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,+BAA+B,CAAC,MAAM,EAAE,wBAAwB,EAAE,OAAO,CAAC,CAAC;oBACxG,CAAC;yBAAM,CAAC;wBACP,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAAC,MAAM,EAAE,wBAAwB,EAAE,OAAO,CAAC,CAAC;oBAChG,CAAC;oBAED,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;gBAE1C,IAAI,MAAM,CAAC;gBACX,IAAI,kBAAkB,EAAE,CAAC;oBACxB,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,+BAA+B,CAAC,IAAI,EAAE,wBAAwB,EAAE,OAAO,CAAC,CAAC;gBACtG,CAAC;qBAAM,CAAC;oBACP,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,uBAAuB,CAAC,IAAI,EAAE,wBAAwB,EAAE,OAAO,CAAC,CAAC;gBAC9F,CAAC;gBAED,6BAA6B,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAC1D,CAAC;QACF,CAAC,CAAC;~~QApED~~,IAAI,CAAC,UAAU,EAAE,CAAC;QAClB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACxB,CAAC;IAES,UAAU;QACnB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,4BAAe,EAAE,IAAA,4BAAe,EAAC,CAAC,uBAAuB,CAAC,CAAC,EAAE,+BAAkB,CAAC,CAAC;QAE5G,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IACpE,CAAC;;AAjBM,4CAAc,GAAG,qBAAqB,AAAxB,CAAyB;AACvC,6CAAe,GAAG;IACxB,CAAC,SAAS,EAAE,QAAQ,CAAC;IACrB,CAAC,kBAAkB,EAAE,iBAAiB,CAAC;IACvC,CAAC,kBAAkB,EAAE,QAAQ,CAAC;IAC9B,CAAC,SAAS,EAAE,iBAAiB,CAAC;CAC9B,AALqB,CAKpB;kBATkB,6BAA6B"}
1	+ {"version":3,"file":"AccountsStakingInfoController.js","sourceRoot":"","sources":["../../../../src/controllers/accounts/AccountsStakingInfoController.ts"],"names":[],"mappings":"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"}

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

@@ -95,15 +95,22 @@ class AccountsStakingPayoutsController extends AbstractController_1.default {
          * @param req Express Request
          * @param res Express Response
          */
-        this.getStakingPayoutsByAccountId = async ({ params: { address }, query: { depth, era, unclaimedOnly, at, useRcBlock } }, res) => {
+        this.getStakingPayoutsByAccountId = async ({ params: { address }, query: { depth, era, unclaimedOnly, at, useRcBlock, useRcBlockFormat } }, res) => {
             const { specName } = this;
             const isKusama = specName.toString().toLowerCase() === 'kusama';
             const { isAssetHubMigrated } = apiRegistry_1.ApiPromiseRegistry.assetHubInfo;
+            const useObjectFormat = useRcBlockFormat === 'object';
             if (useRcBlock === 'true') {
                 const rcAtResults = await this.getHashFromRcAt(at);
-                // Return empty array if no Asset Hub blocks found
+                // Handle empty results based on format
                 if (rcAtResults.length === 0) {
-                    AccountsStakingPayoutsController.sanitizedSend(res, []);
+                    if (useObjectFormat) {
+                        const rcBlockInfo = await this.getRcBlockInfo(at);
+                        AccountsStakingPayoutsController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, []));
+                    }
+                    else {
+                        AccountsStakingPayoutsController.sanitizedSend(res, []);
+                    }
                     return;
                 }
                 // Process each Asset Hub block found
@@ -144,7 +151,14 @@ class AccountsStakingPayoutsController extends AbstractController_1.default {
                     };
                     results.push(enhancedResult);
                 }
-                AccountsStakingPayoutsController.sanitizedSend(res, results);
+                // Send response based on format
+                if (useObjectFormat) {
+                    const rcBlockInfo = await this.getRcBlockInfo(at);
+                    AccountsStakingPayoutsController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, results));
+                }
+                else {
+                    AccountsStakingPayoutsController.sanitizedSend(res, results);
+                }
             }
             else {
                 let hash = await this.getHashFromAt(at);

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

	@@ -1 +1 @@
1	- {"version":3,"file":"AccountsStakingPayoutsController.js","sourceRoot":"","sources":["../../../../src/controllers/accounts/AccountsStakingPayoutsController.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,2CAA8C;AAC9C,kDAAuB;AAEvB,6CAA8D;AAE9D,mDAAuD;AACvD,iDAAwF;AACxF,6CAA+D;AAE/D,0HAA6F;AAE7F,+EAAuD;AAEvD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2DG;AACH,MAAqB,gCAAiC,SAAQ,4BAAiD;IAQ9G,YAAY,GAAW;QACtB,KAAK,CAAC,GAAG,EAAE,oCAAoC,EAAE,IAAI,wCAA6B,CAAC,GAAG,CAAC,CAAC,CAAC;QAU1F;;;;;WAKG;QACK,iCAA4B,GAAkC,KAAK,EAC1E,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,GAAG,EAAE,aAAa,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,~~EAC7E~~,GAAG,EACa,EAAE;YAClB,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;YAC1B,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAC,WAAW,EAAE,KAAK,QAAQ,CAAC;YAChE,MAAM,EAAE,kBAAkB,EAAE,GAAG,gCAAkB,CAAC,YAAY,CAAC;~~YAE~~/D,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,gCAAgC,CAAC,aAAa,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;~~oBACxD~~,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,IAAI,IAAI,GAAG,MAAM,CAAC;oBAClB,IAAI,KAAK,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;oBAEpC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC,CAAC;oBAE5G,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC;wBACzC,QAAQ;wBACR,KAAK,EAAE,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,EAAE;wBACxB,GAAG,EAAE,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,QAAQ,EAAE;wBACpB,UAAU;qBACV,CAAC,CAAC;oBAEH,IAAI,QAAQ,IAAI,UAAU,GAAG,GAAG,EAAE,CAAC;wBAClC,MAAM,kBAAkB,GAAwB,uCAAwB,CAAC;wBACzE,MAAM,KAAK,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC;wBACnD,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;wBAClD,KAAK,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;oBACjC,CAAC;oBAED,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;wBAC1B,MAAM,IAAI,wBAAU,CAAC,8CAA8C,CAAC,CAAC;oBACtE,CAAC;oBAED,IAAI,MAAM,CAAC;oBACX,IAAI,kBAAkB,EAAE,CAAC;wBACxB,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,iCAAiC,CAC5D,IAAI,EACJ,OAAO,EACP,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,cAAc,EAAE,CAAC,CAAW,EAC1D,MAAM,EACN,aAAa,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EACxC,UAAU,EACV,KAAK,CACL,CAAC;oBACH,CAAC;yBAAM,CAAC;wBACP,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,yBAAyB,CACpD,IAAI,EACJ,OAAO,EACP,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,cAAc,EAAE,CAAC,CAAW,EAC1D,MAAM,EACN,aAAa,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EACxC,UAAU,EACV,KAAK,CACL,CAAC;oBACH,CAAC;oBAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;oBAC3C,MAAM,WAAW,GAAG,MAAM,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE,CAAC;oBAE3D,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,gCAAgC,CAAC,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;~~YAC9D~~,CAAC;iBAAM,CAAC;gBACP,IAAI,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;gBACxC,IAAI,KAAK,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;gBAEpC,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,eAAe,CAAC,KAAK,EAAE,GAAG,EAAE,SAAS,CAAC,CAAC,CAAC;gBAE5G,MAAM,cAAc,GAAG,IAAI,CAAC,aAAa,CAAC;oBACzC,QAAQ;oBACR,KAAK,EAAE,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,QAAQ,EAAE;oBACxB,GAAG,EAAE,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,QAAQ,EAAE;oBACpB,UAAU;iBACV,CAAC,CAAC;gBAEH,IAAI,QAAQ,IAAI,UAAU,GAAG,GAAG,EAAE,CAAC;oBAClC,MAAM,kBAAkB,GAAwB,uCAAwB,CAAC;oBACzE,MAAM,KAAK,GAAG,kBAAkB,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC;oBACnD,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;oBAClD,KAAK,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;gBACjC,CAAC;gBAED,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC;oBAC1B,MAAM,IAAI,wBAAU,CAAC,8CAA8C,CAAC,CAAC;gBACtE,CAAC;gBAED,IAAI,MAAM,CAAC;gBACX,IAAI,kBAAkB,EAAE,CAAC;oBACxB,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,iCAAiC,CAC5D,IAAI,EACJ,OAAO,EACP,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,cAAc,EAAE,CAAC,CAAW,EAC1D,MAAM,EACN,aAAa,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EACxC,UAAU,EACV,KAAK,CACL,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACP,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,yBAAyB,CACpD,IAAI,EACJ,OAAO,EACP,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE,cAAc,EAAE,CAAC,CAAW,EAC1D,MAAM,EACN,aAAa,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,EACxC,UAAU,EACV,KAAK,CACL,CAAC;gBACH,CAAC;gBAED,gCAAgC,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAC7D,CAAC;QACF,CAAC,CAAC;~~QAhJD~~,IAAI,CAAC,UAAU,EAAE,CAAC;IACnB,CAAC;IAES,UAAU;QACnB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,4BAAe,EAAE,IAAA,4BAAe,EAAC,CAAC,eAAe,CAAC,CAAC,EAAE,+BAAkB,CAAC,CAAC;QAEpG,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,4BAA4B,CAAC,CAAC,CAAC,CAAC;IAC3E,CAAC;~~IA2IO~~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~~AAnOM~~,+CAAc,GAAG,wBAAwB,AAA3B,CAA4B;AAC1C,gDAAe,GAAG;IACxB,CAAC,SAAS,EAAE,QAAQ,CAAC;IACrB,CAAC,kBAAkB,EAAE,iBAAiB,CAAC;IACvC,CAAC,kBAAkB,EAAE,QAAQ,CAAC;IAC9B,CAAC,SAAS,EAAE,iBAAiB,CAAC;CAC9B,AALqB,CAKpB;kBAPkB,gCAAgC"}
1	+ {"version":3,"file":"AccountsStakingPayoutsController.js","sourceRoot":"","sources":["../../../../src/controllers/accounts/AccountsStakingPayoutsController.ts"],"names":[],"mappings":"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"}

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

@@ -75,13 +75,20 @@ class AccountsVestingInfoController extends AbstractController_1.default {
          * @param req Express Request
          * @param res Express Response
          */
-        this.getAccountVestingInfo = async ({ params: { address }, query: { at, useRcBlock, includeClaimable } }, res) => {
+        this.getAccountVestingInfo = async ({ params: { address }, query: { at, useRcBlock, useRcBlockFormat, includeClaimable } }, res) => {
             const shouldIncludeClaimable = includeClaimable === 'true';
+            const useObjectFormat = useRcBlockFormat === 'object';
             if (useRcBlock === 'true') {
                 const rcAtResults = await this.getHashFromRcAt(at);
-                // Return empty array if no Asset Hub blocks found
+                // Handle empty results based on format
                 if (rcAtResults.length === 0) {
-                    AccountsVestingInfoController.sanitizedSend(res, []);
+                    if (useObjectFormat) {
+                        const rcBlockInfo = await this.getRcBlockInfo(at);
+                        AccountsVestingInfoController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, []));
+                    }
+                    else {
+                        AccountsVestingInfoController.sanitizedSend(res, []);
+                    }
                     return;
                 }
                 // Process each Asset Hub block found
@@ -99,7 +106,14 @@ class AccountsVestingInfoController extends AbstractController_1.default {
                     };
                     results.push(enhancedResult);
                 }
-                AccountsVestingInfoController.sanitizedSend(res, results);
+                // Send response based on format
+                if (useObjectFormat) {
+                    const rcBlockInfo = await this.getRcBlockInfo(at);
+                    AccountsVestingInfoController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, results));
+                }
+                else {
+                    AccountsVestingInfoController.sanitizedSend(res, results);
+                }
             }
             else {
                 const hash = await this.getHashFromAt(at);

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;;;;;AAExE,kDAAuB;AAIvB,iDAAuE;AACvE,6CAA4D;AAC5D,+EAAuD;AAEvD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2CG;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,gBAAgB,EAAE,EAAE,~~EACpE~~,GAAG,EACa,EAAE;YAClB,MAAM,sBAAsB,GAAG,gBAAgB,KAAK,MAAM,CAAC;~~YAE3D~~,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,8EAA8E;oBAC9E,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,uBAAuB,CACxD,MAAM,EACN,OAAO,EACP,sBAAsB,EACtB,IAAI,eAAE,CAAC,aAAa,CAAC,CACrB,CAAC;oBAEF,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,EAAE,sBAAsB,CAAC,CAAC;gBACjG,6BAA6B,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAC1D,CAAC;QACF,CAAC,CAAC;~~QA5DD~~,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/blocks/BlocksController.js CHANGED Viewed

@@ -137,11 +137,12 @@ class BlocksController extends AbstractController_1.default {
          * @param _req Express Request
          * @param res Express Response
          */
-        this.getLatestBlock = async ({ query: { eventDocs, extrinsicDocs, finalized, noFees, decodedXcmMsgs, paraId, useRcBlock, useEvmFormat }, method, route, }, res) => {
+        this.getLatestBlock = async ({ query: { eventDocs, extrinsicDocs, finalized, noFees, decodedXcmMsgs, paraId, useRcBlock, useRcBlockFormat, useEvmFormat, }, method, route, }, res) => {
             var _a;
             const eventDocsArg = eventDocs === 'true';
             const extrinsicDocsArg = extrinsicDocs === 'true';
             const useRcBlockArg = useRcBlock === 'true';
+            const useObjectFormat = useRcBlockFormat === 'object';
             if (useRcBlockArg) {
                 const rcApi = (_a = apiRegistry_1.ApiPromiseRegistry.getApiByType('relay')[0]) === null || _a === void 0 ? void 0 : _a.api;
                 let rcHash;
@@ -157,9 +158,15 @@ class BlocksController extends AbstractController_1.default {
                     rcHash = await rcApi.rpc.chain.getFinalizedHead();
                 }
                 const rcAtResults = await this.getHashFromRcAt(rcHash);
-                // Return empty array if no Asset Hub blocks found
+                // Handle empty results based on format
                 if (rcAtResults.length === 0) {
-                    BlocksController.sanitizedSend(res, []);
+                    if (useObjectFormat) {
+                        const rcBlockInfo = await this.getRcBlockInfo(rcHash);
+                        BlocksController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, []));
+                    }
+                    else {
+                        BlocksController.sanitizedSend(res, []);
+                    }
                     return;
                 }
                 // Process each Asset Hub block found
@@ -203,7 +210,14 @@ class BlocksController extends AbstractController_1.default {
                     };
                     results.push(enhancedResult);
                 }
-                BlocksController.sanitizedSend(res, results);
+                // Send response based on format
+                if (useObjectFormat) {
+                    const rcBlockInfo = await this.getRcBlockInfo(rcHash);
+                    BlocksController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, results));
+                }
+                else {
+                    BlocksController.sanitizedSend(res, results);
+                }
                 // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
                 const path = route.path;
                 if (res.locals.metrics) {
@@ -277,15 +291,22 @@ class BlocksController extends AbstractController_1.default {
          * @param req Express Request
          * @param res Express Response
          */
-        this.getBlockById = async ({ params: { number }, query: { eventDocs, extrinsicDocs, noFees, finalizedKey, decodedXcmMsgs, paraId, useRcBlock, useEvmFormat }, method, route, }, res) => {
+        this.getBlockById = async ({ params: { number }, query: { eventDocs, extrinsicDocs, noFees, finalizedKey, decodedXcmMsgs, paraId, useRcBlock, useRcBlockFormat, useEvmFormat, }, method, route, }, res) => {
             const useRcBlockArg = useRcBlock === 'true';
+            const useObjectFormat = useRcBlockFormat === 'object';
             const checkFinalized = (0, util_1.isHex)(number);
             if (useRcBlockArg) {
                 // Treat the 'number' parameter as a relay chain block identifier
                 const rcAtResults = await this.getHashFromRcAt(number);
-                // Return empty array if no Asset Hub blocks found
+                // Handle empty results based on format
                 if (rcAtResults.length === 0) {
-                    BlocksController.sanitizedSend(res, []);
+                    if (useObjectFormat) {
+                        const rcBlockInfo = await this.getRcBlockInfo(number);
+                        BlocksController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, []));
+                    }
+                    else {
+                        BlocksController.sanitizedSend(res, []);
+                    }
                     return;
                 }
                 // Process each Asset Hub block found
@@ -336,7 +357,14 @@ class BlocksController extends AbstractController_1.default {
                     };
                     results.push(enhancedResult);
                 }
-                BlocksController.sanitizedSend(res, results);
+                // Send response based on format
+                if (useObjectFormat) {
+                    const rcBlockInfo = await this.getRcBlockInfo(number);
+                    BlocksController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, results));
+                }
+                else {
+                    BlocksController.sanitizedSend(res, results);
+                }
                 // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
                 const path = route.path;
                 if (res.locals.metrics) {
@@ -399,14 +427,21 @@ class BlocksController extends AbstractController_1.default {
          * @param req Express Request
          * @param res Express Response
          */
-        this.getBlockHeaderById = async ({ params: { number }, query: { useRcBlock } }, res) => {
+        this.getBlockHeaderById = async ({ params: { number }, query: { useRcBlock, useRcBlockFormat } }, res) => {
             const useRcBlockArg = useRcBlock === 'true';
+            const useObjectFormat = useRcBlockFormat === 'object';
             if (useRcBlockArg) {
                 // Treat the 'number' parameter as a relay chain block identifier
                 const rcAtResults = await this.getHashFromRcAt(number);
-                // Return empty array if no Asset Hub blocks found
+                // Handle empty results based on format
                 if (rcAtResults.length === 0) {
-                    BlocksController.sanitizedSend(res, []);
+                    if (useObjectFormat) {
+                        const rcBlockInfo = await this.getRcBlockInfo(number);
+                        BlocksController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, []));
+                    }
+                    else {
+                        BlocksController.sanitizedSend(res, []);
+                    }
                     return;
                 }
                 // Process each Asset Hub block found
@@ -427,7 +462,14 @@ class BlocksController extends AbstractController_1.default {
                     };
                     results.push(enhancedResult);
                 }
-                BlocksController.sanitizedSend(res, results);
+                // Send response based on format
+                if (useObjectFormat) {
+                    const rcBlockInfo = await this.getRcBlockInfo(number);
+                    BlocksController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, results));
+                }
+                else {
+                    BlocksController.sanitizedSend(res, results);
+                }
             }
             else {
                 const hash = await this.getHashForBlock(number);
@@ -441,10 +483,11 @@ class BlocksController extends AbstractController_1.default {
          * @param req Express Request
          * @param res Express Response
          */
-        this.getLatestBlockHeader = async ({ query: { finalized, useRcBlock } }, res) => {
+        this.getLatestBlockHeader = async ({ query: { finalized, useRcBlock, useRcBlockFormat } }, res) => {
             var _a;
             const paramFinalized = finalized !== 'false';
             const useRcBlockArg = useRcBlock === 'true';
+            const useObjectFormat = useRcBlockFormat === 'object';
             if (useRcBlockArg) {
                 const rcApi = (_a = apiRegistry_1.ApiPromiseRegistry.getApiByType('relay')[0]) === null || _a === void 0 ? void 0 : _a.api;
                 let rcHash;
@@ -456,9 +499,15 @@ class BlocksController extends AbstractController_1.default {
                     rcHash = rcHeader.hash;
                 }
                 const rcAtResults = await this.getHashFromRcAt(rcHash);
-                // Return empty array if no Asset Hub blocks found
+                // Handle empty results based on format
                 if (rcAtResults.length === 0) {
-                    BlocksController.sanitizedSend(res, []);
+                    if (useObjectFormat) {
+                        const rcBlockInfo = await this.getRcBlockInfo(rcHash);
+                        BlocksController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, []));
+                    }
+                    else {
+                        BlocksController.sanitizedSend(res, []);
+                    }
                     return;
                 }
                 // Process each Asset Hub block found
@@ -479,7 +528,14 @@ class BlocksController extends AbstractController_1.default {
                     };
                     results.push(enhancedResult);
                 }
-                BlocksController.sanitizedSend(res, results);
+                // Send response based on format
+                if (useObjectFormat) {
+                    const rcBlockInfo = await this.getRcBlockInfo(rcHash);
+                    BlocksController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, results));
+                }
+                else {
+                    BlocksController.sanitizedSend(res, results);
+                }
             }
             else {
                 const hash = paramFinalized ? await this.api.rpc.chain.getFinalizedHead() : undefined;
@@ -493,12 +549,13 @@ class BlocksController extends AbstractController_1.default {
          * @param req Express Request
          * @param res Express Response
          */
-        this.getBlocks = async ({ query: { range, eventDocs, extrinsicDocs, noFees, useRcBlock, useEvmFormat }, method, route }, res) => {
+        this.getBlocks = async ({ query: { range, eventDocs, extrinsicDocs, noFees, useRcBlock, useRcBlockFormat, useEvmFormat }, method, route }, res) => {
             if (!range)
                 throw new http_errors_1.BadRequest('range query parameter must be inputted.');
             // We set a max range to 500 blocks.
             const rangeOfNums = this.parseRangeOfNumbersOrThrow(range, 500);
             const useRcBlockArg = useRcBlock === 'true';
+            const useObjectFormat = useRcBlockFormat === 'object';
             const eventDocsArg = eventDocs === 'true';
             const extrinsicDocsArg = extrinsicDocs === 'true';
             const queryFinalizedHead = !this.options.finalizes ? false : true;
@@ -575,7 +632,19 @@ class BlocksController extends AbstractController_1.default {
              * Sort blocks from least to greatest.
              */
             blocks.sort((a, b) => a.number.toNumber() - b.number.toNumber());
-            BlocksController.sanitizedSend(res, blocks);
+            // Note: For range queries with useRcBlockFormat=object, the response format
+            // doesn't apply the same way since we're querying multiple RC blocks.
+            // The array format is maintained for consistency with range queries.
+            if (useRcBlockArg && useObjectFormat) {
+                // For range queries with object format, we wrap all blocks in a single response
+                // Note: This uses a synthetic rcBlock since we're querying a range
+                const firstRcBlockNumber = rangeOfNums[0].toString();
+                const rcBlockInfo = await this.getRcBlockInfo(firstRcBlockNumber);
+                BlocksController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, blocks));
+            }
+            else {
+                BlocksController.sanitizedSend(res, blocks);
+            }
             // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
             const path = route.path;
             if (res.locals.metrics) {