Skip to content

Commit 323ba14

Browse files
nkrishangnkrishang
authored
Directory re-structure (#478)
* Re-structure dirs * WIP: fix paths * resolve paths * resolve compile errors
1 parent 51c03e9 commit 323ba14

File tree

312 files changed

+626
-628
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

312 files changed

+626
-628
lines changed

‎contracts/base/ERC1155LazyMint.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import "../extension/interface/IClaimableERC1155.sol";
1515
import "../extension/DefaultOperatorFilterer.sol";
1616

1717
import "../lib/TWStrings.sol";
18-
import "../openzeppelin-presets/security/ReentrancyGuard.sol";
18+
import "../external-deps/openzeppelin/security/ReentrancyGuard.sol";
1919

2020
/**
2121
* BASE: ERC1155Base

‎contracts/base/ERC20Base.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pragma solidity ^0.8.0;
33

44
/// @author thirdweb
55

6-
import "../openzeppelin-presets/token/ERC20/extensions/ERC20Permit.sol";
6+
import "../external-deps/openzeppelin/token/ERC20/extensions/ERC20Permit.sol";
77

88
import "../extension/ContractMetadata.sol";
99
import "../extension/Multicall.sol";

‎contracts/base/ERC20Drop.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pragma solidity ^0.8.0;
33

44
/// @author thirdweb
55

6-
import "../openzeppelin-presets/token/ERC20/extensions/ERC20Permit.sol";
6+
import "../external-deps/openzeppelin/token/ERC20/extensions/ERC20Permit.sol";
77

88
import "../extension/ContractMetadata.sol";
99
import "../extension/Multicall.sol";

‎contracts/base/ERC20DropVote.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pragma solidity ^0.8.0;
33

44
/// @author thirdweb
55

6-
import "../openzeppelin-presets/token/ERC20/extensions/ERC20Votes.sol";
6+
import "../external-deps/openzeppelin/token/ERC20/extensions/ERC20Votes.sol";
77

88
import "../extension/ContractMetadata.sol";
99
import "../extension/Multicall.sol";

‎contracts/base/ERC20Vote.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pragma solidity ^0.8.0;
33

44
/// @author thirdweb
55

6-
import "../openzeppelin-presets/token/ERC20/extensions/ERC20Votes.sol";
6+
import "../external-deps/openzeppelin/token/ERC20/extensions/ERC20Votes.sol";
77

88
import "./ERC20Base.sol";
99
import "../extension/interface/IMintableERC20.sol";

‎contracts/base/ERC721LazyMint.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import "../extension/interface/IClaimableERC721.sol";
1515
import "../extension/DefaultOperatorFilterer.sol";
1616

1717
import "../lib/TWStrings.sol";
18-
import "../openzeppelin-presets/security/ReentrancyGuard.sol";
18+
import "../external-deps/openzeppelin/security/ReentrancyGuard.sol";
1919

2020
/**
2121
* BASE: ERC721A

‎contracts/eip/ERC721A.sol

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
pragma solidity ^0.8.4;
66

77
import "./interface/IERC721A.sol";
8-
import "../openzeppelin-presets/token/ERC721/IERC721Receiver.sol";
8+
import "../external-deps/openzeppelin/token/ERC721/IERC721Receiver.sol";
99
import "../lib/TWAddress.sol";
10-
import "../openzeppelin-presets/utils/Context.sol";
10+
import "../external-deps/openzeppelin/utils/Context.sol";
1111
import "../lib/TWStrings.sol";
1212
import "./ERC165.sol";
1313

‎contracts/dynamic-contracts/eip/ERC721AUpgradeable.sol renamed to ‎contracts/eip/ERC721AUpgradeable.sol

+7-7
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ pragma solidity ^0.8.4;
66

77
////////// CHANGELOG: turn `approve` to virtual //////////
88

9-
import "../../eip/interface/IERC721A.sol";
10-
import "../../eip/interface/IERC721Receiver.sol";
11-
import "../../lib/TWAddress.sol";
12-
import "../../openzeppelin-presets/utils/Context.sol";
13-
import "../../lib/TWStrings.sol";
14-
import "../../eip/ERC165.sol";
15-
import "../extension/Initializable.sol";
9+
import "./interface/IERC721A.sol";
10+
import "./interface/IERC721Receiver.sol";
11+
import "../lib/TWAddress.sol";
12+
import "../external-deps/openzeppelin/utils/Context.sol";
13+
import "../lib/TWStrings.sol";
14+
import "./ERC165.sol";
15+
import "../extension/upgradeable/Initializable.sol";
1616

1717
library ERC721AStorage {
1818
bytes32 public constant ERC721A_STORAGE_POSITION = keccak256("erc721.a.storage");

‎contracts/eip/ERC721AVirtualApprove.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ pragma solidity ^0.8.4;
99
import "./interface/IERC721A.sol";
1010
import "./interface/IERC721Receiver.sol";
1111
import "../lib/TWAddress.sol";
12-
import "../openzeppelin-presets/utils/Context.sol";
12+
import "../external-deps/openzeppelin/utils/Context.sol";
1313
import "../lib/TWStrings.sol";
1414
import "./ERC165.sol";
1515

‎contracts/extension/BurnToClaim.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { ERC721Burnable } from "@openzeppelin/contracts/token/ERC721/extensions/
99
import "../eip/interface/IERC1155.sol";
1010
import "../eip/interface/IERC721.sol";
1111

12-
import "../openzeppelin-presets/utils/Context.sol";
12+
import "../external-deps/openzeppelin/utils/Context.sol";
1313
import "./interface/IBurnToClaim.sol";
1414

1515
abstract contract BurnToClaim is IBurnToClaim {

‎contracts/extension/ProxyForUpgradeable.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
44
/// @author thirdweb
55

66
import "./Proxy.sol";
7-
import "../openzeppelin-presets/proxy/ERC1967/ERC1967Upgrade.sol";
7+
import "../external-deps/openzeppelin/proxy/ERC1967/ERC1967Upgrade.sol";
88

99
/**
1010
* @dev This contract implements an upgradeable proxy. It is upgradeable because calls are delegated to an

‎contracts/extension/SignatureAction.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
44
/// @author thirdweb
55

66
import "./interface/ISignatureAction.sol";
7-
import "../openzeppelin-presets/utils/cryptography/EIP712.sol";
7+
import "../external-deps/openzeppelin/utils/cryptography/EIP712.sol";
88

99
abstract contract SignatureAction is EIP712, ISignatureAction {
1010
using ECDSA for bytes32;

‎contracts/extension/SignatureMintERC1155.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
44
/// @author thirdweb
55

66
import "./interface/ISignatureMintERC1155.sol";
7-
import "../openzeppelin-presets/utils/cryptography/EIP712.sol";
7+
import "../external-deps/openzeppelin/utils/cryptography/EIP712.sol";
88

99
abstract contract SignatureMintERC1155 is EIP712, ISignatureMintERC1155 {
1010
using ECDSA for bytes32;

‎contracts/extension/SignatureMintERC20.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
44
/// @author thirdweb
55

66
import "./interface/ISignatureMintERC20.sol";
7-
import "../openzeppelin-presets/utils/cryptography/EIP712.sol";
7+
import "../external-deps/openzeppelin/utils/cryptography/EIP712.sol";
88

99
abstract contract SignatureMintERC20 is EIP712, ISignatureMintERC20 {
1010
using ECDSA for bytes32;

‎contracts/extension/SignatureMintERC721.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
44
/// @author thirdweb
55

66
import "./interface/ISignatureMintERC721.sol";
7-
import "../openzeppelin-presets/utils/cryptography/EIP712.sol";
7+
import "../external-deps/openzeppelin/utils/cryptography/EIP712.sol";
88

99
abstract contract SignatureMintERC721 is EIP712, ISignatureMintERC721 {
1010
using ECDSA for bytes32;

‎contracts/extension/Staking1155.sol

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ pragma solidity ^0.8.11;
33

44
/// @author thirdweb
55

6-
import "../openzeppelin-presets/security/ReentrancyGuard.sol";
7-
import "../openzeppelin-presets/utils/math/SafeMath.sol";
6+
import "../external-deps/openzeppelin/security/ReentrancyGuard.sol";
7+
import "../external-deps/openzeppelin/utils/math/SafeMath.sol";
88
import "../eip/interface/IERC1155.sol";
99

1010
import "./interface/IStaking1155.sol";

‎contracts/extension/Staking1155Upgradeable.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pragma solidity ^0.8.11;
44
/// @author thirdweb
55

66
import "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
7-
import "../openzeppelin-presets/utils/math/SafeMath.sol";
7+
import "../external-deps/openzeppelin/utils/math/SafeMath.sol";
88
import "../eip/interface/IERC1155.sol";
99

1010
import "./interface/IStaking1155.sol";

‎contracts/extension/Staking20.sol

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ pragma solidity ^0.8.11;
33

44
/// @author thirdweb
55

6-
import "../openzeppelin-presets/security/ReentrancyGuard.sol";
7-
import "../openzeppelin-presets/utils/math/SafeMath.sol";
6+
import "../external-deps/openzeppelin/security/ReentrancyGuard.sol";
7+
import "../external-deps/openzeppelin/utils/math/SafeMath.sol";
88
import "../eip/interface/IERC20.sol";
99
import "../lib/CurrencyTransferLib.sol";
1010

‎contracts/extension/Staking20Upgradeable.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pragma solidity ^0.8.11;
44
/// @author thirdweb
55

66
import "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
7-
import "../openzeppelin-presets/utils/math/SafeMath.sol";
7+
import "../external-deps/openzeppelin/utils/math/SafeMath.sol";
88
import "../eip/interface/IERC20.sol";
99
import "../lib/CurrencyTransferLib.sol";
1010

‎contracts/extension/Staking721.sol

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ pragma solidity ^0.8.11;
33

44
/// @author thirdweb
55

6-
import "../openzeppelin-presets/security/ReentrancyGuard.sol";
7-
import "../openzeppelin-presets/utils/math/SafeMath.sol";
6+
import "../external-deps/openzeppelin/security/ReentrancyGuard.sol";
7+
import "../external-deps/openzeppelin/utils/math/SafeMath.sol";
88
import "../eip/interface/IERC721.sol";
99

1010
import "./interface/IStaking721.sol";

‎contracts/extension/Staking721Upgradeable.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pragma solidity ^0.8.11;
44
/// @author thirdweb
55

66
import "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
7-
import "../openzeppelin-presets/utils/math/SafeMath.sol";
7+
import "../external-deps/openzeppelin/utils/math/SafeMath.sol";
88
import "../eip/interface/IERC721.sol";
99

1010
import "./interface/IStaking721.sol";

‎contracts/extension/TokenStore.sol

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ pragma solidity ^0.8.0;
88
import "../eip/interface/IERC1155.sol";
99
import "../eip/interface/IERC721.sol";
1010

11-
import "../openzeppelin-presets/utils/ERC1155/ERC1155Holder.sol";
12-
import "../openzeppelin-presets/utils/ERC721/ERC721Holder.sol";
11+
import "../external-deps/openzeppelin/utils/ERC1155/ERC1155Holder.sol";
12+
import "../external-deps/openzeppelin/utils/ERC721/ERC721Holder.sol";
1313

1414
// ========== Internal imports ==========
1515

‎contracts/extension/Upgradeable.sol

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ pragma solidity ^0.8.0;
33

44
/// @author thirdweb
55

6-
import "../openzeppelin-presets/proxy/IERC1822Proxiable.sol";
7-
import "../openzeppelin-presets/proxy/ERC1967/ERC1967Upgrade.sol";
6+
import "../external-deps/openzeppelin/proxy/IERC1822Proxiable.sol";
7+
import "../external-deps/openzeppelin/proxy/ERC1967/ERC1967Upgrade.sol";
88

99
/**
1010
* @dev An upgradeability mechanism designed for UUPS proxies. The functions included here can perform an upgrade of an

‎contracts/extension/plugin/ContractMetadataLogic.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
44
/// @author thirdweb
55

66
import "./ContractMetadataStorage.sol";
7-
import "../../extension/interface/IContractMetadata.sol";
7+
import "../interface/IContractMetadata.sol";
88

99
/**
1010
* @author thirdweb.com

‎contracts/extension/plugin/PermissionsEnumerableStorage.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pragma solidity ^0.8.0;
33

44
/// @author thirdweb
55

6-
import "../../extension/interface/IPermissionsEnumerable.sol";
6+
import "../interface/IPermissionsEnumerable.sol";
77

88
/**
99
* @author thirdweb.com

‎contracts/extension/plugin/PermissionsLogic.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pragma solidity ^0.8.0;
33

44
/// @author thirdweb
55

6-
import "../../extension/interface/IPermissions.sol";
6+
import "../interface/IPermissions.sol";
77
import "./PermissionsStorage.sol";
88
import "../../lib/TWStrings.sol";
99

‎contracts/extension/plugin/PlatformFeeLogic.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
44
/// @author thirdweb
55

66
import "./PlatformFeeStorage.sol";
7-
import "../../extension/interface/IPlatformFee.sol";
7+
import "../interface/IPlatformFee.sol";
88

99
/**
1010
* @author thirdweb.com

‎contracts/extension/plugin/PluginMap.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pragma solidity ^0.8.0;
44
/// @author thirdweb
55

66
import "../interface/plugin/IPluginMap.sol";
7-
import "../../openzeppelin-presets/utils/EnumerableSet.sol";
7+
import "../../external-deps/openzeppelin/utils/EnumerableSet.sol";
88

99
/**
1010
* @author thirdweb.com

‎contracts/extension/plugin/Router.sol

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ pragma solidity ^0.8.0;
44
/// @author thirdweb
55

66
import "../interface/plugin/IRouter.sol";
7-
import "../../extension/Multicall.sol";
7+
import "../Multicall.sol";
88
import "../../eip/ERC165.sol";
9-
import "../../openzeppelin-presets/utils/EnumerableSet.sol";
9+
import "../../external-deps/openzeppelin/utils/EnumerableSet.sol";
1010

1111
/**
1212
* @author thirdweb.com

‎contracts/dynamic-contracts/extension/AccountPermissions.sol renamed to ‎contracts/extension/upgradeable/AccountPermissions.sol

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ pragma solidity ^0.8.0;
33

44
/// @author thirdweb
55

6-
import "../../extension/interface/IAccountPermissions.sol";
7-
import "../../openzeppelin-presets/utils/cryptography/EIP712.sol";
8-
import "../../openzeppelin-presets/utils/structs/EnumerableSet.sol";
6+
import "../interface/IAccountPermissions.sol";
7+
import "../../external-deps/openzeppelin/utils/cryptography/EIP712.sol";
8+
import "../../external-deps/openzeppelin/utils/structs/EnumerableSet.sol";
99

1010
library AccountPermissionsStorage {
1111
bytes32 public constant ACCOUNT_PERMISSIONS_STORAGE_POSITION = keccak256("account.permissions.storage");

‎contracts/dynamic-contracts/extension/BatchMintMetadata.sol renamed to ‎contracts/extension/upgradeable/BatchMintMetadata.sol

File renamed without changes.

‎contracts/dynamic-contracts/extension/BurnToClaim.sol renamed to ‎contracts/extension/upgradeable/BurnToClaim.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import { ERC721Burnable } from "@openzeppelin/contracts/token/ERC721/extensions/
99
import "../../eip/interface/IERC1155.sol";
1010
import "../../eip/interface/IERC721.sol";
1111

12-
import "../../extension/interface/IBurnToClaim.sol";
12+
import "../interface/IBurnToClaim.sol";
1313

1414
library BurnToClaimStorage {
1515
bytes32 public constant BURN_TO_CLAIM_STORAGE_POSITION = keccak256("burn.to.claim.storage");

‎contracts/dynamic-contracts/extension/ContractMetadata.sol renamed to ‎contracts/extension/upgradeable/ContractMetadata.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pragma solidity ^0.8.0;
33

44
/// @author thirdweb
55

6-
import "../../extension/interface/IContractMetadata.sol";
6+
import "../interface/IContractMetadata.sol";
77

88
/**
99
* @author thirdweb.com

‎contracts/dynamic-contracts/extension/DefaultOperatorFiltererUpgradeable.sol renamed to ‎contracts/extension/upgradeable/DefaultOperatorFiltererUpgradeable.sol

File renamed without changes.

‎contracts/dynamic-contracts/extension/DelayedReveal.sol renamed to ‎contracts/extension/upgradeable/DelayedReveal.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pragma solidity ^0.8.0;
33

44
/// @author thirdweb
55

6-
import "../../extension/interface/IDelayedReveal.sol";
6+
import "../interface/IDelayedReveal.sol";
77

88
library DelayedRevealStorage {
99
bytes32 public constant DELAYED_REVEAL_STORAGE_POSITION = keccak256("delayed.reveal.storage");

‎contracts/dynamic-contracts/extension/Drop.sol renamed to ‎contracts/extension/upgradeable/Drop.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pragma solidity ^0.8.0;
33

44
/// @author thirdweb
55

6-
import "../../extension/interface/IDrop.sol";
6+
import "../interface/IDrop.sol";
77
import "../../lib/MerkleProof.sol";
88

99
library DropStorage {

‎contracts/dynamic-contracts/extension/ERC2771Context.sol renamed to ‎contracts/extension/upgradeable/ERC2771Context.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: Apache 2.0
22
pragma solidity ^0.8.0;
33

4-
import "../../extension/interface/IERC2771Context.sol";
4+
import "../interface/IERC2771Context.sol";
55

66
/**
77
* @dev Context variant with ERC2771 support.

‎contracts/dynamic-contracts/extension/ERC2771ContextUpgradeable.sol renamed to ‎contracts/extension/upgradeable/ERC2771ContextUpgradeable.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: Apache 2.0
22
pragma solidity ^0.8.0;
33

4-
import "../../extension/interface/IERC2771Context.sol";
4+
import "../interface/IERC2771Context.sol";
55
import "./Initializable.sol";
66

77
/**

‎contracts/dynamic-contracts/extension/Initializable.sol renamed to ‎contracts/extension/upgradeable/Initializable.sol

File renamed without changes.

‎contracts/dynamic-contracts/extension/LazyMint.sol renamed to ‎contracts/extension/upgradeable/LazyMint.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pragma solidity ^0.8.0;
33

44
/// @author thirdweb
55

6-
import "../../extension/interface/ILazyMint.sol";
6+
import "../interface/ILazyMint.sol";
77
import "./BatchMintMetadata.sol";
88

99
library LazyMintStorage {

‎contracts/dynamic-contracts/extension/OperatorFilterToggle.sol renamed to ‎contracts/extension/upgradeable/OperatorFilterToggle.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pragma solidity ^0.8.0;
33

44
/// @author thirdweb
55

6-
import "../../extension/interface/IOperatorFilterToggle.sol";
6+
import "../interface/IOperatorFilterToggle.sol";
77

88
library OperatorFilterToggleStorage {
99
bytes32 public constant OPERATOR_FILTER_TOGGLE_STORAGE_POSITION = keccak256("operator.filter.toggle.storage");

‎contracts/dynamic-contracts/extension/OperatorFiltererUpgradeable.sol renamed to ‎contracts/extension/upgradeable/OperatorFiltererUpgradeable.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pragma solidity ^0.8.0;
33

44
/// @author thirdweb
55

6-
import "../../extension/interface/IOperatorFilterRegistry.sol";
6+
import "../interface/IOperatorFilterRegistry.sol";
77
import "./OperatorFilterToggle.sol";
88

99
abstract contract OperatorFiltererUpgradeable is OperatorFilterToggle {

‎contracts/dynamic-contracts/extension/Ownable.sol renamed to ‎contracts/extension/upgradeable/Ownable.sol

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ pragma solidity ^0.8.0;
33

44
/// @author thirdweb
55

6-
import "../../extension/interface/IOwnable.sol";
6+
import "../interface/IOwnable.sol";
77

88
/**
99
* @title Ownable

0 commit comments

Comments
 (0)