rebase merge fixes

.changeset/config.json

@@ -4,7 +4,7 @@
   "commit": false,
   "fixed": [],
   "linked": [],
-  "access": "restricted",
+  "access": "public",
   "baseBranch": "main",
   "updateInternalDependencies": "patch",
   "ignore": []

.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

.storage-layout

@@ -31,6 +31,7 @@
 | salesConfig           | struct IERC721Drop.SalesConfiguration                         | 354  | 0      | 96    | src/ERC721Drop.sol:ERC721Drop |
 | presaleMintsByAddress | mapping(address => uint256)                                   | 357  | 0      | 32    | src/ERC721Drop.sol:ERC721Drop |
 | royaltyMintSchedule   | uint32                                                        | 358  | 0      | 4     | src/ERC721Drop.sol:ERC721Drop |
+| createReferral        | address                                                       | 358  | 4      | 20    | src/ERC721Drop.sol:ERC721Drop |
 
 =======================
 ➡ ERC721DropProxy

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

DEPLOYING.md

@@ -7,17 +7,6 @@ Make sure required addresses / multisigs are setup for
 1. funds recipient
 2. contract factory upgrade owner address
 
-Ensure that the default operator-filterer-registry deployment is on the current chain.
-
-If not, use the mainnet default filter address to re-deploy on the chain using ImmutableCreate2Factory (required also for seaport).
-
-To deploy ImmutableCreate2Factory, follow the steps in the seaport deploy scripts: https://github.com/ProjectOpenSea/seaport/blob/main/docs/Deployment.md#setting-up-factory-on-a-new-chain
-
-example call:
-cast send 0x0000000000FFe8B47B3e2130213B802212439497 'function safeCreate2(bytes32,bytes)' [...] --rpc-url $(rpc base) --interactive
-
-copied from the mainnet deploy txn: https://etherscan.io/tx/0x4c2038f55147cae309c2e597a5323b42b63fd556a15d2f1b5a799eee1b3ddf04
-
 ### 1. Setup `chainConfigs` file.
 
 Use `1.json` for reference. We are ordering keys alphabetically.

addresses/1.json

@@ -1,8 +1,9 @@
 {
   "DROP_METADATA_RENDERER": "0x5914d9a241008b9f02f22811bf3a77e02b84d226",
   "EDITION_METADATA_RENDERER": "0x192ce8267cbab9c3c477d61e85d7f0c5fe3b46af",
-  "ERC721DROP_IMPL": "0x419074d73Cf0852e46b8531b430B1230C348C291",
+  "ERC721DROP_IMPL": "0x8237F421357F87a23ed0CFf3a5586172F210A21B",
+  "ERC721DROP_IMPL_VERSION": 14,
   "FACTORY_UPGRADE_GATE": "0x8Da5aC3A39D3B8BCaA1FC15A01506cf4F5e79830",
   "ZORA_NFT_CREATOR_PROXY": "0xF74B146ce44CC162b601deC3BE331784DB111DC1",
-  "ZORA_NFT_CREATOR_V1_IMPL": "0xa6a2956fa075d50b021385478A99f3642dAfCc2C"
+  "ZORA_NFT_CREATOR_V1_IMPL": "0x932A29Dbfc1B8c3BdfC763eF53F113486A5b5E7D"
 }

addresses/10.json

@@ -1,10 +1,11 @@
 {
   "DROP_METADATA_RENDERER": "0x96CcF205A366E15E261d77B14586389f80a029e9",
   "EDITION_METADATA_RENDERER": "0xa2a7D8bcE0bf58D177137ECB94f3Fa6aA06aA7A1",
-  "ERC721DROP_IMPL": "0x46E772210f01647FA573b915bE287Ff9b65AD4B0",
+  "ERC721DROP_IMPL": "0x3E8524770adD176bE381a0529E09f1c6c3502A5a",
+  "ERC721DROP_IMPL_VERSION": 14,
   "FACTORY_UPGRADE_GATE": "0x192D663C3D6813a24a24582A76B8d872c4F6F7f9",
   "ZORA_NFT_CREATOR_PROXY": "0x7d1a46c6e614A0091c39E102F2798C27c1fA8892",
-  "ZORA_NFT_CREATOR_V1_IMPL": "0xd1cba36d92B052079523F471Eb891563F2E5dF5C",
+  "ZORA_NFT_CREATOR_V1_IMPL": "0x805E0a08dE70f85C01F7848370d5e3fc08aAd0ea",
   "timestamp": 1683682873,
   "commit": "8b52993"
 }

addresses/11155111.json

@@ -2,6 +2,7 @@
   "DROP_METADATA_RENDERER": "0x0Cf8733DEd6d9E0905A8cCc8DC767F381A76970a",
   "EDITION_METADATA_RENDERER": "0xC5c958a65656A84b74100D1d420a1819fEA18d41",
   "ERC721DROP_IMPL": "0xF706f5A8030C1e7D344D2Ef32Dff6B8568B3d07B",
+  "ERC721DROP_IMPL_VERSION": 11,
   "FACTORY_UPGRADE_GATE": "0x3C1ebcF36Ca9DD9371c9aA99c274e4988906c6E3",
   "ZORA_NFT_CREATOR_PROXY": "0x87cfd516c5ea86e50b950678CA970a8a28de27ac",
   "ZORA_NFT_CREATOR_V1_IMPL": "0x96315ee3C58d16A40DA8Ee05008bA1F6654ea358"

addresses/420.json

@@ -1,10 +1,11 @@
 {
   "DROP_METADATA_RENDERER": "0xCe6B190956D73dA045bA348743E4C1cb6652f37f",
   "EDITION_METADATA_RENDERER": "0x169007EF8fF4d2a225f361654e4B8280910fD8FC",
-  "ERC721DROP_IMPL": "0x53a85FbD2955EF713AA489Ae0C48523E727a0c07",
+  "ERC721DROP_IMPL": "0x61Cb091f8EC70029E393D31BA8F6D533c1308408",
+  "ERC721DROP_IMPL_VERSION": 14,
   "FACTORY_UPGRADE_GATE": "0x9B414A3F7872bdd2E6513689214BD2Debbe48340",
   "ZORA_NFT_CREATOR_PROXY": "0x3C1ebcF36Ca9DD9371c9aA99c274e4988906c6E3",
-  "ZORA_NFT_CREATOR_V1_IMPL": "0xfFFD7409031B1aeb731271C6C2D59771523Ff8a8",
+  "ZORA_NFT_CREATOR_V1_IMPL": "0xbe83E15eED1FD666C241960f50549bE9D639743c",
   "timestamp": 1683668679,
   "commit": "e100eee"
 }

addresses/424.json

@@ -0,0 +1,11 @@
+{
+  "DROP_METADATA_RENDERER": "0xd77783B9df27BC9ABd438d1ddE67e3afB64618e0",
+  "EDITION_METADATA_RENDERER": "0xC647382DFbb02ddf39dde7fDEbb5D844a832BE33",
+  "ERC721DROP_IMPL": "0x0ef82DaB14798E63F1B99479Ba689e3f6A6fEb6C",
+  "ERC721DROP_IMPL_VERSION": 13,
+  "FACTORY_UPGRADE_GATE": "0x973577d5B73a9b2508296F81260415151d0a955E",
+  "ZORA_NFT_CREATOR_PROXY": "0x48d8db63724444C6270749fEe80bBDB6CF33677f",
+  "ZORA_NFT_CREATOR_V1_IMPL": "0x97eb05B8db496B12244BCcf17CF377d00a99b67a",
+  "timestamp": 1689886675,
+  "commit": "bdafc01"
+}

addresses/5.json

@@ -3,8 +3,9 @@
   "ZORA_FEE_MANAGER": "0xCf5E957CA7b77EC16611992d79f4E179132ad98C",
   "EDITION_METADATA_RENDERER": "0x2f5C21EF9DdFf9A1FE76a1c55dd5112fcf2EfD39",
   "DROP_METADATA_RENDERER": "0x5956Fd16c4d8c4b4711F2551971aBB7c2F4aF677",
-  "ERC721_DROP": "0x242f0EE150a171CC250685F19faA062D79bd3170",
+  "ERC721DROP_IMPL": "0xe4c17055048aEe01D0d122804816fEe5E6ac4A67",
+  "ERC721DROP_IMPL_VERSION": 14,
   "FACTORY_UPGRADE_GATE": "0x942C03C7afE5c8118BDB728Aa06d1b894B1cD9A8",
   "ZORA_NFT_CREATOR_PROXY": "0xb9583D05Ba9ba8f7F14CCEe3Da10D2bc0A72f519",
-  "ZORA_NFT_CREATOR_V1_IMPL": "0x2d54733cBebb23b8a10a935f6B42Efaaa9f5d27e"
+  "ZORA_NFT_CREATOR_V1_IMPL": "0x0209aAEC870BE5C1cC243eE18eF6e80d545e9F32"
 }

addresses/58008.json

@@ -0,0 +1,11 @@
+{
+  "DROP_METADATA_RENDERER": "0x973577d5B73a9b2508296F81260415151d0a955E",
+  "EDITION_METADATA_RENDERER": "0x0ef82DaB14798E63F1B99479Ba689e3f6A6fEb6C",
+  "ERC721DROP_IMPL": "0x48d8db63724444C6270749fEe80bBDB6CF33677f",
+  "ERC721DROP_IMPL_VERSION": 13,
+  "FACTORY_UPGRADE_GATE": "0x97eb05B8db496B12244BCcf17CF377d00a99b67a",
+  "ZORA_NFT_CREATOR_PROXY": "0x418B87c2C9579d27FC3D66605545AB9889737E60",
+  "ZORA_NFT_CREATOR_V1_IMPL": "0x39C51a7957651ea176733F19125BD9c253894D6F",
+  "timestamp": 1689881298,
+  "commit": "4b6455d"
+}

addresses/7777777.json

@@ -1,10 +1,11 @@
 {
   "DROP_METADATA_RENDERER": "0x4A0ad3Ef9bE8095590D854bC8481C9E50922a3c0",
   "EDITION_METADATA_RENDERER": "0xCA7bF48453B72e4E175267127B4Ed7EB12F83b93",
-  "ERC721DROP_IMPL": "0x8ee55A8598EC2CE412a476890695fa0E7154510c",
+  "ERC721DROP_IMPL": "0x53a85FbD2955EF713AA489Ae0C48523E727a0c07",
+  "ERC721DROP_IMPL_VERSION": 14,
   "FACTORY_UPGRADE_GATE": "0x446A4135FB31007064107EFfDC15B8843B72B6F6",
   "ZORA_NFT_CREATOR_PROXY": "0xA2c2A96A232113Dd4993E8b048EEbc3371AE8d85",
-  "ZORA_NFT_CREATOR_V1_IMPL": "0xe7763512099a9C2567a40a669aA9F48FF8493455",
+  "ZORA_NFT_CREATOR_V1_IMPL": "0xfFFD7409031B1aeb731271C6C2D59771523Ff8a8",
   "timestamp": 1686787866,
   "commit": "87735a2"
 }

addresses/8453.json

@@ -1,10 +1,11 @@
 {
   "DROP_METADATA_RENDERER": "0xF77330C8b1c41f2e44470763Cf9E3ACa78Db4381",
   "EDITION_METADATA_RENDERER": "0x2008C05685F9fA15BBD75d80e9A44ab0c7230577",
-  "ERC721DROP_IMPL": "0x3F155E58AcA1AE60e4FEce2753CC6B363525042c",
+  "ERC721DROP_IMPL": "0x8Ca5e648C5dFEfcdDa06d627F4b490B719ccFD98",
+  "ERC721DROP_IMPL_VERSION": 14,
   "FACTORY_UPGRADE_GATE": "0x532142aE8e53a5F92B9dE1a43F1FFD6eF789e65e",
   "ZORA_NFT_CREATOR_PROXY": "0x58C3ccB2dcb9384E5AB9111CD1a5DEA916B0f33c",
-  "ZORA_NFT_CREATOR_V1_IMPL": "0xba187429b966788B5C11a99A848938c88DfDFf5C",
+  "ZORA_NFT_CREATOR_V1_IMPL": "0x76CC78EF3aafD52e716a8e37F3dBbE0C42c51d54",
   "timestamp": 1689712140,
   "commit": "a9e390f"
 }

addresses/84531.json

@@ -1,8 +1,9 @@
 {
   "DROP_METADATA_RENDERER": "0x0Cf8733DEd6d9E0905A8cCc8DC767F381A76970a",
   "EDITION_METADATA_RENDERER": "0xC5c958a65656A84b74100D1d420a1819fEA18d41",
-  "ERC721DROP_IMPL": "0x53a85FbD2955EF713AA489Ae0C48523E727a0c07",
+  "ERC721DROP_IMPL": "0x39Bcc1e15b8ec15684F17fEf298151F4A544B591",
+  "ERC721DROP_IMPL_VERSION": 14,
   "FACTORY_UPGRADE_GATE": "0x3C1ebcF36Ca9DD9371c9aA99c274e4988906c6E3",
   "ZORA_NFT_CREATOR_PROXY": "0x87cfd516c5ea86e50b950678CA970a8a28de27ac",
-  "ZORA_NFT_CREATOR_V1_IMPL": "0xfFFD7409031B1aeb731271C6C2D59771523Ff8a8"
+  "ZORA_NFT_CREATOR_V1_IMPL": "0x489f8fFbd5f5eA8875c2EbC5CA9ED1214BD77F42"
 }

addresses/999.json

@@ -1,8 +1,9 @@
 {
   "DROP_METADATA_RENDERER": "0xb9583D05Ba9ba8f7F14CCEe3Da10D2bc0A72f519",
   "EDITION_METADATA_RENDERER": "0x481c56e15A9B2987Bd6041043e1d807697505d23",
-  "ERC721DROP_IMPL": "0xa1F45f5B50e16E79366867E91fE45c181D18Cb67",
+  "ERC721DROP_IMPL": "0x293997C6a1f2A1cA3aB971f548c4D95585E46282",
+  "ERC721DROP_IMPL_VERSION": 14,
   "FACTORY_UPGRADE_GATE": "0x2068BA7Be6e22b97d21f5eb6e152A36d2Dc27da2",
   "ZORA_NFT_CREATOR_PROXY": "0xeB29A4e5b84fef428c072debA2444e93c080CE87",
-  "ZORA_NFT_CREATOR_V1_IMPL": "0x2D6d587e9B09fa01405A5816938554ccdeEf69db"
+  "ZORA_NFT_CREATOR_V1_IMPL": "0xe4c17055048aEe01D0d122804816fEe5E6ac4A67"
 }

chainConfigs/1.json

@@ -4,5 +4,6 @@
   "MINT_FEE_AMOUNT": 777000000000000,
   "MINT_FEE_RECIPIENT": "0xd1d1D4e36117aB794ec5d4c78cBD3a8904E691D0",
   "SUBSCRIPTION_MARKET_FILTER_ADDRESS": "0x3cc6CddA760b79bAfa08dF41ECFA224f810dCeB6",
-  "ZORA_ERC721_TRANSFER_HELPER": "0x909e9efE4D87d1a6018C2065aE642b6D0447bc91"
+  "ZORA_ERC721_TRANSFER_HELPER": "0x909e9efE4D87d1a6018C2065aE642b6D0447bc91",
+  "PROTOCOL_REWARDS": "0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B"
 }

chainConfigs/10.json

@@ -1,8 +1,9 @@
 {
-  "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",
-  "ZORA_ERC721_TRANSFER_HELPER": "0x0000000000000000000000000000000000000000"
+  "ZORA_ERC721_TRANSFER_HELPER": "0x0000000000000000000000000000000000000000",
+  "PROTOCOL_REWARDS": "0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B"
 }

chainConfigs/11155111.json

@@ -1,7 +1,7 @@
 {
   "FACTORY_OWNER": "0xE51051a204afb2fC071A2406914cdEA5638e5018",
   "FACTORY_UPGRADE_GATE_OWNER": "0xE51051a204afb2fC071A2406914cdEA5638e5018",
-  "MINT_FEE_AMOUNT": 111000000000000,
+  "MINT_FEE_AMOUNT": 777000000000000,
   "MINT_FEE_RECIPIENT": "0xE51051a204afb2fC071A2406914cdEA5638e5018",
   "SUBSCRIPTION_MARKET_FILTER_ADDRESS": "0x9B414A3F7872bdd2E6513689214BD2Debbe48340",
   "SUBSCRIPTION_MARKET_FILTER_OWNER": "0xE51051a204afb2fC071A2406914cdEA5638e5018",

chainConfigs/420.json

@@ -5,5 +5,5 @@
   "MINT_FEE_RECIPIENT": "0x11cf5F667dC6AD4dEE58CB07e4AAc6a3fc7E1DCb",
   "SUBSCRIPTION_MARKET_FILTER_ADDRESS": "0x3cc6CddA760b79bAfa08dF41ECFA224f810dCeB6",
   "ZORA_ERC721_TRANSFER_HELPER": "0x0000000000000000000000000000000000000000",
-  "PROTOCOL_REWARDS": "0x421B6ad0CdD20bE3636F3511B6ae244d8F668dB1"
+  "PROTOCOL_REWARDS": "0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B"
 }

chainConfigs/424.json

@@ -0,0 +1,10 @@
+{
+  "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",
+  "PROTOCOL_REWARDS": "0x7777777A456fF23D9b6851184472c08FBDa73e32"
+}

chainConfigs/5.json

@@ -5,5 +5,5 @@
   "MINT_FEE_RECIPIENT": "0xDC498668B5e6CC518fD58A2ADBF614Fd3A13D3a0",
   "SUBSCRIPTION_MARKET_FILTER_ADDRESS": "0x3cc6CddA760b79bAfa08dF41ECFA224f810dCeB6",
   "ZORA_ERC721_TRANSFER_HELPER": "0xd1adAF05575295710dE1145c3c9427c364A70a7f",
-  "PROTOCOL_REWARDS": "0x8Ca5e648C5dFEfcdDa06d627F4b490B719ccFD98"
+  "PROTOCOL_REWARDS": "0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B"
 }

chainConfigs/58008.json

@@ -0,0 +1,9 @@
+{
+  "FACTORY_OWNER": "0xfAe426B462f4Bc9857ED28D8473Fb85192f23E9b",
+  "FACTORY_UPGRADE_GATE_OWNER": "0xfAe426B462f4Bc9857ED28D8473Fb85192f23E9b",
+  "MINT_FEE_AMOUNT": 777000000000000,
+  "MINT_FEE_RECIPIENT": "0x917D86f1eBD1d9f59Dae1C00e5Af7f8689299EC4",
+  "SUBSCRIPTION_MARKET_FILTER_ADDRESS": "0x0000000000000000000000000000000000000000",
+  "SUBSCRIPTION_MARKET_FILTER_OWNER": "0x0000000000000000000000000000000000000000",
+  "ZORA_ERC721_TRANSFER_HELPER": "0x0000000000000000000000000000000000000000"
+}

chainConfigs/7777777.json

@@ -4,5 +4,6 @@
     "MINT_FEE_AMOUNT": 777000000000000,
     "MINT_FEE_RECIPIENT": "0xEcfc2ee50409E459c554a2b0376F882Ce916D853",
     "SUBSCRIPTION_MARKET_FILTER_ADDRESS": "0x0000000000000000000000000000000000000000",
-    "ZORA_ERC721_TRANSFER_HELPER": "0x0000000000000000000000000000000000000000"
+    "ZORA_ERC721_TRANSFER_HELPER": "0x0000000000000000000000000000000000000000",
+    "PROTOCOL_REWARDS": "0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B"
   }

chainConfigs/8453.json

@@ -4,5 +4,6 @@
   "MINT_FEE_AMOUNT": 777000000000000,
   "MINT_FEE_RECIPIENT": "0x7bf90111Ad7C22bec9E9dFf8A01A44713CC1b1B6",
   "SUBSCRIPTION_MARKET_FILTER_ADDRESS": "0x000000000000AAeB6D7670E522A718067333cd4E",
-  "ZORA_ERC721_TRANSFER_HELPER": "0x0000000000000000000000000000000000000000"
+  "ZORA_ERC721_TRANSFER_HELPER": "0x0000000000000000000000000000000000000000",
+  "PROTOCOL_REWARDS": "0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B"
 }

chainConfigs/84531.json

@@ -1,9 +1,9 @@
 {
   "FACTORY_OWNER": "0x02539E813cA450C2c7334e885423f4A899a063Fe",
   "FACTORY_UPGRADE_GATE_OWNER": "0x02539E813cA450C2c7334e885423f4A899a063Fe",
-  "MINT_FEE_AMOUNT": 111000000000000,
+  "MINT_FEE_AMOUNT": 777000000000000,
   "MINT_FEE_RECIPIENT": "0x02539E813cA450C2c7334e885423f4A899a063Fe",
   "SUBSCRIPTION_MARKET_FILTER_ADDRESS": "0x9B414A3F7872bdd2E6513689214BD2Debbe48340",
   "ZORA_ERC721_TRANSFER_HELPER": "0xd1adAF05575295710dE1145c3c9427c364A70a7f",
-  "PROTOCOL_REWARDS": "0xd34872BE0cdb6b09d45FCa067B07f04a1A9aE1aE"
+  "PROTOCOL_REWARDS": "0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B"
 }

chainConfigs/999.json

@@ -5,5 +5,5 @@
   "MINT_FEE_RECIPIENT": "0x11cf5F667dC6AD4dEE58CB07e4AAc6a3fc7E1DCb",
   "SUBSCRIPTION_MARKET_FILTER_ADDRESS": "0x0000000000000000000000000000000000000000",
   "ZORA_ERC721_TRANSFER_HELPER": "0x0000000000000000000000000000000000000000",
-  "PROTOCOL_REWARDS": "0xF62b0d56BA617F803DF1C464C519FF7D29451B2f"
+  "PROTOCOL_REWARDS": "0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B"
 }

foundry.toml

@@ -11,16 +11,30 @@ gas_reports = ['*']
 
 fs_permissions = [{ access = "read", path = "./addresses"}, { access = "read", path = "./chainConfigs"}, { access = "read", path = "./package.json" }]
 
+[etherscan]
+optimism = { key = "$OPT_ETHERSCAN_API_KEY" }
+base = { key = "ANY_KEY_IS_OKAY" }
+mainnet = { key = "$ETHERSCAN_API_KEY" }
+
+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"
+
+optimism = "https://opt-mainnet.g.alchemy.com/v2/${ALCHEMY_KEY}"
+optimism_goerli = "https://opt-goerli.g.alchemy.com/v2/${ALCHEMY_KEY}"
+
 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"
 pgn_sepolia = "https://sepolia.publicgoods.network"
 pgn = "https://rpc.publicgoods.network"
+base = "https://base-mainnet.g.alchemy.com/v2/${ALCHEMY_KEY}"
+base_goerli = "https://base-goerli.g.alchemy.com/v2/${ALCHEMY_KEY}"
+pgn = "https://rpc.publicgoods.network"
+pgn_sepolia = "https://sepolia.publicgoods.network"

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",
@@ -51,7 +51,11 @@
   },
   "dependencies": {
     "@dotenv/cli": "^2.2.2",
+<<<<<<< HEAD
     "@zoralabs/protocol-rewards": "^1.0.1",
+=======
+    "@zoralabs/protocol-rewards": "^1.0.2",
+>>>>>>> origin/main
     "ds-test": "https://github.com/dapphub/ds-test#cd98eff28324bfac652e63a239a60632a761790b",
     "forge-std": "https://github.com/foundry-rs/forge-std#cd7d533f9a0ee0ec02ad81e0a8f262bc4203c653"
   }