From 08d8572ca02c1d2aa2f37cf62868f87ea0dcca11 Mon Sep 17 00:00:00 2001 From: cyrbuzz Date: Fri, 15 Dec 2023 13:46:54 +0800 Subject: [PATCH 1/2] feat: upgrade --- package.json | 2 +- src/hooks/useProjectList.tsx | 73 +++-- src/pages/explorer/Home/Home.module.css | 2 - src/pages/explorer/Home/Home.tsx | 28 +- src/pages/studio/Home/Home.tsx | 112 ++++---- yarn.lock | 345 ++++++++++++++++++++++-- 6 files changed, 466 insertions(+), 96 deletions(-) diff --git a/package.json b/package.json index fd474d027..ce2a4724d 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "@sentry/react": "^7.57.0", "@subql/apollo-links": "^1.2.3", "@subql/components": "1.0.3-22", - "@subql/contract-sdk": "^0.100.3", + "@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", diff --git a/src/hooks/useProjectList.tsx b/src/hooks/useProjectList.tsx index 1ca545044..f2041d750 100644 --- a/src/hooks/useProjectList.tsx +++ b/src/hooks/useProjectList.tsx @@ -43,7 +43,7 @@ export const useProjectList = (props: UseProjectListProps = {}) => { variables: { offset: 0 }, }); - const [getProject, { error: topError }] = useGetProjectLazyQuery(); + const [getProject, { error: topError, loading: topLoading }] = useGetProjectLazyQuery(); const [searchKeywords, setSearchKeywords] = React.useState(''); const [filterCategories, setFilterCategories] = useState([]); @@ -121,6 +121,7 @@ export const useProjectList = (props: UseProjectListProps = {}) => { // filter once or twice is the same. const nonEmptyProjects = res.data.projects?.nodes.filter(notEmpty).filter(notEmpty); const mergered = options?.refresh ? [...nonEmptyProjects] : [...fetchedProejcts.current, ...nonEmptyProjects]; + // TODO: filter by backend. setProjects(mergered.filter((proj) => (account ? account.toLowerCase() === proj.owner.toLowerCase() : true))); fetchedProejcts.current = mergered; updatedLength = mergered.length; @@ -143,8 +144,8 @@ export const useProjectList = (props: UseProjectListProps = {}) => { }); const topProjectItem = useMemo(() => { - if (!showTopProject) return ''; - if (!inSearchMode && topProject) + if (!showTopProject || inSearchMode) return ''; + if (topProject) return ( { /> ); - if (!inSearchMode) return ; + if (topLoading) return ; return ''; - }, [inSearchMode, topProject, showTopProject, onProjectClick]); + }, [inSearchMode, topProject, topLoading, showTopProject, onProjectClick]); const projectListItems = useMemo(() => { - if (loading) { - return new Array(projects.length + 10 <= total ? 10 : total - projects.length).fill(0).map((_, i) => { - return ; - }); - } + const loadingItems = new Array(projects.length + 10 <= total ? 10 : total - projects.length).fill(0).map((_, i) => { + return ; + }); if (projects.length) { - return projects.map((project) => ( - { - onProjectClick?.(project.id); - }} - /> - )); + return ( + <> + {projects.map((project) => ( + { + onProjectClick?.(project.id); + }} + /> + ))} + {loading && loadingItems} + + ); + } else { + if (loading) return loadingItems; } - if (inSearchMode) return ''; - // TODO: ui - return 'No Projects'; - }, [inSearchMode, loading, projects]); + return ''; + }, [inSearchMode, loading, projects, onProjectClick]); + + const emptyResult = useMemo(() => { + if (loading || topLoading) return ''; + if (inSearchMode && !projects.length) + return ( +
+ No projects match your search +
+ ); + + if (!inSearchMode && !projects.length && !topProject) + return ( +
+ No projects +
+ ); + }, [loading, inSearchMode, projects, topProject, showTopProject, topLoading]); const listsWithSearch = useMemo(() => { return ( @@ -228,11 +249,7 @@ export const useProjectList = (props: UseProjectListProps = {}) => { {projectListItems} - {inSearchMode && !loading && !projects.length && ( -
- No projects match your search -
- )} + {emptyResult} {(error || topError) && {`We have an error: ${error?.message || topError?.message}`}} diff --git a/src/pages/explorer/Home/Home.module.css b/src/pages/explorer/Home/Home.module.css index b36f281b7..bf9b29275 100644 --- a/src/pages/explorer/Home/Home.module.css +++ b/src/pages/explorer/Home/Home.module.css @@ -6,8 +6,6 @@ .header { display: flex; - justify-content: space-between; - align-items: center; flex-direction: column; margin-bottom: 72px; } diff --git a/src/pages/explorer/Home/Home.tsx b/src/pages/explorer/Home/Home.tsx index 23c3920c7..0325152bb 100644 --- a/src/pages/explorer/Home/Home.tsx +++ b/src/pages/explorer/Home/Home.tsx @@ -5,7 +5,9 @@ import * as React from 'react'; import { useTranslation } from 'react-i18next'; import { useNavigate } from 'react-router'; import { useProjectList } from '@hooks/useProjectList'; +import { PublishNewProjectModal } from '@pages/studio/Home/Home'; import { Typography } from '@subql/components'; +import { Button } from 'antd'; import { ROUTES } from '../../../utils'; import styles from './Home.module.css'; @@ -15,12 +17,32 @@ const { PROJECT_NAV } = ROUTES; // TODO move to components export const Header: React.FC = () => { const { t } = useTranslation(); + const [showPublishModal, setShowPublishModal] = React.useState(false); + return (
{t('explorer.home.header')} - - {t('explorer.home.headerDesc')} - +
+ + {t('explorer.home.headerDesc')} + + +
+ { + setShowPublishModal(val); + }} + >
); }; diff --git a/src/pages/studio/Home/Home.tsx b/src/pages/studio/Home/Home.tsx index d3df663c6..91cc3b483 100644 --- a/src/pages/studio/Home/Home.tsx +++ b/src/pages/studio/Home/Home.tsx @@ -4,6 +4,7 @@ import * as React from 'react'; import { useNavigate } from 'react-router'; import { useProjectList } from '@hooks/useProjectList'; +import { usePropsValue } from '@hooks/usePropsValue'; import { Modal, Typography } from '@subql/components'; import { Button, Form, Input } from 'antd'; import { useForm } from 'antd/es/form/Form'; @@ -13,6 +14,67 @@ import { ROUTES } from '../../../utils'; const { STUDIO_CREATE_NAV, STUDIO_PROJECT_NAV } = ROUTES; +export const PublishNewProjectModal: React.FC<{ value: boolean; onChange: (val: boolean) => void }> = ({ + value, + onChange, +}) => { + const navigate = useNavigate(); + const [form] = useForm(); + const [showCreateModal, setShowCreateModal] = usePropsValue({ + value, + onChange, + defaultValue: false, + }); + const handleCreateProject = () => { + navigate( + `${STUDIO_CREATE_NAV}?name=${encodeURI(form.getFieldValue('projectName'))}&deploymentId=${form.getFieldValue( + 'deploymentId', + )}`, + ); + }; + + return ( + setShowCreateModal(false)} + onOk={async () => { + await form.validateFields(); + + handleCreateProject(); + }} + okText={'Next'} + okButtonProps={{ + shape: 'round', + size: 'large', + }} + cancelButtonProps={{ + style: { display: 'none' }, + }} + > +
+ + Please enter the deployment ID of your SubQuery project below. To get the deployment ID, run subql publish + from your project code to publish it to IPFS. Learn how to publish a SubQuery project here. + + +
+ + + +
+ + + + Project names should be unique, you can edit this later. +
+
+
+
+ ); +}; + const Home: React.FC = () => { const { account } = useWeb3(); const navigate = useNavigate(); @@ -23,15 +85,7 @@ const Home: React.FC = () => { }, }); - const [form] = useForm(); const [showCreateModal, setShowCreateModal] = React.useState(false); - const handleCreateProject = () => { - navigate( - `${STUDIO_CREATE_NAV}?name=${encodeURI(form.getFieldValue('projectName'))}&deploymentId=${form.getFieldValue( - 'deploymentId', - )}`, - ); - }; const enableCreateModal = () => setShowCreateModal(true); return ( @@ -43,44 +97,12 @@ const Home: React.FC = () => { - setShowCreateModal(false)} - onOk={async () => { - await form.validateFields(); - - handleCreateProject(); + { + setShowCreateModal(val); }} - okText={'Next'} - okButtonProps={{ - shape: 'round', - size: 'large', - }} - cancelButtonProps={{ - style: { display: 'none' }, - }} - > -
- - Please enter the deployment ID of your SubQuery project below. To get the deployment ID, run subql publish - from your project code to publish it to IPFS. Learn how to publish a SubQuery project here. - - -
- - - -
- - - - Project names should be unique, you can edit this later. -
-
-
-
+ /> {listsWithSearch} diff --git a/yarn.lock b/yarn.lock index be3ae788a..a020e0bb0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2496,6 +2496,24 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" +"@ethereumjs/block@^3.6.2": + version "3.6.3" + resolved "https://registry.npmjs.org/@ethereumjs/block/-/block-3.6.3.tgz#d96cbd7af38b92ebb3424223dbf773f5ccd27f84" + integrity sha512-CegDeryc2DVKnDkg5COQrE0bJfw/p0v3GBk2W5/Dj5dOVfEmb50Ux0GLnSPypooLnfqjwFaorGuT9FokWB3GRg== + dependencies: + "@ethereumjs/common" "^2.6.5" + "@ethereumjs/tx" "^3.5.2" + ethereumjs-util "^7.1.5" + merkle-patricia-tree "^4.2.4" + +"@ethereumjs/common@^2.6.4", "@ethereumjs/common@^2.6.5": + version "2.6.5" + resolved "https://registry.npmjs.org/@ethereumjs/common/-/common-2.6.5.tgz#0a75a22a046272579d91919cb12d84f2756e8d30" + integrity sha512-lRyVQOeCDaIVtgfbowla32pzeDv2Obr8oR8Put5RdUBNRGr1VGPGQNGP6elWIpgK3YdpzqTOh4GyUGOureVeeA== + dependencies: + crc-32 "^1.2.0" + ethereumjs-util "^7.1.5" + "@ethereumjs/common@^3.2.0": version "3.2.0" resolved "https://registry.npmjs.org/@ethereumjs/common/-/common-3.2.0.tgz#b71df25845caf5456449163012074a55f048e0a0" @@ -2509,6 +2527,14 @@ resolved "https://registry.npmmirror.com/@ethereumjs/rlp/-/rlp-4.0.1.tgz#626fabfd9081baab3d0a3074b0c7ecaf674aaa41" integrity sha512-tqsQiBQDQdmPWE1xkkBq4rlSW5QZpLOUJ5RJh2/9fug+q9tnUhuZoVLk7s0scUIKTOzEtR72DFBXI4WiZcMpvw== +"@ethereumjs/tx@^3.5.2": + version "3.5.2" + resolved "https://registry.npmjs.org/@ethereumjs/tx/-/tx-3.5.2.tgz#197b9b6299582ad84f9527ca961466fce2296c1c" + integrity sha512-gQDNJWKrSDGu2w7w0PzVXVBNMzb7wwdDOmOqczmhNjqFxFuIbhVJDwiGEnxFNC2/b8ifcZzY7MLcluizohRzNw== + dependencies: + "@ethereumjs/common" "^2.6.4" + ethereumjs-util "^7.1.5" + "@ethereumjs/tx@^4.2.0": version "4.2.0" resolved "https://registry.npmjs.org/@ethereumjs/tx/-/tx-4.2.0.tgz#5988ae15daf5a3b3c815493bc6b495e76009e853" @@ -3159,6 +3185,23 @@ dependencies: "@lit-labs/ssr-dom-shim" "^1.0.0" +"@maticnetwork/maticjs-ethers@^1.0.3": + version "1.0.3" + resolved "https://registry.npmjs.org/@maticnetwork/maticjs-ethers/-/maticjs-ethers-1.0.3.tgz#29dc7740f07d2f295535633e2c2e7f9fa0e21d90" + integrity sha512-paGulmLG62We/pyOVH3Q7mZd/E/SGFKa+rXtyvpoMB8v5oFn/yTtoKvLWyIoZ8zBi4JrjSegKL+/US5+OibYwQ== + dependencies: + ethers "^5.5.1" + +"@maticnetwork/maticjs@^3.6.7": + version "3.6.7" + resolved "https://registry.npmjs.org/@maticnetwork/maticjs/-/maticjs-3.6.7.tgz#a79e79d572144cca89a5ad82a1113b416071620b" + integrity sha512-vkcnPDBL7NXqrhwfzrDdrHbYmwm+nLRCftzMM9hUculGts8iWF7C8M6efiJSpUUbl/CrXkfo2nJg1aenlH9dog== + dependencies: + "@ethereumjs/block" "^3.6.2" + ethereumjs-util "^7.1.4" + merkle-patricia-tree "^4.2.4" + node-fetch "^2.6.1" + "@metamask/abi-utils@^2.0.2": version "2.0.2" resolved "https://registry.npmjs.org/@metamask/abi-utils/-/abi-utils-2.0.2.tgz#ad394e9cb8a95ac177cad942daadd88a246c0de8" @@ -4647,10 +4690,13 @@ string-width "4.2.3" use-screen "^1.1.3" -"@subql/contract-sdk@^0.100.3": - version "0.100.3" - resolved "https://registry.yarnpkg.com/@subql/contract-sdk/-/contract-sdk-0.100.3.tgz#a6e6708ad3a545823b54b7eaa1d95a8d6d6b183d" - integrity sha512-kMXFLFBdF0bByc5ub77iOMi4uE5+iDteaSlCSEn+VZiG1Wc/nrw2ezCrmiZ7Qn3OUxn/4+bpZLos3oBUwP3v2A== +"@subql/contract-sdk@0.111.0": + version "0.111.0" + resolved "https://registry.npmjs.org/@subql/contract-sdk/-/contract-sdk-0.111.0.tgz#f0efd73cbd3566b97dab93661832bbda9aa2470d" + integrity sha512-SBXuRKWW9sUZ0CyhYyr268uj7WttJRtLs1fXPc/JjvucN/D9820El46bEQIJVSw3QK30rPilIGBihRM/rmckbA== + dependencies: + "@maticnetwork/maticjs" "^3.6.7" + "@maticnetwork/maticjs-ethers" "^1.0.3" "@subql/network-clients@^0.100.0": version "0.100.0" @@ -4800,6 +4846,11 @@ dependencies: "@babel/runtime" "^7.12.5" +"@types/abstract-leveldown@*": + version "7.2.5" + resolved "https://registry.npmjs.org/@types/abstract-leveldown/-/abstract-leveldown-7.2.5.tgz#db2cf364c159fb1f12be6cd3549f56387eaf8d73" + integrity sha512-/2B0nQF4UdupuxeKTJA2+Rj1D+uDemo6P4kMwKCpbfpnzeVaWSELTsAw4Lxn3VJD6APtRrZOCuYo+4nHUQfTfg== + "@types/aria-query@^4.2.0": version "4.2.2" resolved "https://registry.yarnpkg.com/@types/aria-query/-/aria-query-4.2.2.tgz#ed4e0ad92306a704f9fb132a0cfcf77486dbe2bc" @@ -4812,6 +4863,13 @@ dependencies: "@types/node" "*" +"@types/bn.js@^5.1.0": + version "5.1.5" + resolved "https://registry.npmjs.org/@types/bn.js/-/bn.js-5.1.5.tgz#2e0dacdcce2c0f16b905d20ff87aedbc6f7b4bf0" + integrity sha512-V46N0zwKRF5Q00AZ6hWtN0T8gGmDUaUzLWQvHFo5yThtVwK/VCenFY3wXVbOvNfajEpsTfQM4IN9k/d6gUVX3A== + dependencies: + "@types/node" "*" + "@types/codemirror@^5.60.8": version "5.60.10" resolved "https://registry.npmjs.org/@types/codemirror/-/codemirror-5.60.10.tgz#ac836a3ac20483988a0507cdbbaeb6ee0affa1e6" @@ -4942,6 +5000,20 @@ resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" integrity sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ== +"@types/level-errors@*": + version "3.0.2" + resolved "https://registry.npmjs.org/@types/level-errors/-/level-errors-3.0.2.tgz#f33ec813c50780b547463da9ad8acac89ee457d9" + integrity sha512-gyZHbcQ2X5hNXf/9KS2qGEmgDe9EN2WDM3rJ5Ele467C0nA1sLhtmv1bZiPMDYfAYCfPWft0uQIaTvXbASSTRA== + +"@types/levelup@^4.3.0": + version "4.3.3" + resolved "https://registry.npmjs.org/@types/levelup/-/levelup-4.3.3.tgz#4dc2b77db079b1cf855562ad52321aa4241b8ef4" + integrity sha512-K+OTIjJcZHVlZQN1HmU64VtrC0jC3dXWQozuEIR9zVvltIk90zaGPM2AgT+fIkChpzHhFE3YnvFLCbLtzAmexA== + dependencies: + "@types/abstract-leveldown" "*" + "@types/level-errors" "*" + "@types/node" "*" + "@types/lodash-es@^4.17.7": version "4.17.7" resolved "https://registry.yarnpkg.com/@types/lodash-es/-/lodash-es-4.17.7.tgz#22edcae9f44aff08546e71db8925f05b33c7cc40" @@ -5031,6 +5103,13 @@ resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== +"@types/pbkdf2@^3.0.0": + version "3.1.2" + resolved "https://registry.npmjs.org/@types/pbkdf2/-/pbkdf2-3.1.2.tgz#2dc43808e9985a2c69ff02e2d2027bd4fe33e8dc" + integrity sha512-uRwJqmiXmh9++aSu1VNEn3iIxWOhd8AHXNSdlaLfdAAdSTY9jYVeGWnzejM3dvrkbqE3/hyQkQQ29IFATEGlew== + dependencies: + "@types/node" "*" + "@types/prop-types@*": version "15.7.5" resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.5.tgz#5f19d2b85a98e9558036f6a3cacc8819420f05cf" @@ -5109,6 +5188,13 @@ resolved "https://registry.yarnpkg.com/@types/scheduler/-/scheduler-0.16.2.tgz#1a62f89525723dde24ba1b01b092bf5df8ad4d39" integrity sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew== +"@types/secp256k1@^4.0.1": + version "4.0.6" + resolved "https://registry.npmjs.org/@types/secp256k1/-/secp256k1-4.0.6.tgz#d60ba2349a51c2cbc5e816dcd831a42029d376bf" + integrity sha512-hHxJU6PAEUn0TP4S/ZOzuTUvJWuZ6eIKeNKb5RBpODvSl6hp1Wrw4s7ATY50rklRCScUDpHzVA/DQdSjJ3UoYQ== + dependencies: + "@types/node" "*" + "@types/semver@^7.3.12": version "7.3.13" resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.13.tgz#da4bfd73f49bd541d28920ab0e2bf0ee80f71c91" @@ -5919,6 +6005,28 @@ abort-controller@^3.0.0: dependencies: event-target-shim "^5.0.0" +abstract-leveldown@^6.2.1: + version "6.3.0" + resolved "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.3.0.tgz#d25221d1e6612f820c35963ba4bd739928f6026a" + integrity sha512-TU5nlYgta8YrBMNpc9FwQzRbiXsj49gsALsXadbGHt9CROPzX5fB0rWDR5mtdpOOKa5XqRFpbj1QroPAoPzVjQ== + dependencies: + buffer "^5.5.0" + immediate "^3.2.3" + level-concat-iterator "~2.0.0" + level-supports "~1.0.0" + xtend "~4.0.0" + +abstract-leveldown@~6.2.1: + version "6.2.3" + resolved "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-6.2.3.tgz#036543d87e3710f2528e47040bc3261b77a9a8eb" + integrity sha512-BsLm5vFMRUrrLeCcRc+G0t2qOaTzpoJQLOubq2XM72eNpjF5UdU5o/5NvlNhx95XHcAvcl8OMXr4mlg/fRgUXQ== + dependencies: + buffer "^5.5.0" + immediate "^3.2.3" + level-concat-iterator "~2.0.0" + level-supports "~1.0.0" + xtend "~4.0.0" + acorn-jsx@^5.3.2: version "5.3.2" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937" @@ -6847,6 +6955,11 @@ bindings@^1.3.0: dependencies: file-uri-to-path "1.0.0" +blakejs@^1.1.0: + version "1.2.1" + resolved "https://registry.npmjs.org/blakejs/-/blakejs-1.2.1.tgz#5057e4206eadb4a97f7c0b6e197a505042fc3814" + integrity sha512-QXUSXI3QVc/gJME0dBpXrag1kbzOqCjCX8/b54ntNyW6sjtoqxqRk3LTmXzaJoh71zMsDCjM+47jS7XiwN/+fQ== + blob-to-it@^1.0.1: version "1.0.4" resolved "https://registry.yarnpkg.com/blob-to-it/-/blob-to-it-1.0.4.tgz#f6caf7a4e90b7bb9215fa6a318ed6bd8ad9898cb" @@ -6859,7 +6972,7 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.11.9, bn.js@^4.12.0: resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== -bn.js@^5.0.0, bn.js@^5.1.1, bn.js@^5.2.0, bn.js@^5.2.1: +bn.js@^5.0.0, bn.js@^5.1.1, bn.js@^5.1.2, bn.js@^5.2.0, bn.js@^5.2.1: version "5.2.1" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-5.2.1.tgz#0bc527a6a0d18d0aa8d5b0538ce4a77dccfa7b70" integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ== @@ -6910,7 +7023,7 @@ browser-readablestream-to-it@^1.0.0, browser-readablestream-to-it@^1.0.1, browse resolved "https://registry.yarnpkg.com/browser-readablestream-to-it/-/browser-readablestream-to-it-1.0.3.tgz#ac3e406c7ee6cdf0a502dd55db33bab97f7fba76" integrity sha512-+12sHB+Br8HIh6VAMVEG5r3UXCyESIgDW7kzk3BjIXa43DVqVwL7GC5TW3jeh+72dtcH99pPVpw0X8i0jt+/kw== -browserify-aes@^1.0.0, browserify-aes@^1.0.4: +browserify-aes@^1.0.0, browserify-aes@^1.0.4, browserify-aes@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/browserify-aes/-/browserify-aes-1.2.0.tgz#326734642f403dabc3003209853bb70ad428ef48" integrity sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA== @@ -7008,6 +7121,15 @@ bs58@^4.0.0, bs58@^4.0.1: dependencies: base-x "^3.0.2" +bs58check@^2.1.2: + version "2.1.2" + resolved "https://registry.npmjs.org/bs58check/-/bs58check-2.1.2.tgz#53b018291228d82a5aa08e7d796fdafda54aebfc" + integrity sha512-0TS1jicxdU09dwJMNZtVAfzPi6Q6QeN0pM1Fkzrjn+XYHvzMKPU3pHVpva+769iNVSfIYWf7LJ6WR+BuuMf8cA== + dependencies: + bs58 "^4.0.0" + create-hash "^1.1.0" + safe-buffer "^5.1.2" + buffer-from@^1.0.0: version "1.1.2" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5" @@ -7035,6 +7157,14 @@ buffer@^4.3.0: ieee754 "^1.1.4" isarray "^1.0.0" +buffer@^5.5.0, buffer@^5.6.0: + version "5.7.1" + resolved "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0" + integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ== + dependencies: + base64-js "^1.3.1" + ieee754 "^1.1.13" + bufferutil@^4.0.1: version "4.0.8" resolved "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.8.tgz#1de6a71092d65d7766c4d8a522b261a6e787e8ea" @@ -7894,6 +8024,14 @@ deepmerge@^4.2.2: resolved "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a" integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A== +deferred-leveldown@~5.3.0: + version "5.3.0" + resolved "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-5.3.0.tgz#27a997ad95408b61161aa69bd489b86c71b78058" + integrity sha512-a59VOT+oDy7vtAbLRCZwWgxu2BaCfd5Hk7wxJd48ei7I+nsg8Orlb9CLG0PMZienk9BSUKgeAqkO2+Lw+1+Ukw== + dependencies: + abstract-leveldown "~6.2.1" + inherits "^2.0.3" + define-data-property@^1.0.1, define-data-property@^1.1.1: version "1.1.1" resolved "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz#c35f7cd0ab09883480d12ac5cb213715587800b3" @@ -8147,7 +8285,7 @@ elegant-spinner@^1.0.1: resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e" integrity sha512-B+ZM+RXvRqQaAmkMlO/oSe5nMUOaUnyfGYCEHoR8wrXsZR2mA0XVibsxV1bvTwxdRWah1PkQqso2EzhILGHtEQ== -elliptic@6.5.4, elliptic@^6.5.3: +elliptic@6.5.4, elliptic@^6.5.3, elliptic@^6.5.4: version "6.5.4" resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.5.4.tgz#da37cebd31e79a1367e941b592ed1fbebd58abbb" integrity sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ== @@ -8180,6 +8318,16 @@ encode-utf8@^1.0.3: resolved "https://registry.npmjs.org/encode-utf8/-/encode-utf8-1.0.3.tgz#f30fdd31da07fb596f281beb2f6b027851994cda" integrity sha512-ucAnuBEhUK4boH2HjVYG5Q2mQyPorvv0u/ocS+zhdw0S8AlHYY+GOFhP1Gio5z4icpP2ivFSvhtFjQi8+T9ppw== +encoding-down@^6.3.0: + version "6.3.0" + resolved "https://registry.npmjs.org/encoding-down/-/encoding-down-6.3.0.tgz#b1c4eb0e1728c146ecaef8e32963c549e76d082b" + integrity sha512-QKrV0iKR6MZVJV08QY0wp1e7vF6QbhnbQhb07bwpEyuz4uZiZgPlEGdkCROuFkUwdxlFaiPIhjyarH1ee/3vhw== + dependencies: + abstract-leveldown "^6.2.1" + inherits "^2.0.3" + level-codec "^9.0.0" + level-errors "^2.0.0" + encoding@^0.1.13: version "0.1.13" resolved "https://registry.yarnpkg.com/encoding/-/encoding-0.1.13.tgz#56574afdd791f54a8e9b2785c0582a2d26210fa9" @@ -8220,7 +8368,7 @@ err-code@^3.0.1: resolved "https://registry.yarnpkg.com/err-code/-/err-code-3.0.1.tgz#a444c7b992705f2b120ee320b09972eef331c920" integrity sha512-GiaH0KJUewYok+eeY05IIgjtAe4Yltygk9Wqp1V5yVWLdhf0hYZchRjNIT9bb0mSwRcIusT3cx7PJUf3zEIfUA== -errno@^0.1.1: +errno@^0.1.1, errno@~0.1.1: version "0.1.8" resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.8.tgz#8bb3e9c7d463be4976ff888f76b4809ebc2e811f" integrity sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A== @@ -8746,6 +8894,27 @@ ethereum-checksum-address@^0.0.8: keccak "^3.0.2" meow "^10.1.2" +ethereum-cryptography@^0.1.3: + version "0.1.3" + resolved "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-0.1.3.tgz#8d6143cfc3d74bf79bbd8edecdf29e4ae20dd191" + integrity sha512-w8/4x1SGGzc+tO97TASLja6SLd3fRIK2tLVcV2Gx4IB21hE19atll5Cq9o3d0ZmAYC/8aw0ipieTSiekAea4SQ== + dependencies: + "@types/pbkdf2" "^3.0.0" + "@types/secp256k1" "^4.0.1" + blakejs "^1.1.0" + browserify-aes "^1.2.0" + bs58check "^2.1.2" + create-hash "^1.2.0" + create-hmac "^1.1.7" + hash.js "^1.1.7" + keccak "^3.0.0" + pbkdf2 "^3.0.17" + randombytes "^2.1.0" + safe-buffer "^5.1.2" + scrypt-js "^3.0.0" + secp256k1 "^4.0.1" + setimmediate "^1.0.5" + ethereum-cryptography@^2.0.0: version "2.0.0" resolved "https://registry.npmmirror.com/ethereum-cryptography/-/ethereum-cryptography-2.0.0.tgz#e052b49fa81affae29402e977b8d3a31f88612b6" @@ -8766,7 +8935,18 @@ ethereum-cryptography@^2.1.2: "@scure/bip32" "1.3.1" "@scure/bip39" "1.2.1" -ethers@^5.4.7, ethers@^5.6.8: +ethereumjs-util@^7.1.4, ethereumjs-util@^7.1.5: + version "7.1.5" + resolved "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-7.1.5.tgz#9ecf04861e4fbbeed7465ece5f23317ad1129181" + integrity sha512-SDl5kKrQAudFBUe5OJM9Ac6WmMyYmXX/6sTmLZ3ffG2eY6ZIGBes3pEDxNN6V72WyOw4CPD5RomKdsa8DAAwLg== + dependencies: + "@types/bn.js" "^5.1.0" + bn.js "^5.1.2" + create-hash "^1.1.2" + ethereum-cryptography "^0.1.3" + rlp "^2.2.4" + +ethers@^5.4.7, ethers@^5.5.1, ethers@^5.6.8: version "5.7.2" resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.7.2.tgz#3a7deeabbb8c030d4126b24f84e525466145872e" integrity sha512-wswUsmWo1aOK8rR7DIKiWSw9DbLWe6x98Jrn8wcTflTVvaXhAMaB5zGAXy0GYQEQp9iO1iSHWVyARQm11zUtyg== @@ -9188,7 +9368,7 @@ function.prototype.name@^1.1.6: es-abstract "^1.22.1" functions-have-names "^1.2.3" -functional-red-black-tree@^1.0.1: +functional-red-black-tree@^1.0.1, functional-red-black-tree@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" integrity sha512-dsKNQNdj6xA3T+QlADDA7mOSlX0qiMINjn0cgr+eGHGsbSHzTabcIogz2+p/iqP1Xs6EP/sS2SbqH+brGTbq0g== @@ -9777,7 +9957,7 @@ idb@^7.0.1: resolved "https://registry.npmjs.org/idb/-/idb-7.1.1.tgz#d910ded866d32c7ced9befc5bfdf36f572ced72b" integrity sha512-gchesWBzyvGHRO9W8tzUWFDycow5gwjvFKfyV9FF32Y7F50yZMp7mP+T2mJIWFx49zicqyC4uefHM17o6xKIVQ== -ieee754@^1.1.4, ieee754@^1.2.1: +ieee754@^1.1.13, ieee754@^1.1.4, ieee754@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352" integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA== @@ -9797,11 +9977,21 @@ image-size@~0.5.0: resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c" integrity sha512-6TDAlDPZxUFCv+fuOkIoXT/V/f3Qbq8e37p+YOiYrUv3v9cc3/6x78VdfPgFVaB9dZYeLUfKgHRebpkm/oP2VQ== +immediate@^3.2.3: + version "3.3.0" + resolved "https://registry.npmjs.org/immediate/-/immediate-3.3.0.tgz#1aef225517836bcdf7f2a2de2600c79ff0269266" + integrity sha512-HR7EVodfFUdQCTIeySw+WDRFJlPcLOJbXfwwZ7Oom6tjsvZ3bOkCDJHehQC3nxJrv7+f9XecwazynjU8e4Vw3Q== + immediate@~3.0.5: version "3.0.6" resolved "https://registry.npmmirror.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b" integrity sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ== +immediate@~3.2.3: + version "3.2.3" + resolved "https://registry.npmjs.org/immediate/-/immediate-3.2.3.tgz#d140fa8f614659bd6541233097ddaac25cdd991c" + integrity sha512-RrGCXRm/fRVqMIhqXrGEX9rRADavPiDFSoMb/k64i9XMk8uH4r/Omi5Ctierj6XzNecwDbO4WuFbDD1zmpl3Tg== + immutable@^4.0.0: version "4.2.4" resolved "https://registry.yarnpkg.com/immutable/-/immutable-4.2.4.tgz#83260d50889526b4b531a5e293709a77f7c55a2a" @@ -10728,7 +10918,7 @@ jwt-decode@^3.1.2: resolved "https://registry.yarnpkg.com/jwt-decode/-/jwt-decode-3.1.2.tgz#3fb319f3675a2df0c2895c8f5e9fa4b67b04ed59" integrity sha512-UfpWE/VZn0iP50d8cz9NrZLM9lSWhcJ+0Gt/nm4by88UL+J1SiKN8/5dkjMmbEzwL2CAe+67GsegCbIKtbp75A== -keccak@^3.0.1: +keccak@^3.0.0, keccak@^3.0.1: version "3.0.4" resolved "https://registry.npmjs.org/keccak/-/keccak-3.0.4.tgz#edc09b89e633c0549da444432ecf062ffadee86d" integrity sha512-3vKuW0jV8J3XNTzvfyicFR5qvxrSAGl7KIhvgOu5cmWwM7tZRj3fMbj/pfIf4be7aznbc+prBWGjywox/g2Y6Q== @@ -10785,6 +10975,77 @@ less@^4.1.1, less@^4.1.3: needle "^3.1.0" source-map "~0.6.0" +level-codec@^9.0.0: + version "9.0.2" + resolved "https://registry.npmjs.org/level-codec/-/level-codec-9.0.2.tgz#fd60df8c64786a80d44e63423096ffead63d8cbc" + integrity sha512-UyIwNb1lJBChJnGfjmO0OR+ezh2iVu1Kas3nvBS/BzGnx79dv6g7unpKIDNPMhfdTEGoc7mC8uAu51XEtX+FHQ== + dependencies: + buffer "^5.6.0" + +level-concat-iterator@~2.0.0: + version "2.0.1" + resolved "https://registry.npmjs.org/level-concat-iterator/-/level-concat-iterator-2.0.1.tgz#1d1009cf108340252cb38c51f9727311193e6263" + integrity sha512-OTKKOqeav2QWcERMJR7IS9CUo1sHnke2C0gkSmcR7QuEtFNLLzHQAvnMw8ykvEcv0Qtkg0p7FOwP1v9e5Smdcw== + +level-errors@^2.0.0, level-errors@~2.0.0: + version "2.0.1" + resolved "https://registry.npmjs.org/level-errors/-/level-errors-2.0.1.tgz#2132a677bf4e679ce029f517c2f17432800c05c8" + integrity sha512-UVprBJXite4gPS+3VznfgDSU8PTRuVX0NXwoWW50KLxd2yw4Y1t2JUR5In1itQnudZqRMT9DlAM3Q//9NCjCFw== + dependencies: + errno "~0.1.1" + +level-iterator-stream@~4.0.0: + version "4.0.2" + resolved "https://registry.npmjs.org/level-iterator-stream/-/level-iterator-stream-4.0.2.tgz#7ceba69b713b0d7e22fcc0d1f128ccdc8a24f79c" + integrity sha512-ZSthfEqzGSOMWoUGhTXdX9jv26d32XJuHz/5YnuHZzH6wldfWMOVwI9TBtKcya4BKTyTt3XVA0A3cF3q5CY30Q== + dependencies: + inherits "^2.0.4" + readable-stream "^3.4.0" + xtend "^4.0.2" + +level-mem@^5.0.1: + version "5.0.1" + resolved "https://registry.npmjs.org/level-mem/-/level-mem-5.0.1.tgz#c345126b74f5b8aa376dc77d36813a177ef8251d" + integrity sha512-qd+qUJHXsGSFoHTziptAKXoLX87QjR7v2KMbqncDXPxQuCdsQlzmyX+gwrEHhlzn08vkf8TyipYyMmiC6Gobzg== + dependencies: + level-packager "^5.0.3" + memdown "^5.0.0" + +level-packager@^5.0.3: + version "5.1.1" + resolved "https://registry.npmjs.org/level-packager/-/level-packager-5.1.1.tgz#323ec842d6babe7336f70299c14df2e329c18939" + integrity sha512-HMwMaQPlTC1IlcwT3+swhqf/NUO+ZhXVz6TY1zZIIZlIR0YSn8GtAAWmIvKjNY16ZkEg/JcpAuQskxsXqC0yOQ== + dependencies: + encoding-down "^6.3.0" + levelup "^4.3.2" + +level-supports@~1.0.0: + version "1.0.1" + resolved "https://registry.npmjs.org/level-supports/-/level-supports-1.0.1.tgz#2f530a596834c7301622521988e2c36bb77d122d" + integrity sha512-rXM7GYnW8gsl1vedTJIbzOrRv85c/2uCMpiiCzO2fndd06U/kUXEEU9evYn4zFggBOg36IsBW8LzqIpETwwQzg== + dependencies: + xtend "^4.0.2" + +level-ws@^2.0.0: + version "2.0.0" + resolved "https://registry.npmjs.org/level-ws/-/level-ws-2.0.0.tgz#207a07bcd0164a0ec5d62c304b4615c54436d339" + integrity sha512-1iv7VXx0G9ec1isqQZ7y5LmoZo/ewAsyDHNA8EFDW5hqH2Kqovm33nSFkSdnLLAK+I5FlT+lo5Cw9itGe+CpQA== + dependencies: + inherits "^2.0.3" + readable-stream "^3.1.0" + xtend "^4.0.1" + +levelup@^4.3.2: + version "4.4.0" + resolved "https://registry.npmjs.org/levelup/-/levelup-4.4.0.tgz#f89da3a228c38deb49c48f88a70fb71f01cafed6" + integrity sha512-94++VFO3qN95cM/d6eBXvd894oJE0w3cInq9USsyQzzoJxmiYzPAocNcuGCPGGjoXqDVJcr3C1jzt1TSjyaiLQ== + dependencies: + deferred-leveldown "~5.3.0" + level-errors "~2.0.0" + level-iterator-stream "~4.0.0" + level-supports "~1.0.0" + xtend "~4.0.0" + leven@^3.1.0: version "3.1.0" resolved "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz#77891de834064cccba82ae7842bb6b14a13ed7f2" @@ -11145,6 +11406,11 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" +ltgt@~2.2.0: + version "2.2.1" + resolved "https://registry.npmjs.org/ltgt/-/ltgt-2.2.1.tgz#f35ca91c493f7b73da0e07495304f17b31f87ee5" + integrity sha512-AI2r85+4MquTw9ZYqabu4nMwy9Oftlfa/e/52t9IjtfG+mGBbTNdAoZ3RQKLHR6r0wQnwZnPIEh/Ya6XTWAKNA== + lz-string@^1.4.4: version "1.5.0" resolved "https://registry.yarnpkg.com/lz-string/-/lz-string-1.5.0.tgz#c1ab50f77887b712621201ba9fd4e3a6ed099941" @@ -11270,6 +11536,18 @@ media-query-parser@^2.0.2: dependencies: "@babel/runtime" "^7.12.5" +memdown@^5.0.0: + version "5.1.0" + resolved "https://registry.npmjs.org/memdown/-/memdown-5.1.0.tgz#608e91a9f10f37f5b5fe767667a8674129a833cb" + integrity sha512-B3J+UizMRAlEArDjWHTMmadet+UKwHd3UjMgGBkZcKAxAYVPS9o0Yeiha4qvz7iGiL2Sb3igUft6p7nbFWctpw== + dependencies: + abstract-leveldown "~6.2.1" + functional-red-black-tree "~1.0.1" + immediate "~3.2.3" + inherits "~2.0.1" + ltgt "~2.2.0" + safe-buffer "~5.2.0" + meow@^10.1.2: version "10.1.5" resolved "https://registry.npmjs.org/meow/-/meow-10.1.5.tgz#be52a1d87b5f5698602b0f32875ee5940904aa7f" @@ -11305,6 +11583,18 @@ merge2@^1.2.3, merge2@^1.3.0, merge2@^1.4.1: resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz#4368892f885e907455a6fd7dc55c0c9d404990ae" integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg== +merkle-patricia-tree@^4.2.4: + version "4.2.4" + resolved "https://registry.npmjs.org/merkle-patricia-tree/-/merkle-patricia-tree-4.2.4.tgz#ff988d045e2bf3dfa2239f7fabe2d59618d57413" + integrity sha512-eHbf/BG6eGNsqqfbLED9rIqbsF4+sykEaBn6OLNs71tjclbMcMOk1tEPmJKcNcNCLkvbpY/lwyOlizWsqPNo8w== + dependencies: + "@types/levelup" "^4.3.0" + ethereumjs-util "^7.1.4" + level-mem "^5.0.1" + level-ws "^2.0.0" + readable-stream "^3.6.0" + semaphore-async-await "^1.5.1" + meros@^1.1.4: version "1.2.1" resolved "https://registry.yarnpkg.com/meros/-/meros-1.2.1.tgz#056f7a76e8571d0aaf3c7afcbe7eb6407ff7329e" @@ -12306,7 +12596,7 @@ pathe@^1.1.0, pathe@^1.1.1: resolved "https://registry.npmjs.org/pathe/-/pathe-1.1.1.tgz#1dd31d382b974ba69809adc9a7a347e65d84829a" integrity sha512-d+RQGp0MAYTIaDBIMmOfMwz3E+LOZnxx1HZd5R18mmCZY0QBlK0LDZfPc8FW8Ed2DlvsuE6PRjroDY+wg4+j/Q== -pbkdf2@^3.0.3: +pbkdf2@^3.0.17, pbkdf2@^3.0.3: version "3.1.2" resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.2.tgz#dd822aa0887580e52f1a039dc3eda108efae3075" integrity sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA== @@ -13676,7 +13966,7 @@ readable-stream@^2.0.2, readable-stream@^2.3.3, readable-stream@^2.3.6: string_decoder "~1.1.1" util-deprecate "~1.0.1" -readable-stream@^3.1.1, readable-stream@^3.5.0: +readable-stream@^3.1.0, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.5.0: version "3.6.2" resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967" integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA== @@ -13978,6 +14268,13 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^3.0.0" inherits "^2.0.1" +rlp@^2.2.4: + version "2.2.7" + resolved "https://registry.npmjs.org/rlp/-/rlp-2.2.7.tgz#33f31c4afac81124ac4b283e2bd4d9720b30beaf" + integrity sha512-d5gdPmgQ0Z+AklL2NVXr/IoSjNZFfTVvQWzL/AM2AOcSzYP2xjlb0AC8YyCLc41MSNf6P6QVtjgPdmVtzb+4lQ== + dependencies: + bn.js "^5.2.0" + roarr@^2.15.3: version "2.15.4" resolved "https://registry.yarnpkg.com/roarr/-/roarr-2.15.4.tgz#f5fe795b7b838ccfe35dc608e0282b9eba2e7afd" @@ -14148,11 +14445,25 @@ scroll-into-view-if-needed@^3.1.0: dependencies: compute-scroll-into-view "^3.0.2" -scrypt-js@3.0.1: +scrypt-js@3.0.1, scrypt-js@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/scrypt-js/-/scrypt-js-3.0.1.tgz#d314a57c2aef69d1ad98a138a21fe9eafa9ee312" integrity sha512-cdwTTnqPu0Hyvf5in5asVdZocVDTNRmR7XEcJuIzMjJeSHybHl7vpB66AzwTaIg6CLSbtjcxc8fqcySfnTkccA== +secp256k1@^4.0.1: + version "4.0.3" + resolved "https://registry.npmjs.org/secp256k1/-/secp256k1-4.0.3.tgz#c4559ecd1b8d3c1827ed2d1b94190d69ce267303" + integrity sha512-NLZVf+ROMxwtEj3Xa562qgv2BK5e2WNmXPiOdVIPLgs6lyTzMvBq0aWTYMI5XCP9jZMVKOcqZLw/Wc4vDkuxhA== + dependencies: + elliptic "^6.5.4" + node-addon-api "^2.0.0" + node-gyp-build "^4.2.0" + +semaphore-async-await@^1.5.1: + version "1.5.1" + resolved "https://registry.npmjs.org/semaphore-async-await/-/semaphore-async-await-1.5.1.tgz#857bef5e3644601ca4b9570b87e9df5ca12974fa" + integrity sha512-b/ptP11hETwYWpeilHXXQiV5UJNJl7ZWWooKRE5eBIYWoom6dZ0SluCIdCtKycsMtZgKWE01/qAw6jblw1YVhg== + semver-compare@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" @@ -14242,7 +14553,7 @@ set-value@^4.1.0: is-plain-object "^2.0.4" is-primitive "^3.0.1" -setimmediate@^1.0.4: +setimmediate@^1.0.4, setimmediate@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/setimmediate/-/setimmediate-1.0.5.tgz#290cbb232e306942d7d7ea9b83732ab7856f8285" integrity sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA== @@ -16001,7 +16312,7 @@ ws@^8.5.0: resolved "https://registry.npmjs.org/ws/-/ws-8.14.2.tgz#6c249a806eb2db7a20d26d51e7709eab7b2e6c7f" integrity sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g== -xtend@^4.0.0, xtend@^4.0.1: +xtend@^4.0.0, xtend@^4.0.1, xtend@^4.0.2, xtend@~4.0.0: version "4.0.2" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54" integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ== From cf4fb7f0c66c52c90a7706f3fd652d3817db989f Mon Sep 17 00:00:00 2001 From: cyrbuzz Date: Fri, 15 Dec 2023 16:26:31 +0800 Subject: [PATCH 2/2] 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"