From cb12ee0e1571dd0e4448a1d95683548e5190e9bb Mon Sep 17 00:00:00 2001 From: sepehr sanaee Date: Tue, 16 Apr 2024 22:53:49 +0330 Subject: [PATCH 1/3] removed goerli based networks --- .env.development | 2 - .env.production | 2 - .env.staging | 2 - src/containers/daoExplorer/daoExplorer.tsx | 13 +- src/containers/daoFilterModal/data.ts | 14 +- src/containers/selectChainForm/index.tsx | 15 +- src/hooks/useDaoMembers.tsx | 8 +- src/index.tsx | 28 +-- .../aragon-backend-service.api.ts | 3 +- .../queries/use-token-holders.ts | 3 +- src/services/token/token-service.ts | 11 +- src/utils/constants/api.ts | 9 - src/utils/constants/chains.ts | 217 ++++++++---------- src/utils/library.ts | 11 +- src/utils/tokens.ts | 2 +- src/utils/validators.ts | 1 - 16 files changed, 118 insertions(+), 223 deletions(-) diff --git a/.env.development b/.env.development index 0034545bd..35a15d921 100644 --- a/.env.development +++ b/.env.development @@ -2,10 +2,8 @@ VITE_FEATURE_FLAG_DAO_WALLET_CONNECT=true # for networks, please use the all-caps SupportedNetworks name VITE_FEATURE_FLAG_BASE=true -VITE_FEATURE_FLAG_BASE_GOERLI=true VITE_FEATURE_FLAG_ARBITRUM=true -VITE_FEATURE_FLAG_ARBITRUM_GOERLI=true VITE_FEATURE_FLAG_MONITORING=true diff --git a/.env.production b/.env.production index 714f9af92..159238069 100644 --- a/.env.production +++ b/.env.production @@ -2,10 +2,8 @@ VITE_FEATURE_FLAG_DAO_WALLET_CONNECT=true # for networks, please use the all-caps SupportedNetworks name VITE_FEATURE_FLAG_BASE=true -VITE_FEATURE_FLAG_BASE_GOERLI=true VITE_FEATURE_FLAG_ARBITRUM=true -VITE_FEATURE_FLAG_ARBITRUM_GOERLI=true VITE_FEATURE_FLAG_MONITORING=true diff --git a/.env.staging b/.env.staging index 0034545bd..35a15d921 100644 --- a/.env.staging +++ b/.env.staging @@ -2,10 +2,8 @@ VITE_FEATURE_FLAG_DAO_WALLET_CONNECT=true # for networks, please use the all-caps SupportedNetworks name VITE_FEATURE_FLAG_BASE=true -VITE_FEATURE_FLAG_BASE_GOERLI=true VITE_FEATURE_FLAG_ARBITRUM=true -VITE_FEATURE_FLAG_ARBITRUM_GOERLI=true VITE_FEATURE_FLAG_MONITORING=true diff --git a/src/containers/daoExplorer/daoExplorer.tsx b/src/containers/daoExplorer/daoExplorer.tsx index 535983876..c345633f4 100644 --- a/src/containers/daoExplorer/daoExplorer.tsx +++ b/src/containers/daoExplorer/daoExplorer.tsx @@ -62,15 +62,7 @@ export const DaoExplorer = () => { pluginNames: filters.pluginNames, }), ...(filters.networks?.length !== 0 && { - networks: filters.networks?.map(network => { - // TODO: Remove this Goerli based network conditions - if (network === 'arbitrum-goerli') { - return 'arbitrumGoerli'; - } else if (network === 'base-goerli') { - return 'baseGoerli'; - } - return network; - }), + networks: filters.networks, }), ...(filters.quickFilter === 'memberOf' && address ? {memberAddress: address} @@ -101,7 +93,8 @@ export const DaoExplorer = () => { () => followedDaosResult.data?.pages .flatMap(page => page.data) - .map(followedDaoToDao), + .map(followedDaoToDao) + .filter(dao => dao.network), [followedDaosResult] ); diff --git a/src/containers/daoFilterModal/data.ts b/src/containers/daoFilterModal/data.ts index 7b14642a2..0e355bb92 100644 --- a/src/containers/daoFilterModal/data.ts +++ b/src/containers/daoFilterModal/data.ts @@ -1,11 +1,4 @@ -import { - CHAIN_METADATA, - GOERLI_BASED_NETWORKS, - SupportedNetworks, -} from 'utils/constants'; - -const ShowGoerliBasedNetworks = - import.meta.env.VITE_FEATURE_FLAG_HIDE_GOERLIBASED_NETWORKS === 'false'; +import {CHAIN_METADATA, SupportedNetworks} from 'utils/constants'; type NetworkFilter = { label: string; @@ -18,10 +11,7 @@ export const networkFilters: Array = Object.entries( ).flatMap(([key, {name, isTestnet}]) => { const value: SupportedNetworks = key as SupportedNetworks; - if (!ShowGoerliBasedNetworks && GOERLI_BASED_NETWORKS.includes(value)) - return []; - - return value !== 'goerli' && value !== 'unsupported' + return value !== 'unsupported' ? ({label: name, value, testnet: isTestnet} as NetworkFilter) : []; }); diff --git a/src/containers/selectChainForm/index.tsx b/src/containers/selectChainForm/index.tsx index 46372d5e8..8dcabe2ba 100644 --- a/src/containers/selectChainForm/index.tsx +++ b/src/containers/selectChainForm/index.tsx @@ -103,9 +103,6 @@ type SelectableNetworks = Record< } >; -const ShowGoerliBasedNetworks = - import.meta.env.VITE_FEATURE_FLAG_HIDE_GOERLIBASED_NETWORKS === 'false'; - const networks: SelectableNetworks = { main: { cost: ['polygon', 'base', 'arbitrum', 'ethereum'], @@ -113,14 +110,8 @@ const networks: SelectableNetworks = { security: ['ethereum', 'base', 'arbitrum', 'polygon'], }, test: { - cost: ShowGoerliBasedNetworks - ? ['mumbai', 'base-goerli', 'arbitrum-goerli', 'sepolia', 'goerli'] - : ['sepolia'], - popularity: ShowGoerliBasedNetworks - ? ['goerli', 'sepolia', 'mumbai', 'arbitrum-goerli', 'base-goerli'] - : ['sepolia'], - security: ShowGoerliBasedNetworks - ? ['goerli', 'sepolia', 'base-goerli', 'arbitrum-goerli', 'mumbai'] - : ['sepolia'], + cost: ['sepolia'], + popularity: ['sepolia'], + security: ['sepolia'], }, }; diff --git a/src/hooks/useDaoMembers.tsx b/src/hooks/useDaoMembers.tsx index deac35a8f..69bae4ae3 100644 --- a/src/hooks/useDaoMembers.tsx +++ b/src/hooks/useDaoMembers.tsx @@ -137,14 +137,8 @@ export const useDaoMembers = ( const countOnly = opts?.countOnly || false; const enabled = opts?.enabled || true; - // TODO: Remove this Goerli based network conditions const covalentSupportedNetwork = !( - network === 'goerli' || - network === 'mumbai' || - network === 'arbitrum' || - network === 'arbitrum-goerli' || - network === 'base' || - network === 'base-goerli' + network === 'arbitrum' || network === 'base' ); const useGraphql = diff --git a/src/index.tsx b/src/index.tsx index 6932a0ec0..88723218a 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -11,18 +11,7 @@ import {createWeb3Modal} from '@web3modal/wagmi/react'; import {http, createConfig, WagmiProvider} from 'wagmi'; import {walletConnect, coinbaseWallet} from 'wagmi/connectors'; -import { - Chain, - arbitrum, - arbitrumGoerli, - base, - baseGoerli, - goerli, - mainnet, - polygon, - polygonMumbai, - sepolia, -} from 'wagmi/chains'; +import {Chain, arbitrum, base, mainnet, polygon, sepolia} from 'wagmi/chains'; import {AlertProvider} from 'context/alert'; import {GlobalModalsProvider} from 'context/globalModals'; import {NetworkProvider} from 'context/network'; @@ -43,17 +32,10 @@ import {App} from './app'; import {aragonGateway} from 'utils/aragonGateway'; import {HttpTransport} from 'viem'; -const chains = [ - base, - baseGoerli, - goerli, - mainnet, - polygon, - polygonMumbai, - arbitrum, - arbitrumGoerli, - sepolia, -] as [Chain, ...Chain[]]; +const chains = [base, mainnet, polygon, arbitrum, sepolia] as [ + Chain, + ...Chain[], +]; const transports = chains.reduce( (RPCs, value) => { diff --git a/src/services/aragon-backend/aragon-backend-service.api.ts b/src/services/aragon-backend/aragon-backend-service.api.ts index ff9066def..2a216b1ed 100644 --- a/src/services/aragon-backend/aragon-backend-service.api.ts +++ b/src/services/aragon-backend/aragon-backend-service.api.ts @@ -13,6 +13,5 @@ export interface IFetchDaosParams extends IOrderedRequest, IPaginatedRequest { pluginNames?: string[]; - // TODO: Remove this Goerli based network conditions - networks?: Array; + networks?: Array; } diff --git a/src/services/aragon-backend/queries/use-token-holders.ts b/src/services/aragon-backend/queries/use-token-holders.ts index dd8b2d865..d66b001f4 100644 --- a/src/services/aragon-backend/queries/use-token-holders.ts +++ b/src/services/aragon-backend/queries/use-token-holders.ts @@ -3,7 +3,6 @@ import {UseQueryOptions, useQuery} from '@tanstack/react-query'; import {aragonBackendQueryKeys} from '../query-keys'; import type {IFetchTokenHoldersParams} from '../aragon-backend-service.api'; import {TokenHoldersResponse} from '../domain/token-holders-response'; -import {supportedNetworksToBackendMap} from 'utils/constants'; const tokenHoldersQueryDocument = gql` query Holders($network: Network!, $tokenAddress: String!, $page: Int!) { @@ -37,7 +36,7 @@ const fetchTokenHolders = async ( tokenHoldersQueryDocument, { ...params, - network: supportedNetworksToBackendMap[params.network], + network: params.network, page: params.page ?? 0, } ); diff --git a/src/services/token/token-service.ts b/src/services/token/token-service.ts index 9760b3e96..bfbb8d6f8 100644 --- a/src/services/token/token-service.ts +++ b/src/services/token/token-service.ts @@ -9,7 +9,6 @@ import { CHAIN_METADATA, COVALENT_API_KEY, SupportedNetworks, - supportedNetworksToBackendMap, } from 'utils/constants'; import {TOP_ETH_SYMBOL_ADDRESSES} from 'utils/constants/topSymbolAddresses'; import {isNativeToken} from 'utils/tokens'; @@ -105,7 +104,7 @@ class TokenService { const {token: resp} = await request( `${import.meta.env.VITE_BACKEND_URL}/graphql`, this.tokenQueryDocument, - {network: supportedNetworksToBackendMap[network], tokenAddress} + {network: network, tokenAddress} ); const currPriceUsd = resp.priceUsd || 0; const prevPriceUsd = currPriceUsd - (resp.priceChangeOnDayUsd || 0); @@ -127,11 +126,7 @@ class TokenService { }, }; - // TODO: Remove this Goerli based network conditions - if ( - (network === 'base' || network === 'base-goerli') && - token.address === constants.AddressZero - ) { + if (network === 'base' && token.address === constants.AddressZero) { token.imgUrl = REPLACEMENT_BASE_ETHER_LOGO_URL; } } catch { @@ -184,7 +179,7 @@ class TokenService { `${import.meta.env.VITE_BACKEND_URL}/graphql`, this.tokenBalanceQueryDocument, { - network: supportedNetworksToBackendMap[network], + network: network, address, currency: this.defaultCurrency, } diff --git a/src/utils/constants/api.ts b/src/utils/constants/api.ts index 294fcf90b..e4e243355 100644 --- a/src/utils/constants/api.ts +++ b/src/utils/constants/api.ts @@ -14,7 +14,6 @@ export const AppMetadata = { ], }; -// TODO: Remove this Goerli based network conditions export const FEEDBACK_FORM = 'https://aragonassociation.atlassian.net/servicedesk/customer/portal/3'; @@ -32,14 +31,6 @@ export const SUBGRAPH_API_URL: SubgraphNetworkUrl = { sepolia: 'https://subgraph.satsuma-prod.com/qHR2wGfc5RLi6/aragon/osx-sepolia/version/v1.4.0/api', unsupported: undefined, - goerli: - 'https://subgraph.satsuma-prod.com/qHR2wGfc5RLi6/aragon/osx-goerli/version/v1.4.0/api', - mumbai: - 'https://subgraph.satsuma-prod.com/qHR2wGfc5RLi6/aragon/osx-mumbai/version/v1.4.0/api', - 'arbitrum-goerli': - 'https://subgraph.satsuma-prod.com/qHR2wGfc5RLi6/aragon/osx-arbitrumGoerli/version/v1.4.0/api', - 'base-goerli': - 'https://subgraph.satsuma-prod.com/qHR2wGfc5RLi6/aragon/osx-baseGoerli/version/v1.4.0/api', }; export const walletConnectProjectID = import.meta.env diff --git a/src/utils/constants/chains.ts b/src/utils/constants/chains.ts index ab0151717..3d73593aa 100644 --- a/src/utils/constants/chains.ts +++ b/src/utils/constants/chains.ts @@ -18,18 +18,12 @@ export function isSupportedChainId( export const GASLESS_SUPPORTED_NETWORKS: SupportedNetworks[] = ['sepolia']; // TODO: Remove this Goerli based network conditions -export const ENS_SUPPORTED_NETWORKS: SupportedNetworks[] = [ - 'ethereum', - 'goerli', -]; +export const ENS_SUPPORTED_NETWORKS: SupportedNetworks[] = ['ethereum']; export const NETWORKS_WITH_CUSTOM_REGISTRY: SupportedNetworks[] = [ 'arbitrum', 'base', 'polygon', 'sepolia', - 'arbitrum-goerli', - 'base-goerli', - 'mumbai', ]; export const L2_NETWORKS = NETWORKS_WITH_CUSTOM_REGISTRY; @@ -41,13 +35,9 @@ const SUPPORTED_NETWORKS = [ 'ethereum', 'polygon', 'sepolia', - 'goerli', - 'arbitrum-goerli', - 'base-goerli', - 'mumbai', ] as const; -export const GOERLI_BASED_NETWORKS: SupportedNetworks[] = [ +export const GOERLI_BASED_NETWORKS: string[] = [ 'goerli', 'base-goerli', 'arbitrum-goerli', @@ -64,18 +54,6 @@ export function toSupportedNetwork(network: string): SupportedNetworks { : 'unsupported'; } -export const supportedNetworksToBackendMap = { - ethereum: 'ethereum', - sepolia: 'sepolia', - polygon: 'polygon', - goerli: 'goerli', - mumbai: 'mumbai', - 'base-goerli': 'baseGoerli', - 'arbitrum-goerli': 'arbitrumGoerli', - base: 'base', - arbitrum: 'arbitrum', -} as Record; - /** * Get the network name with given chain id * @param chainId Chain id @@ -131,7 +109,6 @@ const polygonscanApiKey = import.meta.env.VITE_POLYGONSCAN_API_KEY; const arbiscanApiKey = import.meta.env.VITE_ARBISCAN_API_KEY; const basecanApiKey = import.meta.env.VITE_BASESCAN_API_KEY; -// TODO: Remove this Goerli based network conditions export const CHAIN_METADATA: Record = { ethereum: { id: 1, @@ -280,101 +257,101 @@ export const CHAIN_METADATA: Record = { etherscanApi: '', supportsEns: false, }, - goerli: { - id: 5, - name: 'Goerli', - domain: 'L1 Blockchain', - logo: 'https://assets.coingecko.com/coins/images/279/large/ethereum.png?1595348880', - explorer: 'https://goerli.etherscan.io/', - explorerName: 'Etherscan', - isTestnet: true, - mainnet: 'ethereum', - publicRpc: 'https://ethereum-goerli.publicnode.com', - gatewayNetwork: 'ethereum/goerli', - nativeCurrency: { - name: 'Goerli Ether', - symbol: 'ETH', - decimals: 18, - }, - etherscanApi: 'https://api-goerli.etherscan.io/api', - etherscanApiKey: etherscanApiKey, - covalent: { - networkId: 'eth-goerli', - nativeTokenId: '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee', - }, - supportsEns: true, - }, - mumbai: { - id: 80001, - name: i18n.t('explore.modal.filterDAOs.label.polygonMumbai'), - domain: 'L2 Blockchain', - logo: 'https://assets.coingecko.com/coins/images/4713/large/matic-token-icon.png?1624446912', - explorer: 'https://mumbai.polygonscan.com/', - explorerName: 'Polygonscan', - isTestnet: true, - mainnet: 'polygon', - publicRpc: 'https://polygon-mumbai-bor.publicnode.com', - gatewayNetwork: 'polygon/mumbai', - nativeCurrency: { - name: 'MATIC', - symbol: 'MATIC', - decimals: 18, - }, - etherscanApi: 'https://api-testnet.polygonscan.com/api', - etherscanApiKey: polygonscanApiKey, - covalent: { - networkId: 'matic-mumbai', - nativeTokenId: '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee', - }, - supportsEns: false, - }, - 'arbitrum-goerli': { - id: 421613, - name: i18n.t('explore.modal.filterDAOs.label.arbitrumGoerli'), - domain: 'L2 Blockchain', - logo: 'https://bridge.arbitrum.io/logo.png', - explorer: 'https://testnet.arbiscan.io/', - explorerName: 'Arbiscan', - isTestnet: true, - mainnet: 'arbitrum', - publicRpc: 'https://goerli-rollup.arbitrum.io/rpc', - gatewayNetwork: 'arbitrum/goerli', - nativeCurrency: { - name: 'Ether', - symbol: 'ETH', - decimals: 18, - }, - etherscanApi: 'https://api-goerli.arbiscan.io/api', - covalent: { - networkId: 'arbitrum-goerli', - nativeTokenId: '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee', - }, - supportsEns: false, - }, - 'base-goerli': { - id: 84531, - name: i18n.t('explore.modal.filterDAOs.label.baseGoerli'), - domain: 'L2 Blockchain', - logo: 'https://mirror-media.imgix.net/publication-images/cgqxxPdUFBDjgKna_dDir.png?h=250&w=250', - explorer: 'https://goerli.basescan.org/', - explorerName: 'Basescan', - isTestnet: true, - mainnet: 'base', - publicRpc: 'https://goerli.base.org', - gatewayNetwork: 'base/goerli', - nativeCurrency: { - name: 'Ether', - symbol: 'ETH', - decimals: 18, - }, - etherscanApi: 'https://api.basescan.org/api', - etherscanApiKey: '', - covalent: { - networkId: 'base-testnet', - nativeTokenId: '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee', - }, - supportsEns: false, - }, + // goerli: { + // id: 5, + // name: 'Goerli', + // domain: 'L1 Blockchain', + // logo: 'https://assets.coingecko.com/coins/images/279/large/ethereum.png?1595348880', + // explorer: 'https://goerli.etherscan.io/', + // explorerName: 'Etherscan', + // isTestnet: true, + // mainnet: 'ethereum', + // publicRpc: 'https://ethereum-goerli.publicnode.com', + // gatewayNetwork: 'ethereum/goerli', + // nativeCurrency: { + // name: 'Goerli Ether', + // symbol: 'ETH', + // decimals: 18, + // }, + // etherscanApi: 'https://api-goerli.etherscan.io/api', + // etherscanApiKey: etherscanApiKey, + // covalent: { + // networkId: 'eth-goerli', + // nativeTokenId: '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee', + // }, + // supportsEns: true, + // }, + // mumbai: { + // id: 80001, + // name: i18n.t('explore.modal.filterDAOs.label.polygonMumbai'), + // domain: 'L2 Blockchain', + // logo: 'https://assets.coingecko.com/coins/images/4713/large/matic-token-icon.png?1624446912', + // explorer: 'https://mumbai.polygonscan.com/', + // explorerName: 'Polygonscan', + // isTestnet: true, + // mainnet: 'polygon', + // publicRpc: 'https://polygon-mumbai-bor.publicnode.com', + // gatewayNetwork: 'polygon/mumbai', + // nativeCurrency: { + // name: 'MATIC', + // symbol: 'MATIC', + // decimals: 18, + // }, + // etherscanApi: 'https://api-testnet.polygonscan.com/api', + // etherscanApiKey: polygonscanApiKey, + // covalent: { + // networkId: 'matic-mumbai', + // nativeTokenId: '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee', + // }, + // supportsEns: false, + // }, + // 'arbitrum-goerli': { + // id: 421613, + // name: i18n.t('explore.modal.filterDAOs.label.arbitrumGoerli'), + // domain: 'L2 Blockchain', + // logo: 'https://bridge.arbitrum.io/logo.png', + // explorer: 'https://testnet.arbiscan.io/', + // explorerName: 'Arbiscan', + // isTestnet: true, + // mainnet: 'arbitrum', + // publicRpc: 'https://goerli-rollup.arbitrum.io/rpc', + // gatewayNetwork: 'arbitrum/goerli', + // nativeCurrency: { + // name: 'Ether', + // symbol: 'ETH', + // decimals: 18, + // }, + // etherscanApi: 'https://api-goerli.arbiscan.io/api', + // covalent: { + // networkId: 'arbitrum-goerli', + // nativeTokenId: '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee', + // }, + // supportsEns: false, + // }, + // 'base-goerli': { + // id: 84531, + // name: i18n.t('explore.modal.filterDAOs.label.baseGoerli'), + // domain: 'L2 Blockchain', + // logo: 'https://mirror-media.imgix.net/publication-images/cgqxxPdUFBDjgKna_dDir.png?h=250&w=250', + // explorer: 'https://goerli.basescan.org/', + // explorerName: 'Basescan', + // isTestnet: true, + // mainnet: 'base', + // publicRpc: 'https://goerli.base.org', + // gatewayNetwork: 'base/goerli', + // nativeCurrency: { + // name: 'Ether', + // symbol: 'ETH', + // decimals: 18, + // }, + // etherscanApi: 'https://api.basescan.org/api', + // etherscanApiKey: '', + // covalent: { + // networkId: 'base-testnet', + // nativeTokenId: '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee', + // }, + // supportsEns: false, + // }, }; export const chainExplorerAddressLink = ( diff --git a/src/utils/library.ts b/src/utils/library.ts index 0ca8c895e..83af8d7f7 100644 --- a/src/utils/library.ts +++ b/src/utils/library.ts @@ -824,25 +824,16 @@ export function sleepFor(time = 600) { * @param sdkNetwork supported network returned by the SDK * @returns translated equivalent app supported network */ -// TODO: Remove this Goerli based network conditions export const translateToAppNetwork = ( sdkNetwork: SdkContext['network'] ): SupportedNetworks => { switch (sdkNetwork.name as SdkSupportedNetworks) { case SdkSupportedNetworks.ARBITRUM: return 'arbitrum'; - case SdkSupportedNetworks.ARBITRUM_GOERLI: - return 'arbitrum-goerli'; case SdkSupportedNetworks.BASE: return 'base'; - case SdkSupportedNetworks.BASE_GOERLI: - return 'base-goerli'; case SdkSupportedNetworks.MAINNET: return 'ethereum'; - case SdkSupportedNetworks.GOERLI: - return 'goerli'; - case SdkSupportedNetworks.MUMBAI: - return 'mumbai'; case SdkSupportedNetworks.POLYGON: return 'polygon'; case SdkSupportedNetworks.SEPOLIA: @@ -858,7 +849,7 @@ export const translateToAppNetwork = ( * @returns translated equivalent SDK supported network */ export function translateToNetworkishName( - appNetwork: SupportedNetworks + appNetwork: string ): SdkSupportedNetworks | 'unsupported' { if (typeof appNetwork !== 'string') { return 'unsupported'; diff --git a/src/utils/tokens.ts b/src/utils/tokens.ts index 7d4bb33c8..06b5c0ad7 100644 --- a/src/utils/tokens.ts +++ b/src/utils/tokens.ts @@ -102,7 +102,7 @@ export async function getPastVotingPower( // "Historical" data is being fetched by directing the provider to a // specific block // TODO: Remove this Goerli based network conditions - if (network === 'arbitrum' || network === 'arbitrum-goerli') { + if (network === 'arbitrum') { const functionName = 'getVotes'; const iface = new ethers.utils.Interface(votesUpgradeableABI); const data = iface.encodeFunctionData(functionName, [account]); diff --git a/src/utils/validators.ts b/src/utils/validators.ts index ef3a18481..8dc25191e 100644 --- a/src/utils/validators.ts +++ b/src/utils/validators.ts @@ -315,7 +315,6 @@ export function isDaoEnsNameValid( const pattern = /^[a-z0-9-]+$/; if (!pattern.test(value)) return i18n.t('errors.ensNameInvalidFormat'); - // some networks like Arbitrum Goerli and other L2s do not support ENS domains as of now // don't check and allow name collision failure to happen when trying to run transaction if (!provider.network.ensAddress) { console.warn( From c3875c96953dbe24cc20a4c1e5ce288eb720a393 Mon Sep 17 00:00:00 2001 From: sepehr sanaee Date: Tue, 16 Apr 2024 22:57:03 +0330 Subject: [PATCH 2/3] removed goerli based chains from chainlist --- src/utils/constants/chains.ts | 95 ----------------------------------- 1 file changed, 95 deletions(-) diff --git a/src/utils/constants/chains.ts b/src/utils/constants/chains.ts index 3d73593aa..a69aad90a 100644 --- a/src/utils/constants/chains.ts +++ b/src/utils/constants/chains.ts @@ -257,101 +257,6 @@ export const CHAIN_METADATA: Record = { etherscanApi: '', supportsEns: false, }, - // goerli: { - // id: 5, - // name: 'Goerli', - // domain: 'L1 Blockchain', - // logo: 'https://assets.coingecko.com/coins/images/279/large/ethereum.png?1595348880', - // explorer: 'https://goerli.etherscan.io/', - // explorerName: 'Etherscan', - // isTestnet: true, - // mainnet: 'ethereum', - // publicRpc: 'https://ethereum-goerli.publicnode.com', - // gatewayNetwork: 'ethereum/goerli', - // nativeCurrency: { - // name: 'Goerli Ether', - // symbol: 'ETH', - // decimals: 18, - // }, - // etherscanApi: 'https://api-goerli.etherscan.io/api', - // etherscanApiKey: etherscanApiKey, - // covalent: { - // networkId: 'eth-goerli', - // nativeTokenId: '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee', - // }, - // supportsEns: true, - // }, - // mumbai: { - // id: 80001, - // name: i18n.t('explore.modal.filterDAOs.label.polygonMumbai'), - // domain: 'L2 Blockchain', - // logo: 'https://assets.coingecko.com/coins/images/4713/large/matic-token-icon.png?1624446912', - // explorer: 'https://mumbai.polygonscan.com/', - // explorerName: 'Polygonscan', - // isTestnet: true, - // mainnet: 'polygon', - // publicRpc: 'https://polygon-mumbai-bor.publicnode.com', - // gatewayNetwork: 'polygon/mumbai', - // nativeCurrency: { - // name: 'MATIC', - // symbol: 'MATIC', - // decimals: 18, - // }, - // etherscanApi: 'https://api-testnet.polygonscan.com/api', - // etherscanApiKey: polygonscanApiKey, - // covalent: { - // networkId: 'matic-mumbai', - // nativeTokenId: '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee', - // }, - // supportsEns: false, - // }, - // 'arbitrum-goerli': { - // id: 421613, - // name: i18n.t('explore.modal.filterDAOs.label.arbitrumGoerli'), - // domain: 'L2 Blockchain', - // logo: 'https://bridge.arbitrum.io/logo.png', - // explorer: 'https://testnet.arbiscan.io/', - // explorerName: 'Arbiscan', - // isTestnet: true, - // mainnet: 'arbitrum', - // publicRpc: 'https://goerli-rollup.arbitrum.io/rpc', - // gatewayNetwork: 'arbitrum/goerli', - // nativeCurrency: { - // name: 'Ether', - // symbol: 'ETH', - // decimals: 18, - // }, - // etherscanApi: 'https://api-goerli.arbiscan.io/api', - // covalent: { - // networkId: 'arbitrum-goerli', - // nativeTokenId: '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee', - // }, - // supportsEns: false, - // }, - // 'base-goerli': { - // id: 84531, - // name: i18n.t('explore.modal.filterDAOs.label.baseGoerli'), - // domain: 'L2 Blockchain', - // logo: 'https://mirror-media.imgix.net/publication-images/cgqxxPdUFBDjgKna_dDir.png?h=250&w=250', - // explorer: 'https://goerli.basescan.org/', - // explorerName: 'Basescan', - // isTestnet: true, - // mainnet: 'base', - // publicRpc: 'https://goerli.base.org', - // gatewayNetwork: 'base/goerli', - // nativeCurrency: { - // name: 'Ether', - // symbol: 'ETH', - // decimals: 18, - // }, - // etherscanApi: 'https://api.basescan.org/api', - // etherscanApiKey: '', - // covalent: { - // networkId: 'base-testnet', - // nativeTokenId: '0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee', - // }, - // supportsEns: false, - // }, }; export const chainExplorerAddressLink = ( From 57d834ca9e2678d94e1b395122e742dfbc2ac1e4 Mon Sep 17 00:00:00 2001 From: sepehr sanaee Date: Thu, 18 Apr 2024 11:18:11 +0330 Subject: [PATCH 3/3] resolve comments --- .env.development | 2 - .env.production | 2 - .env.staging | 2 - src/app.tsx | 2 - src/assets/locales/en/common.json | 10 ---- src/containers/navbar/deprecationBanner.tsx | 63 --------------------- src/containers/navbar/updateBanner.tsx | 6 +- src/utils/constants/chains.ts | 9 --- src/utils/tokens.ts | 1 - 9 files changed, 1 insertion(+), 96 deletions(-) delete mode 100644 src/containers/navbar/deprecationBanner.tsx diff --git a/.env.development b/.env.development index 35a15d921..afccbaf91 100644 --- a/.env.development +++ b/.env.development @@ -14,8 +14,6 @@ VITE_FEATURE_FLAG_OSX_UPDATES=true # Enable gasless plugin on DAO creation VITE_FEATURE_FLAG_GASLESS_PLUGIN=true -VITE_FEATURE_FLAG_HIDE_GOERLIBASED_NETWORKS=true - VITE_VOCDONI_ENV='stg' VITE_BACKEND_URL=https://stg.app-backend.aragon.org diff --git a/.env.production b/.env.production index 159238069..6541c823e 100644 --- a/.env.production +++ b/.env.production @@ -14,8 +14,6 @@ VITE_FEATURE_FLAG_OSX_UPDATES=true # Enable gasless plugin on DAO creation VITE_FEATURE_FLAG_GASLESS_PLUGIN=false -VITE_FEATURE_FLAG_HIDE_GOERLIBASED_NETWORKS=true - VITE_VOCDONI_ENV='stg' VITE_BACKEND_URL=https://app-backend.aragon.org diff --git a/.env.staging b/.env.staging index 35a15d921..afccbaf91 100644 --- a/.env.staging +++ b/.env.staging @@ -14,8 +14,6 @@ VITE_FEATURE_FLAG_OSX_UPDATES=true # Enable gasless plugin on DAO creation VITE_FEATURE_FLAG_GASLESS_PLUGIN=true -VITE_FEATURE_FLAG_HIDE_GOERLIBASED_NETWORKS=true - VITE_VOCDONI_ENV='stg' VITE_BACKEND_URL=https://stg.app-backend.aragon.org diff --git a/src/app.tsx b/src/app.tsx index dc374a60c..a3a58e840 100644 --- a/src/app.tsx +++ b/src/app.tsx @@ -37,7 +37,6 @@ import {ProposalSettingsFormData} from 'utils/types'; import {GatingMenu} from 'containers/gatingMenu'; import {DelegationGatingMenu} from 'containers/delegationGatingMenu'; import UpdateBanner from 'containers/navbar/updateBanner'; -import DeprecationBanner from 'containers/navbar/deprecationBanner'; import {ActionsProvider} from './context/actions'; export const App: React.FC = () => { @@ -199,7 +198,6 @@ const DaoWrapper: React.FC = () => { return ( -
diff --git a/src/assets/locales/en/common.json b/src/assets/locales/en/common.json index c5e27dc14..8f507b192 100644 --- a/src/assets/locales/en/common.json +++ b/src/assets/locales/en/common.json @@ -1064,11 +1064,8 @@ "polygon": "Polygon", "tokenVoting": "Token-based", "ethereum": "Ethereum", - "baseGoerli": "Base Goerli", - "polygonMumbai": "Polygon Mumbai", "member": "Wallet-based", "governanceType": "Governance type", - "arbitrumGoerli": "Arbitrum Goerli", "arbitrum": "Arbitrum", "ethereumSepolia": "Ethereum Sepolia" }, @@ -1795,13 +1792,6 @@ "labelDaysAgo": "days ago" } }, - "deprecation": { - "banner": { - "title": "This DAO will no longer be usable once support for Goerli and related testnets ends in 2024.", - "ctaLabel": "Learn more", - "ctaLink": "https://blog.ethereum.org/2023/11/30/goerli-lts-update" - } - }, "transactionDialog": { "title": "Transaction required", "description": "You will need to sign a transaction in your connected wallet.", diff --git a/src/containers/navbar/deprecationBanner.tsx b/src/containers/navbar/deprecationBanner.tsx deleted file mode 100644 index b894c5cc1..000000000 --- a/src/containers/navbar/deprecationBanner.tsx +++ /dev/null @@ -1,63 +0,0 @@ -import {ButtonText} from '@aragon/ods-old'; -import React, {useEffect, useState} from 'react'; -import {useLocation} from 'react-router-dom'; -import styled from 'styled-components'; -import {Icon, IconType} from '@aragon/ods'; - -import {useNetwork} from 'context/network'; -import {GOERLI_BASED_NETWORKS} from 'utils/constants'; -import {useTranslation} from 'react-i18next'; - -const DeprecationBanner: React.FC = () => { - const [bannerHidden, setBannerHidden] = useState(true); - - const location = useLocation(); - const {t} = useTranslation(); - - const {network} = useNetwork(); - - useEffect(() => { - if (GOERLI_BASED_NETWORKS.includes(network)) setBannerHidden(false); - else setBannerHidden(true); - }, [network]); - - if (location.pathname.includes('create') || bannerHidden) { - return null; - } - - return ( - - - - - - {t('deprecation.banner.title')} - - - window.open(t('deprecation.banner.ctaLink'), '_blank')} - /> - - - ); -}; - -const UpdateContainer = styled.div.attrs({ - className: - 'flex justify-center items-center py-2 px-6 bg-warning-100' as string, -})``; - -const TextWrapper = styled.div.attrs({ - className: 'flex items-center gap-x-2' as string, -})``; - -const MessageWrapper = styled.div.attrs({ - className: - 'block md:flex md:items-center md:space-x-6 md:space-y-0 space-y-2' as string, -})``; - -export default DeprecationBanner; diff --git a/src/containers/navbar/updateBanner.tsx b/src/containers/navbar/updateBanner.tsx index 82b46c325..a0e99e99a 100644 --- a/src/containers/navbar/updateBanner.tsx +++ b/src/containers/navbar/updateBanner.tsx @@ -18,7 +18,6 @@ import {useIsMember} from 'services/aragon-sdk/queries/use-is-member'; import {featureFlags} from 'utils/featureFlags'; import {NewProposal} from 'utils/paths'; import {ProposalTypes} from 'utils/types'; -import {GOERLI_BASED_NETWORKS} from 'utils/constants'; const UpdateBanner: React.FC = () => { const [bannerHidden, setBannerHidden] = useState(false); @@ -42,8 +41,6 @@ const UpdateBanner: React.FC = () => { const daoUpdateEnabled = featureFlags.getValue('VITE_FEATURE_FLAG_OSX_UPDATES') === 'true'; - const isDeprecationAlertShown = GOERLI_BASED_NETWORKS.includes(network); - const showBanner = !!( !bannerHidden && isMember && @@ -55,8 +52,7 @@ const UpdateBanner: React.FC = () => { location.pathname.includes('new-proposal') || location.pathname.includes('settings') || location.pathname.includes('create') || - showBanner === false || - isDeprecationAlertShown + showBanner === false ) return null; diff --git a/src/utils/constants/chains.ts b/src/utils/constants/chains.ts index a69aad90a..04d7c5ed3 100644 --- a/src/utils/constants/chains.ts +++ b/src/utils/constants/chains.ts @@ -17,7 +17,6 @@ export function isSupportedChainId( // Networks supported by the Gasless voting plugin export const GASLESS_SUPPORTED_NETWORKS: SupportedNetworks[] = ['sepolia']; -// TODO: Remove this Goerli based network conditions export const ENS_SUPPORTED_NETWORKS: SupportedNetworks[] = ['ethereum']; export const NETWORKS_WITH_CUSTOM_REGISTRY: SupportedNetworks[] = [ 'arbitrum', @@ -28,7 +27,6 @@ export const NETWORKS_WITH_CUSTOM_REGISTRY: SupportedNetworks[] = [ export const L2_NETWORKS = NETWORKS_WITH_CUSTOM_REGISTRY; -// TODO: Remove this Goerli based network conditions const SUPPORTED_NETWORKS = [ 'arbitrum', 'base', @@ -37,13 +35,6 @@ const SUPPORTED_NETWORKS = [ 'sepolia', ] as const; -export const GOERLI_BASED_NETWORKS: string[] = [ - 'goerli', - 'base-goerli', - 'arbitrum-goerli', - 'mumbai', -]; - export type SupportedNetworks = | (typeof SUPPORTED_NETWORKS)[number] | 'unsupported'; diff --git a/src/utils/tokens.ts b/src/utils/tokens.ts index 06b5c0ad7..7bea82927 100644 --- a/src/utils/tokens.ts +++ b/src/utils/tokens.ts @@ -101,7 +101,6 @@ export async function getPastVotingPower( // for Arbitrum, there is a mismatch between the l1 and l2 block numbers. // "Historical" data is being fetched by directing the provider to a // specific block - // TODO: Remove this Goerli based network conditions if (network === 'arbitrum') { const functionName = 'getVotes'; const iface = new ethers.utils.Interface(votesUpgradeableABI);