This commit is contained in:
aozhiwei 2023-07-10 17:59:39 +08:00
parent 2ee789e67c
commit e6bec5dfde
3 changed files with 13 additions and 10 deletions

View File

@ -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;

View File

@ -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,
[

View File

@ -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,
[