From c73d4761fa4aaa05cdc87ba2960a3a4d98ecf192 Mon Sep 17 00:00:00 2001 From: Sahil K <86316370+sk-enya@users.noreply.github.com> Date: Fri, 16 Jun 2023 03:20:08 +0530 Subject: [PATCH] Gateway: cleanup Moobeam support for Testnet / Mainnet (#955) * fix for mui version and typescript crashes. * bobabeam / bobabase cleanup * cleaning up bobabeam, bobabase register address. * console cleaning * updated the test cases fixes. --- packages/boba/gateway/.env.example | 9 -- packages/boba/gateway/package.json | 2 +- .../boba/gateway/src/actions/networkAction.js | 2 +- .../global/table/{index.tsx => index.js} | 25 +----- .../components/icons/chain/L1/MoonbaseIcon.js | 55 ------------ .../components/icons/chain/L1/MoonbeamIcon.js | 36 -------- .../components/icons/chain/L2/BobabaseIcon.js | 80 ------------------ .../components/icons/chain/L2/BobabeamIcon.js | 55 ------------ .../notificationBanner/bannerConfig.ts | 4 - .../{PageHeader.tsx => PageHeader.js} | 18 ++-- .../pageTitle/{PageTitle.tsx => PageTitle.js} | 9 +- .../modals/deposit/steps/BridgeAlert.tsx | 4 +- .../deposit/steps/InputStepMultiChain.js | 3 +- .../modals/deposit/steps/alertConfig.ts | 3 - .../__snapshots__/bobaBeamAlert.test.tsx.snap | 33 +------- .../steps/tests/bobaBeamAlert.test.tsx | 35 +------- .../src/containers/wallet/token/Token.js | 2 - packages/boba/gateway/src/hooks/useNetwork.js | 1 - packages/boba/gateway/src/images/moonbase.png | Bin 27692 -> 0 bytes .../gateway/src/reducers/networkReducer.js | 2 +- .../boba/gateway/src/services/app.service.js | 23 +---- .../gateway/src/services/networkService.js | 1 - .../boba/gateway/src/util/amountConvert.js | 6 +- packages/boba/gateway/src/util/coinImage.ts | 4 - packages/boba/gateway/src/util/constant.ts | 5 +- .../src/util/network/config/moonbeam.js | 68 --------------- .../gateway/src/util/network/network.util.js | 63 ++------------ ...c10A60af35a07f0EA8Be3106a4D81014b21a0.json | 68 --------------- ...0bF3a1411AC973A606f90B2d1ee0840e5979B.json | 46 ---------- .../register/addresses/layerZeroMainnet.json | 20 +---- .../register/addresses/layerZeroTestnet.json | 22 +---- yarn.lock | 32 +++++-- 32 files changed, 66 insertions(+), 670 deletions(-) rename packages/boba/gateway/src/components/global/table/{index.tsx => index.js} (79%) delete mode 100644 packages/boba/gateway/src/components/icons/chain/L1/MoonbaseIcon.js delete mode 100644 packages/boba/gateway/src/components/icons/chain/L1/MoonbeamIcon.js delete mode 100644 packages/boba/gateway/src/components/icons/chain/L2/BobabaseIcon.js delete mode 100644 packages/boba/gateway/src/components/icons/chain/L2/BobabeamIcon.js rename packages/boba/gateway/src/components/pageHeader/{PageHeader.tsx => PageHeader.js} (91%) rename packages/boba/gateway/src/components/pageTitle/{PageTitle.tsx => PageTitle.js} (55%) delete mode 100644 packages/boba/gateway/src/images/moonbase.png delete mode 100644 packages/boba/gateway/src/util/network/config/moonbeam.js delete mode 100644 packages/boba/register/addresses/addressBobaBeam_0x564c10A60af35a07f0EA8Be3106a4D81014b21a0.json delete mode 100644 packages/boba/register/addresses/addressesBobaBase_0xF8d0bF3a1411AC973A606f90B2d1ee0840e5979B.json diff --git a/packages/boba/gateway/.env.example b/packages/boba/gateway/.env.example index b63f9cc849..06b216769e 100644 --- a/packages/boba/gateway/.env.example +++ b/packages/boba/gateway/.env.example @@ -22,15 +22,6 @@ REACT_APP_DISABLE_VE_DAO=1 # to disable the walletConnect set below flat to 1. REACT_APP_DISABLE_WALLETCONNECT=1 - -# to show boba beam Alert, DEPOSIT METHODS -# 1 - TO SHOW ALERT 0 - TO HIDE ALERT -REACT_APP_BOBA_BEAM_STATUS=1 - # to show fantom opera Alert, DEPOSIT METHODS # 1 - TO SHOW ALERT 0 - TO HIDE ALERT REACT_APP_BOBA_OPERA_STATUS=1=1 - -# TO remove boba beam features from gateway -# 1 - TO REMOVE moonbeam, boba beam support from gateway. -REACT_APP_DISABLE_BOBA_BEAM=0 diff --git a/packages/boba/gateway/package.json b/packages/boba/gateway/package.json index cac8122483..05fab48a36 100644 --- a/packages/boba/gateway/package.json +++ b/packages/boba/gateway/package.json @@ -26,7 +26,7 @@ "@eth-optimism/contracts": "0.5.11", "@eth-optimism/core-utils": "0.8.1", "@ethersproject/units": "^5.5.0", - "@mui/base": "^5.0.0-alpha.67", + "@mui/base": "5.0.0-alpha.72", "@mui/icons-material": "^5.11.16", "@mui/material": "^5.12.2", "@mui/styles": "^5.3.0", diff --git a/packages/boba/gateway/src/actions/networkAction.js b/packages/boba/gateway/src/actions/networkAction.js index 6879761471..cb6f6f6525 100644 --- a/packages/boba/gateway/src/actions/networkAction.js +++ b/packages/boba/gateway/src/actions/networkAction.js @@ -247,7 +247,7 @@ export function getAllAddresses() { /********************************/ /** * @params - * network - ethereum, bnb, fantom, avax, moonbase, moonbeam + * network - ethereum, bnb, fantom, avax * networkType - MAINNET, TESTNET */ export function setNetwork(payload) { diff --git a/packages/boba/gateway/src/components/global/table/index.tsx b/packages/boba/gateway/src/components/global/table/index.js similarity index 79% rename from packages/boba/gateway/src/components/global/table/index.tsx rename to packages/boba/gateway/src/components/global/table/index.js index ca37486414..a74cbe6c5c 100644 --- a/packages/boba/gateway/src/components/global/table/index.tsx +++ b/packages/boba/gateway/src/components/global/table/index.js @@ -34,17 +34,8 @@ const TableRow = styled(Row)` margin-right: 0px; } ` -type TableHeaderOptionType = { - name: string - tooltip: string - width: number -} - -type TableHeaderType = { - options: TableHeaderOptionType[] -} -export const TableHeader = ({ options }: TableHeaderType) => { +export const TableHeader = ({ options }) => { return ( {options?.map((option) => { @@ -66,18 +57,8 @@ export const TableHeader = ({ options }: TableHeaderType) => { ) } -type TableContentOptionType = { - content: any - width: number -} - -type TableContentType = { - options: TableContentOptionType[] - mobileOptions?: number[] -} - -export const TableContent = ({ options, mobileOptions }: TableContentType) => { - const theme = useTheme() as any +export const TableContent = ({ options, mobileOptions }) => { + const theme = useTheme() const isMobile = useMediaQuery(theme.breakpoints.down('md')) const currentOptions = isMobile && mobileOptions ? mobileOptions.map((i) => options[i]) : options diff --git a/packages/boba/gateway/src/components/icons/chain/L1/MoonbaseIcon.js b/packages/boba/gateway/src/components/icons/chain/L1/MoonbaseIcon.js deleted file mode 100644 index 468746fa0f..0000000000 --- a/packages/boba/gateway/src/components/icons/chain/L1/MoonbaseIcon.js +++ /dev/null @@ -1,55 +0,0 @@ -import * as React from "react" - -function MoonbaseIcon({ selected = false }) { - - if (!selected) { - return - - - - - - - - - - - - - - - - - - - - - - - - - } - - return ( - - - - - - - - - - - - - - - - - - - ) -} - -export default MoonbaseIcon diff --git a/packages/boba/gateway/src/components/icons/chain/L1/MoonbeamIcon.js b/packages/boba/gateway/src/components/icons/chain/L1/MoonbeamIcon.js deleted file mode 100644 index c6f9613125..0000000000 --- a/packages/boba/gateway/src/components/icons/chain/L1/MoonbeamIcon.js +++ /dev/null @@ -1,36 +0,0 @@ -import * as React from "react" - -function MoonbeamIcon({ selected = false }) { - - if (!selected) { - return - - - - - - - - - - - - - } - - return ( - - - - - - - - - - - - ) -} - -export default MoonbeamIcon diff --git a/packages/boba/gateway/src/components/icons/chain/L2/BobabaseIcon.js b/packages/boba/gateway/src/components/icons/chain/L2/BobabaseIcon.js deleted file mode 100644 index 846fd908b7..0000000000 --- a/packages/boba/gateway/src/components/icons/chain/L2/BobabaseIcon.js +++ /dev/null @@ -1,80 +0,0 @@ -import * as React from "react" - -function BobabaseIcon({ selected = false }) { - - - if (!selected) { - return - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - } - - return ( - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ) -} - -export default BobabaseIcon diff --git a/packages/boba/gateway/src/components/icons/chain/L2/BobabeamIcon.js b/packages/boba/gateway/src/components/icons/chain/L2/BobabeamIcon.js deleted file mode 100644 index 5224d2bbcf..0000000000 --- a/packages/boba/gateway/src/components/icons/chain/L2/BobabeamIcon.js +++ /dev/null @@ -1,55 +0,0 @@ -import * as React from "react" - -function BobaBeamIcon({ selected = false }) { - - if (!selected) { - return - - - - - - - - - - - - - - - - - - - - - - } - - return ( - - - - - - - - - - - - - - - - - - - - - - ) -} - -export default BobaBeamIcon diff --git a/packages/boba/gateway/src/components/notificationBanner/bannerConfig.ts b/packages/boba/gateway/src/components/notificationBanner/bannerConfig.ts index 821414e624..febbf595c3 100644 --- a/packages/boba/gateway/src/components/notificationBanner/bannerConfig.ts +++ b/packages/boba/gateway/src/components/notificationBanner/bannerConfig.ts @@ -6,10 +6,6 @@ interface BannerContent { } export const BannerConfig: Record = { - [NETWORK.MOONBEAM]: { - message: `Bobabeam is being wound down & will no longer be available, starting May 25th`, - content: `Bobabeam is being wound down & will no longer be available, starting May 25th. For users of Bobabeam or Bobabeam applications you will need to transfer all your funds to Moonbeam mainnet before May 15th or risk permanently losing access to any assets on Bobabeam.`, - }, [NETWORK.FANTOM]: { message: `BobaOpera is being wound down & will no longer be available, starting June 25th`, content: `BobaOpera is being wound down & will no longer be available starting June 25th. For users of BobaOpera or BobaOpera applications you will need to transfer all your funds to Fantom mainnet before June 15th or risk permanently losing access to any assets on BobaOpera.`, diff --git a/packages/boba/gateway/src/components/pageHeader/PageHeader.tsx b/packages/boba/gateway/src/components/pageHeader/PageHeader.js similarity index 91% rename from packages/boba/gateway/src/components/pageHeader/PageHeader.tsx rename to packages/boba/gateway/src/components/pageHeader/PageHeader.js index 780a70fbc9..86fb4a94cb 100644 --- a/packages/boba/gateway/src/components/pageHeader/PageHeader.tsx +++ b/packages/boba/gateway/src/components/pageHeader/PageHeader.js @@ -37,20 +37,16 @@ const useStyles = makeStyles({ }, }) -type PageHeaderType = { - maintenance: boolean -} - -const PageHeader = ({ maintenance }: PageHeaderType): JSX.Element => { +const PageHeader = ({ maintenance }) => { const classes = useStyles() - const [open, setOpen] = useState(false) - const [walletOpen, setWalletOpen] = useState(false) - const [feeOpen, setFeeOpen] = useState(false) + const [open, setOpen] = useState(false) + const [walletOpen, setWalletOpen] = useState(false) + const [feeOpen, setFeeOpen] = useState(false) const theme = useTheme() - const accountEnabled: boolean = useSelector(selectAccountEnabled()) - const layer: 'L1' | 'L2' = useSelector(selectLayer()) - const monsterNumber: number = useSelector(selectMonster()) + const accountEnabled = useSelector(selectAccountEnabled()) + const layer = useSelector(selectLayer()) + const monsterNumber = useSelector(selectMonster()) const isMobile = useMediaQuery(theme.breakpoints.down('md')) const Logo = monsterNumber > 0 ? BobaLogoM : BobaLogo diff --git a/packages/boba/gateway/src/components/pageTitle/PageTitle.tsx b/packages/boba/gateway/src/components/pageTitle/PageTitle.js similarity index 55% rename from packages/boba/gateway/src/components/pageTitle/PageTitle.tsx rename to packages/boba/gateway/src/components/pageTitle/PageTitle.js index cdd2deaab7..8af68ac588 100644 --- a/packages/boba/gateway/src/components/pageTitle/PageTitle.tsx +++ b/packages/boba/gateway/src/components/pageTitle/PageTitle.js @@ -1,13 +1,8 @@ -import { Typography, Box, BoxProps } from '@mui/material' +import { Typography, Box } from '@mui/material' import React from 'react' import * as S from './PageTitle.styles' -interface PageTitleProps { - title: string - sx?: BoxProps['sx'] -} - -const PageTitle = ({ title, sx }: PageTitleProps): JSX.Element => { +const PageTitle = ({ title, sx }) => { return ( diff --git a/packages/boba/gateway/src/containers/modals/deposit/steps/BridgeAlert.tsx b/packages/boba/gateway/src/containers/modals/deposit/steps/BridgeAlert.tsx index 8bd3f2f819..c27c1a563a 100644 --- a/packages/boba/gateway/src/containers/modals/deposit/steps/BridgeAlert.tsx +++ b/packages/boba/gateway/src/containers/modals/deposit/steps/BridgeAlert.tsx @@ -3,7 +3,7 @@ import React from 'react' import { useSelector } from 'react-redux' import { selectActiveNetwork } from 'selectors' import styled from 'styled-components' -import { BOBABEAM_STATUS, BOBAOPERA_STATUS } from 'util/constant' +import { BOBAOPERA_STATUS } from 'util/constant' import { bridgeAlerts } from './alertConfig' const AlertText = styled(Text)` @@ -18,7 +18,7 @@ const BridgeAlert = () => { const alertCaption = bridgeAlerts[activeNetwork] - if (!!Number(BOBABEAM_STATUS) || !!Number(BOBAOPERA_STATUS)) { + if (!!Number(BOBAOPERA_STATUS)) { return {alertCaption} } diff --git a/packages/boba/gateway/src/containers/modals/deposit/steps/InputStepMultiChain.js b/packages/boba/gateway/src/containers/modals/deposit/steps/InputStepMultiChain.js index 08884d8ca5..2bb55bc693 100644 --- a/packages/boba/gateway/src/containers/modals/deposit/steps/InputStepMultiChain.js +++ b/packages/boba/gateway/src/containers/modals/deposit/steps/InputStepMultiChain.js @@ -41,8 +41,7 @@ function InputStepMultiChain({ handleClose, token, isBridge, openTokenPicker }) const options = [ { value: 'BNB', label: 'BNB', title: 'BNB', image: getImageComponent("BNB") }, { value: 'Avalanche', label: 'Avalanche', title: 'Avalanche', image: getImageComponent('AVAX') }, - { value: 'Fantom', label: 'Fantom', title: 'Fantom', image: getImageComponent('FTM') }, - { value: 'Moonbeam', label: 'Moonbeam', title: 'Moonbeam', image: getImageComponent('GLMR') }, + { value: 'Fantom', label: 'Fantom', title: 'Fantom', image: getImageComponent('FTM') } ].filter(i => networkService.supportedAltL1Chains.includes(i.value)) const dispatch = useDispatch() diff --git a/packages/boba/gateway/src/containers/modals/deposit/steps/alertConfig.ts b/packages/boba/gateway/src/containers/modals/deposit/steps/alertConfig.ts index 82c1a824f8..0fd3b5f2cd 100644 --- a/packages/boba/gateway/src/containers/modals/deposit/steps/alertConfig.ts +++ b/packages/boba/gateway/src/containers/modals/deposit/steps/alertConfig.ts @@ -1,9 +1,6 @@ import { NETWORK } from 'util/network/network.util' export const bridgeAlerts = { - [NETWORK.MOONBEAM]: `For users of Bobabeam or Bobabeam applications - you will need to transfer all your funds to Moonbeam mainnet before May - 15th or risk permanently losing access to any assets on Bobabeam`, [NETWORK.FANTOM]: `For users of BobaOpera or BobaOpera applications you will need to transfer all your funds to Fantom mainnet before June 15th or risk permanently losing access to any assets on BobaOpera`, diff --git a/packages/boba/gateway/src/containers/modals/deposit/steps/tests/__snapshots__/bobaBeamAlert.test.tsx.snap b/packages/boba/gateway/src/containers/modals/deposit/steps/tests/__snapshots__/bobaBeamAlert.test.tsx.snap index 29438781f8..13a25ee32d 100644 --- a/packages/boba/gateway/src/containers/modals/deposit/steps/tests/__snapshots__/bobaBeamAlert.test.tsx.snap +++ b/packages/boba/gateway/src/containers/modals/deposit/steps/tests/__snapshots__/bobaBeamAlert.test.tsx.snap @@ -1,8 +1,8 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`BobaBeamAlert should match the snapshot disabled from env params 1`] = ``; +exports[`BridgeAlert should match the snapshot disabled from env params 1`] = ``; -exports[`BobaBeamAlert should match the snapshot when active network is ethereum 1`] = ` +exports[`BridgeAlert should match the snapshot when active network is ethereum 1`] = ` .c0 { padding: 0px; @@ -25,34 +25,7 @@ exports[`BobaBeamAlert should match the snapshot when active network is ethereum `; -exports[`BobaBeamAlert should match the snapshot when active network is moonbeam 1`] = ` - - .c0 { - padding: 0px; - margin: 0px; - font-weight: 400; - font-size: 0.9rem; - line-height: 1.25; -} - -.c1 { - color: yellow; - font-size: 16px; - font-weight: 700; - margin: 5px 0px; -} - -

- For users of Bobabeam or Bobabeam applications - you will need to transfer all your funds to Moonbeam mainnet before May - 15th or risk permanently losing access to any assets on Bobabeam -

- -`; - -exports[`BobaBeamAlert should match the snapshot when active network is opera 1`] = ` +exports[`BridgeAlert should match the snapshot when active network is opera 1`] = ` .c0 { padding: 0px; diff --git a/packages/boba/gateway/src/containers/modals/deposit/steps/tests/bobaBeamAlert.test.tsx b/packages/boba/gateway/src/containers/modals/deposit/steps/tests/bobaBeamAlert.test.tsx index ec2e73d2a5..9765c144c4 100644 --- a/packages/boba/gateway/src/containers/modals/deposit/steps/tests/bobaBeamAlert.test.tsx +++ b/packages/boba/gateway/src/containers/modals/deposit/steps/tests/bobaBeamAlert.test.tsx @@ -3,7 +3,7 @@ import { render } from '@testing-library/react' import Theme from 'themes' import { Provider } from 'react-redux' import configureStore from 'redux-mock-store' -import BobaBeamAlert from '../BridgeAlert' +import BridgeAlert from '../BridgeAlert' import { NETWORK } from 'util/network/network.util' import * as constants from 'util/constant' @@ -20,18 +20,14 @@ const renderComponent = (state: any) => { })} > - + ) } -describe('BobaBeamAlert', () => { +describe('BridgeAlert', () => { test('should match the snapshot when active network is ethereum', () => { - Object.defineProperty(constants, 'BOBABEAM_STATUS', { - value: 1, - writable: true, - }) Object.defineProperty(constants, 'BOBAOPERA_STATUS', { value: 1, writable: true, @@ -44,28 +40,7 @@ describe('BobaBeamAlert', () => { expect(asFragment()).toMatchSnapshot() }) - test('should match the snapshot when active network is moonbeam', () => { - Object.defineProperty(constants, 'BOBABEAM_STATUS', { - value: 1, - writable: true, - }) - Object.defineProperty(constants, 'BOBAOPERA_STATUS', { - value: 1, - writable: true, - }) - const { asFragment } = renderComponent({ - network: { - activeNetwork: NETWORK.MOONBEAM, - }, - }) - expect(asFragment()).toMatchSnapshot() - }) - test('should match the snapshot when active network is opera', () => { - Object.defineProperty(constants, 'BOBABEAM_STATUS', { - value: 1, - writable: true, - }) Object.defineProperty(constants, 'BOBAOPERA_STATUS', { value: 1, writable: true, @@ -79,10 +54,6 @@ describe('BobaBeamAlert', () => { }) test('should match the snapshot disabled from env params', () => { - Object.defineProperty(constants, 'BOBABEAM_STATUS', { - value: 0, - writable: true, - }) Object.defineProperty(constants, 'BOBAOPERA_STATUS', { value: 0, writable: true, diff --git a/packages/boba/gateway/src/containers/wallet/token/Token.js b/packages/boba/gateway/src/containers/wallet/token/Token.js index 0825f7930b..00b6f1d4ed 100644 --- a/packages/boba/gateway/src/containers/wallet/token/Token.js +++ b/packages/boba/gateway/src/containers/wallet/token/Token.js @@ -141,8 +141,6 @@ function TokenPage({ return 'fantom' } else if (['BNB', 'tBNB'].includes(i.symbolL1)) { return 'binancecoin' - } else if (['DEV', 'GLMR'].includes(i.symbolL1)) { - return 'moonbeam' } else { return i.symbolL1.toLowerCase() } diff --git a/packages/boba/gateway/src/hooks/useNetwork.js b/packages/boba/gateway/src/hooks/useNetwork.js index 853dc63f88..894a3a6d38 100644 --- a/packages/boba/gateway/src/hooks/useNetwork.js +++ b/packages/boba/gateway/src/hooks/useNetwork.js @@ -40,7 +40,6 @@ const useNetwork = () => { networkIcon: icon, })); } else if (queryParams.network && queryParams.chain) { - console.log(NETWORK_TYPE) let type = Object.values(NETWORK_TYPE).includes(queryParams.network) ? queryParams.network : NETWORK_TYPE.MAINNET; let chain = Object.values(NETWORK).includes(queryParams.chain) ? queryParams.chain : NETWORK.ETHEREUM; diff --git a/packages/boba/gateway/src/images/moonbase.png b/packages/boba/gateway/src/images/moonbase.png deleted file mode 100644 index e4961a5a622bc2488069c2c761f12f1d10999030..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 27692 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 { const formattedNumber = scaledNum.toFixed(2); const exponent = ['', 'k', 'M', 'B', 'T'][exp] || ''; return isNaN(formattedNumber) ? '0' : formattedNumber + exponent; -} \ No newline at end of file +} diff --git a/packages/boba/gateway/src/util/coinImage.ts b/packages/boba/gateway/src/util/coinImage.ts index 58648348aa..8d35831b2a 100644 --- a/packages/boba/gateway/src/util/coinImage.ts +++ b/packages/boba/gateway/src/util/coinImage.ts @@ -1,6 +1,5 @@ import TESTLogo from 'images/test.svg' import mttLogo from 'images/mtt.png' -import moonbase from 'images/moonbase.png' export const getCoinImage = (symbol: string): string => { const logoURIbase = @@ -12,9 +11,6 @@ export const getCoinImage = (symbol: string): string => { if (symbol === 'mtt') { url = mttLogo } - if (symbol === 'DEV') { - url = moonbase - } return url } diff --git a/packages/boba/gateway/src/util/constant.ts b/packages/boba/gateway/src/util/constant.ts index 323d50808c..29dfd654e8 100644 --- a/packages/boba/gateway/src/util/constant.ts +++ b/packages/boba/gateway/src/util/constant.ts @@ -28,8 +28,6 @@ export const DISABLE_VE_DAO: EnvType = process.env.REACT_APP_DISABLE_VE_DAO // WalletConnect FLAG export const DISABLE_WALLETCONNECT: EnvType = process.env.REACT_APP_DISABLE_WALLETCONNECT -export const BOBABEAM_STATUS: EnvType = - process.env.REACT_APP_BOBA_BEAM_STATUS || 0 export const BOBAOPERA_STATUS: EnvType = process.env.REACT_APP_BOBA_OPERA_STATUS || 0 @@ -115,7 +113,7 @@ export const ROUTES_PATH: RoutesPathType = { export const PER_PAGE: number = 8 -type Network = 'ethereum' | 'bnb' | 'avax' | 'fantom' | 'moonbeam' //we move this to global network type once we define this +type Network = 'ethereum' | 'bnb' | 'avax' | 'fantom' //we move this to global network type once we define this type Page = | 'Bridge' | 'Ecosystem' @@ -141,7 +139,6 @@ export const PAGES_BY_NETWORK: PagesByNetworkType = { bnb: ['Bridge', 'Wallet', 'Earn', 'History'], avax: ['Bridge', 'Wallet', 'Earn', 'History'], fantom: ['Bridge', 'Wallet', 'Earn', 'History'], - moonbeam: ['Bridge', 'Wallet', 'Earn', 'History'], } enum Layer { diff --git a/packages/boba/gateway/src/util/network/config/moonbeam.js b/packages/boba/gateway/src/util/network/config/moonbeam.js deleted file mode 100644 index 21d5e9a497..0000000000 --- a/packages/boba/gateway/src/util/network/config/moonbeam.js +++ /dev/null @@ -1,68 +0,0 @@ -export const moonbeamConfig = { - Testnet: { - OMGX_WATCHER_URL: `https://api-watcher.bobabase.boba.network/`, - META_TRANSACTION: `https://api-meta-transaction.bobabase.boba.network/`, - MM_Label: `BobaBase`, - addressManager: `0xF8d0bF3a1411AC973A606f90B2d1ee0840e5979B`, - L1: { - name: "MoonBase", - chainId: 1287, - chainIdHex: '0x507', - rpcUrl: [ - `https://rpc.api.moonbase.moonbeam.network`, - `https://moonbase-alpha.public.blastapi.io`, - `https://moonbeam-alpha.api.onfinality.io/public`, - ], - transaction: `https://moonbase.moonscan.io/tx/`, - blockExplorerUrl: `https://moonbase.moonscan.io/`, - symbol: 'DEV', - tokenName: 'DEV', - }, - L2: { - name: "BobaBase", - chainId: 1297, - chainIdHex: '0x511', - rpcUrl: `https://bobabase.boba.network`, - blockExplorer: `https://blockexplorer.bobabase.boba.network/`, - transaction: `https://blockexplorer.bobabase.boba.network/tx/`, - blockExplorerUrl: `https://blockexplorer.bobabase.boba.network/`, - symbol: "BOBA", - tokenName: "Boba Token", - }, - gasEstimateAccount: `0xdb5a187FED81c735ddB1F6E47F28f2A5F74639b2`, - twitterFaucetPromotionText: `https://twitter.com/intent/tweet?text=I%27m%20developing%20on%20Bobabase%20for%20Moonbeam%20` - }, - Mainnet: { - OMGX_WATCHER_URL: `https://api-watcher.bobabeam.boba.network/`, - META_TRANSACTION: `https://api-meta-transaction.bobabeam.boba.network/`, - MM_Label: `bobaBeam`, - addressManager: `0x564c10A60af35a07f0EA8Be3106a4D81014b21a0`, - L1: { - name: "MoonBeam", - chainId: 1284, - chainIdHex: '0x504', - rpcUrl: [ - `https://rpc.api.moonbeam.network`, - `https://rpc.ankr.com/moonbeam`, - `https://1rpc.io/glmr`, - ], - transaction: `https://moonscan.io/tx/`, - blockExplorerUrl: `https://moonscan.io/`, - symbol: "GLMR", - tokenName: "GLMR", - }, - L2: { - name: "BobaBeam", - chainId: 1294, - chainIdHex: '0x50E', - rpcUrl: `https://bobabeam.boba.network`, - blockExplorer: `https://blockexplorer.bobabeam.boba.network/`, - transaction: `https://blockexplorer.bobabeam.boba.network/tx/`, - blockExplorerUrl: `https://blockexplorer.bobabeam.boba.network/`, - symbol: "BOBA", - tokenName: "Boba Token", - }, - gasEstimateAccount: `0xdb5a187FED81c735ddB1F6E47F28f2A5F74639b2`, - twitterFaucetPromotionText: `https://twitter.com/intent/tweet?text=I%27m%20developing%20on%20Bobabeam%20for%20Moonbeam%20` - } -} diff --git a/packages/boba/gateway/src/util/network/network.util.js b/packages/boba/gateway/src/util/network/network.util.js index 351494c15d..7cb10d6a09 100644 --- a/packages/boba/gateway/src/util/network/network.util.js +++ b/packages/boba/gateway/src/util/network/network.util.js @@ -4,39 +4,30 @@ import EthereumIcon from 'components/icons/chain/L1/EthereumIcon'; import BNBIcon from 'components/icons/chain/L1/BNBIcon'; import AvalancheIcon from 'components/icons/chain/L1/AvalancheIcon'; import FantomIcon from 'components/icons/chain/L1/FantomIcon'; -import MoonbeamIcon from 'components/icons/chain/L1/MoonbeamIcon'; -import MoonbaseIcon from 'components/icons/chain/L1/MoonbaseIcon'; import BobaIcon from 'components/icons/chain/L2/BobaIcon'; import BobaBNBIcon from 'components/icons/chain/L2/BobaBNBIcon'; import BobaAvaxIcon from 'components/icons/chain/L2/BobaAvaxIcon'; import BobaFantomIcon from 'components/icons/chain/L2/BobaFantomIcon'; -import BobabeamIcon from 'components/icons/chain/L2/BobabeamIcon'; -import BobabaseIcon from 'components/icons/chain/L2/BobabaseIcon'; import { ethereumConfig } from './config/ethereum'; import { bnbConfig } from './config/bnb'; import { fantomConfig } from './config/fantom'; import { avaxConfig } from './config/avax'; -import { moonbeamConfig } from './config/moonbeam'; import { LAYER } from 'util/constant'; export const L1_ICONS = { ethereum: EthereumIcon, bnb: BNBIcon, avax: AvalancheIcon, - fantom: FantomIcon, - moonbeam: MoonbeamIcon, - moonbase: MoonbaseIcon, + fantom: FantomIcon } export const L2_ICONS = { ethereum: BobaIcon, bnb: BobaBNBIcon, avax: BobaAvaxIcon, - fantom: BobaFantomIcon, - moonbeam: BobabeamIcon, - moonbase: BobabaseIcon, + fantom: BobaFantomIcon } @@ -49,8 +40,7 @@ export const NETWORK = { ETHEREUM: 'ETHEREUM', BNB: 'BNB', FANTOM: 'FANTOM', - AVAX: 'AVAX', - MOONBEAM: 'MOONBEAM', + AVAX: 'AVAX' } @@ -134,27 +124,7 @@ export const CHAIN_ID_LIST = { networkType: NETWORK_TYPE.MAINNET, chain: NETWORK.FANTOM, layer: LAYER.L2 - }, - 1287: { - networkType: NETWORK_TYPE.TESTNET, - chain: NETWORK.MOONBEAM, - layer: LAYER.L1 - }, - 1297: { - networkType: NETWORK_TYPE.TESTNET, - chain: NETWORK.MOONBEAM, - layer: LAYER.L2 - }, - 1284: { - networkType: NETWORK_TYPE.MAINNET, - chain: NETWORK.MOONBEAM, - layer: LAYER.L1 - }, - 1294: { - networkType: NETWORK_TYPE.MAINNET, - chain: NETWORK.MOONBEAM, - layer: LAYER.L2 - }, + } } export const NetworkList = { @@ -198,16 +168,6 @@ export const NetworkList = { l1: 'Fantom', l2: 'Bobaopera' } - }, - { - icon: 'moonbeam', - chain: NETWORK.MOONBEAM, - label: 'Moonbeam <> Boba', - key: 'moonbeam', - name: { - l1: 'Moonbeam', - l2: 'Bobabeam' - } } ], Testnet: [ @@ -250,17 +210,7 @@ export const NetworkList = { l1: 'Fantom Testnet', l2: 'Bobaopera Testnet', } - }, - { - icon: 'moonbase', - chain: NETWORK.MOONBEAM, - label: 'Moonbase <> Boba', - key: 'moonbeam', - name: { - l1: 'Moonbase', - l2: 'Bobabase', - } - }, + } ] } @@ -268,8 +218,7 @@ const networkConfig = { [NETWORK.ETHEREUM] : ethereumConfig, [NETWORK.BNB] : bnbConfig, [NETWORK.FANTOM] : fantomConfig, - [NETWORK.AVAX] : avaxConfig, - [NETWORK.MOONBEAM] : moonbeamConfig + [NETWORK.AVAX] : avaxConfig } export const rpcUrls = Object.values(networkConfig).reduce((networkConfigs, networkConfig) => { diff --git a/packages/boba/register/addresses/addressBobaBeam_0x564c10A60af35a07f0EA8Be3106a4D81014b21a0.json b/packages/boba/register/addresses/addressBobaBeam_0x564c10A60af35a07f0EA8Be3106a4D81014b21a0.json deleted file mode 100644 index 0983ab03e1..0000000000 --- a/packages/boba/register/addresses/addressBobaBeam_0x564c10A60af35a07f0EA8Be3106a4D81014b21a0.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "BondManager": "0xcfe333e0e48EC71f1399a76001cf39E0c6A51dA5", - "CanonicalTransactionChain": "0x99C970105cf6EE2e22b563CB86bCA42D05ac7A95", - "ChainStorageContainer-CTC-batches": "0x808fD25dd00D5F8915Ad69326bFD75A6E014f9b3", - "ChainStorageContainer-CTC-queue": "0x1D023D0B9E8aa136241eB8e8827876f51ef49851", - "ChainStorageContainer-SCC-batches": "0x5Ee60822c68CF0966D8Dc53255627216b4ADC30f", - "L1MultiMessageRelayer": "0x3664bC9BA25D0d3911c39d8ae1734b0B5A3495C1", - "AddressManager": "0x564c10A60af35a07f0EA8Be3106a4D81014b21a0", - "OVM_L1CrossDomainMessenger": "0x9182A0AA011f97633d44383F446A5951bDD3f5bf", - "Proxy__L1CrossDomainMessenger": "0x4765f8b50Bbe049045bBA1270dc7A8CDF17165cF", - "Proxy__L1StandardBridge": "0xAf5297f68D48cd2DE37Ee5cbaC0647fbA4132985", - "StateCommitmentChain": "0xAD379B1518f50Fc737536D2Ec2c13E4640e228A8", - "OVM_Sequencer": "0x9a57cd0a2241f3e5074bec89a86db59098d73e6e", - "Deployer": "0xC31ca2482c936d92dd465391B45940e802A86eDc", - "TK_L1BOBA": "0x18D17A9fD652D7d6a59903E23792ab97F832Ed6C", - "TK_L2BOBA": "0x4200000000000000000000000000000000000006", - "TK_L2WBOBA9": "0x74686A29ac7C5703bDC4f9C2DA176DcE55d4DbAC", - "TK_L1GLMR": "0x0000000000000000000000000000000000000000", - "TK_L2GLMR": "0x4200000000000000000000000000000000000023", - "TK_L1ETH.mc": "0xfA9343C3897324496A05fC75abeD6bAC29f8A40f", - "TK_L2ETH.mc": "0x9790a5640c4cca26e8689CC4163d5719C1A79A03", - "TK_L1ETH.wh": "0xab3f0245B83feB11d15AAffeFD7AD465a59817eD", - "TK_L2ETH.wh": "0x03Ee748da8951c976BfC06190b7e646c8Cc3f2d1", - "TK_L1WBTC.mc": "0x922D641a426DcFFaeF11680e5358F34d97d112E1", - "TK_L2WBTC.mc": "0x7D669C169B7161511CE061da3ad986525Ea179D6", - "TK_L1WBTC.wh": "0xE57eBd2d67B462E9926e04a8e33f01cD0D64346D", - "TK_L2WBTC.wh": "0x1c98d96cfcDc4599D5FbB61Aa30301d94fcA8002", - "TK_L1USDC.mc": "0x818ec0A7Fe18Ff94269904fCED6AE3DaE6d6dC0b", - "TK_L2USDC.mc": "0x078b2D8ce51eD85400959FC5c362d1c53A41C375", - "TK_L1USDC.wh": "0x931715FEE2d06333043d11F658C8CE934aC61D0c", - "TK_L2USDC.wh": "0xEa89117fC0150f9042b0aE0C3058ea6dB970A780", - "L1CrossDomainMessengerFast": "0xFd4892a500303f5Bfe7C78D49a6aB3dddfCccb92", - "Proxy__L1CrossDomainMessengerFast": "0x17d02C3e6cB69225d83d0bADEb0fC09aE735CA3b", - "L2LiquidityPool": "0x079D6565eEE0129fAe337B52C217951f70c58CFa", - "L1LiquidityPool": "0x1c98d96cfcDc4599D5FbB61Aa30301d94fcA8002", - "Proxy__L1LiquidityPool": "0x3fBc139f80a474c9B19A734e9ABb285b6550dF58", - "Proxy__L2LiquidityPool": "0xD7d057F1b1caBB637BFc81F9bf1Fb74f54941E65", - "L2TokenPool": "0x5Ee60822c68CF0966D8Dc53255627216b4ADC30f", - "L1Message": "0x3bdF3E4543eac155dF6d7F0e5cf55a90E468a33b", - "L2Message": "0x99C970105cf6EE2e22b563CB86bCA42D05ac7A95", - "AtomicSwap": "0xAD379B1518f50Fc737536D2Ec2c13E4640e228A8", - "L2ERC721": "0xD5Ad3B843c4dE06762972a6c1d15BD0Ac96E0231", - "L2ERC721Reg": "0xcfe333e0e48EC71f1399a76001cf39E0c6A51dA5", - "L1NFTBridge": "0x65802425d28168e8148B5D13c35e7490Ac52524e", - "L2NFTBridge": "0xFbcc3F48a6Ca8D169f318360E5d9fe00e553F543", - "Proxy__L1NFTBridge": "0x7f61EB6FFe966E8c14AFb8754Bf0825eb6f54bd7", - "Proxy__L2NFTBridge": "0x9182A0AA011f97633d44383F446A5951bDD3f5bf", - "L1MultiMessageRelayerFast": "0xE2EE964E39720f78Cd75BC146Ed078D301981759", - "DiscretionaryExitFee": "0xC828226424E9D9686bddC0fBA91c4e234b3e6F55", - "FeedRegistry": "0xF60bc956315f4E1EA63B925bA4d857CDd95f3532", - "BOBAUSD_Aggregator": "0xAf5297f68D48cd2DE37Ee5cbaC0647fbA4132985", - "BobaBillingContract": "0xf237D39597B41c9E426e1F23a6aC148DC2a9176e", - "Proxy__BobaBillingContract": "0xb210a4BB024196dC8c5f6f407220cA83e65e45FE", - "Boba_GasPriceOracle":"0xE7EEf1eDA522feE7C7752369B0CEE134CdD6AC16", - "Proxy__Boba_GasPriceOracle":"0x4200000000000000000000000000000000000024", - "BobaTuringCredit": "0x4200000000000000000000000000000000000021", - "Proxy__BobaTuringCredit": "0x4200000000000000000000000000000000000020", - "L2StandardTokenFactory": "0xD2ae16D8c66ac7bc1Cf3c9e5d6bfE5f76BeDb826", - "AggregatorHCHepler": "0x45c5dB3F5AC1579DD43404e47562641b61A6AC77", - "Proxy__ETHUSD_AggregatorHC": "0x9e28dE704435871af476460B456Ec741fE5DE24f", - "ETHUSD_AggregatorHC": "0x7C455414e0c0A5B13c9cCAbCB9DA9c477DfAdC27", - "Proxy__GLMRUSD_AggregatorHC": "0x2dA3721dcd04A17195de07D21bCFCCBBFDF4Fc93", - "GLMRUSD_AggregatorHC": "0xFe18D18Ff1c0ce6f6FEDb90433E89B9ab9D6A382", - "Proxy__BTCUSD_AggregatorHC": "0x7590CdA8585150Bd1228497AA21D8365400c20cb", - "BTCUSD_AggregatorHC": "0x48D1B051540F2bb5f9aa6e55328722A3d2166aeD", - "Proxy__USDCUSD_AggregatorHC": "0x9285eF61F09c2CAD195FEa8834C3E2bB8E442BFF", - "USDCUSD_AggregatorHC": "0x3Adfb1265C06fbE8De8087bf7f6634a42fc6C0F7" -} diff --git a/packages/boba/register/addresses/addressesBobaBase_0xF8d0bF3a1411AC973A606f90B2d1ee0840e5979B.json b/packages/boba/register/addresses/addressesBobaBase_0xF8d0bF3a1411AC973A606f90B2d1ee0840e5979B.json deleted file mode 100644 index c7cbd82e51..0000000000 --- a/packages/boba/register/addresses/addressesBobaBase_0xF8d0bF3a1411AC973A606f90B2d1ee0840e5979B.json +++ /dev/null @@ -1,46 +0,0 @@ -{ - "AddressManager": "0xF8d0bF3a1411AC973A606f90B2d1ee0840e5979B", - "Proxy__L1StandardBridge": "0xEcca5FEd8154420403549f5d8F123fcE69fae806", - "Proxy__L1CrossDomainMessenger": "0x76DB375075F1d5Dcd1D70Fc07F69a5c7b40ab877", - "TK_L1BOBA": "0x1365fd7BcEE84686DBCA71e1571C0d9ad9E64945", - "TK_L2BOBA": "0x4200000000000000000000000000000000000006", - "TK_L1DEV": "0x0000000000000000000000000000000000000000", - "TK_L2DEV": "0x4200000000000000000000000000000000000023", - "TK_L1GLMR": "0x0000000000000000000000000000000000000000", - "TK_L2GLMR": "0x4200000000000000000000000000000000000023", - "L1CrossDomainMessengerFast": "0x7bE12FCB0Fc0979f4DD1A9A1CCec9d0036E634A1", - "Proxy__L1CrossDomainMessengerFast": "0xAE8885D3b7937af9480cd7301925a88Dfb0cE9f6", - "L2LiquidityPool": "0x8D4B01Dd2868F388823c12Edce3dec65c22826ce", - "L1LiquidityPool": "0xf17727d61b93078427D9F381bc87C0F76e03124a", - "Proxy__L1LiquidityPool": "0x569a3e1A4A50D0F53BDF05d50D5FeAB3f716f5A1", - "Proxy__L2LiquidityPool": "0xb227a9FebBa59B8Fe5dF7Ad81afac6E7CdE5a4A5", - "L2TokenPool": "0x152eE45C2eF3E6B303d0603C82b785255D386Fd0", - "L1Message": "0x3C285ACC9CAD39c94CF7E46850bd9098b6f858F5", - "L2Message": "0xECF2d55E35E14eC146f17a17B1D2e082bAA12B40", - "AtomicSwap": "0x2e965d49E69dA6182bdc331b740384CF8745A690", - "L2ERC721": "0x3a93df8eba34AFa4Fb74a09D7cb9BB6E528d2E0C", - "L2ERC721Reg": "0xb73Bc7AbED40236ca53b2225e3FA497c04A0F718", - "L1NFTBridge": "0x3ddBca089BCAf1eF7ef5517c8887d3B2261F1292", - "L2NFTBridge": "0x59e8281F47D4E5B5Dfc2463313B8C5AF654a38b2", - "Proxy__L1NFTBridge": "0x1E12Ba552Ac35351563091737910d9E5d1DaD17a", - "Proxy__L2NFTBridge": "0x8E65834B52c3aCc79206a0F09c4b627BC588f09e", - "L1MultiMessageRelayerFast": "0x874a7Ea9722b96924e186f0263866FA90a7C777b", - "DiscretionaryExitFee": "0x01ce26900fC11aBc2AcF53154772bb251c8aA005", - "FeedRegistry": "0x0d2E819A8E0FC9377d3D488A9480D6C00ADE986F", - "BOBAUSD_Aggregator": "0x66335BA50c757a5b1Ee6FB3c3ed703e4a26ea526", - "BobaBillingContract": "0x17CC69Adc242f9C50132503A2e5d5d9cD4889786", - "Proxy__BobaBillingContract": "0x05C9f36D901594D220311B211fA26DbD58B87717", - "Boba_GasPriceOracle":"0xE7EEf1eDA522feE7C7752369B0CEE134CdD6AC16", - "Proxy__Boba_GasPriceOracle":"0x4200000000000000000000000000000000000024", - "BobaTuringCredit": "0x4200000000000000000000000000000000000021", - "Proxy__BobaTuringCredit": "0x4200000000000000000000000000000000000020", - "AuthenticatedFaucet": "0x8b6A1c0590Ab8A9CED9ADa87Df485eCdd97886E2", - "WBOBA9": "0xc03cc0d0995e7b677348e396F5F1D70Fe8667fCe", - "L2StandardTokenFactory": "0xD2ae16D8c66ac7bc1Cf3c9e5d6bfE5f76BeDb826", - "L1ERC1155Bridge": "0x72F86F1c4157E367354C3E3aEfEf6Af1a6F1Dd6e", - "L2ERC1155Bridge": "0x9f4f7f4E80fc02ecB9C0cE20C8f8a9A5C589A1A9", - "Proxy__L1ERC1155Bridge": "0x1dF39152AC0e81aB100341cACC4dE4c372A550cb", - "Proxy__L2ERC1155Bridge": "0x1dF39152AC0e81aB100341cACC4dE4c372A550cb", - "Teleportation": "0x92F4E3796324b916A69c98c96bBd939af19C4AD2", - "Proxy__Teleportation": "0xd68809330075C792C171C450B983F4D18128e9BF" -} diff --git a/packages/boba/register/addresses/layerZeroMainnet.json b/packages/boba/register/addresses/layerZeroMainnet.json index 4d37610845..2b13e3ac37 100644 --- a/packages/boba/register/addresses/layerZeroMainnet.json +++ b/packages/boba/register/addresses/layerZeroMainnet.json @@ -15,35 +15,26 @@ "Avalanche": { "Layer_Zero_Endpoint": "0x3c2269811836af69497E5F486A85D7316753cf62", "Layer_Zero_ChainId": "106" - }, - "Moonbeam": { - "Layer_Zero_Endpoint": "0x9740FF91F1985D8d2B71494aE1A2f723bb3Ed9E4", - "Layer_Zero_ChainId": "126" } }, "BOBA_Bridges": { - "Mainnet":{ + "Mainnet": { "Proxy__EthBridgeToBNB": "0x1A36E24D61BC1aDa68C21C2Da1aD53EaB8E03e55", "Proxy__EthBridgeToFantom": "0x9DD4202AA5ee9625d1eaa671E2294014dd434E7E", "Proxy__EthBridgeToAvalanche": "0xB0003eB166654f7e57c0463F8D1a438eB238c490", - "Proxy__EthBridgeToMoonbeam": "0x6F537839714761388B6d7ED61Bc09579d5dA2F41", "EthBridgeToBNB": "0x5d7824051Ea90F05eC1c6EcfEF05d5234B59040F", "EthBridgeToFantom": "0xd5c567aC6571aB35568A8E8C73470dFf8Eed939e", "EthBridgeToAvalanche": "0x51C3db474B023e4924133F36152f40a7b6E27f3F", - "EthBridgeToMoonbeam": "0x6482767251d24f309C0C9985E2EA1262465400dE", "Proxy__BNBBridgeToEth": "0x819FF4d9215C9dAC76f5eC676b1355973157eBBa", "Proxy__FantomBridgeToEth": "0x409e3693A23D4331F613c36f6D5f439a5b9834e8", "Proxy__AvalancheBridgeToEth": "0x351F4853A0E94DB055ed6ad5DF1b3590791c1F71", - "Proxy__MoonbeamBridgeToEth": "0x9F868333DB1720Fb1412AFfb1AeF47e8C6cFc8c3", "BNBBridgeToEth": "0x62C1275bf5484d940BF46d1fCC1e1Ad5DbdD5AE5", "FantomBridgeToEth": "0x2164dFc94E0f2EE6C2982045950ed052298D12a0", "AvalancheBridgeToEth": "0xBFcB8A6eD80Ef99a5265B72fdC87f4B4dAA598D3", - "MoonbeamBridgeToEth": "0x05469d879dF44cD83f6923Be12f46E2871dA2DAf", "Eth_TK_BOBA": "0x42bbfa2e77757c645eeaad1655e0911a7553efbc", "BNB_TK_BOBA": "0xE0DB679377A0F5Ae2BaE485DE475c9e1d8A4607D", "Avalanche_TK_BOBA": "0x3cD790449CF7D187a143d4Bd7F4654d4f2403e02", - "Fantom_TK_BOBA": "0x4389b230D15119c347B9E8BEA6d930A21aaDF6BA", - "Moonbeam_TK_BOBA": "0x18D17A9fD652D7d6a59903E23792ab97F832Ed6C" + "Fantom_TK_BOBA": "0x4389b230D15119c347B9E8BEA6d930A21aaDF6BA" }, "BNB": { "Proxy__EthBridgeToBNB": "0x1A36E24D61BC1aDa68C21C2Da1aD53EaB8E03e55", @@ -65,13 +56,6 @@ "Proxy__AvalancheBridgeToEth": "0x351F4853A0E94DB055ed6ad5DF1b3590791c1F71", "AvalancheBridgeToEth": "0xBFcB8A6eD80Ef99a5265B72fdC87f4B4dAA598D3", "Avalanche_TK_BOBA": "0x3cD790449CF7D187a143d4Bd7F4654d4f2403e02" - }, - "Moonbeam": { - "Proxy__EthBridgeToMoonbeam": "0x6F537839714761388B6d7ED61Bc09579d5dA2F41", - "EthBridgeToMoonbeam": "0x6482767251d24f309C0C9985E2EA1262465400dE", - "Proxy__MoonbeamBridgeToEth": "0x9F868333DB1720Fb1412AFfb1AeF47e8C6cFc8c3", - "MoonbeamBridgeToEth": "0x05469d879dF44cD83f6923Be12f46E2871dA2DAf", - "Moonbeam_TK_BOBA": "0x18D17A9fD652D7d6a59903E23792ab97F832Ed6C" } } } diff --git a/packages/boba/register/addresses/layerZeroTestnet.json b/packages/boba/register/addresses/layerZeroTestnet.json index 7041140817..d34012db5d 100644 --- a/packages/boba/register/addresses/layerZeroTestnet.json +++ b/packages/boba/register/addresses/layerZeroTestnet.json @@ -1,6 +1,6 @@ { "Layer_Zero_Protocol": { - "Testnet":{ + "Testnet": { "Layer_Zero_Endpoint": "0xbfD2135BFfbb0B5378b56643c2Df8a87552Bfa23", "Layer_Zero_ChainId": "10121" }, @@ -15,35 +15,26 @@ "Avalanche": { "Layer_Zero_Endpoint": "0x93f54D755A063cE7bB9e6Ac47Eccc8e33411d706", "Layer_Zero_ChainId": "10106" - }, - "Moonbase": { - "Layer_Zero_Endpoint": "0xb23b28012ee92E8dE39DEb57Af31722223034747", - "Layer_Zero_ChainId": "10126" } }, "BOBA_Bridges": { - "Testnet":{ + "Testnet": { "Proxy__EthBridgeToBNB": "0x88F8cD148A4B68d250B62EeB75D9Cccd99624E2C", "Proxy__EthBridgeToFantom": "0x46Df4761959BC78867e1Af47cA8bC7B40B3Cb1A6", "Proxy__EthBridgeToAvalanche": "0x1b588Adb7Ec795f45D9c8BDdc2eA49efAE37AB6a", - "Proxy__EthBridgeToMoonbase": "0x3BB2954d2c2AaeE4832e4a89974DC4E5a5a53C0a", "EthBridgeToBNB": "0xCb91c5157024618FC90017c28fa83F36f266Eb4e", "EthBridgeToFantom": "0xa0fDeB9c88178E35D336042A076CeC12b55054a2", "EthBridgeToAvalanche": "0x2C4Ec0725D9b795A90de46326C7dDb57C1437019", - "EthBridgeToMoonbase": "0x66c8283aECcAbB15f3359961a91783ff8553ee1B", "Proxy__BNBBridgeToEth": "0x37152D3D998ED163f4253FDaBDD9E545F0Ec7c07", "Proxy__FantomBridgeToEth": "0x01F93E4EFa199d4D42A248Db90716214f7283DCb", "Proxy__AvalancheBridgeToEth": "0xec4DE3D3bCbCe89875C1C5d2d7FAd8B2AF5080a7", - "Proxy__MoonbaseBridgeToEth": "0xc60e797bf8166EEF92681fc47cDdd7517293F025", "BNBBridgeToEth": "0xc614A66f82e71758Fa7735C91dAD1088c8362f15", "FantomBridgeToEth": "0x7B23c975195503C9Eb1972e900ac4799B5A504Cb", "AvalancheBridgeToEth": "0x7eD586Db48CB0b60b821462Be6e925CA1b5D271D", - "MoonbaseBridgeToEth": "0xBe9813929AD03bE8955fab157D64f5f784ADfc30", "Eth_TK_BOBA": "0xeCCD355862591CBB4bB7E7dD55072070ee3d0fC1", "BNB_TK_BOBA": "0x89d7128C93933012F0d36D9A5bCae82414318A0D", "Avalanche_TK_BOBA": "0xDA72d93c5645E70437D733d55DdE9CCb5403E4b1", - "Fantom_TK_BOBA": "0x44DcA16c6940D74d12ABFa586E0b6caAC0ceDeF8", - "Moonbase_TK_BOBA": "0x0F59e146b557c2168025E576C2A52f782e88cC6D" + "Fantom_TK_BOBA": "0x44DcA16c6940D74d12ABFa586E0b6caAC0ceDeF8" }, "BNB": { "Proxy__EthBridgeToBNB": "0x88F8cD148A4B68d250B62EeB75D9Cccd99624E2C", @@ -65,13 +56,6 @@ "Proxy__AvalancheBridgeToEth": "0xec4DE3D3bCbCe89875C1C5d2d7FAd8B2AF5080a7", "AvalancheBridgeToEth": "0x7eD586Db48CB0b60b821462Be6e925CA1b5D271D", "Avalanche_TK_BOBA": "0xDA72d93c5645E70437D733d55DdE9CCb5403E4b1" - }, - "Moonbase": { - "Proxy__EthBridgeToMoonbase": "0x3BB2954d2c2AaeE4832e4a89974DC4E5a5a53C0a", - "EthBridgeToMoonbase": "0x66c8283aECcAbB15f3359961a91783ff8553ee1B", - "Proxy__MoonbaseBridgeToEth": "0xc60e797bf8166EEF92681fc47cDdd7517293F025", - "MoonbaseBridgeToEth": "0xBe9813929AD03bE8955fab157D64f5f784ADfc30", - "Moonbase_TK_BOBA": "0x0F59e146b557c2168025E576C2A52f782e88cC6D" } } } diff --git a/yarn.lock b/yarn.lock index cacb6f7bac..fd888267c8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1303,6 +1303,13 @@ dependencies: regenerator-runtime "^0.13.11" +"@babel/runtime@^7.17.2": + version "7.22.5" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.22.5.tgz#8564dd588182ce0047d55d7a75e93921107b57ec" + integrity sha512-ecjvYlnAaZ/KVneE/OdKYBYfgXV3Ptu6zQWmgEF7vwKhQnvVS6bjMD2XYgj+SNvQ1GfK/pjgokfPkC/2CO8CuA== + dependencies: + regenerator-runtime "^0.13.11" + "@babel/template@^7.18.10", "@babel/template@^7.20.7", "@babel/template@^7.4.0", "@babel/template@^7.8.6": version "7.20.7" resolved "https://registry.npmjs.org/@babel/template/-/template-7.20.7.tgz" @@ -1698,7 +1705,7 @@ dependencies: "@emotion/memoize" "^0.8.0" -"@emotion/is-prop-valid@^1.2.1": +"@emotion/is-prop-valid@^1.1.2", "@emotion/is-prop-valid@^1.2.1": version "1.2.1" resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.2.1.tgz#23116cf1ed18bfeac910ec6436561ecb1a3885cc" integrity sha512-61Mf7Ufx4aDxx1xlDeOm8aFFigGHE4z+0sKCa+IHCeZKiyP9RLD0Mmx7m8b9/Cf37f7NAvQOOJAbQQGVr5uERw== @@ -3489,7 +3496,20 @@ call-me-maybe "^1.0.1" glob-to-regexp "^0.3.0" -"@mui/base@5.0.0-beta.4", "@mui/base@^5.0.0-alpha.67": +"@mui/base@5.0.0-alpha.72": + version "5.0.0-alpha.72" + resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.72.tgz#551d64402ee5065cf81fd1388a3e7ab8c426fe3e" + integrity sha512-WCAooa9eqbsC68LhyKtDBRumH4hV1eRZ0A3SDKFHSwYG9fCOdsFv/H1dIYRJM0rwD45bMnuDiG3Qmx7YsTiptw== + dependencies: + "@babel/runtime" "^7.17.2" + "@emotion/is-prop-valid" "^1.1.2" + "@mui/utils" "^5.4.4" + "@popperjs/core" "^2.11.3" + clsx "^1.1.1" + prop-types "^15.7.2" + react-is "^17.0.2" + +"@mui/base@5.0.0-beta.4": version "5.0.0-beta.4" resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-beta.4.tgz#e3f4f4a056b88ab357194a245e223177ce35e0b0" integrity sha512-ejhtqYJpjDgHGEljjMBQWZ22yEK0OzIXNa7toJmmXsP4TT3W7xVy8bTJ0TniPDf+JNjrsgfgiFTDGdlEhV1E+g== @@ -3603,7 +3623,7 @@ resolved "https://registry.npmjs.org/@mui/types/-/types-7.2.4.tgz" integrity sha512-LBcwa8rN84bKF+f5sDyku42w1NTxaPgPyYKODsh01U1fVstTClbUoSA96oyRBnSNyEiAVjKm6Gwx9vjR+xyqHA== -"@mui/utils@^5.11.2", "@mui/utils@^5.13.1": +"@mui/utils@^5.11.2", "@mui/utils@^5.13.1", "@mui/utils@^5.4.4": version "5.13.1" resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.13.1.tgz#86199e46014215f95da046a5ec803f4a39c96eee" integrity sha512-6lXdWwmlUbEU2jUI8blw38Kt+3ly7xkmV9ljzY4Q20WhsJMWiNry9CX8M+TaP/HbtuyR8XKsdMgQW7h7MM3n3A== @@ -4169,7 +4189,7 @@ web3 "^1.2.5" web3-utils "^1.2.5" -"@popperjs/core@^2.11.8": +"@popperjs/core@^2.11.3", "@popperjs/core@^2.11.8": version "2.11.8" resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.8.tgz#6b79032e760a0899cd4204710beede972a3a185f" integrity sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A== @@ -9441,7 +9461,7 @@ clone@^1.0.2: resolved "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz" integrity sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg== -clsx@^1.2.1: +clsx@^1.1.1, clsx@^1.2.1: version "1.2.1" resolved "https://registry.npmjs.org/clsx/-/clsx-1.2.1.tgz" integrity sha512-EcR6r5a8bj6pu3ycsa/E/cKVGuTgZJZdsyUYHOksG/UHIiKfjxzRxYJpyVBwYaQeOvghal9fcc4PidlgzugAQg== @@ -22294,7 +22314,7 @@ react-is@^16.10.2, react-is@^16.13.1, react-is@^16.7.0, react-is@^16.8.4: resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== -react-is@^17.0.1: +react-is@^17.0.1, react-is@^17.0.2: version "17.0.2" resolved "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz" integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==