anilspecial
diff --git a/‎.eslintrc.json
Lines changed: 2 additions & 1 deletion b/‎.eslintrc.json
Lines changed: 2 additions & 1 deletion
diff --git a/‎app/platform/fabric/sync/FabricEvent.ts
Lines changed: 6 additions & 7 deletions b/‎app/platform/fabric/sync/FabricEvent.ts
Lines changed: 6 additions & 7 deletions
diff --git a/‎app/platform/fabric/sync/SyncPlatform.ts
Lines changed: 13 additions & 12 deletions b/‎app/platform/fabric/sync/SyncPlatform.ts
Lines changed: 13 additions & 12 deletions
diff --git a/‎app/platform/fabric/sync/SyncService.ts
Lines changed: 18 additions & 9 deletions b/‎app/platform/fabric/sync/SyncService.ts
Lines changed: 18 additions & 9 deletions
diff --git a/‎app/rest/dbroutes.ts
Lines changed: 12 additions & 12 deletions b/‎app/rest/dbroutes.ts
Lines changed: 12 additions & 12 deletions
diff --git a/‎client/e2e-test/package-lock.json
Lines changed: 3 additions & 3 deletions b/‎client/e2e-test/package-lock.json
Lines changed: 3 additions & 3 deletions
diff --git a/‎client/e2e-test/startnetwork.js
Lines changed: 1 addition & 1 deletion b/‎client/e2e-test/startnetwork.js
Lines changed: 1 addition & 1 deletion
@@ -439,7 +439,8 @@
 				"@typescript-eslint/no-explicit-any": "off",
 				"@typescript-eslint/explicit-module-boundary-types": "off",
 				"no-console": ["error"],
-				"import/extensions": ["off"]
+				"import/extensions": ["off"],
+				"wrap-iife": ["error", "inside"]
 			}
 		}
 	]
 
@@ -2,7 +2,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import {helper} from '../../../common/helper';
+import { helper } from '../../../common/helper';
 
 const logger = helper.getLogger('FabricEvent');
 
@@ -12,10 +12,9 @@ const logger = helper.getLogger('FabricEvent');
  * @class FabricEvent
  */
 export class FabricEvent {
-
-	client : any;
-	fabricServices : any;
-	static channelEventHubs : any;
+	client: any;
+	fabricServices: any;
+	static channelEventHubs: any;
 
 	/**
 	 * Creates an instance of FabricEvent.
@@ -47,7 +46,7 @@ export class FabricEvent {
 				continue;
 			}
 
-			this.createChannelEventHub(channel_name);
+			await this.createChannelEventHub(channel_name);
 		}
 	}
 
@@ -71,7 +70,7 @@ export class FabricEvent {
 					}
 				},
 				{
-					startBlock: 1,
+					// Keep startBlock undefined because expecting to start listening from the current block.
 					type: 'full'
 				}
 			);
 
@@ -100,15 +100,14 @@ export class SyncPlatform {
 		}
 
 		// Updating the client network and other details to DB
-		const res = await this.syncService.synchNetworkConfigToDB(this.client);
-		if (!res) {
-			return;
-		}
-
-		setInterval(() => {
+		await (async function updateNetworkConfig(sync) {
 			logger.info('Updating the client network and other details to DB');
-			this.syncService.synchNetworkConfigToDB(this.client);
-		}, 30000);
+			const res = await sync.syncService.synchNetworkConfigToDB(sync.client);
+			if (!res) {
+				logger.error('Failed to update network config to DB');
+			}
+			setTimeout(updateNetworkConfig, 30000, sync);
+		})(this);
 
 		// Start event
 		this.eventHub = new FabricEvent(this.client, this.syncService);
@@ -118,9 +117,11 @@ export class SyncPlatform {
 		 * Setting interval for validating any missing block from the current client ledger
 		 * Set blocksSyncTime property in platform config.json in minutes
 		 */
-		setInterval(() => {
-			this.isChannelEventHubConnected();
-		}, this.blocksSyncTime);
+		(function validateMissingBlocks(sync) {
+			sync.isChannelEventHubConnected();
+			setTimeout(validateMissingBlocks, sync.blocksSyncTime, sync);
+		})(this);
+
 		logger.debug(
 			'******* Initialization end for child client process %s ******',
 			this.network_id
@@ -137,7 +138,7 @@ export class SyncPlatform {
 			// Validate channel event is connected
 			const status = this.eventHub.isChannelEventHubConnected(channel_name);
 			if (status) {
-				await this.syncService.synchBlocks(this.client, channel_name);
+				await this.syncService.syncBlocks(this.client, channel_name);
 			} else {
 				// Channel client is not connected then it will reconnect
 				this.eventHub.connectChannelEventHub(channel_name);
 
@@ -107,6 +107,9 @@ export class SyncServices {
 			} else {
 				return false;
 			}
+
+			// Need that chaincode table is synced up to existing chaincode at this moment
+			await this.insertNewChannelChaincode(client, channel_genesis_hash, null);
 		}
 		return true;
 	}
@@ -305,7 +308,7 @@ export class SyncServices {
 			await this.persistence
 				.getCrudService()
 				.saveChaincode(network_id, chaincode_row);
-			if (discoveryResults && discoveryResults.peers_by_org) {
+			if (discoveryResults?.peers_by_org) {
 				for (const org_name in discoveryResults.peers_by_org) {
 					const org = discoveryResults.peers_by_org[org_name];
 					for (const peer of org.peers) {
@@ -354,12 +357,13 @@ export class SyncServices {
 			.saveChaincodPeerRef(network_id, chaincode_peer_row);
 	}
 
-	async synchBlocks(client, channel_name) {
+	async syncBlocks(client, channel_name) {
 		const network_id = client.getNetworkId();
 
 		const synch_key = `${network_id}_${channel_name}`;
+		logger.info(`syncBlocks: Start >> ${synch_key}`);
 		if (this.synchInProcess.includes(synch_key)) {
-			logger.info(`Block synch in process for >> ${network_id}_${channel_name}`);
+			logger.info(`syncBlocks: Block sync in process for >> ${synch_key}`);
 			return;
 		}
 		this.synchInProcess.push(synch_key);
@@ -376,19 +380,24 @@ export class SyncServices {
 		if (results) {
 			for (const result of results) {
 				// Get block by number
-				const block = await client.fabricGateway.queryBlock(
-					channel_name,
-					result.missing_id
-				);
-				if (block) {
-					await this.processBlockEvent(client, block);
+				try {
+					const block = await client.fabricGateway.queryBlock(
+						channel_name,
+						result.missing_id
+					);
+					if (block) {
+						await this.processBlockEvent(client, block);
+					}
+				} catch {
+					logger.error(`Failed to process Block # ${result.missing_id}`);
 				}
 			}
 		} else {
 			logger.debug('Missing blocks not found for %s', channel_name);
 		}
 		const index = this.synchInProcess.indexOf(synch_key);
 		this.synchInProcess.splice(index, 1);
+		logger.info(`syncBlocks: Finish >> ${synch_key}`);
 	}
 
 	async updateDiscoveredChannel(client, channel_name, channel_genesis_hash) {
 
@@ -24,7 +24,7 @@ export function dbroutes(router: Router, platform: Platform) {
 	router.get('/status/:channel_genesis_hash', (req, res) => {
 		const channel_genesis_hash = req.params.channel_genesis_hash;
 		if (channel_genesis_hash) {
-			const extReq = req as ExtRequest;
+			const extReq = (req as unknown) as ExtRequest;
 			dbStatusMetrics.getStatus(extReq.network, channel_genesis_hash, data => {
 				if (data && data.chaincodeCount && data.txCount && data.peerCount) {
 					return res.send(data);
@@ -52,7 +52,7 @@ export function dbroutes(router: Router, platform: Platform) {
 			const number = parseInt(req.params.number);
 			const channel_genesis_hash = req.params.channel_genesis_hash;
 			if (!isNaN(number) && channel_genesis_hash) {
-				const extReq = req as ExtRequest;
+				const extReq = (req as unknown) as ExtRequest;
 				const row = await dbCrudService.getTxCountByBlockNum(
 					extReq.network,
 					channel_genesis_hash,
@@ -88,7 +88,7 @@ export function dbroutes(router: Router, platform: Platform) {
 		const txid = req.params.txid;
 		const channel_genesis_hash = req.params.channel_genesis_hash;
 		if (txid && txid !== '0' && channel_genesis_hash) {
-			const extReq = req as ExtRequest;
+			const extReq = (req as unknown) as ExtRequest;
 			dbCrudService
 				.getTransactionByID(extReq.network, channel_genesis_hash, txid)
 				.then((row: { createdt: string | number | Date }) => {
@@ -105,7 +105,7 @@ export function dbroutes(router: Router, platform: Platform) {
 	router.get('/blockActivity/:channel_genesis_hash', (req, res) => {
 		const channel_genesis_hash = req.params.channel_genesis_hash;
 		if (channel_genesis_hash) {
-			const extReq = req as ExtRequest;
+			const extReq = (req as unknown) as ExtRequest;
 			dbCrudService
 				.getBlockActivityList(extReq.network, channel_genesis_hash)
 				.then((row: any) => {
@@ -143,7 +143,7 @@ export function dbroutes(router: Router, platform: Platform) {
 				txid = 0;
 			}
 			if (channel_genesis_hash) {
-				const extReq = req as ExtRequest;
+				const extReq = (req as unknown) as ExtRequest;
 				dbCrudService
 					.getTxList(
 						extReq.network,
@@ -179,7 +179,7 @@ export function dbroutes(router: Router, platform: Platform) {
 	router.get('/chaincode/:channel', (req, res) => {
 		const channelName = req.params.channel;
 		if (channelName) {
-			const extReq = req as ExtRequest;
+			const extReq = (req as unknown) as ExtRequest;
 			dbStatusMetrics.getTxPerChaincode(
 				extReq.network,
 				channelName,
@@ -210,7 +210,7 @@ export function dbroutes(router: Router, platform: Platform) {
 	router.get('/peers/:channel_genesis_hash', (req, res) => {
 		const channel_genesis_hash = req.params.channel_genesis_hash;
 		if (channel_genesis_hash) {
-			const extReq = req as ExtRequest;
+			const extReq = (req as unknown) as ExtRequest;
 			dbStatusMetrics.getPeerList(
 				extReq.network,
 				channel_genesis_hash,
@@ -244,7 +244,7 @@ export function dbroutes(router: Router, platform: Platform) {
 				req.query.to as string
 			);
 			if (channel_genesis_hash && !isNaN(blockNum)) {
-				const extReq = req as ExtRequest;
+				const extReq = (req as unknown) as ExtRequest;
 				return dbCrudService
 					.getBlockAndTxList(
 						extReq.network,
@@ -276,7 +276,7 @@ export function dbroutes(router: Router, platform: Platform) {
 		const hours = parseInt(req.params.hours);
 
 		if (channel_genesis_hash && !isNaN(hours)) {
-			const extReq = req as ExtRequest;
+			const extReq = (req as unknown) as ExtRequest;
 			return dbStatusMetrics
 				.getTxByMinute(extReq.network, channel_genesis_hash, hours)
 				.then(handleResult(req, res));
@@ -298,7 +298,7 @@ export function dbroutes(router: Router, platform: Platform) {
 		const days = parseInt(req.params.days);
 
 		if (channel_genesis_hash && !isNaN(days)) {
-			const extReq = req as ExtRequest;
+			const extReq = (req as unknown) as ExtRequest;
 			return dbStatusMetrics
 				.getTxByHour(extReq.network, channel_genesis_hash, days)
 				.then(handleResult(req, res));
@@ -319,7 +319,7 @@ export function dbroutes(router: Router, platform: Platform) {
 		const hours = parseInt(req.params.hours);
 
 		if (channel_genesis_hash && !isNaN(hours)) {
-			const extReq = req as ExtRequest;
+			const extReq = (req as unknown) as ExtRequest;
 			return dbStatusMetrics
 				.getBlocksByMinute(extReq.network, channel_genesis_hash, hours)
 				.then(handleResult(req, res));
@@ -349,7 +349,7 @@ export function dbroutes(router: Router, platform: Platform) {
 		const days = parseInt(req.params.days);
 
 		if (channel_genesis_hash && !isNaN(days)) {
-			const extReq = req as ExtRequest;
+			const extReq = (req as unknown) as ExtRequest;
 			return dbStatusMetrics
 				.getBlocksByHour(extReq.network, channel_genesis_hash, days)
 				.then(handleResult(req, res));
 
@@ -141,7 +141,7 @@ startNetwork = async () => {
 	}
 
 	// Wait for a while to get ready to start REST API server
-	await new Promise(r => setTimeout(r, 20000));
+	await new Promise(r => setTimeout(r, 40000));
 };
 
 startNetwork();
Original file line number	Diff line number	Diff line change
`@@ -439,7 +439,8 @@`
`439`	`439`	`"@typescript-eslint/no-explicit-any": "off",`
`440`	`440`	`"@typescript-eslint/explicit-module-boundary-types": "off",`
`441`	`441`	`"no-console": ["error"],`
`442`		`- "import/extensions": ["off"]`
	`442`	`+ "import/extensions": ["off"],`
	`443`	`+ "wrap-iife": ["error", "inside"]`
`443`	`444`	`}`
`444`	`445`	`}`
`445`	`446`	`]`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`* SPDX-License-Identifier: Apache-2.0`
`3`	`3`	`*/`
`4`	`4`
`5`		`-import {helper} from '../../../common/helper';`
	`5`	`+import { helper } from '../../../common/helper';`
`6`	`6`
`7`	`7`	`const logger = helper.getLogger('FabricEvent');`
`8`	`8`
`@@ -12,10 +12,9 @@ const logger = helper.getLogger('FabricEvent');`
`12`	`12`	`* @class FabricEvent`
`13`	`13`	`*/`
`14`	`14`	`export class FabricEvent {`
`15`		`-`
`16`		`- client : any;`
`17`		`- fabricServices : any;`
`18`		`- static channelEventHubs : any;`
	`15`	`+ client: any;`
	`16`	`+ fabricServices: any;`
	`17`	`+ static channelEventHubs: any;`
`19`	`18`
`20`	`19`	`/**`
`21`	`20`	`* Creates an instance of FabricEvent.`
`@@ -47,7 +46,7 @@ export class FabricEvent {`
`47`	`46`	`continue;`
`48`	`47`	`}`
`49`	`48`
`50`		`- this.createChannelEventHub(channel_name);`
	`49`	`+ await this.createChannelEventHub(channel_name);`
`51`	`50`	`}`
`52`	`51`	`}`
`53`	`52`
`@@ -71,7 +70,7 @@ export class FabricEvent {`
`71`	`70`	`}`
`72`	`71`	`},`
`73`	`72`	`{`
`74`		`- startBlock: 1,`
	`73`	`+ // Keep startBlock undefined because expecting to start listening from the current block.`
`75`	`74`	`type: 'full'`
`76`	`75`	`}`
`77`	`76`	`);`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ startNetwork = async () => {`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`// Wait for a while to get ready to start REST API server`
`144`		`- await new Promise(r => setTimeout(r, 20000));`
	`144`	`+ await new Promise(r => setTimeout(r, 40000));`
`145`	`145`	`};`
`146`	`146`
`147`	`147`	`startNetwork();`