fix: Use correct registry when creating calls; Remove usage of derive…

….chain.getBlock (#391)

* fix: Use correct registry when creating calls; Remove usage of derive.chain.getBlock

* small change

* Update specs

package.json

@@ -36,8 +36,8 @@
     "test": "jest --silent"
   },
   "dependencies": {
-    "@polkadot/api": "^3.3.2",
-    "@polkadot/apps-config": "^0.74.1",
+    "@polkadot/api": "^3.4.1",
+    "@polkadot/apps-config": "^0.75.1",
     "@polkadot/util-crypto": "^5.2.3",
     "@substrate/calc": "^0.1.3",
     "confmgr": "^1.0.6",
@@ -47,14 +47,14 @@
     "winston": "^3.3.3"
   },
   "devDependencies": {
-    "@types/express": "^4.17.9",
-    "@types/express-serve-static-core": "^4.17.17",
+    "@types/express": "^4.17.11",
+    "@types/express-serve-static-core": "^4.17.18",
     "@types/http-errors": "^1.6.3",
-    "@types/jest": "^26.0.19",
+    "@types/jest": "^26.0.20",
     "@types/morgan": "^1.9.2",
     "@types/triple-beam": "^1.3.2",
-    "@typescript-eslint/eslint-plugin": "4.12.0",
-    "@typescript-eslint/parser": "4.12.0",
+    "@typescript-eslint/eslint-plugin": "4.13.0",
+    "@typescript-eslint/parser": "4.13.0",
     "eslint": "^7.17.0",
     "eslint-config-prettier": "^7.1.0",
     "eslint-plugin-prettier": "^3.3.1",

src/services/blocks/BlocksService.spec.ts

@@ -53,7 +53,7 @@ describe('BlocksService', () => {
 				(undefined as unknown) as GenericExtrinsic
 			);
 
-			mockApi.derive.chain.getBlock = (() =>
+			mockApi.rpc.chain.getBlock = (() =>
 				Promise.resolve().then(() => {
 					return {
 						block: mockBlock789629BadExt,
@@ -68,7 +68,7 @@ describe('BlocksService', () => {
 				)
 			);
 
-			mockApi.derive.chain.getBlock = (getBlock as unknown) as GetBlock;
+			mockApi.rpc.chain.getBlock = (getBlock as unknown) as GetBlock;
 		});
 	});
 

src/services/blocks/BlocksService.ts

@@ -1,10 +1,11 @@
 import { ApiPromise } from '@polkadot/api';
-import { SignedBlockExtended } from '@polkadot/api-derive/type';
 import { GenericCall, Struct } from '@polkadot/types';
 import { AbstractInt } from '@polkadot/types/codec/AbstractInt';
 import {
+	AccountId,
 	Block,
 	BlockHash,
+	Digest,
 	DispatchInfo,
 	EventRecord,
 	Hash,
@@ -45,24 +46,19 @@ export class BlocksService extends AbstractService {
 	): Promise<IBlock> {
 		const { api } = this;
 
-		let block;
-		let events;
-		let author;
+		let block, events, sessionValidators;
 		if (typeof api.query.session?.validators?.at === 'function') {
-			// `api.derive.chain.getBlock` requires that `api.query.session?.validators?.at`
-			// is a function in order to query the validator set to pull out the author
-			// see: https://github.com/polkadot-js/api/blob/master/packages/api-derive/src/chain/getBlock.ts#L31
-			[{ author, block }, events] = await Promise.all([
-				api.derive.chain.getBlock(hash) as Promise<SignedBlockExtended>,
+			[{ block }, events, sessionValidators] = await Promise.all([
+				api.rpc.chain.getBlock(hash),
 				this.fetchEvents(api, hash),
+				api.query.session.validators.at(hash),
 			]);
 		} else {
 			[{ block }, events] = await Promise.all([
 				api.rpc.chain.getBlock(hash),
 				this.fetchEvents(api, hash),
 			]);
 		}
-		const authorId = author;
 
 		const {
 			parentHash,
@@ -72,9 +68,11 @@ export class BlocksService extends AbstractService {
 			digest,
 		} = block.header;
 
-		const logs = digest.logs.map((log) => {
-			const { type, index, value } = log;
+		const authorId = sessionValidators
+			? this.extractAuthor(sessionValidators, digest)
+			: undefined;
 
+		const logs = digest.logs.map(({ type, index, value }) => {
 			return { type, index, value };
 		});
 
@@ -513,4 +511,29 @@ export class BlocksService extends AbstractService {
 			args: newArgs,
 		};
 	}
+
+	// Almost exact mimic of https://github.com/polkadot-js/api/blob/e51e89df5605b692033df864aa5ab6108724af24/packages/api-derive/src/type/util.ts#L6
+	// but we save a call to `getHeader` by hardcoding the logic here and using the digest from the blocks header.
+	private extractAuthor(
+		sessionValidators: AccountId[],
+		digest: Digest
+	): AccountId | undefined {
+		const [pitem] = digest.logs.filter(({ type }) => type === 'PreRuntime');
+		// extract from the substrate 2.0 PreRuntime digest
+		if (pitem) {
+			const [engine, data] = pitem.asPreRuntime;
+			return engine.extractAuthor(data, sessionValidators);
+		} else {
+			const [citem] = digest.logs.filter(
+				({ type }) => type === 'Consensus'
+			);
+			// extract author from the consensus (substrate 1.0, digest)
+			if (citem) {
+				const [engine, data] = citem.asConsensus;
+				return engine.extractAuthor(data, sessionValidators);
+			}
+		}
+
+		return undefined;
+	}
 }