Merge pull request #17 from ProjectOpenSea/ryan/mintredemption-offer

add offer item to mintRedemption

Author: ryanio

src/extensions/ERC1155ShipyardRedeemableMintable.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.19;
 
 import {IERC165} from "openzeppelin-contracts/contracts/interfaces/IERC165.sol";
 import {ERC721ConduitPreapproved_Solady} from "shipyard-core/src/tokens/erc721/ERC721ConduitPreapproved_Solady.sol";
-import {ConsiderationItem} from "seaport-types/src/lib/ConsiderationStructs.sol";
+import {ConsiderationItem, OfferItem} from "seaport-types/src/lib/ConsiderationStructs.sol";
 import {Ownable} from "solady/src/auth/Ownable.sol";
 import {ERC7498NFTRedeemables} from "../lib/ERC7498NFTRedeemables.sol";
 import {CampaignParams} from "../lib/RedeemablesStructs.sol";
@@ -24,6 +24,7 @@ contract ERC1155ShipyardRedeemableMintable is ERC1155ShipyardRedeemable, IRedemp
     function mintRedemption(
         uint256, /* campaignId */
         address recipient,
+        OfferItem calldata, /* offer */
         ConsiderationItem[] calldata, /* consideration */
         TraitRedemption[] calldata /* traitRedemptions */
     ) external {

src/extensions/ERC721ShipyardRedeemableMintable.sol

@@ -3,7 +3,7 @@ pragma solidity ^0.8.19;
 
 import {IERC165} from "openzeppelin-contracts/contracts/interfaces/IERC165.sol";
 import {ERC721ConduitPreapproved_Solady} from "shipyard-core/src/tokens/erc721/ERC721ConduitPreapproved_Solady.sol";
-import {ConsiderationItem} from "seaport-types/src/lib/ConsiderationStructs.sol";
+import {ConsiderationItem, OfferItem} from "seaport-types/src/lib/ConsiderationStructs.sol";
 import {Ownable} from "solady/src/auth/Ownable.sol";
 import {ERC7498NFTRedeemables} from "../lib/ERC7498NFTRedeemables.sol";
 import {CampaignParams} from "../lib/RedeemablesStructs.sol";
@@ -24,6 +24,7 @@ contract ERC721ShipyardRedeemableMintable is ERC721ShipyardRedeemable, IRedempti
     function mintRedemption(
         uint256, /* campaignId */
         address recipient,
+        OfferItem calldata, /* offer */
         ConsiderationItem[] calldata, /* consideration */
         TraitRedemption[] calldata /* traitRedemptions */
     ) external {

src/interfaces/IRedemptionMintable.sol

@@ -1,13 +1,14 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.19;
 
-import {ConsiderationItem} from "seaport-types/src/lib/ConsiderationStructs.sol";
+import {ConsiderationItem, OfferItem} from "seaport-types/src/lib/ConsiderationStructs.sol";
 import {TraitRedemption} from "../lib/RedeemablesStructs.sol";
 
 interface IRedemptionMintable {
     function mintRedemption(
         uint256 campaignId,
         address recipient,
+        OfferItem calldata offer,
         ConsiderationItem[] calldata consideration,
         TraitRedemption[] calldata traitRedemptions
     ) external;

src/lib/ERC7498NFTRedeemables.sol

@@ -391,7 +391,10 @@ contract ERC7498NFTRedeemables is IERC165, IERC7498, DynamicTraits, RedeemablesE
     ) internal {
         // Mint the new tokens.
         for (uint256 i; i < offer.length;) {
-            IRedemptionMintable(offer[i].token).mintRedemption(campaignId, recipient, consideration, traitRedemptions);
+            OfferItem memory offerItem = offer[i];
+            IRedemptionMintable(offerItem.token).mintRedemption(
+                campaignId, recipient, offerItem, consideration, traitRedemptions
+            );
             unchecked {
                 ++i;
             }