diff --git a/packages/nfts/deployments/taikoon/holesky.json b/packages/nfts/deployments/taikoon/holesky.json index b96b94fa9d7..3b16900e8ba 100644 --- a/packages/nfts/deployments/taikoon/holesky.json +++ b/packages/nfts/deployments/taikoon/holesky.json @@ -1,5 +1,5 @@ { "MerkleRoot": "0x3e2da39414868a8a49c4ee78da50cc4430d88df27060300e553810ab2d23b5bd", - "Owner": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266", - "TaikoonToken": "0xfDbaA6d6c382A2555856bFaB315D5E6F3CDA1393" + "Owner": "0xf8ff2AF0DC1D5BA4811f22aCb02936A1529fd2Be", + "TaikoonToken": "0xd07F87E0f66861bbde6CfF5Ac39fC4ece15DE93d" } diff --git a/packages/nfts/package.json b/packages/nfts/package.json index c95930d7ccb..dcd38205961 100644 --- a/packages/nfts/package.json +++ b/packages/nfts/package.json @@ -18,8 +18,9 @@ "snaefell:deploy:ipfs": "rm -rf data/snaefell/metadata/* && node script/snaefell/js/4everland.js", "taikoon:deploy:devnet": "forge clean && pnpm compile && forge script script/taikoon/sol/Deploy.s.sol --rpc-url https://rpc.internal.taiko.xyz --broadcast --gas-estimate-multiplier 200", "snaefell:deploy:devnet": "forge clean && pnpm compile && forge script script/snaefell/sol/Deploy.s.sol --rpc-url https://rpc.internal.taiko.xyz --broadcast --gas-estimate-multiplier 200", - "taikoon:deploy:mainnet": "forge clean && pnpm compile && forge script script/taikoon/sol/Deploy.s.sol --rpc-url https://rpc.mainnet.taiko.xyz --broadcast --gas-price 13000000 ", - "snaefell:deploy:mainnet": "forge clean && pnpm compile && forge script script/snaefell/sol/Deploy.s.sol --rpc-url https://rpc.mainnet.taiko.xyz --broadcast --gas-price 13000000 " + "taikoon:deploy:mainnet": "forge clean && pnpm compile && forge script script/taikoon/sol/Deploy.s.sol --rpc-url https://rpc.mainnet.taiko.xyz --broadcast --legacy --with-gas-price 13 ", + "snaefell:deploy:mainnet": "forge clean && pnpm compile && forge script script/snaefell/sol/Deploy.s.sol --rpc-url https://rpc.mainnet.taiko.xyz --broadcast --legacy --with-gas-price 13 ", + "taikoon:deploy:holesky": "forge clean && pnpm compile && forge script script/taikoon/sol/Deploy.s.sol --rpc-url https://1rpc.io/holesky --broadcast --legacy --with-gas-price 13" }, "devDependencies": { "@types/node": "^20.11.30", diff --git a/packages/nfts/script/taikoon/js/generate-merkle-tree.js b/packages/nfts/script/taikoon/js/generate-merkle-tree.js index fddf440b577..86901e7ca2a 100644 --- a/packages/nfts/script/taikoon/js/generate-merkle-tree.js +++ b/packages/nfts/script/taikoon/js/generate-merkle-tree.js @@ -31,3 +31,4 @@ async function main(network) { main("hardhat"); main('mainnet') +main('holesky') diff --git a/packages/nfts/script/taikoon/sol/Deploy.s.sol b/packages/nfts/script/taikoon/sol/Deploy.s.sol index 9c84d869571..587b5a8ed2a 100644 --- a/packages/nfts/script/taikoon/sol/Deploy.s.sol +++ b/packages/nfts/script/taikoon/sol/Deploy.s.sol @@ -7,6 +7,7 @@ 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/taikoon/TaikoonToken.sol"; +import { IMinimalBlacklist } from "@taiko/blacklist/IMinimalBlacklist.sol"; contract DeployScript is Script { UtilsScript public utils; @@ -15,9 +16,18 @@ contract DeployScript is Script { uint256 public deployerPrivateKey; address public deployerAddress; + // Taiko Mainnet Values + //address owner = 0xf8ff2AF0DC1D5BA4811f22aCb02936A1529fd2Be; + // bytes32 root = 0xa7e510d5aed347e65609cf6f0e0738cdd752ffdf5980749057c634489fd09fc3; + // string baseURI = "bafybeierqzehlrqeqqeb6fwmil4dj3ij2p6exgoj4lysl53fsxwob6wbdy"; + // IMinimalBlacklist blacklist = + // IMinimalBlacklist(0x38e48e979b06dD3044C3f7bE8e122328175244e0); + + // Holesky Testnet Values address owner = 0xf8ff2AF0DC1D5BA4811f22aCb02936A1529fd2Be; - bytes32 root = 0xa7e510d5aed347e65609cf6f0e0738cdd752ffdf5980749057c634489fd09fc3; + bytes32 root = 0x3e2da39414868a8a49c4ee78da50cc4430d88df27060300e553810ab2d23b5bd; string baseURI = "bafybeierqzehlrqeqqeb6fwmil4dj3ij2p6exgoj4lysl53fsxwob6wbdy"; + IMinimalBlacklist blacklist = IMinimalBlacklist(0x464ef62Da3dB46701DF5A0fe81eBD2Cbc933196d); function setUp() public { utils = new UtilsScript(); @@ -43,10 +53,7 @@ contract DeployScript is Script { address impl = address(new TaikoonToken()); address proxy = address( new ERC1967Proxy( - impl, - abi.encodeCall( - TaikoonToken.initialize, (owner, baseURI, root, utils.getBlacklist()) - ) + impl, abi.encodeCall(TaikoonToken.initialize, (owner, baseURI, root, blacklist)) ) );