From 84981042dfe2f2e971febdbf6a8f1318a30c110f Mon Sep 17 00:00:00 2001 From: nezouse Date: Mon, 13 May 2024 13:16:51 +0200 Subject: [PATCH 1/5] =?UTF-8?q?=F0=9F=A7=9A=F0=9F=8F=BB=20Remove=20goerli?= =?UTF-8?q?=20from=20example=20app=20=20multichain=20section?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/example/playwright/with-metamask.ts | 12 +++++------- packages/example/src/pages/Multichain.tsx | 4 ++-- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/packages/example/playwright/with-metamask.ts b/packages/example/playwright/with-metamask.ts index 2db1a2019..0bd914148 100644 --- a/packages/example/playwright/with-metamask.ts +++ b/packages/example/playwright/with-metamask.ts @@ -276,9 +276,7 @@ export const withMetamaskTest = (baseUrl: string) => { await waitForExpect(async () => { expect(await page.isVisible(XPath.text('span', 'Mainnet'))).to.be.true - expect(await page.isVisible(XPath.text('span', 'Goerli'))).to.be.true expect(await page.isVisible(XPath.text('span', 'Optimism'))).to.be.true - expect(await page.isVisible(XPath.text('span', 'Optimism Goerli'))).to.be.true }) }) @@ -286,11 +284,11 @@ export const withMetamaskTest = (baseUrl: string) => { await page.goto(`${baseUrl}multichain`) await waitForExpect(async () => { - expect(await page.isVisible(XPath.text('span', 'Chain id:', 4))).to.be.true - expect(await page.isVisible(XPath.text('span', 'Current block timestamp:', 4))).to.be.true - expect(await page.isVisible(XPath.text('span', 'Current difficulty:', 4))).to.be.true - expect(await page.isVisible(XPath.text('span', 'Current block:', 4))).to.be.true - expect(await page.isVisible(XPath.text('span', 'Ether balance:', 4))).to.be.true + expect(await page.isVisible(XPath.text('span', 'Chain id:', 2))).to.be.true + expect(await page.isVisible(XPath.text('span', 'Current block timestamp:', 2))).to.be.true + expect(await page.isVisible(XPath.text('span', 'Current difficulty:', 2))).to.be.true + expect(await page.isVisible(XPath.text('span', 'Current block:', 2))).to.be.true + expect(await page.isVisible(XPath.text('span', 'Ether balance:', 2))).to.be.true }) }) }) diff --git a/packages/example/src/pages/Multichain.tsx b/packages/example/src/pages/Multichain.tsx index 59cd2f958..454140016 100644 --- a/packages/example/src/pages/Multichain.tsx +++ b/packages/example/src/pages/Multichain.tsx @@ -1,11 +1,11 @@ import React from 'react' import { Container, MainContent, Section, SectionRow } from '../components/base/base' -import { Goerli, Mainnet, Optimism, OptimismGoerli } from '@usedapp/core' +import { Mainnet, Optimism } from '@usedapp/core' import { ChainState } from '../components/ChainState' import { Title } from '../typography/Title' import styled from 'styled-components' -const chains = [Mainnet.chainId, Goerli.chainId, Optimism.chainId, OptimismGoerli.chainId] +const chains = [Mainnet.chainId, Optimism.chainId] export const Multichain = () => { return ( From 2acf9146ed138d1ee97b7f0feec12b1836761a10 Mon Sep 17 00:00:00 2001 From: nezouse Date: Mon, 13 May 2024 13:41:14 +0200 Subject: [PATCH 2/5] Add sepolia to test --- packages/example/playwright/with-metamask.ts | 11 ++++++----- packages/example/src/entrypoint.tsx | 2 ++ packages/example/src/pages/Multichain.tsx | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/packages/example/playwright/with-metamask.ts b/packages/example/playwright/with-metamask.ts index 0bd914148..550e5e6a8 100644 --- a/packages/example/playwright/with-metamask.ts +++ b/packages/example/playwright/with-metamask.ts @@ -277,6 +277,7 @@ export const withMetamaskTest = (baseUrl: string) => { await waitForExpect(async () => { expect(await page.isVisible(XPath.text('span', 'Mainnet'))).to.be.true expect(await page.isVisible(XPath.text('span', 'Optimism'))).to.be.true + expect(await page.isVisible(XPath.text('span', 'Sepolia'))).to.be.true }) }) @@ -284,11 +285,11 @@ export const withMetamaskTest = (baseUrl: string) => { await page.goto(`${baseUrl}multichain`) await waitForExpect(async () => { - expect(await page.isVisible(XPath.text('span', 'Chain id:', 2))).to.be.true - expect(await page.isVisible(XPath.text('span', 'Current block timestamp:', 2))).to.be.true - expect(await page.isVisible(XPath.text('span', 'Current difficulty:', 2))).to.be.true - expect(await page.isVisible(XPath.text('span', 'Current block:', 2))).to.be.true - expect(await page.isVisible(XPath.text('span', 'Ether balance:', 2))).to.be.true + expect(await page.isVisible(XPath.text('span', 'Chain id:', 3))).to.be.true + expect(await page.isVisible(XPath.text('span', 'Current block timestamp:', 3))).to.be.true + expect(await page.isVisible(XPath.text('span', 'Current difficulty:', 3))).to.be.true + expect(await page.isVisible(XPath.text('span', 'Current block:', 3))).to.be.true + expect(await page.isVisible(XPath.text('span', 'Ether balance:', 3))).to.be.true }) }) }) diff --git a/packages/example/src/entrypoint.tsx b/packages/example/src/entrypoint.tsx index 0e55206a2..4e8cc9480 100644 --- a/packages/example/src/entrypoint.tsx +++ b/packages/example/src/entrypoint.tsx @@ -10,6 +10,7 @@ import { Goerli, OptimismGoerli, Optimism, + Sepolia, } from '@usedapp/core' import { App } from './App' import { PortisConnector } from '@usedapp/portis-connector' @@ -18,6 +19,7 @@ import { getDefaultProvider } from '@ethersproject/providers' const readOnlyUrls: Config['readOnlyUrls'] = { [Mainnet.chainId]: process.env.MAINNET_URL || getDefaultProvider('mainnet'), + [Sepolia.chainId]: 'https://rpc.sepolia.org', [Goerli.chainId]: process.env.MAINNET_URL ? process.env.MAINNET_URL.replace('mainnet', 'goerli') : getDefaultProvider('goerli'), diff --git a/packages/example/src/pages/Multichain.tsx b/packages/example/src/pages/Multichain.tsx index 454140016..55995da98 100644 --- a/packages/example/src/pages/Multichain.tsx +++ b/packages/example/src/pages/Multichain.tsx @@ -1,11 +1,11 @@ import React from 'react' import { Container, MainContent, Section, SectionRow } from '../components/base/base' -import { Mainnet, Optimism } from '@usedapp/core' +import { Mainnet, Optimism, Sepolia } from '@usedapp/core' import { ChainState } from '../components/ChainState' import { Title } from '../typography/Title' import styled from 'styled-components' -const chains = [Mainnet.chainId, Optimism.chainId] +const chains = [Mainnet.chainId, Optimism.chainId, Sepolia.chainId] export const Multichain = () => { return ( From 9ab54a590490328cfd33482f6ff1b4b6fcc6f287 Mon Sep 17 00:00:00 2001 From: nezouse Date: Mon, 13 May 2024 14:09:40 +0200 Subject: [PATCH 3/5] Update readonly urls --- packages/example/src/entrypoint.tsx | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/packages/example/src/entrypoint.tsx b/packages/example/src/entrypoint.tsx index 4e8cc9480..1e34b7e7a 100644 --- a/packages/example/src/entrypoint.tsx +++ b/packages/example/src/entrypoint.tsx @@ -7,8 +7,6 @@ import { Localhost, MetamaskConnector, CoinbaseWalletConnector, - Goerli, - OptimismGoerli, Optimism, Sepolia, } from '@usedapp/core' @@ -19,12 +17,10 @@ import { getDefaultProvider } from '@ethersproject/providers' const readOnlyUrls: Config['readOnlyUrls'] = { [Mainnet.chainId]: process.env.MAINNET_URL || getDefaultProvider('mainnet'), - [Sepolia.chainId]: 'https://rpc.sepolia.org', - [Goerli.chainId]: process.env.MAINNET_URL - ? process.env.MAINNET_URL.replace('mainnet', 'goerli') - : getDefaultProvider('goerli'), + [Sepolia.chainId]: process.env.MAINNET_URL + ? process.env.MAINNET_URL.replace('sepolia', 'goerli') + : 'https://rpc.sepolia.org', [Optimism.chainId]: 'https://mainnet.optimism.io', - [OptimismGoerli.chainId]: 'https://goerli.optimism.io', } if (process.env.LOCALHOST_URL) { @@ -47,8 +43,8 @@ const config: Config = { projectId: 'bffbe493c0928ee125dc8f23e20167b7', chains: [Mainnet], rpcMap: { - 1: 'https://mainnet.infura.io/v3/d8df2cb7844e4a54ab0a782f608749dd', - 5: 'https://goerli.infura.io/v3/d8df2cb7844e4a54ab0a782f608749dd', + [Mainnet.chainId]: 'https://mainnet.infura.io/v3/d8df2cb7844e4a54ab0a782f608749dd', + [Sepolia.chainId]: 'https://sepolia.infura.io/v3/d8df2cb7844e4a54ab0a782f608749dd', }, }), }, From 4af787a29e5a7ac24971a7261560a28c5fb91e5b Mon Sep 17 00:00:00 2001 From: nezouse Date: Tue, 14 May 2024 14:42:37 +0200 Subject: [PATCH 4/5] Remove sepolia --- packages/example/playwright/with-metamask.ts | 11 +++++------ packages/example/src/entrypoint.tsx | 5 ----- packages/example/src/pages/Multichain.tsx | 4 ++-- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/packages/example/playwright/with-metamask.ts b/packages/example/playwright/with-metamask.ts index 550e5e6a8..0bd914148 100644 --- a/packages/example/playwright/with-metamask.ts +++ b/packages/example/playwright/with-metamask.ts @@ -277,7 +277,6 @@ export const withMetamaskTest = (baseUrl: string) => { await waitForExpect(async () => { expect(await page.isVisible(XPath.text('span', 'Mainnet'))).to.be.true expect(await page.isVisible(XPath.text('span', 'Optimism'))).to.be.true - expect(await page.isVisible(XPath.text('span', 'Sepolia'))).to.be.true }) }) @@ -285,11 +284,11 @@ export const withMetamaskTest = (baseUrl: string) => { await page.goto(`${baseUrl}multichain`) await waitForExpect(async () => { - expect(await page.isVisible(XPath.text('span', 'Chain id:', 3))).to.be.true - expect(await page.isVisible(XPath.text('span', 'Current block timestamp:', 3))).to.be.true - expect(await page.isVisible(XPath.text('span', 'Current difficulty:', 3))).to.be.true - expect(await page.isVisible(XPath.text('span', 'Current block:', 3))).to.be.true - expect(await page.isVisible(XPath.text('span', 'Ether balance:', 3))).to.be.true + expect(await page.isVisible(XPath.text('span', 'Chain id:', 2))).to.be.true + expect(await page.isVisible(XPath.text('span', 'Current block timestamp:', 2))).to.be.true + expect(await page.isVisible(XPath.text('span', 'Current difficulty:', 2))).to.be.true + expect(await page.isVisible(XPath.text('span', 'Current block:', 2))).to.be.true + expect(await page.isVisible(XPath.text('span', 'Ether balance:', 2))).to.be.true }) }) }) diff --git a/packages/example/src/entrypoint.tsx b/packages/example/src/entrypoint.tsx index 1e34b7e7a..3c70f7d24 100644 --- a/packages/example/src/entrypoint.tsx +++ b/packages/example/src/entrypoint.tsx @@ -8,7 +8,6 @@ import { MetamaskConnector, CoinbaseWalletConnector, Optimism, - Sepolia, } from '@usedapp/core' import { App } from './App' import { PortisConnector } from '@usedapp/portis-connector' @@ -17,9 +16,6 @@ import { getDefaultProvider } from '@ethersproject/providers' const readOnlyUrls: Config['readOnlyUrls'] = { [Mainnet.chainId]: process.env.MAINNET_URL || getDefaultProvider('mainnet'), - [Sepolia.chainId]: process.env.MAINNET_URL - ? process.env.MAINNET_URL.replace('sepolia', 'goerli') - : 'https://rpc.sepolia.org', [Optimism.chainId]: 'https://mainnet.optimism.io', } @@ -44,7 +40,6 @@ const config: Config = { chains: [Mainnet], rpcMap: { [Mainnet.chainId]: 'https://mainnet.infura.io/v3/d8df2cb7844e4a54ab0a782f608749dd', - [Sepolia.chainId]: 'https://sepolia.infura.io/v3/d8df2cb7844e4a54ab0a782f608749dd', }, }), }, diff --git a/packages/example/src/pages/Multichain.tsx b/packages/example/src/pages/Multichain.tsx index 55995da98..454140016 100644 --- a/packages/example/src/pages/Multichain.tsx +++ b/packages/example/src/pages/Multichain.tsx @@ -1,11 +1,11 @@ import React from 'react' import { Container, MainContent, Section, SectionRow } from '../components/base/base' -import { Mainnet, Optimism, Sepolia } from '@usedapp/core' +import { Mainnet, Optimism } from '@usedapp/core' import { ChainState } from '../components/ChainState' import { Title } from '../typography/Title' import styled from 'styled-components' -const chains = [Mainnet.chainId, Optimism.chainId, Sepolia.chainId] +const chains = [Mainnet.chainId, Optimism.chainId] export const Multichain = () => { return ( From f8268ed4802a0e5d8651a8ebf6416997622ede02 Mon Sep 17 00:00:00 2001 From: nezouse Date: Tue, 14 May 2024 15:33:11 +0200 Subject: [PATCH 5/5] Remove from non metamask test --- packages/example/playwright/without-metamask.ts | 2 -- 1 file changed, 2 deletions(-) diff --git a/packages/example/playwright/without-metamask.ts b/packages/example/playwright/without-metamask.ts index d811e053d..04c136a06 100644 --- a/packages/example/playwright/without-metamask.ts +++ b/packages/example/playwright/without-metamask.ts @@ -90,9 +90,7 @@ export const withoutMetamaskTest = (baseUrl: string) => { await waitForExpect(async () => { expect(await page.isVisible(XPath.text('span', 'Mainnet'))).to.be.true - expect(await page.isVisible(XPath.text('span', 'Goerli'))).to.be.true expect(await page.isVisible(XPath.text('span', 'Optimism'))).to.be.true - expect(await page.isVisible(XPath.text('span', 'Optimism Goerli'))).to.be.true }) })