From d3deeb5c99ddb41808dca77b3a053d4b96d20928 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 3 Jul 2023 22:30:36 +0800
Subject: [PATCH] 1

---
 server/web3bcspider/blockchain.js            | 5 ++++-
 server/web3bcspider/metadata/factory.js      | 2 ++
 server/web3bcspider/services/blockchain.js   | 6 +++---
 server/web3bcspider/services/pull_bcevent.js | 2 +-
 server/web3bcspider/tasks/bcspider.js        | 1 +
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/server/web3bcspider/blockchain.js b/server/web3bcspider/blockchain.js
index fa0ffb4..772eb80 100644
--- a/server/web3bcspider/blockchain.js
+++ b/server/web3bcspider/blockchain.js
@@ -33,7 +33,6 @@ class BlockChain {
 
   async init() {
     this.web3Conf = metaFactory.getWeb3Conf(this.netId);
-    console.log(this.web3Conf);
     this.contractsConf = metaFactory.getContractsConf(this.netId);
     this.netDir = metaFactory.getNetDir(this.netId);
 
@@ -95,6 +94,10 @@ class BlockChain {
     return contract;
   }
 
+  getCurrBlockNumber() {
+    return this.currBlockNumber;
+  }
+
   async lockQuery() {
     while (this.queryLockTimes > 3) {
       await utils.sleep(100 + utils.randRange(10, 100));
diff --git a/server/web3bcspider/metadata/factory.js b/server/web3bcspider/metadata/factory.js
index ef9fcd8..9ee3edd 100644
--- a/server/web3bcspider/metadata/factory.js
+++ b/server/web3bcspider/metadata/factory.js
@@ -117,6 +117,8 @@ async function init() {
           const netId = net['net_id'];
           const netDir = configDir + 'nets/' + netId + '/';
           web3ConfHash[netId] = {
+            'net_id': netId,
+            'netId': netId,
             'Web3': utils.readJsonFromFile(netDir + 'web3.json'),
             'Contract': utils.readJsonFromFile(netDir + 'contract.json'),
             'Events': net['events'],
diff --git a/server/web3bcspider/services/blockchain.js b/server/web3bcspider/services/blockchain.js
index 2a2bc62..aa6311c 100644
--- a/server/web3bcspider/services/blockchain.js
+++ b/server/web3bcspider/services/blockchain.js
@@ -19,13 +19,13 @@ class BlockChain extends BaseService {
 
   static async staticInit() {
     metaFactory.getNetList().forEach(async (net) => {
-      const bc = new bcClass(net['net_id']);
-      netIdHash[net['net_id']] = bc;
+      const bc = new bcClass(net['netId']);
+      netIdHash[net['netId']] = bc;
       await bc.init();
     });
   }
 
-  async init(netId) {
+  init(netId) {
     this.#bc = getBc(netId);
     return this.#bc != null;
   }
diff --git a/server/web3bcspider/services/pull_bcevent.js b/server/web3bcspider/services/pull_bcevent.js
index 2265677..019f284 100644
--- a/server/web3bcspider/services/pull_bcevent.js
+++ b/server/web3bcspider/services/pull_bcevent.js
@@ -104,7 +104,7 @@ class PullBcEvent extends BaseService {
         }
         continue;
       } catch (err) {
-        log.log(err);
+        log.error(err);
       }
       await utils.sleep(5000 + utils.randRange(500, 1500));
     }
diff --git a/server/web3bcspider/tasks/bcspider.js b/server/web3bcspider/tasks/bcspider.js
index d218cc1..e2f17be 100644
--- a/server/web3bcspider/tasks/bcspider.js
+++ b/server/web3bcspider/tasks/bcspider.js
@@ -41,6 +41,7 @@ class BcSpider extends BaseTask {
 
   createPullBcEventService(net, event) {
     const bc = serviceFactory.create('BlockChain');
+    bc.init(net['net_id']);
     const pullBcEventService = serviceFactory.create('PullBcEvent');
     event['pullBcEventService'] = pullBcEventService;
     pullBcEventService.init(bc, net, event);