@substrate/api-sidecar 19.1.0 → 19.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +29 -22
- package/build/package.json +8 -7
- package/build/src/SidecarConfig.js +9 -1
- package/build/src/SidecarConfig.js.map +1 -1
- package/build/src/Specs.d.ts +1 -0
- package/build/src/Specs.js +34 -1
- package/build/src/Specs.js.map +1 -1
- package/build/src/controllers/AbstractController.js.map +1 -1
- package/build/src/controllers/blocks/BlocksController.d.ts +2 -0
- package/build/src/controllers/blocks/BlocksController.js +87 -8
- package/build/src/controllers/blocks/BlocksController.js.map +1 -1
- package/build/src/controllers/blocks/BlocksExtrinsicsController.d.ts +1 -0
- package/build/src/controllers/blocks/BlocksExtrinsicsController.js +13 -2
- package/build/src/controllers/blocks/BlocksExtrinsicsController.js.map +1 -1
- package/build/src/controllers/blocks/BlocksRawExtrinsicsController.js +12 -3
- package/build/src/controllers/blocks/BlocksRawExtrinsicsController.js.map +1 -1
- package/build/src/logging/Log.js +11 -0
- package/build/src/logging/Log.js.map +1 -1
- package/build/src/main.js +5 -5
- package/build/src/main.js.map +1 -1
- package/build/src/{util/metrics.d.ts → metrics/Metrics.d.ts} +3 -8
- package/build/src/{util/metrics.js → metrics/Metrics.js} +20 -139
- package/build/src/metrics/Metrics.js.map +1 -0
- package/build/src/metrics/config.d.ts +2 -0
- package/build/src/metrics/config.js +71 -0
- package/build/src/metrics/config.js.map +1 -0
- package/build/src/metrics/index.d.ts +2 -0
- package/build/src/metrics/index.js +33 -0
- package/build/src/metrics/index.js.map +1 -0
- package/build/src/parseArgs.js +0 -13
- package/build/src/parseArgs.js.map +1 -1
- package/build/src/services/accounts/AccountsAssetsService.js +1 -2
- package/build/src/services/accounts/AccountsAssetsService.js.map +1 -1
- package/build/src/services/accounts/AccountsPoolAssetsService.js +1 -2
- package/build/src/services/accounts/AccountsPoolAssetsService.js.map +1 -1
- package/build/src/services/accounts/AccountsStakingPayoutsService.js +4 -2
- package/build/src/services/accounts/AccountsStakingPayoutsService.js.map +1 -1
- package/build/src/services/blocks/BlocksService.d.ts +1 -3
- package/build/src/services/blocks/BlocksService.js +16 -26
- package/build/src/services/blocks/BlocksService.js.map +1 -1
- package/build/src/services/blocks/BlocksService.spec.js +6 -67
- package/build/src/services/blocks/BlocksService.spec.js.map +1 -1
- package/build/src/services/pallets/PalletsStakingProgressService.js +3 -3
- package/build/src/services/pallets/PalletsStakingProgressService.js.map +1 -1
- package/build/src/types/metrics/index.d.ts +13 -0
- package/build/src/types/metrics/index.js +3 -0
- package/build/src/types/metrics/index.js.map +1 -0
- package/build/src/types/requests.d.ts +17 -0
- package/build/src/types/sidecar-config/CONFIG.d.ts +7 -1
- package/build/src/types/sidecar-config/CONFIG.js +6 -0
- package/build/src/types/sidecar-config/CONFIG.js.map +1 -1
- package/build/src/types/sidecar-config/MODULES.d.ts +2 -1
- package/build/src/types/sidecar-config/MODULES.js +1 -0
- package/build/src/types/sidecar-config/MODULES.js.map +1 -1
- package/build/src/types/sidecar-config/SidecarConfig.d.ts +9 -0
- package/package.json +8 -7
- package/build/src/util/metrics.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PalletsStakingProgressService.js","sourceRoot":"","sources":["../../../../src/services/pallets/PalletsStakingProgressService.ts"],"names":[],"mappings":";AAAA,oDAAoD;AACpD,8CAA8C;AAC9C,EAAE;AACF,gFAAgF;AAChF,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,kEAAkE;AAClE,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,oEAAoE;AACpE,wEAAwE;;;;;;AAKxE,kDAAuB;AACvB,6CAAkD;AAGlD,wDAAqD;AAErD,MAAa,6BAA8B,SAAQ,iCAAe;IACjE;;;;OAIG;IACH,KAAK,CAAC,2BAA2B,CAAC,IAAe;;QAChD,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC;QACrB,MAAM,WAAW,GAAG,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;QAEvC,MAAM,CAAC,cAAc,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,MAAM,EAAE,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC5E,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,cAAc,EAAE;YAC1C,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE;YACpC,WAAW,CAAC,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE;YACtC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC;SAC7B,CAAC,CAAC;QAEH,IAAI,
|
|
1
|
+
{"version":3,"file":"PalletsStakingProgressService.js","sourceRoot":"","sources":["../../../../src/services/pallets/PalletsStakingProgressService.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
export interface IMetric {
|
|
2
|
+
name: string;
|
|
3
|
+
help: string;
|
|
4
|
+
type: MetricType;
|
|
5
|
+
buckets?: number[];
|
|
6
|
+
labels?: string[];
|
|
7
|
+
}
|
|
8
|
+
export declare const enum MetricType {
|
|
9
|
+
Counter = "counter",
|
|
10
|
+
Gauge = "gauge",
|
|
11
|
+
Histogram = "histogram",
|
|
12
|
+
Summary = "summary"
|
|
13
|
+
}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/types/metrics/index.ts"],"names":[],"mappings":""}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { RequestHandler } from 'express';
|
|
2
2
|
import { ParamsDictionary, Query } from 'express-serve-static-core';
|
|
3
|
+
import type client from 'prom-client';
|
|
3
4
|
/**
|
|
4
5
|
* Body for RequestHandlerTx. In other words, the body of a POST route that sends an encoded transaction.
|
|
5
6
|
*/
|
|
@@ -64,3 +65,19 @@ export interface IConvertQueryParams extends Query {
|
|
|
64
65
|
prefix: string;
|
|
65
66
|
publicKey: string;
|
|
66
67
|
}
|
|
68
|
+
export interface IMetrics {
|
|
69
|
+
metrics?: {
|
|
70
|
+
registry: Record<string, client.Metric>;
|
|
71
|
+
timer: () => number;
|
|
72
|
+
};
|
|
73
|
+
}
|
|
74
|
+
export interface IBlockQueryParams extends Query {
|
|
75
|
+
finalized?: string;
|
|
76
|
+
eventDocs?: string;
|
|
77
|
+
extrinsicDocs?: string;
|
|
78
|
+
noFees?: string;
|
|
79
|
+
decodedXcmMsgs?: string;
|
|
80
|
+
paraId?: string;
|
|
81
|
+
}
|
|
82
|
+
export interface IRequestHandlerWithMetrics<T = unknown, P = unknown> extends RequestHandler<T, unknown, unknown, P, IMetrics> {
|
|
83
|
+
}
|
|
@@ -17,5 +17,11 @@ export declare enum CONFIG {
|
|
|
17
17
|
WRITE = "WRITE",
|
|
18
18
|
WRITE_PATH = "WRITE_PATH",
|
|
19
19
|
WRITE_MAX_FILE_SIZE = "WRITE_MAX_FILE_SIZE",
|
|
20
|
-
WRITE_MAX_FILES = "WRITE_MAX_FILES"
|
|
20
|
+
WRITE_MAX_FILES = "WRITE_MAX_FILES",
|
|
21
|
+
ENABLED = "ENABLED",
|
|
22
|
+
LOKI_HOST = "LOKI_HOST",
|
|
23
|
+
PROM_PORT = "PROM_PORT",
|
|
24
|
+
PROM_HOST = "PROM_HOST",
|
|
25
|
+
LOKI_PORT = "LOKI_PORT",
|
|
26
|
+
INCLUDE_QUERYPARAMS = "INCLUDE_QUERYPARAMS"
|
|
21
27
|
}
|
|
@@ -37,5 +37,11 @@ var CONFIG;
|
|
|
37
37
|
CONFIG["WRITE_PATH"] = "WRITE_PATH";
|
|
38
38
|
CONFIG["WRITE_MAX_FILE_SIZE"] = "WRITE_MAX_FILE_SIZE";
|
|
39
39
|
CONFIG["WRITE_MAX_FILES"] = "WRITE_MAX_FILES";
|
|
40
|
+
CONFIG["ENABLED"] = "ENABLED";
|
|
41
|
+
CONFIG["LOKI_HOST"] = "LOKI_HOST";
|
|
42
|
+
CONFIG["PROM_PORT"] = "PROM_PORT";
|
|
43
|
+
CONFIG["PROM_HOST"] = "PROM_HOST";
|
|
44
|
+
CONFIG["LOKI_PORT"] = "LOKI_PORT";
|
|
45
|
+
CONFIG["INCLUDE_QUERYPARAMS"] = "INCLUDE_QUERYPARAMS";
|
|
40
46
|
})(CONFIG || (exports.CONFIG = CONFIG = {}));
|
|
41
47
|
//# sourceMappingURL=CONFIG.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CONFIG.js","sourceRoot":"","sources":["../../../../src/types/sidecar-config/CONFIG.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;;GAEG;AACH,IAAY,
|
|
1
|
+
{"version":3,"file":"CONFIG.js","sourceRoot":"","sources":["../../../../src/types/sidecar-config/CONFIG.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;;GAEG;AACH,IAAY,MAuBX;AAvBD,WAAY,MAAM;IACjB,iCAAuB,CAAA;IACvB,uBAAa,CAAA;IACb,mDAAyC,CAAA;IACzC,qBAAW,CAAA;IACX,yBAAe,CAAA;IACf,uBAAa,CAAA;IACb,mCAAyB,CAAA;IACzB,mCAAyB,CAAA;IACzB,uCAA6B,CAAA;IAC7B,qCAA2B,CAAA;IAC3B,mCAAyB,CAAA;IACzB,yBAAe,CAAA;IACf,yBAAe,CAAA;IACf,mCAAyB,CAAA;IACzB,qDAA2C,CAAA;IAC3C,6CAAmC,CAAA;IACnC,6BAAmB,CAAA;IACnB,iCAAuB,CAAA;IACvB,iCAAuB,CAAA;IACvB,iCAAuB,CAAA;IACvB,iCAAuB,CAAA;IACvB,qDAA2C,CAAA;AAC5C,CAAC,EAvBW,MAAM,sBAAN,MAAM,QAuBjB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MODULES.js","sourceRoot":"","sources":["../../../../src/types/sidecar-config/MODULES.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;;GAEG;AACH,IAAY,
|
|
1
|
+
{"version":3,"file":"MODULES.js","sourceRoot":"","sources":["../../../../src/types/sidecar-config/MODULES.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;;GAEG;AACH,IAAY,OAKX;AALD,WAAY,OAAO;IAClB,8BAAmB,CAAA;IACnB,kCAAuB,CAAA;IACvB,sBAAW,CAAA;IACX,8BAAmB,CAAA;AACpB,CAAC,EALW,OAAO,uBAAP,OAAO,QAKlB"}
|
|
@@ -5,6 +5,7 @@ export interface ISidecarConfig {
|
|
|
5
5
|
EXPRESS: ISidecarConfigExpress;
|
|
6
6
|
SUBSTRATE: ISidecarConfigSubstrate;
|
|
7
7
|
LOG: ISidecarConfigLog;
|
|
8
|
+
METRICS: ISidecarConfigMetrics;
|
|
8
9
|
}
|
|
9
10
|
interface ISidecarConfigSubstrate {
|
|
10
11
|
URL: string;
|
|
@@ -28,4 +29,12 @@ interface ISidecarConfigLog {
|
|
|
28
29
|
WRITE_MAX_FILE_SIZE: number;
|
|
29
30
|
WRITE_MAX_FILES: number;
|
|
30
31
|
}
|
|
32
|
+
interface ISidecarConfigMetrics {
|
|
33
|
+
ENABLED: boolean;
|
|
34
|
+
PROM_HOST: string;
|
|
35
|
+
PROM_PORT: number;
|
|
36
|
+
LOKI_HOST: string;
|
|
37
|
+
LOKI_PORT: number;
|
|
38
|
+
INCLUDE_QUERYPARAMS: boolean;
|
|
39
|
+
}
|
|
31
40
|
export {};
|
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "19.
|
|
2
|
+
"version": "19.2.0",
|
|
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",
|
|
@@ -50,19 +50,20 @@
|
|
|
50
50
|
"test:test-release": "yarn build:scripts && node scripts/build/runYarnPack.js"
|
|
51
51
|
},
|
|
52
52
|
"dependencies": {
|
|
53
|
-
"@polkadot/api": "^
|
|
54
|
-
"@polkadot/api-contract": "^
|
|
55
|
-
"@polkadot/util-crypto": "^13.
|
|
53
|
+
"@polkadot/api": "^13.2.1",
|
|
54
|
+
"@polkadot/api-contract": "^13.2.1",
|
|
55
|
+
"@polkadot/util-crypto": "^13.1.1",
|
|
56
56
|
"@substrate/calc": "^0.3.1",
|
|
57
57
|
"argparse": "^2.0.1",
|
|
58
58
|
"confmgr": "^1.1.0",
|
|
59
|
-
"express": "^4.
|
|
59
|
+
"express": "^4.21.0",
|
|
60
60
|
"express-winston": "^4.2.0",
|
|
61
61
|
"http-errors": "^2.0.0",
|
|
62
|
-
"lru-cache": "^
|
|
62
|
+
"lru-cache": "^11.0.1",
|
|
63
63
|
"prom-client": "^15.1.3",
|
|
64
64
|
"rxjs": "^7.8.1",
|
|
65
|
-
"winston": "^3.14.
|
|
65
|
+
"winston": "^3.14.2",
|
|
66
|
+
"winston-loki": "^6.1.2"
|
|
66
67
|
},
|
|
67
68
|
"devDependencies": {
|
|
68
69
|
"@substrate/dev": "^0.7.1",
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"metrics.js","sourceRoot":"","sources":["../../../src/util/metrics.ts"],"names":[],"mappings":"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"}
|