From 52612980487227683442e8b899f1bee74a3ffb32 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 14 Jun 2023 14:29:17 +0800
Subject: [PATCH] 1

---
 .../web3service/config/nets/421613/contract.json   | 14 +++++++++++++-
 server/web3service/controllers/claim_box.js        |  8 +++++++-
 server/web3service/services/blockchain.js          |  1 +
 third_party/becrypto                               |  2 +-
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/server/bin_dev/web3service/config/nets/421613/contract.json b/server/bin_dev/web3service/config/nets/421613/contract.json
index 16186b0..06d6b1c 100644
--- a/server/bin_dev/web3service/config/nets/421613/contract.json
+++ b/server/bin_dev/web3service/config/nets/421613/contract.json
@@ -42,7 +42,7 @@
     "address": "0xB469331cEC98E52b7Eab07dFB586253bE232BBF7"
   },
   {
-    "name": "BENftMarket",
+    "name": "BENFTMarket",
     "type": "logic",
     "json": "assets/contracts/BENFTMarket.json",
     "address": "0xb80E19c50747972E735c68C0BA5651AD952d70BC"
@@ -52,5 +52,17 @@
     "type": "logic",
     "json": "assets/contracts/UserMinterFactory.json",
     "address": "0x1A27515c35a92Fb276c2670fa27C85ffAd75D094"
+  },
+  {
+    "name": "NFTSbt",
+    "type": "erc721",
+    "json": "assets/contracts/NFTSbt.json",
+    "address": "0x46675eecD0Bb2dcdE3f9b76A11EE7f6DfB174EcA"
+  },
+  {
+    "name": "ClaimBoxFactory",
+    "type": "logic",
+    "json": "assets/contracts/ClaimBoxFactory.json",
+    "address": "0xc63ed18feE4C3D62b87DfCE5b5F4DafD8905D9B2"
   }
 ]
diff --git a/server/web3service/controllers/claim_box.js b/server/web3service/controllers/claim_box.js
index 9bb6a34..12ff051 100644
--- a/server/web3service/controllers/claim_box.js
+++ b/server/web3service/controllers/claim_box.js
@@ -12,7 +12,13 @@ async function claim(session) {
     const account = session.request('account');
     const netId = session.request('net_id');
     const bc = serviceFactory.create('BlockChain');
-    await bc.init(netId);
+    {
+      const ret = await bc.init(netId);
+      if (!ret) {
+        session.rspErr(500, 'net_id error');
+        return;
+      }
+    }
 
     const nftAddress = bc.getNftAddress(bcutils.CLAIM_BOX_TYPE);
 
diff --git a/server/web3service/services/blockchain.js b/server/web3service/services/blockchain.js
index 7da61eb..bdd9d28 100644
--- a/server/web3service/services/blockchain.js
+++ b/server/web3service/services/blockchain.js
@@ -23,6 +23,7 @@ class BlockChain extends BaseService {
 
   async init(netId) {
     this.#bc = getBc(netId);
+    return this.#bc != null;
   }
 
   getNftAddress(tokenType) {
diff --git a/third_party/becrypto b/third_party/becrypto
index 8d64de3..7a40ca5 160000
--- a/third_party/becrypto
+++ b/third_party/becrypto
@@ -1 +1 @@
-Subproject commit 8d64de35b6a3e27e25982539ed734ffe22ed9896
+Subproject commit 7a40ca526f083ad8bc3f1c8aec94424f9d7f0091