diff --git a/.changeset/afraid-eagles-bow.md b/.changeset/afraid-eagles-bow.md new file mode 100644 index 000000000..5f3346834 --- /dev/null +++ b/.changeset/afraid-eagles-bow.md @@ -0,0 +1,5 @@ +--- +"@zoralabs/1155-deployments": patch +--- + +Removed goerli, optimism-goerli, base-goerli, and zora-goerli from chain configs, addresses, and testing diff --git a/packages/1155-contracts/foundry.toml b/packages/1155-contracts/foundry.toml index 68bd9ccfe..685909692 100644 --- a/packages/1155-contracts/foundry.toml +++ b/packages/1155-contracts/foundry.toml @@ -20,18 +20,14 @@ optimizer_runs = 0 via_ir = false [rpc_endpoints] -goerli = "https://eth-goerli.g.alchemy.com/v2/${ALCHEMY_KEY}" mainnet = "https://eth-mainnet.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. base = "https://base-mainnet.g.alchemy.com/v2/${ALCHEMY_KEY}" -base_goerli = "https://base-goerli.g.alchemy.com/v2/${ALCHEMY_KEY}" optimism = "https://opt-mainnet.g.alchemy.com/v2/${ALCHEMY_KEY}" -optimism_goerli = "https://opt-goerli.g.alchemy.com/v2/${ALCHEMY_KEY}" pgn = "https://rpc.publicgoods.network" pgn_sepolia = "https://sepolia.publicgoods.network" zora = "https://rpc.zora.energy" -zora_goerli = "https://testnet.rpc.zora.energy" zora_sepolia = "https://sepolia.rpc.zora.energy" # See more config options https://github.com/foundry-rs/foundry/tree/master/config diff --git a/packages/1155-deployments/addresses/420.json b/packages/1155-deployments/addresses/420.json deleted file mode 100644 index 97d75d82b..000000000 --- a/packages/1155-deployments/addresses/420.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "CONTRACT_1155_IMPL": "0xC7598f8eAA1455f5b2B3f206A9af55B2BA248e3E", - "CONTRACT_1155_IMPL_VERSION": "2.7.0", - "FACTORY_IMPL": "0xCf0B4Acab081169D12b729c3Bd1c6E7bbAB820Da", - "FACTORY_PROXY": "0x777777C338d93e2C7adf08D102d45CA7CC4Ed021", - "FIXED_PRICE_SALE_STRATEGY": "0x04E2516A2c207E84a1839755675dfd8eF6302F0a", - "MERKLE_MINT_SALE_STRATEGY": "0xf48172CA3B6068B20eE4917Eb27b5472f1f272C7", - "PREMINTER_IMPL": "0x795Efc066f89DFB03048dDd0598F2D8521c99Df6", - "PREMINTER_PROXY": "0x7777773606e7e46C8Ba8B98C08f5cD218e31d340", - "REDEEM_MINTER_FACTORY": "0x78964965cF77850224513a367f899435C5B69174", - "UPGRADE_GATE": "0xbC50029836A59A4E5e1Bb8988272F46ebA0F9900", - "timestamp": 1704496741 -} \ No newline at end of file diff --git a/packages/1155-deployments/addresses/84531.json b/packages/1155-deployments/addresses/84531.json deleted file mode 100644 index ef56bae5e..000000000 --- a/packages/1155-deployments/addresses/84531.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "CONTRACT_1155_IMPL": "0xc6a8C44c695F227097f6F10dfCB4335308AF444D", - "CONTRACT_1155_IMPL_VERSION": "2.7.0", - "FACTORY_IMPL": "0x2667909314554B0f37D306C463e68737d1707953", - "FACTORY_PROXY": "0x777777C338d93e2C7adf08D102d45CA7CC4Ed021", - "FIXED_PRICE_SALE_STRATEGY": "0x04E2516A2c207E84a1839755675dfd8eF6302F0a", - "MERKLE_MINT_SALE_STRATEGY": "0xf48172CA3B6068B20eE4917Eb27b5472f1f272C7", - "PREMINTER_IMPL": "0x795Efc066f89DFB03048dDd0598F2D8521c99Df6", - "PREMINTER_PROXY": "0x7777773606e7e46C8Ba8B98C08f5cD218e31d340", - "REDEEM_MINTER_FACTORY": "0x78964965cF77850224513a367f899435C5B69174", - "UPGRADE_GATE": "0xbC50029836A59A4E5e1Bb8988272F46ebA0F9900", - "timestamp": 1703009473, - "commit": "bdf6682" -} \ No newline at end of file diff --git a/packages/1155-deployments/chainConfigs/420.json b/packages/1155-deployments/chainConfigs/420.json deleted file mode 100644 index 3e9f03e55..000000000 --- a/packages/1155-deployments/chainConfigs/420.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "FACTORY_OWNER": "0xbb45052B2260707655Dfd916a416264f5981192c", - "MINT_FEE_RECIPIENT": "0x5dEe21327CD7CD6725C2578DA1c3E5bb2D2D34b2", - "PROTOCOL_REWARDS": "0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B" -} diff --git a/packages/1155-deployments/chainConfigs/5.json b/packages/1155-deployments/chainConfigs/5.json deleted file mode 100644 index fcb2cc815..000000000 --- a/packages/1155-deployments/chainConfigs/5.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "FACTORY_OWNER": "0xDC498668B5e6CC518fD58A2ADBF614Fd3A13D3a0", - "MINT_FEE_RECIPIENT": "0x9444390c01Dd5b7249E53FAc31290F7dFF53450D", - "PROTOCOL_REWARDS": "0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B" -} diff --git a/packages/1155-deployments/chainConfigs/84531.json b/packages/1155-deployments/chainConfigs/84531.json deleted file mode 100644 index 2dbb7aa54..000000000 --- a/packages/1155-deployments/chainConfigs/84531.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "FACTORY_OWNER": "0x02539E813cA450C2c7334e885423f4A899a063Fe", - "MINT_FEE_RECIPIENT": "0x02539E813cA450C2c7334e885423f4A899a063Fe", - "PROTOCOL_REWARDS": "0x7777777F279eba3d3Ad8F4E708545291A6fDBA8B" -} diff --git a/packages/1155-deployments/foundry.toml b/packages/1155-deployments/foundry.toml index 1183b4959..665df8a35 100644 --- a/packages/1155-deployments/foundry.toml +++ b/packages/1155-deployments/foundry.toml @@ -23,20 +23,17 @@ optimizer_runs = 0 via_ir = false [rpc_endpoints] -goerli = "https://eth-goerli.g.alchemy.com/v2/${ALCHEMY_KEY}" sepolia = "https://eth-sepolia.g.alchemy.com/v2/${ALCHEMY_KEY}" mainnet = "https://eth-mainnet.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. base = "https://base-mainnet.g.alchemy.com/v2/${ALCHEMY_KEY}" optimism = "https://opt-mainnet.g.alchemy.com/v2/${ALCHEMY_KEY}" -optimism_goerli = "https://opt-goerli.g.alchemy.com/v2/${ALCHEMY_KEY}" pgn = "https://rpc.publicgoods.network" pgn_sepolia = "https://sepolia.publicgoods.network" zora = "https://rpc.zora.energy/${CONDUIT_KEY}" -zora_goerli = "https://testnet.rpc.zora.energy/${CONDUIT_KEY}" zora_sepolia = "https://sepolia.rpc.zora.energy/${CONDUIT_KEY}" arbitrum_one = "https://arb-mainnet.g.alchemy.com/v2/${ALCHEMY_KEY}" -arbitrum_sepolia = "https://sepolia-rollup.arbitrum.io/rpc" +arbitrum_sepolia = "https://arb-sepolia.g.alchemy.com/v2/${ALCHEMY_KEY}" # See more config options https://github.com/foundry-rs/foundry/tree/master/config diff --git a/packages/1155-deployments/package.json b/packages/1155-deployments/package.json index c988f3fe7..dd24b9346 100644 --- a/packages/1155-deployments/package.json +++ b/packages/1155-deployments/package.json @@ -7,7 +7,7 @@ "private": true, "scripts": { "dev": "FOUNDRY_PROFILE=dev forge test --watch -vvv", - "test": "FORK_TEST_CHAINS=mainnet,optimism,optimism_goerli,zora,zora_goerli,sepolia,base,zora_sepolia,arbitrum_one,arbitrum_sepolia forge test -vvv", + "test": "FORK_TEST_CHAINS=mainnet,optimism,zora,sepolia,base,zora_sepolia,arbitrum_one,arbitrum_sepolia forge test -vvv", "copy-deployed-contracts": "yarn tsx script/copy-deployed-contracts.ts", "unlink-protocol-rewards": "rm -rf ./node_modules/@zoralabs/protocol-rewards && cp -r ../protocol-rewards ./node_modules/@zoralabs/protocol-rewards", "unlink-1155": "rm -rf ./node_modules/@zoralabs/zora-1155-contracts && cp -r ../1155-contracts ./node_modules/@zoralabs/zora-1155-contracts", diff --git a/packages/1155-deployments/script/CalculateDeterministicParams.s.sol b/packages/1155-deployments/script/CalculateDeterministicParams.s.sol index 6c55d7456..d48ab385a 100644 --- a/packages/1155-deployments/script/CalculateDeterministicParams.s.sol +++ b/packages/1155-deployments/script/CalculateDeterministicParams.s.sol @@ -25,7 +25,7 @@ contract FactoryProxyDeterministicParams is ZoraDeployerBase { address proxyDeployerAddress; function run() public { - vm.createSelectFork("zora_goerli", 1252119); + vm.createSelectFork("zora_sepolia"); deployerAddress = vm.envAddress("TURNKEY_TARGET_ADDRESS"); diff --git a/packages/1155-deployments/test/NewFactoryProxyDeployer.t.sol b/packages/1155-deployments/test/NewFactoryProxyDeployer.t.sol index c96082777..9a4a5ffde 100644 --- a/packages/1155-deployments/test/NewFactoryProxyDeployer.t.sol +++ b/packages/1155-deployments/test/NewFactoryProxyDeployer.t.sol @@ -39,7 +39,7 @@ contract DeterministicProxyDeployerTest is DeterministicDeployerScript, Test { } function test_proxyCanByDeployedAtDesiredAddress(bytes32 proxySalt) external { - vm.createSelectFork("zora_goerli", 1252119); + vm.createSelectFork("zora_sepolia", 5271587); // ensure nonce is greater than current account's nonce (address deployerAddress, uint256 deployerPrivateKey) = makeAddrAndKey("deployer"); @@ -57,7 +57,7 @@ contract DeterministicProxyDeployerTest is DeterministicDeployerScript, Test { DeterministicProxyDeployer factoryProxyDeployer = _deployKnownZoraFactoryProxy(proxyDeployerSalt); bytes memory factoryProxyCreationCode = type(Zora1155Factory).creationCode; - address mintFeeRecipient = makeAddr("mintFeeRecipient "); + address mintFeeRecipient = makeAddr("mintFeeRecipient"); bytes32 digest = factoryProxyDeployer.hashedDigestFactoryProxy( proxyShimSalt, @@ -96,7 +96,7 @@ contract DeterministicProxyDeployerTest is DeterministicDeployerScript, Test { } function test_genericContractCanByDeployedAtDesiredAddress(uint32 nonce) external { - vm.createSelectFork("zora_goerli", 1252119); + vm.createSelectFork("zora_sepolia", 5271587); (address deployerAddress, uint256 deployerPrivateKey) = makeAddrAndKey("deployer"); diff --git a/packages/1155-deployments/test/UpgradesTest.t.sol b/packages/1155-deployments/test/UpgradesTest.t.sol index 90fb348fc..788d81f0a 100644 --- a/packages/1155-deployments/test/UpgradesTest.t.sol +++ b/packages/1155-deployments/test/UpgradesTest.t.sol @@ -160,7 +160,6 @@ contract UpgradesTest is ForkDeploymentConfig, DeploymentTestingUtils, Test { address factoryOwner = chainConfig.factoryOwner; bytes memory preminterUpgradeCalldata; - // hack - for now, only check on zora sepolia or goerli if (preminterUpgradeNeeded) { console2.log("-- preminter upgrade needed --"); console2.log("preminter upgrade target:", targetPreminterProxy); diff --git a/packages/1155-deployments/test/ZoraCreator1155PremintExecutorForkTest.t.sol b/packages/1155-deployments/test/ZoraCreator1155PremintExecutorForkTest.t.sol index 3a20c8625..7e3f6a582 100644 --- a/packages/1155-deployments/test/ZoraCreator1155PremintExecutorForkTest.t.sol +++ b/packages/1155-deployments/test/ZoraCreator1155PremintExecutorForkTest.t.sol @@ -115,8 +115,8 @@ contract ZoraCreator1155PreminterForkTest is ForkDeploymentConfig, Test { } function _chainSupportsPremintV2(string memory chainName) private pure returns (bool) { - // for now we know that only goerli and sepolia have v2 premint deployed - return (equals(chainName, "zora_sepolia") || equals(chainName, "zora_goerli")); + // for now we know that zora sepolia and zora mainnet have premint v2 deployed + return (equals(chainName, "zora_sepolia") || equals(chainName, "zora")); } function _signAndExecutePremintLegacy(