From cf4fb7f0c66c52c90a7706f3fd652d3817db989f Mon Sep 17 00:00:00 2001 From: cyrbuzz Date: Fri, 15 Dec 2023 16:26:31 +0800 Subject: [PATCH] chore: up --- .env | 2 +- .env.staging | 2 +- package.json | 8 ++++---- src/containers/Web3.tsx | 14 ++++++++----- src/i18n/en/explorer.ts | 8 -------- yarn.lock | 45 +++++++++++++++++------------------------ 6 files changed, 34 insertions(+), 45 deletions(-) diff --git a/.env b/.env index 5ea51be80..5646d575d 100644 --- a/.env +++ b/.env @@ -10,7 +10,7 @@ VITE_STABLE_TOKEN=USDC.e VITE_STABLE_TOKEN_ADDRESS=0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174 VITE_FLEXPLAN_ENABLED=true VITE_STUDIO_ENABLED=false -VITE_NETWORK=kepler +VITE_NETWORK=mainnet VITE_GQL_PROXY=https://gql-proxy.subquery.network VITE_AUTH_URL=https://kepler-auth.subquery.network VITE_NETWORK_DEPLOYMENT_ID=QmWfLyhgwyhwAfbnHQfg4YhJG9Vuj4cuDH5R4oW35t6MYn diff --git a/.env.staging b/.env.staging index 6a3bc82d7..7efa37c3f 100644 --- a/.env.staging +++ b/.env.staging @@ -10,7 +10,7 @@ VITE_STABLE_TOKEN=USDC.e VITE_STABLE_TOKEN_ADDRESS=0x2791Bca1f2de4661ED88A30C99A7a9449Aa84174 VITE_FLEXPLAN_ENABLED=true VITE_STUDIO_ENABLED=false -VITE_NETWORK=kepler +VITE_NETWORK=mainnet VITE_GQL_PROXY=https://gql-proxy.subquery.network VITE_AUTH_URL=https://kepler-auth.subquery.network VITE_NETWORK_DEPLOYMENT_ID=QmWfLyhgwyhwAfbnHQfg4YhJG9Vuj4cuDH5R4oW35t6MYn diff --git a/package.json b/package.json index ce2a4724d..1b8b9d7b3 100644 --- a/package.json +++ b/package.json @@ -22,10 +22,10 @@ "@subql/apollo-links": "^1.2.3", "@subql/components": "1.0.3-22", "@subql/contract-sdk": "0.111.0", - "@subql/network-clients": "^0.100.0", - "@subql/network-config": "^0.100.0", - "@subql/network-query": "0.100.3-0", - "@subql/react-hooks": "0.100.3-1", + "@subql/network-clients": "^0.111.0", + "@subql/network-config": "^0.111.0", + "@subql/network-query": "0.111.0", + "@subql/react-hooks": "^0.111.0", "@testing-library/jest-dom": "^5.11.4", "@testing-library/react": "^11.1.0", "@testing-library/user-event": "^12.1.10", diff --git a/src/containers/Web3.tsx b/src/containers/Web3.tsx index 1732364ec..a30632024 100644 --- a/src/containers/Web3.tsx +++ b/src/containers/Web3.tsx @@ -2,22 +2,26 @@ // SPDX-License-Identifier: Apache-2.0 import React from 'react'; -import keplerJSON from '@subql/contract-sdk/publish/kepler.json'; +import { SubqueryNetwork } from '@subql/contract-sdk'; +import mainnetJSON from '@subql/contract-sdk/publish/mainnet.json'; import testnetJSON from '@subql/contract-sdk/publish/testnet.json'; import { NETWORKS_CONFIG_INFO, SQNetworks } from '@subql/network-config'; import { InjectedConnector } from '@web3-react/injected-connector'; import { useAccount } from 'wagmi'; export const NETWORK_NAME: SQNetworks = import.meta.env.VITE_NETWORK; -export const isMainnet = import.meta.env.VITE_NETWORK === 'kepler'; -export const SUPPORTED_NETWORK = (isMainnet ? 'kepler' : 'testnet') as SQNetworks; +export const isMainnet = import.meta.env.VITE_NETWORK === 'mainnet'; +export const SUPPORTED_NETWORK = (isMainnet ? 'mainnet' : 'testnet') as SQNetworks; export const defaultChainId = parseInt(NETWORKS_CONFIG_INFO[SUPPORTED_NETWORK].chainId, 16); export const ECOSYSTEM_NETWORK = NETWORKS_CONFIG_INFO[SUPPORTED_NETWORK].chainName; -export const NETWORK_DEPLOYMENT_DETAILS = isMainnet ? keplerJSON : testnetJSON; +export const NETWORK_DEPLOYMENT_DETAILS = isMainnet ? mainnetJSON : testnetJSON; -export const SQT_TOKEN_ADDRESS = NETWORK_DEPLOYMENT_DETAILS.SQToken.address; +// TODO: FIXME, Mainnet dont have this yet +// eslint-disable-next-line @typescript-eslint/ban-ts-comment +// @ts-ignore +export const SQT_TOKEN_ADDRESS = NETWORK_DEPLOYMENT_DETAILS.child.SQToken.address; export const injectedConntector = new InjectedConnector({ supportedChainIds: [defaultChainId], diff --git a/src/i18n/en/explorer.ts b/src/i18n/en/explorer.ts index 490ccb6be..569c6c5a2 100644 --- a/src/i18n/en/explorer.ts +++ b/src/i18n/en/explorer.ts @@ -38,14 +38,6 @@ const translation = { disconnect: 'Disconnect', walletBalance: `Wallet Balance: {{balance}} ${TOKEN}`, }, - globalBanner: { - title: 'Season 3 Frontier Testnet has started 🔥', - description: 'Duration: {{startDate}} - {{endDate}} Local Time', - duration: 'Duration', - seasonEndTitle: 'Season 3 has finished, SubQuery Frontier was a huge success! 🔥', - seasonEndDescription: - 'The incentivised phase of the SubQuery Frontier Network has finished, get ready for the Kepler Network', - }, account: { title: { delegating: 'You are Delegating', diff --git a/yarn.lock b/yarn.lock index a020e0bb0..4f5e56a50 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4698,37 +4698,30 @@ "@maticnetwork/maticjs" "^3.6.7" "@maticnetwork/maticjs-ethers" "^1.0.3" -"@subql/network-clients@^0.100.0": - version "0.100.0" - resolved "https://registry.yarnpkg.com/@subql/network-clients/-/network-clients-0.100.0.tgz#de68cef8bf0f6fa7f806e136f69d781ec9b4ce15" - integrity sha512-lXvKdqCAjXwjAiuxI31e29P712elimyNA6OxACs9Lw743fni5gXH4ojF8o8jnoj4bRVKXuwvfKavODfMDKVH4g== +"@subql/network-clients@^0.111.0": + version "0.111.0" + resolved "https://registry.npmjs.org/@subql/network-clients/-/network-clients-0.111.0.tgz#43473c75240abc1cac68a1499bbda7d1687d02fc" + integrity sha512-mKkPAEktM2ahEo3iM4rqIjstJk/FMEB4Uka6TFh3NLjYDsZ7R9zrbSk0tYs10WwErADaZMK4aclQgKgFgs3DTA== dependencies: "@apollo/client" "^3.7.0" "@ethersproject/bignumber" "^5.7.0" - "@subql/network-config" "0.100.0" - "@subql/network-query" "0.100.0" + "@subql/network-config" "0.111.0" + "@subql/network-query" "0.111.0" axios "^0.27.2" buffer "^6.0.3" cross-fetch "^3.1.5" ethers "^5.6.8" graphql "^16.5.0" -"@subql/network-config@0.100.0", "@subql/network-config@^0.100.0": - version "0.100.0" - resolved "https://registry.yarnpkg.com/@subql/network-config/-/network-config-0.100.0.tgz#1b400c0fce56f5845b4629d00467aeecf3665924" - integrity sha512-tTUgIC3fCZnmsx1+7vlrD2DpDbLOFPbJScfywpH642mtDPfuBeNbsEDW+MbzDB1SWWMEELsNZ3euTV8Wyh3eRA== - -"@subql/network-query@0.100.0": - version "0.100.0" - resolved "https://registry.yarnpkg.com/@subql/network-query/-/network-query-0.100.0.tgz#f22c57156ea65fbf0d5469d2f783da347016ebdb" - integrity sha512-6zj/RTWq/qrNEAHOVifrZsgRGs8Ujo52/AKmJ6ywl8xXZnSC7jM1UEjtUmu63kB/hbsDmOnxKaNnhHSh4Ghx5g== - dependencies: - graphql "^16.5.0" +"@subql/network-config@0.111.0", "@subql/network-config@^0.111.0": + version "0.111.0" + resolved "https://registry.npmjs.org/@subql/network-config/-/network-config-0.111.0.tgz#5d8aa774372b0f25600777d270913f9a9362702a" + integrity sha512-fyoWXz4/FreaeHxfEnhgzzoURlYom/P1fci5R5yYTVflq5R1OiN/PnzMtctcvWAkJeJybZVpCeAQGeZLIq0qMg== -"@subql/network-query@0.100.3-0": - version "0.100.3-0" - resolved "https://registry.npmjs.org/@subql/network-query/-/network-query-0.100.3-0.tgz#46fa62091c815a383a3e276b6f8e6ee0c32a22d1" - integrity sha512-VJBjlcXAece8xjK/7Ii8cEuBvmgXyf3h2bLVtrX6vDuM5+cddn4xpl3pY9tLA330G5/mkQd2GmP+A9lHO7RkDA== +"@subql/network-query@0.111.0": + version "0.111.0" + resolved "https://registry.npmjs.org/@subql/network-query/-/network-query-0.111.0.tgz#846f8bf8b2780afac3cef1e61a2fd41b3f95a1b2" + integrity sha512-B14hGY0JeM0B+7suLmszGpdrA7co7RNYalPzjCStIrfw1FvSlHN6STlSNtBHINqj2u+XwToVxlGwVrRWyRwpEQ== dependencies: graphql "^16.5.0" @@ -4743,15 +4736,15 @@ jwt-decode "^3.1.2" lru-cache "^10.0.1" -"@subql/react-hooks@0.100.3-1": - version "0.100.3-1" - resolved "https://registry.npmjs.org/@subql/react-hooks/-/react-hooks-0.100.3-1.tgz#2fb270747568b6f7d0ab8b75b6a114b8984ee2f9" - integrity sha512-HdYx+rNDu8qyzF6gn38w0hbtZvQ2Rupbcnem5jA8/lbgxVF05k0K6nAsBOdNUvxybp7YijPJQqxUAZ2nw0NWZg== +"@subql/react-hooks@^0.111.0": + version "0.111.0" + resolved "https://registry.npmjs.org/@subql/react-hooks/-/react-hooks-0.111.0.tgz#ef062cc9a25a263b716f79f89040170557d90599" + integrity sha512-Lc1Er7EqwTmCYGGwZ+Bw/oUX8vQveXsgin4C6rLHz49Mc7yDNr+i9wCdqiXV9MVvKfRcxmX6Hv5oF0LQZq/iYA== dependencies: "@graphql-tools/code-file-loader" "^7.3.6" "@graphql-tools/graphql-tag-pluck" "^7.3.6" "@graphql-tools/load" "^7.7.7" - "@subql/network-query" "0.100.3-0" + "@subql/network-query" "0.111.0" ahooks "^3.7.8" bignumber.js "^9.1.2" class-transformer "^0.5.1"