Fix arbitrum sepolia url (#192)

ourzora · Feb 22, 2024 · 9946d0a · 9946d0a
1 parent 6b8f9fc
commit 9946d0a
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 58 deletions.
diff --git a/.changeset/afraid-eagles-bow.md 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
@@ -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
diff --git a/packages/1155-deployments/addresses/84531.json b/packages/1155-deployments/addresses/84531.json
diff --git a/packages/1155-deployments/chainConfigs/420.json b/packages/1155-deployments/chainConfigs/420.json
diff --git a/packages/1155-deployments/chainConfigs/5.json b/packages/1155-deployments/chainConfigs/5.json
diff --git a/packages/1155-deployments/chainConfigs/84531.json b/packages/1155-deployments/chainConfigs/84531.json
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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(