chaindata: always track active, not current era

FlorianFranzen · penumbra23 · FlorianFranzen · commit d15533e2f0bf · 2024-05-13T22:39:26.000+02:00
Co-authored-by: penumbra23 &lt;glbranimir@gmail.com&gt;
diff --git a/packages/common/src/chaindata/queries/Era.ts b/packages/common/src/chaindata/queries/Era.ts
@@ -204,12 +204,12 @@ export const findEraBlockHash = async (
         return ["", "API at block hash is null"];
       }
 
-      const testEra = await apiAt.query.staking.currentEra();
+      const testEra = await apiAt.query.staking.activeEra();
       if (testEra && testEra.isEmpty) {
         logger.info(`Test era is empty: ${JSON.stringify(testEra)}`);
         return ["", "Test era is none"];
       }
-      const testIndex = testEra.unwrap().toNumber();
+      const testIndex = testEra.unwrap().index.toNumber();
       if (era == testIndex) {
         return [blockHash.toString(), null];
       }

Original file line number	Diff line number	Diff line change
`@@ -204,12 +204,12 @@ export const findEraBlockHash = async (`
`204`	`204`	`return ["", "API at block hash is null"];`
`205`	`205`	`}`
`206`	`206`
`207`		`- const testEra = await apiAt.query.staking.currentEra();`
	`207`	`+ const testEra = await apiAt.query.staking.activeEra();`
`208`	`208`	`if (testEra && testEra.isEmpty) {`
`209`	`209`	logger.info(`Test era is empty: ${JSON.stringify(testEra)}`);
`210`	`210`	`return ["", "Test era is none"];`
`211`	`211`	`}`
`212`		`- const testIndex = testEra.unwrap().toNumber();`
	`212`	`+ const testIndex = testEra.unwrap().index.toNumber();`
`213`	`213`	`if (era == testIndex) {`
`214`	`214`	`return [blockHash.toString(), null];`
`215`	`215`	`}`