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

change sth

Browse Source
This commit is contained in:
CounterFire2023 2023-10-25 16:10:47 +08:00
parent b6e6476cab
commit d83e480ec3
5 changed files with 6733 additions and 6728 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13838
build/contracts/NftDistributor.json
View File

File diff suppressed because one or more lines are too long

6
contracts/logic/ExecuteRelay.sol
View File

@ -1,7 +1,7 @@
// SPDX-License-Identifier: MIT // SPDX-License-Identifier: MIT
pragma solidity 0.8.10; pragma solidity 0.8.10;
import "../core/HasSignature.sol"; import "../core/HasSignature712.sol";
import "../utils/TimeChecker.sol"; import "../utils/TimeChecker.sol";
interface IToken { interface IToken {
@ -20,8 +20,8 @@ interface IToken {
) external; ) external;
} }
contract ExecuteRelay is HasSignature, TimeChecker { contract ExecuteRelay is HasSignature712, TimeChecker {
constructor() HasSignature("ExecuteRelay", "1") {} constructor() HasSignature712("ExecuteRelay", "1") {}
address public tokenAddress; address public tokenAddress;

2
contracts/market/MarketPlace.sol
View File

@ -113,7 +113,7 @@ contract MarketPlace is Ownable, HasSignature {
values[2] values[2]
); );
checkSigner712(addresses[0], criteriaMessageHash, signature); checkSigner(addresses[0], criteriaMessageHash, signature);
// check current ownership // check current ownership
IERC721 nft = IERC721(addresses[1]); IERC721 nft = IERC721(addresses[1]);

114
migrations/2_depoly_etc.js
View File

@ -1,38 +1,38 @@
const Badge = artifacts.require("tokens/erc721/BEBadge"); // const Badge = artifacts.require("tokens/erc721/BEBadge");
const Coin = artifacts.require("tokens/erc20/BEUSDT"); // const Coin = artifacts.require("tokens/erc20/BEUSDT");
const Wallet = artifacts.require("core/BEMultiSigWallet"); const Wallet = artifacts.require("core/BEMultiSigWallet");
const Distributor = artifacts.require("logic/NftDistributor"); // const Distributor = artifacts.require("logic/NftDistributor");
const config = require("../config/config"); const config = require("../config/config");
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(Badge, "BE Badge", "Badge", "4000"); // await deployer.deploy(Badge, "BE Badge", "Badge", "4000");
const badgeInstance = await Badge.deployed(); // const badgeInstance = await Badge.deployed();
if (badgeInstance) { // if (badgeInstance) {
console.log("BEBadge successfully deployed. "); // console.log("BEBadge successfully deployed. ");
console.log("address: " + badgeInstance.address); // console.log("address: " + badgeInstance.address);
} // }
base.updateArray({ // base.updateArray({
name: "BEBadge", // name: "BEBadge",
type: "erc721", // type: "erc721",
json: "assets/contracts/BEBadge.json", // json: "assets/contracts/BEBadge.json",
address: badgeInstance.address, // address: badgeInstance.address,
network, // network,
}); // });
await badgeInstance.updateBaseURI(config.token.baseTokenURI); // await badgeInstance.updateBaseURI(config.token.baseTokenURI);
await deployer.deploy(Coin, "BE test USDT", "USDT"); // await deployer.deploy(Coin, "BE test USDT", "USDT");
const coinInstance = await Coin.deployed(); // const coinInstance = await Coin.deployed();
if (coinInstance) { // if (coinInstance) {
console.log("BEUSDT successfully deployed. "); // console.log("BEUSDT successfully deployed. ");
console.log("address: " + coinInstance.address); // console.log("address: " + coinInstance.address);
} // }
base.updateArray({ // base.updateArray({
name: "BEUSDT", // name: "BEUSDT",
type: "erc20", // type: "erc20",
json: "assets/contracts/BEUSDT.json", // json: "assets/contracts/BEUSDT.json",
address: coinInstance.address, // address: coinInstance.address,
network, // network,
}); // });
await deployer.deploy( await deployer.deploy(
Wallet, Wallet,
60, 60,
@ -53,32 +53,32 @@ module.exports = async function (deployer, network, accounts) {
address: walletInstance.address, address: walletInstance.address,
network, network,
}); });
await badgeInstance.setMintRole(walletInstance.address); // await badgeInstance.setMintRole(walletInstance.address);
console.log("success add wallet to badge's mint role"); // console.log("success add wallet to badge's mint role");
await coinInstance.setMintRole(walletInstance.address); // await coinInstance.setMintRole(walletInstance.address);
console.log("success add wallet to usdt's mint role"); // console.log("success add wallet to usdt's mint role");
await deployer.deploy( // await deployer.deploy(
Distributor, // Distributor,
badgeInstance.address, // badgeInstance.address,
config.admins.executors // config.admins.executors
); // );
const distributorInstance = await Distributor.deployed(); // const distributorInstance = await Distributor.deployed();
if (distributorInstance) { // if (distributorInstance) {
console.log("NftDistributor successfully deployed."); // console.log("NftDistributor successfully deployed.");
console.log("address: " + distributorInstance.address); // console.log("address: " + distributorInstance.address);
} // }
base.updateArray({ // base.updateArray({
name: "NftDistributor", // name: "NftDistributor",
type: "logic", // type: "logic",
json: "assets/contracts/NftDistributor.json", // json: "assets/contracts/NftDistributor.json",
address: distributorInstance.address, // address: distributorInstance.address,
network, // network,
}); // });
await badgeInstance.setMintRole(distributorInstance.address); // await badgeInstance.setMintRole(distributorInstance.address);
await distributorInstance.grantRole( // await distributorInstance.grantRole(
"0xa076a07f65bcd51bcb15a0f01a65bc18f2d922acb81bcfd8af4caf5adb557091", // "0xa076a07f65bcd51bcb15a0f01a65bc18f2d922acb81bcfd8af4caf5adb557091",
walletInstance.address // walletInstance.address
); // );
console.log("success add distributor to badge's mint role"); // console.log("success add distributor to badge's mint role");
}; };

3
migrations/5_deploy_nft.js
View File

@ -2,7 +2,8 @@ const config = require("../config/config");
const base = require("../scripts/base"); const base = require("../scripts/base");
module.exports = async function (deployer, network, accounts) { module.exports = async function (deployer, network, accounts) {
const tokens = [{ name: "HERO", desc: "CRYPTO ELITE'S HERO", limit: 0 }]; // const tokens = [{ name: "HERO", desc: "CRYPTO ELITE'S HERO", limit: 0 }];
const tokens = [{ name: "PLANET", desc: "CF PLANET", limit: 0 }];
for (let i = 0, l = tokens.length; i < l; i++) { for (let i = 0, l = tokens.length; i < l; i++) {
const { name, desc, limit } = tokens[i]; const { name, desc, limit } = tokens[i];
let Nft = artifacts.require("tokens/erc721/NFT"); let Nft = artifacts.require("tokens/erc721/NFT");