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 3 commits
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
14 changes: 7 additions & 7 deletions .github/workflows/taikoon.yml → .github/workflows/nfts.yml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
name: Taikoon
name: NFTs

on:
push:
branches: [main]
paths:
- "packages/taikoon/**"
- "packages/nfts/**"
pull_request:
paths:
- "packages/taikoon/**"
- "packages/nfts/**"

jobs:
build-taikoon:
build-nfts:
runs-on: [taiko-runner]
steps:
- name: Cancel previous runs
Expand All @@ -30,13 +30,13 @@ jobs:
uses: ./.github/actions/install-pnpm-dependencies

- name: Check formatting
working-directory: ./packages/taikoon
working-directory: ./packages/nfts
run: forge fmt --check

- name: Solidity compilation
working-directory: ./packages/taikoon
working-directory: ./packages/nfts
run: pnpm compile

- name: Unit Tests
working-directory: ./packages/taikoon
working-directory: ./packages/nfts
run: pnpm test
3 changes: 1 addition & 2 deletions .github/workflows/repo--validate-pr-title.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,7 @@ jobs:
guardian-prover-health-check-ui
protocol
relayer
taikoon
snaefell-nft
nfts
ui-lib
taiko-client
supplementary-contracts
Expand Down
2 changes: 1 addition & 1 deletion .release-please-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"packages/protocol": "1.5.0",
"packages/relayer": "0.12.0",
"packages/taiko-client": "0.22.0",
"packages/taikoon": "1.0.0",
"packages/nfts": "1.0.0",
"packages/supplementary-contracts": "1.0.0",
"packages/taikoon-ui": "1.0.0"
}
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ taiko-mono/
│ ├── <a href="./packages/relayer">relayer</a>: Bridge backend relayer.
│ ├── <a href="./packages/supplementary-contracts">supplementary-contracts</a>: Supplementary smart contracts that are not part of the Taiko rollup protocol.
│ ├── <a href="./packages/taiko-client">taiko-client</a>: Taiko client implementation in Go.
│ ├── <a href="./packages/taikoon">taikoon</a>: Taikoon NFT contracts.
│ ├── <a href="./packages/nfts">nfts</a>: NFT contracts.
│ └── <a href="./packages/taikoon-ui">taikoon-ui</a>: Taikoon NFT UI.
...
</pre>
Expand Down
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.
4 changes: 2 additions & 2 deletions packages/taikoon/README.md → packages/nfts/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Taikoon MFT
# NFTs

## Setup

Expand All @@ -18,7 +18,7 @@ $ pnpm install # installs the workspace's dependencies

---

## Deploying the Taikoons
## Deploying the Taikoon NFT

In order to deploy the token, the images for the NFTs must be placed under `data/original/`. The following script will re-size them and upload them to IPFS:

Expand Down
Empty file.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@taiko/taikoon",
"name": "@taiko/nfts",
"version": "1.0.0",
"private": true,
"scripts": {
Expand Down
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
File renamed without changes.
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
13 changes: 0 additions & 13 deletions packages/snaefell-nft/package.json

This file was deleted.

Loading
Loading