Skip to content

Commit

Permalink
Remove sepolia (#2291)
Browse files Browse the repository at this point in the history
Signed-off-by: deniallugo <[email protected]>

Signed-off-by: deniallugo <[email protected]>
  • Loading branch information
Deniallugo committed Sep 2, 2022
1 parent af17ba7 commit b87e051
Show file tree
Hide file tree
Showing 9 changed files with 2 additions and 27 deletions.
1 change: 0 additions & 1 deletion .github/workflows/setup.runtime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ jobs:
"cluster": "stage"
},
"^goerli$": { "cluster": "testnet-new" },
"^sepolia$": { "cluster": "testnet-new" },
"^mainnet$": { "cluster": "mainnet", "hfEnv": "prod", "namespace": "zksync" }
}
- run: echo "::set-output name=short::$(git rev-parse --short HEAD)"
Expand Down
1 change: 0 additions & 1 deletion contracts/hardhat.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ localConfig.EASY_EXODUS = process.env.CONTRACTS_TEST_EASY_EXODUS === 'true';

const contractDefs = {
goerli: testnetConfig,
sepolia: testnetConfig,
rinkeby: testnetConfig,
ropsten: testnetConfig,
mainnet: prodConfig,
Expand Down
5 changes: 0 additions & 5 deletions core/lib/types/src/network.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ pub enum Network {
Rinkeby,
/// Ethereum Goerli testnet.
Goerli,
/// Ethereum Sepolia testnet.
Sepolia,
/// Ethereum Ropsten testnet.
Ropsten,
/// Self-hosted Ethereum & zkSync networks.
Expand All @@ -43,7 +41,6 @@ impl FromStr for Network {
"rinkeby" => Self::Rinkeby,
"ropsten" => Self::Ropsten,
"goerli" => Self::Goerli,
"sepolia" => Self::Sepolia,
"localhost" => Self::Localhost,
"test" => Self::Test,
another => return Err(another.to_owned()),
Expand All @@ -59,7 +56,6 @@ impl fmt::Display for Network {
Self::Ropsten => write!(f, "ropsten"),
Self::Localhost => write!(f, "localhost"),
Self::Goerli => write!(f, "goerli"),
Self::Sepolia => write!(f, "sepolia"),
Self::Unknown => write!(f, "unknown"),
Self::Test => write!(f, "test"),
}
Expand All @@ -74,7 +70,6 @@ impl Network {
Network::Ropsten => 3,
Network::Rinkeby => 4,
Network::Goerli => 5,
Network::Sepolia => 11155111,
Network::Localhost => 9,
Network::Unknown => panic!("Unknown chain ID"),
Network::Test => panic!("Test chain ID"),
Expand Down
2 changes: 1 addition & 1 deletion core/tests/ts-tests/tests/tester/tester.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import * as crypto from 'crypto';

const zksyncAbi =
require('../../../../../contracts/artifacts/cache/solpp-generated-contracts/ZkSync.sol/ZkSync.json').abi;
type Network = 'localhost' | 'goerli' | 'sepolia';
type Network = 'localhost' | 'goerli';

const testConfigPath = path.join(process.env.ZKSYNC_HOME as string, `etc/test_config/constant`);
const ethTestConfig = JSON.parse(fs.readFileSync(`${testConfigPath}/eth.json`, { encoding: 'utf-8' }));
Expand Down
1 change: 0 additions & 1 deletion sdk/zksync-rs/src/provider.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ pub fn get_rpc_addr(network: Network) -> &'static str {
Network::Unknown => panic!("Attempt to create a provider from an unknown network"),
Network::Test => panic!("Attempt to create a provider from an test network"),
Network::Goerli => "https://goerli-api.zksync.io/jsrpc",
Network::Sepolia => "https://sepolia-api.zksync.io/jsrpc",
}
}

Expand Down
10 changes: 0 additions & 10 deletions sdk/zksync.js/src/provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,16 +50,6 @@ export async function getDefaultProvider(
} else if (transport === 'HTTP') {
return await Provider.newHttpProvider('https://goerli-api.zksync.io/jsrpc', pollIntervalMilliSecs, network);
}
} else if (network === 'sepolia') {
if (transport === 'WS') {
return await Provider.newWebsocketProvider('wss://sepolia-api.zksync.io/jsrpc-ws', network);
} else if (transport === 'HTTP') {
return await Provider.newHttpProvider(
'https://sepolia-api.zksync.io/jsrpc',
pollIntervalMilliSecs,
network
);
}
} else if (network === 'goerli-beta') {
if (transport === 'WS') {
return await Provider.newWebsocketProvider('wss://goerli-beta-api.zksync.dev/jsrpc-ws', network);
Expand Down
2 changes: 0 additions & 2 deletions sdk/zksync.js/src/rest-provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ export async function getDefaultRestProvider(
return await RestProvider.newProvider('http://127.0.0.1:3001/api/v0.2', pollIntervalMilliSecs, network);
} else if (network === 'goerli') {
return await RestProvider.newProvider('https://goerli-api.zksync.io/api/v0.2', pollIntervalMilliSecs, network);
} else if (network === 'sepolia') {
return await RestProvider.newProvider('https://sepolia-api.zksync.io/api/v0.2', pollIntervalMilliSecs, network);
} else if (network === 'goerli-beta') {
return await RestProvider.newProvider(
'https://goerli-beta-api.zksync.dev/api/v0.2',
Expand Down
6 changes: 1 addition & 5 deletions sdk/zksync.js/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@ export type TotalFee = Map<TokenLike, BigNumber>;

export type Nonce = number | 'committed';

export type Network = 'localhost' | 'sepolia' | 'goerli' | 'mainnet' | 'rinkeby-beta' | 'goerli-beta';
export type Network = 'localhost' | 'goerli' | 'mainnet' | 'rinkeby-beta' | 'goerli-beta';

const MAINNET_NETWORK_CHAIN_ID = 1;
const SEPOLIA_NETWORK_CHAIN_ID = 11155111;
const RINKEBY_NETWORK_CHAIN_ID = 4;
const GOERLI_NETWORK_CHAIN_ID = 5;
const LOCALHOST_NETWORK_CHAIN_ID = 9;
Expand All @@ -31,9 +30,6 @@ export function l1ChainId(network?: Network): number {
if (network === 'goerli' || network === 'goerli-beta') {
return GOERLI_NETWORK_CHAIN_ID;
}
if (network === 'sepolia') {
return SEPOLIA_NETWORK_CHAIN_ID;
}
if (network === 'mainnet') {
return MAINNET_NETWORK_CHAIN_ID;
}
Expand Down
1 change: 0 additions & 1 deletion sdk/zksync.js/src/withdraw-helpers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ function checkEthProvider(ethersWallet: ethers.Signer) {
// https://github.com/makerdao/multicall
function getMulticallAddressByNetwork(network: Network) {
switch (network) {
case 'sepolia':
case 'rinkeby-beta':
return '0x42ad527de7d4e9d9d011ac45b31d8551f8fe9821';
case 'goerli':
Expand Down

0 comments on commit b87e051

Please sign in to comment.