Implement queryBlock by using system chaincode for query (qscc) (#109)

* BE-749 Implement queryBlock by querying QSCC Invoke "GetBlockByNumber" func in QSCC Signed-off-by: Atsushi Neki <atsushin@fast.au.fujitsu.com> * BE-749 Remove unnecessary logs Signed-off-by: Atsushi Neki <atsushin@fast.au.fujitsu.com>
hyperledger-labs · May 28, 2020 · 8e5af16 · 8e5af16
1 parent e60a7a4
commit 8e5af16
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 12 deletions.
diff --git a/app/platform/fabric/FabricClient.js b/app/platform/fabric/FabricClient.js
@@ -785,6 +785,21 @@ class FabricClient {
  }
  }
 
+ /**
+ *
+ *
+ * @param {*} channel_genesis_hash
+ * @returns
+ * @memberof FabricClient
+ */
+ getChannelNameByHash(channel_genesis_hash) {
+ for (const [channel_name, hash_name] of this.channelsGenHash.entries()) {
+ if (channel_genesis_hash === hash_name) {
+ return channel_name;
+ }
+ }
+ }
+
  /**
  *
  *

diff --git a/app/platform/fabric/Proxy.js b/app/platform/fabric/Proxy.js
@@ -235,15 +235,11 @@ class Proxy {
  */
  async getBlockByNumber(network_name, channel_genesis_hash, number) {
  const client = this.platform.getClient(network_name);
- const channel = client.getChannelByHash(channel_genesis_hash);
+ const channelName = client.getChannelNameByHash(channel_genesis_hash);
  let block;
 
  try {
- block = await channel.queryBlock(
- parseInt(number),
- client.getDefaultPeer(),
- true
- );
+ block = await client.fabricGateway.queryBlock(channelName, parseInt(number));
  } catch (e) {
  logger.debug('queryBlock >> ', e);
  }

diff --git a/app/platform/fabric/gateway/FabricGateway.js b/app/platform/fabric/gateway/FabricGateway.js
@@ -3,7 +3,7 @@
  */
 
 const { Wallets, Gateway } = require('fabric-network');
-const { Client } = require('fabric-common');
+const { BlockDecoder, Client } = require('fabric-common');
 const fabprotos = require('fabric-protos');
 
 const FabricCAServices = require('fabric-ca-client');
@@ -261,7 +261,20 @@ class FabricGateway {
  const contract = network.getContract('cscc');
  const result = await contract.evaluateTransaction('GetChannels');
  const resultJson = fabprotos.protos.ChannelQueryResponse.decode(result);
- logger.info('queryChannels :', resultJson);
+ return resultJson;
+ }
+
+ async queryBlock(channelName, blockNum) {
+ const network = await this.gateway.getNetwork(this.defaultChannelName);
+
+ // Get the contract from the network.
+ const contract = network.getContract('qscc');
+ const resultByte = await contract.evaluateTransaction(
+ 'GetBlockByNumber',
+ channelName,
+ String(blockNum)
+ );
+ const resultJson = BlockDecoder.decode(resultByte);
  return resultJson;
  }
 }

diff --git a/app/platform/fabric/sync/SyncService.js b/app/platform/fabric/sync/SyncService.js
@@ -388,10 +388,10 @@ class SyncServices {
  if (results) {
  for (const result of results) {
  // Get block by number
- const block = await client
- .getHFC_Client()
- .getChannel(channel_name)
-  .queryBlock(result.missing_id, client.getDefaultPeer(), true);
+ const block = await client.fabricGateway.queryBlock(
+ channel_name,
+ result.missing_id
+ );
  await this.processBlockEvent(client, block);
  }
  } else {