feat: protocol rewards

addresses/420.json

@@ -1,10 +1,10 @@
 {
   "DROP_METADATA_RENDERER": "0xCe6B190956D73dA045bA348743E4C1cb6652f37f",
   "EDITION_METADATA_RENDERER": "0x169007EF8fF4d2a225f361654e4B8280910fD8FC",
-  "ERC721DROP_IMPL": "0x0Cf8733DEd6d9E0905A8cCc8DC767F381A76970a",
+  "ERC721DROP_IMPL": "0x53a85FbD2955EF713AA489Ae0C48523E727a0c07",
   "FACTORY_UPGRADE_GATE": "0x9B414A3F7872bdd2E6513689214BD2Debbe48340",
   "ZORA_NFT_CREATOR_PROXY": "0x3C1ebcF36Ca9DD9371c9aA99c274e4988906c6E3",
-  "ZORA_NFT_CREATOR_V1_IMPL": "0xC5c958a65656A84b74100D1d420a1819fEA18d41",
+  "ZORA_NFT_CREATOR_V1_IMPL": "0xfFFD7409031B1aeb731271C6C2D59771523Ff8a8",
   "timestamp": 1683668679,
   "commit": "e100eee"
 }

addresses/5.json

@@ -1,12 +1,10 @@
 {
-  "ZORA_NFT_CREATOR_V1": "0xb4d319458E489825Cea8e25b5e43742BCdAFc6dd",
-  "ZORA_NFT_CREATOR_PROXY": "0xb9583D05Ba9ba8f7F14CCEe3Da10D2bc0A72f519",
   "ZORA_ERC721_TRANSFER_HELPER": "0xd1adAF05575295710dE1145c3c9427c364A70a7f",
   "ZORA_FEE_MANAGER": "0xCf5E957CA7b77EC16611992d79f4E179132ad98C",
   "EDITION_METADATA_RENDERER": "0x2f5C21EF9DdFf9A1FE76a1c55dd5112fcf2EfD39",
   "DROP_METADATA_RENDERER": "0x5956Fd16c4d8c4b4711F2551971aBB7c2F4aF677",
-  "ERC721_DROP": "0x2093eFB737C07324D8b6c5807910EFF45045D987",
+  "ERC721_DROP": "0x242f0EE150a171CC250685F19faA062D79bd3170",
   "FACTORY_UPGRADE_GATE": "0x942C03C7afE5c8118BDB728Aa06d1b894B1cD9A8",
   "ZORA_NFT_CREATOR_PROXY": "0xb9583D05Ba9ba8f7F14CCEe3Da10D2bc0A72f519",
-  "ZORA_NFT_CREATOR_V1_IMPL": "0x4328cbDAD668E81B475766520E1004e6688D2949"
+  "ZORA_NFT_CREATOR_V1_IMPL": "0x2d54733cBebb23b8a10a935f6B42Efaaa9f5d27e"
 }

addresses/84531.json

@@ -1,8 +1,8 @@
 {
   "DROP_METADATA_RENDERER": "0x0Cf8733DEd6d9E0905A8cCc8DC767F381A76970a",
   "EDITION_METADATA_RENDERER": "0xC5c958a65656A84b74100D1d420a1819fEA18d41",
-  "ERC721DROP_IMPL": "0x421B6ad0CdD20bE3636F3511B6ae244d8F668dB1",
+  "ERC721DROP_IMPL": "0x53a85FbD2955EF713AA489Ae0C48523E727a0c07",
   "FACTORY_UPGRADE_GATE": "0x3C1ebcF36Ca9DD9371c9aA99c274e4988906c6E3",
   "ZORA_NFT_CREATOR_PROXY": "0x87cfd516c5ea86e50b950678CA970a8a28de27ac",
-  "ZORA_NFT_CREATOR_V1_IMPL": "0x0ABdD5AA61E9107519DB7cD626442B905284B7eb"
+  "ZORA_NFT_CREATOR_V1_IMPL": "0xfFFD7409031B1aeb731271C6C2D59771523Ff8a8"
 }

addresses/999.json

@@ -1,8 +1,8 @@
 {
   "DROP_METADATA_RENDERER": "0xb9583D05Ba9ba8f7F14CCEe3Da10D2bc0A72f519",
   "EDITION_METADATA_RENDERER": "0x481c56e15A9B2987Bd6041043e1d807697505d23",
-  "ERC721DROP_IMPL": "0xA3Fb46092D9DAe8eAa2F99417630930F4Ee5A45a",
+  "ERC721DROP_IMPL": "0xa1F45f5B50e16E79366867E91fE45c181D18Cb67",
   "FACTORY_UPGRADE_GATE": "0x2068BA7Be6e22b97d21f5eb6e152A36d2Dc27da2",
   "ZORA_NFT_CREATOR_PROXY": "0xeB29A4e5b84fef428c072debA2444e93c080CE87",
-  "ZORA_NFT_CREATOR_V1_IMPL": "0x4589A93f2444b736E3d35acB331f5241b1c6DAD3"
+  "ZORA_NFT_CREATOR_V1_IMPL": "0x2D6d587e9B09fa01405A5816938554ccdeEf69db"
 }

chainConfigs/420.json

@@ -4,5 +4,6 @@
   "MINT_FEE_AMOUNT": 777000000000000,
   "MINT_FEE_RECIPIENT": "0x11cf5F667dC6AD4dEE58CB07e4AAc6a3fc7E1DCb",
   "SUBSCRIPTION_MARKET_FILTER_ADDRESS": "0x3cc6CddA760b79bAfa08dF41ECFA224f810dCeB6",
-  "ZORA_ERC721_TRANSFER_HELPER": "0x0000000000000000000000000000000000000000"
+  "ZORA_ERC721_TRANSFER_HELPER": "0x0000000000000000000000000000000000000000",
+  "PROTOCOL_REWARDS": "0x421B6ad0CdD20bE3636F3511B6ae244d8F668dB1"
 }

chainConfigs/5.json

@@ -4,5 +4,6 @@
   "MINT_FEE_AMOUNT": 777000000000000,
   "MINT_FEE_RECIPIENT": "0xDC498668B5e6CC518fD58A2ADBF614Fd3A13D3a0",
   "SUBSCRIPTION_MARKET_FILTER_ADDRESS": "0x3cc6CddA760b79bAfa08dF41ECFA224f810dCeB6",
-  "ZORA_ERC721_TRANSFER_HELPER": "0xd1adAF05575295710dE1145c3c9427c364A70a7f"
+  "ZORA_ERC721_TRANSFER_HELPER": "0xd1adAF05575295710dE1145c3c9427c364A70a7f",
+  "PROTOCOL_REWARDS": "0x8Ca5e648C5dFEfcdDa06d627F4b490B719ccFD98"
 }

chainConfigs/84531.json

@@ -4,5 +4,6 @@
   "MINT_FEE_AMOUNT": 111000000000000,
   "MINT_FEE_RECIPIENT": "0x02539E813cA450C2c7334e885423f4A899a063Fe",
   "SUBSCRIPTION_MARKET_FILTER_ADDRESS": "0x9B414A3F7872bdd2E6513689214BD2Debbe48340",
-  "ZORA_ERC721_TRANSFER_HELPER": "0xd1adAF05575295710dE1145c3c9427c364A70a7f"
+  "ZORA_ERC721_TRANSFER_HELPER": "0xd1adAF05575295710dE1145c3c9427c364A70a7f",
+  "PROTOCOL_REWARDS": "0xd34872BE0cdb6b09d45FCa067B07f04a1A9aE1aE"
 }

chainConfigs/999.json

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

foundry.toml

@@ -1,7 +1,7 @@
 [profile.default]
 solc_version = '0.8.17'
 optimizer = true
-optimizer_runs = 2383
+optimizer_runs = 500
 via_ir = true
 out = 'out'
 test = 'test'
@@ -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"
+base = "https://developer-access-mainnet.base.org"
+pgn_sepolia = "https://sepolia.publicgoods.network"
+pgn = "https://rpc.publicgoods.network"

package.json

@@ -51,6 +51,7 @@
   },
   "dependencies": {
     "@dotenv/cli": "^2.2.2",
+    "@zoralabs/protocol-rewards": "^1.0.1",
     "ds-test": "https://github.com/dapphub/ds-test#cd98eff28324bfac652e63a239a60632a761790b",
     "forge-std": "https://github.com/foundry-rs/forge-std#cd7d533f9a0ee0ec02ad81e0a8f262bc4203c653"
   }

remappings.txt

@@ -4,3 +4,4 @@ erc721a-upgradeable=lib/ERC721A-Upgradeable/contracts/
 base64/=lib/base64/
 ds-test/=node_modules/ds-test/src/
 forge-std/=node_modules/forge-std/src/
+@zoralabs/protocol-rewards/=node_modules/@zoralabs/protocol-rewards/

script/Deploy.s.sol

@@ -41,7 +41,8 @@ contract Deploy is ZoraDropsDeployBase {
             _factoryUpgradeGate: factoryUpgradeGate,
             _marketFilterDAOAddress: address(chainConfig.subscriptionMarketFilterAddress),
             _mintFeeAmount: chainConfig.mintFeeAmount,
-            _mintFeeRecipient: payable(chainConfig.mintFeeRecipient)
+            _mintFeeRecipient: payable(chainConfig.mintFeeRecipient),
+            _protocolRewards: address(chainConfig.protocolRewards)
         });
 
         ZoraNFTCreatorV1 factoryImpl = new ZoraNFTCreatorV1(address(dropImplementation), editionMetadata, dropMetadata);

script/TestUpgradeAndMint.s.sol

@@ -22,6 +22,8 @@ import {ERC721DropProxy} from "../src/ERC721DropProxy.sol";
 contract DeployNewERC721Drop is Script {
     using Strings for uint256;
 
+    address internal DEFAULT_CREATE_REFERRAL = address(0);
+
     string configFile;
 
     function _getKey(string memory key) internal returns (address result) {

script/UpgradeERC721DropFactory.s.sol

@@ -59,7 +59,8 @@ contract UpgradeERC721DropFactory is ZoraDropsDeployBase {
             _factoryUpgradeGate: IFactoryUpgradeGate(deployment.factoryUpgradeGate),
             _marketFilterDAOAddress: chainConfig.subscriptionMarketFilterAddress,
             _mintFeeAmount: chainConfig.mintFeeAmount,
-            _mintFeeRecipient: payable(chainConfig.mintFeeRecipient)
+            _mintFeeRecipient: payable(chainConfig.mintFeeRecipient),
+            _protocolRewards: chainConfig.protocolRewards
         });
 
         deployment.dropImplementation = address(dropImplementation);

script/ZoraDropsDeployBase.sol

@@ -9,7 +9,7 @@ import {IERC721Drop} from "../src/interfaces/IERC721Drop.sol";
 
 /// @notice Deployment drops for base where 
 abstract contract ZoraDropsDeployBase is ScriptDeploymentConfig {
-
+    
     /// @notice Get deployment configuration struct as JSON
     /// @param deployment deploymet struct
     /// @return deploymentJson string JSON of the deployment info

src/DeploymentConfig.sol

@@ -22,6 +22,8 @@ struct ChainConfig {
     address subscriptionMarketFilterOwner;
     /// @notice Auto-approved hyperstructure on mainnet for enabling ZORA v3 with less gas. Deprecated – safe to set to address(0x)
     address zoraERC721TransferHelper;
+    /// @notice The Protocol Rewards contract
+    address protocolRewards;
 }
 
 /// @notice Deployment addresses – set to new deployed addresses by the scripts.
@@ -51,6 +53,8 @@ abstract contract DeploymentConfig is StdChains, StdCheatsSafe, StdUtils, Script
     /// @notice File used for demo metadata on verification test mint
     string constant DEMO_IPFS_METADATA_FILE = "ipfs://bafkreigu544g6wjvqcysurpzy5pcskbt45a5f33m6wgythpgb3rfqi3lzi";
 
+    address constant DEFAULT_CREATE_REFERRAL = address(0);
+
     ///
     // These are the JSON key constants to standardize writing and reading configuration
     ///
@@ -62,6 +66,7 @@ abstract contract DeploymentConfig is StdChains, StdCheatsSafe, StdUtils, Script
     string constant SUBSCRIPTION_MARKET_FILTER_ADDRESS = "SUBSCRIPTION_MARKET_FILTER_ADDRESS";
     string constant SUBSCRIPTION_MARKET_FILTER_OWNER = "SUBSCRIPTION_MARKET_FILTER_OWNER";
     string constant ZORA_ERC721_TRANSFER_HELPER = "ZORA_ERC721_TRANSFER_HELPER";
+    string constant PROTOCOL_REWARDS = "PROTOCOL_REWARDS";
 
     string constant DROP_METADATA_RENDERER = "DROP_METADATA_RENDERER";
     string constant EDITION_METADATA_RENDERER = "EDITION_METADATA_RENDERER";
@@ -88,6 +93,7 @@ abstract contract DeploymentConfig is StdChains, StdCheatsSafe, StdUtils, Script
         chainConfig.subscriptionMarketFilterAddress = json.readAddress(getKeyPrefix(SUBSCRIPTION_MARKET_FILTER_ADDRESS));
         chainConfig.subscriptionMarketFilterOwner = json.readAddress(getKeyPrefix(SUBSCRIPTION_MARKET_FILTER_OWNER));
         chainConfig.zoraERC721TransferHelper = json.readAddress(getKeyPrefix(ZORA_ERC721_TRANSFER_HELPER));
+        chainConfig.protocolRewards = json.readAddress(getKeyPrefix(PROTOCOL_REWARDS));
     }
 
     /// @notice Get the deployment configuration struct from the JSON configuration file