Skip to content

Commit 5dd1c68

Browse files
sambachamds1
andauthored
chore(networks): goerli sunset (#525)
* chore(networks): goerli sunset * chore(tests): remove goerli, add holesky For more information about the sunsetting of Goerli, see <https://blog.ethereum.org/2023/11/30/goerli-lts-update> * chore: remove goerli entirely * style: forge fmt --------- Co-authored-by: Matt Solomon <[email protected]>
1 parent 2a6c861 commit 5dd1c68

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

foundry.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ fs_permissions = [{ access = "read-write", path = "./"}]
44
[rpc_endpoints]
55
# The RPC URLs are modified versions of the default for testing initialization.
66
mainnet = "https://eth-mainnet.alchemyapi.io/v2/WV407BEiBmjNJfKo9Uo_55u0z0ITyCOX" # Different API key.
7-
optimism_goerli = "https://goerli.optimism.io/" # Adds a trailing slash.
8-
arbitrum_one_goerli = "https://goerli-rollup.arbitrum.io/rpc/" # Adds a trailing slash.
7+
optimism_sepolia = "https://sepolia.optimism.io/" # Adds a trailing slash.
8+
arbitrum_one_sepolia = "https://sepolia-rollup.arbitrum.io/rpc/" # Adds a trailing slash.
99
needs_undefined_env_var = "${UNDEFINED_RPC_URL_PLACEHOLDER}"
1010

1111
[fmt]

src/StdChains.sol

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -199,17 +199,17 @@ abstract contract StdChains {
199199
setChainWithDefaultRpcUrl(
200200
"mainnet", ChainData("Mainnet", 1, "https://eth-mainnet.alchemyapi.io/v2/pwc5rmJhrdoaSEfimoKEmsvOjKSmPDrP")
201201
);
202-
setChainWithDefaultRpcUrl(
203-
"goerli", ChainData("Goerli", 5, "https://goerli.infura.io/v3/b9794ad1ddf84dfb8c34d6bb5dca2001")
204-
);
205202
setChainWithDefaultRpcUrl(
206203
"sepolia", ChainData("Sepolia", 11155111, "https://sepolia.infura.io/v3/b9794ad1ddf84dfb8c34d6bb5dca2001")
207204
);
205+
setChainWithDefaultRpcUrl("holesky", ChainData("Holesky", 17000, "https://rpc.holesky.ethpandaops.io"));
208206
setChainWithDefaultRpcUrl("optimism", ChainData("Optimism", 10, "https://mainnet.optimism.io"));
209-
setChainWithDefaultRpcUrl("optimism_goerli", ChainData("Optimism Goerli", 420, "https://goerli.optimism.io"));
207+
setChainWithDefaultRpcUrl(
208+
"optimism_sepolia", ChainData("Optimism Sepolia", 11155420, "https://sepolia.optimism.io")
209+
);
210210
setChainWithDefaultRpcUrl("arbitrum_one", ChainData("Arbitrum One", 42161, "https://arb1.arbitrum.io/rpc"));
211211
setChainWithDefaultRpcUrl(
212-
"arbitrum_one_goerli", ChainData("Arbitrum One Goerli", 421613, "https://goerli-rollup.arbitrum.io/rpc")
212+
"arbitrum_one_sepolia", ChainData("Arbitrum One Sepolia", 421614, "https://sepolia-rollup.arbitrum.io/rpc")
213213
);
214214
setChainWithDefaultRpcUrl("arbitrum_nova", ChainData("Arbitrum Nova", 42170, "https://nova.arbitrum.io/rpc"));
215215
setChainWithDefaultRpcUrl("polygon", ChainData("Polygon", 137, "https://polygon-rpc.com"));
@@ -233,7 +233,7 @@ abstract contract StdChains {
233233
"moonriver", ChainData("Moonriver", 1285, "https://rpc.api.moonriver.moonbeam.network")
234234
);
235235
setChainWithDefaultRpcUrl("moonbase", ChainData("Moonbase", 1287, "https://rpc.testnet.moonbeam.network"));
236-
setChainWithDefaultRpcUrl("base_goerli", ChainData("Base Goerli", 84531, "https://goerli.base.org"));
236+
setChainWithDefaultRpcUrl("base_sepolia", ChainData("Base Sepolia", 84532, "https://sepolia.base.org"));
237237
setChainWithDefaultRpcUrl("base", ChainData("Base", 8453, "https://mainnet.base.org"));
238238
setChainWithDefaultRpcUrl("fraxtal", ChainData("Fraxtal", 252, "https://rpc.frax.com"));
239239
setChainWithDefaultRpcUrl("fraxtal_testnet", ChainData("Fraxtal Testnet", 2522, "https://rpc.testnet.frax.com"));

test/StdChains.t.sol

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ contract StdChainsTest is Test {
2525
function test_ChainRpcInitialization() public {
2626
// RPCs specified in `foundry.toml` should be updated.
2727
assertEq(getChain(1).rpcUrl, "https://eth-mainnet.alchemyapi.io/v2/WV407BEiBmjNJfKo9Uo_55u0z0ITyCOX");
28-
assertEq(getChain("optimism_goerli").rpcUrl, "https://goerli.optimism.io/");
29-
assertEq(getChain("arbitrum_one_goerli").rpcUrl, "https://goerli-rollup.arbitrum.io/rpc/");
28+
assertEq(getChain("optimism_sepolia").rpcUrl, "https://sepolia.optimism.io/");
29+
assertEq(getChain("arbitrum_one_sepolia").rpcUrl, "https://sepolia-rollup.arbitrum.io/rpc/");
3030

3131
// Environment variables should be the next fallback
3232
assertEq(getChain("arbitrum_nova").rpcUrl, "https://nova.arbitrum.io/rpc");
@@ -54,12 +54,12 @@ contract StdChainsTest is Test {
5454
// Currently commented out since this is slow and public RPCs are flaky, often resulting in failing CI.
5555
// function test_Rpcs() public {
5656
// _testRpc("mainnet");
57-
// _testRpc("goerli");
5857
// _testRpc("sepolia");
58+
// _testRpc("holesky");
5959
// _testRpc("optimism");
60-
// _testRpc("optimism_goerli");
60+
// _testRpc("optimism_sepolia");
6161
// _testRpc("arbitrum_one");
62-
// _testRpc("arbitrum_one_goerli");
62+
// _testRpc("arbitrum_one_sepolia");
6363
// _testRpc("arbitrum_nova");
6464
// _testRpc("polygon");
6565
// _testRpc("polygon_mumbai");
@@ -71,7 +71,7 @@ contract StdChainsTest is Test {
7171
// _testRpc("moonbeam");
7272
// _testRpc("moonriver");
7373
// _testRpc("moonbase");
74-
// _testRpc("base_goerli");
74+
// _testRpc("base_sepolia");
7575
// _testRpc("base");
7676
// _testRpc("fraxtal");
7777
// _testRpc("fraxtal_testnet");

test/StdCheats.t.sol

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ contract StdCheatsTest is Test {
400400
}
401401

402402
function testFuzz_AssumeNotPrecompile(address addr) external {
403-
assumeNotPrecompile(addr, getChain("optimism_goerli").chainId);
403+
assumeNotPrecompile(addr, getChain("optimism_sepolia").chainId);
404404
assertTrue(
405405
addr < address(1) || (addr > address(9) && addr < address(0x4200000000000000000000000000000000000000))
406406
|| addr > address(0x4200000000000000000000000000000000000800)

0 commit comments

Comments
 (0)