@substrate/api-sidecar 12.2.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.
- package/README.md +0 -5
- package/build/package.json +15 -16
- package/build/src/controllers/blocks/BlocksController.js +9 -3
- package/build/src/controllers/blocks/BlocksController.js.map +1 -1
- package/build/src/controllers/blocks/BlocksExtrinsicsController.js +3 -1
- package/build/src/controllers/blocks/BlocksExtrinsicsController.js.map +1 -1
- package/build/src/controllers/pallets/PalletsStorageController.js +1 -1
- package/build/src/controllers/pallets/PalletsStorageController.js.map +1 -1
- package/build/src/logging/transformers/filterApiRpc.js.map +1 -1
- package/build/src/logging/transformers/stripTimestamp.js.map +1 -1
- package/build/src/logging/transports/consoleTransport.js +1 -1
- package/build/src/logging/transports/consoleTransport.js.map +1 -1
- package/build/src/services/accounts/AccountsValidateService.d.ts +5 -2
- package/build/src/services/accounts/AccountsValidateService.js +27 -7
- package/build/src/services/accounts/AccountsValidateService.js.map +1 -1
- package/build/src/services/accounts/AccountsValidateService.spec.js +20 -1
- package/build/src/services/accounts/AccountsValidateService.spec.js.map +1 -1
- package/build/src/services/blocks/BlocksService.d.ts +49 -1
- package/build/src/services/blocks/BlocksService.js +147 -2
- package/build/src/services/blocks/BlocksService.js.map +1 -1
- package/build/src/services/blocks/BlocksService.spec.js +69 -1
- package/build/src/services/blocks/BlocksService.spec.js.map +1 -1
- package/build/src/services/pallets/PalletsStorageService.js +3 -1
- package/build/src/services/pallets/PalletsStorageService.js.map +1 -1
- package/build/src/types/logging/Transformers.d.ts +10 -0
- package/build/src/types/logging/Transformers.js +18 -0
- package/build/src/types/logging/Transformers.js.map +1 -0
- package/build/src/types/logging/index.d.ts +1 -0
- package/build/src/types/logging/index.js +29 -0
- package/build/src/types/logging/index.js.map +1 -0
- package/build/src/types/responses/ValidateAddress.d.ts +2 -0
- package/build/src/util/integers/compare.d.ts +5 -0
- package/build/src/util/integers/compare.js +11 -0
- package/build/src/util/integers/compare.js.map +1 -0
- package/build/src/util/integers/compare.spec.d.ts +1 -0
- package/build/src/util/integers/compare.spec.js +18 -0
- package/build/src/util/integers/compare.spec.js.map +1 -0
- package/package.json +15 -16
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.
|
|
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",
|
|
@@ -36,7 +36,6 @@
|
|
|
36
36
|
"dev": "tsc-watch --onSuccess \"yarn run main\"",
|
|
37
37
|
"test": "NODE_ENV=test substrate-exec-jest --detectOpenHandles",
|
|
38
38
|
"test:watch": "NODE_ENV=test substrate-exec-jest --watch",
|
|
39
|
-
"test:cov": "NODE_ENV=test substrate-exec-jest --detectOpenHandles --coverage",
|
|
40
39
|
"lint:e2e-tests": "cd e2e-tests && substrate-dev-run-lint",
|
|
41
40
|
"build:e2e-tests": "substrate-exec-tsc --project e2e-tests/tsconfig.json",
|
|
42
41
|
"test:e2e-tests": "yarn build:e2e-tests && node ./e2e-tests/build/index.js --config=./e2e-tests/jest.config.js",
|
|
@@ -54,28 +53,28 @@
|
|
|
54
53
|
"update-pjs-deps": "substrate-update-pjs-deps && yarn"
|
|
55
54
|
},
|
|
56
55
|
"dependencies": {
|
|
57
|
-
"@polkadot/api": "^8.
|
|
58
|
-
"@polkadot/util-crypto": "^
|
|
56
|
+
"@polkadot/api": "^8.14.1",
|
|
57
|
+
"@polkadot/util-crypto": "^10.1.1",
|
|
59
58
|
"@substrate/calc": "^0.2.8",
|
|
60
59
|
"argparse": "^2.0.1",
|
|
61
|
-
"confmgr": "1.0.
|
|
62
|
-
"express": "^4.
|
|
63
|
-
"express-winston": "^4.
|
|
64
|
-
"http-errors": "^
|
|
65
|
-
"lru-cache": "^
|
|
66
|
-
"rxjs": "^7.5.
|
|
67
|
-
"winston": "^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"
|
|
68
67
|
},
|
|
69
68
|
"devDependencies": {
|
|
70
|
-
"@substrate/dev": "^0.6.
|
|
69
|
+
"@substrate/dev": "^0.6.3",
|
|
71
70
|
"@types/argparse": "2.0.10",
|
|
72
71
|
"@types/express": "4.17.13",
|
|
73
|
-
"@types/express-serve-static-core": "4.17.
|
|
74
|
-
"@types/http-errors": "1.8.
|
|
75
|
-
"@types/lru-cache": "^
|
|
72
|
+
"@types/express-serve-static-core": "4.17.30",
|
|
73
|
+
"@types/http-errors": "1.8.2",
|
|
74
|
+
"@types/lru-cache": "^7.10.10",
|
|
76
75
|
"@types/morgan": "1.9.3",
|
|
77
76
|
"@types/triple-beam": "^1.3.2",
|
|
78
|
-
"tsc-watch": "^4.
|
|
77
|
+
"tsc-watch": "^4.6.2"
|
|
79
78
|
},
|
|
80
79
|
"resolutions": {
|
|
81
80
|
"node-fetch": "2.6.7",
|
|
@@ -92,9 +92,10 @@ class BlocksController extends AbstractController_1.default {
|
|
|
92
92
|
* @param _req Express Request
|
|
93
93
|
* @param res Express Response
|
|
94
94
|
*/
|
|
95
|
-
this.getLatestBlock = async ({ query: { eventDocs, extrinsicDocs, finalized } }, res) => {
|
|
95
|
+
this.getLatestBlock = async ({ query: { eventDocs, extrinsicDocs, finalized, feeByEvent } }, res) => {
|
|
96
96
|
const eventDocsArg = eventDocs === 'true';
|
|
97
97
|
const extrinsicDocsArg = extrinsicDocs === 'true';
|
|
98
|
+
const getFeeByEvent = feeByEvent === 'true';
|
|
98
99
|
let hash, queryFinalizedHead, omitFinalizedTag;
|
|
99
100
|
if (!this.options.finalizes) {
|
|
100
101
|
// If the network chain doesn't finalize blocks, we dont want a finalized tag.
|
|
@@ -121,6 +122,7 @@ class BlocksController extends AbstractController_1.default {
|
|
|
121
122
|
checkFinalized: false,
|
|
122
123
|
queryFinalizedHead,
|
|
123
124
|
omitFinalizedTag,
|
|
125
|
+
getFeeByEvent,
|
|
124
126
|
};
|
|
125
127
|
const historicApi = await this.api.at(hash);
|
|
126
128
|
BlocksController.sanitizedSend(res, await this.service.fetchBlock(hash, historicApi, options));
|
|
@@ -131,11 +133,12 @@ class BlocksController extends AbstractController_1.default {
|
|
|
131
133
|
* @param req Express Request
|
|
132
134
|
* @param res Express Response
|
|
133
135
|
*/
|
|
134
|
-
this.getBlockById = async ({ params: { number }, query: { eventDocs, extrinsicDocs } }, res) => {
|
|
136
|
+
this.getBlockById = async ({ params: { number }, query: { eventDocs, extrinsicDocs, feeByEvent } }, res) => {
|
|
135
137
|
const checkFinalized = (0, util_1.isHex)(number);
|
|
136
138
|
const hash = await this.getHashForBlock(number);
|
|
137
139
|
const eventDocsArg = eventDocs === 'true';
|
|
138
140
|
const extrinsicDocsArg = extrinsicDocs === 'true';
|
|
141
|
+
const getFeeByEvent = feeByEvent === 'true';
|
|
139
142
|
const queryFinalizedHead = !this.options.finalizes ? false : true;
|
|
140
143
|
const omitFinalizedTag = !this.options.finalizes ? true : false;
|
|
141
144
|
const options = {
|
|
@@ -144,6 +147,7 @@ class BlocksController extends AbstractController_1.default {
|
|
|
144
147
|
checkFinalized,
|
|
145
148
|
queryFinalizedHead,
|
|
146
149
|
omitFinalizedTag,
|
|
150
|
+
getFeeByEvent,
|
|
147
151
|
};
|
|
148
152
|
// HistoricApi to fetch any historic information that doesnt include the current runtime
|
|
149
153
|
const historicApi = await this.api.at(hash);
|
|
@@ -179,13 +183,14 @@ class BlocksController extends AbstractController_1.default {
|
|
|
179
183
|
* @param req Express Request
|
|
180
184
|
* @param res Express Response
|
|
181
185
|
*/
|
|
182
|
-
this.getBlocks = async ({ query: { range, eventDocs, extrinsicDocs } }, res) => {
|
|
186
|
+
this.getBlocks = async ({ query: { range, eventDocs, extrinsicDocs, feeByEvent } }, res) => {
|
|
183
187
|
if (!range)
|
|
184
188
|
throw new http_errors_1.BadRequest('range query parameter must be inputted.');
|
|
185
189
|
// We set a max range to 500 blocks.
|
|
186
190
|
const rangeOfNums = this.parseRangeOfNumbersOrThrow(range, 500);
|
|
187
191
|
const eventDocsArg = eventDocs === 'true';
|
|
188
192
|
const extrinsicDocsArg = extrinsicDocs === 'true';
|
|
193
|
+
const getFeeByEvent = feeByEvent === 'true';
|
|
189
194
|
const queryFinalizedHead = !this.options.finalizes ? false : true;
|
|
190
195
|
const omitFinalizedTag = !this.options.finalizes ? true : false;
|
|
191
196
|
const options = {
|
|
@@ -194,6 +199,7 @@ class BlocksController extends AbstractController_1.default {
|
|
|
194
199
|
checkFinalized: false,
|
|
195
200
|
queryFinalizedHead,
|
|
196
201
|
omitFinalizedTag,
|
|
202
|
+
getFeeByEvent,
|
|
197
203
|
};
|
|
198
204
|
const pQueue = new PromiseQueue_1.PromiseQueue(4);
|
|
199
205
|
const blocksPromise = [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BlocksController.js","sourceRoot":"","sources":["../../../../src/controllers/blocks/BlocksController.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,yCAAuC;AAEvC,6CAAyC;AAGzC,6CAA+C;AAG/C,0DAAuD;AACvD,+EAAuD;AAQvD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA0DG;AACH,MAAqB,gBAAiB,SAAQ,4BAAiC;IAC9E,YAAY,GAAe,EAAmB,OAA0B;QACvE,KAAK,CACJ,GAAG,EACH,SAAS,EACT,IAAI,wBAAa,CAAC,GAAG,EAAE,OAAO,CAAC,iBAAiB,EAAE,OAAO,CAAC,UAAU,CAAC,CACrE,CAAC;QAL2C,YAAO,GAAP,OAAO,CAAmB;QAmBxE;;;;;WAKG;QACK,mBAAc,GAAmB,KAAK,EAC7C,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,SAAS,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"BlocksController.js","sourceRoot":"","sources":["../../../../src/controllers/blocks/BlocksController.ts"],"names":[],"mappings":"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"}
|
|
@@ -28,16 +28,18 @@ class BlocksExtrinsicsController extends AbstractController_1.default {
|
|
|
28
28
|
* @param _req Express Request
|
|
29
29
|
* @param res Express Response
|
|
30
30
|
*/
|
|
31
|
-
this.getExtrinsicByTimepoint = async ({ params: { blockId, extrinsicIndex }, query: { eventDocs, extrinsicDocs }, }, res) => {
|
|
31
|
+
this.getExtrinsicByTimepoint = async ({ params: { blockId, extrinsicIndex }, query: { eventDocs, extrinsicDocs, feeByEvent }, }, res) => {
|
|
32
32
|
const hash = await this.getHashForBlock(blockId);
|
|
33
33
|
const eventDocsArg = eventDocs === 'true';
|
|
34
34
|
const extrinsicDocsArg = extrinsicDocs === 'true';
|
|
35
|
+
const getFeeByEvent = feeByEvent === 'true';
|
|
35
36
|
const options = {
|
|
36
37
|
eventDocs: eventDocsArg,
|
|
37
38
|
extrinsicDocs: extrinsicDocsArg,
|
|
38
39
|
checkFinalized: true,
|
|
39
40
|
queryFinalizedHead: false,
|
|
40
41
|
omitFinalizedTag: true,
|
|
42
|
+
getFeeByEvent,
|
|
41
43
|
};
|
|
42
44
|
const historicApi = await this.api.at(hash);
|
|
43
45
|
const block = await this.service.fetchBlock(hash, historicApi, options);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BlocksExtrinsicsController.js","sourceRoot":"","sources":["../../../../src/controllers/blocks/BlocksExtrinsicsController.ts"],"names":[],"mappings":";AAAA,oDAAoD;AACpD,8CAA8C;AAC9C,EAAE;AACF,gFAAgF;AAChF,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,kEAAkE;AAClE,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,oEAAoE;AACpE,wEAAwE;;;;;AAOxE,6CAA+C;AAE/C,+EAAuD;AAOvD,MAAqB,0BAA2B,SAAQ,4BAAiC;IACxF,YAAY,GAAe,EAAE,OAA0B;QACtD,KAAK,CACJ,GAAG,EACH,6BAA6B,EAC7B,IAAI,wBAAa,CAAC,GAAG,EAAE,OAAO,CAAC,iBAAiB,EAAE,OAAO,CAAC,UAAU,CAAC,CACrE,CAAC;QAUH;;;;WAIG;QACK,4BAAuB,GAAiC,KAAK,EACpE,EACC,MAAM,EAAE,EAAE,OAAO,EAAE,cAAc,EAAE,EACnC,KAAK,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"BlocksExtrinsicsController.js","sourceRoot":"","sources":["../../../../src/controllers/blocks/BlocksExtrinsicsController.ts"],"names":[],"mappings":";AAAA,oDAAoD;AACpD,8CAA8C;AAC9C,EAAE;AACF,gFAAgF;AAChF,uEAAuE;AACvE,oEAAoE;AACpE,sCAAsC;AACtC,EAAE;AACF,kEAAkE;AAClE,iEAAiE;AACjE,gEAAgE;AAChE,+CAA+C;AAC/C,EAAE;AACF,oEAAoE;AACpE,wEAAwE;;;;;AAOxE,6CAA+C;AAE/C,+EAAuD;AAOvD,MAAqB,0BAA2B,SAAQ,4BAAiC;IACxF,YAAY,GAAe,EAAE,OAA0B;QACtD,KAAK,CACJ,GAAG,EACH,6BAA6B,EAC7B,IAAI,wBAAa,CAAC,GAAG,EAAE,OAAO,CAAC,iBAAiB,EAAE,OAAO,CAAC,UAAU,CAAC,CACrE,CAAC;QAUH;;;;WAIG;QACK,4BAAuB,GAAiC,KAAK,EACpE,EACC,MAAM,EAAE,EAAE,OAAO,EAAE,cAAc,EAAE,EACnC,KAAK,EAAE,EAAE,SAAS,EAAE,aAAa,EAAE,UAAU,EAAE,GAC/C,EACD,GAAG,EACa,EAAE;YAClB,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC;YAEjD,MAAM,YAAY,GAAG,SAAS,KAAK,MAAM,CAAC;YAC1C,MAAM,gBAAgB,GAAG,aAAa,KAAK,MAAM,CAAC;YAClD,MAAM,aAAa,GAAG,UAAU,KAAK,MAAM,CAAC;YAE5C,MAAM,OAAO,GAAG;gBACf,SAAS,EAAE,YAAY;gBACvB,aAAa,EAAE,gBAAgB;gBAC/B,cAAc,EAAE,IAAI;gBACpB,kBAAkB,EAAE,KAAK;gBACzB,gBAAgB,EAAE,IAAI;gBACtB,aAAa;aACb,CAAC;YAEF,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC;YAE5C,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,CAAC;YAExE;;eAEG;YACH,IAAI,CAAC,kBAAkB,CACtB,cAAc,EACd,8CAA8C,CAC9C,CAAC;YAEF;;;eAGG;YACH,MAAM,KAAK,GAAG,QAAQ,CAAC,cAAc,EAAE,EAAE,CAAC,CAAC;YAE3C,0BAA0B,CAAC,aAAa,CACvC,GAAG,EACH,IAAI,CAAC,OAAO,CAAC,qBAAqB,CAAC,KAAK,EAAE,KAAK,CAAC,CAChD,CAAC;QACH,CAAC,CAAC;QA1DD,IAAI,CAAC,UAAU,EAAE,CAAC;IACnB,CAAC;IAES,UAAU;QACnB,IAAI,CAAC,yBAAyB,CAAC;YAC9B,CAAC,kBAAkB,EAAE,IAAI,CAAC,uBAAuB,CAAC;SAClD,CAAC,CAAC;IACJ,CAAC;CAoDD;AAlED,6CAkEC"}
|
|
@@ -72,7 +72,7 @@ class PalletsStorageController extends AbstractController_1.default {
|
|
|
72
72
|
};
|
|
73
73
|
this.initRoutes();
|
|
74
74
|
this.deprecationMsg =
|
|
75
|
-
'The adjustMetadataV13 query parameter
|
|
75
|
+
'The adjustMetadataV13 query parameter has been deprecated. It will still be available to use for historic blocks.';
|
|
76
76
|
}
|
|
77
77
|
initRoutes() {
|
|
78
78
|
// TODO look into middleware validation of in path IDs. https://github.com/paritytech/substrate-api-sidecar/issues/281
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PalletsStorageController.js","sourceRoot":"","sources":["../../../../src/controllers/pallets/PalletsStorageController.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"PalletsStorageController.js","sourceRoot":"","sources":["../../../../src/controllers/pallets/PalletsStorageController.ts"],"names":[],"mappings":"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"}
|
|
@@ -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;;;
|
|
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"}
|
|
@@ -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;;;
|
|
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"}
|
|
@@ -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 `
|
|
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) {
|
|
@@ -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;;;
|
|
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"}
|
|
@@ -2,8 +2,11 @@ import { IValidateAddrResponse } from '../../types/responses/ValidateAddress';
|
|
|
2
2
|
import { AbstractService } from '../AbstractService';
|
|
3
3
|
export declare class AccountsValidateService extends AbstractService {
|
|
4
4
|
/**
|
|
5
|
-
* Takes a given address and determines whether it is a ss58
|
|
6
|
-
*
|
|
5
|
+
* Takes a given address and determines whether it is a ss58 or
|
|
6
|
+
* a hex (from a u8 array) formatted address,
|
|
7
|
+
* what the ss58 prefix for that address is,
|
|
8
|
+
* what is the network address format,
|
|
9
|
+
* and what the account ID is for this address.
|
|
7
10
|
*
|
|
8
11
|
* @param address ss58 or hex address to validate
|
|
9
12
|
*/
|
|
@@ -22,14 +22,18 @@ const defaults_1 = require("@polkadot/util-crypto/address/defaults");
|
|
|
22
22
|
const AbstractService_1 = require("../AbstractService");
|
|
23
23
|
class AccountsValidateService extends AbstractService_1.AbstractService {
|
|
24
24
|
/**
|
|
25
|
-
* Takes a given address and determines whether it is a ss58
|
|
26
|
-
*
|
|
25
|
+
* Takes a given address and determines whether it is a ss58 or
|
|
26
|
+
* a hex (from a u8 array) formatted address,
|
|
27
|
+
* what the ss58 prefix for that address is,
|
|
28
|
+
* what is the network address format,
|
|
29
|
+
* and what the account ID is for this address.
|
|
27
30
|
*
|
|
28
31
|
* @param address ss58 or hex address to validate
|
|
29
32
|
*/
|
|
30
33
|
validateAddress(address) {
|
|
31
34
|
let u8Address;
|
|
32
|
-
|
|
35
|
+
const addressIsHex = (0, util_1.isHex)(address);
|
|
36
|
+
if (addressIsHex) {
|
|
33
37
|
u8Address = (0, util_1.hexToU8a)(address);
|
|
34
38
|
}
|
|
35
39
|
else {
|
|
@@ -42,14 +46,30 @@ class AccountsValidateService extends AbstractService_1.AbstractService {
|
|
|
42
46
|
}
|
|
43
47
|
if (defaults_1.defaults.allowedEncodedLengths.includes(u8Address.length)) {
|
|
44
48
|
const [isValid, , , ss58Prefix] = (0, util_crypto_1.checkAddressChecksum)(u8Address);
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
+
if (isValid) {
|
|
50
|
+
let network = null;
|
|
51
|
+
for (const networkParams of util_crypto_1.allNetworks) {
|
|
52
|
+
if (networkParams['prefix'] === ss58Prefix) {
|
|
53
|
+
network = networkParams['network'];
|
|
54
|
+
break;
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
const accountId = addressIsHex
|
|
58
|
+
? '0x' + address.slice(4, -4)
|
|
59
|
+
: this.api.registry.createType('AccountId', address).toHex();
|
|
60
|
+
return {
|
|
61
|
+
isValid: isValid,
|
|
62
|
+
ss58Prefix,
|
|
63
|
+
network,
|
|
64
|
+
accountId,
|
|
65
|
+
};
|
|
66
|
+
}
|
|
49
67
|
}
|
|
50
68
|
return {
|
|
51
69
|
isValid: false,
|
|
52
70
|
ss58Prefix: null,
|
|
71
|
+
network: null,
|
|
72
|
+
accountId: null,
|
|
53
73
|
};
|
|
54
74
|
}
|
|
55
75
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AccountsValidateService.js","sourceRoot":"","sources":["../../../../src/services/accounts/AccountsValidateService.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,yCAAiD;AACjD,
|
|
1
|
+
{"version":3,"file":"AccountsValidateService.js","sourceRoot":"","sources":["../../../../src/services/accounts/AccountsValidateService.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,yCAAiD;AACjD,uDAI+B;AAC/B,qEAAkE;AAGlE,wDAAqD;AAErD,MAAa,uBAAwB,SAAQ,iCAAe;IAC3D;;;;;;;;OAQG;IACH,eAAe,CAAC,OAAe;QAC9B,IAAI,SAAS,CAAC;QACd,MAAM,YAAY,GAAG,IAAA,YAAK,EAAC,OAAO,CAAC,CAAC;QACpC,IAAI,YAAY,EAAE;YACjB,SAAS,GAAG,IAAA,eAAQ,EAAC,OAAO,CAAC,CAAC;SAC9B;aAAM;YACN,IAAI;gBACH,SAAS,GAAG,IAAA,0BAAY,EAAC,OAAO,CAAC,CAAC;aAClC;YAAC,OAAO,CAAC,EAAE;gBACX,MAAM,IAAI,KAAK,CAAC,CAAW,CAAC,CAAC;aAC7B;SACD;QAED,IAAI,mBAAQ,CAAC,qBAAqB,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE;YAC9D,MAAM,CAAC,OAAO,EAAE,AAAD,EAAG,AAAD,EAAG,UAAU,CAAC,GAAG,IAAA,kCAAoB,EAAC,SAAS,CAAC,CAAC;YAClE,IAAI,OAAO,EAAE;gBACZ,IAAI,OAAO,GAAG,IAAI,CAAC;gBACnB,KAAK,MAAM,aAAa,IAAI,yBAAW,EAAE;oBACxC,IAAI,aAAa,CAAC,QAAQ,CAAC,KAAK,UAAU,EAAE;wBAC3C,OAAO,GAAG,aAAa,CAAC,SAAS,CAAC,CAAC;wBACnC,MAAM;qBACN;iBACD;gBACD,MAAM,SAAS,GAAG,YAAY;oBAC7B,CAAC,CAAC,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;oBAC7B,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC;gBAC9D,OAAO;oBACN,OAAO,EAAE,OAAO;oBAChB,UAAU;oBACV,OAAO;oBACP,SAAS;iBACT,CAAC;aACF;SACD;QAED,OAAO;YACN,OAAO,EAAE,KAAK;YACd,UAAU,EAAE,IAAI;YAChB,OAAO,EAAE,IAAI;YACb,SAAS,EAAE,IAAI;SACf,CAAC;IACH,CAAC;CACD;AApDD,0DAoDC"}
|
|
@@ -16,14 +16,19 @@
|
|
|
16
16
|
// along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
18
|
const sanitize_1 = require("../../sanitize");
|
|
19
|
+
const mock_1 = require("../test-helpers/mock");
|
|
19
20
|
const AccountsValidateService_1 = require("./AccountsValidateService");
|
|
20
|
-
const mockApi = {
|
|
21
|
+
const mockApi = {
|
|
22
|
+
...mock_1.defaultMockApi,
|
|
23
|
+
};
|
|
21
24
|
const validateService = new AccountsValidateService_1.AccountsValidateService(mockApi);
|
|
22
25
|
describe('Validate addresses', () => {
|
|
23
26
|
it('Should verify a polkadot address', () => {
|
|
24
27
|
const expectedResponse = {
|
|
25
28
|
isValid: true,
|
|
26
29
|
ss58Prefix: '0',
|
|
30
|
+
network: 'polkadot',
|
|
31
|
+
accountId: '0x2a39366f6620a6c2e2fed5990a3d419e6a19dd127fc7a50b515cf17e2dc5cc59',
|
|
27
32
|
};
|
|
28
33
|
const polkadotAddr = '1xN1Q5eKQmS5AzASdjt6R6sHF76611vKR4PFpFjy1kXau4m';
|
|
29
34
|
expect((0, sanitize_1.sanitizeNumbers)(validateService.validateAddress(polkadotAddr))).toStrictEqual(expectedResponse);
|
|
@@ -32,6 +37,8 @@ describe('Validate addresses', () => {
|
|
|
32
37
|
const expectedResponse = {
|
|
33
38
|
isValid: true,
|
|
34
39
|
ss58Prefix: '2',
|
|
40
|
+
network: 'kusama',
|
|
41
|
+
accountId: '0x2a39366f6620a6c2e2fed5990a3d419e6a19dd127fc7a50b515cf17e2dc5cc59',
|
|
35
42
|
};
|
|
36
43
|
const kusamaAddr = 'DXgXPAT5zWtPHo6FhVvrDdiaDPgCNGxhJAeVBYLtiwW9hAc';
|
|
37
44
|
expect((0, sanitize_1.sanitizeNumbers)(validateService.validateAddress(kusamaAddr))).toStrictEqual(expectedResponse);
|
|
@@ -40,6 +47,8 @@ describe('Validate addresses', () => {
|
|
|
40
47
|
const expectedResponse = {
|
|
41
48
|
isValid: true,
|
|
42
49
|
ss58Prefix: '16',
|
|
50
|
+
network: 'kulupu',
|
|
51
|
+
accountId: '0x2a39366f6620a6c2e2fed5990a3d419e6a19dd127fc7a50b515cf17e2dc5cc59',
|
|
43
52
|
};
|
|
44
53
|
const kulupuAddr = '2cYv9Gk6U4m4a7Taw9pG8qMfd1Pnxw6FLTvV6kYZNhGL6M9y';
|
|
45
54
|
expect((0, sanitize_1.sanitizeNumbers)(validateService.validateAddress(kulupuAddr))).toStrictEqual(expectedResponse);
|
|
@@ -48,6 +57,8 @@ describe('Validate addresses', () => {
|
|
|
48
57
|
const expectedResponse = {
|
|
49
58
|
isValid: true,
|
|
50
59
|
ss58Prefix: '42',
|
|
60
|
+
network: 'substrate',
|
|
61
|
+
accountId: '0x78b39b0b6dd87cb68009eb570511d21c229bdb5e94129ae570e9b79442ba2665',
|
|
51
62
|
};
|
|
52
63
|
const substrateAddr = '5EnxxUmEbw8DkENKiYuZ1DwQuMoB2UWEQJZZXrTsxoz7SpgG';
|
|
53
64
|
expect((0, sanitize_1.sanitizeNumbers)(validateService.validateAddress(substrateAddr))).toStrictEqual(expectedResponse);
|
|
@@ -56,6 +67,8 @@ describe('Validate addresses', () => {
|
|
|
56
67
|
const expectedResponse = {
|
|
57
68
|
isValid: true,
|
|
58
69
|
ss58Prefix: '0',
|
|
70
|
+
network: 'polkadot',
|
|
71
|
+
accountId: '0x2a39366f6620a6c2e2fed5990a3d419e6a19dd127fc7a50b515cf17e2dc5cc59',
|
|
59
72
|
};
|
|
60
73
|
const polkadotHex = '0x002a39366f6620a6c2e2fed5990a3d419e6a19dd127fc7a50b515cf17e2dc5cc592312';
|
|
61
74
|
expect((0, sanitize_1.sanitizeNumbers)(validateService.validateAddress(polkadotHex))).toStrictEqual(expectedResponse);
|
|
@@ -64,6 +77,8 @@ describe('Validate addresses', () => {
|
|
|
64
77
|
const expectedResponse = {
|
|
65
78
|
isValid: true,
|
|
66
79
|
ss58Prefix: '2',
|
|
80
|
+
network: 'kusama',
|
|
81
|
+
accountId: '0xce046d43fc4c0fb8b3b754028515e5020f5f1d8d620b4ef0f983c5df34b19529',
|
|
67
82
|
};
|
|
68
83
|
const kusamaHex = '0x02ce046d43fc4c0fb8b3b754028515e5020f5f1d8d620b4ef0f983c5df34b1952909e9';
|
|
69
84
|
expect((0, sanitize_1.sanitizeNumbers)(validateService.validateAddress(kusamaHex))).toStrictEqual(expectedResponse);
|
|
@@ -72,6 +87,8 @@ describe('Validate addresses', () => {
|
|
|
72
87
|
const expectedResponse = {
|
|
73
88
|
isValid: true,
|
|
74
89
|
ss58Prefix: '8',
|
|
90
|
+
network: 'karura',
|
|
91
|
+
accountId: '0x6d6f646c6163612f636470740000000000000000000000000000000000000000',
|
|
75
92
|
};
|
|
76
93
|
const karuraHex = '0x086d6f646c6163612f6364707400000000000000000000000000000000000000008333';
|
|
77
94
|
expect((0, sanitize_1.sanitizeNumbers)(validateService.validateAddress(karuraHex))).toStrictEqual(expectedResponse);
|
|
@@ -80,6 +97,8 @@ describe('Validate addresses', () => {
|
|
|
80
97
|
const expectedResponse = {
|
|
81
98
|
isValid: false,
|
|
82
99
|
ss58Prefix: null,
|
|
100
|
+
network: null,
|
|
101
|
+
accountId: null,
|
|
83
102
|
};
|
|
84
103
|
const invalidAddr = '0x2a39366f6620a6c2e2fed5990a3d419e6a19dd127fc7a50b515cf17e2dc5cc59';
|
|
85
104
|
expect((0, sanitize_1.sanitizeNumbers)(validateService.validateAddress(invalidAddr))).toStrictEqual(expectedResponse);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AccountsValidateService.spec.js","sourceRoot":"","sources":["../../../../src/services/accounts/AccountsValidateService.spec.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;;AAIxE,6CAAiD;AACjD,uEAAoE;AAEpE,MAAM,OAAO,GAAG,
|
|
1
|
+
{"version":3,"file":"AccountsValidateService.spec.js","sourceRoot":"","sources":["../../../../src/services/accounts/AccountsValidateService.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,7 @@ interface FetchBlockOptions {
|
|
|
19
19
|
checkFinalized: boolean;
|
|
20
20
|
queryFinalizedHead: boolean;
|
|
21
21
|
omitFinalizedTag: boolean;
|
|
22
|
+
getFeeByEvent: boolean;
|
|
22
23
|
}
|
|
23
24
|
export declare class BlocksService extends AbstractService {
|
|
24
25
|
private minCalcFeeRuntime;
|
|
@@ -30,7 +31,7 @@ export declare class BlocksService extends AbstractService {
|
|
|
30
31
|
* @param hash `BlockHash` of the block to fetch.
|
|
31
32
|
* @param FetchBlockOptions options for additonal information.
|
|
32
33
|
*/
|
|
33
|
-
fetchBlock(hash: BlockHash, historicApi: ApiDecoration<'promise'>, { eventDocs, extrinsicDocs, checkFinalized, queryFinalizedHead, omitFinalizedTag, }: FetchBlockOptions): Promise<IBlock>;
|
|
34
|
+
fetchBlock(hash: BlockHash, historicApi: ApiDecoration<'promise'>, { eventDocs, extrinsicDocs, checkFinalized, queryFinalizedHead, omitFinalizedTag, getFeeByEvent, }: FetchBlockOptions): Promise<IBlock>;
|
|
34
35
|
/**
|
|
35
36
|
* Return the header of a block
|
|
36
37
|
*
|
|
@@ -67,6 +68,53 @@ export declare class BlocksService extends AbstractService {
|
|
|
67
68
|
* @param historicApi ApiDecoration to use for the query
|
|
68
69
|
*/
|
|
69
70
|
private fetchEvents;
|
|
71
|
+
/**
|
|
72
|
+
* This will check whether we should query the fee by `payment::queryInfo`
|
|
73
|
+
* or by an extrinsics events.
|
|
74
|
+
*
|
|
75
|
+
* @param events The events to search through for a partialFee
|
|
76
|
+
* @param extrinsicHex Hex of the given extrinsic
|
|
77
|
+
* @param hash Blockhash we are querying
|
|
78
|
+
* @param getFeeByEvent `FeeByEvent` query parameter
|
|
79
|
+
*/
|
|
80
|
+
private getPartialFeeInfo;
|
|
81
|
+
/**
|
|
82
|
+
* This searches through an extrinsics given events to see if there is a partialFee
|
|
83
|
+
* within the data. If the estimated partialFee is within a given difference of the
|
|
84
|
+
* found fee within the data than we return that result.
|
|
85
|
+
*
|
|
86
|
+
* The order of the events we search through are:
|
|
87
|
+
* 1.Balances::Event::Withdraw
|
|
88
|
+
* 2.Treasury::Event::Deposit
|
|
89
|
+
* 3.Balances::Event::Deposit
|
|
90
|
+
*
|
|
91
|
+
* @param events The events to search through for a partialFee
|
|
92
|
+
* @param partialFee Estimated partialFee given by `payment::queryInfo`
|
|
93
|
+
*/
|
|
94
|
+
private getPartialFeeByEvents;
|
|
95
|
+
/**
|
|
96
|
+
* Find the corresponding events relevant to the passed in pallet, and method name.
|
|
97
|
+
*
|
|
98
|
+
* @param events The events to search through for a partialFee
|
|
99
|
+
* @param palletName Pallet to search for
|
|
100
|
+
* @param methodName Method to search for
|
|
101
|
+
*/
|
|
102
|
+
private findEvent;
|
|
103
|
+
/**
|
|
104
|
+
* Sanitize a given fee
|
|
105
|
+
*
|
|
106
|
+
* @param fee
|
|
107
|
+
*/
|
|
108
|
+
private sanitizeFee;
|
|
109
|
+
/**
|
|
110
|
+
* Checks to see if the value in an event is within 00.00001% accuracy of
|
|
111
|
+
* the queried `partialFee` from `rpc::payment::queryInfo`.
|
|
112
|
+
*
|
|
113
|
+
* @param eventBalance Balance returned in the data of an event
|
|
114
|
+
* @param partialFee Fee queried from `rpc::payment::queryInfo`
|
|
115
|
+
* @param diff difference between the
|
|
116
|
+
*/
|
|
117
|
+
private areFeesSimilar;
|
|
70
118
|
/**
|
|
71
119
|
* Checks to see if the current chain has the session module, then retrieve all
|
|
72
120
|
* validators.
|