fix usage of crossminta addr

me-foundation · Dec 22, 2023 · eb1be3c · eb1be3c
1 parent 83b14f6
commit eb1be3c
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 43 deletions.
diff --git a/contracts/BucketAuction.sol b/contracts/BucketAuction.sol
@@ -33,7 +33,6 @@ contract BucketAuction is IBucketAuction, ERC721M {
         uint256 minimumContributionInWei,
         uint64 startTimeUnixSeconds,
         uint64 endTimeUnixSeconds,
-        address crossmintAddress,
         uint64 timestampExpirySeconds
     )
         ERC721M(
@@ -44,8 +43,8 @@ contract BucketAuction is IBucketAuction, ERC721M {
             globalWalletLimit,
             cosigner,
             timestampExpirySeconds,
-            address(0),
-            crossmintAddress
+            address(0), // mintCurrency
+            address(0) // crossMintAddress
         )
     {
         _claimable = false;
@@ -102,15 +101,10 @@ contract BucketAuction is IBucketAuction, ERC721M {
         return _userData[user];
     }
 
-    function getUserDataPage(uint256 limit, uint256 offset)
-        external
-        view
-        returns (
-            User[] memory,
-            address[] memory,
-            uint256 total
-        )
-    {
+    function getUserDataPage(
+        uint256 limit,
+        uint256 offset
+    ) external view returns (User[] memory, address[] memory, uint256 total) {
         uint256 numUsers = _users.length();
         uint256 pageSize = limit;
         if (pageSize > numUsers - offset) {
@@ -148,10 +142,10 @@ contract BucketAuction is IBucketAuction, ERC721M {
      * @param startTime set to unix timestamp for the auction start time.
      * @param endTime set to unix timestamp for the auction end time.
      */
-    function setStartAndEndTimeUnixSeconds(uint64 startTime, uint64 endTime)
-        external
-        onlyOwner
-    {
+    function setStartAndEndTimeUnixSeconds(
+        uint64 startTime,
+        uint64 endTime
+    ) external onlyOwner {
         if (_price != 0) revert PriceHasBeenSet();
         if (endTime <= startTime) revert InvalidStartAndEndTimestamp();
 
@@ -185,10 +179,9 @@ contract BucketAuction is IBucketAuction, ERC721M {
      * @dev set this price in wei, not eth!
      * @param minimumContributionInWei new price, set in wei
      */
-    function setMinimumContribution(uint256 minimumContributionInWei)
-        external
-        onlyOwner
-    {
+    function setMinimumContribution(
+        uint256 minimumContributionInWei
+    ) external onlyOwner {
         _minimumContributionInWei = minimumContributionInWei;
         emit SetMinimumContribution(minimumContributionInWei);
     }
@@ -213,10 +206,10 @@ contract BucketAuction is IBucketAuction, ERC721M {
      * @param to address to mint tokens to.
      * @param numberOfTokens number of tokens to mint.
      */
-    function _internalMint(address to, uint256 numberOfTokens)
-        internal
-        hasSupply(numberOfTokens)
-    {
+    function _internalMint(
+        address to,
+        uint256 numberOfTokens
+    ) internal hasSupply(numberOfTokens) {
         _safeMint(to, numberOfTokens);
         if (!_firstTokenSent && numberOfTokens > 0) _firstTokenSent = true;
     }
@@ -362,10 +355,9 @@ contract BucketAuction is IBucketAuction, ERC721M {
      * @notice send refunds and tokens to a batch of addresses.
      * @param addresses array of addresses to send tokens to.
      */
-    function sendTokensAndRefundBatch(address[] calldata addresses)
-        external
-        onlyOwner
-    {
+    function sendTokensAndRefundBatch(
+        address[] calldata addresses
+    ) external onlyOwner {
         for (uint256 i; i < addresses.length; i++) {
             sendTokensAndRefund(addresses[i]);
         }

diff --git a/contracts/BucketAuctionOperatorFilterer.sol b/contracts/BucketAuctionOperatorFilterer.sol
@@ -20,7 +20,6 @@ contract BucketAuctionOperatorFilterer is
         uint256 minimumContributionInWei,
         uint64 startTimeUnixSeconds,
         uint64 endTimeUnixSeconds,
-        address crossMintAddress,
         uint64 timestampExpirySeconds
     )
         UpdatableOperatorFilterer(
@@ -38,7 +37,6 @@ contract BucketAuctionOperatorFilterer is
             minimumContributionInWei,
             startTimeUnixSeconds,
             endTimeUnixSeconds,
-            crossMintAddress,
             timestampExpirySeconds
         )
     {}

diff --git a/contracts/DutchAuction.sol b/contracts/DutchAuction.sol
@@ -25,8 +25,7 @@ contract DutchAuction is IDutchAuction, ERC721M {
         uint256 maxMintableSupply,
         uint256 globalWalletLimit,
         address cosigner,
-        bool refundable,
-        address crossmintAddress
+        bool refundable
     )
         ERC721M(
             collectionName,
@@ -39,7 +38,7 @@ contract DutchAuction is IDutchAuction, ERC721M {
             300,
             /* mintCurrency= */
             address(0),
-            crossmintAddress
+            address(0)
         )
     {
         _refundable = refundable;
@@ -139,13 +138,9 @@ contract DutchAuction is IDutchAuction, ERC721M {
         return config.endAmountInWei;
     }
 
-    function bid(uint32 qty)
-        external
-        payable
-        nonReentrant
-        hasSupply(qty)
-        validTime
-    {
+    function bid(
+        uint32 qty
+    ) external payable nonReentrant hasSupply(qty) validTime {
         uint256 price = getCurrentPriceInWei();
         if (msg.value < qty * price) revert NotEnoughValue();
 

diff --git a/test/BucketAuction.test.ts b/test/BucketAuction.test.ts
@@ -29,7 +29,6 @@ describe('BucketAuction', function () {
       /* minimumContributionInWei= */ 100,
       0, // Placeholder; startTimeUnixSeconds will be overwritten later
       1, // Placeholder; endTimeUnixSeconds will be overwritten later
-      ethers.constants.AddressZero, // crossmint address
       60, // timestamp expiry seconds
     );
     await ba.deployed();

diff --git a/test/DutchAuction.test.ts b/test/DutchAuction.test.ts
@@ -26,7 +26,6 @@ describe('DutchAuction', function () {
       0,
       ethers.constants.AddressZero,
       /* refundable= */ true,
-      ethers.constants.AddressZero,
     );
     await da.deployed();
 
@@ -328,7 +327,6 @@ describe('DutchAuction', function () {
         0,
         ethers.constants.AddressZero,
         /* refundable= */ false,
-        ethers.constants.AddressZero,
       );
       await da.deployed();