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

add unit test && fix

Browse Source
This commit is contained in:
owen05
2021-09-20 14:52:23 +08:00
parent cc57ee2c14
commit 013cbf66ca
10 changed files with 491 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -117,11 +117,15 @@ contract BaseFilterV1 is InitializableOwnable, ReentrancyGuard {
)
{
require(NFTInAmount <= getAvaliableNFTInAmount(), "EXCEDD_IN_AMOUNT");
(rawReceive, received) = _queryNFTIn(_TOTAL_NFT_AMOUNT_,_TOTAL_NFT_AMOUNT_ + NFTInAmount);
}
function _queryNFTIn(uint256 start, uint256 end) internal view returns(uint256 rawReceive, uint256 received) {
rawReceive = _geometricCalc(
_GS_START_IN_,
_CR_IN_,
_TOTAL_NFT_AMOUNT_,
_TOTAL_NFT_AMOUNT_ + NFTInAmount
start,
end
);
(,, received) = IFilterAdmin(_OWNER_).queryMintFee(rawReceive);
}
@@ -135,11 +139,15 @@ contract BaseFilterV1 is InitializableOwnable, ReentrancyGuard {
)
{
require(NFTOutAmount <= getAvaliableNFTOutAmount(), "EXCEED_OUT_AMOUNT");
(rawPay, pay) = _queryNFTTargetOut(_TOTAL_NFT_AMOUNT_ - NFTOutAmount, _TOTAL_NFT_AMOUNT_);
}
function _queryNFTTargetOut(uint256 start, uint256 end) internal view returns(uint256 rawPay, uint256 pay) {
rawPay = _geometricCalc(
_GS_START_TARGET_OUT_,
_CR_TARGET_OUT_,
_TOTAL_NFT_AMOUNT_ - NFTOutAmount,
_TOTAL_NFT_AMOUNT_
start,
end
);
(,, pay) = IFilterAdmin(_OWNER_).queryBurnFee(rawPay);
}
@@ -153,11 +161,15 @@ contract BaseFilterV1 is InitializableOwnable, ReentrancyGuard {
)
{
require(NFTOutAmount <= getAvaliableNFTOutAmount(), "EXCEED_OUT_AMOUNT");
(rawPay, pay) = _queryNFTRandomOut(_TOTAL_NFT_AMOUNT_ - NFTOutAmount, _TOTAL_NFT_AMOUNT_);
}
function _queryNFTRandomOut(uint256 start, uint256 end) internal view returns(uint256 rawPay, uint256 pay) {
rawPay = _geometricCalc(
_GS_START_RANDOM_OUT_,
_CR_RANDOM_OUT_,
_TOTAL_NFT_AMOUNT_ - NFTOutAmount,
_TOTAL_NFT_AMOUNT_
start,
end
);
(,, pay) = IFilterAdmin(_OWNER_).queryBurnFee(rawPay);
}
@@ -165,22 +177,27 @@ contract BaseFilterV1 is InitializableOwnable, ReentrancyGuard {
// ============ Math =============
function _geometricCalc(
uint256 a1,
uint256 a0,
uint256 q,
uint256 start,
uint256 end
) internal view returns (uint256) {
if (q == DecimalMath.ONE) {
return end.sub(start).mul(a1);
}
//Sn=a1*(q^n-1)/(q-1)
//Sn-Sm = a1*(q^n-q^m)/(q-1)
return end.sub(start).mul(a0);
}
//q^n
uint256 qn = DecimalMath.powFloor(q, end);
//q^m
uint256 qm = DecimalMath.powFloor(q, start);
return a1.mul(qn.sub(qm)).div(q.sub(DecimalMath.ONE));
if (q < DecimalMath.ONE) {
//Sn=a0*(1 - q^n)/(1-q)
//Sn-Sm = a0*(q^m - q^n)/(1-q)
return a0.mul(qm.sub(qn)).div(DecimalMath.ONE.sub(q));
} else {
//Sn=a0*(q^n - 1)/(q - 1)
//Sn-Sm = a0*(q^n - q^m)/(q-1)
return a0.mul(qn.sub(qm)).div(q.sub(DecimalMath.ONE));
}
}
function _getRandomNum() public view returns (uint256 randomNum) {
@@ -204,7 +221,7 @@ contract BaseFilterV1 is InitializableOwnable, ReentrancyGuard {
uint256 newCr,
bool toggleFlag
) internal {
require(newCr > DecimalMath.ONE, "CR_INVALID");
require(newCr != 0, "CR_INVALID");
_GS_START_IN_ = newGsStart;
_CR_IN_ = newCr;
_NFT_IN_TOGGLE_ = true;
@@ -225,7 +242,7 @@ contract BaseFilterV1 is InitializableOwnable, ReentrancyGuard {
uint256 newCr,
bool toggleFlag
) internal {
require(newCr > DecimalMath.ONE, "CR_INVALID");
require(newCr != 0, "CR_INVALID");
_GS_START_RANDOM_OUT_ = newGsStart;
_CR_RANDOM_OUT_ = newCr;
_NFT_RANDOM_OUT_TOGGLE_ = true;
@@ -246,7 +263,7 @@ contract BaseFilterV1 is InitializableOwnable, ReentrancyGuard {
uint256 newCr,
bool toggleFlag
) internal {
require(newCr > DecimalMath.ONE, "CR_INVALID");
require(newCr != 0, "CR_INVALID");
_GS_START_TARGET_OUT_ = newGsStart;
_CR_TARGET_OUT_ = newCr;
_NFT_TARGET_OUT_TOGGLE_ = true;

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

@@ -60,6 +60,9 @@ contract FilterERC1155V1 is IERC1155Receiver, BaseFilterV1 {
preventReentrant
returns (uint256 received)
{
uint256 avaliableNFTInAmount = getAvaliableNFTInAmount();
uint256 originTotalNftAmount = _TOTAL_NFT_AMOUNT_;
uint256 totalAmount = 0;
for (uint256 i = 0; i < tokenIds.length; i++) {
uint256 tokenId = tokenIds[i];
@@ -68,7 +71,8 @@ contract FilterERC1155V1 is IERC1155Receiver, BaseFilterV1 {
totalAmount += inAmount;
emit NftIn(tokenId, inAmount);
}
(uint256 rawReceive, ) = queryNFTIn(totalAmount);
require(totalAmount <= avaliableNFTInAmount, "EXCEDD_IN_AMOUNT");
(uint256 rawReceive, ) = _queryNFTIn(originTotalNftAmount, originTotalNftAmount + totalAmount);
received = IFilterAdmin(_OWNER_).mintFragTo(to, rawReceive);
emit NftInOrder(to, received);
@@ -79,13 +83,17 @@ contract FilterERC1155V1 is IERC1155Receiver, BaseFilterV1 {
uint256[] memory amounts,
address to
) external preventReentrant returns (uint256 paid) {
uint256 avaliableNFTOutAmount = getAvaliableNFTOutAmount();
uint256 originTotalNftAmount = _TOTAL_NFT_AMOUNT_;
uint256 totalAmount = 0;
for (uint256 i = 0; i < tokenIds.length; i++) {
totalAmount += amounts[i];
_transferOutERC1155(to, tokenIds[i], amounts[i]);
emit TargetOut(tokenIds[i], amounts[i]);
}
(uint256 rawPay, ) = queryNFTTargetOut(totalAmount);
require(totalAmount <= avaliableNFTOutAmount, "EXCEED_OUT_AMOUNT");
(uint256 rawPay, ) = _queryNFTTargetOut(originTotalNftAmount - totalAmount, originTotalNftAmount);
paid = IFilterAdmin(_OWNER_).burnFragFrom(to, rawPay);
emit TargetOutOrder(to, paid);
@@ -102,10 +110,11 @@ contract FilterERC1155V1 is IERC1155Receiver, BaseFilterV1 {
uint256 randomNum = _getRandomNum() % _TOTAL_NFT_AMOUNT_;
uint256 sum;
for (uint256 j = 0; j < _NFT_IDS_.length; j++) {
sum += _NFT_RESERVE_[_NFT_IDS_[j]];
uint256 tokenId = _NFT_IDS_[j];
sum += _NFT_RESERVE_[tokenId];
if (sum >= randomNum) {
_transferOutERC1155(to, _NFT_IDS_[j], 1);
emit RandomOut( _NFT_IDS_[j], 1);
_transferOutERC1155(to, tokenId, 1);
emit RandomOut(tokenId, 1);
break;
}
}
@@ -179,10 +188,13 @@ contract FilterERC1155V1 is IERC1155Receiver, BaseFilterV1 {
_TOTAL_NFT_AMOUNT_ -= outAmount;
if (currentAmount == 0) {
uint256 index = _TOKENID_IDX_[tokenId] - 1;
_NFT_IDS_[index] = _NFT_IDS_[_NFT_IDS_.length - 1];
if(index != _NFT_IDS_.length - 1) {
uint256 lastTokenId = _NFT_IDS_[_NFT_IDS_.length - 1];
_NFT_IDS_[index] = lastTokenId;
_TOKENID_IDX_[lastTokenId] = index + 1;
}
_NFT_IDS_.pop();
_TOKENID_IDX_[tokenId] = 0;
_TOKENID_IDX_[_NFT_IDS_[index]] = index + 1;
}
}

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

@@ -62,6 +62,8 @@ contract FilterERC721V1 is IERC721Receiver, BaseFilterV1 {
preventReentrant
returns (uint256 received)
{
require(tokenIds.length <= getAvaliableNFTInAmount(), "EXCEDD_IN_AMOUNT");
uint256 originTotalNftAmount = _TOTAL_NFT_AMOUNT_;
for (uint256 i = 0; i < tokenIds.length; i++) {
uint256 tokenId = tokenIds[i];
require(isNFTIDValid(tokenId), "NFT_ID_NOT_SUPPORT");
@@ -77,7 +79,7 @@ contract FilterERC721V1 is IERC721Receiver, BaseFilterV1 {
emit NftIn(tokenId);
}
_TOTAL_NFT_AMOUNT_ = _NFT_IDS_.length;
(uint256 rawReceive, ) = queryNFTIn(tokenIds.length);
(uint256 rawReceive, ) = _queryNFTIn(originTotalNftAmount, originTotalNftAmount + tokenIds.length);
received = IFilterAdmin(_OWNER_).mintFragTo(to, rawReceive);
emit NftInOrder(to, received);
@@ -108,10 +110,10 @@ contract FilterERC721V1 is IERC721Receiver, BaseFilterV1 {
(uint256 rawPay, ) = queryNFTRandomOut(amount);
paid = IFilterAdmin(_OWNER_).burnFragFrom(to, rawPay);
for (uint256 i = 0; i < amount; i++) {
uint256 index = _getRandomNum() % _TOTAL_NFT_AMOUNT_;
_transferOutERC721(to, _NFT_IDS_[index]);
emit RandomOut(_NFT_IDS_[index]);
uint256 index = _getRandomNum() % _NFT_IDS_.length;
uint256 tokenId = _NFT_IDS_[index];
_transferOutERC721(to, tokenId);
emit RandomOut(tokenId);
}
_TOTAL_NFT_AMOUNT_ = _NFT_IDS_.length;
@@ -134,11 +136,14 @@ contract FilterERC721V1 is IERC721Receiver, BaseFilterV1 {
uint256 index = _TOKENID_IDX_[tokenId] - 1;
require(index < _NFT_IDS_.length, "INDEX_INVALID");
IERC721(_NFT_COLLECTION_).safeTransferFrom(address(this), to, tokenId);
_NFT_IDS_[index] = _NFT_IDS_[_NFT_IDS_.length - 1];
if(index != _NFT_IDS_.length - 1) {
uint256 lastTokenId = _NFT_IDS_[_NFT_IDS_.length - 1];
_NFT_IDS_[index] = lastTokenId;
_TOKENID_IDX_[lastTokenId] = index + 1;
}
_NFT_IDS_.pop();
_NFT_RESERVE_[tokenId] = 0;
_TOKENID_IDX_[tokenId] = 0;
_TOKENID_IDX_[_NFT_IDS_[index]] = index + 1;
}
function emergencyWithdraw(
@@ -157,11 +162,14 @@ contract FilterERC721V1 is IERC721Receiver, BaseFilterV1 {
uint256 tokenId = tokenIds[i];
if (_NFT_RESERVE_[tokenId] > 0 && nftContract[i] == _NFT_COLLECTION_) {
uint256 index = getNFTIndexById(tokenId);
_NFT_IDS_[index] = _NFT_IDS_[_NFT_IDS_.length - 1];
if(index != _NFT_IDS_.length - 1) {
uint256 lastTokenId = _NFT_IDS_[_NFT_IDS_.length - 1];
_NFT_IDS_[index] = lastTokenId;
_TOKENID_IDX_[lastTokenId] = index + 1;
}
_NFT_IDS_.pop();
_NFT_RESERVE_[tokenId] = 0;
_TOKENID_IDX_[tokenId] = 0;
_TOKENID_IDX_[_NFT_IDS_[index]] = index + 1;
}
IERC721(nftContract[i]).safeTransferFrom(address(this), to, tokenIds[i]);
emit EmergencyWithdraw(nftContract[i],tokenIds[i],to);