feat: membership sale (#328)

* add `SellPartyCardsAuthority` * update deploy * add a few tests * update events and add helper functions * update relevant abis * fix tests * add more tests * add more tests * update `isSaleActive` logic * move Contributed event * merge `AboveMaximumContributionsError` and `BelowMinimumContributionsError` * remove redundant initial delegate check * fix compile errors * transfer contribution to Party and fix totalContribution * update `ContributionRouter` * fix `isSaleActive` * fix tests and increase coverage * fix test * update contribute event * fix event and tests * tweaks * increase coverage * perf: optimize and refactor `SellPartyCardsAuthority` (#30) * fix tests * update delegate comments * ensure contract is an authority before sale creation * fix deploy * emit `Finalized` if not enough room for another contribution * style: rename `delegate` to `initialDelegate` * fix(`SellPartyCardsAuthority`): mitigations (#329) * Fix merge conflict --------- Co-authored-by: Brian Le <[email protected]>
PartyDAO · Nov 30, 2023 · de1b8f7 · de1b8f7
1 parent 6a1d972
commit de1b8f7
Show file tree

Hide file tree

Showing 7 changed files with 1,379 additions and 5 deletions.
diff --git a/contracts/authorities/SellPartyCardsAuthority.sol b/contracts/authorities/SellPartyCardsAuthority.sol
diff --git a/contracts/crowdfund/ContributionRouter.sol b/contracts/crowdfund/ContributionRouter.sol
@@ -4,6 +4,7 @@ pragma solidity 0.8.20;
 import { LibAddress } from "../utils/LibAddress.sol";
 import { LibRawResult } from "../utils/LibRawResult.sol";
 import { InitialETHCrowdfund } from "../crowdfund/InitialETHCrowdfund.sol";
+import { SellPartyCardsAuthority } from "../../contracts/authorities/SellPartyCardsAuthority.sol";
 
 contract ContributionRouter {
     using LibRawResult for bytes;
@@ -75,11 +76,13 @@ contract ContributionRouter {
         assembly {
             target := shr(96, calldataload(sub(calldatasize(), 20)))
         }
-        if (msg.sig == InitialETHCrowdfund.batchContributeFor.selector) {
+        if (
+            msg.sig == InitialETHCrowdfund.batchContributeFor.selector ||
+            msg.sig == SellPartyCardsAuthority.batchContributeFor.selector
+        ) {
             uint256 numOfMints;
             assembly {
-                // 196 is the offset of the length of `tokenIds` in the
-                // calldata.
+                // 196 is the offset of the array length in the calldata.
                 numOfMints := calldataload(196)
             }
             feeAmount *= numOfMints;

diff --git a/contracts/utils/LibSafeCast.sol b/contracts/utils/LibSafeCast.sol
@@ -8,6 +8,7 @@ library LibSafeCast {
     error Uint256ToInt128CastOutOfRangeError(uint256 u256);
     error Uint256ToUint128CastOutOfRangeError(uint256 u256);
     error Uint256ToUint40CastOutOfRangeError(uint256 u256);
+    error Uint96ToUint16CastOutOfRange(uint96 u96);
 
     function safeCastUint256ToUint96(uint256 v) internal pure returns (uint96) {
         if (v > uint256(type(uint96).max)) {
@@ -23,13 +24,27 @@ library LibSafeCast {
         return uint128(v);
     }
 
+    function safeCastUint256ToUint160(uint256 v) internal pure returns (uint160) {
+        if (v > uint256(type(uint160).max)) {
+            revert Uint256ToUint128CastOutOfRangeError(v);
+        }
+        return uint160(v);
+    }
+
     function safeCastUint256ToInt192(uint256 v) internal pure returns (int192) {
         if (v > uint256(uint192(type(int192).max))) {
             revert Uint256ToInt192CastOutOfRange(v);
         }
         return int192(uint192(v));
     }
 
+    function safeCastUint96ToUint16(uint96 v) internal pure returns (uint16) {
+        if (v > uint96(type(uint16).max)) {
+            revert Uint96ToUint16CastOutOfRange(v);
+        }
+        return uint16(v);
+    }
+
     function safeCastUint96ToInt192(uint96 v) internal pure returns (int192) {
         return int192(uint192(v));
     }

diff --git a/deploy/Deploy.s.sol b/deploy/Deploy.s.sol
@@ -31,6 +31,7 @@ import "../contracts/market-wrapper/NounsMarketWrapper.sol";
 import { AtomicManualParty } from "../contracts/crowdfund/AtomicManualParty.sol";
 import { ContributionRouter } from "../contracts/crowdfund/ContributionRouter.sol";
 import { AddPartyCardsAuthority } from "../contracts/authorities/AddPartyCardsAuthority.sol";
+import { SellPartyCardsAuthority } from "../contracts/authorities/SellPartyCardsAuthority.sol";
 import { SSTORE2MetadataProvider } from "../contracts/renderers/SSTORE2MetadataProvider.sol";
 import { BasicMetadataProvider } from "../contracts/renderers/BasicMetadataProvider.sol";
 import "./LibDeployConstants.sol";
@@ -81,6 +82,7 @@ abstract contract Deploy {
     AtomicManualParty public atomicManualParty;
     ContributionRouter public contributionRouter;
     AddPartyCardsAuthority public addPartyCardsAuthority;
+    SellPartyCardsAuthority public sellPartyCardsAuthority;
 
     function deploy(LibDeployConstants.DeployConstants memory deployConstants) public virtual {
         _switchDeployer(DeployerRole.Default);
@@ -349,6 +351,15 @@ abstract contract Deploy {
         _trackDeployerGasAfter();
         console.log("  Deployed - AddPartyCardsAuthority", address(addPartyCardsAuthority));
 
+        // DEPLOY_SELL_PARTY_CARDS_AUTHORITY
+        console.log("");
+        console.log("### SellPartyCardsAuthority");
+        console.log("  Deploying - SellPartyCardsAuthority");
+        _trackDeployerGasBefore();
+        sellPartyCardsAuthority = new SellPartyCardsAuthority();
+        _trackDeployerGasAfter();
+        console.log("  Deployed - SellPartyCardsAuthority", address(sellPartyCardsAuthority));
+
         // DEPLOY_BATCH_BUY_OPERATOR
         console.log("");
         console.log("### CollectionBatchBuyOperator");
@@ -685,7 +696,7 @@ contract DeployScript is Script, Deploy {
         Deploy.deploy(deployConstants);
         vm.stopBroadcast();
 
-        AddressMapping[] memory addressMapping = new AddressMapping[](28);
+        AddressMapping[] memory addressMapping = new AddressMapping[](29);
         addressMapping[0] = AddressMapping("Globals", address(globals));
         addressMapping[1] = AddressMapping("TokenDistributor", address(tokenDistributor));
         addressMapping[2] = AddressMapping(
@@ -741,6 +752,10 @@ contract DeployScript is Script, Deploy {
             "AddPartyCardsAuthority",
             address(addPartyCardsAuthority)
         );
+        addressMapping[28] = AddressMapping(
+            "SellPartyCardsAuthority",
+            address(sellPartyCardsAuthority)
+        );
 
         console.log("");
         console.log("### Deployed addresses");