Merge pull request #142 from moleculeprotocol/jonas/tch-26-discrimina…

…te-crowdsales-in-the-subgraph Discriminate (plain) crowdsales in the subgraph
moleculeprotocol · Oct 29, 2023 · fec479e · fec479e
2 parents 2887a5b + e46a02e
commit fec479e
Show file tree

Hide file tree

Showing 14 changed files with 1,346 additions and 173 deletions.
diff --git a/src/crowdsale/CrowdSale.sol b/src/crowdsale/CrowdSale.sol
@@ -70,7 +70,7 @@ contract CrowdSale is ReentrancyGuard, Ownable {
      */
     uint16 public currentFeeBp = 0;
 
-    event Started(uint256 indexed saleId, address indexed issuer, Sale sale, uint16 percentageFee);
+    event Started(uint256 indexed saleId, address indexed issuer, Sale sale, uint16 feeBp);
     event Settled(uint256 indexed saleId, uint256 totalBids, uint256 surplus);
     /// @notice emitted when participants of the sale claim their tokens
     event Claimed(uint256 indexed saleId, address indexed claimer, uint256 claimed, uint256 refunded);

diff --git a/src/crowdsale/LockingCrowdSale.sol b/src/crowdsale/LockingCrowdSale.sol
@@ -27,7 +27,7 @@ contract LockingCrowdSale is CrowdSale {
 
     address immutable lockingTokenImplementation = address(new TimelockedToken());
 
-    event Started(uint256 indexed saleId, address indexed issuer, Sale sale, TimelockedToken lockingToken, uint256 lockingDuration);
+    event Started(uint256 indexed saleId, address indexed issuer, Sale sale, TimelockedToken lockingToken, uint256 lockingDuration, uint16 feeBp);
     event LockingContractCreated(TimelockedToken indexed lockingContract, IERC20Metadata indexed underlyingToken);
 
     /// @dev disable parent sale starting functions
@@ -71,7 +71,14 @@ contract LockingCrowdSale is CrowdSale {
     }
 
     function _afterSaleStarted(uint256 saleId) internal virtual override {
-        emit Started(saleId, msg.sender, _sales[saleId], lockingContracts[address(_sales[saleId].auctionToken)], salesLockingDuration[saleId]);
+        emit Started(
+            saleId,
+            msg.sender,
+            _sales[saleId],
+            lockingContracts[address(_sales[saleId].auctionToken)],
+            salesLockingDuration[saleId],
+            _saleInfo[saleId].feeBp
+        );
     }
 
     function _afterSaleSettled(uint256 saleId) internal override {

diff --git a/src/crowdsale/StakedLockingCrowdSale.sol b/src/crowdsale/StakedLockingCrowdSale.sol
@@ -45,7 +45,8 @@ contract StakedLockingCrowdSale is LockingCrowdSale {
         StakingInfo staking,
         TimelockedToken lockingToken,
         uint256 lockingDuration,
-        uint256 stakingDuration
+        uint256 stakingDuration,
+        uint16 feeBp
     );
     event Staked(uint256 indexed saleId, address indexed bidder, uint256 stakedAmount, uint256 price);
     event ClaimedStakes(uint256 indexed saleId, address indexed claimer, uint256 stakesClaimed, uint256 stakesRefunded);
@@ -139,7 +140,8 @@ contract StakedLockingCrowdSale is LockingCrowdSale {
             salesStaking[saleId],
             lockingContracts[address(_sales[saleId].auctionToken)],
             salesLockingDuration[saleId],
-            stakingDuration
+            stakingDuration,
+            _saleInfo[saleId].feeBp
         );
     }