@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.
- 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/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
|
@@ -1 +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,iDAAsD;AACtD,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;QAa9E,wBAAmB,GAAiE,KAAK,EAChG,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,kBAAkB,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"PalletsDispatchablesController.js","sourceRoot":"","sources":["../../../../src/controllers/pallets/PalletsDispatchablesController.ts"],"names":[],"mappings":"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"}
|
|
@@ -36,13 +36,20 @@ const AbstractController_1 = __importDefault(require("../AbstractController"));
|
|
|
36
36
|
class PalletsErrorsController extends AbstractController_1.default {
|
|
37
37
|
constructor(api) {
|
|
38
38
|
super(api, '/pallets/:palletId/errors', new services_1.PalletsErrorsService(api));
|
|
39
|
-
this.getErrorById = async ({ query: { at, metadata, useRcBlock }, params: { palletId, errorItemId } }, res) => {
|
|
39
|
+
this.getErrorById = async ({ query: { at, metadata, useRcBlock, useRcBlockFormat }, params: { palletId, errorItemId } }, res) => {
|
|
40
40
|
const metadataArg = metadata === 'true';
|
|
41
|
+
const useObjectFormat = useRcBlockFormat === 'object';
|
|
41
42
|
if (useRcBlock === 'true') {
|
|
42
43
|
const rcAtResults = await this.getHashFromRcAt(at);
|
|
43
|
-
//
|
|
44
|
+
// Handle empty results based on format
|
|
44
45
|
if (rcAtResults.length === 0) {
|
|
45
|
-
|
|
46
|
+
if (useObjectFormat) {
|
|
47
|
+
const rcBlockInfo = await this.getRcBlockInfo(at);
|
|
48
|
+
PalletsErrorsController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, []));
|
|
49
|
+
}
|
|
50
|
+
else {
|
|
51
|
+
PalletsErrorsController.sanitizedSend(res, []);
|
|
52
|
+
}
|
|
46
53
|
return;
|
|
47
54
|
}
|
|
48
55
|
// Process each Asset Hub block found
|
|
@@ -66,7 +73,14 @@ class PalletsErrorsController extends AbstractController_1.default {
|
|
|
66
73
|
};
|
|
67
74
|
results.push(enhancedResult);
|
|
68
75
|
}
|
|
69
|
-
|
|
76
|
+
// Send response based on format
|
|
77
|
+
if (useObjectFormat) {
|
|
78
|
+
const rcBlockInfo = await this.getRcBlockInfo(at);
|
|
79
|
+
PalletsErrorsController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, results));
|
|
80
|
+
}
|
|
81
|
+
else {
|
|
82
|
+
PalletsErrorsController.sanitizedSend(res, results);
|
|
83
|
+
}
|
|
70
84
|
}
|
|
71
85
|
else {
|
|
72
86
|
const hash = await this.getHashFromAt(at);
|
|
@@ -81,13 +95,20 @@ class PalletsErrorsController extends AbstractController_1.default {
|
|
|
81
95
|
PalletsErrorsController.sanitizedSend(res, result);
|
|
82
96
|
}
|
|
83
97
|
};
|
|
84
|
-
this.getErrors = async ({ params: { palletId }, query: { at, onlyIds, useRcBlock } }, res) => {
|
|
98
|
+
this.getErrors = async ({ params: { palletId }, query: { at, onlyIds, useRcBlock, useRcBlockFormat } }, res) => {
|
|
85
99
|
const onlyIdsArg = onlyIds === 'true';
|
|
100
|
+
const useObjectFormat = useRcBlockFormat === 'object';
|
|
86
101
|
if (useRcBlock === 'true') {
|
|
87
102
|
const rcAtResults = await this.getHashFromRcAt(at);
|
|
88
|
-
//
|
|
103
|
+
// Handle empty results based on format
|
|
89
104
|
if (rcAtResults.length === 0) {
|
|
90
|
-
|
|
105
|
+
if (useObjectFormat) {
|
|
106
|
+
const rcBlockInfo = await this.getRcBlockInfo(at);
|
|
107
|
+
PalletsErrorsController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, []));
|
|
108
|
+
}
|
|
109
|
+
else {
|
|
110
|
+
PalletsErrorsController.sanitizedSend(res, []);
|
|
111
|
+
}
|
|
91
112
|
return;
|
|
92
113
|
}
|
|
93
114
|
// Process each Asset Hub block found
|
|
@@ -109,7 +130,14 @@ class PalletsErrorsController extends AbstractController_1.default {
|
|
|
109
130
|
};
|
|
110
131
|
results.push(enhancedResult);
|
|
111
132
|
}
|
|
112
|
-
|
|
133
|
+
// Send response based on format
|
|
134
|
+
if (useObjectFormat) {
|
|
135
|
+
const rcBlockInfo = await this.getRcBlockInfo(at);
|
|
136
|
+
PalletsErrorsController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, results));
|
|
137
|
+
}
|
|
138
|
+
else {
|
|
139
|
+
PalletsErrorsController.sanitizedSend(res, results);
|
|
140
|
+
}
|
|
113
141
|
}
|
|
114
142
|
else {
|
|
115
143
|
const hash = await this.getHashFromAt(at);
|
|
@@ -1 +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,iDAAsD;AACtD,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;QAahE,iBAAY,GAA0D,KAAK,EAClF,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"PalletsErrorsController.js","sourceRoot":"","sources":["../../../../src/controllers/pallets/PalletsErrorsController.ts"],"names":[],"mappings":"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"}
|
|
@@ -25,13 +25,20 @@ const AbstractController_1 = __importDefault(require("../AbstractController"));
|
|
|
25
25
|
class PalletsEventsController extends AbstractController_1.default {
|
|
26
26
|
constructor(api) {
|
|
27
27
|
super(api, '/pallets/:palletId/events', new services_1.PalletsEventsService(api));
|
|
28
|
-
this.getEventById = async ({ query: { at, metadata, useRcBlock }, params: { palletId, eventItemId } }, res) => {
|
|
28
|
+
this.getEventById = async ({ query: { at, metadata, useRcBlock, useRcBlockFormat }, params: { palletId, eventItemId } }, res) => {
|
|
29
29
|
const metadataArg = metadata === 'true';
|
|
30
|
+
const useObjectFormat = useRcBlockFormat === 'object';
|
|
30
31
|
if (useRcBlock === 'true') {
|
|
31
32
|
const rcAtResults = await this.getHashFromRcAt(at);
|
|
32
|
-
//
|
|
33
|
+
// Handle empty results based on format
|
|
33
34
|
if (rcAtResults.length === 0) {
|
|
34
|
-
|
|
35
|
+
if (useObjectFormat) {
|
|
36
|
+
const rcBlockInfo = await this.getRcBlockInfo(at);
|
|
37
|
+
PalletsEventsController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, []));
|
|
38
|
+
}
|
|
39
|
+
else {
|
|
40
|
+
PalletsEventsController.sanitizedSend(res, []);
|
|
41
|
+
}
|
|
35
42
|
return;
|
|
36
43
|
}
|
|
37
44
|
// Process each Asset Hub block found
|
|
@@ -55,7 +62,14 @@ class PalletsEventsController extends AbstractController_1.default {
|
|
|
55
62
|
};
|
|
56
63
|
results.push(enhancedResult);
|
|
57
64
|
}
|
|
58
|
-
|
|
65
|
+
// Send response based on format
|
|
66
|
+
if (useObjectFormat) {
|
|
67
|
+
const rcBlockInfo = await this.getRcBlockInfo(at);
|
|
68
|
+
PalletsEventsController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, results));
|
|
69
|
+
}
|
|
70
|
+
else {
|
|
71
|
+
PalletsEventsController.sanitizedSend(res, results);
|
|
72
|
+
}
|
|
59
73
|
}
|
|
60
74
|
else {
|
|
61
75
|
const hash = await this.getHashFromAt(at);
|
|
@@ -70,13 +84,20 @@ class PalletsEventsController extends AbstractController_1.default {
|
|
|
70
84
|
PalletsEventsController.sanitizedSend(res, result);
|
|
71
85
|
}
|
|
72
86
|
};
|
|
73
|
-
this.getEvents = async ({ params: { palletId }, query: { at, onlyIds, useRcBlock } }, res) => {
|
|
87
|
+
this.getEvents = async ({ params: { palletId }, query: { at, onlyIds, useRcBlock, useRcBlockFormat } }, res) => {
|
|
74
88
|
const onlyIdsArg = onlyIds === 'true';
|
|
89
|
+
const useObjectFormat = useRcBlockFormat === 'object';
|
|
75
90
|
if (useRcBlock === 'true') {
|
|
76
91
|
const rcAtResults = await this.getHashFromRcAt(at);
|
|
77
|
-
//
|
|
92
|
+
// Handle empty results based on format
|
|
78
93
|
if (rcAtResults.length === 0) {
|
|
79
|
-
|
|
94
|
+
if (useObjectFormat) {
|
|
95
|
+
const rcBlockInfo = await this.getRcBlockInfo(at);
|
|
96
|
+
PalletsEventsController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, []));
|
|
97
|
+
}
|
|
98
|
+
else {
|
|
99
|
+
PalletsEventsController.sanitizedSend(res, []);
|
|
100
|
+
}
|
|
80
101
|
return;
|
|
81
102
|
}
|
|
82
103
|
// Process each Asset Hub block found
|
|
@@ -98,7 +119,14 @@ class PalletsEventsController extends AbstractController_1.default {
|
|
|
98
119
|
};
|
|
99
120
|
results.push(enhancedResult);
|
|
100
121
|
}
|
|
101
|
-
|
|
122
|
+
// Send response based on format
|
|
123
|
+
if (useObjectFormat) {
|
|
124
|
+
const rcBlockInfo = await this.getRcBlockInfo(at);
|
|
125
|
+
PalletsEventsController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, results));
|
|
126
|
+
}
|
|
127
|
+
else {
|
|
128
|
+
PalletsEventsController.sanitizedSend(res, results);
|
|
129
|
+
}
|
|
102
130
|
}
|
|
103
131
|
else {
|
|
104
132
|
const hash = await this.getHashFromAt(at);
|
|
@@ -1 +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,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,
|
|
1
|
+
{"version":3,"file":"PalletsEventsController.js","sourceRoot":"","sources":["../../../../src/controllers/pallets/PalletsEventsController.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,12 +47,19 @@ const AbstractController_1 = __importDefault(require("../AbstractController"));
|
|
|
47
47
|
class PalletsForeignAssetsController extends AbstractController_1.default {
|
|
48
48
|
constructor(api) {
|
|
49
49
|
super(api, '/pallets/foreign-assets', new services_1.PalletsForeignAssetsService(api));
|
|
50
|
-
this.getForeignAssets = async ({ query: { at, useRcBlock } }, res) => {
|
|
50
|
+
this.getForeignAssets = async ({ query: { at, useRcBlock, useRcBlockFormat } }, res) => {
|
|
51
|
+
const useObjectFormat = useRcBlockFormat === 'object';
|
|
51
52
|
if (useRcBlock === 'true') {
|
|
52
53
|
const rcAtResults = await this.getHashFromRcAt(at);
|
|
53
|
-
//
|
|
54
|
+
// Handle empty results based on format
|
|
54
55
|
if (rcAtResults.length === 0) {
|
|
55
|
-
|
|
56
|
+
if (useObjectFormat) {
|
|
57
|
+
const rcBlockInfo = await this.getRcBlockInfo(at);
|
|
58
|
+
PalletsForeignAssetsController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, []));
|
|
59
|
+
}
|
|
60
|
+
else {
|
|
61
|
+
PalletsForeignAssetsController.sanitizedSend(res, []);
|
|
62
|
+
}
|
|
56
63
|
return;
|
|
57
64
|
}
|
|
58
65
|
// Process each Asset Hub block found
|
|
@@ -69,7 +76,14 @@ class PalletsForeignAssetsController extends AbstractController_1.default {
|
|
|
69
76
|
};
|
|
70
77
|
results.push(enhancedResult);
|
|
71
78
|
}
|
|
72
|
-
|
|
79
|
+
// Send response based on format
|
|
80
|
+
if (useObjectFormat) {
|
|
81
|
+
const rcBlockInfo = await this.getRcBlockInfo(at);
|
|
82
|
+
PalletsForeignAssetsController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, results));
|
|
83
|
+
}
|
|
84
|
+
else {
|
|
85
|
+
PalletsForeignAssetsController.sanitizedSend(res, results);
|
|
86
|
+
}
|
|
73
87
|
}
|
|
74
88
|
else {
|
|
75
89
|
const hash = await this.getHashFromAt(at);
|
|
@@ -1 +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,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,
|
|
1
|
+
{"version":3,"file":"PalletsForeignAssetsController.js","sourceRoot":"","sources":["../../../../src/controllers/pallets/PalletsForeignAssetsController.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,18 +24,25 @@ const AbstractController_1 = __importDefault(require("../AbstractController"));
|
|
|
24
24
|
class PalletsNominationPoolController extends AbstractController_1.default {
|
|
25
25
|
constructor(api) {
|
|
26
26
|
super(api, '/pallets/nomination-pools', new services_1.PalletsNominationPoolService(api));
|
|
27
|
-
this.getNominationPoolById = async ({ params: { poolId }, query: { at, useRcBlock, metadata } }, res) => {
|
|
27
|
+
this.getNominationPoolById = async ({ params: { poolId }, query: { at, useRcBlock, useRcBlockFormat, metadata } }, res) => {
|
|
28
28
|
/**
|
|
29
29
|
* Verify our param `poolId` is an integer represented as a string, and return
|
|
30
30
|
* it as an integer
|
|
31
31
|
*/
|
|
32
32
|
const index = this.parseNumberOrThrow(poolId, '`poolId` path param is not a number');
|
|
33
33
|
const metadataArg = metadata === 'true';
|
|
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
|
+
PalletsNominationPoolController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, []));
|
|
42
|
+
}
|
|
43
|
+
else {
|
|
44
|
+
PalletsNominationPoolController.sanitizedSend(res, []);
|
|
45
|
+
}
|
|
39
46
|
return;
|
|
40
47
|
}
|
|
41
48
|
// Process each Asset Hub block found
|
|
@@ -52,7 +59,14 @@ class PalletsNominationPoolController 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
|
+
PalletsNominationPoolController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, results));
|
|
66
|
+
}
|
|
67
|
+
else {
|
|
68
|
+
PalletsNominationPoolController.sanitizedSend(res, results);
|
|
69
|
+
}
|
|
56
70
|
}
|
|
57
71
|
else {
|
|
58
72
|
const hash = await this.getHashFromAt(at);
|
|
@@ -60,12 +74,19 @@ class PalletsNominationPoolController extends AbstractController_1.default {
|
|
|
60
74
|
PalletsNominationPoolController.sanitizedSend(res, result);
|
|
61
75
|
}
|
|
62
76
|
};
|
|
63
|
-
this.getNominationPoolInfo = async ({ query: { at, useRcBlock } }, res) => {
|
|
77
|
+
this.getNominationPoolInfo = async ({ query: { at, useRcBlock, useRcBlockFormat } }, res) => {
|
|
78
|
+
const useObjectFormat = useRcBlockFormat === 'object';
|
|
64
79
|
if (useRcBlock === 'true') {
|
|
65
80
|
const rcAtResults = await this.getHashFromRcAt(at);
|
|
66
|
-
//
|
|
81
|
+
// Handle empty results based on format
|
|
67
82
|
if (rcAtResults.length === 0) {
|
|
68
|
-
|
|
83
|
+
if (useObjectFormat) {
|
|
84
|
+
const rcBlockInfo = await this.getRcBlockInfo(at);
|
|
85
|
+
PalletsNominationPoolController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, []));
|
|
86
|
+
}
|
|
87
|
+
else {
|
|
88
|
+
PalletsNominationPoolController.sanitizedSend(res, []);
|
|
89
|
+
}
|
|
69
90
|
return;
|
|
70
91
|
}
|
|
71
92
|
// Process each Asset Hub block found
|
|
@@ -82,7 +103,14 @@ class PalletsNominationPoolController extends AbstractController_1.default {
|
|
|
82
103
|
};
|
|
83
104
|
results.push(enhancedResult);
|
|
84
105
|
}
|
|
85
|
-
|
|
106
|
+
// Send response based on format
|
|
107
|
+
if (useObjectFormat) {
|
|
108
|
+
const rcBlockInfo = await this.getRcBlockInfo(at);
|
|
109
|
+
PalletsNominationPoolController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, results));
|
|
110
|
+
}
|
|
111
|
+
else {
|
|
112
|
+
PalletsNominationPoolController.sanitizedSend(res, results);
|
|
113
|
+
}
|
|
86
114
|
}
|
|
87
115
|
else {
|
|
88
116
|
const hash = await this.getHashFromAt(at);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PalletsNominationPoolsController.js","sourceRoot":"","sources":["../../../../src/controllers/pallets/PalletsNominationPoolsController.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,6CAA8D;AAC9D,+EAAuD;AAEvD,MAAqB,+BAAgC,SAAQ,4BAAgD;IAG5G,YAAY,GAAW;QACtB,KAAK,CAAC,GAAG,EAAE,2BAA2B,EAAE,IAAI,uCAA4B,CAAC,GAAG,CAAC,CAAC,CAAC;QAYxE,0BAAqB,GAAmB,KAAK,EACpD,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"PalletsNominationPoolsController.js","sourceRoot":"","sources":["../../../../src/controllers/pallets/PalletsNominationPoolsController.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,12 +30,19 @@ class PalletsOnGoingReferendaController extends AbstractController_1.default {
|
|
|
30
30
|
* @param _req Express Request
|
|
31
31
|
* @param res Express Response
|
|
32
32
|
*/
|
|
33
|
-
this.getPalletOnGoingReferenda = async ({ query: { at, useRcBlock } }, res) => {
|
|
33
|
+
this.getPalletOnGoingReferenda = async ({ 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
|
+
PalletsOnGoingReferendaController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, []));
|
|
42
|
+
}
|
|
43
|
+
else {
|
|
44
|
+
PalletsOnGoingReferendaController.sanitizedSend(res, []);
|
|
45
|
+
}
|
|
39
46
|
return;
|
|
40
47
|
}
|
|
41
48
|
// Process each Asset Hub block found
|
|
@@ -52,7 +59,14 @@ class PalletsOnGoingReferendaController 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
|
+
PalletsOnGoingReferendaController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, results));
|
|
66
|
+
}
|
|
67
|
+
else {
|
|
68
|
+
PalletsOnGoingReferendaController.sanitizedSend(res, results);
|
|
69
|
+
}
|
|
56
70
|
}
|
|
57
71
|
else {
|
|
58
72
|
const hash = await this.getHashFromAt(at);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PalletsOnGoingReferendaController.js","sourceRoot":"","sources":["../../../../src/controllers/pallets/PalletsOnGoingReferendaController.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,6CAAgE;AAChE,+EAAuD;AAEvD,MAAqB,iCAAkC,SAAQ,4BAAkD;IAGhH,YAAY,GAAW;QACtB,KAAK,CAAC,GAAG,EAAE,6BAA6B,EAAE,IAAI,yCAA8B,CAAC,GAAG,CAAC,CAAC,CAAC;QASpF;;;;;WAKG;QACK,8BAAyB,GAAmB,KAAK,
|
|
1
|
+
{"version":3,"file":"PalletsOnGoingReferendaController.js","sourceRoot":"","sources":["../../../../src/controllers/pallets/PalletsOnGoingReferendaController.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,6CAAgE;AAChE,+EAAuD;AAEvD,MAAqB,iCAAkC,SAAQ,4BAAkD;IAGhH,YAAY,GAAW;QACtB,KAAK,CAAC,GAAG,EAAE,6BAA6B,EAAE,IAAI,yCAA8B,CAAC,GAAG,CAAC,CAAC,CAAC;QASpF;;;;;WAKG;QACK,8BAAyB,GAAmB,KAAK,EACxD,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,gBAAgB,EAAE,EAAE,EAC/C,GAAG,EACa,EAAE;YAClB,MAAM,eAAe,GAAG,gBAAgB,KAAK,QAAQ,CAAC;YAEtD,IAAI,UAAU,KAAK,MAAM,EAAE,CAAC;gBAC3B,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC;gBAEnD,uCAAuC;gBACvC,IAAI,WAAW,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;oBAC9B,IAAI,eAAe,EAAE,CAAC;wBACrB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;wBAClD,iCAAiC,CAAC,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,2BAA2B,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC,CAAC;oBACzG,CAAC;yBAAM,CAAC;wBACP,iCAAiC,CAAC,aAAa,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;oBAC1D,CAAC;oBACD,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,4BAA4B,CAAC,MAAM,CAAC,CAAC;oBAEvE,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,gCAAgC;gBAChC,IAAI,eAAe,EAAE,CAAC;oBACrB,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;oBAClD,iCAAiC,CAAC,aAAa,CAAC,GAAG,EAAE,IAAI,CAAC,2BAA2B,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC;gBAC9G,CAAC;qBAAM,CAAC;oBACP,iCAAiC,CAAC,aAAa,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;gBAC/D,CAAC;YACF,CAAC;iBAAM,CAAC;gBACP,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;gBAC1C,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,4BAA4B,CAAC,IAAI,CAAC,CAAC;gBACrE,iCAAiC,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAC9D,CAAC;QACF,CAAC,CAAC;QAhED,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,yBAAyB,CAAC,CAAC,CAAC,CAAC;IACxE,CAAC;;AAVM,gDAAc,GAAG,yBAAyB,AAA5B,CAA6B;AAC3C,iDAAe,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,AAAlB,CAAmB;kBAFrB,iCAAiC"}
|
|
@@ -65,17 +65,24 @@ const AbstractController_1 = __importDefault(require("../AbstractController"));
|
|
|
65
65
|
class PalletsPoolAssetsController extends AbstractController_1.default {
|
|
66
66
|
constructor(api) {
|
|
67
67
|
super(api, '/pallets/pool-assets/:assetId', new services_1.PalletsPoolAssetsService(api));
|
|
68
|
-
this.getPoolAssetById = async ({ params: { assetId }, query: { at, useRcBlock } }, res) => {
|
|
68
|
+
this.getPoolAssetById = async ({ params: { assetId }, query: { at, useRcBlock, useRcBlockFormat } }, res) => {
|
|
69
69
|
/**
|
|
70
70
|
* Verify our param `assetId` is an integer represented as a string, and return
|
|
71
71
|
* it as an integer
|
|
72
72
|
*/
|
|
73
73
|
const index = this.parseNumberOrThrow(assetId, '`assetId` path param is not a number');
|
|
74
|
+
const useObjectFormat = useRcBlockFormat === 'object';
|
|
74
75
|
if (useRcBlock === 'true') {
|
|
75
76
|
const rcAtResults = await this.getHashFromRcAt(at);
|
|
76
|
-
//
|
|
77
|
+
// Handle empty results based on format
|
|
77
78
|
if (rcAtResults.length === 0) {
|
|
78
|
-
|
|
79
|
+
if (useObjectFormat) {
|
|
80
|
+
const rcBlockInfo = await this.getRcBlockInfo(at);
|
|
81
|
+
PalletsPoolAssetsController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, []));
|
|
82
|
+
}
|
|
83
|
+
else {
|
|
84
|
+
PalletsPoolAssetsController.sanitizedSend(res, []);
|
|
85
|
+
}
|
|
79
86
|
return;
|
|
80
87
|
}
|
|
81
88
|
// Process each Asset Hub block found
|
|
@@ -92,7 +99,14 @@ class PalletsPoolAssetsController extends AbstractController_1.default {
|
|
|
92
99
|
};
|
|
93
100
|
results.push(enhancedResult);
|
|
94
101
|
}
|
|
95
|
-
|
|
102
|
+
// Send response based on format
|
|
103
|
+
if (useObjectFormat) {
|
|
104
|
+
const rcBlockInfo = await this.getRcBlockInfo(at);
|
|
105
|
+
PalletsPoolAssetsController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, results));
|
|
106
|
+
}
|
|
107
|
+
else {
|
|
108
|
+
PalletsPoolAssetsController.sanitizedSend(res, results);
|
|
109
|
+
}
|
|
96
110
|
}
|
|
97
111
|
else {
|
|
98
112
|
const hash = await this.getHashFromAt(at);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PalletsPoolAssetsController.js","sourceRoot":"","sources":["../../../../src/controllers/pallets/PalletsPoolAssetsController.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,6CAA0D;AAC1D,+EAAuD;AAEvD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AACH,MAAqB,2BAA4B,SAAQ,4BAA4C;IAGpG,YAAY,GAAW;QACtB,KAAK,CAAC,GAAG,EAAE,+BAA+B,EAAE,IAAI,mCAAwB,CAAC,GAAG,CAAC,CAAC,CAAC;QASxE,qBAAgB,GAAmB,KAAK,EAC/C,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,UAAU,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"PalletsPoolAssetsController.js","sourceRoot":"","sources":["../../../../src/controllers/pallets/PalletsPoolAssetsController.ts"],"names":[],"mappings":"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"}
|
|
@@ -90,12 +90,19 @@ class PalletsStakingProgressController extends AbstractController_1.default {
|
|
|
90
90
|
* @param _req Express Request
|
|
91
91
|
* @param res Express Response
|
|
92
92
|
*/
|
|
93
|
-
this.getPalletStakingProgress = async ({ query: { at, useRcBlock } }, res) => {
|
|
93
|
+
this.getPalletStakingProgress = async ({ query: { at, useRcBlock, useRcBlockFormat } }, res) => {
|
|
94
|
+
const useObjectFormat = useRcBlockFormat === 'object';
|
|
94
95
|
if (useRcBlock === 'true') {
|
|
95
96
|
const rcAtResults = await this.getHashFromRcAt(at);
|
|
96
|
-
//
|
|
97
|
+
// Handle empty results based on format
|
|
97
98
|
if (rcAtResults.length === 0) {
|
|
98
|
-
|
|
99
|
+
if (useObjectFormat) {
|
|
100
|
+
const rcBlockInfo = await this.getRcBlockInfo(at);
|
|
101
|
+
PalletsStakingProgressController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, []));
|
|
102
|
+
}
|
|
103
|
+
else {
|
|
104
|
+
PalletsStakingProgressController.sanitizedSend(res, []);
|
|
105
|
+
}
|
|
99
106
|
return;
|
|
100
107
|
}
|
|
101
108
|
// Process each Asset Hub block found
|
|
@@ -112,7 +119,14 @@ class PalletsStakingProgressController extends AbstractController_1.default {
|
|
|
112
119
|
};
|
|
113
120
|
results.push(enhancedResult);
|
|
114
121
|
}
|
|
115
|
-
|
|
122
|
+
// Send response based on format
|
|
123
|
+
if (useObjectFormat) {
|
|
124
|
+
const rcBlockInfo = await this.getRcBlockInfo(at);
|
|
125
|
+
PalletsStakingProgressController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, results));
|
|
126
|
+
}
|
|
127
|
+
else {
|
|
128
|
+
PalletsStakingProgressController.sanitizedSend(res, results);
|
|
129
|
+
}
|
|
116
130
|
}
|
|
117
131
|
else {
|
|
118
132
|
const hash = await this.getHashFromAt(at);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PalletsStakingProgressController.js","sourceRoot":"","sources":["../../../../src/controllers/pallets/PalletsStakingProgressController.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,6CAA+D;AAC/D,+EAAuD;AAEvD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2DG;AACH,MAAqB,gCAAiC,SAAQ,4BAAiD;IAM9G,YAAY,GAAW;QACtB,KAAK,CAAC,GAAG,EAAE,2BAA2B,EAAE,IAAI,wCAA6B,CAAC,GAAG,CAAC,CAAC,CAAC;QASjF;;;;;WAKG;QACK,6BAAwB,GAAmB,KAAK,
|
|
1
|
+
{"version":3,"file":"PalletsStakingProgressController.js","sourceRoot":"","sources":["../../../../src/controllers/pallets/PalletsStakingProgressController.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,12 +30,19 @@ class PalletsStakingValidatorsController extends AbstractController_1.default {
|
|
|
30
30
|
* @param _req Express Request
|
|
31
31
|
* @param res Express Response
|
|
32
32
|
*/
|
|
33
|
-
this.getPalletStakingValidators = async ({ query: { at, useRcBlock } }, res) => {
|
|
33
|
+
this.getPalletStakingValidators = async ({ 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
|
+
PalletsStakingValidatorsController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, []));
|
|
42
|
+
}
|
|
43
|
+
else {
|
|
44
|
+
PalletsStakingValidatorsController.sanitizedSend(res, []);
|
|
45
|
+
}
|
|
39
46
|
return;
|
|
40
47
|
}
|
|
41
48
|
// Process each Asset Hub block found
|
|
@@ -52,7 +59,14 @@ class PalletsStakingValidatorsController 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
|
+
PalletsStakingValidatorsController.sanitizedSend(res, this.formatRcBlockObjectResponse(rcBlockInfo, results));
|
|
66
|
+
}
|
|
67
|
+
else {
|
|
68
|
+
PalletsStakingValidatorsController.sanitizedSend(res, results);
|
|
69
|
+
}
|
|
56
70
|
}
|
|
57
71
|
else {
|
|
58
72
|
const hash = await this.getHashFromAt(at);
|