Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/erc721pool interaction test #41

Merged
merged 5 commits into from
Jul 10, 2024
Merged

Feature/erc721pool interaction test #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
848e5b8
[Test] Add ERC721 pool interaction test cases
ayodeko Jun 28, 2024
bff9b8e
[Test] added erc721 penalty fee pool interaction tests
ayodeko Jul 1, 2024
294d115
change or to and for status check in erc721 cancel request
ayodeko Jul 1, 2024
a5fd066
Merge branch 'develop' into feature/erc721pool_interaction_test
ayodeko Jul 1, 2024
fd156aa
[Test] made changes to erc721 test
ayodeko Jul 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions contracts/factories/ERC721PenaltyFeeFactory.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ contract ERC721PenaltyFeeStakingFactory is Ownable, IPenaltyFeeFactory {
PenaltyFeeRequest storage req = requests[id];
if (msg.sender != req.info.deployer) revert InvalidCaller();
if (
req.info.requestStatus != Status.CREATED ||
req.info.requestStatus != Status.CREATED &&
req.info.requestStatus != Status.APPROVED
) revert InvalidRequestStatus();
req.info.requestStatus = Status.CANCELED;
Expand All @@ -121,4 +121,4 @@ contract ERC721PenaltyFeeStakingFactory is Ownable, IPenaltyFeeFactory {
function getPools() external view returns (address[] memory pools) {
pools = stakingPools;
}
}
}
2 changes: 2 additions & 0 deletions contracts/pools/ERC721/ERC721LockUpStakingPool.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ contract ERC721LockUpPool is
function unstake(uint256[] calldata tokenIds) external nonReentrant {
uint256 length = tokenIds.length;
if (length == 0) revert InvalidAmount();
if (block.timestamp < pool.unstakeLockUpTime)
revert TokensInLockUp(block.timestamp, pool.unstakeLockUpTime);
UserInfo storage user = userInfo[msg.sender];
uint256 currentAmount = user.amount;
if (length > currentAmount)
Expand Down
Loading
Loading