fix: use all params for cache key (#1805)

Author: amacar

src/controllers/blocks/BlocksController.ts

@@ -234,15 +234,7 @@ export default class BlocksController extends AbstractController<BlocksService>
 				};
 
 				// Create a key for the cache that is a concatenation of the block hash and all the query params included in the request
-				const cacheKey =
-					ahHash.toString() +
-					Number(options.eventDocs) +
-					Number(options.extrinsicDocs) +
-					Number(options.checkFinalized) +
-					Number(options.noFees) +
-					Number(options.checkDecodedXcm) +
-					Number(options.paraId) +
-					Number(options.useEvmAddressFormat);
+				const cacheKey = ahHash.toString() + Object.values(options).join();
 
 				const isBlockCached = this.blockStore.get(cacheKey);
 
@@ -318,15 +310,7 @@ export default class BlocksController extends AbstractController<BlocksService>
 			useEvmAddressFormat: useEvmFormat === 'true',
 		};
 		// Create a key for the cache that is a concatenation of the block hash and all the query params included in the request
-		const cacheKey =
-			hash.toString() +
-			Number(options.eventDocs) +
-			Number(options.extrinsicDocs) +
-			Number(options.checkFinalized) +
-			Number(options.noFees) +
-			Number(options.checkDecodedXcm) +
-			Number(options.paraId) +
-			Number(options.useEvmAddressFormat);
+		const cacheKey = hash.toString() + Object.values(options).join();
 
 		const isBlockCached = this.blockStore.get(cacheKey);
 
@@ -409,15 +393,7 @@ export default class BlocksController extends AbstractController<BlocksService>
 				};
 
 				// Create a key for the cache that is a concatenation of the block hash and all the query params included in the request
-				const cacheKey =
-					ahHash.toString() +
-					Number(options.eventDocs) +
-					Number(options.extrinsicDocs) +
-					Number(options.checkFinalized) +
-					Number(options.noFees) +
-					Number(options.checkDecodedXcm) +
-					Number(options.paraId) +
-					Number(options.useEvmAddressFormat);
+				const cacheKey = ahHash.toString() + Object.values(options).join();
 
 				const isBlockCached = this.blockStore.get(cacheKey);
 
@@ -490,15 +466,7 @@ export default class BlocksController extends AbstractController<BlocksService>
 		};
 
 		// Create a key for the cache that is a concatenation of the block hash and all the query params included in the request
-		const cacheKey =
-			hash.toString() +
-			Number(options.eventDocs) +
-			Number(options.extrinsicDocs) +
-			Number(options.checkFinalized) +
-			Number(options.noFees) +
-			Number(options.checkDecodedXcm) +
-			Number(options.paraId) +
-			Number(options.useEvmAddressFormat);
+		const cacheKey = hash.toString() + Object.values(options).join();
 
 		const isBlockCached = this.blockStore.get(cacheKey);
 

src/controllers/blocks/BlocksExtrinsicsController.ts

@@ -83,14 +83,7 @@ export default class BlocksExtrinsicsController extends AbstractController<Block
 					useEvmAddressFormat: useEvmFormat === 'true',
 				};
 
-				const cacheKey =
-					ahHash.toString() +
-					Number(options.eventDocs) +
-					Number(options.extrinsicDocs) +
-					Number(options.checkFinalized) +
-					Number(options.noFees) +
-					Number(options.checkDecodedXcm) +
-					Number(options.useEvmAddressFormat);
+				const cacheKey = ahHash.toString() + Object.values(options).join();
 
 				const isBlockCached = this.blockStore.get(cacheKey);
 				const historicApi = await this.api.at(ahHash);
@@ -145,14 +138,7 @@ export default class BlocksExtrinsicsController extends AbstractController<Block
 				useEvmAddressFormat: useEvmFormat === 'true',
 			};
 
-			const cacheKey =
-				hash.toString() +
-				Number(options.eventDocs) +
-				Number(options.extrinsicDocs) +
-				Number(options.checkFinalized) +
-				Number(options.noFees) +
-				Number(options.checkDecodedXcm) +
-				Number(options.useEvmAddressFormat);
+			const cacheKey = hash.toString() + Object.values(options).join();
 
 			const isBlockCached = this.blockStore.get(cacheKey);
 			const historicApi = await this.api.at(hash);

src/controllers/rc/blocks/RcBlocksController.ts

@@ -144,14 +144,7 @@ export default class RcBlocksController extends AbstractController<BlocksService
 			paraId: paraIdArg,
 		};
 
-		const cacheKey =
-			hash.toString() +
-			Number(options.eventDocs) +
-			Number(options.extrinsicDocs) +
-			Number(options.checkFinalized) +
-			Number(options.noFees) +
-			Number(options.checkDecodedXcm) +
-			Number(options.paraId);
+		const cacheKey = hash.toString() + Object.values(options).join();
 
 		const isBlockCached = this.blockStore.get(cacheKey);
 
@@ -219,14 +212,7 @@ export default class RcBlocksController extends AbstractController<BlocksService
 			paraId: paraIdArg,
 		};
 
-		const cacheKey =
-			hash.toString() +
-			Number(options.eventDocs) +
-			Number(options.extrinsicDocs) +
-			Number(options.checkFinalized) +
-			Number(options.noFees) +
-			Number(options.checkDecodedXcm) +
-			Number(options.paraId);
+		const cacheKey = hash.toString() + Object.values(options).join();
 
 		const isBlockCached = this.blockStore.get(cacheKey);
 

src/controllers/rc/blocks/RcBlocksExtrinsicsController.ts

@@ -74,13 +74,7 @@ export default class RcBlocksExtrinsicsController extends AbstractController<Blo
 			paraId: undefined,
 		};
 
-		const cacheKey =
-			hash.toString() +
-			Number(options.eventDocs) +
-			Number(options.extrinsicDocs) +
-			Number(options.checkFinalized) +
-			Number(options.noFees) +
-			Number(options.checkDecodedXcm);
+		const cacheKey = hash.toString() + Object.values(options).join();
 
 		const isBlockCached = this.blockStore.get(cacheKey);
 		const historicApi = await rcApi.at(hash);