@substrate/api-sidecar 12.4.3 → 13.1.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 (117) hide show
  1. package/README.md +6 -6
  2. package/build/package.json +6 -6
  3. package/build/src/SidecarConfig.js +1 -1
  4. package/build/src/SidecarConfig.js.map +1 -1
  5. package/build/src/Specs.js +3 -3
  6. package/build/src/Specs.js.map +1 -1
  7. package/build/src/chains-config/acalaControllers.js +3 -2
  8. package/build/src/chains-config/acalaControllers.js.map +1 -1
  9. package/build/src/chains-config/astarControllers.js +3 -2
  10. package/build/src/chains-config/astarControllers.js.map +1 -1
  11. package/build/src/chains-config/bifrostControllers.js +3 -2
  12. package/build/src/chains-config/bifrostControllers.js.map +1 -1
  13. package/build/src/chains-config/bifrostPolkadotControllers.d.ts +5 -0
  14. package/build/src/chains-config/bifrostPolkadotControllers.js +49 -0
  15. package/build/src/chains-config/bifrostPolkadotControllers.js.map +1 -0
  16. package/build/src/chains-config/cache/QueryFeeDetailsCache.d.ts +55 -0
  17. package/build/src/chains-config/cache/QueryFeeDetailsCache.js +80 -0
  18. package/build/src/chains-config/cache/QueryFeeDetailsCache.js.map +1 -0
  19. package/build/src/chains-config/cache/QueryFeeDetailsCache.spec.d.ts +1 -0
  20. package/build/src/chains-config/cache/QueryFeeDetailsCache.spec.js +47 -0
  21. package/build/src/chains-config/cache/QueryFeeDetailsCache.spec.js.map +1 -0
  22. package/build/src/chains-config/cache/index.d.ts +2 -0
  23. package/build/src/chains-config/cache/index.js +19 -0
  24. package/build/src/chains-config/cache/index.js.map +1 -0
  25. package/build/src/chains-config/calamariControllers.js +3 -2
  26. package/build/src/chains-config/calamariControllers.js.map +1 -1
  27. package/build/src/chains-config/crustControllers.js +3 -2
  28. package/build/src/chains-config/crustControllers.js.map +1 -1
  29. package/build/src/chains-config/defaultControllers.js +3 -2
  30. package/build/src/chains-config/defaultControllers.js.map +1 -1
  31. package/build/src/chains-config/dockMainnetControllers.js +3 -2
  32. package/build/src/chains-config/dockMainnetControllers.js.map +1 -1
  33. package/build/src/chains-config/dockPoSMainnetControllers.js +3 -2
  34. package/build/src/chains-config/dockPoSMainnetControllers.js.map +1 -1
  35. package/build/src/chains-config/dockPoSTestnetControllers.js +3 -2
  36. package/build/src/chains-config/dockPoSTestnetControllers.js.map +1 -1
  37. package/build/src/chains-config/heikoControllers.js +3 -2
  38. package/build/src/chains-config/heikoControllers.js.map +1 -1
  39. package/build/src/chains-config/index.js +2 -0
  40. package/build/src/chains-config/index.js.map +1 -1
  41. package/build/src/chains-config/karuraControllers.js +3 -2
  42. package/build/src/chains-config/karuraControllers.js.map +1 -1
  43. package/build/src/chains-config/kiltControllers.js +3 -2
  44. package/build/src/chains-config/kiltControllers.js.map +1 -1
  45. package/build/src/chains-config/kulupuControllers.js +3 -2
  46. package/build/src/chains-config/kulupuControllers.js.map +1 -1
  47. package/build/src/chains-config/kusamaControllers.js +3 -2
  48. package/build/src/chains-config/kusamaControllers.js.map +1 -1
  49. package/build/src/chains-config/mandalaControllers.js +3 -2
  50. package/build/src/chains-config/mandalaControllers.js.map +1 -1
  51. package/build/src/chains-config/mantaControllers.js +3 -2
  52. package/build/src/chains-config/mantaControllers.js.map +1 -1
  53. package/build/src/chains-config/parallelControllers.js +3 -2
  54. package/build/src/chains-config/parallelControllers.js.map +1 -1
  55. package/build/src/chains-config/polkadotControllers.js +3 -2
  56. package/build/src/chains-config/polkadotControllers.js.map +1 -1
  57. package/build/src/chains-config/polymeshControllers.js +3 -2
  58. package/build/src/chains-config/polymeshControllers.js.map +1 -1
  59. package/build/src/chains-config/shidenControllers.js +3 -2
  60. package/build/src/chains-config/shidenControllers.js.map +1 -1
  61. package/build/src/chains-config/soraControllers.js +3 -2
  62. package/build/src/chains-config/soraControllers.js.map +1 -1
  63. package/build/src/chains-config/statemineControllers.js +3 -2
  64. package/build/src/chains-config/statemineControllers.js.map +1 -1
  65. package/build/src/chains-config/statemintControllers.js +3 -2
  66. package/build/src/chains-config/statemintControllers.js.map +1 -1
  67. package/build/src/chains-config/westendControllers.js +3 -2
  68. package/build/src/chains-config/westendControllers.js.map +1 -1
  69. package/build/src/controllers/accounts/AccountsBalanceInfoController.js +1 -1
  70. package/build/src/controllers/accounts/AccountsBalanceInfoController.js.map +1 -1
  71. package/build/src/controllers/accounts/AccountsStakingPayoutsController.js +1 -1
  72. package/build/src/controllers/accounts/AccountsStakingPayoutsController.js.map +1 -1
  73. package/build/src/controllers/blocks/BlocksController.d.ts +1 -8
  74. package/build/src/controllers/blocks/BlocksController.js +6 -10
  75. package/build/src/controllers/blocks/BlocksController.js.map +1 -1
  76. package/build/src/controllers/blocks/BlocksExtrinsicsController.d.ts +1 -7
  77. package/build/src/controllers/blocks/BlocksExtrinsicsController.js +2 -4
  78. package/build/src/controllers/blocks/BlocksExtrinsicsController.js.map +1 -1
  79. package/build/src/controllers/blocks/BlocksTraceController.js +2 -0
  80. package/build/src/controllers/blocks/BlocksTraceController.js.map +1 -1
  81. package/build/src/controllers/node/NodeTransactionPoolController.js +2 -0
  82. package/build/src/controllers/node/NodeTransactionPoolController.js.map +1 -1
  83. package/build/src/controllers/pallets/PalletsStorageController.js +2 -1
  84. package/build/src/controllers/pallets/PalletsStorageController.js.map +1 -1
  85. package/build/src/controllers/paras/ParasController.js +2 -0
  86. package/build/src/controllers/paras/ParasController.js.map +1 -1
  87. package/build/src/controllers/transaction/TransactionMaterialController.js +2 -0
  88. package/build/src/controllers/transaction/TransactionMaterialController.js.map +1 -1
  89. package/build/src/main.js +10 -9
  90. package/build/src/main.js.map +1 -1
  91. package/build/src/middleware/validate/index.d.ts +1 -0
  92. package/build/src/middleware/validate/index.js +3 -1
  93. package/build/src/middleware/validate/index.js.map +1 -1
  94. package/build/src/middleware/validate/util.d.ts +18 -0
  95. package/build/src/middleware/validate/util.js +51 -0
  96. package/build/src/middleware/validate/util.js.map +1 -0
  97. package/build/src/middleware/validate/validateAddressMiddleware.spec.js +23 -52
  98. package/build/src/middleware/validate/validateAddressMiddleware.spec.js.map +1 -1
  99. package/build/src/middleware/validate/validateBooleanMiddleware.d.ts +7 -0
  100. package/build/src/middleware/validate/validateBooleanMiddleware.js +45 -0
  101. package/build/src/middleware/validate/validateBooleanMiddleware.js.map +1 -0
  102. package/build/src/middleware/validate/validateBooleanMiddleware.spec.d.ts +1 -0
  103. package/build/src/middleware/validate/validateBooleanMiddleware.spec.js +53 -0
  104. package/build/src/middleware/validate/validateBooleanMiddleware.spec.js.map +1 -0
  105. package/build/src/services/blocks/BlocksService.d.ts +29 -50
  106. package/build/src/services/blocks/BlocksService.js +89 -153
  107. package/build/src/services/blocks/BlocksService.js.map +1 -1
  108. package/build/src/services/blocks/BlocksService.spec.js +19 -83
  109. package/build/src/services/blocks/BlocksService.spec.js.map +1 -1
  110. package/build/src/services/paras/ParasService.js +1 -1
  111. package/build/src/services/paras/ParasService.js.map +1 -1
  112. package/build/src/types/chains-config/ControllerConfig.d.ts +20 -8
  113. package/build/src/types/sidecar-config/CONFIG.d.ts +1 -1
  114. package/build/src/types/sidecar-config/CONFIG.js +1 -1
  115. package/build/src/types/sidecar-config/CONFIG.js.map +1 -1
  116. package/build/src/types/sidecar-config/SidecarConfig.d.ts +1 -1
  117. package/package.json +6 -6
@@ -20,6 +20,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
20
20
  Object.defineProperty(exports, "__esModule", { value: true });
21
21
  const util_1 = require("@polkadot/util");
22
22
  const http_errors_1 = require("http-errors");
23
+ const validate_1 = require("../../middleware/validate");
23
24
  const services_1 = require("../../services");
24
25
  const PromiseQueue_1 = require("../../util/PromiseQueue");
25
26
  const AbstractController_1 = __importDefault(require("../AbstractController"));
@@ -84,7 +85,7 @@ const AbstractController_1 = __importDefault(require("../AbstractController"));
84
85
  */
85
86
  class BlocksController extends AbstractController_1.default {
86
87
  constructor(api, options) {
87
- super(api, '/blocks', new services_1.BlocksService(api, options.minCalcFeeRuntime, options.blockStore));
88
+ super(api, '/blocks', new services_1.BlocksService(api, options.minCalcFeeRuntime, options.blockStore, options.hasQueryFeeApi));
88
89
  this.options = options;
89
90
  /**
90
91
  * Get the latest block.
@@ -92,10 +93,9 @@ class BlocksController extends AbstractController_1.default {
92
93
  * @param _req Express Request
93
94
  * @param res Express Response
94
95
  */
95
- this.getLatestBlock = async ({ query: { eventDocs, extrinsicDocs, finalized, feeByEvent } }, res) => {
96
+ this.getLatestBlock = async ({ query: { eventDocs, extrinsicDocs, finalized } }, res) => {
96
97
  const eventDocsArg = eventDocs === 'true';
97
98
  const extrinsicDocsArg = extrinsicDocs === 'true';
98
- const getFeeByEvent = feeByEvent === 'true';
99
99
  let hash, queryFinalizedHead, omitFinalizedTag;
100
100
  if (!this.options.finalizes) {
101
101
  // If the network chain doesn't finalize blocks, we dont want a finalized tag.
@@ -122,7 +122,6 @@ class BlocksController extends AbstractController_1.default {
122
122
  checkFinalized: false,
123
123
  queryFinalizedHead,
124
124
  omitFinalizedTag,
125
- getFeeByEvent,
126
125
  };
127
126
  const historicApi = await this.api.at(hash);
128
127
  BlocksController.sanitizedSend(res, await this.service.fetchBlock(hash, historicApi, options));
@@ -133,12 +132,11 @@ class BlocksController extends AbstractController_1.default {
133
132
  * @param req Express Request
134
133
  * @param res Express Response
135
134
  */
136
- this.getBlockById = async ({ params: { number }, query: { eventDocs, extrinsicDocs, feeByEvent } }, res) => {
135
+ this.getBlockById = async ({ params: { number }, query: { eventDocs, extrinsicDocs } }, res) => {
137
136
  const checkFinalized = (0, util_1.isHex)(number);
138
137
  const hash = await this.getHashForBlock(number);
139
138
  const eventDocsArg = eventDocs === 'true';
140
139
  const extrinsicDocsArg = extrinsicDocs === 'true';
141
- const getFeeByEvent = feeByEvent === 'true';
142
140
  const queryFinalizedHead = !this.options.finalizes ? false : true;
143
141
  const omitFinalizedTag = !this.options.finalizes ? true : false;
144
142
  const options = {
@@ -147,7 +145,6 @@ class BlocksController extends AbstractController_1.default {
147
145
  checkFinalized,
148
146
  queryFinalizedHead,
149
147
  omitFinalizedTag,
150
- getFeeByEvent,
151
148
  };
152
149
  // HistoricApi to fetch any historic information that doesnt include the current runtime
153
150
  const historicApi = await this.api.at(hash);
@@ -183,14 +180,13 @@ class BlocksController extends AbstractController_1.default {
183
180
  * @param req Express Request
184
181
  * @param res Express Response
185
182
  */
186
- this.getBlocks = async ({ query: { range, eventDocs, extrinsicDocs, feeByEvent } }, res) => {
183
+ this.getBlocks = async ({ query: { range, eventDocs, extrinsicDocs } }, res) => {
187
184
  if (!range)
188
185
  throw new http_errors_1.BadRequest('range query parameter must be inputted.');
189
186
  // We set a max range to 500 blocks.
190
187
  const rangeOfNums = this.parseRangeOfNumbersOrThrow(range, 500);
191
188
  const eventDocsArg = eventDocs === 'true';
192
189
  const extrinsicDocsArg = extrinsicDocs === 'true';
193
- const getFeeByEvent = feeByEvent === 'true';
194
190
  const queryFinalizedHead = !this.options.finalizes ? false : true;
195
191
  const omitFinalizedTag = !this.options.finalizes ? true : false;
196
192
  const options = {
@@ -199,7 +195,6 @@ class BlocksController extends AbstractController_1.default {
199
195
  checkFinalized: false,
200
196
  queryFinalizedHead,
201
197
  omitFinalizedTag,
202
- getFeeByEvent,
203
198
  };
204
199
  const pQueue = new PromiseQueue_1.PromiseQueue(4);
205
200
  const blocksPromise = [];
@@ -224,6 +219,7 @@ class BlocksController extends AbstractController_1.default {
224
219
  this.initRoutes();
225
220
  }
226
221
  initRoutes() {
222
+ this.router.use(this.path, (0, validate_1.validateBoolean)(['eventDocs', 'extrinsicDocs', 'finalized']));
227
223
  this.safeMountAsyncGetHandlers([
228
224
  ['/', this.getBlocks],
229
225
  ['/head', this.getLatestBlock],
@@ -1 +1 @@
1
- {"version":3,"file":"BlocksController.js","sourceRoot":"","sources":["../../../../src/controllers/blocks/BlocksController.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"BlocksController.js","sourceRoot":"","sources":["../../../../src/controllers/blocks/BlocksController.ts"],"names":[],"mappings":"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"}
@@ -1,12 +1,7 @@
1
1
  import { ApiPromise } from '@polkadot/api';
2
- import LRU from 'lru-cache';
3
- import { IBlock } from 'src/types/responses';
4
2
  import { BlocksService } from '../../services';
3
+ import { ControllerOptions } from '../../types/chains-config';
5
4
  import AbstractController from '../AbstractController';
6
- interface ControllerOptions {
7
- minCalcFeeRuntime: null | number;
8
- blockStore: LRU<string, IBlock>;
9
- }
10
5
  export default class BlocksExtrinsicsController extends AbstractController<BlocksService> {
11
6
  constructor(api: ApiPromise, options: ControllerOptions);
12
7
  protected initRoutes(): void;
@@ -17,4 +12,3 @@ export default class BlocksExtrinsicsController extends AbstractController<Block
17
12
  */
18
13
  private getExtrinsicByTimepoint;
19
14
  }
20
- export {};
@@ -22,24 +22,22 @@ const services_1 = require("../../services");
22
22
  const AbstractController_1 = __importDefault(require("../AbstractController"));
23
23
  class BlocksExtrinsicsController extends AbstractController_1.default {
24
24
  constructor(api, options) {
25
- super(api, '/blocks/:blockId/extrinsics', new services_1.BlocksService(api, options.minCalcFeeRuntime, options.blockStore));
25
+ super(api, '/blocks/:blockId/extrinsics', new services_1.BlocksService(api, options.minCalcFeeRuntime, options.blockStore, options.hasQueryFeeApi));
26
26
  /**
27
27
  *
28
28
  * @param _req Express Request
29
29
  * @param res Express Response
30
30
  */
31
- this.getExtrinsicByTimepoint = async ({ params: { blockId, extrinsicIndex }, query: { eventDocs, extrinsicDocs, feeByEvent }, }, res) => {
31
+ this.getExtrinsicByTimepoint = async ({ params: { blockId, extrinsicIndex }, query: { eventDocs, extrinsicDocs }, }, res) => {
32
32
  const hash = await this.getHashForBlock(blockId);
33
33
  const eventDocsArg = eventDocs === 'true';
34
34
  const extrinsicDocsArg = extrinsicDocs === 'true';
35
- const getFeeByEvent = feeByEvent === 'true';
36
35
  const options = {
37
36
  eventDocs: eventDocsArg,
38
37
  extrinsicDocs: extrinsicDocsArg,
39
38
  checkFinalized: true,
40
39
  queryFinalizedHead: false,
41
40
  omitFinalizedTag: true,
42
- getFeeByEvent,
43
41
  };
44
42
  const historicApi = await this.api.at(hash);
45
43
  const block = await this.service.fetchBlock(hash, historicApi, options);
@@ -1 +1 @@
1
- {"version":3,"file":"BlocksExtrinsicsController.js","sourceRoot":"","sources":["../../../../src/controllers/blocks/BlocksExtrinsicsController.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;;;;;AAOxE,6CAA+C;AAE/C,+EAAuD;AAOvD,MAAqB,0BAA2B,SAAQ,4BAAiC;IACxF,YAAY,GAAe,EAAE,OAA0B;QACtD,KAAK,CACJ,GAAG,EACH,6BAA6B,EAC7B,IAAI,wBAAa,CAAC,GAAG,EAAE,OAAO,CAAC,iBAAiB,EAAE,OAAO,CAAC,UAAU,CAAC,CACrE,CAAC;QAUH;;;;WAIG;QACK,4BAAuB,GAAiC,KAAK,EACpE,EACC,MAAM,EAAE,EAAE,OAAO,EAAE,cAAc,EAAE,EACnC,KAAK,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,UAAU,EAAE,GAC/C,EACD,GAAG,EACa,EAAE;YAClB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;YAEjD,MAAM,YAAY,GAAG,SAAS,KAAK,MAAM,CAAC;YAC1C,MAAM,gBAAgB,GAAG,aAAa,KAAK,MAAM,CAAC;YAClD,MAAM,aAAa,GAAG,UAAU,KAAK,MAAM,CAAC;YAE5C,MAAM,OAAO,GAAG;gBACf,SAAS,EAAE,YAAY;gBACvB,aAAa,EAAE,gBAAgB;gBAC/B,cAAc,EAAE,IAAI;gBACpB,kBAAkB,EAAE,KAAK;gBACzB,gBAAgB,EAAE,IAAI;gBACtB,aAAa;aACb,CAAC;YAEF,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;YAE5C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;YAExE;;eAEG;YACH,IAAI,CAAC,kBAAkB,CACtB,cAAc,EACd,8CAA8C,CAC9C,CAAC;YAEF;;;eAGG;YACH,MAAM,KAAK,GAAG,QAAQ,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;YAE3C,0BAA0B,CAAC,aAAa,CACvC,GAAG,EACH,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,KAAK,EAAE,KAAK,CAAC,CAChD,CAAC;QACH,CAAC,CAAC;QA1DD,IAAI,CAAC,UAAU,EAAE,CAAC;IACnB,CAAC;IAES,UAAU;QACnB,IAAI,CAAC,yBAAyB,CAAC;YAC9B,CAAC,kBAAkB,EAAE,IAAI,CAAC,uBAAuB,CAAC;SAClD,CAAC,CAAC;IACJ,CAAC;CAoDD;AAlED,6CAkEC"}
1
+ {"version":3,"file":"BlocksExtrinsicsController.js","sourceRoot":"","sources":["../../../../src/controllers/blocks/BlocksExtrinsicsController.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,6CAA+C;AAG/C,+EAAuD;AAEvD,MAAqB,0BAA2B,SAAQ,4BAAiC;IACxF,YAAY,GAAe,EAAE,OAA0B;QACtD,KAAK,CACJ,GAAG,EACH,6BAA6B,EAC7B,IAAI,wBAAa,CAChB,GAAG,EACH,OAAO,CAAC,iBAAiB,EACzB,OAAO,CAAC,UAAU,EAClB,OAAO,CAAC,cAAc,CACtB,CACD,CAAC;QAUH;;;;WAIG;QACK,4BAAuB,GAAiC,KAAK,EACpE,EACC,MAAM,EAAE,EAAE,OAAO,EAAE,cAAc,EAAE,EACnC,KAAK,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,GACnC,EACD,GAAG,EACa,EAAE;YAClB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;YAEjD,MAAM,YAAY,GAAG,SAAS,KAAK,MAAM,CAAC;YAC1C,MAAM,gBAAgB,GAAG,aAAa,KAAK,MAAM,CAAC;YAElD,MAAM,OAAO,GAAG;gBACf,SAAS,EAAE,YAAY;gBACvB,aAAa,EAAE,gBAAgB;gBAC/B,cAAc,EAAE,IAAI;gBACpB,kBAAkB,EAAE,KAAK;gBACzB,gBAAgB,EAAE,IAAI;aACtB,CAAC;YAEF,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;YAE5C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;YAExE;;eAEG;YACH,IAAI,CAAC,kBAAkB,CACtB,cAAc,EACd,8CAA8C,CAC9C,CAAC;YAEF;;;eAGG;YACH,MAAM,KAAK,GAAG,QAAQ,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;YAE3C,0BAA0B,CAAC,aAAa,CACvC,GAAG,EACH,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,KAAK,EAAE,KAAK,CAAC,CAChD,CAAC;QACH,CAAC,CAAC;QAxDD,IAAI,CAAC,UAAU,EAAE,CAAC;IACnB,CAAC;IAES,UAAU;QACnB,IAAI,CAAC,yBAAyB,CAAC;YAC9B,CAAC,kBAAkB,EAAE,IAAI,CAAC,uBAAuB,CAAC;SAClD,CAAC,CAAC;IACJ,CAAC;CAkDD;AArED,6CAqEC"}
@@ -18,6 +18,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
18
18
  return (mod && mod.__esModule) ? mod : { "default": mod };
19
19
  };
20
20
  Object.defineProperty(exports, "__esModule", { value: true });
21
+ const middleware_1 = require("../../middleware");
21
22
  const services_1 = require("../../services");
22
23
  const AbstractController_1 = __importDefault(require("../AbstractController"));
23
24
  const BlocksController_1 = __importDefault(require("./BlocksController"));
@@ -47,6 +48,7 @@ class BlocksTraceController extends AbstractController_1.default {
47
48
  this.initRoutes();
48
49
  }
49
50
  initRoutes() {
51
+ this.router.use(this.path, (0, middleware_1.validateBoolean)(['actions']));
50
52
  this.safeMountAsyncGetHandlers([
51
53
  ['/head/traces', this.getLatestBlockTraces],
52
54
  ['/:number/traces', this.getBlockTraces],
@@ -1 +1 @@
1
- {"version":3,"file":"BlocksTraceController.js","sourceRoot":"","sources":["../../../../src/controllers/blocks/BlocksTraceController.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,6CAAoD;AACpD,+EAAuD;AACvD,0EAAkD;AAElD,MAAqB,qBAAsB,SAAQ,4BAAsC;IACxF,YAAY,GAAe;QAC1B,KAAK,CAAC,GAAG,EAAE,sBAAsB,EAAE,IAAI,6BAAkB,CAAC,GAAG,CAAC,CAAC,CAAC;QAazD,yBAAoB,GAAmB,KAAK,EACnD,IAAI,EACJ,GAAG,EACa,EAAE;YAClB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC;YAEzD,0BAAgB,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QACtE,CAAC,CAAC;QAEM,mBAAc,GAAmB,KAAK,EAC7C,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,EAAE,EACtB,GAAG,EACa,EAAE;YAClB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;YAEhD,0BAAgB,CAAC,aAAa,CAAC,GAAG,EAAE,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QACtE,CAAC,CAAC;QAEM,6BAAwB,GAAmB,KAAK,EACvD,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EACtB,GAAG,EACa,EAAE;YAClB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC;YACzD,MAAM,cAAc,GAAG,OAAO,KAAK,MAAM,CAAC;YAC1C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;YAE5C,0BAAgB,CAAC,aAAa,CAC7B,GAAG,EACH,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,WAAW,EAAE,cAAc,CAAC,CAChE,CAAC;QACH,CAAC,CAAC;QAEM,uBAAkB,GAAmB,KAAK,EACjD,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,EAAE,EAC1C,GAAG,EACa,EAAE;YAClB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;YAChD,MAAM,cAAc,GAAG,OAAO,KAAK,MAAM,CAAC;YAC1C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;YAE5C,0BAAgB,CAAC,aAAa,CAC7B,GAAG,EACH,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,WAAW,EAAE,cAAc,CAAC,CAChE,CAAC;QACH,CAAC,CAAC;QAxDD,IAAI,CAAC,UAAU,EAAE,CAAC;IACnB,CAAC;IAES,UAAU;QACnB,IAAI,CAAC,yBAAyB,CAAC;YAC9B,CAAC,cAAc,EAAE,IAAI,CAAC,oBAAoB,CAAC;YAC3C,CAAC,iBAAiB,EAAE,IAAI,CAAC,cAAc,CAAC;YACxC,CAAC,4BAA4B,EAAE,IAAI,CAAC,kBAAkB,CAAC;YACvD,CAAC,yBAAyB,EAAE,IAAI,CAAC,wBAAwB,CAAC;SAC1D,CAAC,CAAC;IACJ,CAAC;CA+CD;AA5DD,wCA4DC"}
1
+ {"version":3,"file":"BlocksTraceController.js","sourceRoot":"","sources":["../../../../src/controllers/blocks/BlocksTraceController.ts"],"names":[],"mappings":"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"}
@@ -18,6 +18,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
18
18
  return (mod && mod.__esModule) ? mod : { "default": mod };
19
19
  };
20
20
  Object.defineProperty(exports, "__esModule", { value: true });
21
+ const middleware_1 = require("../../middleware");
21
22
  const services_1 = require("../../services");
22
23
  const AbstractController_1 = __importDefault(require("../AbstractController"));
23
24
  /**
@@ -48,6 +49,7 @@ class NodeTransactionPoolController extends AbstractController_1.default {
48
49
  this.initRoutes();
49
50
  }
50
51
  initRoutes() {
52
+ this.router.use(this.path, (0, middleware_1.validateBoolean)(['includeFee']));
51
53
  this.safeMountAsyncGetHandlers([['', this.getNodeTransactionPool]]);
52
54
  }
53
55
  }
@@ -1 +1 @@
1
- {"version":3,"file":"NodeTransactionPoolController.js","sourceRoot":"","sources":["../../../../src/controllers/node/NodeTransactionPoolController.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,6CAA4D;AAC5D,+EAAuD;AAEvD;;;;;;;;;;;GAWG;AACH,MAAqB,6BAA8B,SAAQ,4BAA8C;IACxG,YAAY,GAAe;QAC1B,KAAK,CAAC,GAAG,EAAE,wBAAwB,EAAE,IAAI,qCAA0B,CAAC,GAAG,CAAC,CAAC,CAAC;QAQ3E;;;;;WAKG;QACK,2BAAsB,GAAmB,KAAK,EACrD,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,EAAE,EACzB,GAAG,EACa,EAAE;YAClB,MAAM,gBAAgB,GAAG,UAAU,KAAK,MAAM,CAAC;YAE/C,6BAA6B,CAAC,aAAa,CAC1C,GAAG,EACH,MAAM,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,CACzD,CAAC;QACH,CAAC,CAAC;QAvBD,IAAI,CAAC,UAAU,EAAE,CAAC;IACnB,CAAC;IAES,UAAU;QACnB,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC;IACrE,CAAC;CAmBD;AA3BD,gDA2BC"}
1
+ {"version":3,"file":"NodeTransactionPoolController.js","sourceRoot":"","sources":["../../../../src/controllers/node/NodeTransactionPoolController.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,iDAAmD;AACnD,6CAA4D;AAC5D,+EAAuD;AAEvD;;;;;;;;;;;GAWG;AACH,MAAqB,6BAA8B,SAAQ,4BAA8C;IACxG,YAAY,GAAe;QAC1B,KAAK,CAAC,GAAG,EAAE,wBAAwB,EAAE,IAAI,qCAA0B,CAAC,GAAG,CAAC,CAAC,CAAC;QAS3E;;;;;WAKG;QACK,2BAAsB,GAAmB,KAAK,EACrD,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,EAAE,EACzB,GAAG,EACa,EAAE;YAClB,MAAM,gBAAgB,GAAG,UAAU,KAAK,MAAM,CAAC;YAE/C,6BAA6B,CAAC,aAAa,CAC1C,GAAG,EACH,MAAM,IAAI,CAAC,OAAO,CAAC,oBAAoB,CAAC,gBAAgB,CAAC,CACzD,CAAC;QACH,CAAC,CAAC;QAxBD,IAAI,CAAC,UAAU,EAAE,CAAC;IACnB,CAAC;IAES,UAAU;QACnB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAA,4BAAe,EAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAC5D,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC;IACrE,CAAC;CAmBD;AA5BD,gDA4BC"}
@@ -19,6 +19,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
19
19
  };
20
20
  Object.defineProperty(exports, "__esModule", { value: true });
21
21
  const util_1 = require("@polkadot/util");
22
+ const middleware_1 = require("../..//middleware");
22
23
  const Log_1 = require("../../logging/Log");
23
24
  const services_1 = require("../../services");
24
25
  const AbstractController_1 = __importDefault(require("../AbstractController"));
@@ -75,7 +76,7 @@ class PalletsStorageController extends AbstractController_1.default {
75
76
  'The adjustMetadataV13 query parameter has been deprecated. It will still be available to use for historic blocks.';
76
77
  }
77
78
  initRoutes() {
78
- // TODO look into middleware validation of in path IDs. https://github.com/paritytech/substrate-api-sidecar/issues/281
79
+ this.router.use(this.path, (0, middleware_1.validateBoolean)(['adjustMetadataV13']));
79
80
  this.safeMountAsyncGetHandlers([
80
81
  ['/:storageItemId', this.getStorageItem],
81
82
  ['/', this.getStorage],
@@ -1 +1 @@
1
- {"version":3,"file":"PalletsStorageController.js","sourceRoot":"","sources":["../../../../src/controllers/pallets/PalletsStorageController.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"PalletsStorageController.js","sourceRoot":"","sources":["../../../../src/controllers/pallets/PalletsStorageController.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,yCAAiD;AAGjD,kDAAoD;AACpD,2CAAwC;AACxC,6CAAuD;AACvD,+EAAuD;AAEvD;;;;;;;;;;;;GAYG;AACH,MAAqB,wBAAyB,SAAQ,4BAAyC;IAE9F,YAAY,GAAe;QAC1B,KAAK,CAAC,GAAG,EAAE,4BAA4B,EAAE,IAAI,gCAAqB,CAAC,GAAG,CAAC,CAAC,CAAC;QAelE,mBAAc,GAAmB,KAAK,EAC7C,EACC,KAAK,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,iBAAiB,EAAE,EACtD,MAAM,EAAE,EAAE,QAAQ,EAAE,aAAa,EAAE,GACnC,EACD,GAAG,EACa,EAAE;YAClB,MAAM,OAAO,GAAG,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;YAC5D,MAAM,OAAO,GAAG,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC;YAC5D,MAAM,WAAW,GAAG,QAAQ,KAAK,MAAM,CAAC;YACxC,MAAM,oBAAoB,GAAG,iBAAiB,KAAK,MAAM,CAAC;YAE1D,oBAAoB,IAAI,SAAG,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAE7D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YAC1C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;YAE5C,wBAAwB,CAAC,aAAa,CACrC,GAAG,EACH,MAAM,IAAI,CAAC,OAAO,CAAC,gBAAgB,CAAC,WAAW,EAAE;gBAChD,IAAI;gBACJ,iEAAiE;gBACjE,QAAQ,EAAE,IAAA,sBAAe,EAAC,QAAQ,CAAC;gBACnC,aAAa,EAAE,IAAA,sBAAe,EAAC,aAAa,CAAC;gBAC7C,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,OAAO;gBACb,QAAQ,EAAE,WAAW;gBACrB,oBAAoB;aACpB,CAAC,CACF,CAAC;QACH,CAAC,CAAC;QAEM,eAAU,GAAmB,KAAK,EACzC,EAAE,MAAM,EAAE,EAAE,QAAQ,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,iBAAiB,EAAE,EAAE,EACnE,GAAG,EACa,EAAE;YAClB,MAAM,UAAU,GAAG,OAAO,KAAK,MAAM,CAAC;YACtC,MAAM,oBAAoB,GAAG,iBAAiB,KAAK,MAAM,CAAC;YAE1D,oBAAoB,IAAI,SAAG,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAE7D,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YAC1C,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;YAE5C,wBAAwB,CAAC,aAAa,CACrC,GAAG,EACH,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,WAAW,EAAE;gBAC5C,IAAI;gBACJ,QAAQ,EAAE,IAAA,sBAAe,EAAC,QAAQ,CAAC;gBACnC,OAAO,EAAE,UAAU;gBACnB,oBAAoB;aACpB,CAAC,CACF,CAAC;QACH,CAAC,CAAC;QAlED,IAAI,CAAC,UAAU,EAAE,CAAC;QAClB,IAAI,CAAC,cAAc;YAClB,mHAAmH,CAAC;IACtH,CAAC;IAES,UAAU;QACnB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAA,4BAAe,EAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC;QACnE,IAAI,CAAC,yBAAyB,CAAC;YAC9B,CAAC,iBAAiB,EAAE,IAAI,CAAC,cAAc,CAAC;YACxC,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC;SACtB,CAAC,CAAC;IACJ,CAAC;CAwDD;AAxED,2CAwEC"}
@@ -18,6 +18,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
18
18
  return (mod && mod.__esModule) ? mod : { "default": mod };
19
19
  };
20
20
  Object.defineProperty(exports, "__esModule", { value: true });
21
+ const middleware_1 = require("../../middleware");
21
22
  const services_1 = require("../../services");
22
23
  const AbstractController_1 = __importDefault(require("../AbstractController"));
23
24
  class ParasController extends AbstractController_1.default {
@@ -64,6 +65,7 @@ class ParasController extends AbstractController_1.default {
64
65
  this.initRoutes();
65
66
  }
66
67
  initRoutes() {
68
+ this.router.use(this.path + '/paras/leases/current', (0, middleware_1.validateBoolean)(['currentLeaseHolders']));
67
69
  this.safeMountAsyncGetHandlers([
68
70
  ['/paras', this.getParas],
69
71
  ['/paras/crowdloans', this.getCrowdloans],
@@ -1 +1 @@
1
- {"version":3,"file":"ParasController.js","sourceRoot":"","sources":["../../../../src/controllers/paras/ParasController.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ParasController.js","sourceRoot":"","sources":["../../../../src/controllers/paras/ParasController.ts"],"names":[],"mappings":"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"}
@@ -19,6 +19,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
19
19
  };
20
20
  Object.defineProperty(exports, "__esModule", { value: true });
21
21
  const Log_1 = require("../../logging/Log");
22
+ const middleware_1 = require("../../middleware");
22
23
  const services_1 = require("../../services");
23
24
  const AbstractController_1 = __importDefault(require("../AbstractController"));
24
25
  /**
@@ -68,6 +69,7 @@ class TransactionMaterialController extends AbstractController_1.default {
68
69
  this.initRoutes();
69
70
  }
70
71
  initRoutes() {
72
+ this.router.use(this.path, (0, middleware_1.validateBoolean)(['noMeta']));
71
73
  this.safeMountAsyncGetHandlers([['', this.getTransactionMaterial]]);
72
74
  }
73
75
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"TransactionMaterialController.js","sourceRoot":"","sources":["../../../../src/controllers/transaction/TransactionMaterialController.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,2CAAwC;AACxC,6CAA4D;AAC5D,+EAAuD;AAIvD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,MAAqB,6BAA8B,SAAQ,4BAA8C;IACxG,YAAY,GAAe;QAC1B,KAAK,CAAC,GAAG,EAAE,uBAAuB,EAAE,IAAI,qCAA0B,CAAC,GAAG,CAAC,CAAC,CAAC;QAQ1E;;;;;WAKG;QACK,2BAAsB,GAAmB,KAAK,EACrD,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EACnC,GAAG,EACa,EAAE;YAClB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YAE1C,MAAM,WAAW,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YAE7D,6BAA6B,CAAC,aAAa,CAC1C,GAAG,EACH,MAAM,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,IAAI,EAAE,WAAW,CAAC,CAC9D,CAAC;QACH,CAAC,CAAC;QAzBD,IAAI,CAAC,UAAU,EAAE,CAAC;IACnB,CAAC;IAES,UAAU;QACnB,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC;IACrE,CAAC;IAsBD;;;;;OAKG;IACK,iBAAiB,CACxB,MAAe,EACf,QAAiB;QAEjB;;;;WAIG;QACH,IAAI,QAAQ,EAAE;YACb,QAAQ,QAAQ,EAAE;gBACjB,KAAK,MAAM;oBACV,OAAO,MAAM,CAAC;gBACf,KAAK,OAAO;oBACX,OAAO,OAAO,CAAC;gBAChB;oBACC,MAAM,IAAI,KAAK,CACd,wDAAwD,CACxD,CAAC;aACH;SACD;QAED,IAAI,MAAM,EAAE;YACX,SAAG,CAAC,MAAM,CAAC,IAAI,CACd,qGAAqG,CACrG,CAAC;YACF,QAAQ,MAAM,EAAE;gBACf,KAAK,MAAM;oBACV,OAAO,KAAK,CAAC;gBACd,KAAK,OAAO;oBACX,OAAO,OAAO,CAAC;aAChB;SACD;QAED,4EAA4E;QAC5E,OAAO,OAAO,CAAC;IAChB,CAAC;CACD;AAzED,gDAyEC"}
1
+ {"version":3,"file":"TransactionMaterialController.js","sourceRoot":"","sources":["../../../../src/controllers/transaction/TransactionMaterialController.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,2CAAwC;AACxC,iDAAmD;AACnD,6CAA4D;AAC5D,+EAAuD;AAIvD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,MAAqB,6BAA8B,SAAQ,4BAA8C;IACxG,YAAY,GAAe;QAC1B,KAAK,CAAC,GAAG,EAAE,uBAAuB,EAAE,IAAI,qCAA0B,CAAC,GAAG,CAAC,CAAC,CAAC;QAS1E;;;;;WAKG;QACK,2BAAsB,GAAmB,KAAK,EACrD,EAAE,KAAK,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EACnC,GAAG,EACa,EAAE;YAClB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YAE1C,MAAM,WAAW,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YAE7D,6BAA6B,CAAC,aAAa,CAC1C,GAAG,EACH,MAAM,IAAI,CAAC,OAAO,CAAC,wBAAwB,CAAC,IAAI,EAAE,WAAW,CAAC,CAC9D,CAAC;QACH,CAAC,CAAC;QA1BD,IAAI,CAAC,UAAU,EAAE,CAAC;IACnB,CAAC;IAES,UAAU;QACnB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,IAAA,4BAAe,EAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACxD,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC;IACrE,CAAC;IAsBD;;;;;OAKG;IACK,iBAAiB,CACxB,MAAe,EACf,QAAiB;QAEjB;;;;WAIG;QACH,IAAI,QAAQ,EAAE;YACb,QAAQ,QAAQ,EAAE;gBACjB,KAAK,MAAM;oBACV,OAAO,MAAM,CAAC;gBACf,KAAK,OAAO;oBACX,OAAO,OAAO,CAAC;gBAChB;oBACC,MAAM,IAAI,KAAK,CACd,wDAAwD,CACxD,CAAC;aACH;SACD;QAED,IAAI,MAAM,EAAE;YACX,SAAG,CAAC,MAAM,CAAC,IAAI,CACd,qGAAqG,CACrG,CAAC;YACF,QAAQ,MAAM,EAAE;gBACf,KAAK,MAAM;oBACV,OAAO,KAAK,CAAC;gBACd,KAAK,OAAO;oBACX,OAAO,OAAO,CAAC;aAChB;SACD;QAED,4EAA4E;QAC5E,OAAO,OAAO,CAAC;IAChB,CAAC;CACD;AA1ED,gDA0EC"}
package/build/src/main.js CHANGED
@@ -64,7 +64,9 @@ async function main() {
64
64
  const { TYPES_BUNDLE, TYPES_SPEC, TYPES_CHAIN, TYPES } = config.SUBSTRATE;
65
65
  // Instantiate a web socket connection to the node and load types
66
66
  const api = await api_1.ApiPromise.create({
67
- provider: new rpc_provider_1.WsProvider(config.SUBSTRATE.WS_URL),
67
+ provider: config.SUBSTRATE.URL.startsWith('http')
68
+ ? new rpc_provider_1.HttpProvider(config.SUBSTRATE.URL)
69
+ : new rpc_provider_1.WsProvider(config.SUBSTRATE.URL),
68
70
  /* eslint-disable @typescript-eslint/no-var-requires */
69
71
  typesBundle: TYPES_BUNDLE
70
72
  ? require(TYPES_BUNDLE)
@@ -83,7 +85,7 @@ async function main() {
83
85
  api.rpc.system.chain(),
84
86
  api.rpc.state.getRuntimeVersion(),
85
87
  ]);
86
- startUpPrompt(config.SUBSTRATE.WS_URL, chainName.toString(), implName.toString());
88
+ startUpPrompt(config.SUBSTRATE.URL, chainName.toString(), implName.toString());
87
89
  // Create our App
88
90
  const app = new App_1.default({
89
91
  preMiddleware: [(0, express_1.json)(), middleware.httpLoggerCreate(logger)],
@@ -105,22 +107,21 @@ async function main() {
105
107
  * Prompt the user with some basic info about the node and the network they have
106
108
  * connected Sidecar to.
107
109
  *
108
- * @param wsUrl websocket url of the node Sidecar is connected to
110
+ * @param url Url of the node Sidecar is connected to, can be a websocket or http address
109
111
  * @param chainName chain name of the network Sidecar is connected to
110
112
  * @param implName implementation name of the node Sidecar is connected to
111
113
  */
112
- function startUpPrompt(wsUrl, chainName, implName) {
114
+ function startUpPrompt(url, chainName, implName) {
113
115
  const { logger } = Log_1.Log;
114
- const { config } = SidecarConfig_1.SidecarConfig;
115
- logger.info(`Connected to chain ${chainName} on the ${implName} client at ${config.SUBSTRATE.WS_URL}`);
116
+ logger.info(`Connected to chain ${chainName} on the ${implName} client at ${url}`);
116
117
  // Split the Url to check for 2 things. Secure connection, and if its a local IP.
117
- const splitUrl = wsUrl.split(':');
118
+ const splitUrl = url.split(':');
118
119
  // If its 'ws' its not a secure connection.
119
- const isSecure = splitUrl[0] === 'wss';
120
+ const isSecure = splitUrl[0] === 'wss' || splitUrl[0] === 'https';
120
121
  // Check if its a local IP.
121
122
  const isLocal = splitUrl[1] === '//127.0.0.1' || splitUrl[1] === '//localhost';
122
123
  if (!isSecure && !isLocal) {
123
- logger.warn(`Using unencrypted connection to a public node (${wsUrl}); All traffic is sent over the internet in cleartext.`);
124
+ logger.warn(`Using unencrypted connection to a public node (${url}); All traffic is sent over the internet in cleartext.`);
124
125
  }
125
126
  }
126
127
  process.on('SIGINT', function () {
@@ -1 +1 @@
1
- {"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/main.ts"],"names":[],"mappings":"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"}
@@ -1 +1,2 @@
1
1
  export { validateAddressMiddleware as validateAddress } from './validateAddressMiddleware';
2
+ export { validateBooleanMiddleware as validateBoolean } from './validateBooleanMiddleware';
@@ -15,7 +15,9 @@
15
15
  // You should have received a copy of the GNU General Public License
16
16
  // along with this program. If not, see <http://www.gnu.org/licenses/>.
17
17
  Object.defineProperty(exports, "__esModule", { value: true });
18
- exports.validateAddress = void 0;
18
+ exports.validateBoolean = exports.validateAddress = void 0;
19
19
  var validateAddressMiddleware_1 = require("./validateAddressMiddleware");
20
20
  Object.defineProperty(exports, "validateAddress", { enumerable: true, get: function () { return validateAddressMiddleware_1.validateAddressMiddleware; } });
21
+ var validateBooleanMiddleware_1 = require("./validateBooleanMiddleware");
22
+ Object.defineProperty(exports, "validateBoolean", { enumerable: true, get: function () { return validateBooleanMiddleware_1.validateBooleanMiddleware; } });
21
23
  //# sourceMappingURL=index.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/middleware/validate/index.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,yEAA2F;AAAlF,4HAAA,yBAAyB,OAAmB"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/middleware/validate/index.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,yEAA2F;AAAlF,4HAAA,yBAAyB,OAAmB;AACrD,yEAA2F;AAAlF,4HAAA,yBAAyB,OAAmB"}
@@ -0,0 +1,18 @@
1
+ import { Request } from 'express';
2
+ import { RequestHandler } from 'express-serve-static-core';
3
+ /**
4
+ * Assert that a middleware does not error with the given request.
5
+ *
6
+ * @param name String for tests to log.
7
+ * @param req Express Request containing thing it errors on.
8
+ */
9
+ export declare const doesNotErrorWith: (name: string, req: Request, middleware: RequestHandler) => void;
10
+ /**
11
+ * Assert that a middleware passes `err` to next with the given
12
+ * `req`.
13
+ *
14
+ * @param name String for tests to log.
15
+ * @param req Express Request containing thing it errors on.
16
+ * @param err Expected error that it passes to next.
17
+ */
18
+ export declare const errorsWith: (name: string, req: Request, err: unknown, middleware: RequestHandler) => void;
@@ -0,0 +1,51 @@
1
+ "use strict";
2
+ // Copyright 2017-2022 Parity Technologies (UK) Ltd.
3
+ // This file is part of Substrate API Sidecar.
4
+ //
5
+ // Substrate API Sidecar is free software: you can redistribute it and/or modify
6
+ // it under the terms of the GNU General Public License as published by
7
+ // the Free Software Foundation, either version 3 of the License, or
8
+ // (at your option) any later version.
9
+ //
10
+ // This program is distributed in the hope that it will be useful,
11
+ // but WITHOUT ANY WARRANTY; without even the implied warranty of
12
+ // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13
+ // GNU General Public License for more details.
14
+ //
15
+ // You should have received a copy of the GNU General Public License
16
+ // along with this program. If not, see <http://www.gnu.org/licenses/>.
17
+ Object.defineProperty(exports, "__esModule", { value: true });
18
+ exports.errorsWith = exports.doesNotErrorWith = void 0;
19
+ /**
20
+ * Assert that a middleware does not error with the given request.
21
+ *
22
+ * @param name String for tests to log.
23
+ * @param req Express Request containing thing it errors on.
24
+ */
25
+ const doesNotErrorWith = (name, req, middleware) => {
26
+ it(`does not error with ${name}`, () => {
27
+ const next = jest.fn();
28
+ middleware(req, null, next);
29
+ expect(next).toBeCalledTimes(1);
30
+ expect(next).toBeCalledWith();
31
+ });
32
+ };
33
+ exports.doesNotErrorWith = doesNotErrorWith;
34
+ /**
35
+ * Assert that a middleware passes `err` to next with the given
36
+ * `req`.
37
+ *
38
+ * @param name String for tests to log.
39
+ * @param req Express Request containing thing it errors on.
40
+ * @param err Expected error that it passes to next.
41
+ */
42
+ const errorsWith = (name, req, err, middleware) => {
43
+ it(`errors with ${name}`, () => {
44
+ const next = jest.fn();
45
+ middleware(req, null, next);
46
+ expect(next).toBeCalledTimes(1);
47
+ expect(next).toBeCalledWith(err);
48
+ });
49
+ };
50
+ exports.errorsWith = errorsWith;
51
+ //# sourceMappingURL=util.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"util.js","sourceRoot":"","sources":["../../../../src/middleware/validate/util.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;;;;;GAKG;AACI,MAAM,gBAAgB,GAAG,CAC/B,IAAY,EACZ,GAAY,EACZ,UAA0B,EACnB,EAAE;IACT,EAAE,CAAC,uBAAuB,IAAI,EAAE,EAAE,GAAG,EAAE;QACtC,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;QACvB,UAAU,CAAC,GAAG,EAAE,IAA2B,EAAE,IAAI,CAAC,CAAC;QACnD,MAAM,CAAC,IAAI,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;QAChC,MAAM,CAAC,IAAI,CAAC,CAAC,cAAc,EAAE,CAAC;IAC/B,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC;AAXW,QAAA,gBAAgB,oBAW3B;AAEF;;;;;;;GAOG;AACI,MAAM,UAAU,GAAG,CACzB,IAAY,EACZ,GAAY,EACZ,GAAY,EACZ,UAA0B,EACnB,EAAE;IACT,EAAE,CAAC,eAAe,IAAI,EAAE,EAAE,GAAG,EAAE;QAC9B,MAAM,IAAI,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;QAEvB,UAAU,CAAC,GAAG,EAAE,IAA2B,EAAE,IAAI,CAAC,CAAC;QACnD,MAAM,CAAC,IAAI,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;QAChC,MAAM,CAAC,IAAI,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC;AAbW,QAAA,UAAU,cAarB"}
@@ -16,102 +16,73 @@
16
16
  // along with this program. If not, see <http://www.gnu.org/licenses/>.
17
17
  Object.defineProperty(exports, "__esModule", { value: true });
18
18
  const http_errors_1 = require("http-errors");
19
+ const util_1 = require("./util");
19
20
  const validateAddressMiddleware_1 = require("./validateAddressMiddleware");
20
- /**
21
- * Assert that `validateAddressMiddleware` does not error with a the given `req`.
22
- *
23
- * @param name thing it does not error on
24
- * @param req Express Request containing thing it errors on
25
- */
26
- function doesNotErrorWith(name, req) {
27
- it(`does not error with ${name}`, () => {
28
- const next = jest.fn();
29
- (0, validateAddressMiddleware_1.validateAddressMiddleware)(req, null, next);
30
- expect(next).toBeCalledTimes(1);
31
- expect(next).toBeCalledWith();
32
- });
33
- }
34
- /**
35
- * Assert that `validateAddressMiddleware` passes `err` to next with the given
36
- * `req`.
37
- *
38
- * @param name thing it errors on
39
- * @param req Express Request containing thing it errors on
40
- * @param err expected error that it passes to next
41
- */
42
- function errorsWith(name, req, err) {
43
- it(`errors with ${name}`, () => {
44
- const next = jest.fn();
45
- (0, validateAddressMiddleware_1.validateAddressMiddleware)(req, null, next);
46
- expect(next).toBeCalledTimes(1);
47
- expect(next).toBeCalledWith(err);
48
- });
49
- }
50
21
  describe('validateAddressMiddleware', () => {
51
- doesNotErrorWith('no address in params', {
22
+ (0, util_1.doesNotErrorWith)('no address in params', {
52
23
  params: {
53
24
  number: '1',
54
25
  },
55
- });
56
- doesNotErrorWith('a valid substrate address', {
26
+ }, validateAddressMiddleware_1.validateAddressMiddleware);
27
+ (0, util_1.doesNotErrorWith)('a valid substrate address', {
57
28
  params: {
58
29
  number: '1',
59
30
  address: '5EnxxUmEbw8DkENKiYuZ1DwQuMoB2UWEQJZZXrTsxoz7SpgG',
60
31
  },
61
- });
62
- doesNotErrorWith('a valid kusama address', {
32
+ }, validateAddressMiddleware_1.validateAddressMiddleware);
33
+ (0, util_1.doesNotErrorWith)('a valid kusama address', {
63
34
  params: {
64
35
  number: '1',
65
36
  address: 'DXgXPAT5zWtPHo6FhVvrDdiaDPgCNGxhJAeVBYLtiwW9hAc',
66
37
  },
67
- });
68
- doesNotErrorWith('a valid kulupu address', {
38
+ }, validateAddressMiddleware_1.validateAddressMiddleware);
39
+ (0, util_1.doesNotErrorWith)('a valid kulupu address', {
69
40
  params: {
70
41
  number: '1',
71
42
  address: '2cYv9Gk6U4m4a7Taw9pG8qMfd1Pnxw6FLTvV6kYZNhGL6M9y',
72
43
  },
73
- });
74
- doesNotErrorWith('a valid edgeware address', {
44
+ }, validateAddressMiddleware_1.validateAddressMiddleware);
45
+ (0, util_1.doesNotErrorWith)('a valid edgeware address', {
75
46
  params: {
76
47
  number: '1',
77
48
  address: '5D24s4paTdVxddyeUzgsxGGiRd7SPhTnEvKu6XGPQvj1QSYN',
78
49
  },
79
- });
80
- doesNotErrorWith('a valid polkadot address', {
50
+ }, validateAddressMiddleware_1.validateAddressMiddleware);
51
+ (0, util_1.doesNotErrorWith)('a valid polkadot address', {
81
52
  params: {
82
53
  number: '1',
83
54
  address: '1xN1Q5eKQmS5AzASdjt6R6sHF76611vKR4PFpFjy1kXau4m',
84
55
  },
85
- });
86
- doesNotErrorWith('a valid H160 address', {
56
+ }, validateAddressMiddleware_1.validateAddressMiddleware);
57
+ (0, util_1.doesNotErrorWith)('a valid H160 address', {
87
58
  params: {
88
59
  number: '1',
89
60
  address: '0xf24FF3a9CF04c71Dbc94D0b566f7A27B94566cac',
90
61
  },
91
- });
92
- errorsWith('an address containing an invalid base58 char', {
62
+ }, validateAddressMiddleware_1.validateAddressMiddleware);
63
+ (0, util_1.errorsWith)('an address containing an invalid base58 char', {
93
64
  params: {
94
65
  number: '1',
95
66
  address: '5EnxIUmEbw8DkENKiYuZ1DwQuMoB2UWEQJZZXrTsxoz7SpgG',
96
67
  },
97
- }, new http_errors_1.BadRequest('Invalid base58 character "I" (0x49) at index 4'));
98
- errorsWith('an address missing some bytes', {
68
+ }, new http_errors_1.BadRequest('Invalid base58 character "I" (0x49) at index 4'), validateAddressMiddleware_1.validateAddressMiddleware);
69
+ (0, util_1.errorsWith)('an address missing some bytes', {
99
70
  params: {
100
71
  number: '1',
101
72
  address: 'y9EMHt34JJo4rWLSaxoLGdYXvjgSXEd4zHUnQgfNzwES8b',
102
73
  },
103
- }, new http_errors_1.BadRequest('Invalid address format'));
104
- errorsWith('an address with invalid decoded address checksum', {
74
+ }, new http_errors_1.BadRequest('Invalid address format'), validateAddressMiddleware_1.validateAddressMiddleware);
75
+ (0, util_1.errorsWith)('an address with invalid decoded address checksum', {
105
76
  params: {
106
77
  number: '1',
107
78
  address: '5GoKvZWG5ZPYL1WUovuHW3zJBWBP5eT8CbqjdRY4Q6iMaDwU',
108
79
  },
109
- }, new http_errors_1.BadRequest('Invalid decoded address checksum'));
110
- errorsWith('a nonsense address', {
80
+ }, new http_errors_1.BadRequest('Invalid decoded address checksum'), validateAddressMiddleware_1.validateAddressMiddleware);
81
+ (0, util_1.errorsWith)('a nonsense address', {
111
82
  params: {
112
83
  number: '1',
113
84
  address: 'hello',
114
85
  },
115
- }, new http_errors_1.BadRequest('Invalid base58 character "l" (0x6c) at index 2'));
86
+ }, new http_errors_1.BadRequest('Invalid base58 character "l" (0x6c) at index 2'), validateAddressMiddleware_1.validateAddressMiddleware);
116
87
  });
117
88
  //# sourceMappingURL=validateAddressMiddleware.spec.js.map