Uses explicit imports.

rmrk-team · Dec 6, 2023 · a1852c5 · a1852c5
1 parent ee3f576
commit a1852c5
Show file tree

Hide file tree

Showing 100 changed files with 326 additions and 233 deletions.
diff --git a/contracts/RMRK/access/Ownable.sol b/contracts/RMRK/access/Ownable.sol
@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.21;
 
-import "@openzeppelin/contracts/utils/Context.sol";
+import {Context} from "@openzeppelin/contracts/utils/Context.sol";
 import "../library/RMRKErrors.sol";
 
 /**

diff --git a/contracts/RMRK/access/OwnableLock.sol b/contracts/RMRK/access/OwnableLock.sol
@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.21;
 
-import "./Ownable.sol";
+import {Ownable} from "./Ownable.sol";
 import "../library/RMRKErrors.sol";
 
 /**

diff --git a/contracts/RMRK/catalog/IRMRKCatalog.sol b/contracts/RMRK/catalog/IRMRKCatalog.sol
@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.21;
 
-import "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 
 /**
  * @title IRMRKCatalog

diff --git a/contracts/RMRK/catalog/RMRKCatalog.sol b/contracts/RMRK/catalog/RMRKCatalog.sol
@@ -2,8 +2,8 @@
 
 pragma solidity ^0.8.21;
 
-import "./IRMRKCatalog.sol";
-import "@openzeppelin/contracts/utils/Address.sol";
+import {IRMRKCatalog, IERC165} from "./IRMRKCatalog.sol";
+import {Address} from "@openzeppelin/contracts/utils/Address.sol";
 import "../library/RMRKErrors.sol";
 
 /**

diff --git a/contracts/RMRK/emotable/IERC7409.sol b/contracts/RMRK/emotable/IERC7409.sol
@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.21;
 
-import "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 
 interface IERC7409 is IERC165 {
     /**

diff --git a/contracts/RMRK/emotable/RMRKEmotesRepository.sol b/contracts/RMRK/emotable/RMRKEmotesRepository.sol
@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.21;
 
-import "./IERC7409.sol";
+import {IERC7409, IERC165} from "./IERC7409.sol";
 
 error BulkParametersOfUnequalLength();
 error ExpiredPresignedEmote();

diff --git a/contracts/RMRK/equippable/IERC6220.sol b/contracts/RMRK/equippable/IERC6220.sol
@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.21;
 
-import "../multiasset/IERC5773.sol";
+import {IERC5773} from "../multiasset/IERC5773.sol";
 
 /**
  * @title IERC6220

diff --git a/contracts/RMRK/equippable/RMRKEquippable.sol b/contracts/RMRK/equippable/RMRKEquippable.sol
@@ -4,12 +4,16 @@
 
 pragma solidity ^0.8.21;
 
-import "../catalog/IRMRKCatalog.sol";
-import "../library/RMRKLib.sol";
-import "../multiasset/AbstractMultiAsset.sol";
-import "../nestable/RMRKNestable.sol";
-import "../security/ReentrancyGuard.sol";
-import "./IERC6220.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+import {IERC5773} from "../multiasset/IERC5773.sol";
+import {IERC6220} from "./IERC6220.sol";
+import {IERC7401} from "../nestable/IERC7401.sol";
+import {IRMRKCatalog} from "../catalog/IRMRKCatalog.sol";
+import {RMRKLib} from "../library/RMRKLib.sol";
+import {AbstractMultiAsset} from "../multiasset/AbstractMultiAsset.sol";
+import {RMRKNestable} from "../nestable/RMRKNestable.sol";
+import {ReentrancyGuard} from "../security/ReentrancyGuard.sol";
+import "../library/RMRKErrors.sol";
 
 /**
  * @title RMRKEquippable

diff --git a/contracts/RMRK/equippable/RMRKMinifiedEquippable.sol b/contracts/RMRK/equippable/RMRKMinifiedEquippable.sol
@@ -2,18 +2,18 @@
 
 pragma solidity ^0.8.21;
 
-import "@openzeppelin/contracts/token/ERC721/IERC721.sol";
-import "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
-import "@openzeppelin/contracts/utils/Context.sol";
-import "@openzeppelin/contracts/utils/introspection/IERC165.sol";
-
-import "../catalog/IRMRKCatalog.sol";
-import "../core/RMRKCore.sol";
-import "../equippable/IERC6220.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+import {IERC5773} from "../multiasset/IERC5773.sol";
+import {IERC6220} from "../equippable/IERC6220.sol";
+import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
+import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
+import {IERC7401} from "../nestable/IERC7401.sol";
+import {Context} from "@openzeppelin/contracts/utils/Context.sol";
+import {IRMRKCatalog} from "../catalog/IRMRKCatalog.sol";
+import {RMRKCore} from "../core/RMRKCore.sol";
+import {RMRKLib} from "../library/RMRKLib.sol";
+import {ReentrancyGuard} from "../security/ReentrancyGuard.sol";
 import "../library/RMRKErrors.sol";
-import "../library/RMRKLib.sol";
-import "../nestable/IERC7401.sol";
-import "../security/ReentrancyGuard.sol";
 
 /**
  * @title RMRKMinifiedEquippable

diff --git a/contracts/RMRK/extension/RMRKRoyalties.sol b/contracts/RMRK/extension/RMRKRoyalties.sol
@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.21;
 
-import "@openzeppelin/contracts/interfaces/IERC2981.sol";
+import {IERC2981} from "@openzeppelin/contracts/interfaces/IERC2981.sol";
 import "../library/RMRKErrors.sol";
 
 /**

diff --git a/contracts/RMRK/extension/multiAssetAutoIndex/IRMRKMultiAssetAutoIndex.sol b/contracts/RMRK/extension/multiAssetAutoIndex/IRMRKMultiAssetAutoIndex.sol
@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.21;
 
-import "../../multiasset/IERC5773.sol";
+import {IERC5773} from "../../multiasset/IERC5773.sol";
 
 /**
  * @title RMRKMultiAssetAutoIndex

diff --git a/contracts/RMRK/extension/multiAssetAutoIndex/RMRKMultiAssetAutoIndex.sol b/contracts/RMRK/extension/multiAssetAutoIndex/RMRKMultiAssetAutoIndex.sol
@@ -2,8 +2,10 @@
 
 pragma solidity ^0.8.21;
 
-import "./IRMRKMultiAssetAutoIndex.sol";
-import "../../multiasset/RMRKMultiAsset.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+import {IRMRKMultiAssetAutoIndex} from "./IRMRKMultiAssetAutoIndex.sol";
+import {RMRKMultiAsset} from "../../multiasset/RMRKMultiAsset.sol";
+import {AbstractMultiAsset} from "../../multiasset/AbstractMultiAsset.sol";
 
 /**
  * @title RMRKMultiAssetAutoIndex

diff --git a/contracts/RMRK/extension/nestableAutoIndex/IRMRKNestableAutoIndex.sol b/contracts/RMRK/extension/nestableAutoIndex/IRMRKNestableAutoIndex.sol
@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.21;
 
-import "../../nestable/IERC7401.sol";
+import {IERC7401} from "../../nestable/IERC7401.sol";
 
 /**
  * @title RMRKNestableAutoIndex

diff --git a/contracts/RMRK/extension/nestableAutoIndex/RMRKNestableAutoIndex.sol b/contracts/RMRK/extension/nestableAutoIndex/RMRKNestableAutoIndex.sol
@@ -2,8 +2,10 @@
 
 pragma solidity ^0.8.21;
 
-import "./IRMRKNestableAutoIndex.sol";
-import "../../nestable/RMRKNestable.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+import {IERC7401} from "../../nestable/IERC7401.sol";
+import {IRMRKNestableAutoIndex} from "./IRMRKNestableAutoIndex.sol";
+import {RMRKNestable} from "../../nestable/RMRKNestable.sol";
 
 /**
  * @title RMRKNestableAutoIndex

diff --git a/contracts/RMRK/extension/reclaimableChild/IRMRKReclaimableChild.sol b/contracts/RMRK/extension/reclaimableChild/IRMRKReclaimableChild.sol
@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.21;
 
-import "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 
 /**
  * @title IRMRKReclaimableChild

diff --git a/contracts/RMRK/extension/reclaimableChild/RMRKReclaimableChild.sol b/contracts/RMRK/extension/reclaimableChild/RMRKReclaimableChild.sol
@@ -2,8 +2,12 @@
 
 pragma solidity ^0.8.21;
 
-import "../../nestable/RMRKNestable.sol";
-import "./IRMRKReclaimableChild.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+import {IERC7401} from "../../nestable/IERC7401.sol";
+import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
+import {RMRKNestable} from "../../nestable/RMRKNestable.sol";
+import {IRMRKReclaimableChild} from "./IRMRKReclaimableChild.sol";
+import "../../library/RMRKErrors.sol";
 
 /**
  * @title RMRKReclaimableChild

diff --git a/contracts/RMRK/extension/revealable/RMRKRevealable.sol b/contracts/RMRK/extension/revealable/RMRKRevealable.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 
-import "./IRMRKRevealable.sol";
-import "./IRMRKRevealer.sol";
+import {IRMRKRevealable} from "./IRMRKRevealable.sol";
+import {IRMRKRevealer} from "./IRMRKRevealer.sol";
 
 pragma solidity ^0.8.21;
 

diff --git a/contracts/RMRK/extension/soulbound/IERC6454.sol b/contracts/RMRK/extension/soulbound/IERC6454.sol
@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.21;
 
-import "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 
 /**
  * @title IERC6454

diff --git a/contracts/RMRK/extension/soulbound/RMRKSoulbound.sol b/contracts/RMRK/extension/soulbound/RMRKSoulbound.sol
@@ -2,8 +2,9 @@
 
 pragma solidity ^0.8.21;
 
-import "../../core/RMRKCore.sol";
-import "./IERC6454.sol";
+import {IERC6454} from "./IERC6454.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+import {RMRKCore} from "../../core/RMRKCore.sol";
 import "../../library/RMRKErrors.sol";
 
 /**

diff --git a/contracts/RMRK/extension/soulbound/RMRKSoulboundAfterBlockNumber.sol b/contracts/RMRK/extension/soulbound/RMRKSoulboundAfterBlockNumber.sol
@@ -2,7 +2,8 @@
 
 pragma solidity ^0.8.21;
 
-import "./RMRKSoulbound.sol";
+import {IERC6454} from "./IERC6454.sol";
+import {RMRKSoulbound} from "./RMRKSoulbound.sol";
 
 /**
  * @title RMRKSoulboundAfterBlockNumber

diff --git a/contracts/RMRK/extension/soulbound/RMRKSoulboundAfterTransactions.sol b/contracts/RMRK/extension/soulbound/RMRKSoulboundAfterTransactions.sol
@@ -2,7 +2,8 @@
 
 pragma solidity ^0.8.21;
 
-import "./RMRKSoulbound.sol";
+import {IERC6454} from "./IERC6454.sol";
+import {RMRKSoulbound} from "./RMRKSoulbound.sol";
 
 /**
  * @title RMRKSoulboundAfterTransactions

diff --git a/contracts/RMRK/extension/soulbound/RMRKSoulboundPerToken.sol b/contracts/RMRK/extension/soulbound/RMRKSoulboundPerToken.sol
@@ -2,7 +2,8 @@
 
 pragma solidity ^0.8.21;
 
-import "./RMRKSoulbound.sol";
+import {IERC6454} from "./IERC6454.sol";
+import {RMRKSoulbound} from "./RMRKSoulbound.sol";
 
 /**
  * @title RMRKSoulboundPerToken

diff --git a/contracts/RMRK/extension/tokenAttributes/IERC7508.sol b/contracts/RMRK/extension/tokenAttributes/IERC7508.sol
@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.21;
 
-import "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 
 /**
  * @title IERC7508

diff --git a/contracts/RMRK/extension/tokenAttributes/RMRKTokenAttributesRepository.sol b/contracts/RMRK/extension/tokenAttributes/RMRKTokenAttributesRepository.sol
@@ -2,13 +2,13 @@
 
 pragma solidity ^0.8.21;
 
-import "@openzeppelin/contracts/access/Ownable.sol";
-import "@openzeppelin/contracts/token/ERC721/IERC721.sol";
-import "@openzeppelin/contracts/utils/introspection/IERC165.sol";
-import "@openzeppelin/contracts/utils/Context.sol";
+import {Ownable} from "@openzeppelin/contracts/access/Ownable.sol";
+import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+import {Context} from "@openzeppelin/contracts/utils/Context.sol";
 
 import "../../library/RMRKErrors.sol";
-import "./IERC7508.sol";
+import {IERC7508} from "./IERC7508.sol";
 
 /**
  * @title RMRKTokenAttributesRepository

diff --git a/contracts/RMRK/extension/tokenHolder/IRMRKTokenHolder.sol b/contracts/RMRK/extension/tokenHolder/IRMRKTokenHolder.sol
@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.21;
 
-import "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 
 /**
  * @title IRMRKTokenHolder

diff --git a/contracts/RMRK/extension/tokenHolder/RMRKTokenHolder.sol b/contracts/RMRK/extension/tokenHolder/RMRKTokenHolder.sol
@@ -2,12 +2,12 @@
 
 pragma solidity ^0.8.21;
 
-import "./IRMRKTokenHolder.sol";
-import "@openzeppelin/contracts/token/ERC20/IERC20.sol";
-import "@openzeppelin/contracts/token/ERC721/IERC721.sol";
-import "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
-import "@openzeppelin/contracts/token/ERC1155/IERC1155.sol";
-import "@openzeppelin/contracts/token/ERC1155/IERC1155Receiver.sol";
+import {IRMRKTokenHolder} from "./IRMRKTokenHolder.sol";
+import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
+import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
+import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
+import {IERC1155} from "@openzeppelin/contracts/token/ERC1155/IERC1155.sol";
+import {IERC1155Receiver} from "@openzeppelin/contracts/token/ERC1155/IERC1155Receiver.sol";
 
 error InvalidValue();
 error InvalidAddress();

diff --git a/contracts/RMRK/extension/typedMultiAsset/IRMRKTypedMultiAsset.sol b/contracts/RMRK/extension/typedMultiAsset/IRMRKTypedMultiAsset.sol
@@ -2,8 +2,8 @@
 
 pragma solidity ^0.8.21;
 
-// import "../../multiasset/IERC5773.sol";
-import "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+// import {IERC5773} from "../../multiasset/IERC5773.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 
 /**
  * @title IRMRKTypedMultiAsset

diff --git a/contracts/RMRK/extension/typedMultiAsset/RMRKTypedMultiAsset.sol b/contracts/RMRK/extension/typedMultiAsset/RMRKTypedMultiAsset.sol
@@ -2,7 +2,8 @@
 
 pragma solidity ^0.8.21;
 
-import "./IRMRKTypedMultiAsset.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+import {IRMRKTypedMultiAsset} from "./IRMRKTypedMultiAsset.sol";
 
 /**
  * @title RMRKTypedMultiAsset

diff --git a/contracts/RMRK/multiasset/AbstractMultiAsset.sol b/contracts/RMRK/multiasset/AbstractMultiAsset.sol
@@ -2,9 +2,9 @@
 
 pragma solidity ^0.8.21;
 
-import "./IERC5773.sol";
-import "../library/RMRKLib.sol";
-import "@openzeppelin/contracts/utils/Context.sol";
+import {IERC5773} from "./IERC5773.sol";
+import {RMRKLib} from "../library/RMRKLib.sol";
+import {Context} from "@openzeppelin/contracts/utils/Context.sol";
 import "../library/RMRKErrors.sol";
 
 /**

diff --git a/contracts/RMRK/multiasset/IERC5773.sol b/contracts/RMRK/multiasset/IERC5773.sol
@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.21;
 
-import "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 
 /**
  * @title IERC5773

diff --git a/contracts/RMRK/multiasset/RMRKMultiAsset.sol b/contracts/RMRK/multiasset/RMRKMultiAsset.sol
@@ -3,11 +3,12 @@
 
 pragma solidity ^0.8.21;
 
-import "@openzeppelin/contracts/token/ERC721/IERC721.sol";
-import "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
-import "@openzeppelin/contracts/utils/introspection/IERC165.sol";
-import "./AbstractMultiAsset.sol";
-import "../core/RMRKCore.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+import {IERC5773} from "./IERC5773.sol";
+import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol";
+import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol";
+import {AbstractMultiAsset} from "./AbstractMultiAsset.sol";
+import {RMRKCore} from "../core/RMRKCore.sol";
 import "../library/RMRKErrors.sol";
 
 /**

diff --git a/contracts/RMRK/nestable/IERC7401.sol b/contracts/RMRK/nestable/IERC7401.sol
@@ -2,7 +2,7 @@
 
 pragma solidity ^0.8.21;
 
-import "@openzeppelin/contracts/utils/introspection/IERC165.sol";
+import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol";
 
 /**
  * @title IERC7401