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.

Sign up for GitHub

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

fix(nfts): pfp frontend fixes #18034

Merged
merged 12 commits into from
Sep 10, 2024
+25 −9
Merged

fix(nfts): pfp frontend fixes #18034

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a7dbac8
feat(nfts): trailblazer profile picture
bennettyong Aug 30, 2024
0582c92
feat: tests
bennettyong Sep 2, 2024
2ba6566
fix: tests
bennettyong Sep 2, 2024
966ca21
fix: tests
bennettyong Sep 2, 2024
89a35de
fix: comments
bennettyong Sep 2, 2024
eaeb860
fix: interface
bennettyong Sep 2, 2024
ce8e4b8
fix: tests
bennettyong Sep 2, 2024
d621201
fix: lint
bennettyong Sep 3, 2024
dcc0b13
fix: comments
bennettyong Sep 3, 2024
ac7f0ab
fix: tests
bennettyong Sep 4, 2024
62600cb
fixes for frontend
bearni95 Sep 4, 2024
b2168fb
s2 deployments
bearni95 Sep 6, 2024
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
3 changes: 3 additions & 0 deletions packages/nfts/deployments/profile/hekla.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"RegisterProfilePicture": "0xdBfaFc789c4272161ce01a4A3aBa04C232362504"
}
3 changes: 3 additions & 0 deletions packages/nfts/deployments/profile/mainnet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"RegisterProfilePicture": "0xCbC7846351BaEaB1ed51f8FF57e10C367E01488A"
}
5 changes: 5 additions & 0 deletions packages/nfts/deployments/taikoon/hekla.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"MerkleRoot": "0x1c3b504b4d5640d26ad1aa3b57a9df9ec034f19239768e734b849c306d10b110",
"Owner": "0x4100a9B680B1Be1F10Cb8b5a57fE59eA77A8184e",
"TaikoonToken": "0xf3FBa6f1E6C1998195239e7DD794c1EcEA8Da66B"
}
6 changes: 3 additions & 3 deletions packages/nfts/deployments/trailblazers-badges/hekla.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"MintSigner": "0x3cda4F2EaC3fc2FdE78B3DFFe1A1A1Eff88c68c5",
"Owner": "0x7d70236E2517f5B95247AF1d806A9E3C328a7860",
"TrailblazersBadges": "0x010992985d1DA35676271bd5abA16E0E8D5582d3"
"MintSigner": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
"Owner": "0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266",
"TrailblazersBadges": "0x4406dB2850EcE5e44B93a7b0296229DF882d34e6"
}
4 changes: 3 additions & 1 deletion packages/nfts/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"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 --gas-estimate-multiplier 200",
"taikoon:deploy:hekla": "forge clean && pnpm compile && forge script script/taikoon/sol/Deploy.s.sol --rpc-url https://rpc.hekla.taiko.xyz --broadcast --gas-estimate-multiplier 200",
"tbzb:deploy:localhost": "forge clean && pnpm compile && forge script script/trailblazers-badges/sol/Deploy.s.sol --rpc-url http://localhost:8545 --broadcast",
"tbzb:deploy:hekla": "forge clean && pnpm compile && forge script script/trailblazers-badges/sol/Deploy.s.sol --rpc-url https://rpc.hekla.taiko.xyz --broadcast --gas-estimate-multiplier 200",
"galxe:deploy:mainnet": "forge clean && pnpm compile && forge script script/galxe/Deploy.s.sol --rpc-url https://rpc.mainnet.taiko.xyz --legacy --with-gas-price 1",
Expand All @@ -30,7 +31,8 @@
"kbw:deploy:hekla": "forge clean && pnpm compile && forge script script/party-ticket/sol/Deploy.s.sol --rpc-url https://rpc.hekla.taiko.xyz --broadcast --gas-estimate-multiplier 200",
"kbw:deploy:mainnet": "forge clean && pnpm compile && forge script script/party-ticket/sol/Deploy.s.sol --rpc-url https://rpc.mainnet.taiko.xyz --broadcast --legacy --with-gas-price 30 ",
"kbw:upgradeV2:hekla": "forge clean && pnpm compile && forge script script/party-ticket/sol/UpgradeV2.s.sol --rpc-url https://rpc.hekla.taiko.xyz --broadcast --gas-estimate-multiplier 200",
"kbw:upgradeV2:mainnet": "forge clean && pnpm compile && forge script script/party-ticket/sol/UpgradeV2.s.sol --rpc-url https://rpc.mainnet.taiko.xyz --broadcast"
"kbw:upgradeV2:mainnet": "forge clean && pnpm compile && forge script script/party-ticket/sol/UpgradeV2.s.sol --rpc-url https://rpc.mainnet.taiko.xyz --broadcast",
"pfp:deploy:hekla": "forge clean && pnpm compile && forge script script/profile/Deploy.s.sol --rpc-url https://rpc.hekla.taiko.xyz --broadcast --gas-estimate-multiplier 200"
},
"devDependencies": {
"@types/node": "^20.11.30",
Expand Down
2 changes: 1 addition & 1 deletion packages/nfts/script/profile/Deploy.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ contract DeployScript is Script {

RegisterProfilePicture profile = RegisterProfilePicture(proxy);

console.log("Deployed TaikoPartyTicket to:", address(profile));
console.log("Deployed Trailblazers PFP to:", address(profile));

string memory finalJson = vm.serializeAddress(jsonRoot, "RegisterProfilePicture", address(profile));
vm.writeJson(finalJson, jsonLocation);
Expand Down
2 changes: 1 addition & 1 deletion packages/nfts/script/taikoon/sol/Deploy.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ contract DeployScript is Script {
// IMinimalBlacklist blacklist = IMinimalBlacklist(0xe61E9034b5633977eC98E302b33e321e8140F105);

// Hardhat Testnet Values
address owner = 0xf8ff2AF0DC1D5BA4811f22aCb02936A1529fd2Be;
address owner = 0x4100a9B680B1Be1F10Cb8b5a57fE59eA77A8184e;
bytes32 root = 0x1c3b504b4d5640d26ad1aa3b57a9df9ec034f19239768e734b849c306d10b110;
string baseURI =
"https://taikonfts.4everland.link/ipfs/bafybeiegdqpwx3he5dvoxqklspdjekjepjcobfaakyficksratn73qbbyy";
Expand Down
3 changes: 3 additions & 0 deletions packages/nfts/script/taikoon/sol/Utils.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ contract UtilsScript is Script {
} else if (chainId == 167_000) {
lowercaseNetworkKey = "mainnet";
uppercaseNetworkKey = "MAINNET";
} else if (chainId == 167_009) {
lowercaseNetworkKey = "hekla";
uppercaseNetworkKey = "HEKLA";
} else {
revert("Unsupported chainId");
}
Expand Down
6 changes: 3 additions & 3 deletions packages/nfts/script/trailblazers-badges/sol/Deploy.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,20 @@ contract DeployScript is Script {
// Taiko Mainnet Values
//address owner = 0xf8ff2AF0DC1D5BA4811f22aCb02936A1529fd2Be;
//bytes32 root = 0xa7e510d5aed347e65609cf6f0e0738cdd752ffdf5980749057c634489fd09fc3;
// string baseURI = "bafybeierqzehlrqeqqeb6fwmil4dj3ij2p6exgoj4lysl53fsxwob6wbdy";
// string baseURI = "bafybeiebmvj6roz4iuoinackb5c6eeshvppctkydrckqrnxexdnzh6odq4";
// IMinimalBlacklist blacklist = IMinimalBlacklist(0xfA5EA6f9A13532cd64e805996a941F101CCaAc9a);

// Holesky Testnet Values
// address owner = 0xf8ff2AF0DC1D5BA4811f22aCb02936A1529fd2Be;
// bytes32 root = 0xf1359c4c4ba41a72025f2534ea8ad23c6b941b55a715838ebdc71202a78c6c87;
// string baseURI = "bafybeierqzehlrqeqqeb6fwmil4dj3ij2p6exgoj4lysl53fsxwob6wbdy";
// string baseURI = "bafybeiebmvj6roz4iuoinackb5c6eeshvppctkydrckqrnxexdnzh6odq4";
// IMinimalBlacklist blacklist = IMinimalBlacklist(0xe61E9034b5633977eC98E302b33e321e8140F105);

// Hardhat Testnet Values
address owner = 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266;
address mintSigner = 0xf39Fd6e51aad88F6F4ce6aB8827279cffFb92266;
string baseURI =
"https://taikonfts.4everland.link/ipfs/bafybeierqzehlrqeqqeb6fwmil4dj3ij2p6exgoj4lysl53fsxwob6wbdy";
"https://taikonfts.4everland.link/ipfs/bafybeiebmvj6roz4iuoinackb5c6eeshvppctkydrckqrnxexdnzh6odq4";
IMinimalBlacklist blacklist = IMinimalBlacklist(0xe61E9034b5633977eC98E302b33e321e8140F105);

function setUp() public {
Expand Down