crypto/contracts-imtbl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改whiteCount方法, 防止白名单被revoke后, whitecount为负的问题

Browse Source
This commit is contained in:
CounterFire2023 2024-06-12 13:07:48 +08:00
parent 54682fbfc7
commit 89d407b895
4 changed files with 37 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contracts/activity/NFTClaimStage2WL.sol
View File

@ -124,13 +124,15 @@ contract NFTClaimStage2WL is ReentrancyGuard, AccessControl {
} }
function whiteCount() external view returns (uint256){ function whiteCount() external view returns (uint256){
uint256 _count1 = _whitelist1[_msgSender()]; uint256 _whiteCount = _whitelist1[_msgSender()];
uint256 _count2 = _whitelist2[_msgSender()];
if (mintParse == 2) { if (mintParse == 2) {
return _count1 + _count2 - _mintedRecords[_msgSender()].length(); _whiteCount += _whitelist2[_msgSender()];
} else {
return _count1 - _mintedRecords[_msgSender()].length();
} }
uint256 _minted = _mintedRecords[_msgSender()].length();
if (_whiteCount > _minted) {
return _whiteCount - _minted;
}
return 0;
} }
function mintedNum() external view returns (uint256){ function mintedNum() external view returns (uint256){

4
deploy/2_1_deploy_nftclaimer_wl.ts
View File

@ -22,6 +22,10 @@ const deployNFTClaim: DeployFunction =
args: [nftAddress, startNftId, mintConfig], args: [nftAddress, startNftId, mintConfig],
log: true, log: true,
}); });
console.log("==NFTClaimStage2WL addr=", ret.address);
const _contract = new hre.ethers.Contract(ret.address, ret.abi, provider);
var mintCfg= await _contract.mintConfig();
console.log("list", mintCfg);
updateArray({ updateArray({
name: "NFTClaimStage2WL", name: "NFTClaimStage2WL",
type: "logic", type: "logic",

50
deployments/imtbl_test/NFTClaimStage2WL.json
View File

@ -1,5 +1,5 @@
{ {
"address": "0x31F29C9A3D0c1c13C825475aebF0d964b5B47c45", "address": "0x09F2D6CAf92860a1f79049E2552eFa54186c883c",
"abi": [ "abi": [
{ {
"inputs": [ "inputs": [
@ -585,22 +585,22 @@
"type": "function" "type": "function"
} }
], ],
"transactionHash": "0x961a7fd0f3fa0a870f19e74f975ba869aa77fde6ea8a83a3af2614757b0098aa", "transactionHash": "0x2cc1fcafc37ce2b3ba277bf4032f4b72df804cd8ebf09bf5b50c3aeeaaf00473",
"receipt": { "receipt": {
"to": null, "to": null,
"from": "0x50A8e60041A206AcaA5F844a1104896224be6F39", "from": "0x50A8e60041A206AcaA5F844a1104896224be6F39",
"contractAddress": "0x31F29C9A3D0c1c13C825475aebF0d964b5B47c45", "contractAddress": "0x09F2D6CAf92860a1f79049E2552eFa54186c883c",
"transactionIndex": 0, "transactionIndex": 0,
"gasUsed": "1508317", "gasUsed": "1508329",
"logsBloom": "0x00000004000000000000000000000000000000000000020000000000000820000000000000000000000000000000100000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000200000000000020000000000000000000800000000000000400000000000000000000000000000000000000000000004000000000000000000000000000000000000080000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000180000000400020000000000000000000000000000000000000020000000000000000000000000000", "logsBloom": "0x00000004000000000000000001000000000000000000020000000000000820000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000800000004000000400000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000100000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000180000000400020000000000000000000000000000000000000020000000000000000000000000000",
"blockHash": "0x73675ef0eb9158c28daea54273bc36408ae217df1af00382a76c79d6985478f6", "blockHash": "0x1e882a8f7226ee68209ab20a3f240623aad476d68ec8dbfdde4010f41b20ccfe",
"transactionHash": "0x961a7fd0f3fa0a870f19e74f975ba869aa77fde6ea8a83a3af2614757b0098aa", "transactionHash": "0x2cc1fcafc37ce2b3ba277bf4032f4b72df804cd8ebf09bf5b50c3aeeaaf00473",
"logs": [ "logs": [
{ {
"transactionIndex": 0, "transactionIndex": 0,
"blockNumber": 9326237, "blockNumber": 9331362,
"transactionHash": "0x961a7fd0f3fa0a870f19e74f975ba869aa77fde6ea8a83a3af2614757b0098aa", "transactionHash": "0x2cc1fcafc37ce2b3ba277bf4032f4b72df804cd8ebf09bf5b50c3aeeaaf00473",
"address": "0x31F29C9A3D0c1c13C825475aebF0d964b5B47c45", "address": "0x09F2D6CAf92860a1f79049E2552eFa54186c883c",
"topics": [ "topics": [
"0x2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d", "0x2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d",
"0x0000000000000000000000000000000000000000000000000000000000000000", "0x0000000000000000000000000000000000000000000000000000000000000000",
@ -609,13 +609,13 @@
], ],
"data": "0x", "data": "0x",
"logIndex": 0, "logIndex": 0,
"blockHash": "0x73675ef0eb9158c28daea54273bc36408ae217df1af00382a76c79d6985478f6" "blockHash": "0x1e882a8f7226ee68209ab20a3f240623aad476d68ec8dbfdde4010f41b20ccfe"
}, },
{ {
"transactionIndex": 0, "transactionIndex": 0,
"blockNumber": 9326237, "blockNumber": 9331362,
"transactionHash": "0x961a7fd0f3fa0a870f19e74f975ba869aa77fde6ea8a83a3af2614757b0098aa", "transactionHash": "0x2cc1fcafc37ce2b3ba277bf4032f4b72df804cd8ebf09bf5b50c3aeeaaf00473",
"address": "0x31F29C9A3D0c1c13C825475aebF0d964b5B47c45", "address": "0x09F2D6CAf92860a1f79049E2552eFa54186c883c",
"topics": [ "topics": [
"0x2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d", "0x2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d",
"0x5550444154455f574c5f524f4c45000000000000000000000000000000000000", "0x5550444154455f574c5f524f4c45000000000000000000000000000000000000",
@ -624,13 +624,13 @@
], ],
"data": "0x", "data": "0x",
"logIndex": 1, "logIndex": 1,
"blockHash": "0x73675ef0eb9158c28daea54273bc36408ae217df1af00382a76c79d6985478f6" "blockHash": "0x1e882a8f7226ee68209ab20a3f240623aad476d68ec8dbfdde4010f41b20ccfe"
}, },
{ {
"transactionIndex": 0, "transactionIndex": 0,
"blockNumber": 9326237, "blockNumber": 9331362,
"transactionHash": "0x961a7fd0f3fa0a870f19e74f975ba869aa77fde6ea8a83a3af2614757b0098aa", "transactionHash": "0x2cc1fcafc37ce2b3ba277bf4032f4b72df804cd8ebf09bf5b50c3aeeaaf00473",
"address": "0x31F29C9A3D0c1c13C825475aebF0d964b5B47c45", "address": "0x09F2D6CAf92860a1f79049E2552eFa54186c883c",
"topics": [ "topics": [
"0x2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d", "0x2f8788117e7eff1d82e926ec794901d17c78024a50270940304540a733656f0d",
"0xa076a07f65bcd51bcb15a0f01a65bc18f2d922acb81bcfd8af4caf5adb557091", "0xa076a07f65bcd51bcb15a0f01a65bc18f2d922acb81bcfd8af4caf5adb557091",
@ -639,22 +639,22 @@
], ],
"data": "0x", "data": "0x",
"logIndex": 2, "logIndex": 2,
"blockHash": "0x73675ef0eb9158c28daea54273bc36408ae217df1af00382a76c79d6985478f6" "blockHash": "0x1e882a8f7226ee68209ab20a3f240623aad476d68ec8dbfdde4010f41b20ccfe"
} }
], ],
"blockNumber": 9326237, "blockNumber": 9331362,
"cumulativeGasUsed": "1508317", "cumulativeGasUsed": "1508329",
"status": 1, "status": 1,
"byzantium": true "byzantium": true
}, },
"args": [ "args": [
"0xaa34B79A0Ab433eaC900fB3CB9f191F5Cd27501D", "0x23e7Ef7D6F9bc3305E8EF0Fa1e5e12C1D5a4b06B",
"6240603010000001", "6240603010000001",
[ [
2000, 2000,
"0xaa34B79A0Ab433eaC900fB3CB9f191F5Cd27501D", "0xFd42bfb03212dA7e1A4608a44d7658641D99CF34",
100, "100",
"0x5Ab03Aa79Ab91B7420b5CFF134a4188388888888" "0x50A8e60041A206AcaA5F844a1104896224be6F39"
] ]
], ],
"numDeployments": 1, "numDeployments": 1,

2
out/imtbl_test_dev.json
View File

@ -33,6 +33,6 @@
"name": "NFTClaimStage2WL", "name": "NFTClaimStage2WL",
"type": "logic", "type": "logic",
"json": "assets/contracts/NFTClaimStage2WL.json", "json": "assets/contracts/NFTClaimStage2WL.json",
"address": "0x31F29C9A3D0c1c13C825475aebF0d964b5B47c45" "address": "0x09F2D6CAf92860a1f79049E2552eFa54186c883c"
} }
] ]