diff --git a/DEPLOYING.md b/DEPLOYING.md index 6e82394..2a2760b 100644 --- a/DEPLOYING.md +++ b/DEPLOYING.md @@ -35,8 +35,6 @@ Use `1.json` for reference. We are ordering keys alphabetically. # subscription market filter address for operator filter registry. # can be set to 0 to disable. see: https://github.com/ProjectOpenSea/operator-filter-registry "SUBSCRIPTION_MARKET_FILTER_ADDRESS": "0x3cc6CddA760b79bAfa08dF41ECFA224f810dCeB6", - # subscription market filter owner address. - "SUBSCRIPTION_MARKET_FILTER_OWNER": "0x9AaC739c133074dB445183A95149880a2156541A", # pre-approved transfer helper for ZORA v3, likely should be 0 on new networks "ZORA_ERC721_TRANSFER_HELPER": "0x909e9efE4D87d1a6018C2065aE642b6D0447bc91" } diff --git a/chainConfigs/1.json b/chainConfigs/1.json index 4e1eef1..2eed09a 100644 --- a/chainConfigs/1.json +++ b/chainConfigs/1.json @@ -4,6 +4,5 @@ "MINT_FEE_AMOUNT": 777000000000000, "MINT_FEE_RECIPIENT": "0xd1d1D4e36117aB794ec5d4c78cBD3a8904E691D0", "SUBSCRIPTION_MARKET_FILTER_ADDRESS": "0x3cc6CddA760b79bAfa08dF41ECFA224f810dCeB6", - "SUBSCRIPTION_MARKET_FILTER_OWNER": "0x9AaC739c133074dB445183A95149880a2156541A", "ZORA_ERC721_TRANSFER_HELPER": "0x909e9efE4D87d1a6018C2065aE642b6D0447bc91" } diff --git a/chainConfigs/10.json b/chainConfigs/10.json index 0062c92..61f4b64 100644 --- a/chainConfigs/10.json +++ b/chainConfigs/10.json @@ -4,6 +4,5 @@ "MINT_FEE_AMOUNT": 777000000000000, "MINT_FEE_RECIPIENT": "0x7A810DCd0f8d83B20212326813Db6EF7E9FD030c", "SUBSCRIPTION_MARKET_FILTER_ADDRESS": "0x3cc6CddA760b79bAfa08dF41ECFA224f810dCeB6", - "SUBSCRIPTION_MARKET_FILTER_OWNER": "0xe3A6CD067a1193b903143C36dA00557c9d95C41e", "ZORA_ERC721_TRANSFER_HELPER": "0x0000000000000000000000000000000000000000" } diff --git a/chainConfigs/420.json b/chainConfigs/420.json index 6af76c2..b75a240 100644 --- a/chainConfigs/420.json +++ b/chainConfigs/420.json @@ -4,6 +4,5 @@ "MINT_FEE_AMOUNT": 777000000000000, "MINT_FEE_RECIPIENT": "0x11cf5F667dC6AD4dEE58CB07e4AAc6a3fc7E1DCb", "SUBSCRIPTION_MARKET_FILTER_ADDRESS": "0x3cc6CddA760b79bAfa08dF41ECFA224f810dCeB6", - "SUBSCRIPTION_MARKET_FILTER_OWNER": "0xe3A6CD067a1193b903143C36dA00557c9d95C41e", "ZORA_ERC721_TRANSFER_HELPER": "0x0000000000000000000000000000000000000000" } diff --git a/chainConfigs/5.json b/chainConfigs/5.json index 7daac2a..f73d6fc 100644 --- a/chainConfigs/5.json +++ b/chainConfigs/5.json @@ -4,6 +4,5 @@ "MINT_FEE_AMOUNT": 777000000000000, "MINT_FEE_RECIPIENT": "0xDC498668B5e6CC518fD58A2ADBF614Fd3A13D3a0", "SUBSCRIPTION_MARKET_FILTER_ADDRESS": "0x3cc6CddA760b79bAfa08dF41ECFA224f810dCeB6", - "SUBSCRIPTION_MARKET_FILTER_OWNER": "0x9AaC739c133074dB445183A95149880a2156541A", "ZORA_ERC721_TRANSFER_HELPER": "0xd1adAF05575295710dE1145c3c9427c364A70a7f" } diff --git a/chainConfigs/7777777.json b/chainConfigs/7777777.json index 6133103..f9f8908 100644 --- a/chainConfigs/7777777.json +++ b/chainConfigs/7777777.json @@ -4,6 +4,5 @@ "MINT_FEE_AMOUNT": 777000000000000, "MINT_FEE_RECIPIENT": "0xEcfc2ee50409E459c554a2b0376F882Ce916D853", "SUBSCRIPTION_MARKET_FILTER_ADDRESS": "0x0000000000000000000000000000000000000000", - "SUBSCRIPTION_MARKET_FILTER_OWNER": "0x0000000000000000000000000000000000000000", "ZORA_ERC721_TRANSFER_HELPER": "0x0000000000000000000000000000000000000000" } \ No newline at end of file diff --git a/chainConfigs/8453.json b/chainConfigs/8453.json index b7ef558..916b019 100644 --- a/chainConfigs/8453.json +++ b/chainConfigs/8453.json @@ -4,6 +4,5 @@ "MINT_FEE_AMOUNT": 777000000000000, "MINT_FEE_RECIPIENT": "0x7bf90111Ad7C22bec9E9dFf8A01A44713CC1b1B6", "SUBSCRIPTION_MARKET_FILTER_ADDRESS": "0x000000000000AAeB6D7670E522A718067333cd4E", - "SUBSCRIPTION_MARKET_FILTER_OWNER": "0x3cc6CddA760b79bAfa08dF41ECFA224f810dCeB6", "ZORA_ERC721_TRANSFER_HELPER": "0x0000000000000000000000000000000000000000" } diff --git a/chainConfigs/84531.json b/chainConfigs/84531.json index 7b51a6e..7a45789 100644 --- a/chainConfigs/84531.json +++ b/chainConfigs/84531.json @@ -4,6 +4,5 @@ "MINT_FEE_AMOUNT": 111000000000000, "MINT_FEE_RECIPIENT": "0x02539E813cA450C2c7334e885423f4A899a063Fe", "SUBSCRIPTION_MARKET_FILTER_ADDRESS": "0x9B414A3F7872bdd2E6513689214BD2Debbe48340", - "SUBSCRIPTION_MARKET_FILTER_OWNER": "0x02539E813cA450C2c7334e885423f4A899a063Fe", "ZORA_ERC721_TRANSFER_HELPER": "0xd1adAF05575295710dE1145c3c9427c364A70a7f" } diff --git a/chainConfigs/999.json b/chainConfigs/999.json index c3a04d0..a84c849 100644 --- a/chainConfigs/999.json +++ b/chainConfigs/999.json @@ -4,6 +4,5 @@ "MINT_FEE_AMOUNT": 777000000000000, "MINT_FEE_RECIPIENT": "0x11cf5F667dC6AD4dEE58CB07e4AAc6a3fc7E1DCb", "SUBSCRIPTION_MARKET_FILTER_ADDRESS": "0x0000000000000000000000000000000000000000", - "SUBSCRIPTION_MARKET_FILTER_OWNER": "0x0000000000000000000000000000000000000000", "ZORA_ERC721_TRANSFER_HELPER": "0x0000000000000000000000000000000000000000" } \ No newline at end of file diff --git a/script/DeployFeeRegistry.s.sol b/script/DeployFeeRegistry.s.sol deleted file mode 100644 index 7b042af..0000000 --- a/script/DeployFeeRegistry.s.sol +++ /dev/null @@ -1,35 +0,0 @@ -// SPDX-License-Identifier: MIT -pragma solidity ^0.8.13; - -import "forge-std/console2.sol"; - -import {ZoraDropsDeployBase} from "./ZoraDropsDeployBase.sol"; -import {IOperatorFilterRegistry} from "../src/interfaces/IOperatorFilterRegistry.sol"; -import {OwnedSubscriptionManager} from "../src/filter/OwnedSubscriptionManager.sol"; -import {ChainConfig} from '../src/DeploymentConfig.sol'; - -contract DeployFeeRegistry is ZoraDropsDeployBase { - address constant IMMUTABLE_OPENSEA_FEE_REGISTRY = address(0x000000000000AAeB6D7670E522A718067333cd4E); - - function setupFeeRegistry(address deployer) public returns (OwnedSubscriptionManager) { - OwnedSubscriptionManager ownedSubscriptionManager = new OwnedSubscriptionManager(deployer); - address[] memory blockedOperatorsList = new address[](0); - IOperatorFilterRegistry operatorFilterRegistry = IOperatorFilterRegistry(IMMUTABLE_OPENSEA_FEE_REGISTRY); - operatorFilterRegistry.updateOperators(address(ownedSubscriptionManager), blockedOperatorsList, true); - return ownedSubscriptionManager; - } - - function run() public { - address subscriptionOwner = getChainConfig().subscriptionMarketFilterOwner; - console2.log("Setup operators ---"); - - vm.startBroadcast(); - - // Add opensea contracts to test - OwnedSubscriptionManager ownedSubscriptionManager = setupFeeRegistry(subscriptionOwner); - - vm.stopBroadcast(); - - console2.log(address(ownedSubscriptionManager)); - } -}