@substrate/api-sidecar 11.3.18 → 11.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.
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "11.3.18",
2
+ "version": "11.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",
@@ -38,7 +38,7 @@
38
38
  "test:watch": "substrate-exec-jest --watch",
39
39
  "test:cov": "NODE_ENV=test substrate-exec-jest --detectOpenHandles --coverage",
40
40
  "lint:e2e-tests": "cd e2e-tests && substrate-dev-run-lint",
41
- "build:e2e-tests": "(cd e2e-tests && substrate-exec-tsc)",
41
+ "build:e2e-tests": "substrate-exec-tsc --project e2e-tests/tsconfig.json",
42
42
  "test:e2e-tests": "yarn build:e2e-tests && node ./e2e-tests/build/index.js --config=./e2e-tests/jest.config.js",
43
43
  "test:init-e2e-tests": "yarn start:e2e-scripts --log-level=http",
44
44
  "test:init-e2e-tests:polkadot": "yarn test:init-e2e-tests --chain polkadot",
@@ -47,16 +47,16 @@
47
47
  "test:init-e2e-tests:statemine": "yarn test:init-e2e-tests --chain statemine",
48
48
  "test:init-e2e-tests:statemint": "yarn test:init-e2e-tests --chain statemint",
49
49
  "start:e2e-scripts": "yarn build:scripts && node scripts/build/runChainTests.js",
50
- "build:scripts": "substrate-exec-rimraf scripts/build/ && cd scripts && substrate-exec-tsc",
50
+ "build:scripts": "substrate-exec-rimraf scripts/build/ && substrate-exec-tsc --project scripts/tsconfig.json",
51
51
  "lint:scripts": "cd scripts && substrate-dev-run-lint",
52
52
  "start:test-release": "yarn build:scripts && node scripts/build/runYarnPack.js",
53
53
  "test:test-release": "yarn start:test-release",
54
54
  "update-pjs-deps": "substrate-update-pjs-deps && yarn"
55
55
  },
56
56
  "dependencies": {
57
- "@polkadot/api": "8.3.1",
58
- "@polkadot/apps-config": "0.113.1",
59
- "@polkadot/util-crypto": "9.1.1",
57
+ "@polkadot/api": "8.4.2",
58
+ "@polkadot/apps-config": "0.112.1",
59
+ "@polkadot/util-crypto": "9.2.1",
60
60
  "@substrate/calc": "^0.2.8",
61
61
  "argparse": "^2.0.1",
62
62
  "confmgr": "1.0.7",
@@ -68,7 +68,7 @@
68
68
  "winston": "^3.3.3"
69
69
  },
70
70
  "devDependencies": {
71
- "@substrate/dev": "^0.6.0",
71
+ "@substrate/dev": "^0.6.1",
72
72
  "@types/argparse": "2.0.10",
73
73
  "@types/express": "4.17.13",
74
74
  "@types/express-serve-static-core": "4.17.25",
@@ -79,28 +79,28 @@
79
79
  "tsc-watch": "^4.4.0"
80
80
  },
81
81
  "resolutions": {
82
- "@polkadot/api": "8.3.1",
83
- "@polkadot/api-augment": "8.3.1",
84
- "@polkadot/api-base": "8.3.1",
85
- "@polkadot/api-derive": "8.3.1",
86
- "@polkadot/rpc-core": "8.3.1",
87
- "@polkadot/rpc-augment": "8.3.1",
88
- "@polkadot/rpc-provider": "8.3.1",
89
- "@polkadot/types": "8.3.1",
90
- "@polkadot/types-augment": "8.3.1",
91
- "@polkadot/types-codec": "8.3.1",
92
- "@polkadot/types-create": "8.3.1",
93
- "@polkadot/types-support": "8.3.1",
94
- "@polkadot/types-known": "8.3.1",
95
- "@polkadot/keyring": "9.1.1",
96
- "@polkadot/networks": "9.1.1",
97
- "@polkadot/util": "9.1.1",
98
- "@polkadot/util-crypto": "9.1.1",
99
- "@polkadot/x-fetch": "9.1.1",
100
- "@polkadot/x-global": "9.1.1",
101
- "@polkadot/x-bigint": "9.1.1",
102
- "@polkadot/x-ws": "9.1.1",
103
- "@polkadot/wasm-crypto": "6.0.1",
82
+ "@polkadot/api": "8.4.2",
83
+ "@polkadot/api-augment": "8.4.2",
84
+ "@polkadot/api-base": "8.4.2",
85
+ "@polkadot/api-derive": "8.4.2",
86
+ "@polkadot/rpc-core": "8.4.2",
87
+ "@polkadot/rpc-augment": "8.4.2",
88
+ "@polkadot/rpc-provider": "8.4.2",
89
+ "@polkadot/types": "8.4.2",
90
+ "@polkadot/types-augment": "8.4.2",
91
+ "@polkadot/types-codec": "8.4.2",
92
+ "@polkadot/types-create": "8.4.2",
93
+ "@polkadot/types-support": "8.4.2",
94
+ "@polkadot/types-known": "8.4.2",
95
+ "@polkadot/keyring": "9.2.1",
96
+ "@polkadot/networks": "9.2.1",
97
+ "@polkadot/util": "9.2.1",
98
+ "@polkadot/util-crypto": "9.2.1",
99
+ "@polkadot/x-fetch": "9.2.1",
100
+ "@polkadot/x-global": "9.2.1",
101
+ "@polkadot/x-bigint": "9.2.1",
102
+ "@polkadot/x-ws": "9.2.1",
103
+ "@polkadot/wasm-crypto": "6.1.1",
104
104
  "bn.js": "5.2.0",
105
105
  "node-fetch": "2.6.7",
106
106
  "prismjs": ">=1.23.0",
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/chains-config/index.ts"],"names":[],"mappings":";;;AAIA,gDAA6C;AAE7C,yDAAsD;AACtD,yDAAsD;AACtD,6DAA0D;AAC1D,+DAA4D;AAC5D,yDAAsD;AACtD,6DAA0D;AAC1D,qEAAkE;AAClE,2EAAwE;AACxE,2EAAqE;AACrE,2DAAwD;AACxD,uDAAoD;AACpD,2DAAwD;AACxD,2DAAwD;AACxD,6DAA0D;AAC1D,yDAAsD;AACtD,+DAA4D;AAC5D,+DAA4D;AAC5D,2DAAwD;AACxD,uDAAoD;AACpD,iEAA8D;AAC9D,iEAA8D;AAC9D,6DAA0D;AAE1D,MAAM,mBAAmB,GAAG;IAC3B,OAAO,EAAE,uCAAkB;IAC3B,QAAQ,EAAE,yCAAmB;IAC7B,QAAQ,EAAE,yCAAmB;IAC7B,MAAM,EAAE,qCAAiB;IACzB,MAAM,EAAE,qCAAiB;IACzB,IAAI,EAAE,iCAAe;IACrB,OAAO,EAAE,uCAAkB;IAC3B,mBAAmB,EAAE,+CAAsB;IAC3C,uBAAuB,EAAE,qDAAyB;IAClD,uBAAuB,EAAE,kDAAsB;IAC/C,SAAS,EAAE,2CAAoB;IAC/B,SAAS,EAAE,2CAAoB;IAC/B,QAAQ,EAAE,2CAAoB;IAC9B,QAAQ,EAAE,2CAAoB;IAC9B,MAAM,EAAE,qCAAiB;IACzB,KAAK,EAAE,mCAAgB;IACvB,IAAI,EAAE,iCAAe;IACrB,QAAQ,EAAE,yCAAmB;IAC7B,MAAM,EAAE,qCAAiB;IACzB,KAAK,EAAE,mCAAgB;IACvB,KAAK,EAAE,mCAAgB;IACvB,KAAK,EAAE,mCAAgB;IACvB,OAAO,EAAE,uCAAkB;CAC3B,CAAC;AAEF;;;;;GAKG;AACH,SAAgB,qBAAqB,CACpC,GAAe,EACf,QAAgB;IAEhB,IAAI,mBAAmB,CAAC,QAAQ,CAAC,EAAE;QAClC,OAAO,wBAAwB,CAAC,GAAG,EAAE,mBAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC;KACpE;IAED,8EAA8E;IAC9E,mBAAmB;IACnB,OAAO,wBAAwB,CAAC,GAAG,EAAE,uCAAkB,CAAC,CAAC;AAC1D,CAAC;AAXD,sDAWC;AAED;;;;;;GAMG;AACH,SAAS,wBAAwB,CAAC,GAAe,EAAE,MAAwB;IAC1E,MAAM,oBAAoB,GAAG,MAAM,CAAC,WAAW,CAAC;IAEhD,OAAO,oBAAoB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE;QACtD,GAAG,CAAC,IAAI,CAAC,IAAI,yBAAW,CAAC,UAAU,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;QAE3D,OAAO,GAAG,CAAC;IACZ,CAAC,EAAE,EAA2C,CAAC,CAAC;AACjD,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/chains-config/index.ts"],"names":[],"mappings":";;;AAIA,gDAA6C;AAE7C,yDAAsD;AACtD,yDAAsD;AACtD,6DAA0D;AAC1D,+DAA4D;AAC5D,yDAAsD;AACtD,6DAA0D;AAC1D,qEAAkE;AAClE,2EAAwE;AACxE,2EAAqE;AACrE,2DAAwD;AACxD,uDAAoD;AACpD,2DAAwD;AACxD,2DAAwD;AACxD,6DAA0D;AAC1D,yDAAsD;AACtD,+DAA4D;AAC5D,+DAA4D;AAC5D,2DAAwD;AACxD,uDAAoD;AACpD,iEAA8D;AAC9D,iEAA8D;AAC9D,6DAA0D;AAE1D,MAAM,mBAAmB,GAAsC;IAC9D,OAAO,EAAE,uCAAkB;IAC3B,QAAQ,EAAE,yCAAmB;IAC7B,QAAQ,EAAE,yCAAmB;IAC7B,MAAM,EAAE,qCAAiB;IACzB,MAAM,EAAE,qCAAiB;IACzB,IAAI,EAAE,iCAAe;IACrB,OAAO,EAAE,uCAAkB;IAC3B,mBAAmB,EAAE,+CAAsB;IAC3C,uBAAuB,EAAE,qDAAyB;IAClD,uBAAuB,EAAE,kDAAsB;IAC/C,SAAS,EAAE,2CAAoB;IAC/B,SAAS,EAAE,2CAAoB;IAC/B,QAAQ,EAAE,2CAAoB;IAC9B,QAAQ,EAAE,2CAAoB;IAC9B,MAAM,EAAE,qCAAiB;IACzB,KAAK,EAAE,mCAAgB;IACvB,IAAI,EAAE,iCAAe;IACrB,QAAQ,EAAE,yCAAmB;IAC7B,MAAM,EAAE,qCAAiB;IACzB,KAAK,EAAE,mCAAgB;IACvB,KAAK,EAAE,mCAAgB;IACvB,KAAK,EAAE,mCAAgB;IACvB,OAAO,EAAE,uCAAkB;CAC3B,CAAC;AAEF;;;;;GAKG;AACH,SAAgB,qBAAqB,CACpC,GAAe,EACf,QAAgB;IAEhB,IAAI,mBAAmB,CAAC,QAAQ,CAAC,EAAE;QAClC,OAAO,wBAAwB,CAAC,GAAG,EAAE,mBAAmB,CAAC,QAAQ,CAAC,CAAC,CAAC;KACpE;IAED,8EAA8E;IAC9E,mBAAmB;IACnB,OAAO,wBAAwB,CAAC,GAAG,EAAE,uCAAkB,CAAC,CAAC;AAC1D,CAAC;AAXD,sDAWC;AAED;;;;;;GAMG;AACH,SAAS,wBAAwB,CAAC,GAAe,EAAE,MAAwB;IAC1E,MAAM,oBAAoB,GAAG,MAAM,CAAC,WAAW,CAAC;IAEhD,OAAO,oBAAoB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,UAAU,EAAE,EAAE;QACtD,GAAG,CAAC,IAAI,CAAC,IAAI,yBAAW,CAAC,UAAU,CAAC,CAAC,GAAG,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC;QAE3D,OAAO,GAAG,CAAC;IACZ,CAAC,EAAE,EAA2C,CAAC,CAAC;AACjD,CAAC"}
@@ -48,14 +48,15 @@ class AccountsBalanceController extends AbstractController_1.default {
48
48
  * @param req Express Request
49
49
  * @param res Express Response
50
50
  */
51
- this.getAccountBalanceInfo = async ({ params: { address }, query: { at, token } }, res) => {
51
+ this.getAccountBalanceInfo = async ({ params: { address }, query: { at, token, denominated } }, res) => {
52
52
  const tokenArg = typeof token === 'string'
53
53
  ? token.toUpperCase()
54
54
  : // We assume the first token is the native token
55
55
  this.api.registry.chainTokens[0].toUpperCase();
56
+ const withDenomination = denominated === 'true';
56
57
  const hash = await this.getHashFromAt(at);
57
58
  const historicApi = await this.api.at(hash);
58
- AccountsBalanceController.sanitizedSend(res, await this.service.fetchAccountBalanceInfo(hash, historicApi, address, tokenArg));
59
+ AccountsBalanceController.sanitizedSend(res, await this.service.fetchAccountBalanceInfo(hash, historicApi, address, tokenArg, withDenomination));
59
60
  };
60
61
  this.initRoutes();
61
62
  }
@@ -1 +1 @@
1
- {"version":3,"file":"AccountsBalanceInfoController.js","sourceRoot":"","sources":["../../../../src/controllers/accounts/AccountsBalanceInfoController.ts"],"names":[],"mappings":";;;;;AAIA,iDAAmD;AACnD,6CAA4D;AAC5D,+EAAuD;AAEvD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,MAAqB,yBAA0B,SAAQ,4BAA8C;IACpG,YAAY,GAAe;QAC1B,KAAK,CACJ,GAAG,EACH,iCAAiC,EACjC,IAAI,qCAA0B,CAAC,GAAG,CAAC,CACnC,CAAC;QAUH;;;;;WAKG;QACK,0BAAqB,GAAkC,KAAK,EACnE,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAC7C,GAAG,EACa,EAAE;YAClB,MAAM,QAAQ,GACb,OAAO,KAAK,KAAK,QAAQ;gBACxB,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE;gBACrB,CAAC,CAAC,gDAAgD;oBAChD,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;YAEnD,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,yBAAyB,CAAC,aAAa,CACtC,GAAG,EACH,MAAM,IAAI,CAAC,OAAO,CAAC,uBAAuB,CACzC,IAAI,EACJ,WAAW,EACX,OAAO,EACP,QAAQ,CACR,CACD,CAAC;QACH,CAAC,CAAC;QArCD,IAAI,CAAC,UAAU,EAAE,CAAC;IACnB,CAAC;IAES,UAAU;QACnB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,4BAAe,CAAC,CAAC;QAE5C,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IACpE,CAAC;CA+BD;AA7CD,4CA6CC"}
1
+ {"version":3,"file":"AccountsBalanceInfoController.js","sourceRoot":"","sources":["../../../../src/controllers/accounts/AccountsBalanceInfoController.ts"],"names":[],"mappings":";;;;;AAIA,iDAAmD;AACnD,6CAA4D;AAC5D,+EAAuD;AAEvD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,MAAqB,yBAA0B,SAAQ,4BAA8C;IACpG,YAAY,GAAe;QAC1B,KAAK,CACJ,GAAG,EACH,iCAAiC,EACjC,IAAI,qCAA0B,CAAC,GAAG,CAAC,CACnC,CAAC;QAUH;;;;;WAKG;QACK,0BAAqB,GAAkC,KAAK,EACnE,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE,EAC1D,GAAG,EACa,EAAE;YAClB,MAAM,QAAQ,GACb,OAAO,KAAK,KAAK,QAAQ;gBACxB,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE;gBACrB,CAAC,CAAC,gDAAgD;oBAChD,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;YACnD,MAAM,gBAAgB,GAAG,WAAW,KAAK,MAAM,CAAC;YAEhD,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,yBAAyB,CAAC,aAAa,CACtC,GAAG,EACH,MAAM,IAAI,CAAC,OAAO,CAAC,uBAAuB,CACzC,IAAI,EACJ,WAAW,EACX,OAAO,EACP,QAAQ,EACR,gBAAgB,CAChB,CACD,CAAC;QACH,CAAC,CAAC;QAvCD,IAAI,CAAC,UAAU,EAAE,CAAC;IACnB,CAAC;IAES,UAAU;QACnB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,4BAAe,CAAC,CAAC;QAE5C,IAAI,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE,EAAE,IAAI,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IACpE,CAAC;CAiCD;AA/CD,4CA+CC"}
@@ -31,6 +31,7 @@ exports.nodeUtilFormat = winston.format((info, _opts) => {
31
31
  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
32
32
  const args = info[triple_beam_1.SPLAT];
33
33
  if (args) {
34
+ // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
34
35
  info.message = (0, util_1.format)(info.message, ...args);
35
36
  }
36
37
  return info;
@@ -1 +1 @@
1
- {"version":3,"file":"nodeUtilFormat.js","sourceRoot":"","sources":["../../../../src/logging/transformers/nodeUtilFormat.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AACA,6CAAoC;AACpC,+BAA8B;AAC9B,iDAAmC;AAEnC;;;GAGG;AACU,QAAA,cAAc,GAAG,OAAO,CAAC,MAAM,CAC3C,CAAC,IAAuB,EAAE,KAAc,EAAE,EAAE;IAC3C,mEAAmE;IACnE,MAAM,IAAI,GAAG,IAAI,CAAC,mBAA0B,CAAC,CAAC;IAC9C,IAAI,IAAI,EAAE;QACT,IAAI,CAAC,OAAO,GAAG,IAAA,aAAM,EAAC,IAAI,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;KAC7C;IACD,OAAO,IAAI,CAAC;AACb,CAAC,CACD,CAAC"}
1
+ {"version":3,"file":"nodeUtilFormat.js","sourceRoot":"","sources":["../../../../src/logging/transformers/nodeUtilFormat.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;AACA,6CAAoC;AACpC,+BAA8B;AAC9B,iDAAmC;AAEnC;;;GAGG;AACU,QAAA,cAAc,GAAG,OAAO,CAAC,MAAM,CAC3C,CAAC,IAAuB,EAAE,KAAc,EAAE,EAAE;IAC3C,mEAAmE;IACnE,MAAM,IAAI,GAAG,IAAI,CAAC,mBAA0B,CAAC,CAAC;IAC9C,IAAI,IAAI,EAAE;QACT,iEAAiE;QACjE,IAAI,CAAC,OAAO,GAAG,IAAA,aAAM,EAAC,IAAI,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;KAC7C;IACD,OAAO,IAAI,CAAC;AACb,CAAC,CACD,CAAC"}
@@ -11,5 +11,37 @@ export declare class AccountsBalanceInfoService extends AbstractService {
11
11
  * @param address Address of the account to get the balance info of.
12
12
  * @param token Token to get the balance info of.
13
13
  */
14
- fetchAccountBalanceInfo(hash: BlockHash, historicApi: ApiDecoration<'promise'>, address: string, token: string): Promise<IAccountBalanceInfo>;
14
+ fetchAccountBalanceInfo(hash: BlockHash, historicApi: ApiDecoration<'promise'>, address: string, token: string, denominate: boolean): Promise<IAccountBalanceInfo>;
15
+ /**
16
+ * Apply a denomination to a balance depending on the chains decimal value.
17
+ *
18
+ * @param balance free balance available encoded as Balance. This will be
19
+ * represented as an atomic value.
20
+ * @param dec The chains given decimal token value. It must be > 0, and it
21
+ * is applied to the given atomic value given by the `balance`.
22
+ */
23
+ private applyDenominationBalance;
24
+ /**
25
+ * Parse and denominate the `amount` key in each BalanceLock
26
+ *
27
+ * @param locks A vector containing BalanceLock objects
28
+ * @param dec The chains given decimal value
29
+ */
30
+ private applyDenominationLocks;
31
+ /**
32
+ * Either denominate a value, or return the original Balance as an atomic value.
33
+ *
34
+ * @param denominate Boolean to determine whether or not we denominate a balance
35
+ * @param bal Inputted Balance
36
+ * @param dec Decimal value used to denominate a Balance
37
+ */
38
+ private inDenominationBal;
39
+ /**
40
+ * Either denominate the Balance's within Locks or return the original Locks.
41
+ *
42
+ * @param denominate Boolean to determine whether or not we denominate a balance
43
+ * @param locks Inputted Vec<BalanceLock>, only the amount key will be denominated
44
+ * @param dec Decimal value used to denominate a Balance
45
+ */
46
+ private inDenominationLocks;
15
47
  }
@@ -12,8 +12,14 @@ class AccountsBalanceInfoService extends AbstractService_1.AbstractService {
12
12
  * @param address Address of the account to get the balance info of.
13
13
  * @param token Token to get the balance info of.
14
14
  */
15
- async fetchAccountBalanceInfo(hash, historicApi, address, token) {
15
+ async fetchAccountBalanceInfo(hash, historicApi, address, token, denominate) {
16
16
  const { api } = this;
17
+ if (denominate && historicApi.registry.chainDecimals.length === 0) {
18
+ throw new http_errors_1.BadRequest("Invalid use of the query parameter `denominated`. This chain doesn't have a valid chain decimal to denominate a value.");
19
+ }
20
+ const capitalizeTokens = historicApi.registry.chainTokens.map((token) => token.toUpperCase());
21
+ const tokenIdx = capitalizeTokens.indexOf(token);
22
+ const decimal = historicApi.registry.chainDecimals[tokenIdx];
17
23
  /**
18
24
  * Check two different cases where a historicApi is needed in order
19
25
  * to have the correct runtime methods.
@@ -45,11 +51,11 @@ class AccountsBalanceInfoService extends AbstractService_1.AbstractService {
45
51
  at,
46
52
  nonce,
47
53
  tokenSymbol: token,
48
- free,
49
- reserved,
50
- miscFrozen,
51
- feeFrozen,
52
- locks,
54
+ free: this.inDenominationBal(denominate, free, decimal),
55
+ reserved: this.inDenominationBal(denominate, reserved, decimal),
56
+ miscFrozen: this.inDenominationBal(denominate, miscFrozen, decimal),
57
+ feeFrozen: this.inDenominationBal(denominate, feeFrozen, decimal),
58
+ locks: this.inDenominationLocks(denominate, locks, decimal),
53
59
  };
54
60
  }
55
61
  else {
@@ -74,11 +80,11 @@ class AccountsBalanceInfoService extends AbstractService_1.AbstractService {
74
80
  at,
75
81
  nonce,
76
82
  tokenSymbol: token,
77
- free,
78
- reserved,
79
- miscFrozen,
80
- feeFrozen,
81
- locks,
83
+ free: this.inDenominationBal(denominate, free, decimal),
84
+ reserved: this.inDenominationBal(denominate, reserved, decimal),
85
+ miscFrozen: this.inDenominationBal(denominate, miscFrozen, decimal),
86
+ feeFrozen: this.inDenominationBal(denominate, feeFrozen, decimal),
87
+ locks: this.inDenominationLocks(denominate, locks, decimal),
82
88
  };
83
89
  }
84
90
  else {
@@ -132,17 +138,75 @@ class AccountsBalanceInfoService extends AbstractService_1.AbstractService {
132
138
  at,
133
139
  nonce,
134
140
  tokenSymbol: token,
135
- free,
136
- reserved,
137
- miscFrozen,
138
- feeFrozen,
139
- locks,
141
+ free: this.inDenominationBal(denominate, free, decimal),
142
+ reserved: this.inDenominationBal(denominate, reserved, decimal),
143
+ miscFrozen: this.inDenominationBal(denominate, miscFrozen, decimal),
144
+ feeFrozen: this.inDenominationBal(denominate, feeFrozen, decimal),
145
+ locks: this.inDenominationLocks(denominate, locks, decimal),
140
146
  };
141
147
  }
142
148
  else {
143
149
  throw new http_errors_1.BadRequest('Account not found');
144
150
  }
145
151
  }
152
+ /**
153
+ * Apply a denomination to a balance depending on the chains decimal value.
154
+ *
155
+ * @param balance free balance available encoded as Balance. This will be
156
+ * represented as an atomic value.
157
+ * @param dec The chains given decimal token value. It must be > 0, and it
158
+ * is applied to the given atomic value given by the `balance`.
159
+ */
160
+ applyDenominationBalance(balance, dec) {
161
+ const strBalance = balance.toString();
162
+ // We dont want to denominate a zero balance or zero decimal
163
+ if (strBalance === '0' || dec === 0) {
164
+ return strBalance;
165
+ }
166
+ // If the denominated value will be less then zero, pad it correctly
167
+ if (strBalance.length <= dec) {
168
+ return '.'.padEnd(dec - strBalance.length + 1, '0').concat(strBalance);
169
+ }
170
+ const lenDiff = strBalance.length - dec;
171
+ return (strBalance.substring(0, lenDiff) +
172
+ '.' +
173
+ strBalance.substring(lenDiff, strBalance.length));
174
+ }
175
+ /**
176
+ * Parse and denominate the `amount` key in each BalanceLock
177
+ *
178
+ * @param locks A vector containing BalanceLock objects
179
+ * @param dec The chains given decimal value
180
+ */
181
+ applyDenominationLocks(locks, dec) {
182
+ return locks.map((lock) => {
183
+ return {
184
+ id: lock.id,
185
+ amount: this.applyDenominationBalance(lock.amount, dec),
186
+ reasons: lock.reasons,
187
+ };
188
+ });
189
+ }
190
+ /**
191
+ * Either denominate a value, or return the original Balance as an atomic value.
192
+ *
193
+ * @param denominate Boolean to determine whether or not we denominate a balance
194
+ * @param bal Inputted Balance
195
+ * @param dec Decimal value used to denominate a Balance
196
+ */
197
+ inDenominationBal(denominate, bal, dec) {
198
+ return denominate ? this.applyDenominationBalance(bal, dec) : bal;
199
+ }
200
+ /**
201
+ * Either denominate the Balance's within Locks or return the original Locks.
202
+ *
203
+ * @param denominate Boolean to determine whether or not we denominate a balance
204
+ * @param locks Inputted Vec<BalanceLock>, only the amount key will be denominated
205
+ * @param dec Decimal value used to denominate a Balance
206
+ */
207
+ inDenominationLocks(denominate, locks, dec) {
208
+ return denominate ? this.applyDenominationLocks(locks, dec) : locks;
209
+ }
146
210
  }
147
211
  exports.AccountsBalanceInfoService = AccountsBalanceInfoService;
148
212
  //# sourceMappingURL=AccountsBalanceInfoService.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"AccountsBalanceInfoService.js","sourceRoot":"","sources":["../../../../src/services/accounts/AccountsBalanceInfoService.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"AccountsBalanceInfoService.js","sourceRoot":"","sources":["../../../../src/services/accounts/AccountsBalanceInfoService.ts"],"names":[],"mappings":"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"}
@@ -40,10 +40,10 @@ describe('AccountsBalanceInfoService', () => {
40
40
  at: (_hash) => tempHistoricApi,
41
41
  };
42
42
  const tempAccountsBalanceInfoService = new AccountsBalanceInfoService_1.AccountsBalanceInfoService(tempMockApi);
43
- expect((0, sanitizeNumbers_1.sanitizeNumbers)(await tempAccountsBalanceInfoService.fetchAccountBalanceInfo(mock_1.blockHash789629, mockHistoricApi, mock_1.testAddress, 'DOT'))).toStrictEqual(balanceInfo789629_json_1.default);
43
+ expect((0, sanitizeNumbers_1.sanitizeNumbers)(await tempAccountsBalanceInfoService.fetchAccountBalanceInfo(mock_1.blockHash789629, mockHistoricApi, mock_1.testAddress, 'DOT', false))).toStrictEqual(balanceInfo789629_json_1.default);
44
44
  });
45
45
  it('Correctly queries historical blocks', async () => {
46
- const result = await accountsBalanceInfoService.fetchAccountBalanceInfo(mock_1.blockHash789629, mockHistoricApi, mock_1.testAddress, 'DOT');
46
+ const result = await accountsBalanceInfoService.fetchAccountBalanceInfo(mock_1.blockHash789629, mockHistoricApi, mock_1.testAddress, 'DOT', false);
47
47
  const expectedResponse = {
48
48
  at: {
49
49
  hash: '0x7b713de604a99857f6c25eacc115a4f28d2611a23d9ddff99ab0e4f1c17a8578',
@@ -107,18 +107,62 @@ describe('AccountsBalanceInfoService', () => {
107
107
  expect(tokenHistoricApi.registry.chainDecimals).toStrictEqual([12]);
108
108
  });
109
109
  it('querrys tokens pallet storage with a non-native token', async () => {
110
- expect((0, sanitizeNumbers_1.sanitizeNumbers)(await tokenAccountsBalanceInfoService.fetchAccountBalanceInfo(mock_1.blockHash789629, tokenHistoricApi, mock_1.testAddress, 'fOoToKeN')).tokenSymbol).toEqual('fOoToKeN');
110
+ expect((0, sanitizeNumbers_1.sanitizeNumbers)(await tokenAccountsBalanceInfoService.fetchAccountBalanceInfo(mock_1.blockHash789629, tokenHistoricApi, mock_1.testAddress, 'fOoToKeN', false)).tokenSymbol).toEqual('fOoToKeN');
111
111
  expect(mockTokensLocksAt).toBeCalled();
112
112
  expect(mockTokenAccountAt).toBeCalled();
113
113
  expect(mockBalancesLocksAt).not.toBeCalled();
114
114
  });
115
115
  it('does not query tokens pallet storage with the native token', async () => {
116
- expect((0, sanitizeNumbers_1.sanitizeNumbers)(await tokenAccountsBalanceInfoService.fetchAccountBalanceInfo(mock_1.blockHash789629, tokenHistoricApi, mock_1.testAddress, 'doT')).tokenSymbol).toEqual('doT');
116
+ expect((0, sanitizeNumbers_1.sanitizeNumbers)(await tokenAccountsBalanceInfoService.fetchAccountBalanceInfo(mock_1.blockHash789629, tokenHistoricApi, mock_1.testAddress, 'doT', false)).tokenSymbol).toEqual('doT');
117
117
  expect(mockTokensLocksAt).not.toBeCalled();
118
118
  expect(mockTokenAccountAt).not.toBeCalled();
119
119
  expect(mockBalancesLocksAt).toBeCalled();
120
120
  });
121
121
  });
122
122
  });
123
+ describe('applyDenomination', () => {
124
+ const balance = registries_1.polkadotRegistry.createType('Balance', 12345);
125
+ it('Should correctly denominate a balance when balance.length <= decimal', () => {
126
+ const ltValue = accountsBalanceInfoService['applyDenominationBalance'](balance, 7);
127
+ const etValue = accountsBalanceInfoService['applyDenominationBalance'](balance, 5);
128
+ expect(ltValue).toBe('.0012345');
129
+ expect(etValue).toBe('.12345');
130
+ });
131
+ it('Should correctly denominate a balance when balance.length > decimal', () => {
132
+ const value = accountsBalanceInfoService['applyDenominationBalance'](balance, 3);
133
+ expect(value).toBe('12.345');
134
+ });
135
+ it('Should correctly denominate a balance when balance is equal to zero', () => {
136
+ const zeroBalance = registries_1.polkadotRegistry.createType('Balance', 0);
137
+ const value = accountsBalanceInfoService['applyDenominationBalance'](zeroBalance, 2);
138
+ expect(value).toBe('0');
139
+ });
140
+ it('Should correctly denominate a balance when the decimal value is zero', () => {
141
+ const value = accountsBalanceInfoService['applyDenominationBalance'](balance, 0);
142
+ expect(value).toBe('12345');
143
+ });
144
+ });
145
+ describe('denominateLocks', () => {
146
+ it('Should correctly parse and denominate a Vec<BalanceLocks>', () => {
147
+ const balanceLock = registries_1.polkadotRegistry.createType('BalanceLock', {
148
+ id: '0x7374616b696e6720',
149
+ amount: 12345,
150
+ reasons: 'All',
151
+ });
152
+ const vecLocks = registries_1.polkadotRegistry.createType('Vec<BalanceLock>', [
153
+ balanceLock,
154
+ ]);
155
+ const value = accountsBalanceInfoService['applyDenominationLocks'](vecLocks, 3);
156
+ const expectedValue = [
157
+ { amount: '12.345', id: '0x7374616b696e6720', reasons: 'All' },
158
+ ];
159
+ expect((0, sanitizeNumbers_1.sanitizeNumbers)(value)).toStrictEqual(expectedValue);
160
+ });
161
+ it('Should handle an empty Vec correctly', () => {
162
+ const vecLocks = registries_1.polkadotRegistry.createType('Vec<BalanceLock>', []);
163
+ const value = accountsBalanceInfoService['applyDenominationLocks'](vecLocks, 3);
164
+ expect((0, sanitizeNumbers_1.sanitizeNumbers)(value)).toStrictEqual([]);
165
+ });
166
+ });
123
167
  });
124
168
  //# sourceMappingURL=AccountsBalanceInfoService.spec.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"AccountsBalanceInfoService.spec.js","sourceRoot":"","sources":["../../../../src/services/accounts/AccountsBalanceInfoService.spec.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"AccountsBalanceInfoService.spec.js","sourceRoot":"","sources":["../../../../src/services/accounts/AccountsBalanceInfoService.spec.ts"],"names":[],"mappings":"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"}
@@ -101,15 +101,15 @@ describe('AccountsStakingPayoutsService', () => {
101
101
  it('`extractExposure` should return the correct value when the address is a nominator', () => {
102
102
  const res = stakingPayoutsService['extractExposure'](nominator, validator, derivedExposure);
103
103
  expect((0, sanitizeNumbers_1.sanitizeNumbers)(res)).toStrictEqual({
104
- nominatorExposure: '33223051661066608',
105
- totalExposure: '33223251661066608',
104
+ nominatorExposure: '33223051661066606',
105
+ totalExposure: '33223251661066606',
106
106
  });
107
107
  });
108
108
  it('`extractExposure` should return the correct value when the address is a validator', () => {
109
109
  const res = stakingPayoutsService['extractExposure'](validator, validator, derivedExposure);
110
110
  expect((0, sanitizeNumbers_1.sanitizeNumbers)(res)).toStrictEqual({
111
111
  nominatorExposure: '200000000000',
112
- totalExposure: '33223251661066608',
112
+ totalExposure: '33223251661066606',
113
113
  });
114
114
  });
115
115
  it('`deriveNominatedExposures` should return the correct value when address is a validator', () => {
@@ -392,11 +392,11 @@ class BlocksService extends AbstractService_1.AbstractService {
392
392
  * @param blockHash Hash of a block in the runtime to get the extrinsic base weight(s) for
393
393
  */
394
394
  getWeight(historicApi) {
395
- var _a, _b;
395
+ var _a;
396
396
  const { consts: { system }, } = historicApi;
397
397
  let weightValue;
398
398
  if ((_a = system.blockWeights) === null || _a === void 0 ? void 0 : _a.perClass) {
399
- const { normal, operational, mandatory } = (_b = system.blockWeights) === null || _b === void 0 ? void 0 : _b.perClass;
399
+ const { normal, operational, mandatory } = system.blockWeights.perClass;
400
400
  const perClass = {
401
401
  normal: {
402
402
  baseExtrinsic: normal.baseExtrinsic.toBigInt(),
@@ -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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"}
@@ -1,13 +1,18 @@
1
1
  import { Vec } from '@polkadot/types';
2
- import { Balance, BalanceLock, Index } from '@polkadot/types/interfaces';
2
+ import { Balance, BalanceLock, Index, LockIdentifier, Reasons } from '@polkadot/types/interfaces';
3
3
  import { IAt } from '.';
4
4
  export interface IAccountBalanceInfo {
5
5
  at: IAt;
6
6
  tokenSymbol: string;
7
7
  nonce: Index;
8
- free: Balance;
9
- reserved: Balance;
10
- miscFrozen: Balance;
11
- feeFrozen: Balance;
12
- locks: Vec<BalanceLock>;
8
+ free: Balance | string;
9
+ reserved: Balance | string;
10
+ miscFrozen: Balance | string;
11
+ feeFrozen: Balance | string;
12
+ locks: Vec<BalanceLock> | IBalanceLock[];
13
+ }
14
+ export interface IBalanceLock {
15
+ id: LockIdentifier;
16
+ amount: string;
17
+ reasons: Reasons;
13
18
  }
@@ -1,12 +1,12 @@
1
- import { Compact } from '@polkadot/types';
2
- import { Address, Balance, EcdsaSignature, Ed25519Signature, Index, RuntimeDispatchInfo, Sr25519Signature } from '@polkadot/types/interfaces';
1
+ import { Address, EcdsaSignature, Ed25519Signature, RuntimeDispatchInfo, Sr25519Signature } from '@polkadot/types/interfaces';
2
+ import { ICompact, INumber } from '@polkadot/types-codec/types/interfaces';
3
3
  import { IAt, IFrameMethod, ISanitizedArgs, ISanitizedEvent } from '.';
4
4
  export interface IExtrinsic {
5
5
  method: string | IFrameMethod;
6
6
  signature: ISignature | null;
7
- nonce: Compact<Index> | null;
7
+ nonce: ICompact<INumber> | null;
8
8
  args: ISanitizedArgs;
9
- tip: Compact<Balance> | null;
9
+ tip: ICompact<INumber> | null;
10
10
  hash: string;
11
11
  info: RuntimeDispatchInfo | {
12
12
  error: string;
package/package.json CHANGED
@@ -1,5 +1,5 @@
1
1
  {
2
- "version": "11.3.18",
2
+ "version": "11.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",
@@ -38,7 +38,7 @@
38
38
  "test:watch": "substrate-exec-jest --watch",
39
39
  "test:cov": "NODE_ENV=test substrate-exec-jest --detectOpenHandles --coverage",
40
40
  "lint:e2e-tests": "cd e2e-tests && substrate-dev-run-lint",
41
- "build:e2e-tests": "(cd e2e-tests && substrate-exec-tsc)",
41
+ "build:e2e-tests": "substrate-exec-tsc --project e2e-tests/tsconfig.json",
42
42
  "test:e2e-tests": "yarn build:e2e-tests && node ./e2e-tests/build/index.js --config=./e2e-tests/jest.config.js",
43
43
  "test:init-e2e-tests": "yarn start:e2e-scripts --log-level=http",
44
44
  "test:init-e2e-tests:polkadot": "yarn test:init-e2e-tests --chain polkadot",
@@ -47,16 +47,16 @@
47
47
  "test:init-e2e-tests:statemine": "yarn test:init-e2e-tests --chain statemine",
48
48
  "test:init-e2e-tests:statemint": "yarn test:init-e2e-tests --chain statemint",
49
49
  "start:e2e-scripts": "yarn build:scripts && node scripts/build/runChainTests.js",
50
- "build:scripts": "substrate-exec-rimraf scripts/build/ && cd scripts && substrate-exec-tsc",
50
+ "build:scripts": "substrate-exec-rimraf scripts/build/ && substrate-exec-tsc --project scripts/tsconfig.json",
51
51
  "lint:scripts": "cd scripts && substrate-dev-run-lint",
52
52
  "start:test-release": "yarn build:scripts && node scripts/build/runYarnPack.js",
53
53
  "test:test-release": "yarn start:test-release",
54
54
  "update-pjs-deps": "substrate-update-pjs-deps && yarn"
55
55
  },
56
56
  "dependencies": {
57
- "@polkadot/api": "8.3.1",
58
- "@polkadot/apps-config": "0.113.1",
59
- "@polkadot/util-crypto": "9.1.1",
57
+ "@polkadot/api": "8.4.2",
58
+ "@polkadot/apps-config": "0.112.1",
59
+ "@polkadot/util-crypto": "9.2.1",
60
60
  "@substrate/calc": "^0.2.8",
61
61
  "argparse": "^2.0.1",
62
62
  "confmgr": "1.0.7",
@@ -68,7 +68,7 @@
68
68
  "winston": "^3.3.3"
69
69
  },
70
70
  "devDependencies": {
71
- "@substrate/dev": "^0.6.0",
71
+ "@substrate/dev": "^0.6.1",
72
72
  "@types/argparse": "2.0.10",
73
73
  "@types/express": "4.17.13",
74
74
  "@types/express-serve-static-core": "4.17.25",
@@ -79,28 +79,28 @@
79
79
  "tsc-watch": "^4.4.0"
80
80
  },
81
81
  "resolutions": {
82
- "@polkadot/api": "8.3.1",
83
- "@polkadot/api-augment": "8.3.1",
84
- "@polkadot/api-base": "8.3.1",
85
- "@polkadot/api-derive": "8.3.1",
86
- "@polkadot/rpc-core": "8.3.1",
87
- "@polkadot/rpc-augment": "8.3.1",
88
- "@polkadot/rpc-provider": "8.3.1",
89
- "@polkadot/types": "8.3.1",
90
- "@polkadot/types-augment": "8.3.1",
91
- "@polkadot/types-codec": "8.3.1",
92
- "@polkadot/types-create": "8.3.1",
93
- "@polkadot/types-support": "8.3.1",
94
- "@polkadot/types-known": "8.3.1",
95
- "@polkadot/keyring": "9.1.1",
96
- "@polkadot/networks": "9.1.1",
97
- "@polkadot/util": "9.1.1",
98
- "@polkadot/util-crypto": "9.1.1",
99
- "@polkadot/x-fetch": "9.1.1",
100
- "@polkadot/x-global": "9.1.1",
101
- "@polkadot/x-bigint": "9.1.1",
102
- "@polkadot/x-ws": "9.1.1",
103
- "@polkadot/wasm-crypto": "6.0.1",
82
+ "@polkadot/api": "8.4.2",
83
+ "@polkadot/api-augment": "8.4.2",
84
+ "@polkadot/api-base": "8.4.2",
85
+ "@polkadot/api-derive": "8.4.2",
86
+ "@polkadot/rpc-core": "8.4.2",
87
+ "@polkadot/rpc-augment": "8.4.2",
88
+ "@polkadot/rpc-provider": "8.4.2",
89
+ "@polkadot/types": "8.4.2",
90
+ "@polkadot/types-augment": "8.4.2",
91
+ "@polkadot/types-codec": "8.4.2",
92
+ "@polkadot/types-create": "8.4.2",
93
+ "@polkadot/types-support": "8.4.2",
94
+ "@polkadot/types-known": "8.4.2",
95
+ "@polkadot/keyring": "9.2.1",
96
+ "@polkadot/networks": "9.2.1",
97
+ "@polkadot/util": "9.2.1",
98
+ "@polkadot/util-crypto": "9.2.1",
99
+ "@polkadot/x-fetch": "9.2.1",
100
+ "@polkadot/x-global": "9.2.1",
101
+ "@polkadot/x-bigint": "9.2.1",
102
+ "@polkadot/x-ws": "9.2.1",
103
+ "@polkadot/wasm-crypto": "6.1.1",
104
104
  "bn.js": "5.2.0",
105
105
  "node-fetch": "2.6.7",
106
106
  "prismjs": ">=1.23.0",