From a95d7a4b8e701b324b43e334ab072f677302dac4 Mon Sep 17 00:00:00 2001 From: Jaco Greeff Date: Tue, 19 Nov 2019 14:39:54 +0100 Subject: [PATCH] Bump API (#1911) * Bump API * Session keys cleanup --- package.json | 6 +- packages/app-contracts/package.json | 2 +- .../app-staking/src/Actions/Account/index.tsx | 10 +-- packages/react-api/package.json | 2 +- packages/react-components/src/AddressInfo.tsx | 4 +- yarn.lock | 90 +++++++++---------- 6 files changed, 56 insertions(+), 58 deletions(-) diff --git a/package.json b/package.json index 38a626bf36..91b3e996d8 100644 --- a/package.json +++ b/package.json @@ -10,10 +10,10 @@ "packages/*" ], "resolutions": { - "@polkadot/api": "^0.97.0-beta.12", - "@polkadot/api-contract": "^0.97.0-beta.12", + "@polkadot/api": "^0.97.0-beta.13", + "@polkadot/api-contract": "^0.97.0-beta.13", "@polkadot/keyring": "^1.7.0-beta.7", - "@polkadot/types": "^0.97.0-beta.12", + "@polkadot/types": "^0.97.0-beta.13", "@polkadot/util": "^1.7.0-beta.7", "@polkadot/util-crypto": "^1.7.0-beta.7", "babel-core": "^7.0.0-bridge.0", diff --git a/packages/app-contracts/package.json b/packages/app-contracts/package.json index 5bde0b714a..30d285c589 100644 --- a/packages/app-contracts/package.json +++ b/packages/app-contracts/package.json @@ -11,7 +11,7 @@ "license": "Apache-2.0", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/api-contract": "^0.97.0-beta.12", + "@polkadot/api-contract": "^0.97.0-beta.13", "@polkadot/react-components": "^0.37.0-beta.103" } } diff --git a/packages/app-staking/src/Actions/Account/index.tsx b/packages/app-staking/src/Actions/Account/index.tsx index 988117748e..7d0c6a2dc8 100644 --- a/packages/app-staking/src/Actions/Account/index.tsx +++ b/packages/app-staking/src/Actions/Account/index.tsx @@ -114,16 +114,14 @@ class Account extends React.PureComponent { const isStashNominating = nominators && !!nominators.length; const _stashId = toIdString(stashId); const isStashValidating = !!allStashes && !!_stashId && allStashes.includes(_stashId); + const nextConcat = u8aConcat(...nextSessionIds.map((id): Uint8Array => id.toU8a())); + const currConcat = u8aConcat(...sessionIds.map((id): Uint8Array => id.toU8a())); return { controllerId: toIdString(controllerId), destination: rewardDestination && rewardDestination.toNumber(), - hexSessionIdNext: u8aToHex(u8aConcat(...( - nextSessionIds.length - ? nextSessionIds - : sessionIds - ).map((id): Uint8Array => id.toU8a())), 48), - hexSessionIdQueue: u8aToHex(u8aConcat(...(sessionIds).map((id): Uint8Array => id.toU8a())), 48), + hexSessionIdNext: u8aToHex(nextConcat, 48), + hexSessionIdQueue: u8aToHex(currConcat.length ? currConcat : nextConcat, 48), isStashNominating, isStashValidating, nominees: nominators && nominators.map(toIdString), diff --git a/packages/react-api/package.json b/packages/react-api/package.json index ab75c18f6e..0becd5b6cc 100644 --- a/packages/react-api/package.json +++ b/packages/react-api/package.json @@ -31,7 +31,7 @@ "homepage": "https://github.com/polkadot-js/ui/tree/master/packages/ui-reactive#readme", "dependencies": { "@babel/runtime": "^7.7.2", - "@polkadot/api": "^0.97.0-beta.12", + "@polkadot/api": "^0.97.0-beta.13", "@polkadot/extension-dapp": "^0.14.0-beta.5", "edgeware-node-types": "^1.0.10", "rxjs-compat": "^6.5.3" diff --git a/packages/react-components/src/AddressInfo.tsx b/packages/react-components/src/AddressInfo.tsx index ec6d0dfc88..43ef88ffd7 100644 --- a/packages/react-components/src/AddressInfo.tsx +++ b/packages/react-components/src/AddressInfo.tsx @@ -49,7 +49,7 @@ interface Props extends BareProps, I18nProps { stakingInfo?: DerivedStaking; withBalance?: boolean | BalanceActiveType; withExtended?: boolean | CryptoActiveType; - withHexSessionId?: [string | null][]; + withHexSessionId?: (string | null)[]; withRewardDestination?: boolean; withValidatorPrefs?: boolean | ValidatorPrefsType; } @@ -348,7 +348,7 @@ function AddressInfo (props: Props): React.ReactElement { )} {withHexSessionId && withHexSessionId[0] !== withHexSessionId[1] && ( <> -