Merge branch 'main' into zora-rewards

ourzora · Aug 2, 2023 · f939e2f · f939e2f
2 parents 594e9b8 + 2c7e73e
commit f939e2f
Show file tree

Hide file tree

Showing 10 changed files with 65 additions and 7 deletions.
diff --git 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/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/addresses/424.json 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"
+}
diff --git a/addresses/58008.json 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"
+}
diff --git 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/chainConfigs/424.json 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
@@ -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
@@ -11,16 +11,27 @@ 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"
diff --git 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",

diff --git 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();