From 3e6d7a6c33b2cafec339c59238bb8a1bbbe08ffd Mon Sep 17 00:00:00 2001 From: Dan Oved Date: Thu, 20 Jul 2023 22:30:51 -0700 Subject: [PATCH 1/3] Deploy pgn sepolia and mainnet (#140) * Deployed to pgn sepolia * added pgn mainnet --- .changeset/four-onions-collect.md | 5 +++++ .changeset/pretty-badgers-sneeze.md | 5 +++++ .github/workflows/test_fork.yml | 2 +- addresses/424.json | 10 ++++++++++ addresses/58008.json | 10 ++++++++++ chainConfigs/424.json | 9 +++++++++ chainConfigs/58008.json | 9 +++++++++ foundry.toml | 4 +++- script/Deploy.s.sol | 4 +++- 9 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 .changeset/four-onions-collect.md create mode 100644 .changeset/pretty-badgers-sneeze.md create mode 100644 addresses/424.json create mode 100644 addresses/58008.json create mode 100644 chainConfigs/424.json create mode 100644 chainConfigs/58008.json diff --git a/.changeset/four-onions-collect.md b/.changeset/four-onions-collect.md new file mode 100644 index 0000000..eb0e211 --- /dev/null +++ b/.changeset/four-onions-collect.md @@ -0,0 +1,5 @@ +--- +'@zoralabs/nft-drop-contracts': patch +--- + +Deployed to pgn sepolia diff --git a/.changeset/pretty-badgers-sneeze.md b/.changeset/pretty-badgers-sneeze.md new file mode 100644 index 0000000..63b781d --- /dev/null +++ b/.changeset/pretty-badgers-sneeze.md @@ -0,0 +1,5 @@ +--- +'@zoralabs/nft-drop-contracts': patch +--- + +Added pgn mainnet diff --git a/.github/workflows/test_fork.yml b/.github/workflows/test_fork.yml index 0cc19ca..6ddfd3e 100644 --- a/.github/workflows/test_fork.yml +++ b/.github/workflows/test_fork.yml @@ -35,6 +35,6 @@ jobs: run: | forge test -vvv --match-test fork env: - FORK_TEST_CHAINS: mainnet,goerli,optimism,optimism_goerli,zora,zora_goerli,base_goerli,base + FORK_TEST_CHAINS: mainnet,goerli,optimism,optimism_goerli,zora,zora_goerli,base_goerli,base,pgn_sepolia,pgn ALCHEMY_KEY: ${{ secrets.ALCHEMY_KEY }} id: test diff --git a/addresses/424.json b/addresses/424.json new file mode 100644 index 0000000..700b843 --- /dev/null +++ b/addresses/424.json @@ -0,0 +1,10 @@ +{ + "DROP_METADATA_RENDERER": "0xd77783B9df27BC9ABd438d1ddE67e3afB64618e0", + "EDITION_METADATA_RENDERER": "0xC647382DFbb02ddf39dde7fDEbb5D844a832BE33", + "ERC721DROP_IMPL": "0x0ef82DaB14798E63F1B99479Ba689e3f6A6fEb6C", + "FACTORY_UPGRADE_GATE": "0x973577d5B73a9b2508296F81260415151d0a955E", + "ZORA_NFT_CREATOR_PROXY": "0x48d8db63724444C6270749fEe80bBDB6CF33677f", + "ZORA_NFT_CREATOR_V1_IMPL": "0x97eb05B8db496B12244BCcf17CF377d00a99b67a", + "timestamp": 1689886675, + "commit": "bdafc01" +} \ No newline at end of file diff --git a/addresses/58008.json b/addresses/58008.json new file mode 100644 index 0000000..8e88817 --- /dev/null +++ b/addresses/58008.json @@ -0,0 +1,10 @@ +{ + "DROP_METADATA_RENDERER": "0x973577d5B73a9b2508296F81260415151d0a955E", + "EDITION_METADATA_RENDERER": "0x0ef82DaB14798E63F1B99479Ba689e3f6A6fEb6C", + "ERC721DROP_IMPL": "0x48d8db63724444C6270749fEe80bBDB6CF33677f", + "FACTORY_UPGRADE_GATE": "0x97eb05B8db496B12244BCcf17CF377d00a99b67a", + "ZORA_NFT_CREATOR_PROXY": "0x418B87c2C9579d27FC3D66605545AB9889737E60", + "ZORA_NFT_CREATOR_V1_IMPL": "0x39C51a7957651ea176733F19125BD9c253894D6F", + "timestamp": 1689881298, + "commit": "4b6455d" +} \ No newline at end of file diff --git a/chainConfigs/424.json b/chainConfigs/424.json new file mode 100644 index 0000000..3d66d97 --- /dev/null +++ b/chainConfigs/424.json @@ -0,0 +1,9 @@ +{ + "FACTORY_OWNER": "0x8fbC66d36cceB3Ad69B4d672756da54CcFec1cD2", + "FACTORY_UPGRADE_GATE_OWNER": "0x8fbC66d36cceB3Ad69B4d672756da54CcFec1cD2", + "MINT_FEE_AMOUNT": 777000000000000, + "MINT_FEE_RECIPIENT": "0x95FD5d77B206cCc0B1f7D7A4077fbE8eb4fC31eF", + "SUBSCRIPTION_MARKET_FILTER_ADDRESS": "0x0000000000000000000000000000000000000000", + "SUBSCRIPTION_MARKET_FILTER_OWNER": "0x0000000000000000000000000000000000000000", + "ZORA_ERC721_TRANSFER_HELPER": "0x0000000000000000000000000000000000000000" +} diff --git a/chainConfigs/58008.json b/chainConfigs/58008.json new file mode 100644 index 0000000..33e5b3a --- /dev/null +++ b/chainConfigs/58008.json @@ -0,0 +1,9 @@ +{ + "FACTORY_OWNER": "0xfAe426B462f4Bc9857ED28D8473Fb85192f23E9b", + "FACTORY_UPGRADE_GATE_OWNER": "0xfAe426B462f4Bc9857ED28D8473Fb85192f23E9b", + "MINT_FEE_AMOUNT": 111000000000000, + "MINT_FEE_RECIPIENT": "0x917D86f1eBD1d9f59Dae1C00e5Af7f8689299EC4", + "SUBSCRIPTION_MARKET_FILTER_ADDRESS": "0x0000000000000000000000000000000000000000", + "SUBSCRIPTION_MARKET_FILTER_OWNER": "0x0000000000000000000000000000000000000000", + "ZORA_ERC721_TRANSFER_HELPER": "0x0000000000000000000000000000000000000000" +} diff --git a/foundry.toml b/foundry.toml index 43b582a..b07f1b1 100644 --- a/foundry.toml +++ b/foundry.toml @@ -21,4 +21,6 @@ optimism_goerli = "https://goerli.optimism.io" zora = "https://rpc.zora.energy" zora_goerli = "https://testnet.rpc.zora.energy" base_goerli = "https://goerli.base.org" -base = "https://developer-access-mainnet.base.org" \ No newline at end of file +base = "https://developer-access-mainnet.base.org" +pgn_sepolia = "https://sepolia.publicgoods.network" +pgn = "https://rpc.publicgoods.network" \ No newline at end of file diff --git a/script/Deploy.s.sol b/script/Deploy.s.sol index 1e55946..1712d8e 100644 --- a/script/Deploy.s.sol +++ b/script/Deploy.s.sol @@ -30,7 +30,9 @@ contract Deploy is ZoraDropsDeployBase { console2.log("Setup contracts ---"); - vm.startBroadcast(); + address deployer = vm.envAddress("DEPLOYER"); + + vm.startBroadcast(deployer); DropMetadataRenderer dropMetadata = new DropMetadataRenderer(); EditionMetadataRenderer editionMetadata = new EditionMetadataRenderer(); From b8de02e7fc62609895c0c4265229286175839e53 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 20 Jul 2023 22:46:53 -0700 Subject: [PATCH 2/3] Version Packages (#141) Co-authored-by: github-actions[bot] --- .changeset/four-onions-collect.md | 5 ----- .changeset/pretty-badgers-sneeze.md | 5 ----- CHANGELOG.md | 7 +++++++ package.json | 2 +- 4 files changed, 8 insertions(+), 11 deletions(-) delete mode 100644 .changeset/four-onions-collect.md delete mode 100644 .changeset/pretty-badgers-sneeze.md diff --git a/.changeset/four-onions-collect.md b/.changeset/four-onions-collect.md deleted file mode 100644 index eb0e211..0000000 --- a/.changeset/four-onions-collect.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@zoralabs/nft-drop-contracts': patch ---- - -Deployed to pgn sepolia diff --git a/.changeset/pretty-badgers-sneeze.md b/.changeset/pretty-badgers-sneeze.md deleted file mode 100644 index 63b781d..0000000 --- a/.changeset/pretty-badgers-sneeze.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'@zoralabs/nft-drop-contracts': patch ---- - -Added pgn mainnet diff --git a/CHANGELOG.md b/CHANGELOG.md index dca5e0f..6cfc183 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # @zoralabs/nft-drop-contracts +## 1.14.1 + +### Patch Changes + +- 3e6d7a6: Deployed to pgn sepolia +- 3e6d7a6: Added pgn mainnet + ## 1.14.0 ### Minor Changes diff --git a/package.json b/package.json index 06319b0..20dc1fa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@zoralabs/nft-drop-contracts", - "version": "1.14.0", + "version": "1.14.1", "description": "ZORA NFT Drops Contracts", "author": "ZORA", "license": "MIT", From 2c7e73e3000c1b679221b1c3c796bb87a3fbc297 Mon Sep 17 00:00:00 2001 From: Iain Nash Date: Wed, 2 Aug 2023 15:30:26 -0400 Subject: [PATCH 3/3] Update foundry toml file settings (#144) * update foundry toml file settings * update etherscan * update owner in config for optimism --- chainConfigs/10.json | 4 ++-- foundry.toml | 16 ++++++++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/chainConfigs/10.json b/chainConfigs/10.json index 61f4b64..2465ac4 100644 --- a/chainConfigs/10.json +++ b/chainConfigs/10.json @@ -1,6 +1,6 @@ { - "FACTORY_OWNER": "0x7A810DCd0f8d83B20212326813Db6EF7E9FD030c", - "FACTORY_UPGRADE_GATE_OWNER": "0x7A810DCd0f8d83B20212326813Db6EF7E9FD030c", + "FACTORY_OWNER": "0x4c7f7b6067fac9a737ecf2ca1a733fc85dd65a2b", + "FACTORY_UPGRADE_GATE_OWNER": "0x4c7f7b6067fac9a737ecf2ca1a733fc85dd65a2b", "MINT_FEE_AMOUNT": 777000000000000, "MINT_FEE_RECIPIENT": "0x7A810DCd0f8d83B20212326813Db6EF7E9FD030c", "SUBSCRIPTION_MARKET_FILTER_ADDRESS": "0x3cc6CddA760b79bAfa08dF41ECFA224f810dCeB6", diff --git a/foundry.toml b/foundry.toml index b07f1b1..c93998f 100644 --- a/foundry.toml +++ b/foundry.toml @@ -11,16 +11,28 @@ gas_reports = ['*'] fs_permissions = [{ access = "read", path = "./addresses"}, { access = "read", path = "./chainConfigs"}, { access = "read", path = "./package.json" }] +[etherscan] +zora_mainnet = { key = "", chain = 7777777, url = "https://explorer.zora.energy/api\\?" } +zora_testnet = { key = "", chain = 999, url = "https://explorer.testnet.zora.energy/api\\?" } + +pgn = { key = "", chain = 7777777, url = "https://explorer.publicgoods.network/api\\?" } +pgn_sepolia = { key = "", chain = 7777777, url = "https://explorer.sepolia.publicgoods.network/api\\?" } + [rpc_endpoints] mainnet = "https://eth-mainnet.g.alchemy.com/v2/${ALCHEMY_KEY}" goerli = "https://eth-goerli.g.alchemy.com/v2/${ALCHEMY_KEY}" + # for optimism, since we are just using this for deployment/fork testing, # we can use these since they're lower volume. + optimism = "https://mainnet.optimism.io" optimism_goerli = "https://goerli.optimism.io" + zora = "https://rpc.zora.energy" zora_goerli = "https://testnet.rpc.zora.energy" -base_goerli = "https://goerli.base.org" + base = "https://developer-access-mainnet.base.org" +base_goerli = "https://goerli.base.org" + +pgn = "https://rpc.publicgoods.network" pgn_sepolia = "https://sepolia.publicgoods.network" -pgn = "https://rpc.publicgoods.network" \ No newline at end of file