@substrate/api-sidecar 11.3.10 → 11.3.11
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +20 -11
- package/build/package.json +12 -9
- package/build/src/services/AbstractService.d.ts +17 -0
- package/build/src/services/AbstractService.js +27 -1
- package/build/src/services/AbstractService.js.map +1 -1
- package/build/src/services/AbstractService.spec.d.ts +1 -0
- package/build/src/services/AbstractService.spec.js +45 -0
- package/build/src/services/AbstractService.spec.js.map +1 -0
- package/build/src/services/accounts/AccountsAssetsService.js +6 -2
- package/build/src/services/accounts/AccountsAssetsService.js.map +1 -1
- package/build/src/services/accounts/AccountsBalanceInfoService.d.ts +0 -7
- package/build/src/services/accounts/AccountsBalanceInfoService.js +3 -15
- package/build/src/services/accounts/AccountsBalanceInfoService.js.map +1 -1
- package/build/src/services/accounts/AccountsStakingInfoService.js +6 -2
- package/build/src/services/accounts/AccountsStakingInfoService.js.map +1 -1
- package/build/src/services/accounts/AccountsStakingPayoutsService.js +3 -1
- package/build/src/services/accounts/AccountsStakingPayoutsService.js.map +1 -1
- package/build/src/services/accounts/AccountsVestingInfoService.js +3 -1
- package/build/src/services/accounts/AccountsVestingInfoService.js.map +1 -1
- package/build/src/services/blocks/BlocksService.spec.js +1 -1
- package/build/src/services/blocks/BlocksService.spec.js.map +1 -1
- package/package.json +12 -9
package/README.md
CHANGED
|
@@ -289,15 +289,10 @@ Need help or want to contribute ideas or code? Head over to our [CONTRIBUTING](.
|
|
|
289
289
|
|
|
290
290
|
All the commits in this repo follow the [Conventional Commits spec](https://www.conventionalcommits.org/en/v1.0.0/#summary). When merging a PR, make sure 1) to use squash merge and 2) that the title of the PR follows the Conventional Commits spec.
|
|
291
291
|
|
|
292
|
-
###
|
|
292
|
+
### Updating polkadot-js dependencies
|
|
293
293
|
|
|
294
|
-
|
|
295
|
-
|
|
296
|
-
1. Make sure that you've run `yarn` in this folder, and run `cargo install wasm-pack` so that that binary is available on your `$PATH`.
|
|
297
|
-
|
|
298
|
-
1. Checkout a branch with the format `name-v5-0-1`. When deciding what version will be released it is important to look over 1) PRs since the last release and 2) release notes for any updated polkadot-js dependencies as they may affect type definitions.
|
|
299
|
-
|
|
300
|
-
1. Ensure we have the latest polkadot-js dependencies. Note: Every monday the polkadot-js ecosystem will usually come out with a new release. It's important that we keep up, and read the release notes for any breaking changes, or high priority updates. You can use the following command `yarn upgrade-interactive` to find and update all available releases. Feel free to update other packages that are available for upgrade if reasonable. To upgrade just `@polkadot` scoped deps use `yarn up "@polkadot/*"`
|
|
294
|
+
1. Every Monday the polkadot-js ecosystem will usually come out with a new release. It's important that we keep up,
|
|
295
|
+
and read the release notes for any breaking changes or high priority updates. You can use the following command `yarn upgrade-interactive` to find and update all available releases. To Upgrade just `@polkadot` scoped deps use `yarn up @polkadot/*`.
|
|
301
296
|
|
|
302
297
|
- @polkadot/api [release notes](https://github.com/polkadot-js/api/releases)
|
|
303
298
|
- @polkadot/apps-config [release notes](https://github.com/polkadot-js/apps/releases)
|
|
@@ -305,9 +300,23 @@ All the commits in this repo follow the [Conventional Commits spec](https://www.
|
|
|
305
300
|
- @polkadot/util-crypto [release notes](https://github.com/polkadot-js/common/releases)
|
|
306
301
|
- @substrate/calc [npm release page](https://www.npmjs.com/package/@substrate/calc)
|
|
307
302
|
|
|
308
|
-
1. Next make sure the resolutions are up to date inside of the `package.json` for all `@polkadot/*` packages, please refer to the releases of each polkadot package we update as a dependency, and reach out to the maintainers for any questions.
|
|
303
|
+
1. Next make sure the resolutions are up to date inside of the `package.json` for all `@polkadot/*` packages, please refer to the releases of each polkadot package we update as a dependency, and reach out to the maintainers for any questions. You will have to run `yarn` again to ensure the dependency `cache`, and `yarn.lock` have the correct versions.
|
|
304
|
+
|
|
305
|
+
1. Ensure everything is working by running the following tests, `yarn build`, `yarn lint`, `yarn test`, `yarn test:init-e2e-tests`.
|
|
306
|
+
|
|
307
|
+
1. Lastly, create a PR with the updates.
|
|
308
|
+
|
|
309
|
+
### Releases
|
|
310
|
+
|
|
311
|
+
#### Preparation
|
|
312
|
+
|
|
313
|
+
1. Make sure the polkadot-js dependencies are up to date. Refer to the "Updating polkadot-js dependencies" if they need to be updated.
|
|
314
|
+
|
|
315
|
+
1. Make sure that you've run `yarn` in this folder, and run `cargo install wasm-pack` so that that binary is available on your `$PATH`.
|
|
316
|
+
|
|
317
|
+
1. Checkout a branch with the format `name-v5-0-1`. When deciding what version will be released it is important to look over 1) PRs since the last release and 2) release notes for any updated polkadot-js dependencies as they may affect type definitions.
|
|
309
318
|
|
|
310
|
-
1.
|
|
319
|
+
1. The next step is making sure the release will work against all relevant runtimes for Polkadot, Kusama, and Westend. This can be handled by running `yarn test:init-e2e-tests`. If you would like to test on an individual chain, you may run the same command followed by its chain, ex: `yarn test:init-e2e-tests:polkadot`. Before moving forward ensure all tests pass, and if it warns of any missing types feel free to make an issue [here](https://github.com/paritytech/substrate-api-sidecar/issues).
|
|
311
320
|
|
|
312
321
|
Note: that the e2e tests will connect to running nodes in order to test sidecar against real data, and they may fail owing to those connections taking too long to establish. If you run into any failures, try running tests just for the chain that failed with something like `yarn test:init-e2e-tests:polkadot`.
|
|
313
322
|
|
|
@@ -315,7 +324,7 @@ All the commits in this repo follow the [Conventional Commits spec](https://www.
|
|
|
315
324
|
|
|
316
325
|
1. Update the substrate-api-sidecar version in the docs by going into `docs/src/openapi-v1.yaml`, and changing the `version` field under `info` to the releases respected version. Then run `yarn build:docs`.
|
|
317
326
|
|
|
318
|
-
1. Update `CHANGELOG.md` by looking at merged PRs since the last release. Follow the format of previous releases. Only record dep updates if they reflect type definition updates as those affect the users API.
|
|
327
|
+
1. Update `CHANGELOG.md` by looking at merged PRs since the last release. Follow the format of previous releases. Only record dep updates if they reflect type definition updates as those affect the users API. It will also help to sort previous PR's by "recently updated" in order to see all PR's merged since the last release.
|
|
319
328
|
|
|
320
329
|
Make sure to note if it is a high upgrade priority (e.g. it has type definitions for an upcoming runtime upgrade to a Parity maintained network).
|
|
321
330
|
|
package/build/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "11.3.
|
|
2
|
+
"version": "11.3.11",
|
|
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",
|
|
@@ -28,12 +28,15 @@
|
|
|
28
28
|
"build:docker": "docker build -t substrate-api-sidecar .",
|
|
29
29
|
"build:docs": "(cd docs && yarn && yarn build)",
|
|
30
30
|
"main": "node ./build/src/main.js",
|
|
31
|
-
"lint": "substrate-dev-run-lint",
|
|
31
|
+
"lint": "substrate-dev-run-lint --fix",
|
|
32
|
+
"lint:ci": "substrate-dev-run-lint",
|
|
32
33
|
"deploy": "yarn build && npm publish",
|
|
33
34
|
"start": "yarn run main",
|
|
34
35
|
"start:log-rpc": "yarn run build && NODE_ENV=test yarn run main ",
|
|
35
36
|
"dev": "tsc-watch --onSuccess \"yarn run main\"",
|
|
36
|
-
"test": "substrate-exec-jest
|
|
37
|
+
"test": "substrate-exec-jest",
|
|
38
|
+
"test:watch": "substrate-exec-jest --watch",
|
|
39
|
+
"test:cov": "substrate-exec-jest --coverage",
|
|
37
40
|
"lint:e2e-tests": "cd e2e-tests && substrate-dev-run-lint",
|
|
38
41
|
"build:e2e-tests": "(cd e2e-tests && substrate-exec-tsc)",
|
|
39
42
|
"test:e2e-tests": "yarn build:e2e-tests && node ./e2e-tests/build/index.js --config=./e2e-tests/jest.config.js",
|
|
@@ -50,8 +53,8 @@
|
|
|
50
53
|
"test:test-release": "yarn start:test-release"
|
|
51
54
|
},
|
|
52
55
|
"dependencies": {
|
|
53
|
-
"@polkadot/api": "^7.
|
|
54
|
-
"@polkadot/apps-config": "^0.
|
|
56
|
+
"@polkadot/api": "^7.9.1",
|
|
57
|
+
"@polkadot/apps-config": "^0.106.1",
|
|
55
58
|
"@polkadot/util-crypto": "^8.4.1",
|
|
56
59
|
"@substrate/calc": "^0.2.7",
|
|
57
60
|
"argparse": "^2.0.1",
|
|
@@ -64,7 +67,7 @@
|
|
|
64
67
|
"winston": "^3.3.3"
|
|
65
68
|
},
|
|
66
69
|
"devDependencies": {
|
|
67
|
-
"@substrate/dev": "^0.5.
|
|
70
|
+
"@substrate/dev": "^0.5.7",
|
|
68
71
|
"@types/argparse": "2.0.10",
|
|
69
72
|
"@types/express": "4.17.13",
|
|
70
73
|
"@types/express-serve-static-core": "4.17.25",
|
|
@@ -75,11 +78,11 @@
|
|
|
75
78
|
"tsc-watch": "^4.4.0"
|
|
76
79
|
},
|
|
77
80
|
"resolutions": {
|
|
78
|
-
"@polkadot/api": "7.
|
|
81
|
+
"@polkadot/api": "7.9.1",
|
|
79
82
|
"@polkadot/keyring": "8.4.1",
|
|
80
83
|
"@polkadot/networks": "8.4.1",
|
|
81
|
-
"@polkadot/types": "7.
|
|
82
|
-
"@polkadot/types-known": "7.
|
|
84
|
+
"@polkadot/types": "7.9.1",
|
|
85
|
+
"@polkadot/types-known": "7.9.1",
|
|
83
86
|
"@polkadot/util": "8.4.1",
|
|
84
87
|
"@polkadot/util-crypto": "8.4.1",
|
|
85
88
|
"@polkadot/wasm-crypto": "4.5.1",
|
|
@@ -1,5 +1,13 @@
|
|
|
1
1
|
import { ApiPromise } from '@polkadot/api';
|
|
2
2
|
import { Text, Vec } from '@polkadot/types';
|
|
3
|
+
import { HttpError } from 'http-errors';
|
|
4
|
+
export declare class EtheuremAddressNotSupported extends Error implements HttpError {
|
|
5
|
+
readonly status: number;
|
|
6
|
+
readonly statusCode: number;
|
|
7
|
+
readonly expose: boolean;
|
|
8
|
+
readonly name: string;
|
|
9
|
+
constructor(msg: string);
|
|
10
|
+
}
|
|
3
11
|
export declare abstract class AbstractService {
|
|
4
12
|
protected api: ApiPromise;
|
|
5
13
|
constructor(api: ApiPromise);
|
|
@@ -9,4 +17,13 @@ export declare abstract class AbstractService {
|
|
|
9
17
|
* @param docs metadata doucumentation array
|
|
10
18
|
*/
|
|
11
19
|
protected sanitizeDocs(docs: Vec<Text>): string;
|
|
20
|
+
/**
|
|
21
|
+
* Returns HttpError with the correct err message for querying accounts balances.
|
|
22
|
+
*
|
|
23
|
+
* @function
|
|
24
|
+
* @param {string} address Address that was queried
|
|
25
|
+
* @param {Error} err Error returned from the promise
|
|
26
|
+
* @returns {HttpError}
|
|
27
|
+
*/
|
|
28
|
+
protected createHttpErrorForAddr(address: string, err: Error): HttpError;
|
|
12
29
|
}
|
|
@@ -1,6 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.AbstractService = void 0;
|
|
3
|
+
exports.AbstractService = exports.EtheuremAddressNotSupported = void 0;
|
|
4
|
+
const util_crypto_1 = require("@polkadot/util-crypto");
|
|
5
|
+
const http_errors_1 = require("http-errors");
|
|
6
|
+
class EtheuremAddressNotSupported extends Error {
|
|
7
|
+
constructor(msg) {
|
|
8
|
+
super(`Etheurem addresses may not be supported on this network: ${msg}`);
|
|
9
|
+
this.expose = true;
|
|
10
|
+
this.status = 400;
|
|
11
|
+
this.statusCode = 400;
|
|
12
|
+
this.name = EtheuremAddressNotSupported.name;
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
exports.EtheuremAddressNotSupported = EtheuremAddressNotSupported;
|
|
4
16
|
class AbstractService {
|
|
5
17
|
constructor(api) {
|
|
6
18
|
this.api = api;
|
|
@@ -15,6 +27,20 @@ class AbstractService {
|
|
|
15
27
|
.map((l, idx, arr) => idx === arr.length - 1 ? l.toString() : `${l.toString()}\n`)
|
|
16
28
|
.join('');
|
|
17
29
|
}
|
|
30
|
+
/**
|
|
31
|
+
* Returns HttpError with the correct err message for querying accounts balances.
|
|
32
|
+
*
|
|
33
|
+
* @function
|
|
34
|
+
* @param {string} address Address that was queried
|
|
35
|
+
* @param {Error} err Error returned from the promise
|
|
36
|
+
* @returns {HttpError}
|
|
37
|
+
*/
|
|
38
|
+
createHttpErrorForAddr(address, err) {
|
|
39
|
+
if ((0, util_crypto_1.isEthereumAddress)(address)) {
|
|
40
|
+
return new EtheuremAddressNotSupported(err.message);
|
|
41
|
+
}
|
|
42
|
+
return new http_errors_1.BadRequest(err.message);
|
|
43
|
+
}
|
|
18
44
|
}
|
|
19
45
|
exports.AbstractService = AbstractService;
|
|
20
46
|
//# sourceMappingURL=AbstractService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractService.js","sourceRoot":"","sources":["../../../src/services/AbstractService.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"AbstractService.js","sourceRoot":"","sources":["../../../src/services/AbstractService.ts"],"names":[],"mappings":";;;AAEA,uDAA0D;AAC1D,6CAAoD;AAEpD,MAAa,2BAA4B,SAAQ,KAAK;IAMrD,YAAY,GAAW;QACtB,KAAK,CAAC,4DAA4D,GAAG,EAAE,CAAC,CAAC;QAJ1D,WAAM,GAAY,IAAI,CAAC;QAKtC,IAAI,CAAC,MAAM,GAAG,GAAG,CAAC;QAClB,IAAI,CAAC,UAAU,GAAG,GAAG,CAAC;QACtB,IAAI,CAAC,IAAI,GAAG,2BAA2B,CAAC,IAAI,CAAC;IAC9C,CAAC;CACD;AAZD,kEAYC;AAED,MAAsB,eAAe;IACpC,YAAsB,GAAe;QAAf,QAAG,GAAH,GAAG,CAAY;IAAG,CAAC;IAEzC;;;;OAIG;IACO,YAAY,CAAC,IAAe;QACrC,OAAO,IAAI;aACT,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,CACpB,GAAG,KAAK,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,IAAI,CAC3D;aACA,IAAI,CAAC,EAAE,CAAC,CAAC;IACZ,CAAC;IAED;;;;;;;OAOG;IACO,sBAAsB,CAAC,OAAe,EAAE,GAAU;QAC3D,IAAI,IAAA,+BAAiB,EAAC,OAAO,CAAC,EAAE;YAC/B,OAAO,IAAI,2BAA2B,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;SACpD;QAED,OAAO,IAAI,wBAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC;CACD;AA/BD,0CA+BC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,45 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const http_errors_1 = require("http-errors");
|
|
4
|
+
const AbstractService_1 = require("./AbstractService");
|
|
5
|
+
const mock_1 = require("./test-helpers/mock");
|
|
6
|
+
class TestAbstractService extends AbstractService_1.AbstractService {
|
|
7
|
+
handleEtheuremAddressError() {
|
|
8
|
+
return this.createHttpErrorForAddr('0x0000000000000000000000000000000000000000', new Error('Ups! something is wrong.'));
|
|
9
|
+
}
|
|
10
|
+
handlePolkadotAddressError() {
|
|
11
|
+
return this.createHttpErrorForAddr('EQBwtmKWCyRrQ8yGWg7LkB8p7hpEKXZz4qUg9WR8hZmieCM', new Error('Ups! something is wrong.'));
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
const mockApi = {
|
|
15
|
+
...mock_1.defaultMockApi,
|
|
16
|
+
at: (_hash) => ({}),
|
|
17
|
+
};
|
|
18
|
+
const testService = new TestAbstractService(mockApi);
|
|
19
|
+
describe('AbstractService', () => {
|
|
20
|
+
describe('createHttpErrorForAddr', () => {
|
|
21
|
+
it('should throws an error instanceof EtheuremAddressNotSupported', () => {
|
|
22
|
+
const err = testService.handleEtheuremAddressError();
|
|
23
|
+
expect(err.expose).toBeTruthy();
|
|
24
|
+
expect(err.headers).toBeUndefined();
|
|
25
|
+
expect(err.message).not.toBeUndefined();
|
|
26
|
+
expect(err.name).toEqual(AbstractService_1.EtheuremAddressNotSupported.name);
|
|
27
|
+
expect(err.stack).not.toBeUndefined();
|
|
28
|
+
expect(err.status).toEqual(400);
|
|
29
|
+
expect(err.statusCode).toEqual(400);
|
|
30
|
+
expect(err).toBeInstanceOf(AbstractService_1.EtheuremAddressNotSupported);
|
|
31
|
+
});
|
|
32
|
+
it('should throws an error instanceof BadRequest', () => {
|
|
33
|
+
const err = testService.handlePolkadotAddressError();
|
|
34
|
+
expect(err.expose).toBeTruthy();
|
|
35
|
+
expect(err.headers).toBeUndefined();
|
|
36
|
+
expect(err.message).not.toBeUndefined();
|
|
37
|
+
expect(err.name).toEqual(http_errors_1.BadRequest.name);
|
|
38
|
+
expect(err.stack).not.toBeUndefined();
|
|
39
|
+
expect(err.status).toEqual(400);
|
|
40
|
+
expect(err.statusCode).toEqual(400);
|
|
41
|
+
expect(err).toBeInstanceOf(http_errors_1.BadRequest);
|
|
42
|
+
});
|
|
43
|
+
});
|
|
44
|
+
});
|
|
45
|
+
//# sourceMappingURL=AbstractService.spec.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AbstractService.spec.js","sourceRoot":"","sources":["../../../src/services/AbstractService.spec.ts"],"names":[],"mappings":";;AAEA,6CAAoD;AAEpD,uDAG2B;AAC3B,8CAAqD;AAErD,MAAM,mBAAoB,SAAQ,iCAAe;IACzC,0BAA0B;QAChC,OAAO,IAAI,CAAC,sBAAsB,CACjC,4CAA4C,EAC5C,IAAI,KAAK,CAAC,0BAA0B,CAAC,CACrC,CAAC;IACH,CAAC;IAEM,0BAA0B;QAChC,OAAO,IAAI,CAAC,sBAAsB,CACjC,iDAAiD,EACjD,IAAI,KAAK,CAAC,0BAA0B,CAAC,CACrC,CAAC;IACH,CAAC;CACD;AAED,MAAM,OAAO,GAAG;IACf,GAAG,qBAAc;IACjB,EAAE,EAAE,CAAC,KAAW,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC;CACA,CAAC;AAE3B,MAAM,WAAW,GAAG,IAAI,mBAAmB,CAAC,OAAO,CAAC,CAAC;AAErD,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAChC,QAAQ,CAAC,wBAAwB,EAAE,GAAG,EAAE;QACvC,EAAE,CAAC,+DAA+D,EAAE,GAAG,EAAE;YACxE,MAAM,GAAG,GAAG,WAAW,CAAC,0BAA0B,EAAE,CAAC;YAErD,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,CAAC;YAChC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,CAAC;YACpC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC;YACxC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,6CAA2B,CAAC,IAAI,CAAC,CAAC;YAC3D,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC;YACtC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAChC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACpC,MAAM,CAAC,GAAG,CAAC,CAAC,cAAc,CAAC,6CAA2B,CAAC,CAAC;QACzD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;YACvD,MAAM,GAAG,GAAG,WAAW,CAAC,0BAA0B,EAAE,CAAC;YAErD,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,CAAC;YAChC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,aAAa,EAAE,CAAC;YACpC,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC;YACxC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,wBAAU,CAAC,IAAI,CAAC,CAAC;YAC1C,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC;YACtC,MAAM,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YAChC,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;YACpC,MAAM,CAAC,GAAG,CAAC,CAAC,cAAc,CAAC,wBAAU,CAAC,CAAC;QACxC,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -61,7 +61,9 @@ class AccountsAssetsService extends AbstractService_1.AbstractService {
|
|
|
61
61
|
const [{ number }, assetApproval] = await Promise.all([
|
|
62
62
|
api.rpc.chain.getHeader(hash),
|
|
63
63
|
historicApi.query.assets.approvals(assetId, address, delegate),
|
|
64
|
-
])
|
|
64
|
+
]).catch((err) => {
|
|
65
|
+
throw this.createHttpErrorForAddr(address, err);
|
|
66
|
+
});
|
|
65
67
|
let amount = null, deposit = null;
|
|
66
68
|
if (assetApproval.isSome) {
|
|
67
69
|
({ amount, deposit } = assetApproval.unwrap());
|
|
@@ -135,7 +137,9 @@ class AccountsAssetsService extends AbstractService_1.AbstractService {
|
|
|
135
137
|
isFrozen: historicApi.registry.createType('bool', false),
|
|
136
138
|
isSufficient: historicApi.registry.createType('bool', false),
|
|
137
139
|
};
|
|
138
|
-
}))
|
|
140
|
+
})).catch((err) => {
|
|
141
|
+
throw this.createHttpErrorForAddr(address, err);
|
|
142
|
+
});
|
|
139
143
|
}
|
|
140
144
|
/**
|
|
141
145
|
* @param keys Extract `assetId`s from an array of storage keys
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AccountsAssetsService.js","sourceRoot":"","sources":["../../../../src/services/accounts/AccountsAssetsService.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"AccountsAssetsService.js","sourceRoot":"","sources":["../../../../src/services/accounts/AccountsAssetsService.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,11 +12,4 @@ export declare class AccountsBalanceInfoService extends AbstractService {
|
|
|
12
12
|
* @param token Token to get the balance info of.
|
|
13
13
|
*/
|
|
14
14
|
fetchAccountBalanceInfo(hash: BlockHash, historicApi: ApiDecoration<'promise'>, address: string, token: string): Promise<IAccountBalanceInfo>;
|
|
15
|
-
/**
|
|
16
|
-
* Returns HttpError with the correct err message for querying accounts balances.
|
|
17
|
-
*
|
|
18
|
-
* @param address Address that was queried
|
|
19
|
-
* @param err Error returned from the promise
|
|
20
|
-
*/
|
|
21
|
-
private createHttpError;
|
|
22
15
|
}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.AccountsBalanceInfoService = void 0;
|
|
4
|
-
const util_crypto_1 = require("@polkadot/util-crypto");
|
|
5
4
|
const http_errors_1 = require("http-errors");
|
|
6
5
|
const AbstractService_1 = require("../AbstractService");
|
|
7
6
|
class AccountsBalanceInfoService extends AbstractService_1.AbstractService {
|
|
@@ -33,7 +32,7 @@ class AccountsBalanceInfoService extends AbstractService_1.AbstractService {
|
|
|
33
32
|
historicApi.query.balances.reservedBalance(address),
|
|
34
33
|
historicApi.query.system.accountNonce(address),
|
|
35
34
|
]).catch((err) => {
|
|
36
|
-
throw this.
|
|
35
|
+
throw this.createHttpErrorForAddr(address, err);
|
|
37
36
|
});
|
|
38
37
|
// Values dont exist for these historic runtimes
|
|
39
38
|
const miscFrozen = api.registry.createType('Balance', 0), feeFrozen = api.registry.createType('Balance', 0);
|
|
@@ -63,7 +62,7 @@ class AccountsBalanceInfoService extends AbstractService_1.AbstractService {
|
|
|
63
62
|
historicApi.query.system.account(address),
|
|
64
63
|
historicApi.query.balances.locks(address),
|
|
65
64
|
]).catch((err) => {
|
|
66
|
-
throw this.
|
|
65
|
+
throw this.createHttpErrorForAddr(address, err);
|
|
67
66
|
});
|
|
68
67
|
const { data: { free, reserved, feeFrozen, miscFrozen }, nonce, } = accountInfo;
|
|
69
68
|
const at = {
|
|
@@ -94,7 +93,7 @@ class AccountsBalanceInfoService extends AbstractService_1.AbstractService {
|
|
|
94
93
|
historicApi.query.balances.locks(address),
|
|
95
94
|
historicApi.query.system.account(address),
|
|
96
95
|
]).catch((err) => {
|
|
97
|
-
throw this.
|
|
96
|
+
throw this.createHttpErrorForAddr(address, err);
|
|
98
97
|
});
|
|
99
98
|
accountData =
|
|
100
99
|
accountInfo.data != null
|
|
@@ -144,17 +143,6 @@ class AccountsBalanceInfoService extends AbstractService_1.AbstractService {
|
|
|
144
143
|
throw new http_errors_1.BadRequest('Account not found');
|
|
145
144
|
}
|
|
146
145
|
}
|
|
147
|
-
/**
|
|
148
|
-
* Returns HttpError with the correct err message for querying accounts balances.
|
|
149
|
-
*
|
|
150
|
-
* @param address Address that was queried
|
|
151
|
-
* @param err Error returned from the promise
|
|
152
|
-
*/
|
|
153
|
-
createHttpError(address, err) {
|
|
154
|
-
return (0, util_crypto_1.isEthereumAddress)(address)
|
|
155
|
-
? new http_errors_1.BadRequest(`Etheurem addresses may not be supported on this network: ${err.message}`)
|
|
156
|
-
: new http_errors_1.BadRequest(err.message);
|
|
157
|
-
}
|
|
158
146
|
}
|
|
159
147
|
exports.AccountsBalanceInfoService = AccountsBalanceInfoService;
|
|
160
148
|
//# sourceMappingURL=AccountsBalanceInfoService.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AccountsBalanceInfoService.js","sourceRoot":"","sources":["../../../../src/services/accounts/AccountsBalanceInfoService.ts"],"names":[],"mappings":";;;AASA,
|
|
1
|
+
{"version":3,"file":"AccountsBalanceInfoService.js","sourceRoot":"","sources":["../../../../src/services/accounts/AccountsBalanceInfoService.ts"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,9 @@ class AccountsStakingInfoService extends AbstractService_1.AbstractService {
|
|
|
16
16
|
const [header, controllerOption] = await Promise.all([
|
|
17
17
|
api.rpc.chain.getHeader(hash),
|
|
18
18
|
historicApi.query.staking.bonded(stash), // Option<AccountId> representing the controller
|
|
19
|
-
])
|
|
19
|
+
]).catch((err) => {
|
|
20
|
+
throw this.createHttpErrorForAddr(stash, err);
|
|
21
|
+
});
|
|
20
22
|
const at = {
|
|
21
23
|
hash,
|
|
22
24
|
height: header.number.unwrap().toString(10),
|
|
@@ -29,7 +31,9 @@ class AccountsStakingInfoService extends AbstractService_1.AbstractService {
|
|
|
29
31
|
historicApi.query.staking.ledger(controller),
|
|
30
32
|
historicApi.query.staking.payee(stash),
|
|
31
33
|
historicApi.query.staking.slashingSpans(stash),
|
|
32
|
-
])
|
|
34
|
+
]).catch((err) => {
|
|
35
|
+
throw this.createHttpErrorForAddr(stash, err);
|
|
36
|
+
});
|
|
33
37
|
const stakingLedger = stakingLedgerOption.unwrapOr(null);
|
|
34
38
|
if (stakingLedger === null) {
|
|
35
39
|
// should never throw because by time we get here we know we have a bonded pair
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AccountsStakingInfoService.js","sourceRoot":"","sources":["../../../../src/services/accounts/AccountsStakingInfoService.ts"],"names":[],"mappings":";;;AACA,6CAA8D;AAG9D,wDAAqD;AAErD,MAAa,0BAA2B,SAAQ,iCAAe;IAC9D;;;;;OAKG;IACH,KAAK,CAAC,uBAAuB,CAC5B,IAAe,EACf,KAAa;QAEb,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;QACrB,MAAM,WAAW,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;QAEvC,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACpD,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC;YAC7B,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,gDAAgD;SACzF,CAAC,CAAC;QAEH,MAAM,EAAE,GAAG;YACV,IAAI;YACJ,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC;SAC3C,CAAC;QAEF,IAAI,gBAAgB,CAAC,MAAM,EAAE;YAC5B,MAAM,IAAI,wBAAU,CAAC,eAAe,KAAK,0BAA0B,CAAC,CAAC;SACrE;QAED,MAAM,UAAU,GAAG,gBAAgB,CAAC,MAAM,EAAE,CAAC;QAE7C,MAAM,CAAC,mBAAmB,EAAE,iBAAiB,EAAE,mBAAmB,CAAC,GAClE,MAAM,OAAO,CAAC,GAAG,CAAC;YACjB,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC;YAC5C,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC;YACtC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC;SAC9C,CAAC,CAAC;QAEJ,MAAM,aAAa,GAAG,mBAAmB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEzD,IAAI,aAAa,KAAK,IAAI,EAAE;YAC3B,+EAA+E;YAC/E,MAAM,IAAI,iCAAmB,CAC5B,6DAA6D,UAAU,CAAC,QAAQ,EAAE,GAAG,CACrF,CAAC;SACF;QAED,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,MAAM;YAClD,CAAC,CAAC,mBAAmB,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC;YAC/C,CAAC,CAAC,CAAC,CAAC;QAEL,OAAO;YACN,EAAE;YACF,UAAU;YACV,iBAAiB;YACjB,gBAAgB;YAChB,OAAO,EAAE,aAAa;SACtB,CAAC;IACH,CAAC;CACD;
|
|
1
|
+
{"version":3,"file":"AccountsStakingInfoService.js","sourceRoot":"","sources":["../../../../src/services/accounts/AccountsStakingInfoService.ts"],"names":[],"mappings":";;;AACA,6CAA8D;AAG9D,wDAAqD;AAErD,MAAa,0BAA2B,SAAQ,iCAAe;IAC9D;;;;;OAKG;IACH,KAAK,CAAC,uBAAuB,CAC5B,IAAe,EACf,KAAa;QAEb,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;QACrB,MAAM,WAAW,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;QAEvC,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACpD,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC;YAC7B,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,gDAAgD;SACzF,CAAC,CAAC,KAAK,CAAC,CAAC,GAAU,EAAE,EAAE;YACvB,MAAM,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC/C,CAAC,CAAC,CAAC;QAEH,MAAM,EAAE,GAAG;YACV,IAAI;YACJ,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC;SAC3C,CAAC;QAEF,IAAI,gBAAgB,CAAC,MAAM,EAAE;YAC5B,MAAM,IAAI,wBAAU,CAAC,eAAe,KAAK,0BAA0B,CAAC,CAAC;SACrE;QAED,MAAM,UAAU,GAAG,gBAAgB,CAAC,MAAM,EAAE,CAAC;QAE7C,MAAM,CAAC,mBAAmB,EAAE,iBAAiB,EAAE,mBAAmB,CAAC,GAClE,MAAM,OAAO,CAAC,GAAG,CAAC;YACjB,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC;YAC5C,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC;YACtC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC;SAC9C,CAAC,CAAC,KAAK,CAAC,CAAC,GAAU,EAAE,EAAE;YACvB,MAAM,IAAI,CAAC,sBAAsB,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;QAC/C,CAAC,CAAC,CAAC;QAEJ,MAAM,aAAa,GAAG,mBAAmB,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QAEzD,IAAI,aAAa,KAAK,IAAI,EAAE;YAC3B,+EAA+E;YAC/E,MAAM,IAAI,iCAAmB,CAC5B,6DAA6D,UAAU,CAAC,QAAQ,EAAE,GAAG,CACrF,CAAC;SACF;QAED,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,MAAM;YAClD,CAAC,CAAC,mBAAmB,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC;YAC/C,CAAC,CAAC,CAAC,CAAC;QAEL,OAAO;YACN,EAAE;YACF,UAAU;YACV,iBAAiB;YACjB,gBAAgB;YAChB,OAAO,EAAE,aAAa;SACtB,CAAC;IACH,CAAC;CACD;AA9DD,gEA8DC"}
|
|
@@ -42,7 +42,9 @@ class AccountsStakingPayoutsService extends AbstractService_1.AbstractService {
|
|
|
42
42
|
// With the general data, we can now fetch the commission of each validator `address` nominates
|
|
43
43
|
const allErasCommissions = await this.fetchAllErasCommissions(historicApi, address, startEra,
|
|
44
44
|
// Create an array of `DeriveEraExposure`
|
|
45
|
-
allErasGeneral.map((eraGeneral) => eraGeneral[0]))
|
|
45
|
+
allErasGeneral.map((eraGeneral) => eraGeneral[0])).catch((err) => {
|
|
46
|
+
throw this.createHttpErrorForAddr(address, err);
|
|
47
|
+
});
|
|
46
48
|
// Group together data by Era so we can easily associate parts that are used congruently downstream
|
|
47
49
|
const allEraData = allErasGeneral.map(([deriveEraExposure, eraRewardPoints, erasValidatorRewardOption,], idx) => {
|
|
48
50
|
const eraCommissions = allErasCommissions[idx];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AccountsStakingPayoutsService.js","sourceRoot":"","sources":["../../../../src/services/accounts/AccountsStakingPayoutsService.ts"],"names":[],"mappings":";;;AAeA,0CAA6C;AAC7C,6CAAyC;AAOzC,wDAAqD;AAiCrD,MAAa,6BAA8B,SAAQ,iCAAe;IACjE;;;;;;;;OAQG;IACH,KAAK,CAAC,yBAAyB,CAC9B,IAAe,EACf,OAAe,EACf,KAAa,EACb,GAAW,EACX,aAAsB,EACtB,UAAkB;QAElB,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;QACrB,MAAM,WAAW,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;QAEvC,MAAM,CAAC,EAAE,MAAM,EAAE,EAAE,YAAY,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YACpD,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC;YAC7B,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,EAAE;SACxC,CAAC,CAAC;QAEH,+EAA+E;QAC/E,IAAI,KAAK,GAAG,YAAY,CAAC,QAAQ,EAAE,EAAE;YACpC,MAAM,IAAI,wBAAU,CAAC,8CAA8C,CAAC,CAAC;SACrE;QACD,IAAI,GAAG,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,GAAG,UAAU,GAAG,YAAY,CAAC,QAAQ,EAAE,EAAE;YAC7D,gFAAgF;YAChF,mFAAmF;YACnF,MAAM,IAAI,wBAAU,CACnB,iEAAiE;gBAChE,+CAA+C,CAChD,CAAC;SACF;QAED,MAAM,EAAE,GAAG;YACV,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC;YACpC,IAAI;SACJ,CAAC;QAEF,uGAAuG;QACvG,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,GAAG,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;QAEhD,mCAAmC;QACnC,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,mBAAmB,CACpD,GAAG,EACH,WAAW,EACX,QAAQ,EACR,GAAG,CACH,CAAC;QAEF,+FAA+F;QAC/F,MAAM,kBAAkB,GAAG,MAAM,IAAI,CAAC,uBAAuB,CAC5D,WAAW,EACX,OAAO,EACP,QAAQ;QACR,yCAAyC;QACzC,cAAc,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CACjD,CAAC;
|
|
1
|
+
{"version":3,"file":"AccountsStakingPayoutsService.js","sourceRoot":"","sources":["../../../../src/services/accounts/AccountsStakingPayoutsService.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,9 @@ class AccountsVestingInfoService extends AbstractService_1.AbstractService {
|
|
|
19
19
|
const [{ number }, vesting] = await Promise.all([
|
|
20
20
|
api.rpc.chain.getHeader(hash),
|
|
21
21
|
historicApi.query.vesting.vesting(address),
|
|
22
|
-
])
|
|
22
|
+
]).catch((err) => {
|
|
23
|
+
throw this.createHttpErrorForAddr(address, err);
|
|
24
|
+
});
|
|
23
25
|
const at = {
|
|
24
26
|
hash,
|
|
25
27
|
height: number.unwrap().toString(10),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AccountsVestingInfoService.js","sourceRoot":"","sources":["../../../../src/services/accounts/AccountsVestingInfoService.ts"],"names":[],"mappings":";;;AACA,6CAAyC;AAGzC,wDAAqD;AAErD,MAAa,0BAA2B,SAAQ,iCAAe;IAC9D;;;;;OAKG;IACH,KAAK,CAAC,uBAAuB,CAC5B,IAAe,EACf,OAAe;QAEf,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;QAErB,MAAM,WAAW,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;QAEvC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,EAAE;YAC/B,MAAM,IAAI,wBAAU,CACnB,uEAAuE,CACvE,CAAC;SACF;QAED,MAAM,CAAC,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC/C,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC;YAC7B,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC;SAC1C,CAAC,CAAC;QAEH,MAAM,EAAE,GAAG;YACV,IAAI;YACJ,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC;SACpC,CAAC;QAEF,IAAI,OAAO,CAAC,MAAM,EAAE;YACnB,OAAO;gBACN,EAAE;gBACF,OAAO,EAAE,EAAE;aACX,CAAC;SACF;aAAM;YACN,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;YAEvC,OAAO;gBACN,EAAE;gBACF,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;aACvE,CAAC;SACF;IACF,CAAC;CACD;
|
|
1
|
+
{"version":3,"file":"AccountsVestingInfoService.js","sourceRoot":"","sources":["../../../../src/services/accounts/AccountsVestingInfoService.ts"],"names":[],"mappings":";;;AACA,6CAAyC;AAGzC,wDAAqD;AAErD,MAAa,0BAA2B,SAAQ,iCAAe;IAC9D;;;;;OAKG;IACH,KAAK,CAAC,uBAAuB,CAC5B,IAAe,EACf,OAAe;QAEf,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;QAErB,MAAM,WAAW,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;QAEvC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,OAAO,EAAE;YAC/B,MAAM,IAAI,wBAAU,CACnB,uEAAuE,CACvE,CAAC;SACF;QAED,MAAM,CAAC,EAAE,MAAM,EAAE,EAAE,OAAO,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC/C,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC;YAC7B,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC;SAC1C,CAAC,CAAC,KAAK,CAAC,CAAC,GAAU,EAAE,EAAE;YACvB,MAAM,IAAI,CAAC,sBAAsB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;QAEH,MAAM,EAAE,GAAG;YACV,IAAI;YACJ,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC;SACpC,CAAC;QAEF,IAAI,OAAO,CAAC,MAAM,EAAE;YACnB,OAAO;gBACN,EAAE;gBACF,OAAO,EAAE,EAAE;aACX,CAAC;SACF;aAAM;YACN,MAAM,aAAa,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;YAEvC,OAAO;gBACN,EAAE;gBACF,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC;aACvE,CAAC;SACF;IACF,CAAC;CACD;AA/CD,gEA+CC"}
|
|
@@ -101,7 +101,7 @@ describe('BlocksService', () => {
|
|
|
101
101
|
block: mockBlock789629BadExt,
|
|
102
102
|
};
|
|
103
103
|
}));
|
|
104
|
-
await expect(blocksService.fetchBlock(mock_1.blockHash789629, mockHistoricApi, options)).rejects.
|
|
104
|
+
await expect(blocksService.fetchBlock(mock_1.blockHash789629, mockHistoricApi, options)).rejects.toThrowError(TypeError);
|
|
105
105
|
mockApi.rpc.chain.getBlock = tempGetBlock;
|
|
106
106
|
});
|
|
107
107
|
it('Returns the finalized tag as undefined when omitFinalizedTag equals true', async () => {
|
|
@@ -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/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "11.3.
|
|
2
|
+
"version": "11.3.11",
|
|
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",
|
|
@@ -28,12 +28,15 @@
|
|
|
28
28
|
"build:docker": "docker build -t substrate-api-sidecar .",
|
|
29
29
|
"build:docs": "(cd docs && yarn && yarn build)",
|
|
30
30
|
"main": "node ./build/src/main.js",
|
|
31
|
-
"lint": "substrate-dev-run-lint",
|
|
31
|
+
"lint": "substrate-dev-run-lint --fix",
|
|
32
|
+
"lint:ci": "substrate-dev-run-lint",
|
|
32
33
|
"deploy": "yarn build && npm publish",
|
|
33
34
|
"start": "yarn run main",
|
|
34
35
|
"start:log-rpc": "yarn run build && NODE_ENV=test yarn run main ",
|
|
35
36
|
"dev": "tsc-watch --onSuccess \"yarn run main\"",
|
|
36
|
-
"test": "substrate-exec-jest
|
|
37
|
+
"test": "substrate-exec-jest",
|
|
38
|
+
"test:watch": "substrate-exec-jest --watch",
|
|
39
|
+
"test:cov": "substrate-exec-jest --coverage",
|
|
37
40
|
"lint:e2e-tests": "cd e2e-tests && substrate-dev-run-lint",
|
|
38
41
|
"build:e2e-tests": "(cd e2e-tests && substrate-exec-tsc)",
|
|
39
42
|
"test:e2e-tests": "yarn build:e2e-tests && node ./e2e-tests/build/index.js --config=./e2e-tests/jest.config.js",
|
|
@@ -50,8 +53,8 @@
|
|
|
50
53
|
"test:test-release": "yarn start:test-release"
|
|
51
54
|
},
|
|
52
55
|
"dependencies": {
|
|
53
|
-
"@polkadot/api": "^7.
|
|
54
|
-
"@polkadot/apps-config": "^0.
|
|
56
|
+
"@polkadot/api": "^7.9.1",
|
|
57
|
+
"@polkadot/apps-config": "^0.106.1",
|
|
55
58
|
"@polkadot/util-crypto": "^8.4.1",
|
|
56
59
|
"@substrate/calc": "^0.2.7",
|
|
57
60
|
"argparse": "^2.0.1",
|
|
@@ -64,7 +67,7 @@
|
|
|
64
67
|
"winston": "^3.3.3"
|
|
65
68
|
},
|
|
66
69
|
"devDependencies": {
|
|
67
|
-
"@substrate/dev": "^0.5.
|
|
70
|
+
"@substrate/dev": "^0.5.7",
|
|
68
71
|
"@types/argparse": "2.0.10",
|
|
69
72
|
"@types/express": "4.17.13",
|
|
70
73
|
"@types/express-serve-static-core": "4.17.25",
|
|
@@ -75,11 +78,11 @@
|
|
|
75
78
|
"tsc-watch": "^4.4.0"
|
|
76
79
|
},
|
|
77
80
|
"resolutions": {
|
|
78
|
-
"@polkadot/api": "7.
|
|
81
|
+
"@polkadot/api": "7.9.1",
|
|
79
82
|
"@polkadot/keyring": "8.4.1",
|
|
80
83
|
"@polkadot/networks": "8.4.1",
|
|
81
|
-
"@polkadot/types": "7.
|
|
82
|
-
"@polkadot/types-known": "7.
|
|
84
|
+
"@polkadot/types": "7.9.1",
|
|
85
|
+
"@polkadot/types-known": "7.9.1",
|
|
83
86
|
"@polkadot/util": "8.4.1",
|
|
84
87
|
"@polkadot/util-crypto": "8.4.1",
|
|
85
88
|
"@polkadot/wasm-crypto": "4.5.1",
|