From e6bec5dfde74c5e1b5ffa275c0860753af9d76a6 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Mon, 10 Jul 2023 17:59:39 +0800
Subject: [PATCH] 1

---
 server/web3sign/blockchain.js                 |  5 +++++
 server/web3sign/controllers/activate721nft.js | 10 +++++-----
 server/web3sign/controllers/claim_box.js      |  8 +++-----
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/server/web3sign/blockchain.js b/server/web3sign/blockchain.js
index ab4acb8..cad614b 100644
--- a/server/web3sign/blockchain.js
+++ b/server/web3sign/blockchain.js
@@ -4,6 +4,7 @@ const utils = require('j7/utils');
 const event = require('j7/event');
 const sync = require("j7/sync");
 const log = require("j7/log");
+const bcutils = require("j7/bcutils");
 const contract = require('common/contract');
 const bcconst = require('common/bcconst');
 const metaFactory = require('./metadata/factory');
@@ -80,6 +81,10 @@ class BlockChain {
     return c ? c['address'] : '';
   }
 
+  isValidAddress(address) {
+    return bcutils.isValidAddress(address);
+  }
+
 }
 
 module.exports = BlockChain;
diff --git a/server/web3sign/controllers/activate721nft.js b/server/web3sign/controllers/activate721nft.js
index 5d2e9a0..081eaa9 100644
--- a/server/web3sign/controllers/activate721nft.js
+++ b/server/web3sign/controllers/activate721nft.js
@@ -4,6 +4,7 @@ const sigUtil = require('@metamask/eth-sig-util');
 const app = require('j7/app');
 const utils = require('j7/utils');
 const bcutils = require('j7/bcutils');
+const bcconst = require('common/bcconst');
 const metaFactory = require('../metadata/factory');
 const serviceFactory = require('../services/factory');
 
@@ -24,7 +25,7 @@ async function activate721Nft(session) {
       }
     }
     {
-      if (!bcutils.isValidAddress(account)) {
+      if (!bc.isValidAddress(account)) {
         session.rspErr(500, 'account error');
         return;
       }
@@ -43,9 +44,8 @@ async function activate721Nft(session) {
         session.rspErr(101, 'item_id param error');
         return;
       }
-      if (!(itemMeta.getNftType() == bcutils.HERO_TYPE ||
-            itemMeta.getNftType() == bcutils.EQUIP_TYPE ||
-            itemMeta.getNftType() == bcutils.CHIP_TYPE)) {
+      if (!(itemMeta.getNftType() == bcconst.BC_NFT_HERO ||
+            itemMeta.getNftType() == bcconst.BC_NFT_CHIP)) {
         session.rspErr(101, 'token_type param error');
         return;
       }
@@ -67,7 +67,7 @@ async function activate721Nft(session) {
     const nowTime = utils.getUtcTime();
     const transId = bcutils.genTransId
     (
-      bcutils.BC_TRANS_FUNC_ACTIVATE,
+      bcconst.BC_TRANS_FUNC_ACTIVATE,
       nowTime,
       seqId,
       [
diff --git a/server/web3sign/controllers/claim_box.js b/server/web3sign/controllers/claim_box.js
index 49a84b0..8c7549c 100644
--- a/server/web3sign/controllers/claim_box.js
+++ b/server/web3sign/controllers/claim_box.js
@@ -1,9 +1,7 @@
-const ethUtil = require('ethereumjs-util');
-const sigUtil = require('@metamask/eth-sig-util');
-
 const app = require('j7/app');
 const utils = require('j7/utils');
 const bcutils = require('j7/bcutils');
+const bcconst = require('common/bcconst');
 const metaFactory = require('../metadata/factory');
 const serviceFactory = require('../services/factory');
 
@@ -40,14 +38,14 @@ async function claim(session) {
     const nowTime = utils.getUtcTime();
     const tokenId = bcutils.genTokenId(
       2006,
-      bcutils.BC_FUNC_COMMON,
+      bcconst.BC_FUNC_COMMON,
       nowTime,
       1,
       seqId
     );
     const transId = bcutils.genTransId
     (
-      bcutils.BC_TRANS_FUNC_COMMON,
+      bcconst.BC_TRANS_FUNC_COMMON,
       nowTime,
       seqId,
       [