diff --git a/components/common/AppWrapper.tsx b/components/common/AppWrapper.tsx index fc8620f..a83366a 100644 --- a/components/common/AppWrapper.tsx +++ b/components/common/AppWrapper.tsx @@ -1,44 +1,36 @@ import React, {ReactElement} from 'react'; import {AppProps} from 'next/app'; -import {AnimatePresence, motion} from 'framer-motion'; import KBar from 'components/common/Kbar'; import Meta from 'components/common/Meta'; import Footer from 'components/common/StandardFooter'; -import Header from 'components/common/StandardHeader'; +import Header from '@yearn-finance/web-lib/layouts/Header.next'; import {KBarProvider} from 'kbar'; - -const transition = {duration: 0.3, ease: [0.17, 0.67, 0.83, 0.67]}; -const thumbnailVariants = { - initial: {y: 20, opacity: 0, transition}, - enter: {y: 0, opacity: 1, transition}, - exit: {y: -20, opacity: 0, transition} -}; +import Link from 'next/link'; +import LogoYearn from 'components/icons/LogoYearn'; function WithLayout(props: AppProps): ReactElement { const {Component, pageProps, router} = props; return ( - -
-
- - - - - +
+
+
} + currentPathName={router.pathname} + onOpenMenuMobile={() => {}} + nav={[ + {path: '/', label: 'Home'}, + {path: '/foo', label: 'Foo'}, + {path: '/bar', label: 'Bar'}, + ]} + logo={}/> + +
-
- +
); } diff --git a/components/common/KBarButton.tsx b/components/common/KBarButton.tsx deleted file mode 100644 index e50dac0..0000000 --- a/components/common/KBarButton.tsx +++ /dev/null @@ -1,31 +0,0 @@ -import React, {ReactElement} from 'react'; -import {Search} from '@yearn-finance/web-lib/icons'; -import {useKBar} from 'kbar'; - -function KBarButton(): ReactElement { - const {query} = useKBar(); - return ( -
- -
- ); -} - -export default KBarButton; diff --git a/components/common/StandardFooter.tsx b/components/common/StandardFooter.tsx index f15d9e7..890170f 100644 --- a/components/common/StandardFooter.tsx +++ b/components/common/StandardFooter.tsx @@ -1,9 +1,12 @@ -import React, {ReactElement} from 'react'; -import Link from 'next/link'; -import {SwitchTheme} from '@yearn-finance/web-lib/components'; -import {useUI} from '@yearn-finance/web-lib/contexts'; -import {SocialDiscord, SocialGithub, SocialMedium, SocialTwitter} from '@yearn-finance/web-lib/icons'; -import meta from 'public/manifest.json'; +import React, {ReactElement} from 'react'; +import Link from 'next/link'; +import {SwitchTheme} from '@yearn-finance/web-lib/components/SwitchTheme'; +import {useUI} from '@yearn-finance/web-lib/contexts/useUI'; +import IconSocialDiscord from '@yearn-finance/web-lib/icons/IconSocialDiscord'; +import IconSocialGithub from '@yearn-finance/web-lib/icons/IconSocialGithub'; +import IconSocialMedium from '@yearn-finance/web-lib/icons/IconSocialMedium'; +import IconSocialTwitter from '@yearn-finance/web-lib/icons/IconSocialTwitter'; +import meta from 'public/manifest.json'; function Footer(): ReactElement { @@ -41,7 +44,7 @@ function Footer(): ReactElement { href={'https://twitter.com/iearnfinance'} target={'_blank'} rel={'noreferrer'}> - +
@@ -49,7 +52,7 @@ function Footer(): ReactElement { href={meta.github} target={'_blank'} rel={'noreferrer'}> - +
@@ -57,7 +60,7 @@ function Footer(): ReactElement { href={'https://discord.yearn.finance/'} target={'_blank'} rel={'noreferrer'}> - +
@@ -65,7 +68,7 @@ function Footer(): ReactElement { href={'https://medium.com/iearn'} target={'_blank'} rel={'noreferrer'}> - +
diff --git a/components/common/StandardHeader.tsx b/components/common/StandardHeader.tsx deleted file mode 100644 index 9012ced..0000000 --- a/components/common/StandardHeader.tsx +++ /dev/null @@ -1,120 +0,0 @@ -import React, {ReactElement, useEffect, useState} from 'react'; -import Link from 'next/link'; -import {Card, Dropdown, ModalMobileMenu} from '@yearn-finance/web-lib/components'; -import {useWeb3} from '@yearn-finance/web-lib/contexts'; -import {Hamburger, NetworkArbitrum, NetworkEthereum, - NetworkFantom, NetworkOptimism} from '@yearn-finance/web-lib/icons'; -import {truncateHex} from '@yearn-finance/web-lib/utils'; -import KBarButton from 'components/common/KBarButton'; -import LogoYearn from 'components/icons/LogoYearn'; - -type TOptions = { - icon: ReactElement; - label: string; - value: number; -} - -const options: TOptions[] = [ - {icon: , label: 'Ethereum', value: 1}, - {icon: , label: 'Optimism', value: 10}, - {icon: , label: 'Fantom', value: 250}, - {icon: , label: 'Arbitrum', value: 42161} -]; - -function StandardHeader({ - shouldUseWallets = true, - shouldUseNetworks = true -}): ReactElement { - const {chainID, onSwitchChain, isActive, address, ens, openLoginModal, onDesactivate} = useWeb3(); - const [walletIdentity, set_walletIdentity] = useState('Connect wallet'); - const [selectedOption, set_selectedOption] = useState(options[0]); - const [hasMobileMenu, set_hasMobileMenu] = useState(false); - - useEffect((): void => { - if (!isActive && address) { - set_walletIdentity('Invalid network'); - } else if (ens) { - set_walletIdentity(ens); - } else if (address) { - set_walletIdentity(truncateHex(address, 4)); - } else { - set_walletIdentity('Connect wallet'); - } - }, [ens, address, isActive]); - - useEffect((): void => { - const _selectedOption = options.find((e): boolean => e.value === Number(chainID)) || options[0]; - set_selectedOption(_selectedOption); - }, [chainID, isActive]); - - function onOpenMobileMenu(): void { - set_hasMobileMenu(true); - } - - return ( -
- -
-
- -
- -

- {'Yearn Finance'} -

-
- - -
-
- -
- -
- -
- {shouldUseNetworks ? ( -
- onSwitchChain(option.value as number, true)} /> -
- ) : null} - {shouldUseWallets ? ( - - ) : null} -
-
- - set_hasMobileMenu(false)} - menu={[ - {'Home'}, - {'Disclaimer'} - ]}/> -
- ); -} - -export default StandardHeader; \ No newline at end of file diff --git a/components/icons/LogoYearn.tsx b/components/icons/LogoYearn.tsx index 80c18b4..5f5059d 100644 --- a/components/icons/LogoYearn.tsx +++ b/components/icons/LogoYearn.tsx @@ -13,7 +13,7 @@ function LogoYearn(props: React.SVGProps): ReactElement { cx={'512'} cy={'512'} r={'512'} - fill={'#FF90A1'}/> + fill={'#000000'}/> diff --git a/package.json b/package.json index 42e32cd..dac0892 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ }, "dependencies": { "@headlessui/react": "^1.7.3", - "@yearn-finance/web-lib": "^0.14.0", + "@yearn-finance/web-lib": "^0.17.55", "axios": "^1.1.3", "ethcall": "^4.8.5", "ethers": "^5.7.2", diff --git a/pages/_app.tsx b/pages/_app.tsx index b99713b..9ffb7b0 100755 --- a/pages/_app.tsx +++ b/pages/_app.tsx @@ -1,6 +1,6 @@ import React, {ReactElement} from 'react'; import {AppProps} from 'next/app'; -import {WithYearn} from '@yearn-finance/web-lib/contexts'; +import {WithYearn} from '@yearn-finance/web-lib/contexts/WithYearn'; import AppWrapper from 'components/common/AppWrapper'; import '../style.css'; @@ -11,7 +11,6 @@ function MyApp(props: AppProps): ReactElement { options={{ web3: { shouldUseWallets: true, - shouldUseStrictChainMode: false, defaultChainID: 1, supportedChainID: [1, 10, 250, 42161, 1337, 31337] } diff --git a/pages/disclaimer.tsx b/pages/disclaimer.tsx index bd6524f..e95b4e5 100644 --- a/pages/disclaimer.tsx +++ b/pages/disclaimer.tsx @@ -1,7 +1,7 @@ import React, {ReactElement} from 'react'; import Link from 'next/link'; -import {Card} from '@yearn-finance/web-lib/components'; -import {Cross} from '@yearn-finance/web-lib/icons'; +import {Card} from '@yearn-finance/web-lib/components/Card'; +import IconCross from '@yearn-finance/web-lib/icons/IconCross'; function DisclaimerPage(): ReactElement { return ( @@ -10,7 +10,7 @@ function DisclaimerPage(): ReactElement {

{'Disclaimer'}

- +
diff --git a/pages/index.tsx b/pages/index.tsx index 2237fe8..fdd51f0 100755 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -1,5 +1,7 @@ import React, {ReactElement} from 'react'; -import {Banner, Card, DescriptionList} from '@yearn-finance/web-lib/components'; +import {Banner} from '@yearn-finance/web-lib/components/Banner'; +import {Card} from '@yearn-finance/web-lib/components/Card'; +import {DescriptionList} from '@yearn-finance/web-lib/components/DescriptionList'; function Content(): ReactElement { return ( diff --git a/pages/settings.tsx b/pages/settings.tsx index 64479a8..2b9f442 100644 --- a/pages/settings.tsx +++ b/pages/settings.tsx @@ -1,6 +1,7 @@ import React, {ReactElement, useMemo, useState} from 'react'; -import {Card} from '@yearn-finance/web-lib/components'; -import {useSettings} from '@yearn-finance/web-lib/contexts'; +import {Card} from '@yearn-finance/web-lib/components/Card'; +import {useSettings} from '@yearn-finance/web-lib/contexts/useSettings'; +import { isAddress } from 'utils/types/isAddress'; type TWrappedInput = { title: string; @@ -43,7 +44,6 @@ function WrappedInput({title, caption, initialValue, onSave}: TWrappedInput): Re ); } - function SectionRPCEndpoints(): ReactElement { const {onUpdateNetworks} = useSettings(); const [, set_nonce] = useState(0); @@ -228,8 +228,10 @@ function SectionOracleAddress(): ReactElement { caption={'Explorer Base URL for the Ethereum Mainnet chain (chainID: 1).'} initialValue={networks[1].lensAddress} onSave={(value): void => { - onUpdateNetworks({1: {lensAddress: value}}); - set_nonce((n: number): number => n + 1); + if (isAddress(value)) { + onUpdateNetworks({1: {lensAddress: value}}); + set_nonce((n: number): number => n + 1); + } }} /> { - onUpdateNetworks({10: {lensAddress: value}}); - set_nonce((n: number): number => n + 1); + if (isAddress(value)) { + onUpdateNetworks({10: {lensAddress: value}}); + set_nonce((n: number): number => n + 1); + } }} /> { - onUpdateNetworks({250: {lensAddress: value}}); - set_nonce((n: number): number => n + 1); + if (isAddress(value)) { + onUpdateNetworks({250: {lensAddress: value}}); + set_nonce((n: number): number => n + 1); + } }} /> { - onUpdateNetworks({42161: {lensAddress: value}}); - set_nonce((n: number): number => n + 1); + if (isAddress(value)) { + onUpdateNetworks({42161: {lensAddress: value}}); + set_nonce((n: number): number => n + 1); + } }} />
diff --git a/utils/types/isAddress.ts b/utils/types/isAddress.ts new file mode 100644 index 0000000..b01abc6 --- /dev/null +++ b/utils/types/isAddress.ts @@ -0,0 +1,5 @@ +import type {TAddress} from '@yearn-finance/web-lib/utils/address'; + +export function isAddress(value: string): value is TAddress { + return /^0x([0-9a-f][0-9a-f])*$/i.test(value); +} diff --git a/yarn.lock b/yarn.lock index 918d804..6239fb5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -940,13 +940,13 @@ "@babel/helper-validator-identifier" "^7.18.6" to-fast-properties "^2.0.0" -"@coinbase/wallet-sdk@^3.5.3": - version "3.5.3" - resolved "https://registry.yarnpkg.com/@coinbase/wallet-sdk/-/wallet-sdk-3.5.3.tgz#ffa657cc16f896e08c3e9ac571ca6a37d1f560fd" - integrity sha512-kaGMk9KyiSLPm1+BvCQSc99ku9gn0j+M1+2Beii+4gx/lRVhutlzmn6l+5zTB/n3xri25iTr+SxjMZLlMfW8Hg== +"@coinbase/wallet-sdk@^3.5.4": + version "3.6.3" + resolved "https://registry.yarnpkg.com/@coinbase/wallet-sdk/-/wallet-sdk-3.6.3.tgz#fd96f6f19d5a0090520c1b014ad4737bbc8e1267" + integrity sha512-XUR4poOJE+dKzwBTdlM693CdLFitr046oZOVY3iDnbFcRrrQswhbDji7q4CmUcD4HxbfViX7PFoIwl79YQcukg== dependencies: "@metamask/safe-event-emitter" "2.0.0" - "@solana/web3.js" "1.52.0" + "@solana/web3.js" "^1.70.1" bind-decorator "^1.0.11" bn.js "^5.1.1" buffer "^6.0.3" @@ -1411,32 +1411,6 @@ bech32 "1.1.4" ws "7.4.6" -"@ethersproject/providers@5.7.1": - version "5.7.1" - resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.7.1.tgz#b0799b616d5579cd1067a8ebf1fc1ec74c1e122c" - integrity sha512-vZveG/DLyo+wk4Ga1yx6jSEHrLPgmTt+dFv0dv8URpVCRf0jVhalps1jq/emN/oXnMRsC7cQgAF32DcXLL7BPQ== - dependencies: - "@ethersproject/abstract-provider" "^5.7.0" - "@ethersproject/abstract-signer" "^5.7.0" - "@ethersproject/address" "^5.7.0" - "@ethersproject/base64" "^5.7.0" - "@ethersproject/basex" "^5.7.0" - "@ethersproject/bignumber" "^5.7.0" - "@ethersproject/bytes" "^5.7.0" - "@ethersproject/constants" "^5.7.0" - "@ethersproject/hash" "^5.7.0" - "@ethersproject/logger" "^5.7.0" - "@ethersproject/networks" "^5.7.0" - "@ethersproject/properties" "^5.7.0" - "@ethersproject/random" "^5.7.0" - "@ethersproject/rlp" "^5.7.0" - "@ethersproject/sha2" "^5.7.0" - "@ethersproject/strings" "^5.7.0" - "@ethersproject/transactions" "^5.7.0" - "@ethersproject/web" "^5.7.0" - bech32 "1.1.4" - ws "7.4.6" - "@ethersproject/providers@5.7.2": version "5.7.2" resolved "https://registry.yarnpkg.com/@ethersproject/providers/-/providers-5.7.2.tgz#f8b1a4f275d7ce58cf0a2eec222269a08beb18cb" @@ -1495,7 +1469,7 @@ "@ethersproject/bytes" "^5.7.0" "@ethersproject/logger" "^5.7.0" -"@ethersproject/sha2@5.6.1", "@ethersproject/sha2@^5.5.0", "@ethersproject/sha2@^5.6.1": +"@ethersproject/sha2@5.6.1", "@ethersproject/sha2@^5.6.1": version "5.6.1" resolved "https://registry.yarnpkg.com/@ethersproject/sha2/-/sha2-5.6.1.tgz#211f14d3f5da5301c8972a8827770b6fd3e51656" integrity sha512-5K2GyqcW7G4Yo3uenHegbXRPDgARpWUiXc6RiF7b6i/HXUoWlb7uCARh7BAHg7/qT/Q5ydofNwiZcim9qpjB6g== @@ -1744,6 +1718,11 @@ dependencies: cross-fetch "^3.1.5" +"@graphql-typed-document-node/core@^3.1.1": + version "3.1.1" + resolved "https://registry.yarnpkg.com/@graphql-typed-document-node/core/-/core-3.1.1.tgz#076d78ce99822258cf813ecc1e7fa460fa74d052" + integrity sha512-NQ17ii0rK1b34VZonlmT2QMJFI70m0TRwbknO/ihlbatXyaktDhN/98vBiUU6kNBPljqGqyIrl2T4nY2RpFANg== + "@headlessui/react@1.7.3", "@headlessui/react@^1.7.3": version "1.7.3" resolved "https://registry.yarnpkg.com/@headlessui/react/-/react-1.7.3.tgz#853c598ff47b37cdd192c5cbee890d9b610c3ec0" @@ -1981,6 +1960,21 @@ resolved "https://registry.yarnpkg.com/@next/swc-win32-x64-msvc/-/swc-win32-x64-msvc-12.3.1.tgz#27d71a95247a9eaee03d47adee7e3bd594514136" integrity sha512-W1ijvzzg+kPEX6LAc+50EYYSEo0FVu7dmTE+t+DM4iOLqgGHoW9uYSz9wCVdkXOEEMP9xhXfGpcSxsfDucyPkA== +"@noble/ed25519@^1.7.0": + version "1.7.1" + resolved "https://registry.yarnpkg.com/@noble/ed25519/-/ed25519-1.7.1.tgz#6899660f6fbb97798a6fbd227227c4589a454724" + integrity sha512-Rk4SkJFaXZiznFyC/t77Q0NKS4FL7TLJJsVG2V2oiEq3kJVeTdxysEe/yRWSpnWMe808XRDJ+VFh5pt/FN5plw== + +"@noble/hashes@^1.1.2": + version "1.1.5" + resolved "https://registry.yarnpkg.com/@noble/hashes/-/hashes-1.1.5.tgz#1a0377f3b9020efe2fae03290bd2a12140c95c11" + integrity sha512-LTMZiiLc+V4v1Yi16TD6aX2gmtKszNye0pQgbaLqkvhIqP7nVsSaJsWloGQjJfJ8offaoP5GtX3yY5swbcJxxQ== + +"@noble/secp256k1@^1.6.3": + version "1.7.0" + resolved "https://registry.yarnpkg.com/@noble/secp256k1/-/secp256k1-1.7.0.tgz#d15357f7c227e751d90aa06b05a0e5cf993ba8c1" + integrity sha512-kbacwGSsH/CTout0ZnZWxnW1B+jH/7r/WAAKLBtrRJ/+CUH7lgmQzl3GTrQua3SGKWNSDsS6lmjnDpIJ5Dxyaw== + "@nodelib/fs.scandir@2.1.5": version "2.1.5" resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" @@ -2090,13 +2084,15 @@ dependencies: buffer "~6.0.3" -"@solana/web3.js@1.52.0": - version "1.52.0" - resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.52.0.tgz#71bd5c322a31e3e2fa8cda2261c594846810b8ea" - integrity sha512-oG1+BX4nVYZ0OBzmk6DRrY8oBYMsbXVQEf9N9JOfKm+wXSmjxVEEo8v3IPV8mKwR0JvUWuE8lOn3IUDiMlRLgg== +"@solana/web3.js@^1.70.1": + version "1.70.1" + resolved "https://registry.yarnpkg.com/@solana/web3.js/-/web3.js-1.70.1.tgz#4a2df47cc32a0f67be5161e772b2ceb6512281fa" + integrity sha512-AnaqCF1cJ3w7d0yhvLGAKAcRI+n5o+ursQihhoTe4cUh8/9d4gbT73SoHYElS7e67OtAgLmSfbcC5hcOAgdvnQ== dependencies: "@babel/runtime" "^7.12.5" - "@ethersproject/sha2" "^5.5.0" + "@noble/ed25519" "^1.7.0" + "@noble/hashes" "^1.1.2" + "@noble/secp256k1" "^1.6.3" "@solana/buffer-layout" "^4.0.0" bigint-buffer "^1.1.5" bn.js "^5.0.0" @@ -2105,13 +2101,9 @@ buffer "6.0.1" fast-stable-stringify "^1.0.0" jayson "^3.4.4" - js-sha3 "^0.8.0" node-fetch "2" - react-native-url-polyfill "^1.3.0" rpc-websockets "^7.5.0" - secp256k1 "^4.0.2" superstruct "^0.14.2" - tweetnacl "^1.0.3" "@surma/rollup-plugin-off-main-thread@^2.2.3": version "2.2.3" @@ -2467,7 +2459,7 @@ resolved "https://registry.yarnpkg.com/@walletconnect/environment/-/environment-1.0.0.tgz#c4545869fa9c389ec88c364e1a5f8178e8ab5034" integrity sha512-4BwqyWy6KpSvkocSaV7WR3BlZfrxLbJSLkg+j7Gl6pTDE+U55lLhJvQaMuDVazXYxcjBsG09k7UlH7cGiUI5vQ== -"@walletconnect/ethereum-provider@^1.8.0": +"@walletconnect/ethereum-provider@^1.7.8": version "1.8.0" resolved "https://registry.yarnpkg.com/@walletconnect/ethereum-provider/-/ethereum-provider-1.8.0.tgz#ed1dbf9cecc3b818758a060d2f9017c50bde1d32" integrity sha512-Nq9m+oo5P0F+njsROHw9KMWdoc/8iGHYzQdkjJN/1C7DtsqFRg5k5a3hd9rzCLpbPsOC1q8Z5lRs6JQgDvPm6Q== @@ -2662,26 +2654,26 @@ dependencies: zustand "^4.0.0-rc.0" -"@web3-react/walletconnect@8.0.35-beta.0": - version "8.0.35-beta.0" - resolved "https://registry.yarnpkg.com/@web3-react/walletconnect/-/walletconnect-8.0.35-beta.0.tgz#49c6c77447d58bfb295f28fa87c8fbfeec95cff5" - integrity sha512-fUrqcnwAr5oecZ6VUE/7+RSVURrohbAgWMLKYxd8Zo47AtTPzgJ1t5Lydh/EX4xJPLhfK1LqX5YgMwiys3DvhQ== +"@web3-react/walletconnect@8.0.36-beta.0": + version "8.0.36-beta.0" + resolved "https://registry.yarnpkg.com/@web3-react/walletconnect/-/walletconnect-8.0.36-beta.0.tgz#a0dbb5286b9011c6c221cc143322822a7387978f" + integrity sha512-u+yNWCm8nz5pZn8SyU5+9pI5hakKcfhUF1TYwj7HVTTMHdMlLXhk19YyaycsFkgbX9zWzouItwxXF8obGt+rCg== dependencies: "@web3-react/types" "^8.0.20-beta.0" eventemitter3 "^4.0.7" -"@yearn-finance/web-lib@^0.14.0": - version "0.14.0" - resolved "https://registry.yarnpkg.com/@yearn-finance/web-lib/-/web-lib-0.14.0.tgz#5e7701164d7eda453835ba9de569b4266327edb0" - integrity sha512-R3v+gWHsxkrOhUBPQRoC6ef9SEb8DuSdpdBAkenc4/JV+/zCpVkPqh6d01mVJV7Q0mfIlq8N56G+kxYyjH81nw== +"@yearn-finance/web-lib@^0.17.55": + version "0.17.55" + resolved "https://registry.yarnpkg.com/@yearn-finance/web-lib/-/web-lib-0.17.55.tgz#66edb7af16af5dacff8c8f3608b80e6046ef0a9d" + integrity sha512-/SeukwpObmfpwke0FWtknnftmPDzHdSYhRei1RTewez1TkwYOj26ifsijOUoM9Pl3WIMFZrUASz7WK9x+FWrrQ== dependencies: - "@coinbase/wallet-sdk" "^3.5.3" + "@coinbase/wallet-sdk" "^3.5.4" "@ethersproject/experimental" "^5.7.0" "@headlessui/react" "1.7.3" "@tailwindcss/forms" "^0.5.3" "@tailwindcss/line-clamp" "^0.4.2" "@tailwindcss/typography" "^0.5.7" - "@walletconnect/ethereum-provider" "^1.8.0" + "@walletconnect/ethereum-provider" "^1.7.8" "@walletconnect/jsonrpc-http-connection" "^1.0.3" "@walletconnect/jsonrpc-provider" "^1.0.5" "@web3-react/coinbase-wallet" "8.0.34-beta.0" @@ -2690,17 +2682,20 @@ "@web3-react/gnosis-safe" "8.0.6-beta.0" "@web3-react/metamask" "8.0.28-beta.0" "@web3-react/types" "8.0.20-beta.0" - "@web3-react/walletconnect" "8.0.35-beta.0" - dayjs "^1.11.5" - ethcall "^4.8.5" - ethers "5.7.1" + "@web3-react/walletconnect" "8.0.36-beta.0" + axios "^1.2.0" + dayjs "^1.11.6" + ethcall "^4.8.7" + ethers "5.7.2" eventemitter3 "^4.0.7" - framer-motion "7.6.1" + framer-motion "7.6.2" + graphql "^16.6.0" + graphql-request "^5.0.0" nprogress "^0.2.0" react "18.2.0" react-dom "^18.2.0" react-hot-toast "2.4.0" - tailwindcss "^3.1.8" + tailwindcss "^3.2.1" JSONStream@^1.3.5: version "1.3.5" @@ -2946,6 +2941,15 @@ axios@^1.1.3: form-data "^4.0.0" proxy-from-env "^1.1.0" +axios@^1.2.0: + version "1.2.1" + resolved "https://registry.yarnpkg.com/axios/-/axios-1.2.1.tgz#44cf04a3c9f0c2252ebd85975361c026cb9f864a" + integrity sha512-I88cFiGu9ryt/tfVEi4kX2SITsvDddTajXTOFmt2uK1ZVA8LytjtdeyefdQWEf5PU8w+4SSJDoYnggflB5tW4A== + dependencies: + follow-redirects "^1.15.0" + form-data "^4.0.0" + proxy-from-env "^1.1.0" + axobject-query@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz#943d47e10c0b704aa42275e20edf3722648989be" @@ -3487,10 +3491,10 @@ damerau-levenshtein@^1.0.8: resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.8.tgz#b43d286ccbd36bc5b2f7ed41caf2d0aba1f8a6e7" integrity sha512-sdQSFB7+llfUcQHUQO3+B8ERRj0Oa4w9POWMI/puGtuf7gFywGmkaLCElnudfTiKZV+NvHqL0ifzdrI8Ro7ESA== -dayjs@^1.11.5: - version "1.11.5" - resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.5.tgz#00e8cc627f231f9499c19b38af49f56dc0ac5e93" - integrity sha512-CAdX5Q3YW3Gclyo5Vpqkgpj8fSdLQcRuzfX6mC6Phy0nfJ0eGYOeS7m4mt2plDWLAtA4TqTakvbboHvUxfe4iA== +dayjs@^1.11.6: + version "1.11.7" + resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.11.7.tgz#4b296922642f70999544d1144a2c25730fce63e2" + integrity sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ== debug@^2.6.9: version "2.6.9" @@ -4160,6 +4164,18 @@ ethcall@^4.8.5: "@types/node" "^18.6.3" abi-coder "^4.0.0" +ethcall@^4.8.7: + version "4.8.13" + resolved "https://registry.yarnpkg.com/ethcall/-/ethcall-4.8.13.tgz#20b45cfbfea721d1ae66d5a53c96a1fe138390a0" + integrity sha512-kpD000saTfBDoQn5g8gqTJhjGinWnAPkAwyYCN8SsGCUgjZxTMtEVwA+soo4ii/uyRYKMDeFFVk866GqU0jerA== + dependencies: + "@ethersproject/abi" "^5.0.0" + "@ethersproject/bytes" "^5.0.0" + "@ethersproject/contracts" "^5.0.0" + "@ethersproject/providers" "^5.0.0" + "@types/node" "^18.6.3" + abi-coder "^4.0.0" + ethereum-cryptography@^0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/ethereum-cryptography/-/ethereum-cryptography-0.1.3.tgz#8d6143cfc3d74bf79bbd8edecdf29e4ae20dd191" @@ -4214,10 +4230,10 @@ ethereumjs-util@^6.0.0: ethjs-util "0.1.6" rlp "^2.2.3" -ethers@5.7.1: - version "5.7.1" - resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.7.1.tgz#48c83a44900b5f006eb2f65d3ba6277047fd4f33" - integrity sha512-5krze4dRLITX7FpU8J4WscXqADiKmyeNlylmmDLbS95DaZpBhDe2YSwRQwKXWNyXcox7a3gBgm/MkGXV1O1S/Q== +ethers@5.7.2, ethers@^5.7.0, ethers@^5.7.2: + version "5.7.2" + resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.7.2.tgz#3a7deeabbb8c030d4126b24f84e525466145872e" + integrity sha512-wswUsmWo1aOK8rR7DIKiWSw9DbLWe6x98Jrn8wcTflTVvaXhAMaB5zGAXy0GYQEQp9iO1iSHWVyARQm11zUtyg== dependencies: "@ethersproject/abi" "5.7.0" "@ethersproject/abstract-provider" "5.7.0" @@ -4237,7 +4253,7 @@ ethers@5.7.1: "@ethersproject/networks" "5.7.1" "@ethersproject/pbkdf2" "5.7.0" "@ethersproject/properties" "5.7.0" - "@ethersproject/providers" "5.7.1" + "@ethersproject/providers" "5.7.2" "@ethersproject/random" "5.7.0" "@ethersproject/rlp" "5.7.0" "@ethersproject/sha2" "5.7.0" @@ -4286,42 +4302,6 @@ ethers@^5.6.8: "@ethersproject/web" "5.6.1" "@ethersproject/wordlists" "5.6.1" -ethers@^5.7.0, ethers@^5.7.2: - version "5.7.2" - resolved "https://registry.yarnpkg.com/ethers/-/ethers-5.7.2.tgz#3a7deeabbb8c030d4126b24f84e525466145872e" - integrity sha512-wswUsmWo1aOK8rR7DIKiWSw9DbLWe6x98Jrn8wcTflTVvaXhAMaB5zGAXy0GYQEQp9iO1iSHWVyARQm11zUtyg== - dependencies: - "@ethersproject/abi" "5.7.0" - "@ethersproject/abstract-provider" "5.7.0" - "@ethersproject/abstract-signer" "5.7.0" - "@ethersproject/address" "5.7.0" - "@ethersproject/base64" "5.7.0" - "@ethersproject/basex" "5.7.0" - "@ethersproject/bignumber" "5.7.0" - "@ethersproject/bytes" "5.7.0" - "@ethersproject/constants" "5.7.0" - "@ethersproject/contracts" "5.7.0" - "@ethersproject/hash" "5.7.0" - "@ethersproject/hdnode" "5.7.0" - "@ethersproject/json-wallets" "5.7.0" - "@ethersproject/keccak256" "5.7.0" - "@ethersproject/logger" "5.7.0" - "@ethersproject/networks" "5.7.1" - "@ethersproject/pbkdf2" "5.7.0" - "@ethersproject/properties" "5.7.0" - "@ethersproject/providers" "5.7.2" - "@ethersproject/random" "5.7.0" - "@ethersproject/rlp" "5.7.0" - "@ethersproject/sha2" "5.7.0" - "@ethersproject/signing-key" "5.7.0" - "@ethersproject/solidity" "5.7.0" - "@ethersproject/strings" "5.7.0" - "@ethersproject/transactions" "5.7.0" - "@ethersproject/units" "5.7.0" - "@ethersproject/wallet" "5.7.0" - "@ethersproject/web" "5.7.1" - "@ethersproject/wordlists" "5.7.0" - ethjs-util@0.1.6, ethjs-util@^0.1.3: version "0.1.6" resolved "https://registry.yarnpkg.com/ethjs-util/-/ethjs-util-0.1.6.tgz#f308b62f185f9fe6237132fb2a9818866a5cd536" @@ -4353,6 +4333,11 @@ expand-template@^2.0.3: resolved "https://registry.yarnpkg.com/expand-template/-/expand-template-2.0.3.tgz#6e14b3fcee0f3a6340ecb57d2e8918692052a47c" integrity sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg== +extract-files@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/extract-files/-/extract-files-9.0.0.tgz#8a7744f2437f81f5ed3250ed9f1550de902fe54a" + integrity sha512-CvdFfHkC95B4bBBk36hcEmvdR2awOdhhVUYH6S/zrVj3477zven/fJMYg7121h4T1xHZC+tetUpubpAhxwI7hQ== + eyes@^0.1.8: version "0.1.8" resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0" @@ -4505,6 +4490,15 @@ for-each@^0.3.3: dependencies: is-callable "^1.1.3" +form-data@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/form-data/-/form-data-3.0.1.tgz#ebd53791b78356a99af9a300d4282c4d5eb9755f" + integrity sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg== + dependencies: + asynckit "^0.4.0" + combined-stream "^1.0.8" + mime-types "^2.1.12" + form-data@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.0.tgz#93919daeaf361ee529584b9b31664dc12c9fa452" @@ -4519,7 +4513,21 @@ fraction.js@^4.2.0: resolved "https://registry.yarnpkg.com/fraction.js/-/fraction.js-4.2.0.tgz#448e5109a313a3527f5a3ab2119ec4cf0e0e2950" integrity sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA== -framer-motion@7.6.1, framer-motion@^7.6.1: +framer-motion@7.6.2: + version "7.6.2" + resolved "https://registry.yarnpkg.com/framer-motion/-/framer-motion-7.6.2.tgz#7fb93ebfeda27c8c2cff1895ca7a417229e81bf7" + integrity sha512-YRr+KaC+1MlLx7iArVyjZRpc0QXI7H0XIOJrdol+dF1+WLQJwS2sP04KGq808BG+byD36UAmAt4YqObE5YFLtw== + dependencies: + "@motionone/dom" "10.13.1" + framesync "6.1.2" + hey-listen "^1.0.8" + popmotion "11.0.5" + style-value-types "5.1.2" + tslib "2.4.0" + optionalDependencies: + "@emotion/is-prop-valid" "^0.8.2" + +framer-motion@^7.6.1: version "7.6.1" resolved "https://registry.yarnpkg.com/framer-motion/-/framer-motion-7.6.1.tgz#45356eb5519275bce42121a3b3849a6243d45a22" integrity sha512-8US03IWJKrLoSb81l5OahNzB9Sv7Jo1RhIwUoTG/25BRUdO9lOqq/klsdZqNmNG0ua9IEJJQ8hkYpETJ4N6VSw== @@ -4736,6 +4744,21 @@ grapheme-splitter@^1.0.4: resolved "https://registry.yarnpkg.com/grapheme-splitter/-/grapheme-splitter-1.0.4.tgz#9cf3a665c6247479896834af35cf1dbb4400767e" integrity sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ== +graphql-request@^5.0.0: + version "5.1.0" + resolved "https://registry.yarnpkg.com/graphql-request/-/graphql-request-5.1.0.tgz#dbc8feee27d21b993cd5da2d3af67821827b240a" + integrity sha512-0OeRVYigVwIiXhNmqnPDt+JhMzsjinxHE7TVy3Lm6jUzav0guVcL0lfSbi6jVTRAxcbwgyr6yrZioSHxf9gHzw== + dependencies: + "@graphql-typed-document-node/core" "^3.1.1" + cross-fetch "^3.1.5" + extract-files "^9.0.0" + form-data "^3.0.0" + +graphql@^16.6.0: + version "16.6.0" + resolved "https://registry.yarnpkg.com/graphql/-/graphql-16.6.0.tgz#c2dcffa4649db149f6282af726c8c83f1c7c5fdb" + integrity sha512-KPIBPDlW7NxrbT/eh4qPXz5FiFdL5UbaA0XUNz2Rp3Z3hqBSkbj0GVjwFDztsWVauZUWsbKHgMg++sk8UX0bkw== + has-bigints@^1.0.1, has-bigints@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.2.tgz#0871bd3e3d51626f6ca0966668ba35d5602d6eaa" @@ -5138,7 +5161,7 @@ js-sdsl@^4.1.4: resolved "https://registry.yarnpkg.com/js-sdsl/-/js-sdsl-4.1.4.tgz#78793c90f80e8430b7d8dc94515b6c77d98a26a6" integrity sha512-Y2/yD55y5jteOAmY50JbUZYwk3CP3wnLPEZnlR1w9oKhITrBEtAxwuWKebFf8hMrPMgbYwFoWK/lH2sBkErELw== -js-sha3@0.8.0, js-sha3@^0.8.0: +js-sha3@0.8.0: version "0.8.0" resolved "https://registry.yarnpkg.com/js-sha3/-/js-sha3-0.8.0.tgz#b9b7a5da73afad7dedd0f8c463954cbde6818840" integrity sha512-gF1cRrHhIzNfToc802P800N8PpXS+evLLXfsVpowqmAFR9uwbi89WvXg2QspOmXL8QL86J4T1EpFu+yUkwJY3Q== @@ -5425,7 +5448,7 @@ 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== -micromatch@^4.0.0, micromatch@^4.0.4: +micromatch@^4.0.0, micromatch@^4.0.4, micromatch@^4.0.5: version "4.0.5" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6" integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA== @@ -6031,7 +6054,7 @@ pump@^3.0.0: end-of-stream "^1.1.0" once "^1.3.1" -punycode@^2.1.0, punycode@^2.1.1: +punycode@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== @@ -6112,13 +6135,6 @@ react-is@^16.13.1: resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== -react-native-url-polyfill@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/react-native-url-polyfill/-/react-native-url-polyfill-1.3.0.tgz#c1763de0f2a8c22cc3e959b654c8790622b6ef6a" - integrity sha512-w9JfSkvpqqlix9UjDvJjm1EjSt652zVQ6iwCIj1cVVkwXf4jQhQgTNXY6EVTwuAmUjg6BC6k9RHCBynoLFo3IQ== - dependencies: - whatwg-url-without-unicode "8.0.0-3" - react-virtual@^2.8.2: version "2.10.4" resolved "https://registry.yarnpkg.com/react-virtual/-/react-virtual-2.10.4.tgz#08712f0acd79d7d6f7c4726f05651a13b24d8704" @@ -6395,7 +6411,7 @@ scrypt-js@3.0.1, scrypt-js@^3.0.0: resolved "https://registry.yarnpkg.com/scrypt-js/-/scrypt-js-3.0.1.tgz#d314a57c2aef69d1ad98a138a21fe9eafa9ee312" integrity sha512-cdwTTnqPu0Hyvf5in5asVdZocVDTNRmR7XEcJuIzMjJeSHybHl7vpB66AzwTaIg6CLSbtjcxc8fqcySfnTkccA== -secp256k1@^4.0.1, secp256k1@^4.0.2: +secp256k1@^4.0.1: version "4.0.3" resolved "https://registry.yarnpkg.com/secp256k1/-/secp256k1-4.0.3.tgz#c4559ecd1b8d3c1827ed2d1b94190d69ce267303" integrity sha512-NLZVf+ROMxwtEj3Xa562qgv2BK5e2WNmXPiOdVIPLgs6lyTzMvBq0aWTYMI5XCP9jZMVKOcqZLw/Wc4vDkuxhA== @@ -6722,7 +6738,7 @@ synckit@^0.8.3: "@pkgr/utils" "^2.3.0" tslib "^2.4.0" -tailwindcss@^3.1.3, tailwindcss@^3.1.8: +tailwindcss@^3.1.3: version "3.1.8" resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.1.8.tgz#4f8520550d67a835d32f2f4021580f9fddb7b741" integrity sha512-YSneUCZSFDYMwk+TGq8qYFdCA3yfBRdBlS7txSq0LUmzyeqRe3a8fBQzbz9M3WS/iFT4BNf/nmw9mEzrnSaC0g== @@ -6778,6 +6794,35 @@ tailwindcss@^3.2.0: quick-lru "^5.1.1" resolve "^1.22.1" +tailwindcss@^3.2.1: + version "3.2.4" + resolved "https://registry.yarnpkg.com/tailwindcss/-/tailwindcss-3.2.4.tgz#afe3477e7a19f3ceafb48e4b083e292ce0dc0250" + integrity sha512-AhwtHCKMtR71JgeYDaswmZXhPcW9iuI9Sp2LvZPo9upDZ7231ZJ7eA9RaURbhpXGVlrjX4cFNlB4ieTetEb7hQ== + dependencies: + arg "^5.0.2" + chokidar "^3.5.3" + color-name "^1.1.4" + detective "^5.2.1" + didyoumean "^1.2.2" + dlv "^1.1.3" + fast-glob "^3.2.12" + glob-parent "^6.0.2" + is-glob "^4.0.3" + lilconfig "^2.0.6" + micromatch "^4.0.5" + normalize-path "^3.0.0" + object-hash "^3.0.0" + picocolors "^1.0.0" + postcss "^8.4.18" + postcss-import "^14.1.0" + postcss-js "^4.0.0" + postcss-load-config "^3.1.4" + postcss-nested "6.0.0" + postcss-selector-parser "^6.0.10" + postcss-value-parser "^4.2.0" + quick-lru "^5.1.1" + resolve "^1.22.1" + tapable@^2.2.0: version "2.2.1" resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" @@ -6946,11 +6991,6 @@ tunnel-agent@^0.6.0: dependencies: safe-buffer "^5.0.1" -tweetnacl@^1.0.3: - version "1.0.3" - resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-1.0.3.tgz#ac0af71680458d8a6378d0d0d050ab1407d35596" - integrity sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw== - type-check@^0.4.0, type-check@~0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" @@ -7097,11 +7137,6 @@ webidl-conversions@^4.0.2: resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg== -webidl-conversions@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz#ae59c8a00b121543a2acc65c0434f57b0fc11aff" - integrity sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA== - webpack-sources@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933" @@ -7110,15 +7145,6 @@ webpack-sources@^1.4.3: source-list-map "^2.0.0" source-map "~0.6.1" -whatwg-url-without-unicode@8.0.0-3: - version "8.0.0-3" - resolved "https://registry.yarnpkg.com/whatwg-url-without-unicode/-/whatwg-url-without-unicode-8.0.0-3.tgz#ab6df4bf6caaa6c85a59f6e82c026151d4bb376b" - integrity sha512-HoKuzZrUlgpz35YO27XgD28uh/WJH4B0+3ttFqRo//lmq+9T/mIOJ6kqmINI9HpUpz1imRC/nR/lxKpJiv0uig== - dependencies: - buffer "^5.4.3" - punycode "^2.1.1" - webidl-conversions "^5.0.0" - whatwg-url@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d"