Skip to content

Commit e3c6b49

Browse files
committed
chore: remove goerli support
1 parent 73f78d3 commit e3c6b49

File tree

5 files changed

+7
-30
lines changed

5 files changed

+7
-30
lines changed

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,13 +79,11 @@ Silius was tested on the following networks, and some public endpoints are avail
7979
| Chain | Supported Status | Public RPC URL |
8080
| :--------: | :-------: | :-------: |
8181
| Ethereum | :heavy_check_mark:| <https://rpc.silius.xyz/api/v1/chain/ethereum-mainnet> |
82-
| Ethereum Goerli | :heavy_check_mark: | <https://rpc.silius.xyz/api/v1/chain/ethereum-goerli> |
8382
| Ethereum Sepolia| :heavy_check_mark: | <https://rpc.silius.xyz/api/v1/chain/ethereum-sepolia> |
8483
| Ethereum Holesky| :heavy_check_mark: | <https://rpc.silius.xyz/api/v1/chain/ethereum-holesky> |
8584
| Polygon | :heavy_check_mark: | <https://rpc.silius.xyz/api/v1/chain/polygon-mainnet> |
8685
| Polygon Mumbai| :heavy_check_mark: | <https://rpc.silius.xyz/api/v1/chain/polygon-mumbai> |
8786
| Linea | :heavy_check_mark: | <https://rpc.silius.xyz/api/v1/chain/linea-mainnet> |
88-
| Linea Goerli | :heavy_check_mark: | <https://rpc.silius.xyz/api/v1/chain/linea-goerli> |
8987
| Optimism | :heavy_check_mark: | <https://rpc.silius.xyz/api/v1/chain/optimism-mainnet> |
9088
| Optimism Sepolia | :heavy_check_mark: | <https://rpc.silius.xyz/api/v1/chain/optimism-sepolia> |
9189
| Arbitrum | :heavy_check_mark: | <https://rpc.silius.xyz/api/v1/chain/arbitrum-mainnet> |

bin/silius/src/bundler.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -200,18 +200,15 @@ where
200200
SendStrategy::Flashbots => {
201201
let relay_endpoints: Vec<String> = match chain_conn
202202
.named()
203-
.expect("Flashbots is only supported on Mainnet, Goerli and Sepolia")
203+
.expect("Flashbots is only supported on Mainnet and Sepolia")
204204
{
205205
NamedChain::Mainnet => {
206206
vec![flashbots_relay_endpoints::FLASHBOTS.into()]
207207
}
208-
NamedChain::Goerli => {
209-
vec![flashbots_relay_endpoints::FLASHBOTS_GOERLI.into()]
210-
}
211208
NamedChain::Sepolia => {
212209
vec![flashbots_relay_endpoints::FLASHBOTS_SEPOLIA.into()]
213210
}
214-
_ => panic!("Flashbots is only supported on Mainnet, Goerli and Sepolia"),
211+
_ => panic!("Flashbots is only supported on Mainnet and Sepolia"),
215212
};
216213

217214
let client = Arc::new(FlashbotsClient::new(

crates/bundler/tests/bundler.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -110,19 +110,19 @@ async fn start_mock_server() -> eyre::Result<(ServerHandle, MockFlashbotsBlockBu
110110

111111
#[tokio::test]
112112
#[ignore]
113-
async fn test_simulate_bundle_flashbots_goerli() -> eyre::Result<()> {
113+
async fn test_simulate_bundle_flashbots_sepolia() -> eyre::Result<()> {
114114
dotenv::dotenv().ok();
115115
let eth_client_address = std::env::var("WS_RPC_URL").expect("WS_RPC_URL env var not set");
116116
let eth_client = Arc::new(Provider::<Ws>::connect(eth_client_address).await?);
117117
let dir = format!(
118118
"{}/.silius/0x129D197b2a989C6798601A49D89a4AEC822A17a3",
119119
std::env::var("HOME").unwrap()
120120
);
121-
let wallet = Wallet::from_file(dir.into(), 5, true)?;
121+
let wallet = Wallet::from_file(dir.into(), 11155111, true)?;
122122

123123
let client = FlashbotsClient::new(
124124
eth_client.clone(),
125-
Some(vec![flashbots_relay_endpoints::FLASHBOTS_GOERLI.into()]),
125+
Some(vec![flashbots_relay_endpoints::FLASHBOTS_SEPOLIA.into()]),
126126
wallet.clone(),
127127
)?;
128128

@@ -145,7 +145,7 @@ async fn test_simulate_bundle_flashbots_goerli() -> eyre::Result<()> {
145145
)),
146146
from: Some(address),
147147
data: Some(approve_call_data.into()),
148-
chain_id: Some(U64::from(5)),
148+
chain_id: Some(U64::from(11155111)),
149149
max_fee_per_gas: Some(max_fee_per_gas),
150150
max_priority_fee_per_gas: Some(max_priority_fee),
151151
gas: Some(U256::from(1000000u64)),

crates/primitives/src/chain.rs

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ impl ChainSpec {
2020
match chain_id {
2121
1 => Self::mainnet(),
2222
1337 => Self::dev(),
23-
5 => Self::goerli(),
2423
11155111 => Self::sepolia(),
2524
137 => Self::polygon(),
2625
80001 => Self::polygon_mumbai(),
@@ -47,15 +46,6 @@ impl ChainSpec {
4746
}
4847
}
4948

50-
/// 'ChainSpec' for goerli
51-
pub fn goerli() -> Self {
52-
Self {
53-
chain: Chain::from(NamedChain::Goerli),
54-
block_time: Duration::from_secs(12),
55-
canonical_mempools: vec!["QmTmj4cizhWpEFCCqk5dP67yws7R2PPgCtb2bd2RgVPCbF".into()],
56-
}
57-
}
58-
5949
/// 'ChainSpec' for sepolia
6050
pub fn sepolia() -> Self {
6151
Self {

crates/primitives/src/constants.rs

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,6 @@ pub mod flashbots_relay_endpoints {
7878
pub const RSYNC_BUILDER: &str = "https://rsync-builder.xyz/";
7979
pub const LOKI_BUILDER: &str = "https://rpc.lokibuilder.xyz/";
8080

81-
// goerli
82-
pub const FLASHBOTS_GOERLI: &str = "https://relay-goerli.flashbots.net";
83-
8481
// sepolia
8582
pub const FLASHBOTS_SEPOLIA: &str = "https://relay-sepolia.flashbots.net";
8683
}
@@ -95,20 +92,15 @@ pub mod fastlane_relay_endpoints {
9592
pub mod supported_chains {
9693
use alloy_chains::NamedChain;
9794

98-
pub const CHAINS: [NamedChain; 15] = [
95+
pub const CHAINS: [NamedChain; 10] = [
9996
NamedChain::Dev,
10097
NamedChain::Mainnet,
101-
NamedChain::Goerli,
10298
NamedChain::Sepolia,
10399
NamedChain::Holesky,
104100
NamedChain::PolygonMumbai,
105-
NamedChain::LineaGoerli,
106-
NamedChain::OptimismGoerli,
107101
NamedChain::OptimismSepolia,
108-
NamedChain::ArbitrumGoerli,
109102
NamedChain::ArbitrumSepolia,
110103
NamedChain::BinanceSmartChainTestnet,
111-
NamedChain::BaseGoerli,
112104
NamedChain::BaseSepolia,
113105
NamedChain::AvalancheFuji,
114106
];

0 commit comments

Comments
 (0)