Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(repo): merge all NFT contracts into one single package #17229

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
rename taikoon to nft-contracts
  • Loading branch information
dantaik committed May 17, 2024
commit 1c28711bdae33f102b434be54ae23f999a8e799d
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { Script, console } from "forge-std/src/Script.sol";
import { MerkleMintersScript } from "./MerkleMinters.s.sol";
import { Merkle } from "murky/Merkle.sol";
import { ERC1967Proxy } from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
import { TaikoonToken } from "../../contracts/TaikoonToken.sol";
import { TaikoonToken } from "../../contracts/taikoon/TaikoonToken.sol";

contract DeployScript is Script {
UtilsScript public utils;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import "forge-std/src/StdJson.sol";
import { UtilsScript } from "./Utils.s.sol";
import { Merkle } from "murky/Merkle.sol";
import "./CsvParser.sol";
import { MerkleWhitelist } from "../../contracts/MerkleWhitelist.sol";
import { TaikoonToken } from "../../contracts/TaikoonToken.sol";
import { MerkleWhitelist } from "../../contracts/taikoon/MerkleWhitelist.sol";
import { TaikoonToken } from "../../contracts/taikoon/TaikoonToken.sol";

contract MerkleMintersScript is Script {
using stdJson for string;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ pragma solidity 0.8.24;
import { Test, console } from "forge-std/src/Test.sol";
import "forge-std/src/StdJson.sol";
import { Merkle } from "murky/Merkle.sol";
import { MerkleWhitelist } from "../contracts/MerkleWhitelist.sol";
import { ERC1967Proxy } from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
import { MerkleWhitelist } from "../../contracts/taikoon/MerkleWhitelist.sol";

/// @custom:oz-upgrades-from MerkleWhitelist
contract MerkleWhitelistForTest is MerkleWhitelist {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.24;

import { MerkleWhitelist } from "../contracts/MerkleWhitelist.sol";
import { MerkleWhitelist } from "../../contracts/taikoon/MerkleWhitelist.sol";

/// @custom:oz-upgrades-from MerkleWhitelist
contract MerkleWhitelistTestWrapper is MerkleWhitelist {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ pragma solidity 0.8.24;

import { Test } from "forge-std/src/Test.sol";

import { TaikoonToken } from "../contracts/TaikoonToken.sol";
import { Merkle } from "murky/Merkle.sol";
import { ERC1967Proxy } from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
import { TaikoonToken } from "../../contracts/taikoon/TaikoonToken.sol";

contract TaikoonTokenTest is Test {
TaikoonToken public token;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
// SPDX-License-Identifier: MIT
pragma solidity 0.8.24;

import "forge-std/src/StdJson.sol";
import { Test, console } from "forge-std/src/Test.sol";
import { TaikoonToken } from "../contracts/TaikoonToken.sol";
import { ERC1967Proxy } from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";
import { Merkle } from "murky/Merkle.sol";
import { MerkleMintersScript } from "../script/sol/MerkleMinters.s.sol";
import "forge-std/src/StdJson.sol";
import { TaikoonToken } from "../../contracts/taikoon/TaikoonToken.sol";
import { MerkleMintersScript } from "../../script/taikoon/MerkleMinters.s.sol";

import { ERC1967Proxy } from "@openzeppelin/contracts/proxy/ERC1967/ERC1967Proxy.sol";

contract UpgradeableTest is Test {
using stdJson for string;
Expand Down