@substrate/api-sidecar 12.4.0 → 12.4.1

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 (18) hide show
  1. package/README.md +0 -5
  2. package/build/package.json +14 -14
  3. package/build/src/logging/transformers/filterApiRpc.js.map +1 -1
  4. package/build/src/logging/transformers/stripTimestamp.js.map +1 -1
  5. package/build/src/logging/transports/consoleTransport.js +1 -1
  6. package/build/src/logging/transports/consoleTransport.js.map +1 -1
  7. package/build/src/services/blocks/BlocksService.d.ts +6 -0
  8. package/build/src/services/blocks/BlocksService.js +29 -10
  9. package/build/src/services/blocks/BlocksService.js.map +1 -1
  10. package/build/src/services/blocks/BlocksService.spec.js +21 -7
  11. package/build/src/services/blocks/BlocksService.spec.js.map +1 -1
  12. package/build/src/types/logging/Transformers.d.ts +10 -0
  13. package/build/src/types/logging/Transformers.js +18 -0
  14. package/build/src/types/logging/Transformers.js.map +1 -0
  15. package/build/src/types/logging/index.d.ts +1 -0
  16. package/build/src/types/logging/index.js +29 -0
  17. package/build/src/types/logging/index.js.map +1 -0
  18. package/package.json +14 -14
package/README.md CHANGED
@@ -170,9 +170,6 @@ Some chains require custom type definitions in order for Sidecar to know how to
170
170
  retrieved from the node. Sidecar affords environment variables which allow the user to specify an absolute path to a JSON file that contains type definitions in the corresponding formats. Consult polkadot-js/api for more info on
171
171
  the type formats (see `RegisteredTypes`).
172
172
 
173
- **N.B** Types set from environment variables will override the corresponding types pulled from
174
- @polkadot/apps-config.
175
-
176
173
  - `SAS_SUBSTRATE_TYPES_BUNDLE`: a bundle of types with versioning info, type aliases, derives, and
177
174
  rpc definitions. Format: `OverrideBundleType` (see [`typesBundle`](https://github.com/polkadot-js/api/blob/21039dec1fcad36061a96bf5526248c5fab38780/packages/types/src/types/registry.ts#L72)).
178
175
  - `SAS_SUBSTRATE_TYPES_CHAIN`: type definitions keyed by `chainName`. Format: `Record<string, RegistryTypes>` (see [`typesChain`](https://github.com/polkadot-js/api/blob/21039dec1fcad36061a96bf5526248c5fab38780/packages/types/src/types/registry.ts#L76)).
@@ -303,8 +300,6 @@ All the commits in this repo follow the [Conventional Commits spec](https://www.
303
300
  and read the release notes for any breaking changes or high priority updates. In order to update all the dependencies and resolutions run `yarn update-pjs-deps`.
304
301
 
305
302
  - @polkadot/api [release notes](https://github.com/polkadot-js/api/releases)
306
- - @polkadot/apps-config [release notes](https://github.com/polkadot-js/apps/releases)
307
- - If there are any major changes to this package that includes third party type packages, its worth noting to contact the maintainers of sidecar and do a peer review of the changes in apps-config, and make sure no bugs will be inherited.
308
303
  - @polkadot/util-crypto [release notes](https://github.com/polkadot-js/common/releases)
309
304
  - @substrate/calc [npm release page](https://www.npmjs.com/package/@substrate/calc)
310
305
 
package/build/package.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "12.4.0",
2
+ "version": "12.4.1",
3
3
  "name": "@substrate/api-sidecar",
4
4
  "description": "REST service that makes it easy to interact with blockchain nodes built using Substrate's FRAME framework.",
5
5
  "homepage": "https://github.com/paritytech/substrate-api-sidecar#readme",
@@ -53,28 +53,28 @@
53
53
  "update-pjs-deps": "substrate-update-pjs-deps && yarn"
54
54
  },
55
55
  "dependencies": {
56
- "@polkadot/api": "^8.12.2",
57
- "@polkadot/util-crypto": "^10.0.2",
56
+ "@polkadot/api": "^8.14.1",
57
+ "@polkadot/util-crypto": "^10.1.1",
58
58
  "@substrate/calc": "^0.2.8",
59
59
  "argparse": "^2.0.1",
60
- "confmgr": "1.0.7",
61
- "express": "^4.17.1",
62
- "express-winston": "^4.1.0",
63
- "http-errors": "^1.8.1",
64
- "lru-cache": "^6.0.0",
65
- "rxjs": "^7.5.5",
66
- "winston": "^3.3.3"
60
+ "confmgr": "1.0.9",
61
+ "express": "^4.18.1",
62
+ "express-winston": "^4.2.0",
63
+ "http-errors": "^2.0.0",
64
+ "lru-cache": "^7.13.1",
65
+ "rxjs": "^7.5.6",
66
+ "winston": "^3.8.1"
67
67
  },
68
68
  "devDependencies": {
69
69
  "@substrate/dev": "^0.6.3",
70
70
  "@types/argparse": "2.0.10",
71
71
  "@types/express": "4.17.13",
72
- "@types/express-serve-static-core": "4.17.25",
73
- "@types/http-errors": "1.8.1",
74
- "@types/lru-cache": "^5.1.1",
72
+ "@types/express-serve-static-core": "4.17.30",
73
+ "@types/http-errors": "1.8.2",
74
+ "@types/lru-cache": "^7.10.10",
75
75
  "@types/morgan": "1.9.3",
76
76
  "@types/triple-beam": "^1.3.2",
77
- "tsc-watch": "^4.4.0"
77
+ "tsc-watch": "^4.6.2"
78
78
  },
79
79
  "resolutions": {
80
80
  "node-fetch": "2.6.7",
package/build/src/logging/transformers/filterApiRpc.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"filterApiRpc.js","sourceRoot":"","sources":["../../../../src/logging/transformers/filterApiRpc.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,qCAAiC;AAEjC;;GAEG;AACU,QAAA,YAAY,GAAG,IAAA,gBAAM,EACjC,CAAC,IAAuB,EAAE,KAAc,EAAE,EAAE;;IAC3C,IACC,CAAC,IAAI;QACL,CAAC,CAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,QAAQ;YACvB,CAAC,CAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,QAAQ,CAAC,WAAW,CAAC,CAAA;aACrC,MAAA,IAAI,CAAC,OAAO,0CAAE,QAAQ,CAAC,SAAS,CAAC,CAAA;YACjC,IAAI,CAAC,KAAK,KAAK,MAAM,CAAC,EACtB;QACD,OAAO,KAAK,CAAC;KACb;IAED,OAAO,IAAI,CAAC;AACb,CAAC,CACD,CAAC"}
1
+ {"version":3,"file":"filterApiRpc.js","sourceRoot":"","sources":["../../../../src/logging/transformers/filterApiRpc.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,qCAAiC;AAIjC;;GAEG;AACU,QAAA,YAAY,GAAG,IAAA,gBAAM,EACjC,CAAC,IAAwB,EAAE,KAAc,EAAE,EAAE;;IAC5C,IACC,CAAC,IAAI;QACL,CAAC,CAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,QAAQ;YACvB,CAAC,CAAA,MAAA,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,0CAAE,QAAQ,CAAC,WAAW,CAAC,CAAA;aACrC,MAAA,IAAI,CAAC,OAAO,0CAAE,QAAQ,CAAC,SAAS,CAAC,CAAA;YACjC,IAAI,CAAC,KAAK,KAAK,MAAM,CAAC,EACtB;QACD,OAAO,KAAK,CAAC;KACb;IAED,OAAO,IAAI,CAAC;AACb,CAAC,CACD,CAAC"}
package/build/src/logging/transformers/stripTimestamp.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"stripTimestamp.js","sourceRoot":"","sources":["../../../../src/logging/transformers/stripTimestamp.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,qCAAiC;AAEjC;;GAEG;AACH,MAAM,cAAc,GACnB,mFAAmF,CAAC;AAErF;;;GAGG;AACU,QAAA,cAAc,GAAG,IAAA,gBAAM,EACnC,CAAC,IAAuB,EAAE,KAAc,EAAE,EAAE;IAC3C,IAAI,cAAc,CAAC,IAAI,CAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,CAAC,EAAE;QACvC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;KAC7C;IAED,OAAO,IAAI,CAAC;AACb,CAAC,CACD,CAAC"}
1
+ {"version":3,"file":"stripTimestamp.js","sourceRoot":"","sources":["../../../../src/logging/transformers/stripTimestamp.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,qCAAiC;AAIjC;;GAEG;AACH,MAAM,cAAc,GACnB,mFAAmF,CAAC;AAErF;;;GAGG;AACU,QAAA,cAAc,GAAG,IAAA,gBAAM,EACnC,CAAC,IAAwB,EAAE,KAAc,EAAE,EAAE;IAC5C,IAAI,cAAc,CAAC,IAAI,CAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,CAAC,EAAE;QACvC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;KAC7C;IAED,OAAO,IAAI,CAAC;AACb,CAAC,CACD,CAAC"}
package/build/src/logging/transports/consoleTransport.js CHANGED
@@ -25,7 +25,7 @@ const transformers_1 = require("../transformers");
25
25
  function consoleTransport() {
26
26
  const { config: { LOG }, } = SidecarConfig_1.SidecarConfig;
27
27
  /**
28
- * A simple printing format for how `TransformableInfo` shows up.
28
+ * A simple printing format for how `ITransformableInfo` shows up.
29
29
  */
30
30
  const simplePrint = winston_1.format.printf((info) => {
31
31
  if (info === null || info === void 0 ? void 0 : info.stack) {
package/build/src/logging/transports/consoleTransport.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"consoleTransport.js","sourceRoot":"","sources":["../../../../src/logging/transports/consoleTransport.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,qCAA6C;AAE7C,uDAAoD;AACpD,kDAMyB;AAEzB;;GAEG;AACH,SAAgB,gBAAgB;IAC/B,MAAM,EACL,MAAM,EAAE,EAAE,GAAG,EAAE,GACf,GAAG,6BAAa,CAAC;IAClB;;OAEG;IACH,MAAM,WAAW,GAAG,gBAAM,CAAC,MAAM,CAAC,CAAC,IAAuB,EAAE,EAAE;QAC7D,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,EAAE;YAChB,yEAAyE;YACzE,OAAO,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,SAAmB,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,KACjD,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OACP,OAAO,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAe,EAAE,CAAC;SAC/B;QAED,OAAO,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,SAAmB,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,KAAK,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,EAAE,CAAC;IACxE,CAAC,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,CAAC,IAAA,6BAAc,GAAE,EAAE,IAAA,6BAAc,GAAE,EAAE,wBAAS,CAAC,CAAC;IAErE,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE;QACd,YAAY,CAAC,IAAI,CAAC,gBAAM,CAAC,QAAQ,EAAE,EAAE,WAAW,CAAC,CAAC;KAClD;SAAM;QACN,YAAY,CAAC,IAAI,CAAC,gBAAM,CAAC,WAAW,EAAE,CAAC,CAAC;KACxC;IAED,IAAI,GAAG,CAAC,UAAU,EAAE;QACnB,YAAY,CAAC,OAAO,CAAC,IAAA,wBAAS,GAAE,CAAC,CAAC;KAClC;IAED,IAAI,GAAG,CAAC,UAAU,EAAE;QACnB,YAAY,CAAC,OAAO,CAAC,IAAA,2BAAY,GAAE,CAAC,CAAC;KACrC;IAED,OAAO,IAAI,oBAAU,CAAC,OAAO,CAAC;QAC7B,KAAK,EAAE,GAAG,CAAC,KAAK,IAAI,MAAM;QAC1B,gBAAgB,EAAE,IAAI;QACtB,MAAM,EAAE,gBAAM,CAAC,OAAO,CAAC,GAAG,YAAY,CAAC;QACvC,gCAAgC;QAChC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM;KACvC,CAAC,CAAC;AACJ,CAAC;AAzCD,4CAyCC"}
1
+ {"version":3,"file":"consoleTransport.js","sourceRoot":"","sources":["../../../../src/logging/transports/consoleTransport.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,qCAA6C;AAE7C,uDAAoD;AAEpD,kDAMyB;AAEzB;;GAEG;AACH,SAAgB,gBAAgB;IAC/B,MAAM,EACL,MAAM,EAAE,EAAE,GAAG,EAAE,GACf,GAAG,6BAAa,CAAC;IAClB;;OAEG;IACH,MAAM,WAAW,GAAG,gBAAM,CAAC,MAAM,CAAC,CAAC,IAAwB,EAAE,EAAE;QAC9D,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,EAAE;YAChB,yEAAyE;YACzE,OAAO,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,SAAS,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,KAAK,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,OAAO,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,EAAE,CAAC;SAC/E;QAED,OAAO,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,SAAS,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,KAAK,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO,EAAE,CAAC;IAC9D,CAAC,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,CAAC,IAAA,6BAAc,GAAE,EAAE,IAAA,6BAAc,GAAE,EAAE,wBAAS,CAAC,CAAC;IAErE,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE;QACd,YAAY,CAAC,IAAI,CAAC,gBAAM,CAAC,QAAQ,EAAE,EAAE,WAAW,CAAC,CAAC;KAClD;SAAM;QACN,YAAY,CAAC,IAAI,CAAC,gBAAM,CAAC,WAAW,EAAE,CAAC,CAAC;KACxC;IAED,IAAI,GAAG,CAAC,UAAU,EAAE;QACnB,YAAY,CAAC,OAAO,CAAC,IAAA,wBAAS,GAAE,CAAC,CAAC;KAClC;IAED,IAAI,GAAG,CAAC,UAAU,EAAE;QACnB,YAAY,CAAC,OAAO,CAAC,IAAA,2BAAY,GAAE,CAAC,CAAC;KACrC;IAED,OAAO,IAAI,oBAAU,CAAC,OAAO,CAAC;QAC7B,KAAK,EAAE,GAAG,CAAC,KAAK,IAAI,MAAM;QAC1B,gBAAgB,EAAE,IAAI;QACtB,MAAM,EAAE,gBAAM,CAAC,OAAO,CAAC,GAAG,YAAY,CAAC;QACvC,gCAAgC;QAChC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,MAAM;KACvC,CAAC,CAAC;AACJ,CAAC;AAvCD,4CAuCC"}
package/build/src/services/blocks/BlocksService.d.ts CHANGED
@@ -100,6 +100,12 @@ export declare class BlocksService extends AbstractService {
100
100
  * @param methodName Method to search for
101
101
  */
102
102
  private findEvent;
103
+ /**
104
+ * Sanitize a given fee
105
+ *
106
+ * @param fee
107
+ */
108
+ private sanitizeFee;
103
109
  /**
104
110
  * Checks to see if the value in an event is within 00.00001% accuracy of
105
111
  * the queried `partialFee` from `rpc::payment::queryInfo`.
package/build/src/services/blocks/BlocksService.js CHANGED
@@ -145,7 +145,7 @@ class BlocksService extends AbstractService_1.AbstractService {
145
145
  };
146
146
  continue;
147
147
  }
148
- const { dispatchClass, partialFee, error } = await this.getPartialFeeInfo(extrinsics[idx].events, block.extrinsics[idx].toHex(), hash, getFeeByEvent);
148
+ const { dispatchClass, partialFee, error } = await this.getPartialFeeInfo(extrinsics[idx].events, block.extrinsics[idx].toHex(), hash, getFeeByEvent, extrinsics[idx].tip);
149
149
  if (error) {
150
150
  extrinsics[idx].info = {
151
151
  error,
@@ -323,7 +323,7 @@ class BlocksService extends AbstractService_1.AbstractService {
323
323
  * @param hash Blockhash we are querying
324
324
  * @param getFeeByEvent `FeeByEvent` query parameter
325
325
  */
326
- async getPartialFeeInfo(events, extrinsicHex, hash, getFeeByEvent) {
326
+ async getPartialFeeInfo(events, extrinsicHex, hash, getFeeByEvent, tip) {
327
327
  const { api } = this;
328
328
  const { class: dispatchClass, partialFee } = await api.rpc.payment.queryInfo(extrinsicHex, hash);
329
329
  /**
@@ -332,7 +332,7 @@ class BlocksService extends AbstractService_1.AbstractService {
332
332
  let fee = partialFee;
333
333
  let error;
334
334
  if (getFeeByEvent) {
335
- const feeInfo = this.getPartialFeeByEvents(events, partialFee);
335
+ const feeInfo = this.getPartialFeeByEvents(events, partialFee, tip);
336
336
  fee = feeInfo.partialFee;
337
337
  error = feeInfo.error;
338
338
  }
@@ -355,15 +355,18 @@ class BlocksService extends AbstractService_1.AbstractService {
355
355
  * @param events The events to search through for a partialFee
356
356
  * @param partialFee Estimated partialFee given by `payment::queryInfo`
357
357
  */
358
- getPartialFeeByEvents(events, partialFee) {
358
+ getPartialFeeByEvents(events, partialFee, tip) {
359
359
  // Check Event:Withdraw event for the balances pallet
360
360
  const withdrawEvent = this.findEvent(events, 'balances', Event.withdraw);
361
361
  if (withdrawEvent.length > 0 && withdrawEvent[0].data) {
362
362
  const dataArr = withdrawEvent[0].data.toJSON();
363
363
  if (Array.isArray(dataArr)) {
364
- const fee = dataArr[dataArr.length - 1];
364
+ const fee = this.sanitizeFee(dataArr[dataArr.length - 1]);
365
+ const adjustedPartialFee = tip
366
+ ? tip.toBn().add(partialFee)
367
+ : partialFee;
365
368
  // The difference between values is 00.00001% or less so they are alike.
366
- if (this.areFeesSimilar(new bn_js_1.default(fee), partialFee)) {
369
+ if (this.areFeesSimilar(new bn_js_1.default(fee), adjustedPartialFee)) {
367
370
  return {
368
371
  partialFee: fee.toString(),
369
372
  };
@@ -375,9 +378,12 @@ class BlocksService extends AbstractService_1.AbstractService {
375
378
  if (treasuryEvent.length > 0 && treasuryEvent[0].data) {
376
379
  const dataArr = treasuryEvent[0].data.toJSON();
377
380
  if (Array.isArray(dataArr)) {
378
- const fee = dataArr[0];
381
+ const fee = this.sanitizeFee(dataArr[0]);
382
+ const adjustedPartialFee = tip
383
+ ? tip.toBn().add(partialFee)
384
+ : partialFee;
379
385
  // The difference between values is 00.00001% or less so they are alike.
380
- if (this.areFeesSimilar(new bn_js_1.default(fee), partialFee)) {
386
+ if (this.areFeesSimilar(new bn_js_1.default(fee), adjustedPartialFee)) {
381
387
  return {
382
388
  partialFee: fee.toString(),
383
389
  };
@@ -388,9 +394,10 @@ class BlocksService extends AbstractService_1.AbstractService {
388
394
  const depositEvents = this.findEvent(events, 'balances', Event.deposit);
389
395
  if (depositEvents.length > 0) {
390
396
  let sumOfFees = new bn_js_1.default(0);
391
- depositEvents.forEach(({ data }) => (sumOfFees = sumOfFees.add(new bn_js_1.default(data[data.length - 1].toString()))));
397
+ depositEvents.forEach(({ data }) => (sumOfFees = sumOfFees.add(new bn_js_1.default(this.sanitizeFee(data[data.length - 1].toString())))));
398
+ const adjustedPartialFee = tip ? tip.toBn().add(partialFee) : partialFee;
392
399
  // The difference between values is 00.00001% or less so they are alike.
393
- if (this.areFeesSimilar(sumOfFees, partialFee)) {
400
+ if (this.areFeesSimilar(sumOfFees, adjustedPartialFee)) {
394
401
  return {
395
402
  partialFee: sumOfFees.toString(),
396
403
  };
@@ -414,6 +421,18 @@ class BlocksService extends AbstractService_1.AbstractService {
414
421
  method.pallet === palletName &&
415
422
  data);
416
423
  }
424
+ /**
425
+ * Sanitize a given fee
426
+ *
427
+ * @param fee
428
+ */
429
+ sanitizeFee(fee) {
430
+ if ((0, util_2.isHex)(fee)) {
431
+ const numFee = (0, util_2.hexToNumber)(fee);
432
+ return numFee.toString(10);
433
+ }
434
+ return fee;
435
+ }
417
436
  /**
418
437
  * Checks to see if the value in an event is within 00.00001% accuracy of
419
438
  * the queried `partialFee` from `rpc::payment::queryInfo`.
package/build/src/services/blocks/BlocksService.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"BlocksService.js","sourceRoot":"","sources":["../../../../src/services/blocks/BlocksService.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"BlocksService.js","sourceRoot":"","sources":["../../../../src/services/blocks/BlocksService.ts"],"names":[],"mappings":"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"}
package/build/src/services/blocks/BlocksService.spec.js CHANGED
@@ -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 base_1 = require("@polkadot/types-codec/base");
21
22
  const http_errors_1 = require("http-errors");
22
23
  const lru_cache_1 = __importDefault(require("lru-cache"));
23
24
  const sanitizeNumbers_1 = require("../../sanitize/sanitizeNumbers");
@@ -260,7 +261,7 @@ describe('BlocksService', () => {
260
261
  expect(await blocksService['isFinalizedBlock'](forkMockApi, blockNumber, queriedHash, finalizedHead, true)).toEqual(false);
261
262
  });
262
263
  it('Returns true when queried blockId is canonical', async () => {
263
- const blocksService = new BlocksService_1.BlocksService(mockApi, 0, new lru_cache_1.default());
264
+ const blocksService = new BlocksService_1.BlocksService(mockApi, 0, new lru_cache_1.default({ max: 2 }));
264
265
  expect(await blocksService['isFinalizedBlock'](mockApi, blockNumber, finalizedHead, finalizedHead, true)).toEqual(true);
265
266
  });
266
267
  });
@@ -367,15 +368,22 @@ describe('BlocksService', () => {
367
368
  const partialFee = registries_1.polkadotRegistry.createType('Balance', '2490128143');
368
369
  const expectedResponse = { partialFee: '2490128143' };
369
370
  it('Should retrieve the correct fee for balances::withdraw events', () => {
370
- const response = blocksService['getPartialFeeByEvents'](mockEventData_1.withdrawEvent, partialFee);
371
+ const response = blocksService['getPartialFeeByEvents'](mockEventData_1.withdrawEvent, partialFee, null);
371
372
  expect(response).toStrictEqual(expectedResponse);
372
373
  });
373
374
  it('Should retrieve the correct fee for treasury::deposit events', () => {
374
- const response = blocksService['getPartialFeeByEvents'](mockEventData_1.treasuryEvent, partialFee);
375
+ const response = blocksService['getPartialFeeByEvents'](mockEventData_1.treasuryEvent, partialFee, null);
375
376
  expect(response).toStrictEqual(expectedResponse);
376
377
  });
377
378
  it('Should retrieve the correct fee for balances::deposit events', () => {
378
- const response = blocksService['getPartialFeeByEvents'](mockEventData_1.balancesDepositEvent, partialFee);
379
+ const response = blocksService['getPartialFeeByEvents'](mockEventData_1.balancesDepositEvent, partialFee, null);
380
+ expect(response).toStrictEqual(expectedResponse);
381
+ });
382
+ it('Should retrieve the correct fee for balances:withdraw events with a tip', () => {
383
+ const expectedResponse = { partialFee: '1681144907847007' };
384
+ const fee = registries_1.polkadotRegistry.createType('Balance', '1675415067070856');
385
+ const tip = new base_1.Compact(registries_1.polkadotRegistry, 'u64', 5729827274000);
386
+ const response = blocksService['getPartialFeeByEvents'](mockEventData_1.withdrawEventForTip, fee, tip);
379
387
  expect(response).toStrictEqual(expectedResponse);
380
388
  });
381
389
  it('Should error correctly when there is no fee in the events', () => {
@@ -384,7 +392,7 @@ describe('BlocksService', () => {
384
392
  error: 'Could not find a reliable fee within the events data.',
385
393
  };
386
394
  const emptyArray = [];
387
- const response = blocksService['getPartialFeeByEvents'](emptyArray, partialFee);
395
+ const response = blocksService['getPartialFeeByEvents'](emptyArray, partialFee, null);
388
396
  expect(response).toStrictEqual(expectedResponseWithError);
389
397
  });
390
398
  });
@@ -393,7 +401,7 @@ describe('BlocksService', () => {
393
401
  (0, mockEventData_1.constructEvent)('balances', 'Withdraw', ['0x', '149000011']),
394
402
  ];
395
403
  it('Should correctly handle `getEventByFee` when true', async () => {
396
- const response = await blocksService['getPartialFeeInfo'](mockEvent, '0x', mock_1.blockHash789629, true);
404
+ const response = await blocksService['getPartialFeeInfo'](mockEvent, '0x', mock_1.blockHash789629, true, null);
397
405
  expect((0, sanitizeNumbers_1.sanitizeNumbers)(response)).toStrictEqual({
398
406
  dispatchClass: 'Normal',
399
407
  partialFee: '149000011',
@@ -401,7 +409,7 @@ describe('BlocksService', () => {
401
409
  });
402
410
  });
403
411
  it('Should correctly handle `getEventByFee` when false', async () => {
404
- const response = await blocksService['getPartialFeeInfo'](mockEvent, '0x', mock_1.blockHash789629, false);
412
+ const response = await blocksService['getPartialFeeInfo'](mockEvent, '0x', mock_1.blockHash789629, false, null);
405
413
  expect((0, sanitizeNumbers_1.sanitizeNumbers)(response)).toStrictEqual({
406
414
  dispatchClass: 'Normal',
407
415
  partialFee: '149000000',
@@ -409,6 +417,12 @@ describe('BlocksService', () => {
409
417
  });
410
418
  });
411
419
  });
420
+ describe('sanitizeFee', () => {
421
+ it('Should sanitize a hex value correctly', () => {
422
+ const response = blocksService['sanitizeFee']('0x000000000000000000119e2433bf11f3');
423
+ expect(response).toBe('4958952928252403');
424
+ });
425
+ });
412
426
  });
413
427
  });
414
428
  //# sourceMappingURL=BlocksService.spec.js.map
package/build/src/services/blocks/BlocksService.spec.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"BlocksService.spec.js","sourceRoot":"","sources":["../../../../src/services/blocks/BlocksService.spec.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"BlocksService.spec.js","sourceRoot":"","sources":["../../../../src/services/blocks/BlocksService.spec.ts"],"names":[],"mappings":"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"}
package/build/src/types/logging/Transformers.d.ts ADDED
@@ -0,0 +1,10 @@
1
+ /**
2
+ * The logform package exports `TransformableInfo` but it sets the
3
+ * message type to `any`. Here we take that exact type and recreate it
4
+ * to have more specific type info.
5
+ */
6
+ export interface ITransformableInfo {
7
+ level: string;
8
+ message: string;
9
+ [key: string]: string;
10
+ }
package/build/src/types/logging/Transformers.js ADDED
@@ -0,0 +1,18 @@
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
+ //# sourceMappingURL=Transformers.js.map
package/build/src/types/logging/Transformers.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"Transformers.js","sourceRoot":"","sources":["../../../../src/types/logging/Transformers.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"}
package/build/src/types/logging/index.d.ts ADDED
@@ -0,0 +1 @@
1
+ export * from './Transformers';
package/build/src/types/logging/index.js ADDED
@@ -0,0 +1,29 @@
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
+ var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
18
+ if (k2 === undefined) k2 = k;
19
+ Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
20
+ }) : (function(o, m, k, k2) {
21
+ if (k2 === undefined) k2 = k;
22
+ o[k2] = m[k];
23
+ }));
24
+ var __exportStar = (this && this.__exportStar) || function(m, exports) {
25
+ for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
26
+ };
27
+ Object.defineProperty(exports, "__esModule", { value: true });
28
+ __exportStar(require("./Transformers"), exports);
29
+ //# sourceMappingURL=index.js.map
package/build/src/types/logging/index.js.map ADDED
@@ -0,0 +1 @@
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/types/logging/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,iDAA+B"}
package/package.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "12.4.0",
2
+ "version": "12.4.1",
3
3
  "name": "@substrate/api-sidecar",
4
4
  "description": "REST service that makes it easy to interact with blockchain nodes built using Substrate's FRAME framework.",
5
5
  "homepage": "https://github.com/paritytech/substrate-api-sidecar#readme",
@@ -53,28 +53,28 @@
53
53
  "update-pjs-deps": "substrate-update-pjs-deps && yarn"
54
54
  },
55
55
  "dependencies": {
56
- "@polkadot/api": "^8.12.2",
57
- "@polkadot/util-crypto": "^10.0.2",
56
+ "@polkadot/api": "^8.14.1",
57
+ "@polkadot/util-crypto": "^10.1.1",
58
58
  "@substrate/calc": "^0.2.8",
59
59
  "argparse": "^2.0.1",
60
- "confmgr": "1.0.7",
61
- "express": "^4.17.1",
62
- "express-winston": "^4.1.0",
63
- "http-errors": "^1.8.1",
64
- "lru-cache": "^6.0.0",
65
- "rxjs": "^7.5.5",
66
- "winston": "^3.3.3"
60
+ "confmgr": "1.0.9",
61
+ "express": "^4.18.1",
62
+ "express-winston": "^4.2.0",
63
+ "http-errors": "^2.0.0",
64
+ "lru-cache": "^7.13.1",
65
+ "rxjs": "^7.5.6",
66
+ "winston": "^3.8.1"
67
67
  },
68
68
  "devDependencies": {
69
69
  "@substrate/dev": "^0.6.3",
70
70
  "@types/argparse": "2.0.10",
71
71
  "@types/express": "4.17.13",
72
- "@types/express-serve-static-core": "4.17.25",
73
- "@types/http-errors": "1.8.1",
74
- "@types/lru-cache": "^5.1.1",
72
+ "@types/express-serve-static-core": "4.17.30",
73
+ "@types/http-errors": "1.8.2",
74
+ "@types/lru-cache": "^7.10.10",
75
75
  "@types/morgan": "1.9.3",
76
76
  "@types/triple-beam": "^1.3.2",
77
- "tsc-watch": "^4.4.0"
77
+ "tsc-watch": "^4.6.2"
78
78
  },
79
79
  "resolutions": {
80
80
  "node-fetch": "2.6.7",