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.

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

Update token sale contract to exclude vesting #45

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
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
27 changes: 10 additions & 17 deletions contracts/TokenSale.sol
Original file line number Diff line number Diff line change
Expand Up @@ -117,29 +117,22 @@ contract TokenSale is Ownable {
}
}

uint256 claimableAmount = (_tokenOutAmount * 2_000) / 10_000;
uint256 remainingAmount;
unchecked {
// this subtraction does not underflow as claimableAmount is a percentage on _tokenOutAmount
remainingAmount = _tokenOutAmount - claimableAmount;
}

require(
tokenOut.transfer(msg.sender, claimableAmount),
tokenOut.transfer(msg.sender, _tokenOutAmount),
"TokenSale: tokenOut transfer failed"
);

// we use same tokenLock instance as airdrop, we make sure that
// the claimers and buyers are distinct to not reinitialize vesting
tokenLock.setupVesting(
msg.sender,
block.timestamp,
block.timestamp,
block.timestamp + vestDuration
);
// approve TokenLock for token transfer
require(tokenOut.approve(address(tokenLock), remainingAmount), "Approve failed");
tokenLock.lock(msg.sender, remainingAmount);
// tokenLock.setupVesting(
// msg.sender,
// block.timestamp,
// block.timestamp,
// block.timestamp + vestDuration
// );
// // approve TokenLock for token transfer
// require(tokenOut.approve(address(tokenLock), remainingAmount), "Approve failed");
// tokenLock.lock(msg.sender, remainingAmount);

emit Sale(msg.sender, tokenInAmount_, _tokenOutAmount);
}
Expand Down