@substrate/api-sidecar 20.13.2 → 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.
- package/build/package.json +3 -2
- package/build/src/chains-config/assetHubKusamaControllers.js +2 -1
- package/build/src/chains-config/assetHubKusamaControllers.js.map +1 -1
- package/build/src/chains-config/assetHubNextWestendControllers.js +2 -1
- package/build/src/chains-config/assetHubNextWestendControllers.js.map +1 -1
- package/build/src/chains-config/assetHubPolkadotControllers.js +2 -1
- package/build/src/chains-config/assetHubPolkadotControllers.js.map +1 -1
- package/build/src/chains-config/assetHubWestendControllers.js +2 -1
- package/build/src/chains-config/assetHubWestendControllers.js.map +1 -1
- package/build/src/chains-config/defaultControllers.js +2 -1
- package/build/src/chains-config/defaultControllers.js.map +1 -1
- package/build/src/chains-config/kusamaControllers.js +2 -1
- package/build/src/chains-config/kusamaControllers.js.map +1 -1
- package/build/src/chains-config/polkadotControllers.js +2 -1
- package/build/src/chains-config/polkadotControllers.js.map +1 -1
- package/build/src/chains-config/westendControllers.js +2 -1
- package/build/src/chains-config/westendControllers.js.map +1 -1
- package/build/src/controllers/AbstractController.d.ts +16 -0
- package/build/src/controllers/AbstractController.js +33 -0
- package/build/src/controllers/AbstractController.js.map +1 -1
- package/build/src/controllers/accounts/AccountsAssetsController.js +36 -8
- package/build/src/controllers/accounts/AccountsAssetsController.js.map +1 -1
- package/build/src/controllers/accounts/AccountsBalanceInfoController.js +18 -4
- package/build/src/controllers/accounts/AccountsBalanceInfoController.js.map +1 -1
- package/build/src/controllers/accounts/AccountsForeignAssetsController.js +18 -4
- package/build/src/controllers/accounts/AccountsForeignAssetsController.js.map +1 -1
- package/build/src/controllers/accounts/AccountsPoolAssetsController.js +36 -8
- package/build/src/controllers/accounts/AccountsPoolAssetsController.js.map +1 -1
- package/build/src/controllers/accounts/AccountsProxyInfoController.js +18 -4
- package/build/src/controllers/accounts/AccountsProxyInfoController.js.map +1 -1
- package/build/src/controllers/accounts/AccountsStakingInfoController.js +18 -4
- package/build/src/controllers/accounts/AccountsStakingInfoController.js.map +1 -1
- package/build/src/controllers/accounts/AccountsStakingPayoutsController.js +18 -4
- package/build/src/controllers/accounts/AccountsStakingPayoutsController.js.map +1 -1
- package/build/src/controllers/accounts/AccountsVestingInfoController.js +18 -4
- package/build/src/controllers/accounts/AccountsVestingInfoController.js.map +1 -1
- package/build/src/controllers/blocks/BlocksController.js +87 -18
- package/build/src/controllers/blocks/BlocksController.js.map +1 -1
- package/build/src/controllers/blocks/BlocksExtrinsicsController.js +18 -4
- package/build/src/controllers/blocks/BlocksExtrinsicsController.js.map +1 -1
- package/build/src/controllers/blocks/BlocksRawExtrinsicsController.js +18 -4
- package/build/src/controllers/blocks/BlocksRawExtrinsicsController.js.map +1 -1
- package/build/src/controllers/index.d.ts +2 -1
- package/build/src/controllers/index.js +2 -1
- package/build/src/controllers/index.js.map +1 -1
- package/build/src/controllers/pallets/PalletsAssetConversionController.js +36 -8
- package/build/src/controllers/pallets/PalletsAssetConversionController.js.map +1 -1
- package/build/src/controllers/pallets/PalletsAssetsController.js +18 -4
- package/build/src/controllers/pallets/PalletsAssetsController.js.map +1 -1
- package/build/src/controllers/pallets/PalletsConstsController.js +36 -8
- package/build/src/controllers/pallets/PalletsConstsController.js.map +1 -1
- package/build/src/controllers/pallets/PalletsDispatchablesController.js +36 -8
- package/build/src/controllers/pallets/PalletsDispatchablesController.js.map +1 -1
- package/build/src/controllers/pallets/PalletsErrorsController.js +36 -8
- package/build/src/controllers/pallets/PalletsErrorsController.js.map +1 -1
- package/build/src/controllers/pallets/PalletsEventsController.js +36 -8
- package/build/src/controllers/pallets/PalletsEventsController.js.map +1 -1
- package/build/src/controllers/pallets/PalletsForeignAssetsController.js +18 -4
- package/build/src/controllers/pallets/PalletsForeignAssetsController.js.map +1 -1
- package/build/src/controllers/pallets/PalletsNominationPoolsController.js +36 -8
- package/build/src/controllers/pallets/PalletsNominationPoolsController.js.map +1 -1
- package/build/src/controllers/pallets/PalletsOnGoingReferendaController.js +18 -4
- package/build/src/controllers/pallets/PalletsOnGoingReferendaController.js.map +1 -1
- package/build/src/controllers/pallets/PalletsPoolAssetsController.js +18 -4
- package/build/src/controllers/pallets/PalletsPoolAssetsController.js.map +1 -1
- package/build/src/controllers/pallets/PalletsStakingProgressController.js +18 -4
- package/build/src/controllers/pallets/PalletsStakingProgressController.js.map +1 -1
- package/build/src/controllers/pallets/PalletsStakingValidatorsController.js +18 -4
- package/build/src/controllers/pallets/PalletsStakingValidatorsController.js.map +1 -1
- package/build/src/controllers/pallets/PalletsStorageController.js +36 -8
- package/build/src/controllers/pallets/PalletsStorageController.js.map +1 -1
- package/build/src/controllers/transaction/TransactionMetadataBlobController.d.ts +55 -0
- package/build/src/controllers/transaction/TransactionMetadataBlobController.js +91 -0
- package/build/src/controllers/transaction/TransactionMetadataBlobController.js.map +1 -0
- package/build/src/controllers/transaction/index.d.ts +1 -0
- package/build/src/controllers/transaction/index.js +4 -2
- package/build/src/controllers/transaction/index.js.map +1 -1
- package/build/src/middleware/validate/validateUseRcBlockMiddleware.d.ts +5 -4
- package/build/src/middleware/validate/validateUseRcBlockMiddleware.js +20 -6
- package/build/src/middleware/validate/validateUseRcBlockMiddleware.js.map +1 -1
- package/build/src/services/pallets/PalletsStakingProgressService.js +19 -2
- package/build/src/services/pallets/PalletsStakingProgressService.js.map +1 -1
- package/build/src/services/pallets/PalletsStakingProgressService.spec.js +19 -19
- package/build/src/services/pallets/PalletsStakingProgressService.spec.js.map +1 -1
- package/build/src/services/transaction/TransactionMetadataBlobService.d.ts +23 -0
- package/build/src/services/transaction/TransactionMetadataBlobService.js +144 -0
- package/build/src/services/transaction/TransactionMetadataBlobService.js.map +1 -0
- package/build/src/services/transaction/TransactionMetadataBlobService.spec.d.ts +1 -0
- package/build/src/services/transaction/TransactionMetadataBlobService.spec.js +269 -0
- package/build/src/services/transaction/TransactionMetadataBlobService.spec.js.map +1 -0
- package/build/src/services/transaction/index.d.ts +1 -0
- package/build/src/services/transaction/index.js +2 -1
- package/build/src/services/transaction/index.js.map +1 -1
- package/build/src/types/requests.d.ts +57 -0
- package/build/src/types/requests.js +1 -1
- package/build/src/types/responses/RcBlockFormat.d.ts +24 -0
- package/build/src/types/responses/RcBlockFormat.js +18 -0
- package/build/src/types/responses/RcBlockFormat.js.map +1 -0
- package/build/src/types/responses/TransactionMetadataBlob.d.ts +11 -0
- package/build/src/types/responses/TransactionMetadataBlob.js +18 -0
- package/build/src/types/responses/TransactionMetadataBlob.js.map +1 -0
- package/build/src/types/responses/index.d.ts +2 -0
- package/build/src/types/responses/index.js +3 -1
- package/build/src/types/responses/index.js.map +1 -1
- package/package.json +3 -2
|
@@ -83,12 +83,19 @@ const AbstractController_1 = __importDefault(require("../AbstractController"));
|
|
|
83
83
|
class AccountsPoolAssetsController extends AbstractController_1.default {
|
|
84
84
|
constructor(api) {
|
|
85
85
|
super(api, '/accounts/:address', new accounts_1.AccountsPoolAssetsService(api));
|
|
86
|
-
this.getPoolAssetBalances = async ({ params: { address }, query: { at, useRcBlock, assets } }, res) => {
|
|
86
|
+
this.getPoolAssetBalances = async ({ params: { address }, query: { at, useRcBlock, useRcBlockFormat, assets } }, res) => {
|
|
87
|
+
const useObjectFormat = useRcBlockFormat === 'object';
|
|
87
88
|
if (useRcBlock === 'true') {
|
|
88
89
|
const rcAtResults = await this.getHashFromRcAt(at);
|
|
89
|
-
//
|
|
90
|
+
// Handle empty results based on format
|
|
90
91
|
if (rcAtResults.length === 0) {
|
|
91
|
-
|
|
92
|
+
if (useObjectFormat) {
|
|
93
|
+
const rcBlockInfo = await this.getRcBlockInfo(at);
|
|
94
|
+
AccountsPoolAssetsController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, []));
|
|
95
|
+
}
|
|
96
|
+
else {
|
|
97
|
+
AccountsPoolAssetsController.sanitizedSend(res, []);
|
|
98
|
+
}
|
|
92
99
|
return;
|
|
93
100
|
}
|
|
94
101
|
const assetsArray = Array.isArray(assets) ? this.parseQueryParamArrayOrThrow(assets) : [];
|
|
@@ -106,7 +113,14 @@ class AccountsPoolAssetsController extends AbstractController_1.default {
|
|
|
106
113
|
};
|
|
107
114
|
results.push(enhancedResult);
|
|
108
115
|
}
|
|
109
|
-
|
|
116
|
+
// Send response based on format
|
|
117
|
+
if (useObjectFormat) {
|
|
118
|
+
const rcBlockInfo = await this.getRcBlockInfo(at);
|
|
119
|
+
AccountsPoolAssetsController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, results));
|
|
120
|
+
}
|
|
121
|
+
else {
|
|
122
|
+
AccountsPoolAssetsController.sanitizedSend(res, results);
|
|
123
|
+
}
|
|
110
124
|
}
|
|
111
125
|
else {
|
|
112
126
|
const hash = await this.getHashFromAt(at);
|
|
@@ -115,16 +129,23 @@ class AccountsPoolAssetsController extends AbstractController_1.default {
|
|
|
115
129
|
AccountsPoolAssetsController.sanitizedSend(res, result);
|
|
116
130
|
}
|
|
117
131
|
};
|
|
118
|
-
this.getPoolAssetApprovals = async ({ params: { address }, query: { at, useRcBlock, delegate, assetId } }, res) => {
|
|
132
|
+
this.getPoolAssetApprovals = async ({ params: { address }, query: { at, useRcBlock, useRcBlockFormat, delegate, assetId } }, res) => {
|
|
119
133
|
if (typeof delegate !== 'string' || typeof assetId !== 'string') {
|
|
120
134
|
throw new http_errors_1.BadRequest('Must include a `delegate` and `assetId` query param');
|
|
121
135
|
}
|
|
122
136
|
const id = this.parseNumberOrThrow(assetId, '`assetId` provided is not a number.');
|
|
137
|
+
const useObjectFormat = useRcBlockFormat === 'object';
|
|
123
138
|
if (useRcBlock === 'true') {
|
|
124
139
|
const rcAtResults = await this.getHashFromRcAt(at);
|
|
125
|
-
//
|
|
140
|
+
// Handle empty results based on format
|
|
126
141
|
if (rcAtResults.length === 0) {
|
|
127
|
-
|
|
142
|
+
if (useObjectFormat) {
|
|
143
|
+
const rcBlockInfo = await this.getRcBlockInfo(at);
|
|
144
|
+
AccountsPoolAssetsController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, []));
|
|
145
|
+
}
|
|
146
|
+
else {
|
|
147
|
+
AccountsPoolAssetsController.sanitizedSend(res, []);
|
|
148
|
+
}
|
|
128
149
|
return;
|
|
129
150
|
}
|
|
130
151
|
// Process each Asset Hub block found
|
|
@@ -141,7 +162,14 @@ class AccountsPoolAssetsController extends AbstractController_1.default {
|
|
|
141
162
|
};
|
|
142
163
|
results.push(enhancedResult);
|
|
143
164
|
}
|
|
144
|
-
|
|
165
|
+
// Send response based on format
|
|
166
|
+
if (useObjectFormat) {
|
|
167
|
+
const rcBlockInfo = await this.getRcBlockInfo(at);
|
|
168
|
+
AccountsPoolAssetsController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, results));
|
|
169
|
+
}
|
|
170
|
+
else {
|
|
171
|
+
AccountsPoolAssetsController.sanitizedSend(res, results);
|
|
172
|
+
}
|
|
145
173
|
}
|
|
146
174
|
else {
|
|
147
175
|
const hash = await this.getHashFromAt(at);
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"AccountsPoolAssetsController.js","sourceRoot":"","sources":["../../../../src/controllers/accounts/AccountsPoolAssetsController.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,12 +30,19 @@ class AccountsProxyInfoController extends AbstractController_1.default {
|
|
|
30
30
|
* @param req Express Request
|
|
31
31
|
* @param res Express Response
|
|
32
32
|
*/
|
|
33
|
-
this.getAccountProxyInfo = async ({ params: { address }, query: { at, useRcBlock } }, res) => {
|
|
33
|
+
this.getAccountProxyInfo = async ({ params: { address }, query: { at, useRcBlock, useRcBlockFormat } }, res) => {
|
|
34
|
+
const useObjectFormat = useRcBlockFormat === 'object';
|
|
34
35
|
if (useRcBlock === 'true') {
|
|
35
36
|
const rcAtResults = await this.getHashFromRcAt(at);
|
|
36
|
-
//
|
|
37
|
+
// Handle empty results based on format
|
|
37
38
|
if (rcAtResults.length === 0) {
|
|
38
|
-
|
|
39
|
+
if (useObjectFormat) {
|
|
40
|
+
const rcBlockInfo = await this.getRcBlockInfo(at);
|
|
41
|
+
AccountsProxyInfoController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, []));
|
|
42
|
+
}
|
|
43
|
+
else {
|
|
44
|
+
AccountsProxyInfoController.sanitizedSend(res, []);
|
|
45
|
+
}
|
|
39
46
|
return;
|
|
40
47
|
}
|
|
41
48
|
// Process each Asset Hub block found
|
|
@@ -52,7 +59,14 @@ class AccountsProxyInfoController extends AbstractController_1.default {
|
|
|
52
59
|
};
|
|
53
60
|
results.push(enhancedResult);
|
|
54
61
|
}
|
|
55
|
-
|
|
62
|
+
// Send response based on format
|
|
63
|
+
if (useObjectFormat) {
|
|
64
|
+
const rcBlockInfo = await this.getRcBlockInfo(at);
|
|
65
|
+
AccountsProxyInfoController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, results));
|
|
66
|
+
}
|
|
67
|
+
else {
|
|
68
|
+
AccountsProxyInfoController.sanitizedSend(res, results);
|
|
69
|
+
}
|
|
56
70
|
}
|
|
57
71
|
else {
|
|
58
72
|
const hash = await this.getHashFromAt(at);
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"AccountsProxyInfoController.js","sourceRoot":"","sources":["../../../../src/controllers/accounts/AccountsProxyInfoController.ts"],"names":[],"mappings":"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"}
|
|
@@ -87,14 +87,21 @@ class AccountsStakingInfoController extends AbstractController_1.default {
|
|
|
87
87
|
* @param req Express Request
|
|
88
88
|
* @param res Express Response
|
|
89
89
|
*/
|
|
90
|
-
this.getAccountStakingInfo = async ({ params: { address }, query: { at, useRcBlock, includeClaimedRewards } }, res) => {
|
|
90
|
+
this.getAccountStakingInfo = async ({ params: { address }, query: { at, useRcBlock, useRcBlockFormat, includeClaimedRewards } }, res) => {
|
|
91
91
|
const { isAssetHubMigrated } = apiRegistry_1.ApiPromiseRegistry.assetHubInfo;
|
|
92
92
|
const includeClaimedRewardsArg = includeClaimedRewards !== 'false';
|
|
93
|
+
const useObjectFormat = useRcBlockFormat === 'object';
|
|
93
94
|
if (useRcBlock === 'true') {
|
|
94
95
|
const rcAtResults = await this.getHashFromRcAt(at);
|
|
95
|
-
//
|
|
96
|
+
// Handle empty results based on format
|
|
96
97
|
if (rcAtResults.length === 0) {
|
|
97
|
-
|
|
98
|
+
if (useObjectFormat) {
|
|
99
|
+
const rcBlockInfo = await this.getRcBlockInfo(at);
|
|
100
|
+
AccountsStakingInfoController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, []));
|
|
101
|
+
}
|
|
102
|
+
else {
|
|
103
|
+
AccountsStakingInfoController.sanitizedSend(res, []);
|
|
104
|
+
}
|
|
98
105
|
return;
|
|
99
106
|
}
|
|
100
107
|
// Process each Asset Hub block found
|
|
@@ -117,7 +124,14 @@ class AccountsStakingInfoController extends AbstractController_1.default {
|
|
|
117
124
|
};
|
|
118
125
|
results.push(enhancedResult);
|
|
119
126
|
}
|
|
120
|
-
|
|
127
|
+
// Send response based on format
|
|
128
|
+
if (useObjectFormat) {
|
|
129
|
+
const rcBlockInfo = await this.getRcBlockInfo(at);
|
|
130
|
+
AccountsStakingInfoController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, results));
|
|
131
|
+
}
|
|
132
|
+
else {
|
|
133
|
+
AccountsStakingInfoController.sanitizedSend(res, results);
|
|
134
|
+
}
|
|
121
135
|
}
|
|
122
136
|
else {
|
|
123
137
|
const hash = await this.getHashFromAt(at);
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"AccountsStakingInfoController.js","sourceRoot":"","sources":["../../../../src/controllers/accounts/AccountsStakingInfoController.ts"],"names":[],"mappings":"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"}
|
|
@@ -95,15 +95,22 @@ class AccountsStakingPayoutsController extends AbstractController_1.default {
|
|
|
95
95
|
* @param req Express Request
|
|
96
96
|
* @param res Express Response
|
|
97
97
|
*/
|
|
98
|
-
this.getStakingPayoutsByAccountId = async ({ params: { address }, query: { depth, era, unclaimedOnly, at, useRcBlock } }, res) => {
|
|
98
|
+
this.getStakingPayoutsByAccountId = async ({ params: { address }, query: { depth, era, unclaimedOnly, at, useRcBlock, useRcBlockFormat } }, res) => {
|
|
99
99
|
const { specName } = this;
|
|
100
100
|
const isKusama = specName.toString().toLowerCase() === 'kusama';
|
|
101
101
|
const { isAssetHubMigrated } = apiRegistry_1.ApiPromiseRegistry.assetHubInfo;
|
|
102
|
+
const useObjectFormat = useRcBlockFormat === 'object';
|
|
102
103
|
if (useRcBlock === 'true') {
|
|
103
104
|
const rcAtResults = await this.getHashFromRcAt(at);
|
|
104
|
-
//
|
|
105
|
+
// Handle empty results based on format
|
|
105
106
|
if (rcAtResults.length === 0) {
|
|
106
|
-
|
|
107
|
+
if (useObjectFormat) {
|
|
108
|
+
const rcBlockInfo = await this.getRcBlockInfo(at);
|
|
109
|
+
AccountsStakingPayoutsController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, []));
|
|
110
|
+
}
|
|
111
|
+
else {
|
|
112
|
+
AccountsStakingPayoutsController.sanitizedSend(res, []);
|
|
113
|
+
}
|
|
107
114
|
return;
|
|
108
115
|
}
|
|
109
116
|
// Process each Asset Hub block found
|
|
@@ -144,7 +151,14 @@ class AccountsStakingPayoutsController extends AbstractController_1.default {
|
|
|
144
151
|
};
|
|
145
152
|
results.push(enhancedResult);
|
|
146
153
|
}
|
|
147
|
-
|
|
154
|
+
// Send response based on format
|
|
155
|
+
if (useObjectFormat) {
|
|
156
|
+
const rcBlockInfo = await this.getRcBlockInfo(at);
|
|
157
|
+
AccountsStakingPayoutsController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, results));
|
|
158
|
+
}
|
|
159
|
+
else {
|
|
160
|
+
AccountsStakingPayoutsController.sanitizedSend(res, results);
|
|
161
|
+
}
|
|
148
162
|
}
|
|
149
163
|
else {
|
|
150
164
|
let hash = await this.getHashFromAt(at);
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"AccountsStakingPayoutsController.js","sourceRoot":"","sources":["../../../../src/controllers/accounts/AccountsStakingPayoutsController.ts"],"names":[],"mappings":"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"}
|
|
@@ -75,13 +75,20 @@ class AccountsVestingInfoController extends AbstractController_1.default {
|
|
|
75
75
|
* @param req Express Request
|
|
76
76
|
* @param res Express Response
|
|
77
77
|
*/
|
|
78
|
-
this.getAccountVestingInfo = async ({ params: { address }, query: { at, useRcBlock, includeClaimable } }, res) => {
|
|
78
|
+
this.getAccountVestingInfo = async ({ params: { address }, query: { at, useRcBlock, useRcBlockFormat, includeClaimable } }, res) => {
|
|
79
79
|
const shouldIncludeClaimable = includeClaimable === 'true';
|
|
80
|
+
const useObjectFormat = useRcBlockFormat === 'object';
|
|
80
81
|
if (useRcBlock === 'true') {
|
|
81
82
|
const rcAtResults = await this.getHashFromRcAt(at);
|
|
82
|
-
//
|
|
83
|
+
// Handle empty results based on format
|
|
83
84
|
if (rcAtResults.length === 0) {
|
|
84
|
-
|
|
85
|
+
if (useObjectFormat) {
|
|
86
|
+
const rcBlockInfo = await this.getRcBlockInfo(at);
|
|
87
|
+
AccountsVestingInfoController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, []));
|
|
88
|
+
}
|
|
89
|
+
else {
|
|
90
|
+
AccountsVestingInfoController.sanitizedSend(res, []);
|
|
91
|
+
}
|
|
85
92
|
return;
|
|
86
93
|
}
|
|
87
94
|
// Process each Asset Hub block found
|
|
@@ -99,7 +106,14 @@ class AccountsVestingInfoController extends AbstractController_1.default {
|
|
|
99
106
|
};
|
|
100
107
|
results.push(enhancedResult);
|
|
101
108
|
}
|
|
102
|
-
|
|
109
|
+
// Send response based on format
|
|
110
|
+
if (useObjectFormat) {
|
|
111
|
+
const rcBlockInfo = await this.getRcBlockInfo(at);
|
|
112
|
+
AccountsVestingInfoController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, results));
|
|
113
|
+
}
|
|
114
|
+
else {
|
|
115
|
+
AccountsVestingInfoController.sanitizedSend(res, results);
|
|
116
|
+
}
|
|
103
117
|
}
|
|
104
118
|
else {
|
|
105
119
|
const hash = await this.getHashFromAt(at);
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"AccountsVestingInfoController.js","sourceRoot":"","sources":["../../../../src/controllers/accounts/AccountsVestingInfoController.ts"],"names":[],"mappings":"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"}
|
|
@@ -137,11 +137,12 @@ class BlocksController extends AbstractController_1.default {
|
|
|
137
137
|
* @param _req Express Request
|
|
138
138
|
* @param res Express Response
|
|
139
139
|
*/
|
|
140
|
-
this.getLatestBlock = async ({ query: { eventDocs, extrinsicDocs, finalized, noFees, decodedXcmMsgs, paraId, useRcBlock, useEvmFormat }, method, route, }, res) => {
|
|
140
|
+
this.getLatestBlock = async ({ query: { eventDocs, extrinsicDocs, finalized, noFees, decodedXcmMsgs, paraId, useRcBlock, useRcBlockFormat, useEvmFormat, }, method, route, }, res) => {
|
|
141
141
|
var _a;
|
|
142
142
|
const eventDocsArg = eventDocs === 'true';
|
|
143
143
|
const extrinsicDocsArg = extrinsicDocs === 'true';
|
|
144
144
|
const useRcBlockArg = useRcBlock === 'true';
|
|
145
|
+
const useObjectFormat = useRcBlockFormat === 'object';
|
|
145
146
|
if (useRcBlockArg) {
|
|
146
147
|
const rcApi = (_a = apiRegistry_1.ApiPromiseRegistry.getApiByType('relay')[0]) === null || _a === void 0 ? void 0 : _a.api;
|
|
147
148
|
let rcHash;
|
|
@@ -157,9 +158,15 @@ class BlocksController extends AbstractController_1.default {
|
|
|
157
158
|
rcHash = await rcApi.rpc.chain.getFinalizedHead();
|
|
158
159
|
}
|
|
159
160
|
const rcAtResults = await this.getHashFromRcAt(rcHash);
|
|
160
|
-
//
|
|
161
|
+
// Handle empty results based on format
|
|
161
162
|
if (rcAtResults.length === 0) {
|
|
162
|
-
|
|
163
|
+
if (useObjectFormat) {
|
|
164
|
+
const rcBlockInfo = await this.getRcBlockInfo(rcHash);
|
|
165
|
+
BlocksController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, []));
|
|
166
|
+
}
|
|
167
|
+
else {
|
|
168
|
+
BlocksController.sanitizedSend(res, []);
|
|
169
|
+
}
|
|
163
170
|
return;
|
|
164
171
|
}
|
|
165
172
|
// Process each Asset Hub block found
|
|
@@ -203,7 +210,14 @@ class BlocksController extends AbstractController_1.default {
|
|
|
203
210
|
};
|
|
204
211
|
results.push(enhancedResult);
|
|
205
212
|
}
|
|
206
|
-
|
|
213
|
+
// Send response based on format
|
|
214
|
+
if (useObjectFormat) {
|
|
215
|
+
const rcBlockInfo = await this.getRcBlockInfo(rcHash);
|
|
216
|
+
BlocksController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, results));
|
|
217
|
+
}
|
|
218
|
+
else {
|
|
219
|
+
BlocksController.sanitizedSend(res, results);
|
|
220
|
+
}
|
|
207
221
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
|
|
208
222
|
const path = route.path;
|
|
209
223
|
if (res.locals.metrics) {
|
|
@@ -277,15 +291,22 @@ class BlocksController extends AbstractController_1.default {
|
|
|
277
291
|
* @param req Express Request
|
|
278
292
|
* @param res Express Response
|
|
279
293
|
*/
|
|
280
|
-
this.getBlockById = async ({ params: { number }, query: { eventDocs, extrinsicDocs, noFees, finalizedKey, decodedXcmMsgs, paraId, useRcBlock, useEvmFormat }, method, route, }, res) => {
|
|
294
|
+
this.getBlockById = async ({ params: { number }, query: { eventDocs, extrinsicDocs, noFees, finalizedKey, decodedXcmMsgs, paraId, useRcBlock, useRcBlockFormat, useEvmFormat, }, method, route, }, res) => {
|
|
281
295
|
const useRcBlockArg = useRcBlock === 'true';
|
|
296
|
+
const useObjectFormat = useRcBlockFormat === 'object';
|
|
282
297
|
const checkFinalized = (0, util_1.isHex)(number);
|
|
283
298
|
if (useRcBlockArg) {
|
|
284
299
|
// Treat the 'number' parameter as a relay chain block identifier
|
|
285
300
|
const rcAtResults = await this.getHashFromRcAt(number);
|
|
286
|
-
//
|
|
301
|
+
// Handle empty results based on format
|
|
287
302
|
if (rcAtResults.length === 0) {
|
|
288
|
-
|
|
303
|
+
if (useObjectFormat) {
|
|
304
|
+
const rcBlockInfo = await this.getRcBlockInfo(number);
|
|
305
|
+
BlocksController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, []));
|
|
306
|
+
}
|
|
307
|
+
else {
|
|
308
|
+
BlocksController.sanitizedSend(res, []);
|
|
309
|
+
}
|
|
289
310
|
return;
|
|
290
311
|
}
|
|
291
312
|
// Process each Asset Hub block found
|
|
@@ -336,7 +357,14 @@ class BlocksController extends AbstractController_1.default {
|
|
|
336
357
|
};
|
|
337
358
|
results.push(enhancedResult);
|
|
338
359
|
}
|
|
339
|
-
|
|
360
|
+
// Send response based on format
|
|
361
|
+
if (useObjectFormat) {
|
|
362
|
+
const rcBlockInfo = await this.getRcBlockInfo(number);
|
|
363
|
+
BlocksController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, results));
|
|
364
|
+
}
|
|
365
|
+
else {
|
|
366
|
+
BlocksController.sanitizedSend(res, results);
|
|
367
|
+
}
|
|
340
368
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
|
|
341
369
|
const path = route.path;
|
|
342
370
|
if (res.locals.metrics) {
|
|
@@ -399,14 +427,21 @@ class BlocksController extends AbstractController_1.default {
|
|
|
399
427
|
* @param req Express Request
|
|
400
428
|
* @param res Express Response
|
|
401
429
|
*/
|
|
402
|
-
this.getBlockHeaderById = async ({ params: { number }, query: { useRcBlock } }, res) => {
|
|
430
|
+
this.getBlockHeaderById = async ({ params: { number }, query: { useRcBlock, useRcBlockFormat } }, res) => {
|
|
403
431
|
const useRcBlockArg = useRcBlock === 'true';
|
|
432
|
+
const useObjectFormat = useRcBlockFormat === 'object';
|
|
404
433
|
if (useRcBlockArg) {
|
|
405
434
|
// Treat the 'number' parameter as a relay chain block identifier
|
|
406
435
|
const rcAtResults = await this.getHashFromRcAt(number);
|
|
407
|
-
//
|
|
436
|
+
// Handle empty results based on format
|
|
408
437
|
if (rcAtResults.length === 0) {
|
|
409
|
-
|
|
438
|
+
if (useObjectFormat) {
|
|
439
|
+
const rcBlockInfo = await this.getRcBlockInfo(number);
|
|
440
|
+
BlocksController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, []));
|
|
441
|
+
}
|
|
442
|
+
else {
|
|
443
|
+
BlocksController.sanitizedSend(res, []);
|
|
444
|
+
}
|
|
410
445
|
return;
|
|
411
446
|
}
|
|
412
447
|
// Process each Asset Hub block found
|
|
@@ -427,7 +462,14 @@ class BlocksController extends AbstractController_1.default {
|
|
|
427
462
|
};
|
|
428
463
|
results.push(enhancedResult);
|
|
429
464
|
}
|
|
430
|
-
|
|
465
|
+
// Send response based on format
|
|
466
|
+
if (useObjectFormat) {
|
|
467
|
+
const rcBlockInfo = await this.getRcBlockInfo(number);
|
|
468
|
+
BlocksController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, results));
|
|
469
|
+
}
|
|
470
|
+
else {
|
|
471
|
+
BlocksController.sanitizedSend(res, results);
|
|
472
|
+
}
|
|
431
473
|
}
|
|
432
474
|
else {
|
|
433
475
|
const hash = await this.getHashForBlock(number);
|
|
@@ -441,10 +483,11 @@ class BlocksController extends AbstractController_1.default {
|
|
|
441
483
|
* @param req Express Request
|
|
442
484
|
* @param res Express Response
|
|
443
485
|
*/
|
|
444
|
-
this.getLatestBlockHeader = async ({ query: { finalized, useRcBlock } }, res) => {
|
|
486
|
+
this.getLatestBlockHeader = async ({ query: { finalized, useRcBlock, useRcBlockFormat } }, res) => {
|
|
445
487
|
var _a;
|
|
446
488
|
const paramFinalized = finalized !== 'false';
|
|
447
489
|
const useRcBlockArg = useRcBlock === 'true';
|
|
490
|
+
const useObjectFormat = useRcBlockFormat === 'object';
|
|
448
491
|
if (useRcBlockArg) {
|
|
449
492
|
const rcApi = (_a = apiRegistry_1.ApiPromiseRegistry.getApiByType('relay')[0]) === null || _a === void 0 ? void 0 : _a.api;
|
|
450
493
|
let rcHash;
|
|
@@ -456,9 +499,15 @@ class BlocksController extends AbstractController_1.default {
|
|
|
456
499
|
rcHash = rcHeader.hash;
|
|
457
500
|
}
|
|
458
501
|
const rcAtResults = await this.getHashFromRcAt(rcHash);
|
|
459
|
-
//
|
|
502
|
+
// Handle empty results based on format
|
|
460
503
|
if (rcAtResults.length === 0) {
|
|
461
|
-
|
|
504
|
+
if (useObjectFormat) {
|
|
505
|
+
const rcBlockInfo = await this.getRcBlockInfo(rcHash);
|
|
506
|
+
BlocksController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, []));
|
|
507
|
+
}
|
|
508
|
+
else {
|
|
509
|
+
BlocksController.sanitizedSend(res, []);
|
|
510
|
+
}
|
|
462
511
|
return;
|
|
463
512
|
}
|
|
464
513
|
// Process each Asset Hub block found
|
|
@@ -479,7 +528,14 @@ class BlocksController extends AbstractController_1.default {
|
|
|
479
528
|
};
|
|
480
529
|
results.push(enhancedResult);
|
|
481
530
|
}
|
|
482
|
-
|
|
531
|
+
// Send response based on format
|
|
532
|
+
if (useObjectFormat) {
|
|
533
|
+
const rcBlockInfo = await this.getRcBlockInfo(rcHash);
|
|
534
|
+
BlocksController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, results));
|
|
535
|
+
}
|
|
536
|
+
else {
|
|
537
|
+
BlocksController.sanitizedSend(res, results);
|
|
538
|
+
}
|
|
483
539
|
}
|
|
484
540
|
else {
|
|
485
541
|
const hash = paramFinalized ? await this.api.rpc.chain.getFinalizedHead() : undefined;
|
|
@@ -493,12 +549,13 @@ class BlocksController extends AbstractController_1.default {
|
|
|
493
549
|
* @param req Express Request
|
|
494
550
|
* @param res Express Response
|
|
495
551
|
*/
|
|
496
|
-
this.getBlocks = async ({ query: { range, eventDocs, extrinsicDocs, noFees, useRcBlock, useEvmFormat }, method, route }, res) => {
|
|
552
|
+
this.getBlocks = async ({ query: { range, eventDocs, extrinsicDocs, noFees, useRcBlock, useRcBlockFormat, useEvmFormat }, method, route }, res) => {
|
|
497
553
|
if (!range)
|
|
498
554
|
throw new http_errors_1.BadRequest('range query parameter must be inputted.');
|
|
499
555
|
// We set a max range to 500 blocks.
|
|
500
556
|
const rangeOfNums = this.parseRangeOfNumbersOrThrow(range, 500);
|
|
501
557
|
const useRcBlockArg = useRcBlock === 'true';
|
|
558
|
+
const useObjectFormat = useRcBlockFormat === 'object';
|
|
502
559
|
const eventDocsArg = eventDocs === 'true';
|
|
503
560
|
const extrinsicDocsArg = extrinsicDocs === 'true';
|
|
504
561
|
const queryFinalizedHead = !this.options.finalizes ? false : true;
|
|
@@ -575,7 +632,19 @@ class BlocksController extends AbstractController_1.default {
|
|
|
575
632
|
* Sort blocks from least to greatest.
|
|
576
633
|
*/
|
|
577
634
|
blocks.sort((a, b) => a.number.toNumber() - b.number.toNumber());
|
|
578
|
-
|
|
635
|
+
// Note: For range queries with useRcBlockFormat=object, the response format
|
|
636
|
+
// doesn't apply the same way since we're querying multiple RC blocks.
|
|
637
|
+
// The array format is maintained for consistency with range queries.
|
|
638
|
+
if (useRcBlockArg && useObjectFormat) {
|
|
639
|
+
// For range queries with object format, we wrap all blocks in a single response
|
|
640
|
+
// Note: This uses a synthetic rcBlock since we're querying a range
|
|
641
|
+
const firstRcBlockNumber = rangeOfNums[0].toString();
|
|
642
|
+
const rcBlockInfo = await this.getRcBlockInfo(firstRcBlockNumber);
|
|
643
|
+
BlocksController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, blocks));
|
|
644
|
+
}
|
|
645
|
+
else {
|
|
646
|
+
BlocksController.sanitizedSend(res, blocks);
|
|
647
|
+
}
|
|
579
648
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
|
|
580
649
|
const path = route.path;
|
|
581
650
|
if (res.locals.metrics) {
|