crypto/becrypto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

移除gameitemmall中feeaddress的hash计算

Browse Source
This commit is contained in:
CounterFire2023 2023-06-15 18:39:48 +08:00
parent aed15263f8
commit b0eea9601b
4 changed files with 4800 additions and 5012 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9735
build/contracts/GameItemMall.json
View File

File diff suppressed because one or more lines are too long

3
contracts/market/GameItemMall.sol
View File

@ -47,7 +47,6 @@ contract GameItemMall is MallBase, ReentrancyGuard, HasSignature, TimeChecker {
orderId, orderId,
currency, currency,
price, price,
feeToAddress,
startTime, startTime,
saltNonce saltNonce
); );
@ -73,7 +72,6 @@ contract GameItemMall is MallBase, ReentrancyGuard, HasSignature, TimeChecker {
uint256 _orderId, uint256 _orderId,
address _currency, address _currency,
uint256 _price, uint256 _price,
address _feeToAddress,
uint256 _startTime, uint256 _startTime,
uint256 _saltNonce uint256 _saltNonce
) public pure returns (bytes32) { ) public pure returns (bytes32) {
@ -82,7 +80,6 @@ contract GameItemMall is MallBase, ReentrancyGuard, HasSignature, TimeChecker {
_orderId, _orderId,
_currency, _currency,
_price, _price,
_feeToAddress,
_startTime, _startTime,
_saltNonce _saltNonce
); );

72
migrations/7_deploy_market.js
View File

@ -5,44 +5,44 @@ const GameItemMall = artifacts.require("market/GameItemMall");
const base = require("../scripts/base"); const base = require("../scripts/base");
module.exports = async function (deployer, network, accounts) { module.exports = async function (deployer, network, accounts) {
await deployer.deploy(BENftMarket); // await deployer.deploy(BENftMarket);
const marketInstance = await BENftMarket.deployed(); // const marketInstance = await BENftMarket.deployed();
if (marketInstance) { // if (marketInstance) {
console.log("MarketPlace successfully deployed."); // console.log("MarketPlace successfully deployed.");
} // }
base.updateArray({ // base.updateArray({
name: "BENftMarket", // name: "BENftMarket",
type: "logic", // type: "logic",
json: "assets/contracts/BENftMarket.json", // json: "assets/contracts/BENftMarket.json",
address: marketInstance.address, // address: marketInstance.address,
network, // network,
}); // });
await deployer.deploy(BENftMall); // await deployer.deploy(BENftMall);
const nftMallInstance = await BENftMall.deployed(); // const nftMallInstance = await BENftMall.deployed();
if (nftMallInstance) { // if (nftMallInstance) {
console.log("BENftMall successfully deployed."); // console.log("BENftMall successfully deployed.");
} // }
base.updateArray({ // base.updateArray({
name: "BENftMall", // name: "BENftMall",
type: "logic", // type: "logic",
json: "assets/contracts/BENftMall.json", // json: "assets/contracts/BENftMall.json",
address: nftMallInstance.address, // address: nftMallInstance.address,
network, // network,
}); // });
await deployer.deploy(GameItemMarket); // await deployer.deploy(GameItemMarket);
const gameMarketInstance = await GameItemMarket.deployed(); // const gameMarketInstance = await GameItemMarket.deployed();
if (gameMarketInstance) { // if (gameMarketInstance) {
console.log("GameItemMarket successfully deployed."); // console.log("GameItemMarket successfully deployed.");
} // }
base.updateArray({ // base.updateArray({
name: "GameItemMarket", // name: "GameItemMarket",
type: "logic", // type: "logic",
json: "assets/contracts/GameItemMarket.json", // json: "assets/contracts/GameItemMarket.json",
address: gameMarketInstance.address, // address: gameMarketInstance.address,
network, // network,
}); // });
await deployer.deploy(GameItemMall); await deployer.deploy(GameItemMall);
const gameMallInstance = await GameItemMall.deployed(); const gameMallInstance = await GameItemMall.deployed();

2
out_arbitrum_testnet_dev.json
View File

@ -81,6 +81,6 @@
"name": "GameItemMall", "name": "GameItemMall",
"type": "logic", "type": "logic",
"json": "assets/contracts/GameItemMall.json", "json": "assets/contracts/GameItemMall.json",
"address": "0x52e3Eb12A2e7f6F9BEAcEd3C2122eD508091A2F1" "address": "0x1D058c7c7451c34BbfF9c0dF1C16b95C5d171d64"
} }
] ]