From 759f41836a315a45c03ff15bfa0aa03bb9c7e62c Mon Sep 17 00:00:00 2001 From: steven2308 Date: Thu, 8 Feb 2024 10:29:27 -0500 Subject: [PATCH] Prettier updates. --- .prettierrc.json | 3 ++- .../RMRK/equippable/RMRKMinifiedEquippable.sol | 4 +++- contracts/RMRK/multiasset/RMRKMultiAsset.sol | 4 +++- contracts/RMRK/nestable/RMRKNestable.sol | 4 +++- contracts/RMRK/utils/RMRKCollectionUtils.sol | 4 +++- contracts/RMRK/utils/RMRKNestableRenderUtils.sol | 4 +++- contracts/RMRK/utils/RMRKRenderUtils.sol | 4 +++- .../abstract/RMRKAbstractEquippable.sol | 8 ++++++-- .../abstract/RMRKAbstractMultiAsset.sol | 4 +++- .../abstract/RMRKAbstractNestable.sol | 4 +++- .../abstract/RMRKAbstractNestableMultiAsset.sol | 8 ++++++-- .../RMRKNestableMultiAssetLazyMintErc20.sol | 4 +++- ...KNestableMultiAssetLazyMintErc20Soulbound.sol | 8 ++++++-- .../RMRKNestableMultiAssetLazyMintNative.sol | 4 +++- ...NestableMultiAssetLazyMintNativeSoulbound.sol | 8 ++++++-- .../premint/RMRKNestableMultiAssetPreMint.sol | 4 +++- .../RMRKNestableMultiAssetPreMintSoulbound.sol | 8 ++++++-- contracts/mocks/ERC721ReceiverMock.sol | 4 +++- contracts/mocks/RMRKImplementationBaseMock.sol | 4 +++- contracts/mocks/RMRKMinifiedEquippableMock.sol | 4 +++- contracts/mocks/RMRKMultiAssetAutoIndexMock.sol | 4 +++- contracts/mocks/RMRKNestableAutoIndexMock.sol | 4 +++- contracts/mocks/RMRKNestableMultiAssetMock.sol | 4 +++- .../RMRKNestableClaimableChildMock.sol | 4 +++- .../revealable/RMRKMultiAssetRevealableMock.sol | 8 ++++++-- .../extensions/revealable/RMRKRevealerMock.sol | 4 +++- .../soulbound/RMRKSoulboundEquippableMock.sol | 4 +++- .../soulbound/RMRKSoulboundMultiAssetMock.sol | 4 +++- .../soulbound/RMRKSoulboundNestableMock.sol | 4 +++- .../RMRKSoulboundNestableMultiAssetMock.sol | 8 ++++++-- .../soulbound/RMRKSoulboundVariantMocks.sol | 16 ++++++++++++---- .../tokenHolder/RMRKTokenHolderMock.sol | 4 +++- .../RMRKNestableTypedMultiAssetMock.sol | 8 ++++++-- .../typedMultiAsset/RMRKTypedEquippableMock.sol | 4 +++- .../typedMultiAsset/RMRKTypedMultiAssetMock.sol | 4 +++- tsconfig.json | 1 + 36 files changed, 138 insertions(+), 46 deletions(-) diff --git a/.prettierrc.json b/.prettierrc.json index 7e7004cc..5bafd643 100644 --- a/.prettierrc.json +++ b/.prettierrc.json @@ -9,7 +9,8 @@ "tabWidth": 4, "useTabs": false, "singleQuote": false, - "bracketSpacing": false + "bracketSpacing": false, + "compiler": "0.8.21" } }, { diff --git a/contracts/RMRK/equippable/RMRKMinifiedEquippable.sol b/contracts/RMRK/equippable/RMRKMinifiedEquippable.sol index a3bb0f10..89583cab 100644 --- a/contracts/RMRK/equippable/RMRKMinifiedEquippable.sol +++ b/contracts/RMRK/equippable/RMRKMinifiedEquippable.sol @@ -6,7 +6,9 @@ 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 { + 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"; diff --git a/contracts/RMRK/multiasset/RMRKMultiAsset.sol b/contracts/RMRK/multiasset/RMRKMultiAsset.sol index fada59ef..28576838 100644 --- a/contracts/RMRK/multiasset/RMRKMultiAsset.sol +++ b/contracts/RMRK/multiasset/RMRKMultiAsset.sol @@ -6,7 +6,9 @@ pragma solidity ^0.8.21; 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 { + 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/RMRKNestable.sol b/contracts/RMRK/nestable/RMRKNestable.sol index c08d0590..1996effb 100644 --- a/contracts/RMRK/nestable/RMRKNestable.sol +++ b/contracts/RMRK/nestable/RMRKNestable.sol @@ -7,7 +7,9 @@ pragma solidity ^0.8.21; import {IERC7401} from "./IERC7401.sol"; import {RMRKCore} from "../core/RMRKCore.sol"; import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol"; -import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol"; +import { + IERC721Receiver +} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol"; import {Context} from "@openzeppelin/contracts/utils/Context.sol"; import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol"; import "../library/RMRKErrors.sol"; diff --git a/contracts/RMRK/utils/RMRKCollectionUtils.sol b/contracts/RMRK/utils/RMRKCollectionUtils.sol index cdc08334..88b08e0e 100644 --- a/contracts/RMRK/utils/RMRKCollectionUtils.sol +++ b/contracts/RMRK/utils/RMRKCollectionUtils.sol @@ -4,7 +4,9 @@ pragma solidity ^0.8.21; import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol"; import {IERC2981} from "@openzeppelin/contracts/interfaces/IERC2981.sol"; -import {IERC721Metadata} from "@openzeppelin/contracts/token/ERC721/extensions/IERC721Metadata.sol"; +import { + IERC721Metadata +} from "@openzeppelin/contracts/token/ERC721/extensions/IERC721Metadata.sol"; import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol"; import {IERC6220} from "../equippable/IERC6220.sol"; import {IERC5773} from "../multiasset/IERC5773.sol"; diff --git a/contracts/RMRK/utils/RMRKNestableRenderUtils.sol b/contracts/RMRK/utils/RMRKNestableRenderUtils.sol index 27fd609c..23cdef08 100644 --- a/contracts/RMRK/utils/RMRKNestableRenderUtils.sol +++ b/contracts/RMRK/utils/RMRKNestableRenderUtils.sol @@ -6,7 +6,9 @@ import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol"; import {IERC5773} from "../multiasset/IERC5773.sol"; import {IERC7401} from "../nestable/IERC7401.sol"; import "../library/RMRKErrors.sol"; -import {IERC721Metadata} from "@openzeppelin/contracts/token/ERC721/extensions/IERC721Metadata.sol"; +import { + IERC721Metadata +} from "@openzeppelin/contracts/token/ERC721/extensions/IERC721Metadata.sol"; /** * @title RMRKNestableRenderUtils diff --git a/contracts/RMRK/utils/RMRKRenderUtils.sol b/contracts/RMRK/utils/RMRKRenderUtils.sol index 6a2f19ac..7856f3fb 100644 --- a/contracts/RMRK/utils/RMRKRenderUtils.sol +++ b/contracts/RMRK/utils/RMRKRenderUtils.sol @@ -4,7 +4,9 @@ pragma solidity ^0.8.21; import {IERC721} from "@openzeppelin/contracts/token/ERC721/IERC721.sol"; import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol"; -import {IERC721Metadata} from "@openzeppelin/contracts/token/ERC721/extensions/IERC721Metadata.sol"; +import { + IERC721Metadata +} from "@openzeppelin/contracts/token/ERC721/extensions/IERC721Metadata.sol"; import {Ownable} from "../access/Ownable.sol"; import {RMRKEquippable} from "../equippable/RMRKEquippable.sol"; import {IERC6454} from "../extension/soulbound/IERC6454.sol"; diff --git a/contracts/implementations/abstract/RMRKAbstractEquippable.sol b/contracts/implementations/abstract/RMRKAbstractEquippable.sol index 03fd0776..8bcd350c 100644 --- a/contracts/implementations/abstract/RMRKAbstractEquippable.sol +++ b/contracts/implementations/abstract/RMRKAbstractEquippable.sol @@ -4,8 +4,12 @@ pragma solidity ^0.8.21; import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol"; import {IERC2981} from "@openzeppelin/contracts/interfaces/IERC2981.sol"; -import {IERC721Metadata} from "@openzeppelin/contracts/token/ERC721/extensions/IERC721Metadata.sol"; -import {RMRKMinifiedEquippable} from "../../RMRK/equippable/RMRKMinifiedEquippable.sol"; +import { + IERC721Metadata +} from "@openzeppelin/contracts/token/ERC721/extensions/IERC721Metadata.sol"; +import { + RMRKMinifiedEquippable +} from "../../RMRK/equippable/RMRKMinifiedEquippable.sol"; import {RMRKImplementationBase} from "../utils/RMRKImplementationBase.sol"; /** diff --git a/contracts/implementations/abstract/RMRKAbstractMultiAsset.sol b/contracts/implementations/abstract/RMRKAbstractMultiAsset.sol index b32098f0..55777744 100644 --- a/contracts/implementations/abstract/RMRKAbstractMultiAsset.sol +++ b/contracts/implementations/abstract/RMRKAbstractMultiAsset.sol @@ -4,7 +4,9 @@ pragma solidity ^0.8.21; import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol"; import {IERC2981} from "@openzeppelin/contracts/interfaces/IERC2981.sol"; -import {IERC721Metadata} from "@openzeppelin/contracts/token/ERC721/extensions/IERC721Metadata.sol"; +import { + IERC721Metadata +} from "@openzeppelin/contracts/token/ERC721/extensions/IERC721Metadata.sol"; import {RMRKMultiAsset} from "../../RMRK/multiasset/RMRKMultiAsset.sol"; import {RMRKImplementationBase} from "../utils/RMRKImplementationBase.sol"; diff --git a/contracts/implementations/abstract/RMRKAbstractNestable.sol b/contracts/implementations/abstract/RMRKAbstractNestable.sol index 0d5789d0..61728457 100644 --- a/contracts/implementations/abstract/RMRKAbstractNestable.sol +++ b/contracts/implementations/abstract/RMRKAbstractNestable.sol @@ -4,7 +4,9 @@ pragma solidity ^0.8.21; import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol"; import {IERC2981} from "@openzeppelin/contracts/interfaces/IERC2981.sol"; -import {IERC721Metadata} from "@openzeppelin/contracts/token/ERC721/extensions/IERC721Metadata.sol"; +import { + IERC721Metadata +} from "@openzeppelin/contracts/token/ERC721/extensions/IERC721Metadata.sol"; import {RMRKNestable} from "../../RMRK/nestable/RMRKNestable.sol"; import {RMRKImplementationBase} from "../utils/RMRKImplementationBase.sol"; diff --git a/contracts/implementations/abstract/RMRKAbstractNestableMultiAsset.sol b/contracts/implementations/abstract/RMRKAbstractNestableMultiAsset.sol index 10964675..c22bddb9 100644 --- a/contracts/implementations/abstract/RMRKAbstractNestableMultiAsset.sol +++ b/contracts/implementations/abstract/RMRKAbstractNestableMultiAsset.sol @@ -4,8 +4,12 @@ pragma solidity ^0.8.21; import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol"; import {IERC2981} from "@openzeppelin/contracts/interfaces/IERC2981.sol"; -import {IERC721Metadata} from "@openzeppelin/contracts/token/ERC721/extensions/IERC721Metadata.sol"; -import {RMRKNestableMultiAsset} from "../../RMRK/nestable/RMRKNestableMultiAsset.sol"; +import { + IERC721Metadata +} from "@openzeppelin/contracts/token/ERC721/extensions/IERC721Metadata.sol"; +import { + RMRKNestableMultiAsset +} from "../../RMRK/nestable/RMRKNestableMultiAsset.sol"; import {RMRKImplementationBase} from "../utils/RMRKImplementationBase.sol"; /** diff --git a/contracts/implementations/lazyMintErc20/RMRKNestableMultiAssetLazyMintErc20.sol b/contracts/implementations/lazyMintErc20/RMRKNestableMultiAssetLazyMintErc20.sol index 99fe352a..e2646a81 100644 --- a/contracts/implementations/lazyMintErc20/RMRKNestableMultiAssetLazyMintErc20.sol +++ b/contracts/implementations/lazyMintErc20/RMRKNestableMultiAssetLazyMintErc20.sol @@ -3,7 +3,9 @@ pragma solidity ^0.8.21; import {IERC20} from "@openzeppelin/contracts/token/ERC20/IERC20.sol"; -import {RMRKAbstractNestableMultiAsset} from "../abstract/RMRKAbstractNestableMultiAsset.sol"; +import { + RMRKAbstractNestableMultiAsset +} from "../abstract/RMRKAbstractNestableMultiAsset.sol"; import {RMRKImplementationBase} from "../utils/RMRKImplementationBase.sol"; import {RMRKTokenURIEnumerated} from "../utils/RMRKTokenURIEnumerated.sol"; import {InitDataERC20Pay} from "./InitDataERC20Pay.sol"; diff --git a/contracts/implementations/lazyMintErc20/RMRKNestableMultiAssetLazyMintErc20Soulbound.sol b/contracts/implementations/lazyMintErc20/RMRKNestableMultiAssetLazyMintErc20Soulbound.sol index 501c4b20..26929c07 100644 --- a/contracts/implementations/lazyMintErc20/RMRKNestableMultiAssetLazyMintErc20Soulbound.sol +++ b/contracts/implementations/lazyMintErc20/RMRKNestableMultiAssetLazyMintErc20Soulbound.sol @@ -3,8 +3,12 @@ pragma solidity ^0.8.21; import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol"; -import {RMRKAbstractNestableMultiAsset} from "../abstract/RMRKAbstractNestableMultiAsset.sol"; -import {RMRKNestableMultiAssetLazyMintErc20} from "./RMRKNestableMultiAssetLazyMintErc20.sol"; +import { + RMRKAbstractNestableMultiAsset +} from "../abstract/RMRKAbstractNestableMultiAsset.sol"; +import { + RMRKNestableMultiAssetLazyMintErc20 +} from "./RMRKNestableMultiAssetLazyMintErc20.sol"; import {RMRKSoulbound} from "../../RMRK/extension/soulbound/RMRKSoulbound.sol"; /** diff --git a/contracts/implementations/lazyMintNative/RMRKNestableMultiAssetLazyMintNative.sol b/contracts/implementations/lazyMintNative/RMRKNestableMultiAssetLazyMintNative.sol index 2267a469..6d6bf3b7 100644 --- a/contracts/implementations/lazyMintNative/RMRKNestableMultiAssetLazyMintNative.sol +++ b/contracts/implementations/lazyMintNative/RMRKNestableMultiAssetLazyMintNative.sol @@ -2,7 +2,9 @@ pragma solidity ^0.8.21; -import {RMRKAbstractNestableMultiAsset} from "../abstract/RMRKAbstractNestableMultiAsset.sol"; +import { + RMRKAbstractNestableMultiAsset +} from "../abstract/RMRKAbstractNestableMultiAsset.sol"; import {RMRKImplementationBase} from "../utils/RMRKImplementationBase.sol"; import {RMRKTokenURIEnumerated} from "../utils/RMRKTokenURIEnumerated.sol"; import {InitDataNativePay} from "./InitDataNativePay.sol"; diff --git a/contracts/implementations/lazyMintNative/RMRKNestableMultiAssetLazyMintNativeSoulbound.sol b/contracts/implementations/lazyMintNative/RMRKNestableMultiAssetLazyMintNativeSoulbound.sol index 9209fc3a..731cce81 100644 --- a/contracts/implementations/lazyMintNative/RMRKNestableMultiAssetLazyMintNativeSoulbound.sol +++ b/contracts/implementations/lazyMintNative/RMRKNestableMultiAssetLazyMintNativeSoulbound.sol @@ -3,8 +3,12 @@ pragma solidity ^0.8.21; import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol"; -import {RMRKAbstractNestableMultiAsset} from "../abstract/RMRKAbstractNestableMultiAsset.sol"; -import {RMRKNestableMultiAssetLazyMintNative} from "./RMRKNestableMultiAssetLazyMintNative.sol"; +import { + RMRKAbstractNestableMultiAsset +} from "../abstract/RMRKAbstractNestableMultiAsset.sol"; +import { + RMRKNestableMultiAssetLazyMintNative +} from "./RMRKNestableMultiAssetLazyMintNative.sol"; import {RMRKSoulbound} from "../../RMRK/extension/soulbound/RMRKSoulbound.sol"; /** diff --git a/contracts/implementations/premint/RMRKNestableMultiAssetPreMint.sol b/contracts/implementations/premint/RMRKNestableMultiAssetPreMint.sol index e3b8bda2..c97fc1a5 100644 --- a/contracts/implementations/premint/RMRKNestableMultiAssetPreMint.sol +++ b/contracts/implementations/premint/RMRKNestableMultiAssetPreMint.sol @@ -2,7 +2,9 @@ pragma solidity ^0.8.21; -import {RMRKAbstractNestableMultiAsset} from "../abstract/RMRKAbstractNestableMultiAsset.sol"; +import { + RMRKAbstractNestableMultiAsset +} from "../abstract/RMRKAbstractNestableMultiAsset.sol"; import {RMRKImplementationBase} from "../utils/RMRKImplementationBase.sol"; import {RMRKTokenURIPerToken} from "../utils/RMRKTokenURIPerToken.sol"; diff --git a/contracts/implementations/premint/RMRKNestableMultiAssetPreMintSoulbound.sol b/contracts/implementations/premint/RMRKNestableMultiAssetPreMintSoulbound.sol index 6e9f6678..ac3f1dd9 100644 --- a/contracts/implementations/premint/RMRKNestableMultiAssetPreMintSoulbound.sol +++ b/contracts/implementations/premint/RMRKNestableMultiAssetPreMintSoulbound.sol @@ -3,8 +3,12 @@ pragma solidity ^0.8.21; import {IERC165} from "@openzeppelin/contracts/utils/introspection/IERC165.sol"; -import {RMRKAbstractNestableMultiAsset} from "../abstract/RMRKAbstractNestableMultiAsset.sol"; -import {RMRKNestableMultiAssetPreMint} from "./RMRKNestableMultiAssetPreMint.sol"; +import { + RMRKAbstractNestableMultiAsset +} from "../abstract/RMRKAbstractNestableMultiAsset.sol"; +import { + RMRKNestableMultiAssetPreMint +} from "./RMRKNestableMultiAssetPreMint.sol"; import {RMRKSoulbound} from "../../RMRK/extension/soulbound/RMRKSoulbound.sol"; /** diff --git a/contracts/mocks/ERC721ReceiverMock.sol b/contracts/mocks/ERC721ReceiverMock.sol index 62575fce..0173a528 100644 --- a/contracts/mocks/ERC721ReceiverMock.sol +++ b/contracts/mocks/ERC721ReceiverMock.sol @@ -2,7 +2,9 @@ pragma solidity ^0.8.21; -import {IERC721Receiver} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol"; +import { + IERC721Receiver +} from "@openzeppelin/contracts/token/ERC721/IERC721Receiver.sol"; contract ERC721ReceiverMock is IERC721Receiver { enum Error { diff --git a/contracts/mocks/RMRKImplementationBaseMock.sol b/contracts/mocks/RMRKImplementationBaseMock.sol index 54772452..1e882a8c 100644 --- a/contracts/mocks/RMRKImplementationBaseMock.sol +++ b/contracts/mocks/RMRKImplementationBaseMock.sol @@ -2,7 +2,9 @@ pragma solidity ^0.8.21; -import {RMRKImplementationBase} from "../implementations/utils/RMRKImplementationBase.sol"; +import { + RMRKImplementationBase +} from "../implementations/utils/RMRKImplementationBase.sol"; contract RMRKImplementationBaseMock is RMRKImplementationBase { constructor( diff --git a/contracts/mocks/RMRKMinifiedEquippableMock.sol b/contracts/mocks/RMRKMinifiedEquippableMock.sol index effa918d..bc5ff1af 100644 --- a/contracts/mocks/RMRKMinifiedEquippableMock.sol +++ b/contracts/mocks/RMRKMinifiedEquippableMock.sol @@ -2,7 +2,9 @@ pragma solidity ^0.8.21; -import {RMRKMinifiedEquippable} from "../RMRK/equippable/RMRKMinifiedEquippable.sol"; +import { + RMRKMinifiedEquippable +} from "../RMRK/equippable/RMRKMinifiedEquippable.sol"; //Minimal public implementation of RMRKEquippable for testing. contract RMRKMinifiedEquippableMock is RMRKMinifiedEquippable { diff --git a/contracts/mocks/RMRKMultiAssetAutoIndexMock.sol b/contracts/mocks/RMRKMultiAssetAutoIndexMock.sol index f5c60fd6..cbc6775e 100644 --- a/contracts/mocks/RMRKMultiAssetAutoIndexMock.sol +++ b/contracts/mocks/RMRKMultiAssetAutoIndexMock.sol @@ -2,7 +2,9 @@ pragma solidity ^0.8.21; -import {RMRKMultiAssetAutoIndex} from "../RMRK/extension/multiAssetAutoIndex/RMRKMultiAssetAutoIndex.sol"; +import { + RMRKMultiAssetAutoIndex +} from "../RMRK/extension/multiAssetAutoIndex/RMRKMultiAssetAutoIndex.sol"; contract RMRKMultiAssetAutoIndexMock is RMRKMultiAssetAutoIndex { function mint(address to, uint256 tokenId) external { diff --git a/contracts/mocks/RMRKNestableAutoIndexMock.sol b/contracts/mocks/RMRKNestableAutoIndexMock.sol index 8f131e41..7b3f4c29 100644 --- a/contracts/mocks/RMRKNestableAutoIndexMock.sol +++ b/contracts/mocks/RMRKNestableAutoIndexMock.sol @@ -2,7 +2,9 @@ pragma solidity ^0.8.21; -import {RMRKNestableAutoIndex} from "../RMRK/extension/nestableAutoIndex/RMRKNestableAutoIndex.sol"; +import { + RMRKNestableAutoIndex +} from "../RMRK/extension/nestableAutoIndex/RMRKNestableAutoIndex.sol"; contract RMRKNestableAutoIndexMock is RMRKNestableAutoIndex { function mint(address to, uint256 tokenId) external { diff --git a/contracts/mocks/RMRKNestableMultiAssetMock.sol b/contracts/mocks/RMRKNestableMultiAssetMock.sol index 65478fa3..034f9d69 100644 --- a/contracts/mocks/RMRKNestableMultiAssetMock.sol +++ b/contracts/mocks/RMRKNestableMultiAssetMock.sol @@ -2,7 +2,9 @@ pragma solidity ^0.8.21; -import {RMRKNestableMultiAsset} from "../RMRK/nestable/RMRKNestableMultiAsset.sol"; +import { + RMRKNestableMultiAsset +} from "../RMRK/nestable/RMRKNestableMultiAsset.sol"; //Minimal public implementation of RMRKNestableMultiAsset for testing. contract RMRKNestableMultiAssetMock is RMRKNestableMultiAsset { diff --git a/contracts/mocks/extensions/claimableChild/RMRKNestableClaimableChildMock.sol b/contracts/mocks/extensions/claimableChild/RMRKNestableClaimableChildMock.sol index 82ad350d..c5f30e52 100644 --- a/contracts/mocks/extensions/claimableChild/RMRKNestableClaimableChildMock.sol +++ b/contracts/mocks/extensions/claimableChild/RMRKNestableClaimableChildMock.sol @@ -2,7 +2,9 @@ pragma solidity ^0.8.21; -import {RMRKReclaimableChild} from "../../../RMRK/extension/reclaimableChild/RMRKReclaimableChild.sol"; +import { + RMRKReclaimableChild +} from "../../../RMRK/extension/reclaimableChild/RMRKReclaimableChild.sol"; import {RMRKNestableMock} from "../../RMRKNestableMock.sol"; import {RMRKNestable} from "../../../RMRK/nestable/RMRKNestable.sol"; diff --git a/contracts/mocks/extensions/revealable/RMRKMultiAssetRevealableMock.sol b/contracts/mocks/extensions/revealable/RMRKMultiAssetRevealableMock.sol index d24fac90..fe826a7f 100644 --- a/contracts/mocks/extensions/revealable/RMRKMultiAssetRevealableMock.sol +++ b/contracts/mocks/extensions/revealable/RMRKMultiAssetRevealableMock.sol @@ -2,8 +2,12 @@ pragma solidity ^0.8.21; -import {IRMRKRevealable} from "../../../RMRK/extension/revealable/IRMRKRevealable.sol"; -import {RMRKRevealable} from "../../../RMRK/extension/revealable/RMRKRevealable.sol"; +import { + IRMRKRevealable +} from "../../../RMRK/extension/revealable/IRMRKRevealable.sol"; +import { + RMRKRevealable +} from "../../../RMRK/extension/revealable/RMRKRevealable.sol"; import {RMRKMultiAssetMock} from "../../RMRKMultiAssetMock.sol"; import {RMRKMultiAsset} from "../../../RMRK/multiasset/RMRKMultiAsset.sol"; diff --git a/contracts/mocks/extensions/revealable/RMRKRevealerMock.sol b/contracts/mocks/extensions/revealable/RMRKRevealerMock.sol index fe16b5b3..32160f5e 100644 --- a/contracts/mocks/extensions/revealable/RMRKRevealerMock.sol +++ b/contracts/mocks/extensions/revealable/RMRKRevealerMock.sol @@ -3,7 +3,9 @@ pragma solidity ^0.8.21; import {Context} from "@openzeppelin/contracts/utils/Context.sol"; -import {IRMRKRevealer} from "../../../RMRK/extension/revealable/IRMRKRevealer.sol"; +import { + IRMRKRevealer +} from "../../../RMRK/extension/revealable/IRMRKRevealer.sol"; import {RMRKMultiAssetMock} from "../../RMRKMultiAssetMock.sol"; error AlreadyRevealed(uint256 tokenId); diff --git a/contracts/mocks/extensions/soulbound/RMRKSoulboundEquippableMock.sol b/contracts/mocks/extensions/soulbound/RMRKSoulboundEquippableMock.sol index 05643d6c..a0e67d07 100644 --- a/contracts/mocks/extensions/soulbound/RMRKSoulboundEquippableMock.sol +++ b/contracts/mocks/extensions/soulbound/RMRKSoulboundEquippableMock.sol @@ -2,7 +2,9 @@ pragma solidity ^0.8.21; -import {RMRKSoulbound} from "../../../RMRK/extension/soulbound/RMRKSoulbound.sol"; +import { + RMRKSoulbound +} from "../../../RMRK/extension/soulbound/RMRKSoulbound.sol"; import {RMRKNestable} from "../../../RMRK/nestable/RMRKNestable.sol"; import {RMRKEquippable} from "../../../RMRK/equippable/RMRKEquippable.sol"; import {RMRKEquippableMock} from "../../RMRKEquippableMock.sol"; diff --git a/contracts/mocks/extensions/soulbound/RMRKSoulboundMultiAssetMock.sol b/contracts/mocks/extensions/soulbound/RMRKSoulboundMultiAssetMock.sol index 26261155..440e9398 100644 --- a/contracts/mocks/extensions/soulbound/RMRKSoulboundMultiAssetMock.sol +++ b/contracts/mocks/extensions/soulbound/RMRKSoulboundMultiAssetMock.sol @@ -2,7 +2,9 @@ pragma solidity ^0.8.21; -import {RMRKSoulbound} from "../../../RMRK/extension/soulbound/RMRKSoulbound.sol"; +import { + RMRKSoulbound +} from "../../../RMRK/extension/soulbound/RMRKSoulbound.sol"; import {RMRKMultiAsset} from "../../../RMRK/multiasset/RMRKMultiAsset.sol"; import {RMRKMultiAssetMock} from "../../RMRKMultiAssetMock.sol"; diff --git a/contracts/mocks/extensions/soulbound/RMRKSoulboundNestableMock.sol b/contracts/mocks/extensions/soulbound/RMRKSoulboundNestableMock.sol index 68fdfaa8..571c8d87 100644 --- a/contracts/mocks/extensions/soulbound/RMRKSoulboundNestableMock.sol +++ b/contracts/mocks/extensions/soulbound/RMRKSoulboundNestableMock.sol @@ -2,7 +2,9 @@ pragma solidity ^0.8.21; -import {RMRKSoulbound} from "../../../RMRK/extension/soulbound/RMRKSoulbound.sol"; +import { + RMRKSoulbound +} from "../../../RMRK/extension/soulbound/RMRKSoulbound.sol"; import {RMRKNestable} from "../../../RMRK/nestable/RMRKNestable.sol"; import {RMRKNestableMock} from "../../RMRKNestableMock.sol"; diff --git a/contracts/mocks/extensions/soulbound/RMRKSoulboundNestableMultiAssetMock.sol b/contracts/mocks/extensions/soulbound/RMRKSoulboundNestableMultiAssetMock.sol index b37a01ed..91a8cb9b 100644 --- a/contracts/mocks/extensions/soulbound/RMRKSoulboundNestableMultiAssetMock.sol +++ b/contracts/mocks/extensions/soulbound/RMRKSoulboundNestableMultiAssetMock.sol @@ -2,9 +2,13 @@ pragma solidity ^0.8.21; -import {RMRKSoulbound} from "../../../RMRK/extension/soulbound/RMRKSoulbound.sol"; +import { + RMRKSoulbound +} from "../../../RMRK/extension/soulbound/RMRKSoulbound.sol"; import {RMRKNestable} from "../../../RMRK/nestable/RMRKNestable.sol"; -import {RMRKNestableMultiAsset} from "../../../RMRK/nestable/RMRKNestableMultiAsset.sol"; +import { + RMRKNestableMultiAsset +} from "../../../RMRK/nestable/RMRKNestableMultiAsset.sol"; import {RMRKNestableMultiAssetMock} from "../../RMRKNestableMultiAssetMock.sol"; contract RMRKSoulboundNestableMultiAssetMock is diff --git a/contracts/mocks/extensions/soulbound/RMRKSoulboundVariantMocks.sol b/contracts/mocks/extensions/soulbound/RMRKSoulboundVariantMocks.sol index 30bbcd85..b5ddee5b 100644 --- a/contracts/mocks/extensions/soulbound/RMRKSoulboundVariantMocks.sol +++ b/contracts/mocks/extensions/soulbound/RMRKSoulboundVariantMocks.sol @@ -3,12 +3,20 @@ pragma solidity ^0.8.21; import {Ownable} from "../../../RMRK/access/Ownable.sol"; -import {RMRKSoulboundAfterBlockNumber} from "../../../RMRK/extension/soulbound/RMRKSoulboundAfterBlockNumber.sol"; -import {RMRKSoulboundAfterTransactions} from "../../../RMRK/extension/soulbound/RMRKSoulboundAfterTransactions.sol"; +import { + RMRKSoulboundAfterBlockNumber +} from "../../../RMRK/extension/soulbound/RMRKSoulboundAfterBlockNumber.sol"; +import { + RMRKSoulboundAfterTransactions +} from "../../../RMRK/extension/soulbound/RMRKSoulboundAfterTransactions.sol"; import {RMRKMultiAsset} from "../../../RMRK/multiasset/RMRKMultiAsset.sol"; -import {RMRKSoulboundPerToken} from "../../../RMRK/extension/soulbound/RMRKSoulboundPerToken.sol"; +import { + RMRKSoulboundPerToken +} from "../../../RMRK/extension/soulbound/RMRKSoulboundPerToken.sol"; import {RMRKMultiAssetMock} from "../../RMRKMultiAssetMock.sol"; -import {RMRKSoulbound} from "../../../RMRK/extension/soulbound/RMRKSoulbound.sol"; +import { + RMRKSoulbound +} from "../../../RMRK/extension/soulbound/RMRKSoulbound.sol"; contract RMRKSoulboundAfterBlockNumberMock is RMRKSoulboundAfterBlockNumber, diff --git a/contracts/mocks/extensions/tokenHolder/RMRKTokenHolderMock.sol b/contracts/mocks/extensions/tokenHolder/RMRKTokenHolderMock.sol index 640df9e3..cf162eed 100644 --- a/contracts/mocks/extensions/tokenHolder/RMRKTokenHolderMock.sol +++ b/contracts/mocks/extensions/tokenHolder/RMRKTokenHolderMock.sol @@ -3,7 +3,9 @@ pragma solidity ^0.8.21; import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol"; -import {RMRKTokenHolder} from "../../../RMRK/extension/tokenHolder/RMRKTokenHolder.sol"; +import { + RMRKTokenHolder +} from "../../../RMRK/extension/tokenHolder/RMRKTokenHolder.sol"; import {IERC7590} from "../../../RMRK/extension/tokenHolder/IERC7590.sol"; error OnlyNFTOwnerCanTransferTokensFromIt(); diff --git a/contracts/mocks/extensions/typedMultiAsset/RMRKNestableTypedMultiAssetMock.sol b/contracts/mocks/extensions/typedMultiAsset/RMRKNestableTypedMultiAssetMock.sol index 5aa448eb..b980d324 100644 --- a/contracts/mocks/extensions/typedMultiAsset/RMRKNestableTypedMultiAssetMock.sol +++ b/contracts/mocks/extensions/typedMultiAsset/RMRKNestableTypedMultiAssetMock.sol @@ -2,9 +2,13 @@ pragma solidity ^0.8.21; -import {RMRKTypedMultiAsset} from "../../../RMRK/extension/typedMultiAsset/RMRKTypedMultiAsset.sol"; +import { + RMRKTypedMultiAsset +} from "../../../RMRK/extension/typedMultiAsset/RMRKTypedMultiAsset.sol"; import {RMRKNestableMultiAssetMock} from "../../RMRKNestableMultiAssetMock.sol"; -import {RMRKNestableMultiAsset} from "../../../RMRK/nestable/RMRKNestableMultiAsset.sol"; +import { + RMRKNestableMultiAsset +} from "../../../RMRK/nestable/RMRKNestableMultiAsset.sol"; contract RMRKNestableTypedMultiAssetMock is RMRKNestableMultiAssetMock, diff --git a/contracts/mocks/extensions/typedMultiAsset/RMRKTypedEquippableMock.sol b/contracts/mocks/extensions/typedMultiAsset/RMRKTypedEquippableMock.sol index f4ccb17f..67bdee7b 100644 --- a/contracts/mocks/extensions/typedMultiAsset/RMRKTypedEquippableMock.sol +++ b/contracts/mocks/extensions/typedMultiAsset/RMRKTypedEquippableMock.sol @@ -2,7 +2,9 @@ pragma solidity ^0.8.21; -import {RMRKTypedMultiAsset} from "../../../RMRK/extension/typedMultiAsset/RMRKTypedMultiAsset.sol"; +import { + RMRKTypedMultiAsset +} from "../../../RMRK/extension/typedMultiAsset/RMRKTypedMultiAsset.sol"; import {RMRKEquippableMock} from "../../RMRKEquippableMock.sol"; import {RMRKEquippable} from "../../../RMRK/equippable/RMRKEquippable.sol"; diff --git a/contracts/mocks/extensions/typedMultiAsset/RMRKTypedMultiAssetMock.sol b/contracts/mocks/extensions/typedMultiAsset/RMRKTypedMultiAssetMock.sol index d80268fc..db34e822 100644 --- a/contracts/mocks/extensions/typedMultiAsset/RMRKTypedMultiAssetMock.sol +++ b/contracts/mocks/extensions/typedMultiAsset/RMRKTypedMultiAssetMock.sol @@ -2,7 +2,9 @@ pragma solidity ^0.8.21; -import {RMRKTypedMultiAsset} from "../../../RMRK/extension/typedMultiAsset/RMRKTypedMultiAsset.sol"; +import { + RMRKTypedMultiAsset +} from "../../../RMRK/extension/typedMultiAsset/RMRKTypedMultiAsset.sol"; import {RMRKMultiAssetMock} from "../../RMRKMultiAssetMock.sol"; import {RMRKMultiAsset} from "../../../RMRK/multiasset/RMRKMultiAsset.sol"; diff --git a/tsconfig.json b/tsconfig.json index d245eb4b..c13399b9 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -11,5 +11,6 @@ "resolveJsonModule": true, }, "include": ["./scripts", "./test", "./typechain-types"], + "exclude": ["node_modules", "dist"], "files": ["./hardhat.config.ts"], }