Merge branch 'master' of git.kingsome.cn:server/game2006web3
This commit is contained in:
commit
e7bb25f306
@ -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');
|
||||
|
@ -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');
|
||||
|
@ -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());
|
||||
|
Loading…
x
Reference in New Issue
Block a user