Fix Regression introduced in PR#79 (storyprotocol#80)

kingster-will · Feb 7, 2024 · 8088e4e · 8088e4e
1 parent 536f33b
commit 8088e4e
Show file tree

Hide file tree

Showing 7 changed files with 3 additions and 15 deletions.
diff --git a/contracts/IPAccountImpl.sol b/contracts/IPAccountImpl.sol
@@ -11,7 +11,6 @@ import { MessageHashUtils } from "@openzeppelin/contracts/utils/cryptography/Mes
 
 import { IAccessController } from "./interfaces/IAccessController.sol";
 import { IIPAccount } from "./interfaces/IIPAccount.sol";
-import { AccessPermission } from "./lib/AccessPermission.sol";
 import { MetaTx } from "./lib/MetaTx.sol";
 import { Errors } from "./lib/Errors.sol";
 

diff --git a/contracts/lib/Licensing.sol b/contracts/lib/Licensing.sol
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: UNLICENSED
 
 pragma solidity ^0.8.20;
-import { Errors } from "./Errors.sol";
 
 /// @title Licensing
 /// @notice Types and constants used by the licensing related contracts

diff --git a/contracts/modules/BaseModule.sol b/contracts/modules/BaseModule.sol
@@ -5,9 +5,7 @@ pragma solidity ^0.8.23;
 import { IModule } from "../interfaces/modules/base/IModule.sol";
 import { IAccessController } from "../interfaces/IAccessController.sol";
 import { IPAssetRegistry } from "../registries/IPAssetRegistry.sol";
-import { IPAccountRegistry } from "../registries/IPAccountRegistry.sol";
 import { LicenseRegistry } from "../registries/LicenseRegistry.sol";
-import { IResolver } from "../interfaces/resolvers/IResolver.sol";
 import { Errors } from "../lib/Errors.sol";
 
 /// @title BaseModule

diff --git a/contracts/modules/RegistrationModule.sol b/contracts/modules/RegistrationModule.sol
@@ -11,7 +11,6 @@ import { Errors } from "../lib/Errors.sol";
 import { IP } from "../lib/IP.sol";
 import { BaseModule } from "../modules/BaseModule.sol";
 import { ILicensingModule } from "../interfaces/modules/licensing/ILicensingModule.sol";
-import { ILicenseRegistry } from "../interfaces/registries/ILicenseRegistry.sol";
 
 /// @title Registration Module
 /// @notice The registration module is responsible for registration of IP into

diff --git a/contracts/registries/IPAssetRegistry.sol b/contracts/registries/IPAssetRegistry.sol
@@ -2,11 +2,9 @@
 // See https://github.com/storyprotocol/protocol-contracts/blob/main/StoryProtocol-AlphaTestingAgreement-17942166.3.pdf
 pragma solidity ^0.8.23;
 
-import { IERC721 } from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
 import { ERC165Checker } from "@openzeppelin/contracts/utils/introspection/ERC165Checker.sol";
 
 import { IIPAccount } from "../interfaces/IIPAccount.sol";
-import { IMetadataProvider } from "../interfaces/registries/metadata/IMetadataProvider.sol";
 import { IIPAssetRegistry } from "../interfaces/registries/IIPAssetRegistry.sol";
 import { IPAccountRegistry } from "../registries/IPAccountRegistry.sol";
 import { IMetadataProviderMigratable } from "../interfaces/registries/metadata/IMetadataProviderMigratable.sol";

diff --git a/contracts/registries/metadata/MetadataProviderV1.sol b/contracts/registries/metadata/MetadataProviderV1.sol
@@ -54,9 +54,9 @@ contract MetadataProviderV1 is MetadataProviderBase {
         if (decodedMetadata.hash == "") {
             revert Errors.MetadataProvider__HashInvalid();
         }
-        // if (decodedMetadata.registrationDate != uint64(block.timestamp)) {
-        //     revert Errors.MetadataProvider__RegistrationDateInvalid();
-        // }
+         if (decodedMetadata.registrationDate != uint64(block.timestamp)) {
+             revert Errors.MetadataProvider__RegistrationDateInvalid();
+         }
         if (decodedMetadata.registrant == address(0)) {
             revert Errors.MetadataProvider__RegistrantInvalid();
         }

diff --git a/contracts/resolvers/IPResolver.sol b/contracts/resolvers/IPResolver.sol
@@ -2,15 +2,10 @@
 // See https://github.com/storyprotocol/protocol-contracts/blob/main/StoryProtocol-AlphaTestingAgreement-17942166.3.pdf
 pragma solidity ^0.8.23;
 
-import { IResolver } from "../interfaces/resolvers/IResolver.sol";
 import { ResolverBase } from "./ResolverBase.sol";
 import { BaseModule } from "../modules/BaseModule.sol";
 import { IModule } from "../interfaces/modules/base/IModule.sol";
-import { IKeyValueResolver } from "../interfaces/resolvers/IKeyValueResolver.sol";
-import { IIPAccount } from "../interfaces/IIPAccount.sol";
 import { KeyValueResolver } from "../resolvers/KeyValueResolver.sol";
-import { Errors } from "../lib/Errors.sol";
-import { IP } from "../lib/IP.sol";
 import { IP_RESOLVER_MODULE_KEY } from "../lib/modules/Module.sol";
 
 /// @title IP Resolver