diff --git a/server/web3sign/controllers/game_item_mall.js b/server/web3sign/controllers/game_item_mall.js index cc418dd..3353717 100644 --- a/server/web3sign/controllers/game_item_mall.js +++ b/server/web3sign/controllers/game_item_mall.js @@ -2,7 +2,7 @@ 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 contract = require('common/contract'); const serviceFactory = require('../services/factory'); async function buy(session) { @@ -25,8 +25,14 @@ async function buy(session) { } } - const currency = metaFactory.getContractByName('CEG')['address']; + const currency = bc.getContractAddressByName(contract.CEG_INSTANCE_NAME); const userAddress = bc.getUserAddress(); + { + if (!bc.isValidAddress(currency)) { + session.rspErr(500, 'ceg error'); + return; + } + } const transModel = session.createModel('Transaction'); const usedTokenIdModel = session.createModel('UsedTokenId'); diff --git a/server/web3sign/controllers/game_item_market.js b/server/web3sign/controllers/game_item_market.js index 3b67947..4cb1993 100644 --- a/server/web3sign/controllers/game_item_market.js +++ b/server/web3sign/controllers/game_item_market.js @@ -2,7 +2,7 @@ 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 contract = require('common/contract'); const serviceFactory = require('../services/factory'); async function buy(session) { @@ -25,8 +25,14 @@ async function buy(session) { } } - const currency = ''; + const currency = bc.getContractAddressByName(contract.CEG_INSTANCE_NAME); const userAddress = bc.getUserAddress(); + { + if (!bc.isValidAddress(currency)) { + session.rspErr(500, 'ceg error'); + return; + } + } const transModel = session.createModel('Transaction'); const usedTokenIdModel = session.createModel('UsedTokenId'); diff --git a/server/web3sign/services/blockchain.js b/server/web3sign/services/blockchain.js index 4dc88dd..102899f 100644 --- a/server/web3sign/services/blockchain.js +++ b/server/web3sign/services/blockchain.js @@ -38,6 +38,11 @@ class BlockChain extends BaseService { return this.#bc.isValidAddress(address); } + getContractAddressByName(name) { + const c = this.#bc.getContractByName(name); + return c ? c['address'] : ''; + } + async soliditySha3Sign(...args) { const signStr = await this.#bc.web3.utils.soliditySha3(...args); let signature = await this.#bc.web3.eth.sign(signStr, this.getUserAddress());