Author extract using correct as-at state (#5598)

* Author extract using correct as-at state

* Align header retrieval

* Dedupe

* Deupe

* Adjust

* Remove deprecated events.at

* 10.3.4

Author: jacogr

CHANGELOG.md

@@ -1,6 +1,13 @@
 # CHANGELOG
 
-## master
+## 10.3.4 Apr 16, 2023
+
+Changes:
+
+- Ensure block author extract uses the correct as-at block construction state
+
+
+## 10.3.3 Apr 15, 2023
 
 Contributed:
 

package.json

@@ -14,7 +14,7 @@
   },
   "sideEffects": false,
   "type": "module",
-  "version": "10.3.3",
+  "version": "10.3.4",
   "versions": {
     "git": "10.3.3",
     "npm": "10.3.3"

packages/api-augment/package.json

@@ -18,14 +18,14 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "10.3.3",
+  "version": "10.3.4",
   "main": "index.js",
   "dependencies": {
-    "@polkadot/api-base": "10.3.3",
-    "@polkadot/rpc-augment": "10.3.3",
-    "@polkadot/types": "10.3.3",
-    "@polkadot/types-augment": "10.3.3",
-    "@polkadot/types-codec": "10.3.3",
+    "@polkadot/api-base": "10.3.4",
+    "@polkadot/rpc-augment": "10.3.4",
+    "@polkadot/types": "10.3.4",
+    "@polkadot/types-augment": "10.3.4",
+    "@polkadot/types-codec": "10.3.4",
     "@polkadot/util": "^11.1.3",
     "tslib": "^2.5.0"
   }

packages/api-base/package.json

@@ -18,11 +18,11 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "10.3.3",
+  "version": "10.3.4",
   "main": "index.js",
   "dependencies": {
-    "@polkadot/rpc-core": "10.3.3",
-    "@polkadot/types": "10.3.3",
+    "@polkadot/rpc-core": "10.3.4",
+    "@polkadot/types": "10.3.4",
     "@polkadot/util": "^11.1.3",
     "rxjs": "^7.8.0",
     "tslib": "^2.5.0"

packages/api-contract/package.json

@@ -18,20 +18,20 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "10.3.3",
+  "version": "10.3.4",
   "main": "index.js",
   "dependencies": {
-    "@polkadot/api": "10.3.3",
-    "@polkadot/types": "10.3.3",
-    "@polkadot/types-codec": "10.3.3",
-    "@polkadot/types-create": "10.3.3",
+    "@polkadot/api": "10.3.4",
+    "@polkadot/types": "10.3.4",
+    "@polkadot/types-codec": "10.3.4",
+    "@polkadot/types-create": "10.3.4",
     "@polkadot/util": "^11.1.3",
     "@polkadot/util-crypto": "^11.1.3",
     "rxjs": "^7.8.0",
     "tslib": "^2.5.0"
   },
   "devDependencies": {
-    "@polkadot/api-augment": "10.3.3",
+    "@polkadot/api-augment": "10.3.4",
     "@polkadot/keyring": "^11.1.3"
   }
 }

packages/api-derive/package.json

@@ -18,25 +18,25 @@
     "./detectPackage.cjs"
   ],
   "type": "module",
-  "version": "10.3.3",
+  "version": "10.3.4",
   "main": "index.js",
   "dependencies": {
-    "@polkadot/api": "10.3.3",
-    "@polkadot/api-augment": "10.3.3",
-    "@polkadot/api-base": "10.3.3",
-    "@polkadot/rpc-core": "10.3.3",
-    "@polkadot/types": "10.3.3",
-    "@polkadot/types-codec": "10.3.3",
+    "@polkadot/api": "10.3.4",
+    "@polkadot/api-augment": "10.3.4",
+    "@polkadot/api-base": "10.3.4",
+    "@polkadot/rpc-core": "10.3.4",
+    "@polkadot/types": "10.3.4",
+    "@polkadot/types-codec": "10.3.4",
     "@polkadot/util": "^11.1.3",
     "@polkadot/util-crypto": "^11.1.3",
     "rxjs": "^7.8.0",
     "tslib": "^2.5.0"
   },
   "devDependencies": {
-    "@polkadot/api": "10.3.3",
-    "@polkadot/api-augment": "10.3.3",
-    "@polkadot/rpc-augment": "10.3.3",
-    "@polkadot/rpc-provider": "10.3.3",
-    "@polkadot/types-support": "10.3.3"
+    "@polkadot/api": "10.3.4",
+    "@polkadot/api-augment": "10.3.4",
+    "@polkadot/rpc-augment": "10.3.4",
+    "@polkadot/rpc-provider": "10.3.4",
+    "@polkadot/types-support": "10.3.4"
   }
 }

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

@@ -34,7 +34,7 @@ export function getBlock (instanceId: string, api: DeriveApi): (hash: Uint8Array
         combineLatest([
           of(signedBlock),
           queryAt.system.events(),
-          getAuthorDetails(signedBlock.block.header, queryAt)
+          getAuthorDetails(api, signedBlock.block.header, blockHash)
         ])
       ),
       map(([signedBlock, events, [, validators, author]]) =>

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

@@ -5,7 +5,7 @@ import type { Observable } from 'rxjs';
 import type { HeaderExtended } from '../type/types.js';
 import type { DeriveApi } from '../types.js';
 
-import { combineLatest, map, switchMap } from 'rxjs';
+import { map, switchMap } from 'rxjs';
 
 import { createHeaderExtended } from '../type/index.js';
 import { memo } from '../util/index.js';
@@ -27,12 +27,9 @@ import { getAuthorDetails } from './util.js';
  */
 export function getHeader (instanceId: string, api: DeriveApi): (blockHash: Uint8Array | string) => Observable<HeaderExtended> {
   return memo(instanceId, (blockHash: Uint8Array | string): Observable<HeaderExtended> =>
-    combineLatest([
-      api.rpc.chain.getHeader(blockHash),
-      api.queryAt(blockHash)
-    ]).pipe(
-      switchMap(([header, queryAt]) =>
-        getAuthorDetails(header, queryAt)
+    api.rpc.chain.getHeader(blockHash).pipe(
+      switchMap((header) =>
+        getAuthorDetails(api, header, blockHash)
       ),
       map(([header, validators, author]) =>
         createHeaderExtended((validators || header).registry, header, validators, author)

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

@@ -5,7 +5,7 @@ import type { Observable } from 'rxjs';
 import type { HeaderExtended } from '../type/types.js';
 import type { DeriveApi } from '../types.js';
 
-import { combineLatest, map, of, switchMap } from 'rxjs';
+import { map, switchMap } from 'rxjs';
 
 import { createHeaderExtended } from '../type/index.js';
 import { memo } from '../util/index.js';
@@ -28,13 +28,7 @@ export function subscribeNewHeads (instanceId: string, api: DeriveApi): () => Ob
   return memo(instanceId, (): Observable<HeaderExtended> =>
     api.rpc.chain.subscribeNewHeads().pipe(
       switchMap((header) =>
-        combineLatest([
-          of(header),
-          api.queryAt(header.hash)
-        ])
-      ),
-      switchMap(([header, queryAt]) =>
-        getAuthorDetails(header, queryAt)
+        getAuthorDetails(api, header)
       ),
       map(([header, validators, author]): HeaderExtended => {
         header.createdAtHash = header.hash;

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

@@ -9,7 +9,7 @@ import type { SpCoreSr25519Public } from '@polkadot/types/lookup';
 import type { Codec, IOption } from '@polkadot/types/types';
 import type { DeriveApi } from '../types.js';
 
-import { combineLatest, map, mergeMap, of } from 'rxjs';
+import { combineLatest, map, mergeMap, of, switchMap } from 'rxjs';
 
 import { memo, unwrapBlockNumber } from '../util/index.js';
 
@@ -24,7 +24,8 @@ export function createBlockNumberDerive <T extends { number: Compact<BlockNumber
     );
 }
 
-export function getAuthorDetails (header: Header, queryAt: QueryableStorage<'rxjs'>): Observable<[Header, Vec<AccountId> | null, AccountId | null]> {
+/** @internal */
+function getAuthorDetailsWithAt (header: Header, queryAt: QueryableStorage<'rxjs'>): Observable<[Header, Vec<AccountId> | null, AccountId | null]> {
   const validators = queryAt.session
     ? queryAt.session.validators()
     : of(null);
@@ -72,3 +73,22 @@ export function getAuthorDetails (header: Header, queryAt: QueryableStorage<'rxj
     of(null)
   ]);
 }
+
+export function getAuthorDetails (api: DeriveApi, header: Header, blockHash?: Uint8Array | string): Observable<[Header, Vec<AccountId> | null, AccountId | null]> {
+  // For on-chain state, we need to retrieve it as per the start
+  // of the block being constructed, i.e. session validators would
+  // be at the point of the block construction, not when all operations
+  // has been supplied.
+  //
+  // However for the first block (no parentHash available), we would
+  // just use the as-is
+  return api.queryAt(
+    header.parentHash.isEmpty
+      ? blockHash || header.hash
+      : header.parentHash
+  ).pipe(
+    switchMap((queryAt) =>
+      getAuthorDetailsWithAt(header, queryAt)
+    )
+  );
+}