[CI Skip] release/stable 2.1.1

skip-checks: true

.babelrc.js

@@ -1 +1,4 @@
+// Copyright 2017-2020 @polkadot/api authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
 module.exports = require('./babel.config.js');

.eslintrc.js

@@ -1,3 +1,6 @@
+// Copyright 2017-2020 @polkadot/api authors & contributors
+// SPDX-License-Identifier: Apache-2.0
+
 const base = require('@polkadot/dev/config/eslint');
 
 module.exports = {

.yarnrc.yml

@@ -7,5 +7,9 @@ nodeLinker: node-modules
 plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
     spec: "@yarnpkg/plugin-interactive-tools"
+  - path: .yarn/plugins/@yarnpkg/plugin-version.cjs
+    spec: "@yarnpkg/plugin-version"
+  - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
+    spec: "@yarnpkg/plugin-workspace-tools"
 
 yarnPath: .yarn/releases/yarn-2.2.2.cjs

CHANGELOG.md

@@ -1,5 +1,86 @@
 # CHANGELOG
 
+## 2.1.1 Oct 5, 2020
+
+Upgrade priority: Low.
+
+Contributed:
+
+- Remove unused documentation link (Thanks to https://github.com/roccomuso)
+
+Changes:
+
+- Adjust RPC error formatting with string cleanups and a larger allowed range
+- Apply limit protection on `Text` & `Bytes`, protecting against OOM on erroneous decoding
+- Add `derive.staking.validatorsFrom` to determine validators nominated and own validators
+- Cleanup document generation without (currently unused) summary links
+- Rename static TRANSACTION_VERSION to EXTRINSIC_VERSION (Substrate alignment)
+- Bump Substrate metadata (tests, doc generation)
+
+
+## 2.0.1 Sep 28, 2020
+
+Upgrade priority: Medium. Required for all teams building on Substrate 2.0 for full compatibility.
+
+- **Important** The `RefCount` type (used by `query.system.accounts`) has been changed to a `u32`. On older chains supply the `RefCount: 'RefCountTo259'` override
+- **Breaking change** Metadata versions before v9 as not supported anymore. v4 was the first version to go with the Substrate 1.0 while Kusama itself starts at v9 as the earliest version. This means that Substrate 1.x chains that have not had any upgrades are not supported in this version of the API anymore.
+- **Breaking change** Extrinsic versions before v4 (1-3) are not supported anymore. This aligns with the above metadata change, where v4 is the canonical version.
+- **Breaking change** Support for the old-style linked-map retrievals via `query.<module>.map()` have been dropped, only the existing `.keys()/.entries()` are available for map iteration.
+
+Contributed:
+
+- Add secondary fields to EpochAuthorship (Thanks to https://github.com/andresilva)
+- Add support for FixedVec in enums (Thanks to https://github.com/monitz87)
+
+Changes:
+
+- Drop support for Substrate 1.0 metadata versions 1-8
+- Drop support for Substrate 1.0 extrinsics version 1-3
+- Add support for `grandpa_proveFinality` RPC
+- Drop support for linked map queries not via .entries (deprecated since early versions of Substrate 2)
+- Support `.entries()` on older chains without `queryStorageAt` support
+- Add bounty type definitions from treasury palette
+- Adjust `RefCount` type as per substrate 2.0
+- Add `PalletVersion` types for future palette versioning
+- Adjust formatting for `Per{cent, bill, mill}` without instance checks
+- Skip invalid keys on validator retrievals
+
+
+## 1.34.1 Sep 21, 2020
+
+Upgrade priority: High. Metadata v12 is the next major version containing structural data exchange changes and will start rolling out to test and live networks in due course.
+
+- **Breaking change** The `Decorated` (from `@polkadot/metadata`) class signature has changed. It now always expects a valid `Metadata` object to be passed-in, instead of raw data. It is recommended to create a `Metadata` object, set it on the registry with `.setMetadata` and then only create a `Decorated` instance. (Only affects metadata-only users of the API)
+
+Contributed:
+
+- Added support for POW block author extraction (Thanks to https://github.com/sorpaas)
+
+Changes:
+
+- Ensure Metadata retrieval does not pollute the default registry
+- When passing `{ nonce: -1 }` to `signAndSend` the API will use `system.accountNextIndex` to determine the nonce
+- Ensure that upgrades override old registry types (non-specified in current)
+- Support for Metadata v12 with fixed indices
+- Cleanups for WebSocket class detection and creation
+- Ensure that ignored map params yield an error on `iterKey`
+- Cater for older chains in derive democracy locks (availability detection)
+
+
+## 1.33.1 Sep 14, 2020
+
+Upgrade priority: Low. Recommended when using clones instances.
+
+Changes:
+
+- Allow `paymentInfo` on any extrinsic with `tx.paymentInfo(<address>, <at>)` (hash specified)
+- When cloning an API instance the runtimeChain is now properly set from source
+- When cloning an API instance the registry is shared with the source
+- Optimize derive `receivedHeartbeats` to not re-create the full object
+- Add `staking.stakerPrefs` derive to retrieve validatorPrefs over a range of eras
+- Basic map of Websocket error codes to short descriptions (where none available)
+
+
 ## 1.32.1 Sep 7, 2020
 
 Upgrade priority: Low. Recommended when manually using provider connect/disconnect or using multiple instances in a single process.

README.md

@@ -27,7 +27,6 @@ The API is split up into a number of internal packages -
 
 Type definitions for interfaces as exposed by Polkadot & Substrate clients -
 
-- [@polkadot/jsonrpc](packages/jsonrpc/) Definitions for JSONRPC endpoints
 - [@polkadot/types](packages/types/) Codecs for all Polkadot and Substrate primitives
 
 ## development

babel.config.js

@@ -1,5 +1,4 @@
 // Copyright 2017-2020 @polkadot/api authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 module.exports = require('@polkadot/dev/config/babel');

copy-to-apps.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Copyright 2017-2020 @polkadot/api authors & contributors
+# SPDX-License-Identifier: Apache-2.0
 
 function copy_folder () {
   SRC="packages/$1/build"

copy-to-test.sh

@@ -1,4 +1,6 @@
 #!/usr/bin/env bash
+# Copyright 2017-2020 @polkadot/api authors & contributors
+# SPDX-License-Identifier: Apache-2.0
 
 function copy_folder () {
   SRC="packages/$1/build"

docs/cookbook/blocks.md

@@ -53,8 +53,19 @@ const signedBlock = await this.api.rpc.chain.getBlock();
 
 // the information for each of the contained extrinsics
 signedBlock.block.extrinsics.forEach((ex, index) => {
-  // the extrinsics are decoded by the API
+  // the extrinsics are decoded by the API, human-like view
   console.log(index, ex.toHuman());
+
+  const { isSigned, meta, method: { args, method, section } } = ex;
+
+  // explicit display of name, args & documentation
+  console.log(`${section}.${method}(${args.map((a) => a.toString()).join(', ')})`);
+  console.log(meta.documentation.map((d) => d.toString()).join('\n'));
+
+  // signer/nonce info
+  if (isSigned) {
+    console.log(`signer=${ex.signer.toString()}, nonce=${ex.nonce.toString()}`);
+  }
 });
 ```
 

jest.config.js

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 const config = require('@polkadot/dev/config/jest');
 

jest.resolver.js

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 const path = require('path');
 

lerna.json

@@ -1,13 +0,0 @@
-{
-  "npmClient": "yarn",
-  "useWorkspaces": true,
-  "command": {
-    "publish": {
-      "allowBranch": "master"
-    }
-  },
-  "packages": [
-    "packages/*"
-  ],
-  "version": "1.32.1"
-}

package.json

@@ -8,7 +8,7 @@
   ],
   "resolutions": {
     "babel-core": "^7.0.0-bridge.0",
-    "typescript": "^4.0.2"
+    "typescript": "^4.0.3"
   },
   "scripts": {
     "build": "yarn build:interfaces && polkadot-dev-build-ts && (cd packages/typegen && copyfiles scripts/* build)",
@@ -28,15 +28,15 @@
     "@babel/core": "^7.11.6",
     "@babel/register": "^7.11.5",
     "@babel/runtime": "^7.11.2",
-    "@polkadot/dev": "^0.55.47",
-    "@polkadot/ts": "^0.3.43",
+    "@polkadot/dev": "^0.57.8",
+    "@polkadot/ts": "^0.3.49",
     "@polkadot/typegen": "workspace:packages/typegen",
-    "@types/jest": "^26.0.13",
-    "@vuepress/plugin-search": "^1.5.4",
-    "copyfiles": "^2.3.0",
-    "typedoc": "^0.19.1",
-    "typedoc-plugin-markdown": "^2.4.2",
-    "typedoc-plugin-no-inherit": "^1.1.10"
+    "@types/jest": "^26.0.14",
+    "@vuepress/plugin-search": "^1.6.0",
+    "copyfiles": "^2.4.0",
+    "typedoc": "^0.19.2",
+    "typedoc-plugin-markdown": "^3.0.7",
+    "typedoc-plugin-no-inherit": "^1.2.0"
   },
-  "version": "1.32.1"
+  "version": "2.1.1"
 }

packages/api-contract/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/api-contract",
-  "version": "1.32.1",
+  "version": "2.1.1",
   "description": "Interfaces for interacting with contracts and contract ABIs",
   "main": "index.js",
   "keywords": [
@@ -27,11 +27,11 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api-contract#readme",
   "dependencies": {
     "@babel/runtime": "^7.11.2",
-    "@polkadot/api": "1.32.1",
-    "@polkadot/rpc-core": "1.32.1",
-    "@polkadot/types": "1.32.1",
-    "@polkadot/util": "^3.4.1",
+    "@polkadot/api": "2.1.1",
+    "@polkadot/rpc-core": "2.1.1",
+    "@polkadot/types": "2.1.1",
+    "@polkadot/util": "^3.5.1",
     "bn.js": "^5.1.3",
-    "rxjs": "^6.6.2"
+    "rxjs": "^6.6.3"
   }
 }

packages/api-contract/src/Abi.spec.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-contract authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { TypeRegistry } from '@polkadot/types';
 

packages/api-contract/src/Abi.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-contract authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { Registry } from '@polkadot/types/types';
 import { AbiConstructors, AbiMessages, ContractABI, ContractABIPre, ContractABIFn, InterfaceAbi } from './types';

packages/api-contract/src/ContractRegistry.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-contract authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { CodecArg, Constructor, Registry, TypeDef } from '@polkadot/types/types';
 import { ContractABIArgBasePre, ContractABIContract, ContractABIContractPre, ContractABIEvent, ContractABIEventPre, ContractABIFn, ContractABIFnArg, ContractABIMessage, ContractABIMessageBase, ContractABIMessagePre, ContractABI, ContractABIMessageCommon, ContractABIPre, ContractABIRange, ContractABIRangePre, ContractABIStorage, ContractABIStorageLayout, ContractABIStorageLayoutPre, ContractABIStoragePre, ContractABIStorageStruct, ContractABIStorageStructPre, ContractABITypePre } from './types';

packages/api-contract/src/MetaRegistry.spec.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/types authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { TypeRegistry } from '@polkadot/types';
 

packages/api-contract/src/MetaRegistry.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-contract authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { MetaRegistryItem, MetaRegistryJson, MetaTypeDefClikeEnum, MetaType, MetaTypeDefEnum, MetaTypeDefEnumVariant, MetaTypeDefEnumVariantStruct, MetaTypeDefEnumVariantTupleStruct, MetaTypeDefEnumVariantUnit, MetaTypeDefStruct, MetaTypeDefStructField, MetaTypeDefTupleStruct, MetaTypeDefUnion, MetaTypeIdCustom, MetaTypeIdVec, MetaTypeIdVecFixed, MetaTypeInfo, Registry, StringIndex, TypeDef, TypeDefInfo, TypeIndex } from '@polkadot/types/types';
 

packages/api-contract/src/base/Blueprint.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-contract authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { ApiTypes, DecorateMethod } from '@polkadot/api/types';
 import { AccountId, Address, Hash } from '@polkadot/types/interfaces';

packages/api-contract/src/base/Code.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-contract authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { ApiTypes, DecorateMethod } from '@polkadot/api/types';
 import { AccountId, Address, Hash } from '@polkadot/types/interfaces';

packages/api-contract/src/base/Contract.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-contract authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { ApiTypes, DecorateMethod, ObsInnerType } from '@polkadot/api/types';
 import { AccountId, Address, ContractExecResult } from '@polkadot/types/interfaces';

packages/api-contract/src/base/index.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 export { default as Blueprint } from './Blueprint';
 export { default as Code } from './Code';

packages/api-contract/src/base/util.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { ApiTypes, DecorateMethod, DecoratedRpc, SubmittableModuleExtrinsics } from '@polkadot/api/types';
 import { RpcInterface } from '@polkadot/rpc-core/types';

packages/api-contract/src/index.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-contract authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 export { default as Abi } from './Abi';
 export * from './rx';

packages/api-contract/src/promise/PromiseBlueprint.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-contract authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { Hash } from '@polkadot/types/interfaces';
 import { ContractABIPre } from '../types';

packages/api-contract/src/promise/PromiseCode.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-contract authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { ContractABIPre } from '../types';
 

packages/api-contract/src/promise/PromiseContract.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-contract authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { AccountId } from '@polkadot/types/interfaces';
 import { ContractABIPre } from '../types';

packages/api-contract/src/promise/index.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-contract authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 export { default as PromiseBlueprint } from './PromiseBlueprint';
 export { default as PromiseCode } from './PromiseCode';

packages/api-contract/src/rx/RxBlueprint.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-contract authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { Hash } from '@polkadot/types/interfaces';
 import { ContractABIPre } from '../types';

packages/api-contract/src/rx/RxCode.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-contract authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { ContractABIPre } from '../types';
 

packages/api-contract/src/rx/RxContract.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-contract authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { AccountId } from '@polkadot/types/interfaces';
 import { ContractABIPre } from '../types';

packages/api-contract/src/rx/index.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-contract authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 export { default as RxBlueprint } from './RxBlueprint';
 export { default as RxCode } from './RxCode';

packages/api-contract/src/types.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-contract authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { ApiTypes, DecorateMethod } from '@polkadot/api/types';
 import { AccountId, Address, ContractExecResult } from '@polkadot/types/interfaces';

packages/api-contract/src/util.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/rpc-core authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { Codec, Registry, TypeDef, TypeDefInfo } from '@polkadot/types/types';
 

packages/api-derive/README.md

@@ -1,7 +1,3 @@
 # @polkadot/api-derive
 
 Common functions used across Polkadot, derived from RPC calls and storage queries.
-
-## Classes
-
-[Classes](SUMMARY.md)

packages/api-derive/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@polkadot/api-derive",
-  "version": "1.32.1",
+  "version": "2.1.1",
   "description": "Common functions used across Polkadot, derived from RPC calls and storage queries.",
   "main": "index.js",
   "keywords": [
@@ -28,17 +28,17 @@
   "homepage": "https://github.com/polkadot-js/api/tree/master/packages/api-derive#readme",
   "dependencies": {
     "@babel/runtime": "^7.11.2",
-    "@polkadot/api": "1.32.1",
-    "@polkadot/rpc-core": "1.32.1",
-    "@polkadot/rpc-provider": "1.32.1",
-    "@polkadot/types": "1.32.1",
-    "@polkadot/util": "^3.4.1",
-    "@polkadot/util-crypto": "^3.4.1",
+    "@polkadot/api": "2.1.1",
+    "@polkadot/rpc-core": "2.1.1",
+    "@polkadot/rpc-provider": "2.1.1",
+    "@polkadot/types": "2.1.1",
+    "@polkadot/util": "^3.5.1",
+    "@polkadot/util-crypto": "^3.5.1",
     "bn.js": "^5.1.3",
     "memoizee": "^0.4.14",
-    "rxjs": "^6.6.2"
+    "rxjs": "^6.6.3"
   },
   "devDependencies": {
-    "@polkadot/keyring": "^3.4.1"
+    "@polkadot/keyring": "^3.5.1"
   }
 }

packages/api-derive/src/accounts/accountId.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';
 

packages/api-derive/src/accounts/flags.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { ApiInterfaceRx } from '@polkadot/api/types';
 import { AccountId, Address, Balance } from '@polkadot/types/interfaces';

packages/api-derive/src/accounts/idAndIndex.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';
 import { AccountIdAndIndex } from '../types';

packages/api-derive/src/accounts/idToIndex.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { AccountId, AccountIndex } from '@polkadot/types/interfaces';
 import { AccountIndexes } from '../types';

packages/api-derive/src/accounts/index.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 export * from './accountId';
 export * from './flags';

packages/api-derive/src/accounts/indexToId.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { AccountId, AccountIndex, BalanceOf } from '@polkadot/types/interfaces';
 import { ITuple } from '@polkadot/types/types';

packages/api-derive/src/accounts/indexes.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { ApiInterfaceRx } from '@polkadot/api/types';
 import { AccountId, AccountIndex } from '@polkadot/types/interfaces';

packages/api-derive/src/accounts/info.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { ApiInterfaceRx } from '@polkadot/api/types';
 import { AccountId, AccountIndex, Address, Balance, Registration } from '@polkadot/types/interfaces';

packages/api-derive/src/accounts/types.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { AccountId, AccountIndex, RegistrationJudgement } from '@polkadot/types/interfaces';
 

packages/api-derive/src/balances/account.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { AccountId, AccountData, AccountIndex, AccountInfo, Address, Balance, Index } from '@polkadot/types/interfaces';
 import { ITuple } from '@polkadot/types/types';

packages/api-derive/src/balances/all.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { AccountId, AccountIndex, Address, Balance, BalanceLock, BalanceLockTo212, BlockNumber, VestingInfo, VestingSchedule } from '@polkadot/types/interfaces';
 import { DeriveBalancesAccount, DeriveBalancesAll } from '../types';

packages/api-derive/src/balances/fees.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { ApiInterfaceRx } from '@polkadot/api/types';
 import { Balance } from '@polkadot/types/interfaces';

packages/api-derive/src/balances/index.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { all } from './all';
 

packages/api-derive/src/balances/votingBalances.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { AccountId, AccountIndex, Address } from '@polkadot/types/interfaces';
 import { DeriveBalancesAccount } from '../types';

packages/api-derive/src/chain/bestNumber.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { BlockNumber } from '@polkadot/types/interfaces';
 

packages/api-derive/src/chain/bestNumberFinalized.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { BlockNumber } from '@polkadot/types/interfaces';
 

packages/api-derive/src/chain/bestNumberLag.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { BlockNumber } from '@polkadot/types/interfaces';
 

packages/api-derive/src/chain/getBlock.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { ApiInterfaceRx } from '@polkadot/api/types';
 

packages/api-derive/src/chain/getHeader.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { ApiInterfaceRx } from '@polkadot/api/types';
 

packages/api-derive/src/chain/index.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 export * from './bestNumber';
 export * from './bestNumberFinalized';

packages/api-derive/src/chain/subscribeNewHeads.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { ApiInterfaceRx } from '@polkadot/api/types';
 

packages/api-derive/src/collective/index.ts

@@ -1,5 +1,4 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 export * from './proposals';

packages/api-derive/src/collective/proposals.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { ApiInterfaceRx } from '@polkadot/api/types';
 import { Hash, Proposal, Votes } from '@polkadot/types/interfaces';

packages/api-derive/src/contracts/fees.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { ApiInterfaceRx } from '@polkadot/api/types';
 import { DeriveContractFees } from '../types';

packages/api-derive/src/contracts/index.ts

@@ -1,5 +1,4 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 export * from './fees';

packages/api-derive/src/council/index.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 export * from './proposals';
 export * from './votes';

packages/api-derive/src/council/proposals.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { ApiInterfaceRx } from '@polkadot/api/types';
 import { DeriveCollectiveProposals } from '../types';

packages/api-derive/src/council/types.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { AccountId, Balance } from '@polkadot/types/interfaces';
 

packages/api-derive/src/council/votes.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { AccountId, Balance } from '@polkadot/types/interfaces';
 import { ITuple } from '@polkadot/types/types';
@@ -14,35 +13,19 @@ import { Vec } from '@polkadot/types';
 import { memo } from '../util';
 
 function retrieveStakeOf (api: ApiInterfaceRx): Observable<[AccountId, Balance][]> {
-  const elections = (api.query.electionsPhragmen || api.query.elections);
-
-  return elections.stakeOf.creator.meta.type.asMap.linked.isTrue
-    ? elections.stakeOf<ITuple<[Vec<AccountId>, Vec<Balance>]>>().pipe(
-      map(([voters, stake]) =>
-        voters.map((voter, index): [AccountId, Balance] => [voter, stake[index]])
-      )
+  return (api.query.electionsPhragmen || api.query.elections).stakeOf.entries<Balance>().pipe(
+    map((entries) =>
+      entries.map(([key, stake]) => [key.args[0] as AccountId, stake])
     )
-    : elections.stakeOf.entries<Balance>().pipe(
-      map((entries) =>
-        entries.map(([key, stake]) => [key.args[0] as AccountId, stake])
-      )
-    );
+  );
 }
 
 function retrieveVoteOf (api: ApiInterfaceRx): Observable<[AccountId, AccountId[]][]> {
-  const elections = (api.query.electionsPhragmen || api.query.elections);
-
-  return elections.votesOf.creator.meta.type.asMap.linked.isTrue
-    ? elections.votesOf<ITuple<[Vec<AccountId>, Vec<Vec<AccountId>>]>>().pipe(
-      map(([voters, votes]) =>
-        voters.map((voter, index) => [voter, votes[index]])
-      )
+  return (api.query.electionsPhragmen || api.query.elections).votesOf.entries<Vec<AccountId>>().pipe(
+    map((entries) =>
+      entries.map(([key, votes]) => [key.args[0] as AccountId, votes])
     )
-    : elections.votesOf.entries<Vec<AccountId>>().pipe(
-      map((entries) =>
-        entries.map(([key, votes]) => [key.args[0] as AccountId, votes])
-      )
-    );
+  );
 }
 
 function retrievePrev (api: ApiInterfaceRx): Observable<DeriveCouncilVotes> {

packages/api-derive/src/council/votesOf.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { AccountId } from '@polkadot/types/interfaces';
 import { ApiInterfaceRx } from '@polkadot/api/types';

packages/api-derive/src/democracy/dispatchQueue.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { BlockNumber, Hash, ReferendumIndex, Scheduled } from '@polkadot/types/interfaces';
 import { ITuple } from '@polkadot/types/types';

packages/api-derive/src/democracy/index.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 export * from './dispatchQueue';
 export * from './locks';

packages/api-derive/src/democracy/locks.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { AccountId, ReferendumInfo, ReferendumInfoTo239, VotingDelegating, VotingDirect, VotingDirectVote } from '@polkadot/types/interfaces';
 import { ApiInterfaceRx } from '@polkadot/api/types';
@@ -76,14 +75,16 @@ function directLocks (api: ApiInterfaceRx, { votes }: VotingDirect): Observable<
 
 export function locks (instanceId: string, api: ApiInterfaceRx): (accountId: string | AccountId) => Observable<DeriveDemocracyLock[]> {
   return memo(instanceId, (accountId: string | AccountId): Observable<DeriveDemocracyLock[]> =>
-    api.query.democracy.votingOf(accountId).pipe(
-      switchMap((voting): Observable<DeriveDemocracyLock[]> =>
-        voting.isDirect
-          ? directLocks(api, voting.asDirect)
-          : voting.isDelegating
-            ? delegateLocks(api, voting.asDelegating)
-            : of([])
+    api.query.democracy.votingOf
+      ? api.query.democracy.votingOf(accountId).pipe(
+        switchMap((voting): Observable<DeriveDemocracyLock[]> =>
+          voting.isDirect
+            ? directLocks(api, voting.asDirect)
+            : voting.isDelegating
+              ? delegateLocks(api, voting.asDelegating)
+              : of([])
+        )
       )
-    )
+      : of([])
   );
 }

packages/api-derive/src/democracy/nextExternal.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { Hash, VoteThreshold } from '@polkadot/types/interfaces';
 import { ITuple } from '@polkadot/types/types';

packages/api-derive/src/democracy/preimage.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { AccountId, Balance, BlockNumber, Hash } from '@polkadot/types/interfaces';
 import { ITuple } from '@polkadot/types/types';

packages/api-derive/src/democracy/preimages.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { AccountId, Balance, BlockNumber, Hash } from '@polkadot/types/interfaces';
 import { ITuple } from '@polkadot/types/types';

packages/api-derive/src/democracy/proposals.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { AccountId, Balance, Hash, PropIndex } from '@polkadot/types/interfaces';
 import { ITuple } from '@polkadot/types/types';

packages/api-derive/src/democracy/referendumIds.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { ApiInterfaceRx } from '@polkadot/api/types';
 import { ReferendumIndex } from '@polkadot/types/interfaces';

packages/api-derive/src/democracy/referendums.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { ApiInterfaceRx } from '@polkadot/api/types';
 import { DeriveReferendumExt } from '../types';

packages/api-derive/src/democracy/referendumsActive.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { ApiInterfaceRx } from '@polkadot/api/types';
 import { DeriveReferendum } from '../types';

packages/api-derive/src/democracy/referendumsFinished.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { ApiInterfaceRx } from '@polkadot/api/types';
 import { ReferendumInfo, ReferendumInfoFinished } from '@polkadot/types/interfaces';

packages/api-derive/src/democracy/referendumsInfo.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { ApiInterfaceRx } from '@polkadot/api/types';
 import { AccountId, ReferendumInfo, ReferendumInfoTo239, Vote, Voting, VotingDirectVote, VotingDelegating } from '@polkadot/types/interfaces';

packages/api-derive/src/democracy/sqrtElectorate.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { ApiInterfaceRx } from '@polkadot/api/types';
 

packages/api-derive/src/democracy/types.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import type BN from 'bn.js';
 import { AccountId, Balance, BlockNumber, Hash, Proposal, PropIndex, ReferendumInfoTo239, ReferendumStatus, Vote, ReferendumIndex, VoteThreshold } from '@polkadot/types/interfaces';

packages/api-derive/src/democracy/util.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { ApiInterfaceRx } from '@polkadot/api/types';
 import { AccountId, Balance, BlockNumber, PreimageStatus, Proposal, ReferendumInfo, ReferendumInfoTo239, ReferendumStatus, Tally, VoteThreshold } from '@polkadot/types/interfaces';

packages/api-derive/src/elections/index.ts

@@ -1,5 +1,4 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 export * from './info';

packages/api-derive/src/elections/info.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { AccountId, Balance, BlockNumber } from '@polkadot/types/interfaces';
 import { ITuple } from '@polkadot/types/types';

packages/api-derive/src/elections/types.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { AccountId, Balance, BlockNumber, SetIndex, VoteIndex } from '@polkadot/types/interfaces';
 

packages/api-derive/src/imOnline/index.ts

@@ -1,5 +1,4 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 export * from './receivedHeartbeats';

packages/api-derive/src/imOnline/receivedHeartbeats.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { AccountId } from '@polkadot/types/interfaces';
 import { DeriveHeartbeats } from '../types';
@@ -13,6 +12,25 @@ import { BN_ZERO } from '@polkadot/util';
 
 import { memo } from '../util';
 
+function mapResult ([result, validators, heartbeats, numBlocks]: [DeriveHeartbeats, AccountId[], Option<Bytes>[], u32[]]): DeriveHeartbeats {
+  validators.forEach((validator, index): void => {
+    const validatorId = validator.toString();
+    const blockCount = numBlocks[index];
+    const hasMessage = !heartbeats[index].isEmpty;
+    const prev = result[validatorId];
+
+    if (!prev || prev.hasMessage !== hasMessage || !prev.blockCount.eq(blockCount)) {
+      result[validatorId] = {
+        blockCount,
+        hasMessage,
+        isOnline: hasMessage || blockCount.gt(BN_ZERO)
+      };
+    }
+  });
+
+  return result;
+}
+
 /**
  * @description Return a boolean array indicating whether the passed accounts had received heartbeats in the current session
  */
@@ -20,8 +38,9 @@ export function receivedHeartbeats (instanceId: string, api: ApiInterfaceRx): ()
   return memo(instanceId, (): Observable<DeriveHeartbeats> =>
     api.query.imOnline?.receivedHeartbeats
       ? api.derive.staking.overview().pipe(
-        switchMap(({ currentIndex, validators }): Observable<[AccountId[], Option<Bytes>[], u32[]]> =>
+        switchMap(({ currentIndex, validators }): Observable<[DeriveHeartbeats, AccountId[], Option<Bytes>[], u32[]]> =>
           combineLatest([
+            of({}),
             of(validators),
             api.query.imOnline.receivedHeartbeats.multi<Option<Bytes>>(
               validators.map((_address, index) => [currentIndex, index])),
@@ -29,16 +48,8 @@ export function receivedHeartbeats (instanceId: string, api: ApiInterfaceRx): ()
               validators.map((address) => [currentIndex, address]))
           ])
         ),
-        map(([validators, heartbeats, numBlocks]): DeriveHeartbeats =>
-          validators.reduce((result: DeriveHeartbeats, validator, index): DeriveHeartbeats => ({
-            ...result,
-            [validator.toString()]: {
-              blockCount: numBlocks[index],
-              hasMessage: !heartbeats[index].isEmpty,
-              isOnline: !heartbeats[index].isEmpty || numBlocks[index].gt(BN_ZERO)
-            }
-          }), {})
-        )
+        map(mapResult)
       )
-      : of({}));
+      : of({})
+  );
 }

packages/api-derive/src/index.spec.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-unsafe-call */

packages/api-derive/src/index.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { ApiInterfaceRx } from '@polkadot/api/types';
 import { AnyFunction } from '@polkadot/types/types';

packages/api-derive/src/parachains/index.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 export * from './info';
 export * from './overview';

packages/api-derive/src/parachains/info.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { CollatorId, ParaId } from '@polkadot/types/interfaces';
 import { DeriveParachainInfo, DeriveParachainFull, DeriveParachainActive } from '../types';

packages/api-derive/src/parachains/overview.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { ParaId } from '@polkadot/types/interfaces';
 import { DeriveParachain, DeriveParachainInfo } from '../types';

packages/api-derive/src/parachains/types.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { CollatorId, ParaId, ParaInfo, Retriable, UpwardMessage } from '@polkadot/types/interfaces';
 import { ITuple } from '@polkadot/types/types';

packages/api-derive/src/session/eraLength.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { BlockNumber } from '@polkadot/types/interfaces';
 

packages/api-derive/src/session/eraProgress.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { BlockNumber } from '@polkadot/types/interfaces';
 

packages/api-derive/src/session/index.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 export * from './eraLength';
 export * from './eraProgress';

packages/api-derive/src/session/indexes.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { ApiInterfaceRx } from '@polkadot/api/types';
 import { ActiveEraInfo, EraIndex, Moment, SessionIndex } from '@polkadot/types/interfaces';

packages/api-derive/src/session/info.ts

@@ -1,6 +1,5 @@
 // Copyright 2017-2020 @polkadot/api-derive authors & contributors
-// This software may be modified and distributed under the terms
-// of the Apache-2.0 license. See the LICENSE file for details.
+// SPDX-License-Identifier: Apache-2.0
 
 import { SessionIndex } from '@polkadot/types/interfaces';
 import { DeriveSessionInfo, DeriveSessionIndexes } from '../types';