Feat: settable-fee-recipient-crowdfund (#393)

PartyDAO · Apr 26, 2024 · a9465ed · a9465ed
1 parent d96338e
commit a9465ed
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 9 deletions.
diff --git a/contracts/crowdfund/ERC20LaunchCrowdfund.sol b/contracts/crowdfund/ERC20LaunchCrowdfund.sol
@@ -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();
@@ -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({

diff --git a/contracts/utils/IERC20Creator.sol b/contracts/utils/IERC20Creator.sol
@@ -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);
 }
diff --git a/lib/erc20-creator b/lib/erc20-creator
diff --git a/test/crowdfund/ERC20LaunchCrowdfundForked.t.sol b/test/crowdfund/ERC20LaunchCrowdfundForked.t.sol
@@ -22,8 +22,8 @@ contract ERC20LaunchCrowdfundForkedTest is SetupPartyHelper {
 
         feeCollector = new FeeCollector(
             INonfungiblePositionManager(0xC36442b4a4522E871399CD717aBDD847Ab11FE88),
-            ITokenDistributor(address(tokenDistributor)),
             globalDaoWalletAddress,
+            5e3,
             IWETH(0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2)
         );
 
@@ -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,
@@ -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 {
@@ -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(
@@ -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(
@@ -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(
@@ -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,
@@ -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,
+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