From 983c77fe61fac0d4f6b260efcd2c83ed15a5c226 Mon Sep 17 00:00:00 2001 From: Jaco Date: Tue, 26 Apr 2022 15:12:17 +0200 Subject: [PATCH] Adjustment for paymentInfo (#4771) * Adjustment for paymentInfo * Bump dev --- package.json | 2 +- packages/api/src/submittable/createClass.ts | 14 ++-- yarn.lock | 72 ++++++++++----------- 3 files changed, 42 insertions(+), 46 deletions(-) diff --git a/package.json b/package.json index 67298b7f13..112721a99c 100644 --- a/package.json +++ b/package.json @@ -34,7 +34,7 @@ "@babel/core": "^7.17.9", "@babel/register": "^7.17.7", "@babel/runtime": "^7.17.9", - "@polkadot/dev": "^0.66.9", + "@polkadot/dev": "^0.66.10", "@polkadot/typegen": "workspace:packages/typegen", "@types/jest": "^27.4.1", "copyfiles": "^2.4.1" diff --git a/packages/api/src/submittable/createClass.ts b/packages/api/src/submittable/createClass.ts index 5df4537c7a..f49a4064b0 100644 --- a/packages/api/src/submittable/createClass.ts +++ b/packages/api/src/submittable/createClass.ts @@ -122,12 +122,6 @@ export function createClass ({ api, apiType, blockHas (): Observable => api.rpc.payment.queryInfo(this.toHex(), blockHash || optionsOrHash as string) ); - } else if (this.isSigned) { - // eslint-disable-next-line @typescript-eslint/no-unsafe-return,@typescript-eslint/no-unsafe-call - return decorateMethod( - (): Observable => - api.rpc.payment.queryInfo(this.toHex()) - ); } const [allOptions] = makeSignAndSendOptions(optionsOrHash); @@ -143,9 +137,11 @@ export function createClass ({ api, apiType, blockHas const eraOptions = makeEraOptions(api, this.registry, allOptions, signingInfo); const signOptions = makeSignOptions(api, eraOptions, {}); - this.signFake(address, signOptions); - - return api.rpc.payment.queryInfo(this.toHex()); + return api.rpc.payment.queryInfo( + this.isSigned + ? api.tx(this).signFake(address, signOptions).toHex() + : this.signFake(address, signOptions).toHex() + ); }) ) )(); diff --git a/yarn.lock b/yarn.lock index 1ce7f09406..66eb9ff5c5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1981,9 +1981,9 @@ __metadata: languageName: unknown linkType: soft -"@polkadot/dev@npm:^0.66.9": - version: 0.66.9 - resolution: "@polkadot/dev@npm:0.66.9" +"@polkadot/dev@npm:^0.66.10": + version: 0.66.10 + resolution: "@polkadot/dev@npm:0.66.10" dependencies: "@babel/cli": ^7.17.6 "@babel/core": ^7.17.9 @@ -2002,7 +2002,7 @@ __metadata: "@babel/register": ^7.17.7 "@babel/runtime": ^7.17.9 "@rollup/plugin-alias": ^3.1.9 - "@rollup/plugin-commonjs": ^21.1.0 + "@rollup/plugin-commonjs": ^22.0.0 "@rollup/plugin-inject": ^4.0.4 "@rollup/plugin-json": ^4.1.0 "@rollup/plugin-node-resolve": ^13.2.1 @@ -2014,7 +2014,7 @@ __metadata: babel-plugin-module-extension-resolver: ^1.0.0-rc.2 babel-plugin-module-resolver: ^4.1.0 babel-plugin-styled-components: ^2.0.7 - browserslist: ^4.20.2 + browserslist: ^4.20.3 coveralls: ^3.1.1 eslint: ^8.14.0 eslint-config-standard: ^17.0.0 @@ -2022,7 +2022,7 @@ __metadata: eslint-plugin-header: ^3.1.1 eslint-plugin-import: ^2.26.0 eslint-plugin-import-newlines: ^1.2.2 - eslint-plugin-n: ^15.1.0 + eslint-plugin-n: ^15.2.0 eslint-plugin-promise: ^6.0.0 eslint-plugin-react: ^7.29.4 eslint-plugin-react-hooks: ^4.4.0 @@ -2069,7 +2069,7 @@ __metadata: polkadot-exec-rollup: scripts/polkadot-exec-rollup.mjs polkadot-exec-tsc: scripts/polkadot-exec-tsc.mjs polkadot-exec-webpack: scripts/polkadot-exec-webpack.mjs - checksum: 4ab1d19e587c3f2c900f416f6761ca682d0f0a848410966f42ff910dcca8c6227ff9b7aa4ef85e8074409658c30da395531596b27e2483d108ee26fd26e634fb + checksum: e99ea62acf056e03ab7c8a369eab9b31943c2af3e388e104064b143eef4c6c8bf68fde0fc824f726827a4b858d7f6aed6d93d403225c60479bcaa7daa2e1f5a0 languageName: node linkType: hard @@ -2406,9 +2406,9 @@ __metadata: languageName: node linkType: hard -"@rollup/plugin-commonjs@npm:^21.1.0": - version: 21.1.0 - resolution: "@rollup/plugin-commonjs@npm:21.1.0" +"@rollup/plugin-commonjs@npm:^22.0.0": + version: 22.0.0 + resolution: "@rollup/plugin-commonjs@npm:22.0.0" dependencies: "@rollup/pluginutils": ^3.1.0 commondir: ^1.0.1 @@ -2418,8 +2418,8 @@ __metadata: magic-string: ^0.25.7 resolve: ^1.17.0 peerDependencies: - rollup: ^2.38.3 - checksum: e8280f4b6192729f2bdf878c48c451dc441075f2a12f22c688393f48a6b95e8ff83caaacc3df4eb1d81516e08a0e3a669213632879910d85dd630b37bb284df7 + rollup: ^2.68.0 + checksum: fdcce2bf58875fde0e06f001544c0d9a0509a12929393862f72dcef8fcbf4d5d0ba0d5db6cf10ba4351335caf67a3dbdb95000678c468585e3972994f92e2ce9 languageName: node linkType: hard @@ -3566,18 +3566,18 @@ __metadata: languageName: node linkType: hard -"browserslist@npm:^4.17.5, browserslist@npm:^4.19.1, browserslist@npm:^4.20.2": - version: 4.20.2 - resolution: "browserslist@npm:4.20.2" +"browserslist@npm:^4.17.5, browserslist@npm:^4.19.1, browserslist@npm:^4.20.3": + version: 4.20.3 + resolution: "browserslist@npm:4.20.3" dependencies: - caniuse-lite: ^1.0.30001317 - electron-to-chromium: ^1.4.84 + caniuse-lite: ^1.0.30001332 + electron-to-chromium: ^1.4.118 escalade: ^3.1.1 - node-releases: ^2.0.2 + node-releases: ^2.0.3 picocolors: ^1.0.0 bin: browserslist: cli.js - checksum: 18e09beeae32e69fea45fc3642240fb63027b1460d90e24da86377177dca3d82c80f8fa44469d95109e3962f08eb2a23e03037bd5e1f1ec38e4866e2a8572435 + checksum: 1e4b719ac2ca0fe235218a606e8b8ef16b8809e0973b924158c39fbc435a0b0fe43437ea52dd6ef5ad2efcb83fcb07431244e472270177814217f7c563651f7d languageName: node linkType: hard @@ -3689,10 +3689,10 @@ __metadata: languageName: node linkType: hard -"caniuse-lite@npm:^1.0.30001317": - version: 1.0.30001317 - resolution: "caniuse-lite@npm:1.0.30001317" - checksum: 0a5fc7fb8c54dde515c2d468e5fc9e0cf2e82dd40d596cdffed90f64c50b5dadd0ab0c25e04769d86488b3115f949abd31d54d1f74d0029b45fa8206a031f47a +"caniuse-lite@npm:^1.0.30001332": + version: 1.0.30001332 + resolution: "caniuse-lite@npm:1.0.30001332" + checksum: e54182ea42ab3d2ff1440f9a6480292f7ab23c00c188df7ad65586312e4da567e8bedd5cb5fb8f0ff4193dc027a54e17e0b3c0b6db5d5a3fb61c7726ff9c45b3 languageName: node linkType: hard @@ -4523,10 +4523,10 @@ __metadata: languageName: node linkType: hard -"electron-to-chromium@npm:^1.4.84": - version: 1.4.85 - resolution: "electron-to-chromium@npm:1.4.85" - checksum: 87cea37f0aeb7aead8ddbc9c2b308eac4537eb50095b45faaf6d75b72d599392833ed12d777baf908550df4a090b250af2e4176c130c291e28e83a930f1e84f8 +"electron-to-chromium@npm:^1.4.118": + version: 1.4.121 + resolution: "electron-to-chromium@npm:1.4.121" + checksum: 85be9ff2d56370215bc186e266a1883cfc50f2f41ac6908432aac44ba4c4ffcd20c6e7a828d8082cae9c0a71d0c329af40ea5dec67901400776269b0617e2210 languageName: node linkType: hard @@ -4805,9 +4805,9 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-n@npm:^15.1.0": - version: 15.1.0 - resolution: "eslint-plugin-n@npm:15.1.0" +"eslint-plugin-n@npm:^15.2.0": + version: 15.2.0 + resolution: "eslint-plugin-n@npm:15.2.0" dependencies: builtins: ^4.0.0 eslint-plugin-es: ^4.1.0 @@ -4819,7 +4819,7 @@ __metadata: semver: ^6.3.0 peerDependencies: eslint: ">=7.0.0" - checksum: 6c358fe29a511756617356a50a8867ec21e7ad426e2f6a1d179edbcfb8a8ded6c28b58bb5570dd198b66cb4f395e54e31c26cd9ac74d1df62901be7bbc7af2c1 + checksum: 4303dea35a40877958e5de9d54c098d842191428e1cef0df320cc3533ecd0b539a67323f6788bffdf76445c2f5a5dfe28837a5d1efb70ebb29c0caa6259bb805 languageName: node linkType: hard @@ -7862,10 +7862,10 @@ fsevents@~2.1.2: languageName: node linkType: hard -"node-releases@npm:^2.0.2": - version: 2.0.2 - resolution: "node-releases@npm:2.0.2" - checksum: da858bf86b4d512842379749f5a5e4196ddab05ba18ffcf29f05bf460beceaca927f070f4430bb5046efec18941ddbc85e4c5fdbb83afc28a38dd6069a2f255e +"node-releases@npm:^2.0.3": + version: 2.0.3 + resolution: "node-releases@npm:2.0.3" + checksum: 5e555fbbebb3343a5d1e5f4e10e1737998bedc57472a35027410d17b2678ed9bc0e5fae008f513798a960eb8687159331b1f46f82a3210d39bd7c40d3c9dcead languageName: node linkType: hard @@ -9042,7 +9042,7 @@ resolve@^2.0.0-next.3: "@babel/core": ^7.17.9 "@babel/register": ^7.17.7 "@babel/runtime": ^7.17.9 - "@polkadot/dev": ^0.66.9 + "@polkadot/dev": ^0.66.10 "@polkadot/typegen": "workspace:packages/typegen" "@types/jest": ^27.4.1 copyfiles: ^2.4.1