Skip to content

Commit ee78bf9

Browse files
authored
Move EvolvingNFT out of unaudited dir (#528)
1 parent 39ac9c9 commit ee78bf9

File tree

4 files changed

+26
-26
lines changed

4 files changed

+26
-26
lines changed

contracts/prebuilts/unaudited/evolving-nfts/EvolvingNFT.sol renamed to contracts/prebuilts/evolving-nfts/EvolvingNFT.sol

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@ pragma solidity ^0.8.11;
1414

1515
import "@thirdweb-dev/dynamic-contracts/src/presets/BaseRouter.sol";
1616

17-
import "../../../extension/Multicall.sol";
18-
import "../../../extension/upgradeable/Initializable.sol";
19-
import "../../../extension/upgradeable/init/ContractMetadataInit.sol";
20-
import "../../../extension/upgradeable/init/RoyaltyInit.sol";
21-
import "../../../extension/upgradeable/init/PrimarySaleInit.sol";
22-
import "../../../extension/upgradeable/init/OwnableInit.sol";
23-
import "../../../extension/upgradeable/init/PermissionsEnumerableInit.sol";
24-
import "../../../extension/upgradeable/init/ERC2771ContextInit.sol";
25-
import "../../../extension/upgradeable/init/ERC721AQueryableInit.sol";
17+
import "../../extension/Multicall.sol";
18+
import "../../extension/upgradeable/Initializable.sol";
19+
import "../../extension/upgradeable/init/ContractMetadataInit.sol";
20+
import "../../extension/upgradeable/init/RoyaltyInit.sol";
21+
import "../../extension/upgradeable/init/PrimarySaleInit.sol";
22+
import "../../extension/upgradeable/init/OwnableInit.sol";
23+
import "../../extension/upgradeable/init/PermissionsEnumerableInit.sol";
24+
import "../../extension/upgradeable/init/ERC2771ContextInit.sol";
25+
import "../../extension/upgradeable/init/ERC721AQueryableInit.sol";
2626

2727
contract EvolvingNFT is
2828
Initializable,

contracts/prebuilts/unaudited/evolving-nfts/EvolvingNFTLogic.sol renamed to contracts/prebuilts/evolving-nfts/EvolvingNFTLogic.sol

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,24 @@ pragma solidity ^0.8.11;
1717
import "@openzeppelin/contracts-upgradeable/utils/StringsUpgradeable.sol";
1818
import "@openzeppelin/contracts-upgradeable/interfaces/IERC2981Upgradeable.sol";
1919

20-
import "../../../eip/queryable/ERC721AQueryableUpgradeable.sol";
20+
import "../../eip/queryable/ERC721AQueryableUpgradeable.sol";
2121

2222
// ========== Internal imports ==========
2323

24-
import "../../../external-deps/openzeppelin/metatx/ERC2771ContextUpgradeable.sol";
25-
import "../../../lib/CurrencyTransferLib.sol";
24+
import "../../external-deps/openzeppelin/metatx/ERC2771ContextUpgradeable.sol";
25+
import "../../lib/CurrencyTransferLib.sol";
2626

2727
// ========== Features ==========
2828

29-
import "../../../extension/Multicall.sol";
30-
import "../../../extension/upgradeable/ContractMetadata.sol";
31-
import "../../../extension/upgradeable/Royalty.sol";
32-
import "../../../extension/upgradeable/PrimarySale.sol";
33-
import "../../../extension/upgradeable/Ownable.sol";
34-
import "../../../extension/upgradeable/Permissions.sol";
35-
import "../../../extension/upgradeable/Drop.sol";
36-
import "../../../extension/upgradeable/SharedMetadataBatch.sol";
37-
import { RulesEngine } from "../../../extension/upgradeable/RulesEngine.sol";
29+
import "../../extension/Multicall.sol";
30+
import "../../extension/upgradeable/ContractMetadata.sol";
31+
import "../../extension/upgradeable/Royalty.sol";
32+
import "../../extension/upgradeable/PrimarySale.sol";
33+
import "../../extension/upgradeable/Ownable.sol";
34+
import "../../extension/upgradeable/Permissions.sol";
35+
import "../../extension/upgradeable/Drop.sol";
36+
import "../../extension/upgradeable/SharedMetadataBatch.sol";
37+
import { RulesEngine } from "../../extension/upgradeable/RulesEngine.sol";
3838

3939
contract EvolvingNFTLogic is
4040
ContractMetadata,

contracts/prebuilts/unaudited/evolving-nfts/extension/RulesEngineExtension.sol renamed to contracts/prebuilts/evolving-nfts/extension/RulesEngineExtension.sol

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ pragma solidity ^0.8.11;
33

44
/// @author thirdweb
55

6-
import { PermissionsStorage } from "../../../../extension/upgradeable/Permissions.sol";
7-
import { RulesEngine } from "../../../../extension/upgradeable/RulesEngine.sol";
6+
import { PermissionsStorage } from "../../../extension/upgradeable/Permissions.sol";
7+
import { RulesEngine } from "../../../extension/upgradeable/RulesEngine.sol";
88

99
contract RulesEngineExtension is RulesEngine {
1010
/// @dev Returns whether the rules of the contract can be set in the given execution context.

src/test/EvolvingNFT.t.sol

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ pragma solidity ^0.8.0;
33

44
import { IExtension } from "@thirdweb-dev/dynamic-contracts/src/interface/IExtension.sol";
55

6-
import { EvolvingNFT } from "contracts/prebuilts/unaudited/evolving-nfts/EvolvingNFT.sol";
7-
import { EvolvingNFTLogic } from "contracts/prebuilts/unaudited/evolving-nfts/EvolvingNFTLogic.sol";
8-
import { RulesEngineExtension } from "contracts/prebuilts/unaudited/evolving-nfts/extension/RulesEngineExtension.sol";
6+
import { EvolvingNFT } from "contracts/prebuilts/evolving-nfts/EvolvingNFT.sol";
7+
import { EvolvingNFTLogic } from "contracts/prebuilts/evolving-nfts/EvolvingNFTLogic.sol";
8+
import { RulesEngineExtension } from "contracts/prebuilts/evolving-nfts/extension/RulesEngineExtension.sol";
99

1010
import { IDrop } from "contracts/extension/interface/IDrop.sol";
1111
import { Drop } from "contracts/extension/upgradeable/Drop.sol";

0 commit comments

Comments
 (0)