Skip to content

Commit

Permalink
Prettier updates.
Browse files Browse the repository at this point in the history
  • Loading branch information
steven2308 committed Feb 8, 2024
1 parent 33b6f8a commit 759f418
Show file tree
Hide file tree
Showing 36 changed files with 138 additions and 46 deletions.
3 changes: 2 additions & 1 deletion .prettierrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
"tabWidth": 4,
"useTabs": false,
"singleQuote": false,
"bracketSpacing": false
"bracketSpacing": false,
"compiler": "0.8.21"
}
},
{
Expand Down
4 changes: 3 additions & 1 deletion contracts/RMRK/equippable/RMRKMinifiedEquippable.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
4 changes: 3 additions & 1 deletion contracts/RMRK/multiasset/RMRKMultiAsset.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
4 changes: 3 additions & 1 deletion contracts/RMRK/nestable/RMRKNestable.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
4 changes: 3 additions & 1 deletion contracts/RMRK/utils/RMRKCollectionUtils.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
4 changes: 3 additions & 1 deletion contracts/RMRK/utils/RMRKNestableRenderUtils.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion contracts/RMRK/utils/RMRKRenderUtils.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
8 changes: 6 additions & 2 deletions contracts/implementations/abstract/RMRKAbstractEquippable.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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";

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
4 changes: 3 additions & 1 deletion contracts/implementations/abstract/RMRKAbstractNestable.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";

/**
Expand Down
4 changes: 3 additions & 1 deletion contracts/mocks/ERC721ReceiverMock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 3 additions & 1 deletion contracts/mocks/RMRKImplementationBaseMock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
4 changes: 3 additions & 1 deletion contracts/mocks/RMRKMinifiedEquippableMock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 3 additions & 1 deletion contracts/mocks/RMRKMultiAssetAutoIndexMock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 3 additions & 1 deletion contracts/mocks/RMRKNestableAutoIndexMock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 3 additions & 1 deletion contracts/mocks/RMRKNestableMultiAssetMock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
4 changes: 3 additions & 1 deletion contracts/mocks/extensions/revealable/RMRKRevealerMock.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
16 changes: 12 additions & 4 deletions contracts/mocks/extensions/soulbound/RMRKSoulboundVariantMocks.sol
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Loading

0 comments on commit 759f418

Please sign in to comment.