fix: logic structure of legacy and new ERC7589

OriumNetwork · Jul 12, 2024 · f136cc8 · f136cc8
1 parent e2a6a65
commit f136cc8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/contracts/OriumSftMarketplace.sol b/contracts/OriumSftMarketplace.sol
@@ -217,16 +217,16 @@ contract OriumSftMarketplace is Initializable, OwnableUpgradeable, PausableUpgra
      */
     function delistRentalOfferAndWithdraw(RentalOffer calldata _offer) external whenNotPaused {
         _delistRentalOffer(_offer);
-        IERC7589 _rolesRegistry = IERC7589(
-            IOriumMarketplaceRoyalties(oriumMarketplaceRoyalties).sftRolesRegistryOf(_offer.tokenAddress)
-        );
-        IERC7589Legacy _rolesRegistryLegacy = IERC7589Legacy(
-            IOriumMarketplaceRoyalties(oriumMarketplaceRoyalties).sftRolesRegistryOf(_offer.tokenAddress)
-        );
 
         if (_offer.tokenAddress == aavegotchiWearableAddress) {
+            IERC7589Legacy _rolesRegistryLegacy = IERC7589Legacy(
+                IOriumMarketplaceRoyalties(oriumMarketplaceRoyalties).sftRolesRegistryOf(_offer.tokenAddress)
+            );
             _rolesRegistryLegacy.releaseTokens(_offer.commitmentId);
         } else {
+            IERC7589 _rolesRegistry = IERC7589(
+                IOriumMarketplaceRoyalties(oriumMarketplaceRoyalties).sftRolesRegistryOf(_offer.tokenAddress)
+            );
             _rolesRegistry.unlockTokens(_offer.commitmentId);
         }
     }

diff --git a/contracts/libraries/LibOriumSftMarketplace.sol b/contracts/libraries/LibOriumSftMarketplace.sol
@@ -100,10 +100,8 @@ library LibOriumSftMarketplace {
         address _expectedGrantor,
         address _rolesRegistryAddress
     ) external view {
-        IERC7589 _rolesRegistry = IERC7589(_rolesRegistryAddress);
-        IERC7589Legacy _rolesRegistryLegacy = IERC7589Legacy(_rolesRegistryAddress);
-
         if (_tokenAddress == aavegotchiWearableAddress) {
+            IERC7589Legacy _rolesRegistryLegacy = IERC7589Legacy(_rolesRegistryAddress);
             require(
                 _rolesRegistryLegacy.grantorOf(_commitmentId) == _expectedGrantor,
                 'OriumSftMarketplace: expected grantor does not match the grantor of the commitmentId'
@@ -117,6 +115,7 @@ library LibOriumSftMarketplace {
                 "OriumSftMarketplace: tokenId provided does not match commitment's tokenId"
             );
         } else {
+            IERC7589 _rolesRegistry = IERC7589(_rolesRegistryAddress);
             require(
                 _rolesRegistry.tokenAmountOf(_commitmentId) == _tokenAmount,
                 "OriumSftMarketplace: tokenAmount provided does not match commitment's tokenAmount"