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

fix

Browse Source
This commit is contained in:
owen05
2021-09-28 14:38:53 +08:00
parent e810adaffe
commit 7b526b8208
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,7 +68,7 @@ contract FilterERC1155V1 is IERC1155Receiver, BaseFilterV1 {
uint256 tokenId = tokenIds[i]; uint256 tokenId = tokenIds[i];
require(isNFTIDValid(tokenId), "NFT_ID_NOT_SUPPORT"); require(isNFTIDValid(tokenId), "NFT_ID_NOT_SUPPORT");
uint256 inAmount = _maintainERC1155In(tokenId); uint256 inAmount = _maintainERC1155In(tokenId);
totalAmount += inAmount; totalAmount = totalAmount.add(inAmount);
emit NftIn(tokenId, inAmount); emit NftIn(tokenId, inAmount);
} }
require(totalAmount <= avaliableNFTInAmount, "EXCEDD_IN_AMOUNT"); require(totalAmount <= avaliableNFTInAmount, "EXCEDD_IN_AMOUNT");
@@ -90,7 +90,7 @@ contract FilterERC1155V1 is IERC1155Receiver, BaseFilterV1 {
uint256 totalAmount = 0; uint256 totalAmount = 0;
for (uint256 i = 0; i < tokenIds.length; i++) { for (uint256 i = 0; i < tokenIds.length; i++) {
totalAmount += amounts[i]; totalAmount = totalAmount.add(amounts[i]);
_transferOutERC1155(to, tokenIds[i], amounts[i]); _transferOutERC1155(to, tokenIds[i], amounts[i]);
emit TargetOut(tokenIds[i], amounts[i]); emit TargetOut(tokenIds[i], amounts[i]);
} }
@@ -116,7 +116,7 @@ contract FilterERC1155V1 is IERC1155Receiver, BaseFilterV1 {
uint256 sum; uint256 sum;
for (uint256 j = 0; j < _NFT_IDS_.length; j++) { for (uint256 j = 0; j < _NFT_IDS_.length; j++) {
uint256 tokenId = _NFT_IDS_[j]; uint256 tokenId = _NFT_IDS_[j];
sum += _NFT_RESERVE_[tokenId]; sum = sum.add(_NFT_RESERVE_[tokenId]);
if (sum >= randomNum) { if (sum >= randomNum) {
_transferOutERC1155(to, tokenId, 1); _transferOutERC1155(to, tokenId, 1);
emit RandomOut(tokenId, 1); emit RandomOut(tokenId, 1);
@@ -190,7 +190,7 @@ contract FilterERC1155V1 is IERC1155Receiver, BaseFilterV1 {
uint256 currentAmount = IERC1155(_NFT_COLLECTION_).balanceOf(address(this), tokenId); uint256 currentAmount = IERC1155(_NFT_COLLECTION_).balanceOf(address(this), tokenId);
uint256 outAmount = _NFT_RESERVE_[tokenId].sub(currentAmount); uint256 outAmount = _NFT_RESERVE_[tokenId].sub(currentAmount);
_NFT_RESERVE_[tokenId] = currentAmount; _NFT_RESERVE_[tokenId] = currentAmount;
_TOTAL_NFT_AMOUNT_ -= outAmount; _TOTAL_NFT_AMOUNT_ = _TOTAL_NFT_AMOUNT_.sub(outAmount);
if (currentAmount == 0) { if (currentAmount == 0) {
uint256 index = _TOKENID_IDX_[tokenId] - 1; uint256 index = _TOKENID_IDX_[tokenId] - 1;
if(index != _NFT_IDS_.length - 1) { if(index != _NFT_IDS_.length - 1) {
@@ -211,7 +211,7 @@ contract FilterERC1155V1 is IERC1155Receiver, BaseFilterV1 {
_TOKENID_IDX_[tokenId] = _NFT_IDS_.length; _TOKENID_IDX_[tokenId] = _NFT_IDS_.length;
} }
_NFT_RESERVE_[tokenId] = currentAmount; _NFT_RESERVE_[tokenId] = currentAmount;
_TOTAL_NFT_AMOUNT_ += inAmount; _TOTAL_NFT_AMOUNT_ = _TOTAL_NFT_AMOUNT_.add(inAmount);
} }
// ============ Support ============ // ============ Support ============

8
contracts/SmartRoute/proxies/DODONFTPoolProxy.sol
View File

@@ -45,7 +45,7 @@ contract DODONFTPoolProxy is InitializableOwnable, ReentrancyGuard {
event ChangeMaintainer(address newMaintainer); event ChangeMaintainer(address newMaintainer);
event ChangeContoller(address newController); event ChangeContoller(address newController);
event ChangeFilterAdminTemplate(address newFilterAdminTemplate); event ChangeFilterAdminTemplate(address newFilterAdminTemplate);
event ChangeWhiteList(address contractAddr, bool isWhiteListed); event ChangeWhiteList(address contractAddr, bool isAllowed);
constructor( constructor(
address cloneFactory, address cloneFactory,
@@ -249,9 +249,9 @@ contract DODONFTPoolProxy is InitializableOwnable, ReentrancyGuard {
emit SetFilterTemplate(idx, newFilterTemplate); emit SetFilterTemplate(idx, newFilterTemplate);
} }
function changeWhiteList(address contractAddr, bool isWhiteListed) external onlyOwner { function changeWhiteList(address contractAddr, bool isAllowed) external onlyOwner {
isWhiteListed[contractAddr] = isWhiteListed; isWhiteListed[contractAddr] = isAllowed;
emit ChangeWhiteList(contractAddr, isWhiteListed); emit ChangeWhiteList(contractAddr, isAllowed);
} }
//======================= Internal ===================== //======================= Internal =====================

2
truffle-test.sh
View File

@@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
# truffle compile --all truffle compile --all
if [ "$1"x = "proxy-dpp"x ] if [ "$1"x = "proxy-dpp"x ]
then then