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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 2 additions & 2 deletions
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‎

Lines changed: 7 additions & 7 deletions
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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 {

0 commit comments

Comments
 (0)