Fix function conflict in marketplace extensions (#682)

Author: kumaryash90

contracts/prebuilts/marketplace/direct-listings/DirectListingsLogic.sol

@@ -36,7 +36,7 @@ contract DirectListingsLogic is IDirectListings, ReentrancyGuard, ERC2771Context
     /// @dev The max bps of the contract. So, 10_000 == 100 %
     uint64 private constant MAX_BPS = 10_000;
 
-    address public constant DEFAULT_FEE_RECIPIENT = 0x1Af20C6B23373350aD464700B5965CE4B0D2aD94;
+    address private constant DEFAULT_FEE_RECIPIENT = 0x1Af20C6B23373350aD464700B5965CE4B0D2aD94;
     uint16 private constant DEFAULT_FEE_BPS = 100;
 
     /// @dev The address of the native token wrapper contract.

contracts/prebuilts/marketplace/english-auctions/EnglishAuctionsLogic.sol

@@ -38,7 +38,7 @@ contract EnglishAuctionsLogic is IEnglishAuctions, ReentrancyGuard, ERC2771Conte
     /// @dev The max bps of the contract. So, 10_000 == 100 %
     uint64 private constant MAX_BPS = 10_000;
 
-    address public constant DEFAULT_FEE_RECIPIENT = 0x1Af20C6B23373350aD464700B5965CE4B0D2aD94;
+    address private constant DEFAULT_FEE_RECIPIENT = 0x1Af20C6B23373350aD464700B5965CE4B0D2aD94;
     uint16 private constant DEFAULT_FEE_BPS = 100;
 
     /// @dev The address of the native token wrapper contract.

contracts/prebuilts/marketplace/entrypoint/MarketplaceV3.sol

@@ -58,6 +58,8 @@ contract MarketplaceV3 is
     /// @dev The address of the native token wrapper contract.
     address private immutable nativeTokenWrapper;
 
+    address public constant DEFAULT_FEE_RECIPIENT = 0x1Af20C6B23373350aD464700B5965CE4B0D2aD94;
+
     /*///////////////////////////////////////////////////////////////
                     Constructor + initializer logic
     //////////////////////////////////////////////////////////////*/

contracts/prebuilts/marketplace/offers/OffersLogic.sol

@@ -35,7 +35,7 @@ contract OffersLogic is IOffers, ReentrancyGuard, ERC2771ContextConsumer {
     /// @dev The max bps of the contract. So, 10_000 == 100 %
     uint64 private constant MAX_BPS = 10_000;
 
-    address public constant DEFAULT_FEE_RECIPIENT = 0x1Af20C6B23373350aD464700B5965CE4B0D2aD94;
+    address private constant DEFAULT_FEE_RECIPIENT = 0x1Af20C6B23373350aD464700B5965CE4B0D2aD94;
     uint16 private constant DEFAULT_FEE_BPS = 100;
 
     /*///////////////////////////////////////////////////////////////

src/test/marketplace/DirectListings.t.sol

@@ -74,7 +74,7 @@ contract MarketplaceDirectListingsTest is BaseTest, IExtension {
 
         // Deploy `DirectListings`
         address directListings = address(new DirectListingsLogic(address(weth)));
-        defaultFeeRecipient = DirectListingsLogic(directListings).DEFAULT_FEE_RECIPIENT();
+        defaultFeeRecipient = 0x1Af20C6B23373350aD464700B5965CE4B0D2aD94;
         vm.label(directListings, "DirectListings_Extension");
 
         // Extension: DirectListingsLogic

src/test/marketplace/EnglishAuctions.t.sol

@@ -75,7 +75,7 @@ contract MarketplaceEnglishAuctionsTest is BaseTest, IExtension {
 
         // Deploy `EnglishAuctions`
         address englishAuctions = address(new EnglishAuctionsLogic(address(weth)));
-        defaultFeeRecipient = EnglishAuctionsLogic(englishAuctions).DEFAULT_FEE_RECIPIENT();
+        defaultFeeRecipient = 0x1Af20C6B23373350aD464700B5965CE4B0D2aD94;
         vm.label(englishAuctions, "EnglishAuctions_Extension");
 
         // Extension: EnglishAuctionsLogic
@@ -2171,7 +2171,7 @@ contract BreitwieserTheCreator is BaseTest, IERC721Receiver, IExtension {
 
         // Deploy `EnglishAuctions`
         address englishAuctions = address(new EnglishAuctionsLogic(address(weth)));
-        defaultFeeRecipient = EnglishAuctionsLogic(englishAuctions).DEFAULT_FEE_RECIPIENT();
+        defaultFeeRecipient = 0x1Af20C6B23373350aD464700B5965CE4B0D2aD94;
         vm.label(englishAuctions, "EnglishAuctions_Extension");
 
         // Extension: EnglishAuctionsLogic

src/test/marketplace/Offers.t.sol

@@ -74,7 +74,7 @@ contract MarketplaceOffersTest is BaseTest, IExtension {
 
         // Deploy `Offers`
         address offers = address(new OffersLogic());
-        defaultFeeRecipient = OffersLogic(offers).DEFAULT_FEE_RECIPIENT();
+        defaultFeeRecipient = 0x1Af20C6B23373350aD464700B5965CE4B0D2aD94;
         vm.label(offers, "Offers_Extension");
 
         // Extension: OffersLogic

src/test/marketplace/direct-listings/_payout/_payout.t.sol

@@ -97,7 +97,7 @@ contract PayoutTest is BaseTest, IExtension {
 
         // Deploy `DirectListings`
         address directListings = address(new DirectListingsLogic(address(weth)));
-        defaultFeeRecipient = DirectListingsLogic(directListings).DEFAULT_FEE_RECIPIENT();
+        defaultFeeRecipient = 0x1Af20C6B23373350aD464700B5965CE4B0D2aD94;
         vm.label(directListings, "DirectListings_Extension");
 
         // Extension: DirectListingsLogic

src/test/marketplace/english-auctions/_payout/_payout.t.sol

@@ -149,7 +149,7 @@ contract EnglishAuctionsPayoutTest is BaseTest, IExtension {
 
         // Deploy `EnglishAuctions`
         address englishAuctions = address(new EnglishAuctionsLogic(address(weth)));
-        defaultFeeRecipient = EnglishAuctionsLogic(englishAuctions).DEFAULT_FEE_RECIPIENT();
+        defaultFeeRecipient = 0x1Af20C6B23373350aD464700B5965CE4B0D2aD94;
         vm.label(englishAuctions, "EnglishAuctions_Extension");
 
         // Extension: EnglishAuctionsLogic

src/test/marketplace/english-auctions/collectAuctionPayout/collectAuctionPayout.t.sol

@@ -144,7 +144,7 @@ contract CollectAuctionPayoutTest is BaseTest, IExtension {
 
         // Deploy `EnglishAuctions`
         address englishAuctions = address(new EnglishAuctionsLogic(address(weth)));
-        defaultFeeRecipient = EnglishAuctionsLogic(englishAuctions).DEFAULT_FEE_RECIPIENT();
+        defaultFeeRecipient = 0x1Af20C6B23373350aD464700B5965CE4B0D2aD94;
         vm.label(englishAuctions, "EnglishAuctions_Extension");
 
         // Extension: EnglishAuctionsLogic