d-bis/dodo-contractV2
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix erc1155 && erc20

Browse Source
This commit is contained in:
owen05
2021-05-06 14:58:53 +08:00
parent ab0451066f
commit 11814c230d
6 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/kovan-config.js
View File

@@ -74,7 +74,7 @@ module.exports = {
DODONFTProxy: "", DODONFTProxy: "",
//================= MysteryBox ================= //================= MysteryBox =================
MysteryBoxV1: "0xbfb19a7e788b2fbC47Bc9013694C6854Ce0e1fAd", MysteryBoxV1: "0x47d2b27525b93A9c9E03001E1D19310A08748D55",
RandomGenerator: "0x53F54E4760FA5f839e5624782D032495613DF218", RandomGenerator: "0x53F54E4760FA5f839e5624782D032495613DF218",
RandomPool: [ RandomPool: [
"0xa2e0ef85618732d80e5ef362773da1c92e8b1c57", "0xa2e0ef85618732d80e5ef362773da1c92e8b1c57",

11
contracts/DODOFee/UserQuota.sol
View File

@@ -16,16 +16,19 @@ interface IQuota {
contract UserQuota is Ownable, IQuota { contract UserQuota is Ownable, IQuota {
mapping(address => uint256) public userQuota; mapping(address => uint256) public userQuota;
uint256 constant quota = 375 * 10**6; //For example 375u on eth
event SetQuota(address user, uint256 amount);
function setUserQuota(address[] memory users) external onlyOwner { function setUserQuota(address[] memory users, uint256[] memory quotas) external onlyOwner {
require(users.length == quotas.length, "PARAMS_LENGTH_NOT_MATCH");
for(uint256 i = 0; i< users.length; i++) { for(uint256 i = 0; i< users.length; i++) {
require(users[i] != address(0), "USER_INVALID"); require(users[i] != address(0), "USER_INVALID");
userQuota[users[i]] = quota; userQuota[users[i]] = quotas[i];
emit SetQuota(users[i],quotas[i]);
} }
} }
function getUserQuota(address user) override external view returns (int) { function getUserQuota(address user) override external view returns (int) {
return int(userQuota[user]); return int(userQuota[user]);
} }
} }

3
contracts/external/ERC1155/InitializableERC1155.sol vendored
View File

@@ -15,12 +15,15 @@ contract InitializableERC1155 is ERC1155 {
mapping (uint256 => string) private _tokenURIs; mapping (uint256 => string) private _tokenURIs;
string internal _baseUri = ""; string internal _baseUri = "";
bool internal _INITIALIZED_;
function init( function init(
address creator, address creator,
uint256 amount, uint256 amount,
string memory uri string memory uri
) public { ) public {
require(!_INITIALIZED_, "INITIALIZED");
_INITIALIZED_ = true;
_mint(creator, 0, amount ,""); _mint(creator, 0, amount ,"");
_setTokenURI(0, uri); _setTokenURI(0, uri);
} }

2
contracts/external/ERC20/InitializableERC20.sol vendored
View File

@@ -19,7 +19,7 @@ contract InitializableERC20 {
bool public initialized; bool public initialized;
mapping(address => uint256) balances; mapping(address => uint256) internal balances;
mapping(address => mapping(address => uint256)) internal allowed; mapping(address => mapping(address => uint256)) internal allowed;
event Transfer(address indexed from, address indexed to, uint256 amount); event Transfer(address indexed from, address indexed to, uint256 amount);

2
contracts/external/ERC20/InitializableMintableERC20.sol vendored
View File

@@ -18,7 +18,7 @@ contract InitializableMintableERC20 is InitializableOwnable {
string public symbol; string public symbol;
uint256 public totalSupply; uint256 public totalSupply;
mapping(address => uint256) balances; mapping(address => uint256) internal balances;
mapping(address => mapping(address => uint256)) internal allowed; mapping(address => mapping(address => uint256)) internal allowed;
event Transfer(address indexed from, address indexed to, uint256 amount); event Transfer(address indexed from, address indexed to, uint256 amount);

6
deploy-nft.txt
View File

@@ -249,3 +249,9 @@ Init DODONFTProxyAddress Tx: 0xc8052841c2f8641e039f13ba13cafd5cf238fb14b455ab61b
DODOApproveProxy unlockAddProxy tx: 0x7968ba876ec167759cfaa66e26c8b3d6c920bade8c6a29a160b62f6642a68a17 DODOApproveProxy unlockAddProxy tx: 0x7968ba876ec167759cfaa66e26c8b3d6c920bade8c6a29a160b62f6642a68a17
DODOApproveProxy addDODOProxy tx: 0xc1d54e062795d2a1fead453813cfb9f96723a9330905827c710ea8c7e63a34e3 DODOApproveProxy addDODOProxy tx: 0xc1d54e062795d2a1fead453813cfb9f96723a9330905827c710ea8c7e63a34e3
Add AdminList on DODONFTRegistry Tx: 0xcb1f687db83b48f1928610c2c04f4685666502a3d17986bb541cbd41b15fa2a9 Add AdminList on DODONFTRegistry Tx: 0xcb1f687db83b48f1928610c2c04f4685666502a3d17986bb541cbd41b15fa2a9
====================================================
network type: kovan
Deploy time: 2021/5/6 上午9:45:28
Deploy type: MysteryBoxV1
MysteryBoxV1Address: 0x47d2b27525b93A9c9E03001E1D19310A08748D55
Init MysteryBoxV1 Tx: 0xa76bca56c6974b8760390e3b5181ef5e01fa3254aa868eebb4e285d617f835fc