Drop interfaces token structure (#173)

* new drop interface structure

* update gitignore

* update docs

* add our own Multicall extension

* dev build

.gitignore

@@ -34,9 +34,10 @@ yarn-error.log*
 /relayerTest
 ./contracts/v2/Market.sol
 /notes.txt
-<<<<<<< HEAD
 .yalc/
 yalc.lock
+package-lock.json
+yarn.lock
 
 # Forge
 #/lib

contracts/feature/Drop.sol

@@ -2,10 +2,12 @@
 pragma solidity ^0.8.0;
 
 import "./interface/IDrop.sol";
+import "./interface/IClaimConditionsMultiPhase.sol";
+import "./LazyMint.sol";
 import "../lib/MerkleProof.sol";
 import "../lib/TWBitMaps.sol";
 
-abstract contract Drop is IDrop {
+abstract contract Drop is LazyMint, IDrop, IClaimConditionsMultiPhase {
     using TWBitMaps for TWBitMaps.BitMap;
 
     /*///////////////////////////////////////////////////////////////

contracts/feature/DropSinglePhase.sol

@@ -1,14 +1,16 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
 
-import "./interface/IDropSinglePhase.sol";
+import "./interface/IClaimConditionsSinglePhase.sol";
+import "./interface/IDrop.sol";
+import "./LazyMint.sol";
 import "../lib/MerkleProof.sol";
 import "../lib/TWBitMaps.sol";
 
-abstract contract DropSinglePhase is IDropSinglePhase {
+abstract contract DropSinglePhase is LazyMint, IDrop, IClaimConditionsSinglePhase {
     using TWBitMaps for TWBitMaps.BitMap;
 
-    /*///////////////////////////////////////////////////////////////
+    /*///////////////////////////////////////////////////x////////////
                             State variables
     //////////////////////////////////////////////////////////////*/
 
@@ -88,7 +90,7 @@ abstract contract DropSinglePhase is IDropSinglePhase {
         // Mint the relevant NFTs to claimer.
         uint256 startTokenId = transferTokensOnClaim(_receiver, _quantity);
 
-        emit TokensClaimed(_dropMsgSender(), _receiver, startTokenId, _quantity);
+        emit TokensClaimed(0, _dropMsgSender(), _receiver, startTokenId, _quantity);
 
         _afterClaim(_receiver, _quantity, _currency, _pricePerToken, _allowlistProof, _data);
     }

contracts/feature/Multicall.sol

@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: MIT
+// OpenZeppelin Contracts (last updated v4.5.0) (utils/Multicall.sol)
+
+pragma solidity ^0.8.0;
+
+import "../lib/TWAddress.sol";
+import "./interface/IMulticall.sol";
+
+/**
+ * @dev Provides a function to batch together multiple calls in a single external call.
+ *
+ * _Available since v4.1._
+ */
+contract Multicall is IMulticall {
+    /**
+     * @dev Receives and executes a batch of function calls on this contract.
+     */
+    function multicall(bytes[] calldata data) external virtual returns (bytes[] memory results) {
+        results = new bytes[](data.length);
+        for (uint256 i = 0; i < data.length; i++) {
+            results[i] = TWAddress.functionDelegateCall(address(this), data[i]);
+        }
+        return results;
+    }
+}

contracts/feature/interface/IClaimConditionsMultiPhase.sol

@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.0;
+
+import "../../lib/TWBitMaps.sol";
+import "./IClaimCondition.sol";
+
+/**
+ *  Thirdweb's 'Drop' contracts are distribution mechanisms for tokens.
+ *
+ *  A contract admin (i.e. a holder of `DEFAULT_ADMIN_ROLE`) can set a series of claim conditions,
+ *  ordered by their respective `startTimestamp`. A claim condition defines criteria under which
+ *  accounts can mint tokens. Claim conditions can be overwritten or added to by the contract admin.
+ *  At any moment, there is only one active claim condition.
+ */
+
+interface IClaimConditionsMultiPhase is IClaimCondition {
+    event ClaimConditionsUpdated(ClaimCondition[] claimConditions);
+
+    /**
+     *  @notice Lets a contract admin (account with `DEFAULT_ADMIN_ROLE`) set claim conditions.
+     *
+     *  @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 resetClaimEligibility) external;
+}

contracts/feature/interface/IClaimConditionsSinglePhase.sol

@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: Apache-2.0
+pragma solidity ^0.8.0;
+
+import "../../lib/TWBitMaps.sol";
+import "./IClaimCondition.sol";
+
+/**
+ *  Thirdweb's 'Drop' contracts are distribution mechanisms for tokens.
+ *
+ *  A contract admin (i.e. a holder of `DEFAULT_ADMIN_ROLE`) can set a series of claim conditions,
+ *  ordered by their respective `startTimestamp`. A claim condition defines criteria under which
+ *  accounts can mint tokens. Claim conditions can be overwritten or added to by the contract admin.
+ *  At any moment, there is only one active claim condition.
+ */
+
+interface IClaimConditionsSinglePhase is IClaimCondition {
+    event ClaimConditionUpdated(ClaimCondition claimConditions, bool resetClaimEligibility);
+
+    /**
+     *  @notice Lets a contract admin (account with `DEFAULT_ADMIN_ROLE`) set claim conditions.
+     *
+     *  @param phase                   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 phase, bool resetClaimEligibility) external;
+}

contracts/feature/interface/IDrop.sol

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: Apache-2.0
 pragma solidity ^0.8.0;
 
-import "./IClaimCondition.sol";
+import "./ILazyMint.sol";
 
-interface IDrop is IClaimCondition {
+interface IDrop is ILazyMint {
     struct AllowlistProof {
         bytes32[] proof;
         uint256 maxQuantityInAllowlist;
@@ -17,8 +17,6 @@ interface IDrop is IClaimCondition {
         uint256 quantityClaimed
     );
 
-    event ClaimConditionsUpdated(ClaimCondition[] claimConditions);
-
     /**
      *  @notice Lets an account claim a given quantity of NFTs.
      *
@@ -38,15 +36,4 @@ interface IDrop is IClaimCondition {
         AllowlistProof calldata allowlistProof,
         bytes memory data
     ) external payable;
-
-    /**
-     *  @notice Lets a contract admin (account with `DEFAULT_ADMIN_ROLE`) set claim conditions.
-     *
-     *  @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 resetClaimEligibility) external;
 }