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

Feat: settable-fee-recipient-crowdfund #393

Merged
merged 4 commits into from
Apr 26, 2024
Merged

Feat: settable-fee-recipient-crowdfund #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5c3f5dc
pass lp fee recipient to crowdfund
arr00 Apr 15, 2024
b0fd4d4
forge install: erc20-creator
arr00 Apr 15, 2024
d732e06
update tests to use new creator
arr00 Apr 15, 2024
561e7ba
allow for rounding error tolerance
arr00 Apr 15, 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
10 changes: 9 additions & 1 deletion contracts/crowdfund/ERC20LaunchCrowdfund.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@ contract ERC20LaunchCrowdfund is InitialETHCrowdfund {
uint256 numTokensForDistribution;
// The number of tokens to send to an arbitrary recipient.
uint256 numTokensForRecipient;
// The number of tokens to use for the Uniswap LP pair.
// The number of tokens to use for the Uniswap LP position.
uint256 numTokensForLP;
// The address that receives fees from the Uniswap LP position.
address lpFeeRecipient;
}

error InvalidTokenDistribution();
Expand Down Expand Up @@ -110,10 +112,16 @@ contract ERC20LaunchCrowdfund is InitialETHCrowdfund {
tokenRecipient = address(party);
}

address lpFeeRecipient = tokenOpts.lpFeeRecipient;
if (lpFeeRecipient == PARTY_ADDRESS_KEY) {
lpFeeRecipient = address(party);
}

// Create the ERC20 token.
ERC20LaunchOptions memory _tokenOpts = tokenOpts;
token = ERC20_CREATOR.createToken{ value: totalContributions_ }(
address(party),
lpFeeRecipient,
_tokenOpts.name,
_tokenOpts.symbol,
TokenConfiguration({
Expand Down
11 changes: 6 additions & 5 deletions contracts/utils/IERC20Creator.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@ struct TokenConfiguration {

interface IERC20Creator {
function createToken(
address partyAddress,
string calldata name,
string calldata symbol,
TokenConfiguration calldata config,
address recipientAddress
address party,
address lpFeeRecipient,
string memory name,
string memory symbol,
TokenConfiguration memory config,
address tokenRecipientAddress
) external payable returns (ERC20 token);
}
2 changes: 1 addition & 1 deletion lib/erc20-creator
Open in desktop
Submodule erc20-creator updated 8 files
+66 −42 src/ERC20CreatorV3.sol
+11 −19 src/FeeCollector.sol
+0 −49 src/utils/MathLib.sol
+24 −24 test/ERC20CreatorV3ForkTest.t.sol
+12 −16 test/ERC20CreatorV3Test.t.sol
+3 −4 test/FeeCollector.t.sol
+169 −0 test/FeeCollectorForked.t.sol
+4 −1 test/mock/MockUniswapV3Factory.t.sol
14 changes: 12 additions & 2 deletions test/crowdfund/ERC20LaunchCrowdfundForked.t.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ contract ERC20LaunchCrowdfundForkedTest is SetupPartyHelper {

feeCollector = new FeeCollector(
INonfungiblePositionManager(0xC36442b4a4522E871399CD717aBDD847Ab11FE88),
ITokenDistributor(address(tokenDistributor)),
globalDaoWalletAddress,
5e3,
IWETH(0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2)
);

Expand Down Expand Up @@ -73,6 +73,7 @@ contract ERC20LaunchCrowdfundForkedTest is SetupPartyHelper {
tokenOpts.numTokensForDistribution = 5e4 ether;
tokenOpts.numTokensForRecipient = 5e4 ether;
tokenOpts.numTokensForLP = 9e5 ether;
tokenOpts.lpFeeRecipient = launchCrowdfundImpl.PARTY_ADDRESS_KEY();

ERC20LaunchCrowdfund launchCrowdfund = crowdfundFactory.createERC20LaunchCrowdfund(
launchCrowdfundImpl,
Expand Down Expand Up @@ -116,7 +117,11 @@ contract ERC20LaunchCrowdfundForkedTest is SetupPartyHelper {
address(tokenDistributor).call(callData);

assertEq(IERC20(info.token).balanceOf(contributor), 5e4 ether);
assertEq(IERC20(info.token).balanceOf(address(launchCrowdfund.party())), 5e4 ether);
assertApproxEqAbs(
IERC20(info.token).balanceOf(address(launchCrowdfund.party())),
5e4 ether,
100
);
}

function test_ERC20LaunchCrowdfund_revertIfNumTokensNotAddUpToTotal() public onlyForked {
Expand Down Expand Up @@ -150,6 +155,7 @@ contract ERC20LaunchCrowdfundForkedTest is SetupPartyHelper {
tokenOpts.numTokensForDistribution = 5e4 ether + 1; // Add 1 to make it invalid
tokenOpts.numTokensForRecipient = 5e4 ether;
tokenOpts.numTokensForLP = 9e5 ether;
tokenOpts.lpFeeRecipient = launchCrowdfundImpl.PARTY_ADDRESS_KEY();

vm.expectRevert(ERC20LaunchCrowdfund.InvalidTokenDistribution.selector);
ERC20LaunchCrowdfund launchCrowdfund = crowdfundFactory.createERC20LaunchCrowdfund(
Expand Down Expand Up @@ -192,6 +198,7 @@ contract ERC20LaunchCrowdfundForkedTest is SetupPartyHelper {
tokenOpts.numTokensForDistribution = 5e4 ether;
tokenOpts.numTokensForRecipient = 5e4 ether;
tokenOpts.numTokensForLP = 1e4 - 1; // Too low
tokenOpts.lpFeeRecipient = launchCrowdfundImpl.PARTY_ADDRESS_KEY();

vm.expectRevert(ERC20LaunchCrowdfund.InvalidTokenDistribution.selector);
ERC20LaunchCrowdfund launchCrowdfund = crowdfundFactory.createERC20LaunchCrowdfund(
Expand Down Expand Up @@ -234,6 +241,7 @@ contract ERC20LaunchCrowdfundForkedTest is SetupPartyHelper {
tokenOpts.numTokensForDistribution = 5e4 ether;
tokenOpts.numTokensForRecipient = 5e4 ether;
tokenOpts.numTokensForLP = 9e5 ether;
tokenOpts.lpFeeRecipient = launchCrowdfundImpl.PARTY_ADDRESS_KEY();

vm.expectRevert(ERC20LaunchCrowdfund.InvalidTokenDistribution.selector);
ERC20LaunchCrowdfund launchCrowdfund = crowdfundFactory.createERC20LaunchCrowdfund(
Expand Down Expand Up @@ -276,6 +284,7 @@ contract ERC20LaunchCrowdfundForkedTest is SetupPartyHelper {
tokenOpts.numTokensForDistribution = 5e4 ether;
tokenOpts.numTokensForRecipient = 5e4 ether;
tokenOpts.numTokensForLP = 9e5 ether;
tokenOpts.lpFeeRecipient = launchCrowdfundImpl.PARTY_ADDRESS_KEY();

ERC20LaunchCrowdfund launchCrowdfund = crowdfundFactory.createERC20LaunchCrowdfund(
launchCrowdfundImpl,
Expand Down Expand Up @@ -364,6 +373,7 @@ contract ERC20LaunchCrowdfundForkedTest is SetupPartyHelper {
tokenOpts.numTokensForDistribution = 5e4 ether;
tokenOpts.numTokensForRecipient = 5e4 ether;
tokenOpts.numTokensForLP = 9e5 ether;
tokenOpts.lpFeeRecipient = launchCrowdfundImpl.PARTY_ADDRESS_KEY();

ERC20LaunchCrowdfund launchCrowdfund = crowdfundFactory.createERC20LaunchCrowdfund(
launchCrowdfundImpl,
Expand Down
Loading