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

fix ERC1155 random

Browse Source
This commit is contained in:
mingda
2021-09-10 19:49:29 +08:00
committed by owen05
parent 551e7063dd
commit 09a4cbfc9c
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
contracts/NFTPool/impl/BaseFilterV1.sol
View File

@@ -173,12 +173,10 @@ contract BaseFilterV1 is InitializableOwnable, ReentrancyGuard {
return a1.mul(qn.sub(qm)).div(q.sub(DecimalMath.ONE));
}
function _getRandomOutId() public view returns (uint256 index) {
index =
uint256(
keccak256(abi.encodePacked(tx.origin, blockhash(block.number - 1), gasleft()))
) %
_TOTAL_NFT_AMOUNT_;
function _getRandomNum() public view returns (uint256 randomNum) {
randomNum = uint256(
keccak256(abi.encodePacked(tx.origin, blockhash(block.number - 1), gasleft()))
);
}
// ================= Ownable ================

10
contracts/NFTPool/impl/FilterERC1155V1.sol
View File

@@ -79,7 +79,15 @@ contract FilterERC1155V1 is IERC1155Receiver, BaseFilterV1 {
(uint256 rawPay, ) = queryNFTRandomOut(amount);
paid = IFilterAdmin(_OWNER_).burnFragFrom(msg.sender, rawPay);
for (uint256 i = 0; i < amount; i++) {
_transferOutERC1155(to, _getRandomOutId(), 1);
uint256 randomNum = _getRandomOutId() % _TOTAL_NFT_AMOUNT_;
uint256 sum;
for (uint256 j = 0; j < _NFT_IDS_.length; j++) {
sum += _NFT_RESERVE_[_NFT_IDS_[j]];
if (sum >= randomNum) {
_transferOutERC1155(to, _NFT_IDS_[j], 1);
break;
}
}
}
}

2
contracts/NFTPool/impl/FilterERC721V1.sol
View File

@@ -87,7 +87,7 @@ contract FilterERC721V1 is IERC721Receiver, BaseFilterV1 {
(uint256 rawPay, ) = queryNFTRandomOut(amount);
paid = IFilterAdmin(_OWNER_).burnFragFrom(msg.sender, rawPay);
for (uint256 i = 0; i < amount; i++) {
_transferOutERC721(to, _getRandomOutId());
_transferOutERC721(to, _getRandomNum() % _TOTAL_NFT_AMOUNT_);
}
_TOTAL_NFT_AMOUNT_ = _NFT_IDS_.length;
}