Skip to content

Commit

Permalink
Ensure epoch is avilable (w/ no staking, permissioned) (polkadot-js#4402
Browse files Browse the repository at this point in the history
)
  • Loading branch information
jacogr authored Jan 13, 2021
1 parent acafb5b commit c4a96a2
Show file tree
Hide file tree
Showing 6 changed files with 84 additions and 75 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@
"packages/*"
],
"resolutions": {
"@polkadot/api": "^3.4.2-6",
"@polkadot/api-contract": "^3.4.2-6",
"@polkadot/api": "^3.4.2-8",
"@polkadot/api-contract": "^3.4.2-8",
"@polkadot/keyring": "^5.2.3",
"@polkadot/networks": "^5.2.3",
"@polkadot/types": "^3.4.2-6",
"@polkadot/types": "^3.4.2-8",
"@polkadot/util": "^5.2.3",
"@polkadot/util-crypto": "^5.2.3",
"@polkadot/wasm-crypto": "^3.1.1",
"@polkadot/x-rxjs": "^3.4.2-6",
"@polkadot/x-rxjs": "^3.4.2-8",
"babel-core": "^7.0.0-bridge.0",
"styled-components": "^5.2.0",
"typescript": "^4.1.3"
Expand Down
2 changes: 1 addition & 1 deletion packages/page-contracts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
"license": "Apache-2.0",
"dependencies": {
"@babel/runtime": "^7.12.5",
"@polkadot/api-contract": "^3.4.2-6"
"@polkadot/api-contract": "^3.4.2-8"
}
}
12 changes: 9 additions & 3 deletions packages/page-explorer/src/SummarySession.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,15 @@ import { formatNumber } from '@polkadot/util';
import { useTranslation } from './translate';

interface Props {
className?: string;
withEra?: boolean;
withSession?: boolean;
}

function SummarySession ({ withEra = true, withSession = true }: Props): React.ReactElement<Props> {
function SummarySession ({ className, withEra = true, withSession = true }: Props): React.ReactElement<Props> {
const { t } = useTranslation();
const { api } = useApi();
const sessionInfo = useCall<DeriveSessionProgress>(api.query.staking && api.derive.session?.progress);
const sessionInfo = useCall<DeriveSessionProgress>(api.derive.session?.progress);
const forcing = useCall<Forcing>(api.query.staking?.forceEra);

const eraLabel = t<string>('era');
Expand All @@ -38,6 +39,7 @@ function SummarySession ({ withEra = true, withSession = true }: Props): React.R
sessionInfo.sessionLength.gtn(1)
? (
<CardSummary
className={className}
label={sessionLabel}
progress={{
total: sessionInfo.sessionLength,
Expand All @@ -57,6 +59,7 @@ function SummarySession ({ withEra = true, withSession = true }: Props): React.R
sessionInfo.sessionLength.gtn(1)
? (
<CardSummary
className={className}
label={eraLabel}
progress={{
total: forcing.isForceAlways ? sessionInfo.sessionLength : sessionInfo.eraLength,
Expand All @@ -66,7 +69,10 @@ function SummarySession ({ withEra = true, withSession = true }: Props): React.R
/>
)
: (
<CardSummary label={eraLabel}>
<CardSummary
className={className}
label={eraLabel}
>
#{formatNumber(sessionInfo.activeEra)}
{activeEraStart && (
<Elapsed
Expand Down
7 changes: 5 additions & 2 deletions packages/page-parachains/src/Overview/Summary.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,15 @@ function Summary ({ parachainCount, proposalCount, upcomingCount }: Props): Reac
</section>
<section>
<CardSummary
className='media--800'
className='media--1000'
label={t<string>('best block')}
>
<BestNumber isFinalized={false} />
</CardSummary>
<SummarySession withEra={false} />
<SummarySession
className='media--800'
withEra={false}
/>
</section>
</SummaryBox>
);
Expand Down
4 changes: 2 additions & 2 deletions packages/react-api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
"homepage": "https://github.com/polkadot-js/apps/tree/master/packages/react-api#readme",
"dependencies": {
"@babel/runtime": "^7.12.5",
"@polkadot/api": "^3.4.2-6",
"@polkadot/api": "^3.4.2-8",
"@polkadot/extension-dapp": "^0.36.2-1",
"@polkadot/x-rxjs": "^3.4.2-6",
"@polkadot/x-rxjs": "^3.4.2-8",
"fflate": "^0.5.2"
}
}
126 changes: 63 additions & 63 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1908,54 +1908,54 @@ __metadata:
languageName: node
linkType: hard

"@polkadot/api-contract@npm:^3.4.2-6":
version: 3.4.2-6
resolution: "@polkadot/api-contract@npm:3.4.2-6"
"@polkadot/api-contract@npm:^3.4.2-8":
version: 3.4.2-8
resolution: "@polkadot/api-contract@npm:3.4.2-8"
dependencies:
"@babel/runtime": ^7.12.5
"@polkadot/api": 3.4.2-6
"@polkadot/types": 3.4.2-6
"@polkadot/api": 3.4.2-8
"@polkadot/types": 3.4.2-8
"@polkadot/util": ^5.2.3
"@polkadot/x-rxjs": 3.4.2-6
"@polkadot/x-rxjs": 3.4.2-8
bn.js: ^4.11.9
checksum: 2d01c616d95937185674f2a1b74405ccbed4b0479da3fb803c9f3c64f6cd039404cd57eb17fba49e290f9672aa3ea504680ca2823b2eb1db2089a96df76013a0
checksum: e1120a7935e0320c6511504500d66628e92d5ac312144b34f649ebefec2b7fccee5e2c67327ca412c198a7f4b9213ed5510978c1cf683247cf27656441e19a7d
languageName: node
linkType: hard

"@polkadot/api-derive@npm:3.4.2-6":
version: 3.4.2-6
resolution: "@polkadot/api-derive@npm:3.4.2-6"
"@polkadot/api-derive@npm:3.4.2-8":
version: 3.4.2-8
resolution: "@polkadot/api-derive@npm:3.4.2-8"
dependencies:
"@babel/runtime": ^7.12.5
"@polkadot/api": 3.4.2-6
"@polkadot/rpc-core": 3.4.2-6
"@polkadot/types": 3.4.2-6
"@polkadot/api": 3.4.2-8
"@polkadot/rpc-core": 3.4.2-8
"@polkadot/types": 3.4.2-8
"@polkadot/util": ^5.2.3
"@polkadot/util-crypto": ^5.2.3
"@polkadot/x-rxjs": 3.4.2-6
"@polkadot/x-rxjs": 3.4.2-8
bn.js: ^4.11.9
checksum: 7ed8204b712457cac6f8d72a7767a70c054a1f8c537b7aaefb7d74a894941755b3ca451e51b6c4be82c7aa6fa33ddea02fc2e5fb170625580e47d57098258657
checksum: 2aff32c435e0bb266e6a1b14b6baba41e23881efdf5000e53187fb643d36719ca4985f6c462c0078f36615995910457cdc35e2825934a62c4c6a668541808cb4
languageName: node
linkType: hard

"@polkadot/api@npm:^3.4.2-6":
version: 3.4.2-6
resolution: "@polkadot/api@npm:3.4.2-6"
"@polkadot/api@npm:^3.4.2-8":
version: 3.4.2-8
resolution: "@polkadot/api@npm:3.4.2-8"
dependencies:
"@babel/runtime": ^7.12.5
"@polkadot/api-derive": 3.4.2-6
"@polkadot/api-derive": 3.4.2-8
"@polkadot/keyring": ^5.2.3
"@polkadot/metadata": 3.4.2-6
"@polkadot/rpc-core": 3.4.2-6
"@polkadot/rpc-provider": 3.4.2-6
"@polkadot/types": 3.4.2-6
"@polkadot/types-known": 3.4.2-6
"@polkadot/metadata": 3.4.2-8
"@polkadot/rpc-core": 3.4.2-8
"@polkadot/rpc-provider": 3.4.2-8
"@polkadot/types": 3.4.2-8
"@polkadot/types-known": 3.4.2-8
"@polkadot/util": ^5.2.3
"@polkadot/util-crypto": ^5.2.3
"@polkadot/x-rxjs": 3.4.2-6
"@polkadot/x-rxjs": 3.4.2-8
bn.js: ^4.11.9
eventemitter3: ^4.0.7
checksum: d5d526f4652ec48ceae0837400f87fdaa61273ee50c964a7396c4c0d03b28feb93eb0ea0b010c2e6fe2e512f9415eb78ea4b557add7c4d261b33b88b63a7ae44
checksum: ca10fed6c953e47995d165797b81d861403ae8f0695627819e42a3bc682ba19898c27597704e8eb76de9a3d3ce032e7d67c26751b03c507d80be4ddb3c68545a
languageName: node
linkType: hard

Expand Down Expand Up @@ -2018,7 +2018,7 @@ __metadata:
resolution: "@polkadot/app-contracts@workspace:packages/page-contracts"
dependencies:
"@babel/runtime": ^7.12.5
"@polkadot/api-contract": ^3.4.2-6
"@polkadot/api-contract": ^3.4.2-8
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -2427,17 +2427,17 @@ __metadata:
languageName: node
linkType: hard

"@polkadot/metadata@npm:3.4.2-6":
version: 3.4.2-6
resolution: "@polkadot/metadata@npm:3.4.2-6"
"@polkadot/metadata@npm:3.4.2-8":
version: 3.4.2-8
resolution: "@polkadot/metadata@npm:3.4.2-8"
dependencies:
"@babel/runtime": ^7.12.5
"@polkadot/types": 3.4.2-6
"@polkadot/types-known": 3.4.2-6
"@polkadot/types": 3.4.2-8
"@polkadot/types-known": 3.4.2-8
"@polkadot/util": ^5.2.3
"@polkadot/util-crypto": ^5.2.3
bn.js: ^4.11.9
checksum: 958c224525cdfc4fb854894899cdd9ce37ed5e179919c3df5dba45b6b44f616fccf92dbb6078830be740b7f620b5fa37785b3f1f3440b442a5d4873a99e04967
checksum: 25133a571c220f0e4c24a6b6736b63d8890926de91785946f8121c1f6a6559ecf095070a1becd70a4225534b31da342d87e0f829f1b82f30f3fb9c7caab39196
languageName: node
linkType: hard

Expand All @@ -2455,9 +2455,9 @@ __metadata:
resolution: "@polkadot/react-api@workspace:packages/react-api"
dependencies:
"@babel/runtime": ^7.12.5
"@polkadot/api": ^3.4.2-6
"@polkadot/api": ^3.4.2-8
"@polkadot/extension-dapp": ^0.36.2-1
"@polkadot/x-rxjs": ^3.4.2-6
"@polkadot/x-rxjs": ^3.4.2-8
fflate: ^0.5.2
languageName: unknown
linkType: soft
Expand Down Expand Up @@ -2586,33 +2586,33 @@ __metadata:
languageName: unknown
linkType: soft

"@polkadot/rpc-core@npm:3.4.2-6":
version: 3.4.2-6
resolution: "@polkadot/rpc-core@npm:3.4.2-6"
"@polkadot/rpc-core@npm:3.4.2-8":
version: 3.4.2-8
resolution: "@polkadot/rpc-core@npm:3.4.2-8"
dependencies:
"@babel/runtime": ^7.12.5
"@polkadot/metadata": 3.4.2-6
"@polkadot/rpc-provider": 3.4.2-6
"@polkadot/types": 3.4.2-6
"@polkadot/metadata": 3.4.2-8
"@polkadot/rpc-provider": 3.4.2-8
"@polkadot/types": 3.4.2-8
"@polkadot/util": ^5.2.3
"@polkadot/x-rxjs": 3.4.2-6
checksum: 6effd1a6b001aa97ea0592020e8c12f21d43fb7f46768f58c7f08a54f2b6492546e10ac9331beabd91ebebd9268b0eed5cd7cacc3498845bdbf31c108be64d2e
"@polkadot/x-rxjs": 3.4.2-8
checksum: 0aebf6550e38f0aa187276219b528410e7d3cd4ee4c6d2dc82ee4007760ddce622ebbba5ae29f7be2cfbb134dc759eb2cbd35f68e3e6ab66a1bd3cc10437f612
languageName: node
linkType: hard

"@polkadot/rpc-provider@npm:3.4.2-6":
version: 3.4.2-6
resolution: "@polkadot/rpc-provider@npm:3.4.2-6"
"@polkadot/rpc-provider@npm:3.4.2-8":
version: 3.4.2-8
resolution: "@polkadot/rpc-provider@npm:3.4.2-8"
dependencies:
"@babel/runtime": ^7.12.5
"@polkadot/types": 3.4.2-6
"@polkadot/types": 3.4.2-8
"@polkadot/util": ^5.2.3
"@polkadot/util-crypto": ^5.2.3
"@polkadot/x-fetch": ^5.2.3
"@polkadot/x-ws": ^5.2.3
bn.js: ^4.11.9
eventemitter3: ^4.0.7
checksum: 735bf924c035d9d24f765d6037bf96bca819568a91011609ea1826678de6f751e87eab14aedb045dab6c52b8c77bfde0397c7eda8431a88ddce8110670e038ac
checksum: 2b5c3ffabe1ecddfd8ad586b2505460150cc5619ada5a4da669b2de1e8fdfd59df03e08fa7791700d3a058b1000942276136b488000b55c8e9cf3e9802ab2d47
languageName: node
linkType: hard

Expand All @@ -2634,30 +2634,30 @@ __metadata:
languageName: node
linkType: hard

"@polkadot/types-known@npm:3.4.2-6":
version: 3.4.2-6
resolution: "@polkadot/types-known@npm:3.4.2-6"
"@polkadot/types-known@npm:3.4.2-8":
version: 3.4.2-8
resolution: "@polkadot/types-known@npm:3.4.2-8"
dependencies:
"@babel/runtime": ^7.12.5
"@polkadot/types": 3.4.2-6
"@polkadot/types": 3.4.2-8
"@polkadot/util": ^5.2.3
bn.js: ^4.11.9
checksum: 1cc43aaea49f955911a474d330ca0ec8596e52a886641793237ab364ada9ef5f16f3e60aaec332663d66604c418265d3b79059a28e54b62f3a0a2fc5b5b12e44
checksum: 3562c4eae3b67373228afa0843f831ed6c3560711a575eb58d8caa722a84b7ad630e35dba2d61aa7988c41c122bf7e2934a762c7234efb98dd207c951880ad90
languageName: node
linkType: hard

"@polkadot/types@npm:^3.4.2-6":
version: 3.4.2-6
resolution: "@polkadot/types@npm:3.4.2-6"
"@polkadot/types@npm:^3.4.2-8":
version: 3.4.2-8
resolution: "@polkadot/types@npm:3.4.2-8"
dependencies:
"@babel/runtime": ^7.12.5
"@polkadot/metadata": 3.4.2-6
"@polkadot/metadata": 3.4.2-8
"@polkadot/util": ^5.2.3
"@polkadot/util-crypto": ^5.2.3
"@polkadot/x-rxjs": 3.4.2-6
"@polkadot/x-rxjs": 3.4.2-8
"@types/bn.js": ^4.11.6
bn.js: ^4.11.9
checksum: b866eccfaedd8e2f880d2f1fa16c1b14c5cfff3c6ce45b88d3d6af6f1c6b2c7db2109b8ff09caee5f8656ecd78e00311a707ecdae3ca0e74abc8283c7ef9b782
checksum: 6f103b1a4ef1cd2d00b8ea667509cf6b9dad569a61a944cf50592ed449af9c1748e1e8f9e76d05def307871ebe5216b18871eb7f9220a1f0aa2b160f88a2c8b3
languageName: node
linkType: hard

Expand Down Expand Up @@ -2819,13 +2819,13 @@ __metadata:
languageName: node
linkType: hard

"@polkadot/x-rxjs@npm:^3.4.2-6":
version: 3.4.2-6
resolution: "@polkadot/x-rxjs@npm:3.4.2-6"
"@polkadot/x-rxjs@npm:^3.4.2-8":
version: 3.4.2-8
resolution: "@polkadot/x-rxjs@npm:3.4.2-8"
dependencies:
"@babel/runtime": ^7.12.5
rxjs: ^6.6.3
checksum: 51e257b6ca8aa176e10d3e7360d0e69fab474f2ba7d4e33f7264a8abea67a144dd97c49659c6c2783a6a90ab055f7f67e4f376e30ab40e0d816758d6c9d902f3
checksum: c70ea5e9c5b5956367e9295432f49dcb317241f49fdf6a1d0a0511d8a30dc67a594a0b1697a90a4c3fcb8c81d225345f280d4bdb8080b33cb82e0e8a590b784f
languageName: node
linkType: hard

Expand Down

0 comments on commit c4a96a2

Please sign in to comment.