Merge branch 'main' into shipyard-droperc721-audit-fixes

Author: jakeloo

contracts/drop/DropERC20.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.11;
 
 interface IThirdwebPlatformFee {
     /// @dev Returns the platform fee bps and recipient.
-    function getPlatformFeeInfo() external view returns (address platformFeeRecipient, uint16 platformFeeBps);
+    function getPlatformFeeInfo() external view returns (address, uint16);
 
     /// @dev Lets a module admin update the fees on primary sales.
     function setPlatformFeeInfo(address _platformFeeRecipient, uint256 _platformFeeBps) external;

contracts/interfaces/IThirdwebPlatformFee.sol

@@ -8,11 +8,12 @@ import "../IThirdwebPrimarySale.sol";
 import "./IDropClaimCondition.sol";
 
 /**
- *  `LazyMintERC20` is an ERC 20 contract.
+ *  Thirdweb's 'Drop' contracts are distribution mechanisms for tokens. The
+ *  `DropERC20` contract is a distribution mechanism for ERC20 tokens.
  *
- *  The module admin can create claim conditions with non-overlapping time windows,
- *  and accounts can claim the tokens, in a given time window, according to restrictions
- *  defined in that time window's claim conditions.
+ *  A contract admin (i.e. holder of `DEFAULT_ADMIN_ROLE`) can create claim conditions
+ *  with non-overlapping time windows, and accounts can claim the tokens according to
+ *  restrictions defined in the claim condition that is active at the time of the transaction.
  */
 
 interface IDropERC20 is
@@ -33,46 +34,50 @@ interface IDropERC20 is
     /// @dev Emitted when new claim conditions are set.
     event ClaimConditionsUpdated(ClaimCondition[] claimConditions);
 
-    /// @dev Emitted when a new sale recipient is set.
+    /// @dev Emitted when a new primary sale recipient is set.
     event PrimarySaleRecipientUpdated(address indexed recipient);
 
-    /// @dev Emitted when fee on primary sales is updated.
+    /// @dev Emitted when fee platform fee recipient or bps is updated.
     event PlatformFeeInfoUpdated(address platformFeeRecipient, uint256 platformFeeBps);
 
-    /// @dev Emitted when a max total supply is set for a token.
+    /// @dev Emitted when the global max supply of tokens is updated.
     event MaxTotalSupplyUpdated(uint256 maxTotalSupply);
 
-    /// @dev Emitted when a wallet claim count is updated.
+    /// @dev Emitted when the wallet claim count for an address is updated.
     event WalletClaimCountUpdated(address indexed wallet, uint256 count);
 
-    /// @dev Emitted when the max wallet claim count is updated.
+    /// @dev Emitted when the global max wallet claim count is updated.
     event MaxWalletClaimCountUpdated(uint256 count);
 
     /**
      *  @notice Lets an account claim a given quantity of tokens.
      *
-     *  @param _receiver The receiver of the NFTs to claim.
-     *  @param _quantity The quantity of tokens to claim.
-     *  @param _currency The currency in which to pay for the claim.
-     *  @param _pricePerToken The price per token to pay for the claim.
-     *  @param _proofs The proof required to prove the account's inclusion in the merkle root whitelist
-     *                 of the mint conditions that apply.
-     *  @param _proofMaxQuantityPerTransaction The maximum claim quantity per transactions that included in the merkle proof.
+     *  @param receiver                       The receiver of the tokens to claim.
+     *  @param quantity                       The quantity of tokens to claim.
+     *  @param currency                       The currency in which to pay for the claim.
+     *  @param pricePerToken                  The price per token (i.e. price per 1 ether unit of the token)
+     *                                         to pay for the claim.
+     *  @param proofs                         The proof of the claimer's inclusion in the merkle root allowlist
+     *                                        of the claim conditions that apply.
+     *  @param proofMaxQuantityPerTransaction (Optional) The maximum number of tokens an address included in an
+     *                                        allowlist can claim.
      */
     function claim(
-        address _receiver,
-        uint256 _quantity,
-        address _currency,
-        uint256 _pricePerToken,
-        bytes32[] calldata _proofs,
-        uint256 _proofMaxQuantityPerTransaction
+        address receiver,
+        uint256 quantity,
+        address currency,
+        uint256 pricePerToken,
+        bytes32[] calldata proofs,
+        uint256 proofMaxQuantityPerTransaction
     ) external payable;
 
     /**
-     *  @notice Lets a module admin (account with `DEFAULT_ADMIN_ROLE`) set claim conditions.
+     *  @notice Lets a contract admin (account with `DEFAULT_ADMIN_ROLE`) set claim conditions.
      *
-     *  @param _phases Mint conditions in ascending order by `startTimestamp`.
-     *  @param _resetLimitRestriction To reset claim phases limit restriction.
+     *  @param phases                Claim conditions in ascending order by `startTimestamp`.
+     *  @param resetClaimEligibility Whether to reset `limitLastClaimTimestamp` and
+     *                               `limitMerkleProofClaim` values when setting new
+     *                               claim conditions.
      */
-    function setClaimConditions(ClaimCondition[] calldata _phases, bool _resetLimitRestriction) external;
+    function setClaimConditions(ClaimCondition[] calldata phases, bool resetClaimEligibility) external;
 }

contracts/interfaces/drop/IDropERC20.sol

@@ -34,13 +34,15 @@ interface IMarketplace is IThirdwebContract, IThirdwebPlatformFee {
      *                        This is the entire listing quantity if the listing is an auction.
      *  @param currency       The currency in which the offer is made.
      *  @param pricePerToken  The price per token offered to the lister.
+     *  @param expirationTimestamp The timestamp after which a seller cannot accept this offer.
      */
     struct Offer {
         uint256 listingId;
         address offeror;
         uint256 quantityWanted;
         address currency;
         uint256 pricePerToken;
+        uint256 expirationTimestamp;
     }
 
     /**
@@ -297,12 +299,16 @@ interface IMarketplace is IThirdwebContract, IThirdwebPlatformFee {
      *
      *  @param _pricePerToken    For direct listings: offered price per token. For auction listings: the bid
      *                           amount per token. The total offer/bid amount is `_quantityWanted * _pricePerToken`.
+     *
+     *  @param _expirationTimestamp For aution listings: inapplicable. For direct listings: The timestamp after which
+     *                              the seller can no longer accept the offer.
      */
     function offer(
         uint256 _listingId,
         uint256 _quantityWanted,
         address _currency,
-        uint256 _pricePerToken
+        uint256 _pricePerToken,
+        uint256 _expirationTimestamp
     ) external payable;
 
     /**

contracts/interfaces/marketplace/IMarketplace.sol

@@ -31,7 +31,7 @@ library CurrencyTransferLib {
     }
 
     /// @dev Transfers a given amount of currency. (With native token wrapping)
-    function transferCurrencyWithWrapperAndBalanceCheck(
+    function transferCurrencyWithWrapper(
         address _currency,
         address _from,
         address _to,
@@ -55,7 +55,7 @@ library CurrencyTransferLib {
                 safeTransferNativeTokenWithWrapper(_to, _amount, _nativeTokenWrapper);
             }
         } else {
-            safeTransferERC20WithBalanceCheck(_currency, _from, _to, _amount);
+            safeTransferERC20(_currency, _from, _to, _amount);
         }
     }
 
@@ -77,30 +77,6 @@ library CurrencyTransferLib {
         }
     }
 
-    /// @dev Transfer `amount` of ERC20 token from `from` to `to`.
-    function safeTransferERC20WithBalanceCheck(
-        address _currency,
-        address _from,
-        address _to,
-        uint256 _amount
-    ) internal {
-        if (_from == _to) {
-            return;
-        }
-
-        uint256 balBefore = IERC20Upgradeable(_currency).balanceOf(_to);
-
-        if (_from == address(this)) {
-            IERC20Upgradeable(_currency).safeTransfer(_to, _amount);
-        } else {
-            IERC20Upgradeable(_currency).safeTransferFrom(_from, _to, _amount);
-        }
-
-        uint256 balAfter = IERC20Upgradeable(_currency).balanceOf(_to);
-
-        require(balAfter == balBefore + _amount, "currency transfer failed.");
-    }
-
     /// @dev Transfers `amount` of native token to `to`.
     function safeTransferNativeToken(address to, uint256 value) internal {
         // solhint-disable avoid-low-level-calls