diff --git a/package.json b/package.json index abe8a7c6c9..0e74defc26 100644 --- a/package.json +++ b/package.json @@ -12,17 +12,17 @@ "packages/*" ], "resolutions": { - "@polkadot/api": "^4.16.3-4", - "@polkadot/api-contract": "^4.16.3-4", - "@polkadot/hw-ledger": "^6.10.2-3", - "@polkadot/keyring": "^6.10.2-3", - "@polkadot/networks": "^6.10.2-3", - "@polkadot/phishing": "^0.6.216", - "@polkadot/types": "^4.16.3-4", - "@polkadot/util": "^6.10.2-3", - "@polkadot/util-crypto": "^6.10.2-3", + "@polkadot/api": "^4.17.2-3", + "@polkadot/api-contract": "^4.17.2-3", + "@polkadot/hw-ledger": "^6.11.1", + "@polkadot/keyring": "^6.11.1", + "@polkadot/networks": "^6.11.1", + "@polkadot/phishing": "^0.6.219", + "@polkadot/types": "^4.17.2-3", + "@polkadot/util": "^6.11.1", + "@polkadot/util-crypto": "^6.11.1", "@polkadot/wasm-crypto": "^4.0.2", - "@polkadot/x-rxjs": "^6.10.2-3", + "@polkadot/x-rxjs": "^6.11.1", "@substrate/connect": "0.3.10", "babel-core": "^7.0.0-bridge.0", "styled-components": "^5.2.0", @@ -74,8 +74,8 @@ "@babel/runtime": "^7.14.6", "@crustio/crust-pin": "^0.0.1", "@pinata/sdk": "^1.1.23", - "@polkadot/dev": "^0.62.44", - "@polkadot/ts": "^0.4.2", + "@polkadot/dev": "^0.62.50", + "@polkadot/ts": "^0.4.3", "@types/bn.js": "^4.11.6", "@types/chart.js": "^2.9.32", "@types/file-saver": "^2.0.2", diff --git a/packages/apps-config/package.json b/packages/apps-config/package.json index edb74df4cc..92fcc59cae 100644 --- a/packages/apps-config/package.json +++ b/packages/apps-config/package.json @@ -19,7 +19,7 @@ "@kiltprotocol/type-definitions": "^0.1.8", "@laminar/type-definitions": "^0.3.1", "@phala/typedefs": "^0.2.1", - "@polkadot/networks": "^6.10.2-3", + "@polkadot/networks": "^6.11.1", "@polymathnetwork/polymesh-types": "^0.0.2", "@snowfork/snowbridge-types": "^0.2.3", "@sora-substrate/type-definitions": "^1.3.32", diff --git a/packages/apps-electron/package.json b/packages/apps-electron/package.json index 5262a0aaf4..fd339582d7 100644 --- a/packages/apps-electron/package.json +++ b/packages/apps-electron/package.json @@ -6,7 +6,7 @@ "dependencies": { "@babel/core": "^7.14.6", "@babel/polyfill": "^7.12.1", - "@polkadot/dev": "^0.62.44", + "@polkadot/dev": "^0.62.50", "@polkadot/react-components": "^0.94.2-37", "electron-log": "^4.3.5", "electron-updater": "^4.3.10" diff --git a/packages/apps/package.json b/packages/apps/package.json index 4d905bed66..cde4536331 100644 --- a/packages/apps/package.json +++ b/packages/apps/package.json @@ -11,7 +11,7 @@ "@babel/runtime": "^7.14.6", "@polkadot/apps-config": "^0.94.2-37", "@polkadot/apps-routing": "^0.94.2-37", - "@polkadot/dev": "^0.62.44", + "@polkadot/dev": "^0.62.50", "@polkadot/react-api": "^0.94.2-37", "@polkadot/react-components": "^0.94.2-37", "@polkadot/react-hooks": "^0.94.2-37", diff --git a/packages/page-accounts/package.json b/packages/page-accounts/package.json index 9cddeeee6f..9c2671d8f9 100644 --- a/packages/page-accounts/package.json +++ b/packages/page-accounts/package.json @@ -6,9 +6,9 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.14.6", - "@polkadot/phishing": "^0.6.216", + "@polkadot/phishing": "^0.6.219", "@polkadot/react-components": "^0.94.2-37", - "@polkadot/vanitygen": "^0.40.2-0", + "@polkadot/vanitygen": "^0.41.1", "detect-browser": "^5.2.0", "file-saver": "^2.0.5" }, diff --git a/packages/page-contracts/package.json b/packages/page-contracts/package.json index 52274ff703..012e0ff9e4 100644 --- a/packages/page-contracts/package.json +++ b/packages/page-contracts/package.json @@ -6,6 +6,6 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.14.6", - "@polkadot/api-contract": "^4.16.3-4" + "@polkadot/api-contract": "^4.17.2-3" } } diff --git a/packages/page-contracts/src/Contracts/Call.tsx b/packages/page-contracts/src/Contracts/Call.tsx index e6c6837d12..46936016de 100644 --- a/packages/page-contracts/src/Contracts/Call.tsx +++ b/packages/page-contracts/src/Contracts/Call.tsx @@ -76,9 +76,9 @@ function Call ({ className = '', contract, messageIndex, onCallResult, onChangeM ? dbValue : 0 }, ...dbParams) - .then(({ gasConsumed, result }) => setEstimatedWeight( + .then(({ gasRequired, result }) => setEstimatedWeight( result.isOk - ? gasConsumed + ? gasRequired : null )) .catch(() => setEstimatedWeight(null)); @@ -122,7 +122,7 @@ function Call ({ className = '', contract, messageIndex, onCallResult, onChangeM ); const isValid = !!(accountId && weight.isValid && isValueValid); - const isViaRpc = contract.hasRpcContractsCall && (isViaCall || !message.isMutating); + const isViaRpc = contract.hasRpcContractsCall && (isViaCall || (!message.isMutating && !message.isPayable)); return (