Merge pull request #8 from highlightxyz/v1.4.2

v1.4.2
highlightxyz · Feb 14, 2024 · ce7fc6f · ce7fc6f
2 parents a6a7a05 + 494b49f
commit ce7fc6f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/contracts/mint/MintManager.sol b/contracts/mint/MintManager.sol
@@ -759,6 +759,7 @@ contract MintManager is
             mechanicVectorId,
             recipient,
             numToMint,
+            _msgSender(),
             _mechanicVectorMetadata,
             data
         );
@@ -818,6 +819,7 @@ contract MintManager is
             mechanicVectorId,
             recipient,
             tokenIds,
+            _msgSender(),
             _mechanicVectorMetadata,
             data
         );
@@ -1675,4 +1677,4 @@ contract MintManager is
             revert(0x00, 0x04)
         }
     }
-}
+}
diff --git a/contracts/mint/mechanics/DiscreteDutchAuctionMechanic.sol b/contracts/mint/mechanics/DiscreteDutchAuctionMechanic.sol
@@ -353,6 +353,7 @@ contract DiscreteDutchAuctionMechanic is MechanicMintManagerClientUpgradeable, U
         bytes32 mechanicVectorId,
         address recipient,
         uint32 numToMint,
+        address minter,
         MechanicVectorMetadata calldata mechanicVectorMetadata,
         bytes calldata data
     ) external payable onlyMintManager {
@@ -366,6 +367,7 @@ contract DiscreteDutchAuctionMechanic is MechanicMintManagerClientUpgradeable, U
         bytes32 mechanicVectorId,
         address recipient,
         uint256[] calldata tokenIds,
+        address minter,
         MechanicVectorMetadata calldata mechanicVectorMetadata,
         bytes calldata data
     ) external payable onlyMintManager {

diff --git a/contracts/mint/mechanics/interfaces/IMechanic.sol b/contracts/mint/mechanics/interfaces/IMechanic.sol
@@ -20,13 +20,15 @@ interface IMechanic is IMechanicData {
      * @param mechanicVectorId Global ID identifying mint vector, using this mechanic
      * @param recipient Mint recipient
      * @param numToMint Number of tokens to mint
+     * @param minter Account that called mint on the MintManager
      * @param mechanicVectorMetadata Mechanic vector metadata
      * @param data Custom data that can be deserialized and processed according to implementation
      */
     function processNumMint(
         bytes32 mechanicVectorId,
         address recipient,
         uint32 numToMint,
+        address minter,
         MechanicVectorMetadata calldata mechanicVectorMetadata,
         bytes calldata data
     ) external payable;
@@ -36,14 +38,16 @@ interface IMechanic is IMechanicData {
      * @param mechanicVectorId Global ID identifying mint vector, using this mechanic
      * @param recipient Mint recipient
      * @param tokenIds IDs of tokens to mint
+     * @param minter Account that called mint on the MintManager
      * @param mechanicVectorMetadata Mechanic vector metadata
      * @param data Custom data that can be deserialized and processed according to implementation
      */
     function processChooseMint(
         bytes32 mechanicVectorId,
         address recipient,
         uint256[] calldata tokenIds,
+        address minter,
         MechanicVectorMetadata calldata mechanicVectorMetadata,
         bytes calldata data
     ) external payable;
-}
+}