@substrate/api-sidecar 14.0.0 → 14.1.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/build/package.json +6 -6
- package/build/src/chains-config/statemineControllers.js +1 -0
- package/build/src/chains-config/statemineControllers.js.map +1 -1
- package/build/src/chains-config/statemintControllers.js +1 -0
- package/build/src/chains-config/statemintControllers.js.map +1 -1
- package/build/src/services/accounts/AccountsStakingPayoutsService.js +14 -4
- package/build/src/services/accounts/AccountsStakingPayoutsService.js.map +1 -1
- package/build/src/services/accounts/AccountsStakingPayoutsService.spec.js +6 -4
- package/build/src/services/accounts/AccountsStakingPayoutsService.spec.js.map +1 -1
- package/build/src/services/node/NodeTransactionPoolService.js +7 -4
- package/build/src/services/node/NodeTransactionPoolService.js.map +1 -1
- package/build/src/services/node/NodeTransactionPoolService.spec.js +4 -4
- package/package.json +6 -6
- package/build/src/controllers/pallets/PalletsNominationPoolsController.d.ts +0 -0
- package/build/src/controllers/pallets/PalletsNominationPoolsController.js +0 -2
- package/build/src/controllers/pallets/PalletsNominationPoolsController.js.map +0 -1
package/build/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "14.
|
|
2
|
+
"version": "14.1.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",
|
|
@@ -53,8 +53,8 @@
|
|
|
53
53
|
"update-pjs-deps": "substrate-update-pjs-deps && yarn"
|
|
54
54
|
},
|
|
55
55
|
"dependencies": {
|
|
56
|
-
"@polkadot/api": "^9.
|
|
57
|
-
"@polkadot/util-crypto": "^10.1.
|
|
56
|
+
"@polkadot/api": "^9.6.2",
|
|
57
|
+
"@polkadot/util-crypto": "^10.1.11",
|
|
58
58
|
"@substrate/calc": "^0.3.0",
|
|
59
59
|
"argparse": "^2.0.1",
|
|
60
60
|
"confmgr": "1.0.9",
|
|
@@ -68,8 +68,8 @@
|
|
|
68
68
|
"devDependencies": {
|
|
69
69
|
"@substrate/dev": "^0.6.4",
|
|
70
70
|
"@types/argparse": "2.0.10",
|
|
71
|
-
"@types/express": "4.17.
|
|
72
|
-
"@types/express-serve-static-core": "4.17.
|
|
71
|
+
"@types/express": "4.17.14",
|
|
72
|
+
"@types/express-serve-static-core": "4.17.31",
|
|
73
73
|
"@types/http-errors": "1.8.2",
|
|
74
74
|
"@types/lru-cache": "^7.10.10",
|
|
75
75
|
"@types/morgan": "1.9.3",
|
|
@@ -86,5 +86,5 @@
|
|
|
86
86
|
"polkadot",
|
|
87
87
|
"kusama"
|
|
88
88
|
],
|
|
89
|
-
"packageManager": "yarn@3.2.
|
|
89
|
+
"packageManager": "yarn@3.2.4"
|
|
90
90
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"statemineControllers.js","sourceRoot":"","sources":["../../../src/chains-config/statemineControllers.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,mCAA6D;AAE7D;;GAEG;AACU,QAAA,oBAAoB,GAAqB;IACrD,WAAW,EAAE;QACZ,gBAAgB;QAChB,kBAAkB;QAClB,QAAQ;QACR,kBAAkB;QAClB,aAAa;QACb,qBAAqB;QACrB,aAAa;QACb,eAAe;QACf,aAAa;QACb,iBAAiB;QACjB,aAAa;QACb,mBAAmB;QACnB,wBAAwB;QACxB,qBAAqB;QACrB,mBAAmB;KACnB;IACD,OAAO,EAAE;QACR,SAAS,EAAE,IAAI;QACf,iBAAiB,EAAE,CAAC;QACpB,UAAU,EAAE,IAAA,oBAAY,GAAE;QAC1B,cAAc,EAAE,IAAI,4BAAoB,CAAC,IAAI,EAAE,IAAI,CAAC;KACpD;CACD,CAAC"}
|
|
1
|
+
{"version":3,"file":"statemineControllers.js","sourceRoot":"","sources":["../../../src/chains-config/statemineControllers.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,mCAA6D;AAE7D;;GAEG;AACU,QAAA,oBAAoB,GAAqB;IACrD,WAAW,EAAE;QACZ,gBAAgB;QAChB,qBAAqB;QACrB,kBAAkB;QAClB,QAAQ;QACR,kBAAkB;QAClB,aAAa;QACb,qBAAqB;QACrB,aAAa;QACb,eAAe;QACf,aAAa;QACb,iBAAiB;QACjB,aAAa;QACb,mBAAmB;QACnB,wBAAwB;QACxB,qBAAqB;QACrB,mBAAmB;KACnB;IACD,OAAO,EAAE;QACR,SAAS,EAAE,IAAI;QACf,iBAAiB,EAAE,CAAC;QACpB,UAAU,EAAE,IAAA,oBAAY,GAAE;QAC1B,cAAc,EAAE,IAAI,4BAAoB,CAAC,IAAI,EAAE,IAAI,CAAC;KACpD;CACD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"statemintControllers.js","sourceRoot":"","sources":["../../../src/chains-config/statemintControllers.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,mCAA6D;AAE7D;;GAEG;AACU,QAAA,oBAAoB,GAAqB;IACrD,WAAW,EAAE;QACZ,gBAAgB;QAChB,kBAAkB;QAClB,QAAQ;QACR,kBAAkB;QAClB,aAAa;QACb,qBAAqB;QACrB,aAAa;QACb,eAAe;QACf,aAAa;QACb,iBAAiB;QACjB,aAAa;QACb,mBAAmB;QACnB,wBAAwB;QACxB,qBAAqB;QACrB,mBAAmB;KACnB;IACD,OAAO,EAAE;QACR,SAAS,EAAE,IAAI;QACf,iBAAiB,EAAE,GAAG;QACtB,UAAU,EAAE,IAAA,oBAAY,GAAE;QAC1B,cAAc,EAAE,IAAI,4BAAoB,CAAC,IAAI,EAAE,IAAI,CAAC;KACpD;CACD,CAAC"}
|
|
1
|
+
{"version":3,"file":"statemintControllers.js","sourceRoot":"","sources":["../../../src/chains-config/statemintControllers.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,mCAA6D;AAE7D;;GAEG;AACU,QAAA,oBAAoB,GAAqB;IACrD,WAAW,EAAE;QACZ,gBAAgB;QAChB,qBAAqB;QACrB,kBAAkB;QAClB,QAAQ;QACR,kBAAkB;QAClB,aAAa;QACb,qBAAqB;QACrB,aAAa;QACb,eAAe;QACf,aAAa;QACb,iBAAiB;QACjB,aAAa;QACb,mBAAmB;QACnB,wBAAwB;QACxB,qBAAqB;QACrB,mBAAmB;KACnB;IACD,OAAO,EAAE;QACR,SAAS,EAAE,IAAI;QACf,iBAAiB,EAAE,GAAG;QACtB,UAAU,EAAE,IAAA,oBAAY,GAAE;QAC1B,cAAc,EAAE,IAAI,4BAAoB,CAAC,IAAI,EAAE,IAAI,CAAC;KACpD;CACD,CAAC"}
|
|
@@ -32,10 +32,20 @@ class AccountsStakingPayoutsService extends AbstractService_1.AbstractService {
|
|
|
32
32
|
async fetchAccountStakingPayout(hash, address, depth, era, unclaimedOnly, currentEra) {
|
|
33
33
|
const { api } = this;
|
|
34
34
|
const historicApi = await api.at(hash);
|
|
35
|
-
const
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
35
|
+
const { number } = await api.rpc.chain.getHeader(hash);
|
|
36
|
+
/**
|
|
37
|
+
* Given https://github.com/polkadot-js/api/issues/5232,
|
|
38
|
+
* polkadot-js, and substrate treats historyDepth as a consts. In order
|
|
39
|
+
* to maintain historical integrity we need to make a check to cover both the
|
|
40
|
+
* storage query and the consts.
|
|
41
|
+
*/
|
|
42
|
+
let historyDepth;
|
|
43
|
+
if (historicApi.consts.staking.historyDepth) {
|
|
44
|
+
historyDepth = historicApi.consts.staking.historyDepth;
|
|
45
|
+
}
|
|
46
|
+
else {
|
|
47
|
+
historyDepth = await historicApi.query.staking.historyDepth();
|
|
48
|
+
}
|
|
39
49
|
// Information is kept for eras in `[current_era - history_depth; current_era]`
|
|
40
50
|
if (depth > historyDepth.toNumber()) {
|
|
41
51
|
throw new http_errors_1.BadRequest('Must specify a depth less than history_depth');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AccountsStakingPayoutsService.js","sourceRoot":"","sources":["../../../../src/services/accounts/AccountsStakingPayoutsService.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;;;AAiBxE,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,
|
|
1
|
+
{"version":3,"file":"AccountsStakingPayoutsService.js","sourceRoot":"","sources":["../../../../src/services/accounts/AccountsStakingPayoutsService.ts"],"names":[],"mappings":"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"}
|
|
@@ -37,9 +37,7 @@ const AccountsStakingPayoutsService_1 = require("./AccountsStakingPayoutsService
|
|
|
37
37
|
* factor to the test logic.
|
|
38
38
|
*/
|
|
39
39
|
const era = registries_1.polkadotRegistryV9122.createType('EraIndex', 532);
|
|
40
|
-
const historyDepthAt =
|
|
41
|
-
return registries_1.polkadotRegistryV9122.createType('u32', 84);
|
|
42
|
-
});
|
|
40
|
+
const historyDepthAt = registries_1.polkadotRegistryV9122.createType('u32', 84);
|
|
43
41
|
const erasRewardPointsAt = (_eraIndex) => Promise.resolve().then(() => {
|
|
44
42
|
return registries_1.polkadotRegistryV9122.createType('PalletStakingEraRewardPoints', accounts_1.mockEraRewardPoints);
|
|
45
43
|
});
|
|
@@ -67,12 +65,16 @@ const deriveEraExposure = (_eraIndex) => Promise.resolve().then(() => {
|
|
|
67
65
|
});
|
|
68
66
|
const mockHistoricApi = {
|
|
69
67
|
registry: registries_1.polkadotRegistryV9122,
|
|
68
|
+
consts: {
|
|
69
|
+
staking: {
|
|
70
|
+
historyDepth: historyDepthAt,
|
|
71
|
+
},
|
|
72
|
+
},
|
|
70
73
|
query: {
|
|
71
74
|
staking: {
|
|
72
75
|
ledger: ledgerAt,
|
|
73
76
|
erasRewardPoints: erasRewardPointsAt,
|
|
74
77
|
erasValidatorReward: erasValidatorRewardAt,
|
|
75
|
-
historyDepth: historyDepthAt,
|
|
76
78
|
erasValidatorPrefs: erasValidatorPrefsAt,
|
|
77
79
|
bonded: bondedAt,
|
|
78
80
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AccountsStakingPayoutsService.spec.js","sourceRoot":"","sources":["../../../../src/services/accounts/AccountsStakingPayoutsService.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;;;;;AAkBxE,6CAAyC;AAEzC,oEAAiE;AACjE,8DAAsE;AACtE,+CAAsD;AACtD,4DAKuC;AACvC,+GAA2F;AAC3F,mFAAgF;AAEhF;;;;;;GAMG;AAEH;;;GAGG;AACH,MAAM,GAAG,GAAG,kCAAqB,CAAC,UAAU,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;AAE9D,MAAM,cAAc,GAAG,
|
|
1
|
+
{"version":3,"file":"AccountsStakingPayoutsService.spec.js","sourceRoot":"","sources":["../../../../src/services/accounts/AccountsStakingPayoutsService.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;;;;;AAkBxE,6CAAyC;AAEzC,oEAAiE;AACjE,8DAAsE;AACtE,+CAAsD;AACtD,4DAKuC;AACvC,+GAA2F;AAC3F,mFAAgF;AAEhF;;;;;;GAMG;AAEH;;;GAGG;AACH,MAAM,GAAG,GAAG,kCAAqB,CAAC,UAAU,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC;AAE9D,MAAM,cAAc,GAAG,kCAAqB,CAAC,UAAU,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AAEnE,MAAM,kBAAkB,GAAG,CAC1B,SAAmB,EAC6B,EAAE,CAClD,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;IAC3B,OAAO,kCAAqB,CAAC,UAAU,CACtC,8BAA8B,EAC9B,8BAAmB,CACnB,CAAC;AACH,CAAC,CAAC,CAAC;AAEJ,MAAM,qBAAqB,GAAG,CAC7B,SAAmB,EACU,EAAE,CAC/B,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;IAC3B,OAAO,kCAAqB,CAAC,UAAU,CACtC,mBAAmB,EACnB,gBAAgB,CAChB,CAAC;AACH,CAAC,CAAC,CAAC;AAEJ,MAAM,oBAAoB,GAAG,CAC5B,IAAkB,EAClB,YAAkC,EACa,EAAE,CACjD,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;IAC3B,OAAO,kCAAqB,CAAC,UAAU,CAAC,6BAA6B,EAAE;QACtE,UAAU,EAAE,QAAQ;QACpB,OAAO,EAAE,KAAK;KACd,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC;AAEJ,MAAM,QAAQ,GAAG,CAChB,YAAkC,EACH,EAAE,CACjC,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;IAC3B,OAAO,kCAAqB,CAAC,UAAU,CACtC,qBAAqB,EACrB,iDAAiD,CACjD,CAAC;AACH,CAAC,CAAC,CAAC;AAEJ,MAAM,QAAQ,GAAG,CAChB,YAAkC,EACoB,EAAE,CACxD,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;IAC3B,OAAO,kCAAqB,CAAC,UAAU,CACtC,oCAAoC,EACpC,qBAAU,CACV,CAAC;AACH,CAAC,CAAC,CAAC;AAEJ,MAAM,iBAAiB,GAAG,CAAC,SAAmB,EAA8B,EAAE,CAC7E,OAAO,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;IAC3B,OAAO;QACN,GAAG;QACH,UAAU,EAAE,sCAA2B;QACvC,UAAU,EAAE,sCAA2B;KACP,CAAC;AACnC,CAAC,CAAC,CAAC;AAEJ,MAAM,eAAe,GAAG;IACvB,QAAQ,EAAE,kCAAqB;IAC/B,MAAM,EAAE;QACP,OAAO,EAAE;YACR,YAAY,EAAE,cAAc;SAC5B;KACD;IACD,KAAK,EAAE;QACN,OAAO,EAAE;YACR,MAAM,EAAE,QAAQ;YAChB,gBAAgB,EAAE,kBAAkB;YACpC,mBAAmB,EAAE,qBAAqB;YAC1C,kBAAkB,EAAE,oBAAoB;YACxC,MAAM,EAAE,QAAQ;SAChB;KACD;CACsC,CAAC;AAEzC,MAAM,OAAO,GAAG;IACf,GAAG,qBAAc;IACjB,MAAM,EAAE;QACP,OAAO,EAAE;YACR,WAAW,EAAE,iBAAiB;SAC9B;KACD;IACD,EAAE,EAAE,CAAC,KAAW,EAAE,EAAE,CAAC,eAAe;CACX,CAAC;AAE3B,MAAM,qBAAqB,GAAG,IAAI,6DAA6B,CAAC,OAAO,CAAC,CAAC;AAEzE,QAAQ,CAAC,+BAA+B,EAAE,GAAG,EAAE;IAC9C;;OAEG;IACH,MAAM,SAAS,GAAG,kDAAkD,CAAC;IACrE,MAAM,SAAS,GAAG,kDAAkD,CAAC;IAErE,MAAM,SAAS,GAAG,kCAAqB,CAAC,UAAU,CACjD,WAAW,EACX,oEAAoE,CACpE,CAAC;IAEF,IAAI,eAAkC,CAAC;IACvC,SAAS,CAAC,KAAK,IAAI,EAAE;QACpB,eAAe,GAAG,MAAM,iBAAiB,CAAC,GAAG,CAAC,CAAC;IAChD,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,8BAA8B,EAAE,GAAG,EAAE;QAC7C,EAAE,CAAC,mCAAmC,EAAE,KAAK,IAAI,EAAE;YAClD,MAAM,GAAG,GAAG,MAAM,qBAAqB,CAAC,yBAAyB,CAChE,SAAS,EACT,SAAS,EACT,CAAC,EACD,GAAG,EACH,IAAI,EACJ,GAAG,CACH,CAAC;YAEF,MAAM,CAAC,IAAA,iCAAe,EAAC,GAAG,CAAC,CAAC,CAAC,aAAa,CAAC,4BAAsB,CAAC,CAAC;QACpE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qCAAqC,EAAE,KAAK,IAAI,EAAE;YACpD,MAAM,GAAG,GAAG,MAAM,qBAAqB,CAAC,yBAAyB,CAChE,SAAS,EACT,SAAS,EACT,CAAC,EACD,GAAG,EACH,KAAK,EACL,GAAG,CACH,CAAC;YAEF,MAAM,CAAC,IAAA,iCAAe,EAAC,GAAG,CAAC,CAAC,CAAC,aAAa,CAAC,4BAAsB,CAAC,CAAC;QACpE,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,+EAA+E,EAAE,KAAK,IAAI,EAAE;YAC9F,MAAM,OAAO,GAAG,MAAM,kBAAkB,CAAC,GAAG,CAAC,CAAC;YAC9C,MAAM,GAAG,GAAG,qBAAqB,CAAC,mCAAmC,CAAC,CACrE,OAAkD,EAClD,SAAS,CACT,CAAC;YACF,MAAM,CAAC,IAAA,iCAAe,EAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mFAAmF,EAAE,GAAG,EAAE;YAC5F,MAAM,GAAG,GAAG,qBAAqB,CAAC,iBAAiB,CAAC,CACnD,SAAS,EACT,SAAS,EACT,eAAe,CACf,CAAC;YACF,MAAM,CAAC,IAAA,iCAAe,EAAC,GAAG,CAAC,CAAC,CAAC,aAAa,CAAC;gBAC1C,iBAAiB,EAAE,mBAAmB;gBACtC,aAAa,EAAE,mBAAmB;aAClC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mFAAmF,EAAE,GAAG,EAAE;YAC5F,MAAM,GAAG,GAAG,qBAAqB,CAAC,iBAAiB,CAAC,CACnD,SAAS,EACT,SAAS,EACT,eAAe,CACf,CAAC;YACF,MAAM,CAAC,IAAA,iCAAe,EAAC,GAAG,CAAC,CAAC,CAAC,aAAa,CAAC;gBAC1C,iBAAiB,EAAE,cAAc;gBACjC,aAAa,EAAE,mBAAmB;aAClC,CAAC,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,wFAAwF,EAAE,GAAG,EAAE;YACjG,MAAM,GAAG,GAAG,qBAAqB,CAAC,0BAA0B,CAAC,CAC5D,kDAAkD,EAClD,eAAe,CACf,CAAC;YACF,MAAM,cAAc,GAAG;gBACtB;oBACC,WAAW,EAAE,iDAAiD;oBAC9D,cAAc,EAAE,GAAG;iBACnB;gBACD;oBACC,WAAW,EAAE,kDAAkD;oBAC/D,cAAc,EAAE,MAAM;iBACtB;aACD,CAAC;YACF,MAAM,CAAC,IAAA,iCAAe,EAAC,GAAG,CAAC,CAAC,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;QAC5D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4FAA4F,EAAE,GAAG,EAAE;YACrG,MAAM,GAAG,GAAG,qBAAqB,CAAC,0BAA0B,CAAC,CAC5D,SAAS,EACT,eAAe,CACf,CAAC;YACF,MAAM,CAAC,IAAA,iCAAe,EAAC,GAAG,CAAC,CAAC,CAAC,aAAa,CACzC,sCAA2B,CAAC,SAAS,CAAC,CACtC,CAAC;QACH,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,QAAQ,CAAC,gBAAgB,EAAE,GAAG,EAAE;QAC/B,EAAE,CAAC,uEAAuE,EAAE,GAAG,EAAE;YAChF,MAAM,WAAW,GAAG,KAAK,IAAI,EAAE;gBAC9B,MAAM,qBAAqB,CAAC,yBAAyB,CACpD,SAAS,EACT,SAAS,EACT,EAAE,EACF,GAAG,EACH,IAAI,EACJ,GAAG,CACH,CAAC;YACH,CAAC,CAAC;YAEF,mEAAmE;YACnE,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CACpC,IAAI,wBAAU,CAAC,8CAA8C,CAAC,CAC9D,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,gEAAgE,EAAE,GAAG,EAAE;YACzE,MAAM,WAAW,GAAG,KAAK,IAAI,EAAE;gBAC9B,MAAM,qBAAqB,CAAC,yBAAyB,CACpD,SAAS,EACT,SAAS,EACT,CAAC,EACD,GAAG,EACH,IAAI,EACJ,GAAG,CACH,CAAC;YACH,CAAC,CAAC;YAEF,mEAAmE;YACnE,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CACpC,IAAI,wBAAU,CACb,iEAAiE;gBAChE,+CAA+C,CAChD,CACD,CAAC;QACH,CAAC,CAAC,CAAC;IACJ,CAAC,CAAC,CAAC;AACJ,CAAC,CAAC,CAAC"}
|
|
@@ -86,11 +86,11 @@ class NodeTransactionPoolService extends AbstractService_1.AbstractService {
|
|
|
86
86
|
const { tip, encodedLength: len } = ext;
|
|
87
87
|
const BN_ONE = new bn_js_1.default(1);
|
|
88
88
|
const sanitizedClass = this.defineDispatchClassType(dispatchClass);
|
|
89
|
-
const maxBlockWeight = api.consts.system.blockWeights.maxBlock;
|
|
90
|
-
const maxLength = api.consts.system.blockLength.max[sanitizedClass];
|
|
89
|
+
const maxBlockWeight = api.consts.system.blockWeights.maxBlock.refTime.unwrap();
|
|
90
|
+
const maxLength = new bn_js_1.default(api.consts.system.blockLength.max[sanitizedClass]);
|
|
91
91
|
const boundedWeight = bn_js_1.default.min(bn_js_1.default.max(weight.toBn(), BN_ONE), maxBlockWeight);
|
|
92
92
|
const boundedLength = bn_js_1.default.min(bn_js_1.default.max(new bn_js_1.default(len), BN_ONE), maxLength);
|
|
93
|
-
const maxTxPerBlockWeight = maxBlockWeight.div(boundedWeight);
|
|
93
|
+
const maxTxPerBlockWeight = maxBlockWeight.toBn().div(boundedWeight);
|
|
94
94
|
const maxTxPerBlockLength = maxLength.div(boundedLength);
|
|
95
95
|
const maxTxPerBlock = bn_js_1.default.min(maxTxPerBlockWeight, maxTxPerBlockLength);
|
|
96
96
|
const saturatedTip = tip.toBn().add(BN_ONE);
|
|
@@ -114,7 +114,10 @@ class NodeTransactionPoolService extends AbstractService_1.AbstractService {
|
|
|
114
114
|
break;
|
|
115
115
|
}
|
|
116
116
|
const { baseFee, lenFee, adjustedWeightFee } = inclusionFee.unwrap();
|
|
117
|
-
const computedInclusionFee = baseFee
|
|
117
|
+
const computedInclusionFee = baseFee
|
|
118
|
+
.toBn()
|
|
119
|
+
.add(lenFee)
|
|
120
|
+
.add(adjustedWeightFee);
|
|
118
121
|
const finalFee = computedInclusionFee.add(tip.toBn());
|
|
119
122
|
const virtualTip = finalFee.mul(operationalFeeMultiplier);
|
|
120
123
|
const scaledVirtualTip = this.maxReward(virtualTip, maxTxPerBlock);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NodeTransactionPoolService.js","sourceRoot":"","sources":["../../../../src/services/node/NodeTransactionPoolService.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":"NodeTransactionPoolService.js","sourceRoot":"","sources":["../../../../src/services/node/NodeTransactionPoolService.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,8 +47,8 @@ describe('NodeTransactionPoolService', () => {
|
|
|
47
47
|
it('works when query param `includeFee` is set to true for normal extrinsics', async () => {
|
|
48
48
|
// This test does not use the same metadata in defaultMockApi. It changes it to v9190,
|
|
49
49
|
// and sets it back to the default value after.
|
|
50
|
-
const normalExt = registries_1.
|
|
51
|
-
const pool = registries_1.
|
|
50
|
+
const normalExt = registries_1.polkadotRegistryV9300.createType('Extrinsic', '0x4d028400d43593c715fdd31c61141abd04a99fd6822c8558854ccde39a5684e7a56da27d0196a6cd1652fc83c449884f67e8f444587b69c5874512f1d746ff6f062a097b2acedfe8d2e07915b4c93cc1c3b48a16ebccc1db8eb810146373ba53c9f42ab48e4500000284d717050300e281b7ec09fb8420ca7ba3fbd627fbe203ff04b2ba0777ae1d8a6942257af0230700e8764817');
|
|
51
|
+
const pool = registries_1.polkadotRegistryV9300.createType('Vec<Extrinsic>', [
|
|
52
52
|
normalExt,
|
|
53
53
|
]);
|
|
54
54
|
mock_1.defaultMockApi.rpc.author.pendingExtrinsics = () => Promise.resolve().then(() => pool);
|
|
@@ -56,8 +56,8 @@ describe('NodeTransactionPoolService', () => {
|
|
|
56
56
|
mock_1.defaultMockApi.rpc.author.pendingExtrinsics = mock_1.pendingExtrinsics;
|
|
57
57
|
});
|
|
58
58
|
it('works when query param `includeFee` is set to true for operational extrinsics', async () => {
|
|
59
|
-
const operationalExt = registries_1.
|
|
60
|
-
const pool = registries_1.
|
|
59
|
+
const operationalExt = registries_1.polkadotRegistryV9300.createType('Extrinsic', '0x350284004adf51a47b72795366d52285e329229c836ea7bbfe139dbe8fa0700c4f86fc5601fc44dcd1994c111671b3577b02e391be8aff10f7ccf766f3189859ea343db041779a67f9357cba0ba051f83d63e45e7a88b5e2ca642181592052acd9f4ccc8821501c107000f03f2af187bbc8a4a2b5a28c2a3c2d85bf7e5b1700cbf1207a8e4c1eb7d8e7e4037350301');
|
|
60
|
+
const pool = registries_1.polkadotRegistryV9300.createType('Vec<Extrinsic>', [
|
|
61
61
|
operationalExt,
|
|
62
62
|
]);
|
|
63
63
|
mock_1.defaultMockApi.rpc.author.pendingExtrinsics = () => Promise.resolve().then(() => pool);
|
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"version": "14.
|
|
2
|
+
"version": "14.1.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",
|
|
@@ -53,8 +53,8 @@
|
|
|
53
53
|
"update-pjs-deps": "substrate-update-pjs-deps && yarn"
|
|
54
54
|
},
|
|
55
55
|
"dependencies": {
|
|
56
|
-
"@polkadot/api": "^9.
|
|
57
|
-
"@polkadot/util-crypto": "^10.1.
|
|
56
|
+
"@polkadot/api": "^9.6.2",
|
|
57
|
+
"@polkadot/util-crypto": "^10.1.11",
|
|
58
58
|
"@substrate/calc": "^0.3.0",
|
|
59
59
|
"argparse": "^2.0.1",
|
|
60
60
|
"confmgr": "1.0.9",
|
|
@@ -68,8 +68,8 @@
|
|
|
68
68
|
"devDependencies": {
|
|
69
69
|
"@substrate/dev": "^0.6.4",
|
|
70
70
|
"@types/argparse": "2.0.10",
|
|
71
|
-
"@types/express": "4.17.
|
|
72
|
-
"@types/express-serve-static-core": "4.17.
|
|
71
|
+
"@types/express": "4.17.14",
|
|
72
|
+
"@types/express-serve-static-core": "4.17.31",
|
|
73
73
|
"@types/http-errors": "1.8.2",
|
|
74
74
|
"@types/lru-cache": "^7.10.10",
|
|
75
75
|
"@types/morgan": "1.9.3",
|
|
@@ -86,5 +86,5 @@
|
|
|
86
86
|
"polkadot",
|
|
87
87
|
"kusama"
|
|
88
88
|
],
|
|
89
|
-
"packageManager": "yarn@3.2.
|
|
89
|
+
"packageManager": "yarn@3.2.4"
|
|
90
90
|
}
|
|
File without changes
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"PalletsNominationPoolsController.js","sourceRoot":"","sources":["../../../../src/controllers/pallets/PalletsNominationPoolsController.ts"],"names":[],"mappings":""}
|