Skip to content

Commit

Permalink
replace duplicated Bitmaps with an powerful already importd one
Browse files Browse the repository at this point in the history
  • Loading branch information
yuhuajing committed Apr 25, 2024
1 parent d3db1b1 commit 3b75c53
Show file tree
Hide file tree
Showing 7 changed files with 39 additions and 2 deletions.
8 changes: 8 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/IMXcontracts.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion contracts/token/erc721/abstract/ERC721Hybrid.sol
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
pragma solidity 0.8.19;

import {ERC721} from "@openzeppelin/contracts/token/ERC721/ERC721.sol";
import {BitMaps} from "@openzeppelin/contracts/utils/structs/BitMaps.sol";
import {BitMaps} from "solidity-bits/contracts/BitMaps.sol";
import {ERC721Psi, ERC721PsiBurnable} from "../erc721psi/ERC721PsiBurnable.sol";
// Errors
import {IImmutableERC721Errors} from "../../../errors/Errors.sol";
Expand Down
2 changes: 1 addition & 1 deletion contracts/token/erc721/abstract/ImmutableERC721Base.sol
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {ERC2981} from "@openzeppelin/contracts/token/common/ERC2981.sol";
import {OperatorAllowlistEnforced} from "../../../allowlist/OperatorAllowlistEnforced.sol";

// Utils
import {BitMaps} from "@openzeppelin/contracts/utils/structs/BitMaps.sol";
import {BitMaps} from "solidity-bits/contracts/BitMaps.sol";
import {AccessControlEnumerable, MintingAccessControl} from "../../../access/MintingAccessControl.sol";

/*
Expand Down

0 comments on commit 3b75c53

Please sign in to comment.