diff --git a/packages/arb-token-bridge-ui/src/components/TransferPanel/TransferPanelSummary.tsx b/packages/arb-token-bridge-ui/src/components/TransferPanel/TransferPanelSummary.tsx index 8be6cf49ff..17f950eb33 100644 --- a/packages/arb-token-bridge-ui/src/components/TransferPanel/TransferPanelSummary.tsx +++ b/packages/arb-token-bridge-ui/src/components/TransferPanel/TransferPanelSummary.tsx @@ -28,28 +28,6 @@ export type TransferPanelSummaryProps = { token: ERC20BridgeToken | null } -function StylusNetworkWarning() { - const [{ sourceChain, destinationChain }] = useNetworks() - const { isStylusTestnetV2: isSourceChainStylusTestnet } = isNetwork( - sourceChain.id - ) - const { isStylusTestnetV2: isDestinationChainStylusTestnet } = isNetwork( - destinationChain.id - ) - - if (!isSourceChainStylusTestnet && !isDestinationChainStylusTestnet) { - return null - } - - return ( - - Stylus is now live on Arbitrum Sepolia. The Stylus v1 and v2 testnets will - be deprecated shortly. Please withdraw all testnet assets and resume - testing on Arbitrum Sepolia. - - ) -} - function StyledLoader() { return ( @@ -272,7 +250,6 @@ export function TransferPanelSummary({ token }: TransferPanelSummaryProps) { )} - ) } diff --git a/packages/arb-token-bridge-ui/src/hooks/useNetworks.ts b/packages/arb-token-bridge-ui/src/hooks/useNetworks.ts index 67e033f57c..565bbb70df 100644 --- a/packages/arb-token-bridge-ui/src/hooks/useNetworks.ts +++ b/packages/arb-token-bridge-ui/src/hooks/useNetworks.ts @@ -10,7 +10,6 @@ import { holesky, arbitrumNova, arbitrumSepolia, - stylusTestnetV2, localL1Network as local, localL2Network as arbitrumLocal } from '../util/wagmi/wagmiAdditionalNetworks' @@ -38,7 +37,6 @@ export function isSupportedChainId( arbitrum.id, arbitrumNova.id, arbitrumSepolia.id, - stylusTestnetV2.id, arbitrumLocal.id, local.id, ...getOrbitChains().map(chain => chain.chainID), diff --git a/packages/arb-token-bridge-ui/src/types/ChainQueryParam.ts b/packages/arb-token-bridge-ui/src/types/ChainQueryParam.ts index 9909cd3bd1..a96150ff61 100644 --- a/packages/arb-token-bridge-ui/src/types/ChainQueryParam.ts +++ b/packages/arb-token-bridge-ui/src/types/ChainQueryParam.ts @@ -16,8 +16,6 @@ const chainQueryParams = [ 'arbitrum-one', 'arbitrum-nova', 'arbitrum-sepolia', - 'stylus-testnet', - 'stylus-testnet-v2', 'custom-localhost', 'arbitrum-localhost' ] as const @@ -51,9 +49,6 @@ export function getChainQueryParamForChain(chainId: ChainId): ChainQueryParam { case ChainId.ArbitrumNova: return 'arbitrum-nova' - case ChainId.StylusTestnetV2: - return 'stylus-testnet-v2' - case ChainId.Sepolia: return 'sepolia' @@ -104,9 +99,6 @@ export function getChainForChainKeyQueryParam( case 'arbitrum-sepolia': return customChains.arbitrumSepolia - case 'stylus-testnet-v2': - return customChains.stylusTestnetV2 - case 'custom-localhost': return customChains.localL1Network diff --git a/packages/arb-token-bridge-ui/src/util/TokenTeleportEnabledUtils.ts b/packages/arb-token-bridge-ui/src/util/TokenTeleportEnabledUtils.ts index e7c9d7d6cd..b5bc5b0846 100644 --- a/packages/arb-token-bridge-ui/src/util/TokenTeleportEnabledUtils.ts +++ b/packages/arb-token-bridge-ui/src/util/TokenTeleportEnabledUtils.ts @@ -25,12 +25,12 @@ const teleportEnabledTokens: { { symbol: 'WETH', l1Address: '0xfff9976782d46cc05630d1f6ebab18b2324d6b14', - allowedL3ChainIds: [ChainId.StylusTestnetV2] + allowedL3ChainIds: [] }, { symbol: 'LINK', l1Address: '0x779877A7B0D9E8603169DdbD7836e478b4624789', - allowedL3ChainIds: [ChainId.StylusTestnetV2] + allowedL3ChainIds: [] } ] } diff --git a/packages/arb-token-bridge-ui/src/util/__tests__/networks.test.ts b/packages/arb-token-bridge-ui/src/util/__tests__/networks.test.ts index 7b9a242235..706d401fd3 100644 --- a/packages/arb-token-bridge-ui/src/util/__tests__/networks.test.ts +++ b/packages/arb-token-bridge-ui/src/util/__tests__/networks.test.ts @@ -127,12 +127,6 @@ describe('getBaseChainIdByChainId', () => { chainId: xaiTestnetChainId }) ).toBe(ChainId.Sepolia) - - expect( - getBaseChainIdByChainId({ - chainId: ChainId.StylusTestnetV2 - }) - ).toBe(ChainId.Sepolia) }) }) diff --git a/packages/arb-token-bridge-ui/src/util/bridgeUiConfig.ts b/packages/arb-token-bridge-ui/src/util/bridgeUiConfig.ts index 04fbf2b936..96569209ba 100644 --- a/packages/arb-token-bridge-ui/src/util/bridgeUiConfig.ts +++ b/packages/arb-token-bridge-ui/src/util/bridgeUiConfig.ts @@ -96,16 +96,6 @@ export function getBridgeUiConfigForChain(chainId: number): BridgeUiConfig { 'AnyTrust protocol. Low fees for high-volume transactions. Secured by a trust-minimized Data Availability Committee (DAC).' } } - case ChainId.StylusTestnetV2: - return { - color: '#E3066E', - network: { - name: 'Stylus Testnet v2', - logo: '/images/StylusLogo.svg', - description: - 'An experimental playground for Arbitrum Stylus smart contracts.' - } - } default: { // added Orbit chains const orbitChain = orbitChains[chainId] diff --git a/packages/arb-token-bridge-ui/src/util/networks.ts b/packages/arb-token-bridge-ui/src/util/networks.ts index 0fd476edaf..a2a8cfd43e 100644 --- a/packages/arb-token-bridge-ui/src/util/networks.ts +++ b/packages/arb-token-bridge-ui/src/util/networks.ts @@ -141,9 +141,7 @@ export enum ChainId { ArbitrumNova = 42170, // L2 Testnets ArbitrumSepolia = 421614, - ArbitrumLocal = 412346, - // Orbit - StylusTestnetV2 = 13331371 + ArbitrumLocal = 412346 } export const supportedCustomOrbitParentChains = [ @@ -174,9 +172,7 @@ export const rpcURLs: { [chainId: number]: string } = { [ChainId.ArbitrumSepolia]: loadEnvironmentVariableWithFallback({ env: chainIdToInfuraUrl(ChainId.ArbitrumSepolia), fallback: 'https://sepolia-rollup.arbitrum.io/rpc' - }), - // Orbit Testnets - [ChainId.StylusTestnetV2]: 'https://stylusv2.arbitrum.io/rpc' + }) } export const explorerUrls: { [chainId: number]: string } = { @@ -189,9 +185,7 @@ export const explorerUrls: { [chainId: number]: string } = { [ChainId.ArbitrumNova]: 'https://nova.arbiscan.io', [ChainId.ArbitrumOne]: 'https://arbiscan.io', // L2 Testnets - [ChainId.ArbitrumSepolia]: 'https://sepolia.arbiscan.io', - // Orbit Testnets - [ChainId.StylusTestnetV2]: 'https://stylusv2-explorer.arbitrum.io' + [ChainId.ArbitrumSepolia]: 'https://sepolia.arbiscan.io' } export const getExplorerUrl = (chainId: ChainId) => { @@ -340,8 +334,6 @@ export function isNetwork(chainId: ChainId) { const isArbitrumSepolia = chainId === ChainId.ArbitrumSepolia const isArbitrumLocal = chainId === ChainId.ArbitrumLocal - const isStylusTestnetV2 = chainId === ChainId.StylusTestnetV2 - const isEthereumMainnetOrTestnet = isEthereumMainnet || isSepolia || isHolesky || isLocal @@ -361,7 +353,6 @@ export function isNetwork(chainId: ChainId) { isHolesky || isArbitrumSepolia || isCustomOrbitChain || - isStylusTestnetV2 || isTestnetOrbitChain const isSupported = @@ -390,7 +381,6 @@ export function isNetwork(chainId: ChainId) { // Orbit chains isOrbitChain, isTestnet, - isStylusTestnetV2, // General isSupported, // Core Chain is a chain category for the UI @@ -445,7 +435,7 @@ function isArbitrumChain(chain: L1Network | L2Network): chain is L2Network { export const TELEPORT_ALLOWLIST: { [id: number]: number[] } = { [ChainId.Ethereum]: [1380012617, 70700], // Rari and PopApex - [ChainId.Sepolia]: [ChainId.StylusTestnetV2] + [ChainId.Sepolia]: [] } export function getChildChainIds(chain: L2Network | L1Network) { diff --git a/packages/arb-token-bridge-ui/src/util/orbitChainsList.ts b/packages/arb-token-bridge-ui/src/util/orbitChainsList.ts index b7cfa67939..51f307bd7b 100644 --- a/packages/arb-token-bridge-ui/src/util/orbitChainsList.ts +++ b/packages/arb-token-bridge-ui/src/util/orbitChainsList.ts @@ -727,8 +727,9 @@ export function getOrbitChains( export function getInboxAddressFromOrbitChainId(chainId: number) { return ( - l2Networks[chainId]?.ethBridge.inbox ?? // for stylus testnet v2 - getOrbitChains().find(chain => chain.chainID === chainId)?.ethBridge.inbox // for other custom orbit chains + getOrbitChains() + // + .find(chain => chain.chainID === chainId)?.ethBridge.inbox ) } diff --git a/packages/arb-token-bridge-ui/src/util/wagmi/getWagmiChain.ts b/packages/arb-token-bridge-ui/src/util/wagmi/getWagmiChain.ts index 425ab16148..a0832597c7 100644 --- a/packages/arb-token-bridge-ui/src/util/wagmi/getWagmiChain.ts +++ b/packages/arb-token-bridge-ui/src/util/wagmi/getWagmiChain.ts @@ -7,7 +7,6 @@ import { holesky, arbitrumNova, arbitrumSepolia, - stylusTestnetV2, localL1Network, localL2Network } from './wagmiAdditionalNetworks' @@ -17,7 +16,6 @@ import { orbitChains } from '../orbitChainsList' export function getWagmiChain(chainId: number): Chain { const customChain = getCustomChainFromLocalStorageById(chainId) - // excluding Stylus because its part of the SDK const orbitChain = orbitChains[chainId] if (customChain) { @@ -48,9 +46,6 @@ export function getWagmiChain(chainId: number): Chain { case ChainId.ArbitrumSepolia: return arbitrumSepolia - case ChainId.StylusTestnetV2: - return stylusTestnetV2 - // Local networks case ChainId.Local: return localL1Network diff --git a/packages/arb-token-bridge-ui/src/util/wagmi/setup.ts b/packages/arb-token-bridge-ui/src/util/wagmi/setup.ts index 834bc14aac..449a115a96 100644 --- a/packages/arb-token-bridge-ui/src/util/wagmi/setup.ts +++ b/packages/arb-token-bridge-ui/src/util/wagmi/setup.ts @@ -8,7 +8,6 @@ import { sepolia, arbitrumNova, arbitrumSepolia, - stylusTestnetV2, localL1Network as local, localL2Network as arbitrumLocal, holesky @@ -37,7 +36,6 @@ const chainList = isTestingEnvironment arbitrumSepolia, holesky, // Orbit chains - stylusTestnetV2, ...wagmiOrbitChains, // add local environments during testing local, @@ -52,7 +50,6 @@ const chainList = isTestingEnvironment sepolia, arbitrumSepolia, holesky, - stylusTestnetV2, ...wagmiOrbitChains, ...customChains ] diff --git a/packages/arb-token-bridge-ui/src/util/wagmi/wagmiAdditionalNetworks.ts b/packages/arb-token-bridge-ui/src/util/wagmi/wagmiAdditionalNetworks.ts index 03549e82cd..d8c6ca9d6f 100644 --- a/packages/arb-token-bridge-ui/src/util/wagmi/wagmiAdditionalNetworks.ts +++ b/packages/arb-token-bridge-ui/src/util/wagmi/wagmiAdditionalNetworks.ts @@ -104,27 +104,6 @@ export const arbitrumNova: Chain = { } } -export const stylusTestnetV2: Chain = { - id: ChainId.StylusTestnetV2, - name: 'Stylus Testnet v2', - network: 'stylus-testnet-v2', - nativeCurrency: ether, - rpcUrls: { - default: { - http: [rpcURLs[ChainId.StylusTestnetV2]!] - }, - public: { - http: [rpcURLs[ChainId.StylusTestnetV2]!] - } - }, - blockExplorers: { - default: { - name: 'Blockscout', - url: 'https://stylusv2-explorer.arbitrum.io' - } - } -} - /** * For e2e testing */