From a328aef9b6945ead06b168fb45906b323a729d88 Mon Sep 17 00:00:00 2001 From: Anthony Date: Thu, 14 Sep 2023 16:41:35 +0900 Subject: [PATCH 01/10] Add Base support to Uniswap widget --- src/assets/svg/base_logo.svg | 4 ++ src/components/Logo/util.ts | 8 +++- src/constants/chainInfo.ts | 27 +++++++++++++ src/constants/chains.ts | 12 ++++++ src/constants/jsonRpcEndpoints.ts | 8 ++++ src/constants/routing.ts | 7 ++++ src/constants/tokens.ts | 40 +++++++++++++++++++ src/hooks/useStablecoinAmountFromFiatValue.ts | 3 +- src/hooks/web3/useJsonRpcUrlsMap.tsx | 2 + src/utils/getExplorerLink.test.ts | 6 +++ src/utils/getExplorerLink.ts | 2 + 11 files changed, 117 insertions(+), 2 deletions(-) create mode 100644 src/assets/svg/base_logo.svg diff --git a/src/assets/svg/base_logo.svg b/src/assets/svg/base_logo.svg new file mode 100644 index 000000000..a784d6a5c --- /dev/null +++ b/src/assets/svg/base_logo.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/components/Logo/util.ts b/src/components/Logo/util.ts index 5af2970f0..54917a9bd 100644 --- a/src/components/Logo/util.ts +++ b/src/components/Logo/util.ts @@ -2,12 +2,13 @@ import { SupportedChainId } from 'constants/chains' import { isAddress } from 'utils' import EthereumLogo from '../../assets/images/ethereum-logo.png' +import BaseLogo from '../../assets/svg/base_logo.svg' import BnbLogo from '../../assets/svg/bnb-logo.svg' import CeloLogo from '../../assets/svg/celo_logo.svg' import MaticLogo from '../../assets/svg/matic-token-icon.svg' import { LogoTableInput } from './LogoTable' -type Network = 'ethereum' | 'arbitrum' | 'optimism' | 'polygon' | 'celo' | 'smartchain' +type Network = 'ethereum' | 'arbitrum' | 'optimism' | 'polygon' | 'celo' | 'smartchain' | 'base' function chainIdToNetworkName(networkId: SupportedChainId): Network | undefined { switch (networkId) { @@ -23,6 +24,8 @@ function chainIdToNetworkName(networkId: SupportedChainId): Network | undefined return 'celo' case SupportedChainId.BNB: return 'smartchain' + case SupportedChainId.BASE: + return 'base' default: return 'ethereum' } @@ -51,6 +54,9 @@ export function getNativeLogoURI(chainId: SupportedChainId = SupportedChainId.MA return CeloLogo case SupportedChainId.BNB: return BnbLogo + case SupportedChainId.BASE: + case SupportedChainId.BASE_GOERLI: + return BaseLogo default: return EthereumLogo } diff --git a/src/constants/chainInfo.ts b/src/constants/chainInfo.ts index d98069641..fe3103be7 100644 --- a/src/constants/chainInfo.ts +++ b/src/constants/chainInfo.ts @@ -1,5 +1,6 @@ import ethereumLogoUrl from 'assets/images/ethereum-logo.png' import arbitrumLogoUrl from 'assets/svg/arbitrum_logo.svg' +import baseLogo from 'assets/svg/base_logo.svg' import bnbLogo from 'assets/svg/bnb-logo.svg' import celoLogo from 'assets/svg/celo_logo.svg' import optimismLogoUrl from 'assets/svg/optimism_logo.svg' @@ -237,6 +238,32 @@ const CHAIN_INFO: ChainInfoMap = { color: '#F0B90B', backgroundColor: '#F0B90B', }, + [SupportedChainId.BASE]: { + networkType: NetworkType.L2, + blockWaitMsBeforeWarning: ms`10m`, + bridge: 'https://bridge.base.org/', + docs: 'https://docs.base.org/', + explorer: 'https://basescan.org/', + infoLink: 'https://info.uniswap.org/#/base/', + label: 'Base', + logoUrl: baseLogo, + nativeCurrency: { name: 'Ether', symbol: 'ETH', decimals: 18 }, + color: '#0152ff', + backgroundColor: '#0152ff', + }, + [SupportedChainId.BASE_GOERLI]: { + networkType: NetworkType.L2, + blockWaitMsBeforeWarning: ms`10m`, + bridge: 'https://goerli-bridge.base.org/', + docs: 'https://docs.base.org/', + explorer: 'https://goerli.basescan.org/', + infoLink: 'https://info.uniswap.org/#/base/', + label: 'Base Goerli', + logoUrl: baseLogo, + nativeCurrency: { name: 'Ether', symbol: 'ETH', decimals: 18 }, + color: '#0152ff', + backgroundColor: '#0152ff', + }, } export function getChainInfo(chainId: SupportedL1ChainId): L1ChainInfo diff --git a/src/constants/chains.ts b/src/constants/chains.ts index cf530f941..1dfb8fa68 100644 --- a/src/constants/chains.ts +++ b/src/constants/chains.ts @@ -21,6 +21,9 @@ export enum SupportedChainId { CELO_ALFAJORES = 44787, BNB = 56, + + BASE = 8453, + BASE_GOERLI = 84531, } export enum ChainName { @@ -38,6 +41,8 @@ export enum ChainName { CELO = 'celo', CELO_ALFAJORES = 'celo-alfajores', BNB = 'bnb', + BASE = 'base', + BASE_GOERLI = 'base-goerli', } export const CHAIN_NAMES_TO_IDS: { [chainName: string]: SupportedChainId } = { @@ -55,6 +60,8 @@ export const CHAIN_NAMES_TO_IDS: { [chainName: string]: SupportedChainId } = { [ChainName.CELO]: SupportedChainId.CELO, [ChainName.CELO_ALFAJORES]: SupportedChainId.CELO_ALFAJORES, [ChainName.BNB]: SupportedChainId.BNB, + [ChainName.BASE]: SupportedChainId.BASE, + [ChainName.BASE_GOERLI]: SupportedChainId.BASE_GOERLI, } /** @@ -71,6 +78,7 @@ export const SUPPORTED_GAS_ESTIMATE_CHAIN_IDS = [ SupportedChainId.ARBITRUM_ONE, SupportedChainId.CELO, SupportedChainId.BNB, + SupportedChainId.BASE, ] /** @@ -86,6 +94,8 @@ export const L1_CHAIN_IDS = [ SupportedChainId.POLYGON_MUMBAI, SupportedChainId.CELO, SupportedChainId.CELO_ALFAJORES, + SupportedChainId.BASE, + SupportedChainId.BASE_GOERLI, ] as const export type SupportedL1ChainId = typeof L1_CHAIN_IDS[number] @@ -99,6 +109,8 @@ export const L2_CHAIN_IDS = [ SupportedChainId.ARBITRUM_RINKEBY, SupportedChainId.OPTIMISM, SupportedChainId.OPTIMISM_GOERLI, + SupportedChainId.BASE, + SupportedChainId.BASE_GOERLI, ] as const export type SupportedL2ChainId = typeof L2_CHAIN_IDS[number] diff --git a/src/constants/jsonRpcEndpoints.ts b/src/constants/jsonRpcEndpoints.ts index 7c7e97561..8069dea12 100644 --- a/src/constants/jsonRpcEndpoints.ts +++ b/src/constants/jsonRpcEndpoints.ts @@ -86,4 +86,12 @@ export const JSON_RPC_FALLBACK_ENDPOINTS: Record = { 'https://bsc-dataseed4.defibit.io', 'https://rpc.ankr.com/bsc', ], + [SupportedChainId.BASE]: [ + // "Safe" URLs + 'https://mainnet.base.org', + ], + [SupportedChainId.BASE_GOERLI]: [ + // "Safe" URLs + 'https://goerli.base.org', + ], } diff --git a/src/constants/routing.ts b/src/constants/routing.ts index 1336fe771..d748a0ddd 100644 --- a/src/constants/routing.ts +++ b/src/constants/routing.ts @@ -9,6 +9,7 @@ import { CUSD_CELO, DAI, DAI_ARBITRUM_ONE, + DAI_BASE, DAI_OPTIMISM, DAI_POLYGON, ETH2X_FLI, @@ -24,6 +25,7 @@ import { SWISE, TRIBE, USDC_BNB_CHAIN, + USDC_BASE, USDC_MAINNET, USDC_POLYGON, USDT, @@ -92,6 +94,11 @@ export const BASES_TO_CHECK_TRADES_AGAINST: ChainTokenList = { USDT_BNB_CHAIN, ...WRAPPED_NATIVE_CURRENCIES_ONLY[SupportedChainId.BNB], ], + [SupportedChainId.BASE]: [ + ...WRAPPED_NATIVE_CURRENCIES_ONLY[SupportedChainId.BASE], + DAI_BASE, + USDC_BASE, + ], } export const ADDITIONAL_BASES: { [chainId: number]: { [tokenAddress: string]: Token[] } } = { [SupportedChainId.MAINNET]: { diff --git a/src/constants/tokens.ts b/src/constants/tokens.ts index df853c490..a123bb283 100644 --- a/src/constants/tokens.ts +++ b/src/constants/tokens.ts @@ -130,6 +130,20 @@ export const USDC_BNB_CHAIN = new Token( 'USDC', 'USDC' ) +export const USDC_BASE = new Token( + SupportedChainId.BASE, + '0x833589fcd6edb6e08f4c7c32d4f71b54bda02913', + 6, + 'USDC', + 'USD Coin' +) +export const USDBC_BASE_GOERLI = new Token( + SupportedChainId.BASE_GOERLI, + '0x853154e2A5604E5C74a2546E2871Ad44932eB92C', + 6, + 'USDbC', + 'USD Base Coin' +) export const USDC: { [chainId in SupportedChainId]: Token } = { [SupportedChainId.MAINNET]: USDC_MAINNET, [SupportedChainId.ARBITRUM_ONE]: USDC_ARBITRUM, @@ -145,6 +159,8 @@ export const USDC: { [chainId in SupportedChainId]: Token } = { [SupportedChainId.KOVAN]: USDC_KOVAN, [SupportedChainId.ROPSTEN]: USDC_ROPSTEN, [SupportedChainId.BNB]: USDC_BNB_CHAIN, + [SupportedChainId.BASE]: USDC_BASE, + [SupportedChainId.BASE_GOERLI]: USDBC_BASE_GOERLI, } export const DAI_POLYGON = new Token( SupportedChainId.POLYGON, @@ -407,6 +423,14 @@ export const DAI_BNB_CHAIN = new Token( 'DAI' ) +export const DAI_BASE = new Token( + SupportedChainId.BASE, + '0x50c5725949a6f0c72e6c4a641f24049a917db0cb', + 18, + 'DAI', + 'Dai Stablecoin' +) + function isBnbChain(chainId: number): chainId is SupportedChainId.BNB { return chainId === SupportedChainId.BNB } @@ -490,6 +514,20 @@ export const WRAPPED_NATIVE_CURRENCY: { [chainId: number]: Token | undefined } = 'WBNB', 'Wrapped BNB' ), + [SupportedChainId.BASE]: new Token( + SupportedChainId.BASE, + '0x4200000000000000000000000000000000000006', + 18, + 'WETH', + 'Wrapped Ether' + ), + [SupportedChainId.BASE_GOERLI]: new Token( + SupportedChainId.BASE_GOERLI, + '0x4200000000000000000000000000000000000006', + 18, + 'WETH', + 'Wrapped Ether' + ), } export function isCelo(chainId: number): chainId is SupportedChainId.CELO | SupportedChainId.CELO_ALFAJORES { @@ -574,5 +612,7 @@ export const TOKEN_SHORTHANDS: { [shorthand: string]: { [chainId in SupportedCha [SupportedChainId.ROPSTEN]: USDC_ROPSTEN.address, [SupportedChainId.CELO]: PORTAL_USDC_CELO.address, [SupportedChainId.CELO_ALFAJORES]: USDC_CELO_ALFAJORES.address, + [SupportedChainId.BASE]: USDC_BASE.address, + [SupportedChainId.BASE_GOERLI]: USDBC_BASE_GOERLI.address, }, } diff --git a/src/hooks/useStablecoinAmountFromFiatValue.ts b/src/hooks/useStablecoinAmountFromFiatValue.ts index a1d890c00..7be9c8475 100644 --- a/src/hooks/useStablecoinAmountFromFiatValue.ts +++ b/src/hooks/useStablecoinAmountFromFiatValue.ts @@ -1,7 +1,7 @@ import { CurrencyAmount, Token } from '@uniswap/sdk-core' import { useWeb3React } from '@web3-react/core' import { SupportedChainId } from 'constants/chains' -import { CUSD_CELO, DAI_OPTIMISM, USDC_ARBITRUM, USDC_MAINNET, USDC_POLYGON } from 'constants/tokens' +import { CUSD_CELO, DAI_OPTIMISM, USDC_ARBITRUM, USDC_MAINNET, USDC_POLYGON, USDC_BASE } from 'constants/tokens' import { useMemo } from 'react' import tryParseCurrencyAmount from 'utils/tryParseCurrencyAmount' @@ -13,6 +13,7 @@ export const STABLECOIN_AMOUNT_OUT: { [chainId: number]: CurrencyAmount } [SupportedChainId.OPTIMISM]: CurrencyAmount.fromRawAmount(DAI_OPTIMISM, 10_000e18), [SupportedChainId.POLYGON]: CurrencyAmount.fromRawAmount(USDC_POLYGON, 10_000e6), [SupportedChainId.CELO]: CurrencyAmount.fromRawAmount(CUSD_CELO, 10_000e18), + [SupportedChainId.BASE]: CurrencyAmount.fromRawAmount(USDC_BASE, 10_000e6), } /** diff --git a/src/hooks/web3/useJsonRpcUrlsMap.tsx b/src/hooks/web3/useJsonRpcUrlsMap.tsx index 3cea0ce7d..c8e36aacb 100644 --- a/src/hooks/web3/useJsonRpcUrlsMap.tsx +++ b/src/hooks/web3/useJsonRpcUrlsMap.tsx @@ -32,6 +32,8 @@ function toJsonRpcMap(getChainConnections: (chainId: SupportedChainId) => T): [SupportedChainId.CELO]: getChainConnections(SupportedChainId.CELO), [SupportedChainId.CELO_ALFAJORES]: getChainConnections(SupportedChainId.CELO_ALFAJORES), [SupportedChainId.BNB]: getChainConnections(SupportedChainId.BNB), + [SupportedChainId.BASE]: getChainConnections(SupportedChainId.BASE), + [SupportedChainId.BASE_GOERLI]: getChainConnections(SupportedChainId.BASE_GOERLI), } } diff --git a/src/utils/getExplorerLink.test.ts b/src/utils/getExplorerLink.test.ts index 97a0da36e..626dc168b 100644 --- a/src/utils/getExplorerLink.test.ts +++ b/src/utils/getExplorerLink.test.ts @@ -39,4 +39,10 @@ describe('#getExplorerLink', () => { it('bnb chain', () => { expect(getExplorerLink(56, 'abc', ExplorerDataType.ADDRESS)).toEqual('https://bscscan.com/address/abc') }) + it('base', () => { + expect(getExplorerLink(8453, 'abc', ExplorerDataType.ADDRESS)).toEqual('https://basescan.org/address/abc') + }) + it('base goerli', () => { + expect(getExplorerLink(84531, 'abc', ExplorerDataType.ADDRESS)).toEqual('https://goerli.basescan.org/address/abc') + }) }) diff --git a/src/utils/getExplorerLink.ts b/src/utils/getExplorerLink.ts index 4ad6ab6c4..148a928ff 100644 --- a/src/utils/getExplorerLink.ts +++ b/src/utils/getExplorerLink.ts @@ -13,6 +13,8 @@ const ETHERSCAN_PREFIXES: { [chainId: number]: string } = { [SupportedChainId.CELO]: 'https://celoscan.io', [SupportedChainId.CELO_ALFAJORES]: 'https://alfajores.celoscan.io', [SupportedChainId.BNB]: 'https://bscscan.com', + [SupportedChainId.BASE]: 'https://basescan.org/', + [SupportedChainId.BASE_GOERLI]: 'https://goerli.basescan.org/', } export enum ExplorerDataType { From cbabcb8266352be0834733813804bd41d3ab9739 Mon Sep 17 00:00:00 2001 From: Anthony Date: Thu, 14 Sep 2023 18:35:40 +0900 Subject: [PATCH 02/10] Remove Base Goerli until routing supports it: https://github.com/Uniswap/interface/pull/7238 --- src/assets/svg/base_logo.svg | 13 ++++++++++--- src/components/Logo/util.ts | 1 - src/constants/chainInfo.ts | 15 +-------------- src/constants/chains.ts | 5 ----- src/constants/jsonRpcEndpoints.ts | 10 ++++++---- src/constants/tokens.ts | 16 ---------------- src/hooks/web3/useJsonRpcUrlsMap.tsx | 1 - src/utils/getExplorerLink.test.ts | 3 --- src/utils/getExplorerLink.ts | 1 - 9 files changed, 17 insertions(+), 48 deletions(-) diff --git a/src/assets/svg/base_logo.svg b/src/assets/svg/base_logo.svg index a784d6a5c..d0303fb15 100644 --- a/src/assets/svg/base_logo.svg +++ b/src/assets/svg/base_logo.svg @@ -1,4 +1,11 @@ - - - + + + + + + + + + + diff --git a/src/components/Logo/util.ts b/src/components/Logo/util.ts index 54917a9bd..20c8f2e71 100644 --- a/src/components/Logo/util.ts +++ b/src/components/Logo/util.ts @@ -55,7 +55,6 @@ export function getNativeLogoURI(chainId: SupportedChainId = SupportedChainId.MA case SupportedChainId.BNB: return BnbLogo case SupportedChainId.BASE: - case SupportedChainId.BASE_GOERLI: return BaseLogo default: return EthereumLogo diff --git a/src/constants/chainInfo.ts b/src/constants/chainInfo.ts index fe3103be7..657c0c331 100644 --- a/src/constants/chainInfo.ts +++ b/src/constants/chainInfo.ts @@ -250,20 +250,7 @@ const CHAIN_INFO: ChainInfoMap = { nativeCurrency: { name: 'Ether', symbol: 'ETH', decimals: 18 }, color: '#0152ff', backgroundColor: '#0152ff', - }, - [SupportedChainId.BASE_GOERLI]: { - networkType: NetworkType.L2, - blockWaitMsBeforeWarning: ms`10m`, - bridge: 'https://goerli-bridge.base.org/', - docs: 'https://docs.base.org/', - explorer: 'https://goerli.basescan.org/', - infoLink: 'https://info.uniswap.org/#/base/', - label: 'Base Goerli', - logoUrl: baseLogo, - nativeCurrency: { name: 'Ether', symbol: 'ETH', decimals: 18 }, - color: '#0152ff', - backgroundColor: '#0152ff', - }, + } } export function getChainInfo(chainId: SupportedL1ChainId): L1ChainInfo diff --git a/src/constants/chains.ts b/src/constants/chains.ts index 1dfb8fa68..87d90235d 100644 --- a/src/constants/chains.ts +++ b/src/constants/chains.ts @@ -23,7 +23,6 @@ export enum SupportedChainId { BNB = 56, BASE = 8453, - BASE_GOERLI = 84531, } export enum ChainName { @@ -42,7 +41,6 @@ export enum ChainName { CELO_ALFAJORES = 'celo-alfajores', BNB = 'bnb', BASE = 'base', - BASE_GOERLI = 'base-goerli', } export const CHAIN_NAMES_TO_IDS: { [chainName: string]: SupportedChainId } = { @@ -61,7 +59,6 @@ export const CHAIN_NAMES_TO_IDS: { [chainName: string]: SupportedChainId } = { [ChainName.CELO_ALFAJORES]: SupportedChainId.CELO_ALFAJORES, [ChainName.BNB]: SupportedChainId.BNB, [ChainName.BASE]: SupportedChainId.BASE, - [ChainName.BASE_GOERLI]: SupportedChainId.BASE_GOERLI, } /** @@ -95,7 +92,6 @@ export const L1_CHAIN_IDS = [ SupportedChainId.CELO, SupportedChainId.CELO_ALFAJORES, SupportedChainId.BASE, - SupportedChainId.BASE_GOERLI, ] as const export type SupportedL1ChainId = typeof L1_CHAIN_IDS[number] @@ -110,7 +106,6 @@ export const L2_CHAIN_IDS = [ SupportedChainId.OPTIMISM, SupportedChainId.OPTIMISM_GOERLI, SupportedChainId.BASE, - SupportedChainId.BASE_GOERLI, ] as const export type SupportedL2ChainId = typeof L2_CHAIN_IDS[number] diff --git a/src/constants/jsonRpcEndpoints.ts b/src/constants/jsonRpcEndpoints.ts index 8069dea12..d95cd2587 100644 --- a/src/constants/jsonRpcEndpoints.ts +++ b/src/constants/jsonRpcEndpoints.ts @@ -89,9 +89,11 @@ export const JSON_RPC_FALLBACK_ENDPOINTS: Record = { [SupportedChainId.BASE]: [ // "Safe" URLs 'https://mainnet.base.org', - ], - [SupportedChainId.BASE_GOERLI]: [ - // "Safe" URLs - 'https://goerli.base.org', + 'https://developer-access-mainnet.base.org/', + 'https://base.gateway.tenderly.co', + 'https://base.publicnode.com', + // "Fallback" URLs + 'https://1rpc.io/base', + 'https://base.meowrpc.com', ], } diff --git a/src/constants/tokens.ts b/src/constants/tokens.ts index a123bb283..846aebfb4 100644 --- a/src/constants/tokens.ts +++ b/src/constants/tokens.ts @@ -137,13 +137,6 @@ export const USDC_BASE = new Token( 'USDC', 'USD Coin' ) -export const USDBC_BASE_GOERLI = new Token( - SupportedChainId.BASE_GOERLI, - '0x853154e2A5604E5C74a2546E2871Ad44932eB92C', - 6, - 'USDbC', - 'USD Base Coin' -) export const USDC: { [chainId in SupportedChainId]: Token } = { [SupportedChainId.MAINNET]: USDC_MAINNET, [SupportedChainId.ARBITRUM_ONE]: USDC_ARBITRUM, @@ -160,7 +153,6 @@ export const USDC: { [chainId in SupportedChainId]: Token } = { [SupportedChainId.ROPSTEN]: USDC_ROPSTEN, [SupportedChainId.BNB]: USDC_BNB_CHAIN, [SupportedChainId.BASE]: USDC_BASE, - [SupportedChainId.BASE_GOERLI]: USDBC_BASE_GOERLI, } export const DAI_POLYGON = new Token( SupportedChainId.POLYGON, @@ -521,13 +513,6 @@ export const WRAPPED_NATIVE_CURRENCY: { [chainId: number]: Token | undefined } = 'WETH', 'Wrapped Ether' ), - [SupportedChainId.BASE_GOERLI]: new Token( - SupportedChainId.BASE_GOERLI, - '0x4200000000000000000000000000000000000006', - 18, - 'WETH', - 'Wrapped Ether' - ), } export function isCelo(chainId: number): chainId is SupportedChainId.CELO | SupportedChainId.CELO_ALFAJORES { @@ -613,6 +598,5 @@ export const TOKEN_SHORTHANDS: { [shorthand: string]: { [chainId in SupportedCha [SupportedChainId.CELO]: PORTAL_USDC_CELO.address, [SupportedChainId.CELO_ALFAJORES]: USDC_CELO_ALFAJORES.address, [SupportedChainId.BASE]: USDC_BASE.address, - [SupportedChainId.BASE_GOERLI]: USDBC_BASE_GOERLI.address, }, } diff --git a/src/hooks/web3/useJsonRpcUrlsMap.tsx b/src/hooks/web3/useJsonRpcUrlsMap.tsx index c8e36aacb..c116f668b 100644 --- a/src/hooks/web3/useJsonRpcUrlsMap.tsx +++ b/src/hooks/web3/useJsonRpcUrlsMap.tsx @@ -33,7 +33,6 @@ function toJsonRpcMap(getChainConnections: (chainId: SupportedChainId) => T): [SupportedChainId.CELO_ALFAJORES]: getChainConnections(SupportedChainId.CELO_ALFAJORES), [SupportedChainId.BNB]: getChainConnections(SupportedChainId.BNB), [SupportedChainId.BASE]: getChainConnections(SupportedChainId.BASE), - [SupportedChainId.BASE_GOERLI]: getChainConnections(SupportedChainId.BASE_GOERLI), } } diff --git a/src/utils/getExplorerLink.test.ts b/src/utils/getExplorerLink.test.ts index 626dc168b..6847a1852 100644 --- a/src/utils/getExplorerLink.test.ts +++ b/src/utils/getExplorerLink.test.ts @@ -42,7 +42,4 @@ describe('#getExplorerLink', () => { it('base', () => { expect(getExplorerLink(8453, 'abc', ExplorerDataType.ADDRESS)).toEqual('https://basescan.org/address/abc') }) - it('base goerli', () => { - expect(getExplorerLink(84531, 'abc', ExplorerDataType.ADDRESS)).toEqual('https://goerli.basescan.org/address/abc') - }) }) diff --git a/src/utils/getExplorerLink.ts b/src/utils/getExplorerLink.ts index 148a928ff..0d48a1f68 100644 --- a/src/utils/getExplorerLink.ts +++ b/src/utils/getExplorerLink.ts @@ -14,7 +14,6 @@ const ETHERSCAN_PREFIXES: { [chainId: number]: string } = { [SupportedChainId.CELO_ALFAJORES]: 'https://alfajores.celoscan.io', [SupportedChainId.BNB]: 'https://bscscan.com', [SupportedChainId.BASE]: 'https://basescan.org/', - [SupportedChainId.BASE_GOERLI]: 'https://goerli.basescan.org/', } export enum ExplorerDataType { From c857610d80dca56315054bb79fa7ff09cbfe35f4 Mon Sep 17 00:00:00 2001 From: Anthony Date: Thu, 14 Sep 2023 19:11:23 +0900 Subject: [PATCH 03/10] Bump uniswap/default-token-lists to 11.6.0 --- package.json | 2 +- yarn.lock | 600 ++++++++++++++------------------------------------- 2 files changed, 166 insertions(+), 436 deletions(-) diff --git a/package.json b/package.json index 397678858..b4f193fee 100644 --- a/package.json +++ b/package.json @@ -166,7 +166,7 @@ "@types/wcag-contrast": "^3.0.0", "@typescript-eslint/eslint-plugin": "^5.21.0", "@typescript-eslint/parser": "^5.21.0", - "@uniswap/default-token-list": "^9.0.0", + "@uniswap/default-token-list": "^11.6.0", "@uniswap/v2-core": "1.0.0", "@uniswap/v3-core": "1.0.0", "@uniswap/v3-periphery": "^1.1.1", diff --git a/yarn.lock b/yarn.lock index 515368036..161a47ecc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1976,6 +1976,8 @@ "@jridgewell/resolve-uri@^3.0.3", "@jridgewell/resolve-uri@^3.1.0": version "3.1.1" + resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721" + integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA== "@jridgewell/set-array@^1.0.0": version "1.1.0" @@ -1984,12 +1986,16 @@ "@jridgewell/source-map@^0.3.3": version "0.3.5" + resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.5.tgz#a3bb4d5c6825aab0d281268f47f6ad5853431e91" + integrity sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ== dependencies: "@jridgewell/gen-mapping" "^0.3.0" "@jridgewell/trace-mapping" "^0.3.9" "@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14": version "1.4.15" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32" + integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg== "@jridgewell/trace-mapping@0.3.9": version "0.3.9" @@ -2001,6 +2007,8 @@ "@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9": version "0.3.19" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.19.tgz#f8a3249862f91be48d3127c3cfe992f79b4b8811" + integrity sha512-kf37QtfW+Hwx/buWGMPcR60iF9ziHa6r/CZJIHbmcm4+0qrXiVdxegAH0F6yddEVQ7zdkjcGCgCzUu+BcbhQxw== dependencies: "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" @@ -3309,6 +3317,8 @@ "@types/estree@*", "@types/estree@^1.0.0": version "1.0.1" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.1.tgz#aa22750962f3bf0e79d753d3cc067f010c95f194" + integrity sha512-LG4opVs2ANWZ1TJoKc937iMmNstM/d0ae1vNbnBvBhqCSezgVUOzcLCqbI5elV8Vy6WKwKjaqR+zO9VKirBBCA== "@types/estree@0.0.39": version "0.0.39" @@ -3731,15 +3741,10 @@ resolved "https://registry.npmjs.org/@uniswap/conedison/-/conedison-1.8.0.tgz" integrity sha512-EeC37bbrd4sJnqW3TxNhExdWUBvzyJDhbTXcbDzFdBh/bg5sOCu1NbYJEnrjwBHEfewc9nF2OjEzejJFyJUx9A== -"@uniswap/default-token-list@^11.2.0": - version "11.4.0" - resolved "https://registry.npmjs.org/@uniswap/default-token-list/-/default-token-list-11.4.0.tgz" - integrity sha512-ADAksIMv/emjJpeD9Rx/1vPBfpI5+Qkf/jWMOnNpRgW1MIGbRPKsVWyZTFeebx6p0MxXnxN70PbysgswWNmemA== - -"@uniswap/default-token-list@^9.0.0": - version "9.0.0" - resolved "https://registry.npmjs.org/@uniswap/default-token-list/-/default-token-list-9.0.0.tgz" - integrity sha512-a62uqv5ApULDVEXCOursXIaEoxP4MtlzdNSiQikYl1x9RfsUAZXl9dBtCo2d1Ne+iS1THic1oCJMshNtT9Z0EQ== +"@uniswap/default-token-list@^11.2.0", "@uniswap/default-token-list@^11.6.0": + version "11.6.0" + resolved "https://registry.npmjs.org/@uniswap/default-token-list/-/default-token-list-11.6.0.tgz" + integrity sha512-4OS+sStju/pOp6w96RL275XDB3VrIiOBqPvqFHVAKP3mMtueYMRjpHEj+BhCi3l0bUmhllz6SyGt1OxD4IMeDQ== "@uniswap/lib@^4.0.1-alpha": version "4.0.1-alpha" @@ -4360,21 +4365,31 @@ "@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5": version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.6.tgz#db046555d3c413f8966ca50a95176a0e2c642e24" + integrity sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q== dependencies: "@webassemblyjs/helper-numbers" "1.11.6" "@webassemblyjs/helper-wasm-bytecode" "1.11.6" "@webassemblyjs/floating-point-hex-parser@1.11.6": version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz#dacbcb95aff135c8260f77fa3b4c5fea600a6431" + integrity sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw== "@webassemblyjs/helper-api-error@1.11.6": version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz#6132f68c4acd59dcd141c44b18cbebbd9f2fa768" + integrity sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q== "@webassemblyjs/helper-buffer@1.11.6": version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz#b66d73c43e296fd5e88006f18524feb0f2c7c093" + integrity sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA== "@webassemblyjs/helper-numbers@1.11.6": version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz#cbce5e7e0c1bd32cf4905ae444ef64cea919f1b5" + integrity sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g== dependencies: "@webassemblyjs/floating-point-hex-parser" "1.11.6" "@webassemblyjs/helper-api-error" "1.11.6" @@ -4382,9 +4397,13 @@ "@webassemblyjs/helper-wasm-bytecode@1.11.6": version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz#bb2ebdb3b83aa26d9baad4c46d4315283acd51e9" + integrity sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA== "@webassemblyjs/helper-wasm-section@1.11.6": version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz#ff97f3863c55ee7f580fd5c41a381e9def4aa577" + integrity sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g== dependencies: "@webassemblyjs/ast" "1.11.6" "@webassemblyjs/helper-buffer" "1.11.6" @@ -4393,19 +4412,27 @@ "@webassemblyjs/ieee754@1.11.6": version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz#bb665c91d0b14fffceb0e38298c329af043c6e3a" + integrity sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg== dependencies: "@xtuc/ieee754" "^1.2.0" "@webassemblyjs/leb128@1.11.6": version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.6.tgz#70e60e5e82f9ac81118bc25381a0b283893240d7" + integrity sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ== dependencies: "@xtuc/long" "4.2.2" "@webassemblyjs/utf8@1.11.6": version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a" + integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA== "@webassemblyjs/wasm-edit@^1.11.5": version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz#c72fa8220524c9b416249f3d94c2958dfe70ceab" + integrity sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw== dependencies: "@webassemblyjs/ast" "1.11.6" "@webassemblyjs/helper-buffer" "1.11.6" @@ -4418,6 +4445,8 @@ "@webassemblyjs/wasm-gen@1.11.6": version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz#fb5283e0e8b4551cc4e9c3c0d7184a65faf7c268" + integrity sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA== dependencies: "@webassemblyjs/ast" "1.11.6" "@webassemblyjs/helper-wasm-bytecode" "1.11.6" @@ -4427,6 +4456,8 @@ "@webassemblyjs/wasm-opt@1.11.6": version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz#d9a22d651248422ca498b09aa3232a81041487c2" + integrity sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g== dependencies: "@webassemblyjs/ast" "1.11.6" "@webassemblyjs/helper-buffer" "1.11.6" @@ -4435,6 +4466,8 @@ "@webassemblyjs/wasm-parser@1.11.6", "@webassemblyjs/wasm-parser@^1.11.5": version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz#bb85378c527df824004812bbdb784eea539174a1" + integrity sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ== dependencies: "@webassemblyjs/ast" "1.11.6" "@webassemblyjs/helper-api-error" "1.11.6" @@ -4445,6 +4478,8 @@ "@webassemblyjs/wast-printer@1.11.6": version "1.11.6" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz#a7bf8dd7e362aeb1668ff43f35cb849f188eff20" + integrity sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A== dependencies: "@webassemblyjs/ast" "1.11.6" "@xtuc/long" "4.2.2" @@ -4529,6 +4564,8 @@ acorn-globals@^6.0.0: acorn-import-assertions@^1.9.0: version "1.9.0" + resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac" + integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA== acorn-jsx@^5.3.1: version "5.3.2" @@ -4550,11 +4587,10 @@ acorn@^7.1.1, acorn@^7.4.0: resolved "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz" integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== -acorn@^8.2.4, acorn@^8.4.1, acorn@^8.5.0, acorn@^8.7.1: - version "8.10.0" - -acorn@^8.8.2: +acorn@^8.2.4, acorn@^8.4.1, acorn@^8.7.1, acorn@^8.8.2: version "8.10.0" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.10.0.tgz#8be5b3907a67221a81ab23c7889c4c5526b62ec5" + integrity sha512-F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw== adm-zip@^0.4.16: version "0.4.16" @@ -4607,27 +4643,7 @@ ajv-keywords@^3.5.2: resolved "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz" integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== -ajv@^6.10.0: - version "6.12.6" - resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz" - integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== - dependencies: - fast-deep-equal "^3.1.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - -ajv@^6.12.4: - version "6.12.6" - resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz" - integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== - dependencies: - fast-deep-equal "^3.1.1" - fast-json-stable-stringify "^2.0.0" - json-schema-traverse "^0.4.1" - uri-js "^4.2.2" - -ajv@^6.12.5: +ajv@^6.10.0, ajv@^6.12.4, ajv@^6.12.5: version "6.12.6" resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz" integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== @@ -5017,6 +5033,8 @@ babel-plugin-macros@^3.0.1, babel-plugin-macros@^3.1.0: babel-plugin-module-resolver@^5.0.0: version "5.0.0" + resolved "https://registry.yarnpkg.com/babel-plugin-module-resolver/-/babel-plugin-module-resolver-5.0.0.tgz#2b7fc176bd55da25f516abf96015617b4f70fc73" + integrity sha512-g0u+/ChLSJ5+PzYwLwP8Rp8Rcfowz58TJNCe+L/ui4rpzE/mg//JVX0EWBUYoxaextqnwuGHzfGp2hh0PPV25Q== dependencies: find-babel-config "^2.0.0" glob "^8.0.3" @@ -5209,12 +5227,7 @@ bin-links@^3.0.0: rimraf "^3.0.0" write-file-atomic "^4.0.0" -binary-extensions@^2.0.0: - version "2.2.0" - resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz" - integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== - -binary-extensions@^2.2.0: +binary-extensions@^2.0.0, binary-extensions@^2.2.0: version "2.2.0" resolved "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz" integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== @@ -5248,17 +5261,7 @@ bn.js@^4.0.0, bn.js@^4.11.0, bn.js@^4.11.8, bn.js@^4.11.9: resolved "https://registry.npmjs.org/bn.js/-/bn.js-4.12.0.tgz" integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== -bn.js@^5.1.2: - version "5.2.1" - resolved "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz" - integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ== - -bn.js@^5.2.0: - version "5.2.1" - resolved "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz" - integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ== - -bn.js@^5.2.1: +bn.js@^5.1.2, bn.js@^5.2.0, bn.js@^5.2.1: version "5.2.1" resolved "https://registry.npmjs.org/bn.js/-/bn.js-5.2.1.tgz" integrity sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ== @@ -5423,7 +5426,9 @@ builtin-modules@^3.1.0: integrity sha512-lGzLKcioL90C7wMczpkY0n/oART3MbBa8R9OFGE1rJxoVI86u4WAGfEk8Wjv10eKSyTHVGkSo3bvBylCEtk7LA== builtins@^5.0.0: - version "5.0.0" + version "5.0.1" + resolved "https://registry.yarnpkg.com/builtins/-/builtins-5.0.1.tgz#87f6db9ab0458be728564fa81d876d8d74552fa9" + integrity sha512-qwVpFEHNfhYJIzNRBvd2C1kyo6jz3ZSMPyyuR47OPdiKWlbYnZNyDWuyR175qDnAJLiCo5fBBqPb3RiXgWlkOQ== dependencies: semver "^7.0.0" @@ -5513,12 +5518,7 @@ camelcase-keys@^6.2.2: map-obj "^4.0.0" quick-lru "^4.0.1" -camelcase@^5.0.0: - version "5.3.1" - resolved "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz" - integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== - -camelcase@^5.3.1: +camelcase@^5.0.0, camelcase@^5.3.1: version "5.3.1" resolved "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz" integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg== @@ -5546,34 +5546,7 @@ cardinal@^2.1.1: ansicolors "~0.3.2" redeyed "~2.1.0" -chalk@^2.0.0: - version "2.4.2" - resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chalk@^2.3.0: - version "2.4.2" - resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chalk@^2.3.2: - version "2.4.2" - resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz" - integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chalk@^2.4.2: +chalk@^2.0.0, chalk@^2.3.0, chalk@^2.3.2, chalk@^2.4.2: version "2.4.2" resolved "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -5735,16 +5708,7 @@ cli-spinners@^2.5.0: resolved "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.0.tgz" integrity sha512-t+4/y50K/+4xcCRosKkA7W4gTr1MySvLV0q+PxmG7FJ5g+66ChKurYjxBCjHggHH3HA5Hh9cy+lcUGWDqVH+4Q== -cli-table3@^0.6.1: - version "0.6.2" - resolved "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.2.tgz" - integrity sha512-QyavHCaIC80cMivimWu4aWHilIpiDpfm3hGmqAmXVL1UsnbLuBSMd21hTX6VY4ZSDSM73ESLeF8TOYId3rBTbw== - dependencies: - string-width "^4.2.0" - optionalDependencies: - "@colors/colors" "1.5.0" - -cli-table3@^0.6.2: +cli-table3@^0.6.1, cli-table3@^0.6.2: version "0.6.2" resolved "https://registry.npmjs.org/cli-table3/-/cli-table3-0.6.2.tgz" integrity sha512-QyavHCaIC80cMivimWu4aWHilIpiDpfm3hGmqAmXVL1UsnbLuBSMd21hTX6VY4ZSDSM73ESLeF8TOYId3rBTbw== @@ -6291,27 +6255,20 @@ dateformat@^3.0.0: resolved "https://registry.npmjs.org/dateformat/-/dateformat-3.0.3.tgz" integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q== -debug@2.6.9: +debug@2.6.9, debug@^2.6.9: version "2.6.9" resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz" integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== dependencies: ms "2.0.0" -debug@4, debug@4.3.4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.3: +debug@4, debug@4.3.4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.3: version "4.3.4" resolved "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz" integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ== dependencies: ms "2.1.2" -debug@^2.6.9: - version "2.6.9" - resolved "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz" - integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA== - dependencies: - ms "2.0.0" - debug@^3.2.7: version "3.2.7" resolved "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz" @@ -6447,12 +6404,7 @@ depd@2.0.0: resolved "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz" integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw== -depd@^1.1.2: - version "1.1.2" - resolved "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz" - integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= - -depd@~1.1.2: +depd@^1.1.2, depd@~1.1.2: version "1.1.2" resolved "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz" integrity sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak= @@ -6500,7 +6452,7 @@ diff-sequences@^29.4.3: resolved "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.4.3.tgz" integrity sha512-ofrBgwpPhCD85kMKtE9RYFFq6OC1A89oW2vvgWZNCwxrUpRUILopY7lsYyMDSjc8g6U6aiO0Qubg6r4Wgt5ZnA== -diff@5.0.0: +diff@5.0.0, diff@^5.0.0: version "5.0.0" resolved "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz" integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w== @@ -6510,11 +6462,6 @@ diff@^4.0.1: resolved "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz" integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== -diff@^5.0.0: - version "5.0.0" - resolved "https://registry.npmjs.org/diff/-/diff-5.0.0.tgz" - integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w== - dijkstrajs@^1.0.1: version "1.0.3" resolved "https://registry.npmjs.org/dijkstrajs/-/dijkstrajs-1.0.3.tgz" @@ -6763,6 +6710,8 @@ engine.io@~3.3.1: enhanced-resolve@^5.15.0: version "5.15.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz#1af946c7d93603eb88e9896cee4904dc012e9c35" + integrity sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg== dependencies: graceful-fs "^4.2.4" tapable "^2.2.0" @@ -6844,7 +6793,9 @@ es-abstract@^1.18.0-next.2, es-abstract@^1.19.1, es-abstract@^1.19.2: unbox-primitive "^1.0.1" es-module-lexer@^1.2.1: - version "1.3.0" + version "1.3.1" + resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.3.1.tgz#c1b0dd5ada807a3b3155315911f364dc4e909db1" + integrity sha512-JUFAyicQV9mXc3YRxPnDlrfBKpqt6hUYzz9/boprUJHs4e4KVr3XwOF70doO6gwXUor6EWZJAyWAfKki84t20Q== es-shim-unscopables@^1.0.0: version "1.0.0" @@ -6877,7 +6828,7 @@ escape-html@~1.0.3: resolved "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz" integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg= -escape-string-regexp@4.0.0: +escape-string-regexp@4.0.0, escape-string-regexp@^4.0.0: version "4.0.0" resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz" integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== @@ -6892,11 +6843,6 @@ escape-string-regexp@^2.0.0: resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz" integrity sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== -escape-string-regexp@^4.0.0: - version "4.0.0" - resolved "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz" - integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== - escodegen@^2.0.0: version "2.0.0" resolved "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz" @@ -7090,12 +7036,7 @@ eslint-utils@^3.0.0: dependencies: eslint-visitor-keys "^2.0.0" -eslint-visitor-keys@^1.1.0: - version "1.3.0" - resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz" - integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== - -eslint-visitor-keys@^1.3.0: +eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: version "1.3.0" resolved "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz" integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== @@ -7263,20 +7204,7 @@ ethereumjs-abi@^0.6.8: bn.js "^4.11.8" ethereumjs-util "^6.0.0" -ethereumjs-util@^6.0.0: - version "6.2.1" - resolved "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.2.1.tgz" - integrity sha512-W2Ktez4L01Vexijrm5EB6w7dg4n/TgpoYU4avuT5T3Vmnw/eCRtiBrJfQYS/DCSvDIOLn2k57GcHdeBcgVxAqw== - dependencies: - "@types/bn.js" "^4.11.3" - bn.js "^4.11.0" - create-hash "^1.1.2" - elliptic "^6.5.2" - ethereum-cryptography "^0.1.3" - ethjs-util "0.1.6" - rlp "^2.2.3" - -ethereumjs-util@^6.2.1: +ethereumjs-util@^6.0.0, ethereumjs-util@^6.2.1: version "6.2.1" resolved "https://registry.npmjs.org/ethereumjs-util/-/ethereumjs-util-6.2.1.tgz" integrity sha512-W2Ktez4L01Vexijrm5EB6w7dg4n/TgpoYU4avuT5T3Vmnw/eCRtiBrJfQYS/DCSvDIOLn2k57GcHdeBcgVxAqw== @@ -7560,6 +7488,8 @@ finalhandler@~1.1.2: find-babel-config@^2.0.0: version "2.0.0" + resolved "https://registry.yarnpkg.com/find-babel-config/-/find-babel-config-2.0.0.tgz#a8216f825415a839d0f23f4d18338a1cc966f701" + integrity sha512-dOKT7jvF3hGzlW60Gc3ONox/0rRZ/tz7WCil0bqA1In/3I8f1BctpXahRnEKDySZqci7u+dqq93sZST9fOJpFw== dependencies: json5 "^2.1.1" path-exists "^4.0.0" @@ -7594,14 +7524,7 @@ find-up@5.0.0: locate-path "^6.0.0" path-exists "^4.0.0" -find-up@^2.0.0: - version "2.1.0" - resolved "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz" - integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c= - dependencies: - locate-path "^2.0.0" - -find-up@^2.1.0: +find-up@^2.0.0, find-up@^2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz" integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c= @@ -7739,16 +7662,7 @@ fs-extra@^10.0.0: jsonfile "^6.0.1" universalify "^2.0.0" -fs-extra@^7.0.0: - version "7.0.1" - resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz" - integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw== - dependencies: - graceful-fs "^4.1.2" - jsonfile "^4.0.0" - universalify "^0.1.0" - -fs-extra@^7.0.1: +fs-extra@^7.0.0, fs-extra@^7.0.1: version "7.0.1" resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz" integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw== @@ -7757,17 +7671,7 @@ fs-extra@^7.0.1: jsonfile "^4.0.0" universalify "^0.1.0" -fs-extra@^9.0.0: - version "9.1.0" - resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz" - integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== - dependencies: - at-least-node "^1.0.0" - graceful-fs "^4.2.0" - jsonfile "^6.0.1" - universalify "^2.0.0" - -fs-extra@^9.0.1: +fs-extra@^9.0.0, fs-extra@^9.0.1: version "9.1.0" resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz" integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ== @@ -7944,6 +7848,8 @@ glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7: glob@^8.0.1, glob@^8.0.3: version "8.1.0" + resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" + integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== dependencies: fs.realpath "^1.0.0" inflight "^1.0.4" @@ -7964,14 +7870,7 @@ globals@^11.1.0: resolved "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz" integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA== -globals@^13.6.0: - version "13.11.0" - resolved "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz" - integrity sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g== - dependencies: - type-fest "^0.20.2" - -globals@^13.9.0: +globals@^13.6.0, globals@^13.9.0: version "13.11.0" resolved "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz" integrity sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g== @@ -8191,14 +8090,7 @@ hosted-git-info@^2.1.4: resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz" integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw== -hosted-git-info@^4.0.0: - version "4.1.0" - resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz" - integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA== - dependencies: - lru-cache "^6.0.0" - -hosted-git-info@^4.0.1: +hosted-git-info@^4.0.0, hosted-git-info@^4.0.1: version "4.1.0" resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-4.1.0.tgz" integrity sha512-kyCuEOWjJqZuDbRHzL8V93NzQhwIB71oFWSyzVo+KPZI+pnQPPxucdkrOZvkLRnrf5URsQM+IJ09Dw29cRALIA== @@ -8390,12 +8282,7 @@ ignore@^4.0.6: resolved "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz" integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== -ignore@^5.1.8: - version "5.2.0" - resolved "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz" - integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== - -ignore@^5.2.0: +ignore@^5.1.8, ignore@^5.2.0: version "5.2.0" resolved "https://registry.npmjs.org/ignore/-/ignore-5.2.0.tgz" integrity sha512-CmxgYGiEPCLhfLnpPp1MoRmifwEIOgjcHXxOBjv7mY96c+eWScsOP9c112ZyLdWHi0FxHjI+4uVhKYp/gcdRmQ== @@ -8567,10 +8454,10 @@ ip-regex@^4.1.0: resolved "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz" integrity sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q== -ip@^1.1.5: - version "1.1.5" - resolved "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz" - integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo= +ip@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ip/-/ip-2.0.0.tgz#4cf4ab182fee2314c75ede1276f8c80b479936da" + integrity sha512-WKa+XuLG1A1R0UWhl2+1XQSi+fZWMsYKffMZTTYsiZaUD8k2yDAj5atimTUD2TZkyCkNEeYE5NhFZmupOGtjYQ== ipaddr.js@1.9.1: version "1.9.1" @@ -8636,6 +8523,8 @@ is-cidr@^4.0.2: is-core-module@^2.13.0, is-core-module@^2.2.0, is-core-module@^2.5.0, is-core-module@^2.8.1: version "2.13.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.0.tgz#bb52aa6e2cbd49a30c2ba68c42bf3435ba6072db" + integrity sha512-Z7dk6Qo8pOCp3l4tsX2C5ZVas4V+UxwQodwZhLopL91TX8UyyHEXafPcyoeeWuLrwzHcr3igO78wNLwHJHsMCQ== dependencies: has "^1.0.3" @@ -9529,6 +9418,8 @@ json5@^1.0.1: json5@^2.1.1, json5@^2.1.2, json5@^2.2.1: version "2.2.3" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.3.tgz#78cd6f1a19bdc12b73db5ad0c61efd66c1e29283" + integrity sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg== jsonfile@^2.1.0: version "2.4.0" @@ -9553,12 +9444,7 @@ jsonfile@^6.0.1: optionalDependencies: graceful-fs "^4.1.6" -jsonparse@^1.2.0: - version "1.3.1" - resolved "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz" - integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA= - -jsonparse@^1.3.1: +jsonparse@^1.2.0, jsonparse@^1.3.1: version "1.3.1" resolved "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz" integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA= @@ -9577,7 +9463,9 @@ just-diff-apply@^5.2.0: integrity sha512-unjtin7rnng0KUpE4RPWwTl8iwWiZuyZqOQ+vm8orV6aIXX8mHN8zlKCPPbOycfDNuLh2PBazbFhNoDJv4S/FA== just-diff@^5.0.1: - version "5.0.1" + version "5.2.0" + resolved "https://registry.yarnpkg.com/just-diff/-/just-diff-5.2.0.tgz#60dca55891cf24cd4a094e33504660692348a241" + integrity sha512-6ufhP9SHjb7jibNFrNxyFZ6od3g+An6Ai9mhGRvcYe8UJlH0prseN64M+6ZBBUoKYHZsitDP42gAJ8+eVWr3lw== keccak@^3.0.0: version "3.0.2" @@ -9980,11 +9868,6 @@ lodash.merge@^4.6.2: resolved "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== -lodash.sortby@^4.7.0: - version "4.7.0" - resolved "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz" - integrity sha1-7dFMgk4sycHgsKG0K7UhBRakJDg= - lodash.truncate@^4.4.2: version "4.4.2" resolved "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz" @@ -10037,7 +9920,9 @@ lru-cache@^6.0.0: yallist "^4.0.0" lru-cache@^7.4.4, lru-cache@^7.5.1, lru-cache@^7.7.1: - version "7.8.1" + version "7.18.3" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-7.18.3.tgz#f793896e0fd0e954a59dfdd82f0773808df6aa89" + integrity sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA== lru_map@^0.3.3: version "0.3.3" @@ -10367,14 +10252,7 @@ minimalistic-crypto-utils@^1.0.1: dependencies: brace-expansion "^1.1.7" -minimatch@5.0.1: - version "5.0.1" - resolved "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz" - integrity sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g== - dependencies: - brace-expansion "^2.0.1" - -minimatch@^5.0.1: +minimatch@5.0.1, minimatch@^5.0.1: version "5.0.1" resolved "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz" integrity sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g== @@ -10466,7 +10344,7 @@ mkdirp-infer-owner@^2.0.0: infer-owner "^1.0.4" mkdirp "^1.0.3" -mkdirp@^0.5.1: +mkdirp@^0.5.1, mkdirp@~0.5.1: version "0.5.5" resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== @@ -10478,13 +10356,6 @@ mkdirp@^1.0.3, mkdirp@^1.0.4: resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -mkdirp@~0.5.1: - version "0.5.5" - resolved "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz" - integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== - dependencies: - minimist "^1.2.5" - mnemonist@^0.38.0, mnemonist@^0.38.3: version "0.38.5" resolved "https://registry.npmjs.org/mnemonist/-/mnemonist-0.38.5.tgz" @@ -10599,12 +10470,7 @@ multihashes@^4.0.1, multihashes@^4.0.2: uint8arrays "^2.1.3" varint "^5.0.2" -mute-stream@0.0.8: - version "0.0.8" - resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz" - integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== - -mute-stream@~0.0.4: +mute-stream@0.0.8, mute-stream@~0.0.4: version "0.0.8" resolved "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== @@ -10797,13 +10663,20 @@ npm-audit-report@^3.0.0: dependencies: chalk "^4.0.0" -npm-bundled@^1.1.1, npm-bundled@^1.1.2: +npm-bundled@^1.1.1: version "1.1.2" resolved "https://registry.npmjs.org/npm-bundled/-/npm-bundled-1.1.2.tgz" integrity sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ== dependencies: npm-normalize-package-bin "^1.0.1" +npm-bundled@^2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-2.0.1.tgz#94113f7eb342cd7a67de1e789f896b04d2c600f4" + integrity sha512-gZLxXdjEzE/+mOstGDqR6b0EkhJ+kM6fxM6vUuckuctuVPh80Q6pw/rSZj9s4Gex9GxWtIicO1pc8DB9KZWudw== + dependencies: + npm-normalize-package-bin "^2.0.0" + npm-install-checks@^5.0.0: version "5.0.0" resolved "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-5.0.0.tgz" @@ -10816,6 +10689,11 @@ npm-normalize-package-bin@^1.0.0, npm-normalize-package-bin@^1.0.1: resolved "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz" integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA== +npm-normalize-package-bin@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-2.0.0.tgz#9447a1adaaf89d8ad0abe24c6c84ad614a675fff" + integrity sha512-awzfKUO7v0FscrSpRoogyNm0sajikhBWpU0QMrW09AMi9n1PoKU6WaIqUzuJSQnpciZZmJ/jMZ2Egfmb/9LiWQ== + npm-package-arg@^9.0.0, npm-package-arg@^9.0.1, npm-package-arg@^9.0.2: version "9.0.2" resolved "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-9.0.2.tgz" @@ -10826,12 +10704,14 @@ npm-package-arg@^9.0.0, npm-package-arg@^9.0.1, npm-package-arg@^9.0.2: validate-npm-package-name "^4.0.0" npm-packlist@^5.0.0: - version "5.0.2" + version "5.1.3" + resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-5.1.3.tgz#69d253e6fd664b9058b85005905012e00e69274b" + integrity sha512-263/0NGrn32YFYi4J533qzrQ/krmmrWwhKkzwTuM4f/07ug51odoaNjUexxO4vxlzURHcmYMH1QjvHjsNDKLVg== dependencies: glob "^8.0.1" ignore-walk "^5.0.1" - npm-bundled "^1.1.2" - npm-normalize-package-bin "^1.0.1" + npm-bundled "^2.0.0" + npm-normalize-package-bin "^2.0.0" npm-pick-manifest@^7.0.0, npm-pick-manifest@^7.0.1: version "7.0.1" @@ -11563,6 +11443,8 @@ pofile@^1.1.0: polished@^3.7.2: version "3.7.2" + resolved "https://registry.yarnpkg.com/polished/-/polished-3.7.2.tgz#ec5ddc17a7d322a574d5e10ddd2a6f01d3e767d1" + integrity sha512-pQKtpZGmsZrW8UUpQMAnR7s3ppHeMQVNyMDKtUyKwuvDmklzcEyM5Kllb3JyE/sE/x7arDmyd35i+4vp99H6sQ== dependencies: "@babel/runtime" "^7.12.5" @@ -11984,7 +11866,7 @@ react-feather@^2.0.8: dependencies: prop-types "^15.7.2" -react-is@^16.12.0: +react-is@^16.12.0, react-is@^16.13.1, react-is@^16.7.0: version "16.13.1" resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== @@ -11994,22 +11876,7 @@ react-is@^16.12.0: resolved "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz" integrity sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w== -react-is@^16.13.1: - version "16.13.1" - resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz" - integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== - -react-is@^16.7.0: - version "16.13.1" - resolved "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz" - integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== - -react-is@^17.0.1: - version "17.0.2" - resolved "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz" - integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== - -react-is@^17.0.2: +react-is@^17.0.1, react-is@^17.0.2: version "17.0.2" resolved "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz" integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== @@ -12129,33 +11996,7 @@ readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.1.0, readable-stre string_decoder "^1.1.1" util-deprecate "^1.0.1" -readable-stream@^2.0.0: - version "2.3.7" - resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz" - integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - -readable-stream@^2.0.2: - version "2.3.7" - resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz" - integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== - dependencies: - core-util-is "~1.0.0" - inherits "~2.0.3" - isarray "~1.0.0" - process-nextick-args "~2.0.0" - safe-buffer "~5.1.1" - string_decoder "~1.1.1" - util-deprecate "~1.0.1" - -readable-stream@~2.3.6: +readable-stream@^2.0.0, readable-stream@^2.0.2, readable-stream@~2.3.6: version "2.3.7" resolved "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz" integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw== @@ -12366,6 +12207,8 @@ requires-port@^1.0.0: reselect@^4.1.5, reselect@^4.1.7: version "4.1.8" + resolved "https://registry.yarnpkg.com/reselect/-/reselect-4.1.8.tgz#3f5dc671ea168dccdeb3e141236f69f02eaec524" + integrity sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ== resize-observer-polyfill@^1.5.1: version "1.5.1" @@ -12403,6 +12246,8 @@ resolve@1.17.0: resolve@^1.10.0, resolve@^1.12.0, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.22.0, resolve@^1.22.1: version "1.22.4" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.4.tgz#1dc40df46554cdaf8948a486a10f6ba1e2026c34" + integrity sha512-PXNdCiPqDqeUou+w1C2eTQbNfxKSuMxqTCuvlmmMsk1NWHL5fRrhY6Pl0qEYYc6+QqGClco1Qj8XnjPego4wfg== dependencies: is-core-module "^2.13.0" path-parse "^1.0.7" @@ -12552,7 +12397,7 @@ rxjs@^7.8.1: dependencies: tslib "^2.1.0" -safe-buffer@5.1.2: +safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: version "5.1.2" resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== @@ -12562,11 +12407,6 @@ safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz" integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ== -safe-buffer@~5.1.0, safe-buffer@~5.1.1: - version "5.1.2" - resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz" - integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== - safe-json-stringify@~1: version "1.2.0" resolved "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz" @@ -12633,6 +12473,8 @@ schema-utils@^2.6.5: schema-utils@^3.0.0, schema-utils@^3.1.1, schema-utils@^3.2.0: version "3.3.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe" + integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg== dependencies: "@types/json-schema" "^7.0.8" ajv "^6.12.5" @@ -12654,6 +12496,8 @@ secp256k1@^4.0.1: semantic-release@^19.0.3: version "19.0.5" + resolved "https://registry.yarnpkg.com/semantic-release/-/semantic-release-19.0.5.tgz#d7fab4b33fc20f1288eafd6c441e5d0938e5e174" + integrity sha512-NMPKdfpXTnPn49FDogMBi36SiBfXkSOJqCkk0E4iWOY1tusvvgBwqUmxTX1kmlT6kIYed9YwNKD1sfPpqa5yaA== dependencies: "@semantic-release/commit-analyzer" "^9.0.2" "@semantic-release/error" "^3.0.0" @@ -12701,7 +12545,7 @@ semver-regex@^3.1.2: resolved "https://registry.npmjs.org/semver-regex/-/semver-regex-3.1.3.tgz" integrity sha512-Aqi54Mk9uYTjVexLnR67rTyBusmwd04cLkHy9hNvk3+G3nT2Oyg7E0l4XVbOaNwIvQ3hHeYxGcyEy+mKreyBFQ== -"semver@2 || 3 || 4 || 5": +"semver@2 || 3 || 4 || 5", semver@^5.5.0: version "5.7.1" resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -12711,27 +12555,7 @@ semver@7.0.0: resolved "https://registry.npmjs.org/semver/-/semver-7.0.0.tgz" integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A== -semver@^5.5.0: - version "5.7.1" - resolved "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz" - integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== - -semver@^6.0.0: - version "6.3.0" - resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - -semver@^6.1.1: - version "6.3.0" - resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - -semver@^6.1.2: - version "6.3.0" - resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz" - integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== - -semver@^6.3.0: +semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0: version "6.3.0" resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== @@ -12771,6 +12595,8 @@ serialize-javascript@6.0.0: serialize-javascript@^6.0.1: version "6.0.1" + resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c" + integrity sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w== dependencies: randombytes "^2.1.0" @@ -12843,12 +12669,7 @@ side-channel@^1.0.4: get-intrinsic "^1.0.2" object-inspect "^1.9.0" -signal-exit@^3.0.2, signal-exit@^3.0.3: - version "3.0.7" - resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz" - integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== - -signal-exit@^3.0.7: +signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7: version "3.0.7" resolved "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz" integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== @@ -12933,16 +12754,20 @@ socket.io@2.2.0: socket.io-parser "~3.3.0" socks-proxy-agent@^6.1.1: - version "6.1.1" + version "6.2.1" + resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz#2687a31f9d7185e38d530bef1944fe1f1496d6ce" + integrity sha512-a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ== dependencies: agent-base "^6.0.2" - debug "^4.3.1" - socks "^2.6.1" + debug "^4.3.3" + socks "^2.6.2" -socks@^2.6.1: - version "2.6.2" +socks@^2.6.2: + version "2.7.1" + resolved "https://registry.yarnpkg.com/socks/-/socks-2.7.1.tgz#d8e651247178fde79c0663043e07240196857d55" + integrity sha512-7maUZy1N7uo6+WVEX6psASxtNlKaNVMlGQKkG/63nEDdLOWNbiUMoLK7X4uYoLhQstau72mLgfEWcXcwsaHbYQ== dependencies: - ip "^1.1.5" + ip "^2.0.0" smart-buffer "^4.2.0" solc@0.7.3: @@ -13003,13 +12828,6 @@ source-map@^0.7.3: resolved "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz" integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== -source-map@~0.8.0-beta.0: - version "0.8.0-beta.0" - resolved "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz" - integrity sha512-2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA== - dependencies: - whatwg-url "^7.0.0" - sourcemap-codec@^1.4.4, sourcemap-codec@^1.4.8: version "1.4.8" resolved "https://registry.npmjs.org/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz" @@ -13312,21 +13130,14 @@ styled-system@^5.0.0, styled-system@^5.1.5: "@styled-system/variant" "^5.1.5" object-assign "^4.1.1" -supports-color@8.1.1: +supports-color@8.1.1, supports-color@^8.0.0, supports-color@^8.1.1: version "8.1.1" resolved "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz" integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== dependencies: has-flag "^4.0.0" -supports-color@^5.3.0: - version "5.5.0" - resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz" - integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== - dependencies: - has-flag "^3.0.0" - -supports-color@^5.5.0: +supports-color@^5.3.0, supports-color@^5.5.0: version "5.5.0" resolved "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz" integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow== @@ -13347,20 +13158,6 @@ supports-color@^7.0.0, supports-color@^7.1.0: dependencies: has-flag "^4.0.0" -supports-color@^8.0.0: - version "8.1.1" - resolved "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz" - integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== - dependencies: - has-flag "^4.0.0" - -supports-color@^8.1.1: - version "8.1.1" - resolved "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz" - integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q== - dependencies: - has-flag "^4.0.0" - supports-hyperlinks@^2.0.0, supports-hyperlinks@^2.2.0: version "2.2.0" resolved "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.2.0.tgz" @@ -13452,6 +13249,8 @@ terminal-link@^2.0.0: terser-webpack-plugin@^5.3.7: version "5.3.9" + resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz#832536999c51b46d468067f9e37662a3b96adfe1" + integrity sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA== dependencies: "@jridgewell/trace-mapping" "^0.3.17" jest-worker "^27.4.5" @@ -13460,7 +13259,9 @@ terser-webpack-plugin@^5.3.7: terser "^5.16.8" terser@^5.10.0, terser@^5.16.8: - version "5.19.3" + version "5.19.4" + resolved "https://registry.yarnpkg.com/terser/-/terser-5.19.4.tgz#941426fa482bf9b40a0308ab2b3cd0cf7c775ebd" + integrity sha512-6p1DjHeuluwxDXcuT9VR8p64klWJKo1ILiy19s6C9+0Bh2+NWTX6nD9EPppiER4ICkHDVB1RkVpin/YW2nQn/g== dependencies: "@jridgewell/source-map" "^0.3.3" acorn "^8.8.2" @@ -13489,12 +13290,7 @@ text-extensions@^1.0.0: resolved "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz" integrity sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ== -text-table@^0.2.0: - version "0.2.0" - resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz" - integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= - -text-table@~0.2.0: +text-table@^0.2.0, text-table@~0.2.0: version "0.2.0" resolved "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz" integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= @@ -13609,13 +13405,6 @@ tough-cookie@^4.0.0: punycode "^2.1.1" universalify "^0.1.2" -tr46@^1.0.1: - version "1.0.1" - resolved "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz" - integrity sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk= - dependencies: - punycode "^2.1.0" - tr46@^2.1.0: version "2.1.0" resolved "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz" @@ -13692,22 +13481,7 @@ tslib@1.14.1, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3: resolved "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.0.3: - version "2.6.0" - resolved "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz" - integrity sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA== - -tslib@^2.1.0: - version "2.6.0" - resolved "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz" - integrity sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA== - -tslib@^2.3.1: - version "2.6.0" - resolved "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz" - integrity sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA== - -tslib@^2.5.0: +tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.1, tslib@^2.5.0: version "2.6.0" resolved "https://registry.npmjs.org/tslib/-/tslib-2.6.0.tgz" integrity sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA== @@ -13734,7 +13508,7 @@ tweetnacl@^1.0.3: resolved "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz" integrity sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw== -type-check@^0.4.0: +type-check@^0.4.0, type-check@~0.4.0: version "0.4.0" resolved "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz" integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew== @@ -13748,13 +13522,6 @@ type-check@~0.3.2: dependencies: prelude-ls "~1.1.2" -type-check@~0.4.0: - version "0.4.0" - resolved "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz" - integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew== - dependencies: - prelude-ls "^1.2.1" - type-detect@4.0.8: version "4.0.8" resolved "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz" @@ -13853,14 +13620,7 @@ uint8arrays@^2.1.3: dependencies: multibase "^4.0.1" -uint8arrays@^3.0.0: - version "3.1.1" - resolved "https://registry.npmjs.org/uint8arrays/-/uint8arrays-3.1.1.tgz" - integrity sha512-+QJa8QRnbdXVpHYjLoTpJIdCTiw9Ir62nocClWuXIq2JIh4Uta0cQsTSpFL678p2CN8B+XSApwcU+pQEqVpKWg== - dependencies: - multiformats "^9.4.2" - -uint8arrays@^3.1.0: +uint8arrays@^3.0.0, uint8arrays@^3.1.0: version "3.1.1" resolved "https://registry.npmjs.org/uint8arrays/-/uint8arrays-3.1.1.tgz" integrity sha512-+QJa8QRnbdXVpHYjLoTpJIdCTiw9Ir62nocClWuXIq2JIh4Uta0cQsTSpFL678p2CN8B+XSApwcU+pQEqVpKWg== @@ -13931,12 +13691,7 @@ universal-user-agent@^6.0.0: resolved "https://registry.npmjs.org/universal-user-agent/-/universal-user-agent-6.0.0.tgz" integrity sha512-isyNax3wXoKaulPDZWHQqbmIx1k2tb9fb3GGDBRxCscfYV2Ch7WxPArBsFEG8s/safwXTT7H4QGhaIkTp9447w== -universalify@^0.1.0: - version "0.1.2" - resolved "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz" - integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== - -universalify@^0.1.2: +universalify@^0.1.0, universalify@^0.1.2: version "0.1.2" resolved "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz" integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg== @@ -14048,15 +13803,7 @@ v8-to-istanbul@^8.1.0: convert-source-map "^1.6.0" source-map "^0.7.3" -validate-npm-package-license@^3.0.1: - version "3.0.4" - resolved "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz" - integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== - dependencies: - spdx-correct "^3.0.0" - spdx-expression-parse "^3.0.0" - -validate-npm-package-license@^3.0.4: +validate-npm-package-license@^3.0.1, validate-npm-package-license@^3.0.4: version "3.0.4" resolved "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz" integrity sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew== @@ -14124,6 +13871,8 @@ warning@^4.0.2: watchpack@^2.4.0: version "2.4.0" + resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d" + integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg== dependencies: glob-to-regexp "^0.4.1" graceful-fs "^4.1.2" @@ -14135,14 +13884,7 @@ wcag-contrast@^3.0.0: dependencies: relative-luminance "^2.0.0" -wcwidth@^1.0.0: - version "1.0.1" - resolved "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz" - integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g= - dependencies: - defaults "^1.0.3" - -wcwidth@^1.0.1: +wcwidth@^1.0.0, wcwidth@^1.0.1: version "1.0.1" resolved "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz" integrity sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g= @@ -14154,11 +13896,6 @@ webidl-conversions@^3.0.0: resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz" integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== -webidl-conversions@^4.0.2: - version "4.0.2" - resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz" - integrity sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg== - webidl-conversions@^5.0.0: version "5.0.0" resolved "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz" @@ -14188,6 +13925,8 @@ webpack-sources@^3.2.3: webpack@^5.76.0: version "5.88.2" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.88.2.tgz#f62b4b842f1c6ff580f3fcb2ed4f0b579f4c210e" + integrity sha512-JmcgNZ1iKj+aiR0OvTYtWQqJwq37Pf683dY9bVORwVbUrDhLhdn/PlO2sHsFHPkj7sHNQF3JwaAkp49V+Sq1tQ== dependencies: "@types/eslint-scope" "^3.7.3" "@types/estree" "^1.0.0" @@ -14234,15 +13973,6 @@ whatwg-url@^5.0.0: tr46 "~0.0.3" webidl-conversions "^3.0.0" -whatwg-url@^7.0.0: - version "7.1.0" - resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz" - integrity sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg== - dependencies: - lodash.sortby "^4.7.0" - tr46 "^1.0.1" - webidl-conversions "^4.0.2" - whatwg-url@^8.0.0, whatwg-url@^8.5.0: version "8.7.0" resolved "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz" From 163f7c210bf0f89fb3328af6790cc0d172d3b63b Mon Sep 17 00:00:00 2001 From: Anthony Date: Fri, 15 Sep 2023 06:26:57 +0900 Subject: [PATCH 04/10] update blockWaitMs and rpc endpoints --- src/constants/chainInfo.ts | 2 +- src/constants/jsonRpcEndpoints.ts | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/constants/chainInfo.ts b/src/constants/chainInfo.ts index 657c0c331..4ec67b935 100644 --- a/src/constants/chainInfo.ts +++ b/src/constants/chainInfo.ts @@ -240,7 +240,7 @@ const CHAIN_INFO: ChainInfoMap = { }, [SupportedChainId.BASE]: { networkType: NetworkType.L2, - blockWaitMsBeforeWarning: ms`10m`, + blockWaitMsBeforeWarning: ms`25m`, bridge: 'https://bridge.base.org/', docs: 'https://docs.base.org/', explorer: 'https://basescan.org/', diff --git a/src/constants/jsonRpcEndpoints.ts b/src/constants/jsonRpcEndpoints.ts index d95cd2587..f648e7283 100644 --- a/src/constants/jsonRpcEndpoints.ts +++ b/src/constants/jsonRpcEndpoints.ts @@ -89,7 +89,6 @@ export const JSON_RPC_FALLBACK_ENDPOINTS: Record = { [SupportedChainId.BASE]: [ // "Safe" URLs 'https://mainnet.base.org', - 'https://developer-access-mainnet.base.org/', 'https://base.gateway.tenderly.co', 'https://base.publicnode.com', // "Fallback" URLs From e71f896aee705440808e340408b019acdeff3ae7 Mon Sep 17 00:00:00 2001 From: Anthony Date: Thu, 21 Sep 2023 13:03:49 -0700 Subject: [PATCH 05/10] Add Multicall and Swap Souter address --- src/constants/addresses.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/constants/addresses.ts b/src/constants/addresses.ts index 2fadaf17f..99b1981e5 100644 --- a/src/constants/addresses.ts +++ b/src/constants/addresses.ts @@ -16,6 +16,7 @@ export const MULTICALL_ADDRESS: AddressMap = { [SupportedChainId.ARBITRUM_RINKEBY]: '0xa501c031958F579dB7676fF1CE78AD305794d579', [SupportedChainId.CELO]: '0x633987602DE5C4F337e3DbF265303A1080324204', [SupportedChainId.CELO_ALFAJORES]: '0x633987602DE5C4F337e3DbF265303A1080324204', + [SupportedChainId.BASE]: '0x091e99cb1C49331a94dD62755D168E941AbD0693', } export const SWAP_ROUTER_ADDRESSES: AddressMap = { @@ -29,6 +30,7 @@ export const SWAP_ROUTER_ADDRESSES: AddressMap = { ]), [SupportedChainId.CELO]: '0x5615CDAb10dc425a742d643d949a7F474C01abc4', [SupportedChainId.CELO_ALFAJORES]: '0x5615CDAb10dc425a742d643d949a7F474C01abc4', + [SupportedChainId.BASE]: '0x2626664c2603336E57B271c5C0b26F421741e481', } export const ARGENT_WALLET_DETECTOR_ADDRESS: AddressMap = { From 711854de55221f065aa8b7adb582dc637566c71c Mon Sep 17 00:00:00 2001 From: Anthony Date: Thu, 21 Sep 2023 13:22:44 -0700 Subject: [PATCH 06/10] Fix linting --- src/constants/chainInfo.ts | 2 +- src/constants/routing.ts | 8 ++------ src/hooks/useStablecoinAmountFromFiatValue.ts | 2 +- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/constants/chainInfo.ts b/src/constants/chainInfo.ts index 4ec67b935..848da8098 100644 --- a/src/constants/chainInfo.ts +++ b/src/constants/chainInfo.ts @@ -250,7 +250,7 @@ const CHAIN_INFO: ChainInfoMap = { nativeCurrency: { name: 'Ether', symbol: 'ETH', decimals: 18 }, color: '#0152ff', backgroundColor: '#0152ff', - } + }, } export function getChainInfo(chainId: SupportedL1ChainId): L1ChainInfo diff --git a/src/constants/routing.ts b/src/constants/routing.ts index d748a0ddd..a50185fea 100644 --- a/src/constants/routing.ts +++ b/src/constants/routing.ts @@ -24,8 +24,8 @@ import { sETH2, SWISE, TRIBE, - USDC_BNB_CHAIN, USDC_BASE, + USDC_BNB_CHAIN, USDC_MAINNET, USDC_POLYGON, USDT, @@ -94,11 +94,7 @@ export const BASES_TO_CHECK_TRADES_AGAINST: ChainTokenList = { USDT_BNB_CHAIN, ...WRAPPED_NATIVE_CURRENCIES_ONLY[SupportedChainId.BNB], ], - [SupportedChainId.BASE]: [ - ...WRAPPED_NATIVE_CURRENCIES_ONLY[SupportedChainId.BASE], - DAI_BASE, - USDC_BASE, - ], + [SupportedChainId.BASE]: [...WRAPPED_NATIVE_CURRENCIES_ONLY[SupportedChainId.BASE], DAI_BASE, USDC_BASE], } export const ADDITIONAL_BASES: { [chainId: number]: { [tokenAddress: string]: Token[] } } = { [SupportedChainId.MAINNET]: { diff --git a/src/hooks/useStablecoinAmountFromFiatValue.ts b/src/hooks/useStablecoinAmountFromFiatValue.ts index 7be9c8475..17423723a 100644 --- a/src/hooks/useStablecoinAmountFromFiatValue.ts +++ b/src/hooks/useStablecoinAmountFromFiatValue.ts @@ -1,7 +1,7 @@ import { CurrencyAmount, Token } from '@uniswap/sdk-core' import { useWeb3React } from '@web3-react/core' import { SupportedChainId } from 'constants/chains' -import { CUSD_CELO, DAI_OPTIMISM, USDC_ARBITRUM, USDC_MAINNET, USDC_POLYGON, USDC_BASE } from 'constants/tokens' +import { CUSD_CELO, DAI_OPTIMISM, USDC_ARBITRUM, USDC_BASE, USDC_MAINNET, USDC_POLYGON } from 'constants/tokens' import { useMemo } from 'react' import tryParseCurrencyAmount from 'utils/tryParseCurrencyAmount' From 49847f5ec1d7a9b07c978e1ec6ee2ccbcf7fb789 Mon Sep 17 00:00:00 2001 From: Anthony Date: Thu, 21 Sep 2023 14:40:16 -0700 Subject: [PATCH 07/10] Additional fixes --- src/constants/chains.ts | 1 - src/hooks/transactions/updater.tsx | 1 + src/utils/getExplorerLink.ts | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/constants/chains.ts b/src/constants/chains.ts index 87d90235d..a3d5c1a0d 100644 --- a/src/constants/chains.ts +++ b/src/constants/chains.ts @@ -91,7 +91,6 @@ export const L1_CHAIN_IDS = [ SupportedChainId.POLYGON_MUMBAI, SupportedChainId.CELO, SupportedChainId.CELO_ALFAJORES, - SupportedChainId.BASE, ] as const export type SupportedL1ChainId = typeof L1_CHAIN_IDS[number] diff --git a/src/hooks/transactions/updater.tsx b/src/hooks/transactions/updater.tsx index e50f7e478..6aec0e3c9 100644 --- a/src/hooks/transactions/updater.tsx +++ b/src/hooks/transactions/updater.tsx @@ -35,6 +35,7 @@ const RETRY_OPTIONS_BY_CHAIN_ID: { [chainId: number]: RetryOptions } = { [SupportedChainId.ARBITRUM_RINKEBY]: { n: 10, minWait: 250, maxWait: 1000 }, [SupportedChainId.OPTIMISM_GOERLI]: { n: 10, minWait: 250, maxWait: 1000 }, [SupportedChainId.OPTIMISM]: { n: 10, minWait: 250, maxWait: 1000 }, + [SupportedChainId.BASE]: { n: 10, minWait: 250, maxWait: 1000 }, } const DEFAULT_RETRY_OPTIONS: RetryOptions = { n: 1, minWait: 0, maxWait: 0 } diff --git a/src/utils/getExplorerLink.ts b/src/utils/getExplorerLink.ts index 0d48a1f68..ba6172551 100644 --- a/src/utils/getExplorerLink.ts +++ b/src/utils/getExplorerLink.ts @@ -13,7 +13,7 @@ const ETHERSCAN_PREFIXES: { [chainId: number]: string } = { [SupportedChainId.CELO]: 'https://celoscan.io', [SupportedChainId.CELO_ALFAJORES]: 'https://alfajores.celoscan.io', [SupportedChainId.BNB]: 'https://bscscan.com', - [SupportedChainId.BASE]: 'https://basescan.org/', + [SupportedChainId.BASE]: 'https://basescan.org', } export enum ExplorerDataType { From 62eff2c1ea2b4e8fa7bb727c4f976cb22b1eff3a Mon Sep 17 00:00:00 2001 From: Anthony Date: Thu, 21 Sep 2023 17:02:17 -0700 Subject: [PATCH 08/10] Bump smart-order-router to v3.16.25 --- package.json | 2 +- yarn.lock | 52 +++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 46 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index b4f193fee..4d71fdfbd 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "@uniswap/redux-multicall": "^1.1.8", "@uniswap/router-sdk": "^1.6.0", "@uniswap/sdk-core": "^4.0.6", - "@uniswap/smart-order-router": "^3.13.7", + "@uniswap/smart-order-router": "^3.16.25", "@uniswap/token-lists": "^1.0.0-beta.30", "@uniswap/universal-router-sdk": "^1.5.6", "@uniswap/v2-sdk": "^3.2.0", diff --git a/yarn.lock b/yarn.lock index 161a47ecc..7ca6e0bb0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3787,19 +3787,32 @@ tiny-invariant "^1.1.0" toformat "^2.0.0" -"@uniswap/smart-order-router@^3.13.7": - version "3.13.7" - resolved "https://registry.npmjs.org/@uniswap/smart-order-router/-/smart-order-router-3.13.7.tgz" - integrity sha512-fJDyUngHWw2lH0qIkDzeUqHgP2VLAq33o5O9yM75nQi6LrD8fEIgsfdzFbF8c+F7enAFtA6Xl4lf5AlHKNaXSg== +"@uniswap/sdk-core@^4.0.7": + version "4.0.7" + resolved "https://registry.yarnpkg.com/@uniswap/sdk-core/-/sdk-core-4.0.7.tgz#90dfd070d7e44494234618af398da158363ae827" + integrity sha512-jscx7KUIWzQatcL5PHY6xy0gEL9IGQcL5h/obxzX9foP2KoNk9cq66Ia8I2Kvpa7zBcPOeW1hU0hJNBq6CzcIQ== + dependencies: + "@ethersproject/address" "^5.0.2" + big.js "^5.2.2" + decimal.js-light "^2.5.0" + jsbi "^3.1.4" + tiny-invariant "^1.1.0" + toformat "^2.0.0" + +"@uniswap/smart-order-router@^3.16.25": + version "3.16.25" + resolved "https://registry.yarnpkg.com/@uniswap/smart-order-router/-/smart-order-router-3.16.25.tgz#30d5c81a056e1cc340c025a92751ce418753c6ff" + integrity sha512-LbalGKZ/VIAfNTMgE4Gn0nAmDGn/C4Rgka4q/hhQO5LHdRmONTuzLmrsMNb9AgRdlGRCqSVM4Mc4VYM/ew5fSg== dependencies: "@uniswap/default-token-list" "^11.2.0" "@uniswap/permit2-sdk" "^1.2.0" "@uniswap/router-sdk" "^1.6.0" + "@uniswap/sdk-core" "^4.0.7" "@uniswap/swap-router-contracts" "^1.3.0" "@uniswap/token-lists" "^1.0.0-beta.31" "@uniswap/universal-router" "^1.0.1" - "@uniswap/universal-router-sdk" "^1.5.4" - "@uniswap/v2-sdk" "^3.2.0" + "@uniswap/universal-router-sdk" "^1.5.7" + "@uniswap/v2-sdk" "^3.2.1" "@uniswap/v3-sdk" "^3.10.0" async-retry "^1.3.1" await-timeout "^1.1.1" @@ -3842,7 +3855,7 @@ resolved "https://registry.npmjs.org/@uniswap/token-lists/-/token-lists-1.0.0-beta.33.tgz" integrity sha512-JQkXcpRI3jFG8y3/CGC4TS8NkDgcxXaOQuYW8Qdvd6DcDiIyg2vVYCG9igFEzF0G6UvxgHkBKC7cWCgzZNYvQg== -"@uniswap/universal-router-sdk@^1.5.4", "@uniswap/universal-router-sdk@^1.5.6": +"@uniswap/universal-router-sdk@^1.5.6": version "1.5.6" resolved "https://registry.npmjs.org/@uniswap/universal-router-sdk/-/universal-router-sdk-1.5.6.tgz" integrity sha512-ZD27U+kugMRJRVEX0oWZsRCw1n5vBN3I17Q22IWE+w/WhOJSppUr6PLo9u4HRdqXTZET7gubnlRc0LOAEkkSkQ== @@ -3856,6 +3869,20 @@ bignumber.js "^9.0.2" ethers "^5.3.1" +"@uniswap/universal-router-sdk@^1.5.7": + version "1.5.7" + resolved "https://registry.yarnpkg.com/@uniswap/universal-router-sdk/-/universal-router-sdk-1.5.7.tgz#d79dedcdf66197695d57ef8c80336da807488871" + integrity sha512-5T08dTZoAEN3W7fw467WoNwzfF8Ks5+t4/l0xVAhadUNq6UB/Ng9q5P70j+D+FVLwZbcbyv5zIkPtooADfjEKw== + dependencies: + "@uniswap/permit2-sdk" "^1.2.0" + "@uniswap/router-sdk" "^1.6.0" + "@uniswap/sdk-core" "^4.0.0" + "@uniswap/universal-router" "1.4.3" + "@uniswap/v2-sdk" "^3.2.0" + "@uniswap/v3-sdk" "^3.10.0" + bignumber.js "^9.0.2" + ethers "^5.3.1" + "@uniswap/universal-router@1.4.3", "@uniswap/universal-router@^1.0.1": version "1.4.3" resolved "https://registry.npmjs.org/@uniswap/universal-router/-/universal-router-1.4.3.tgz" @@ -3886,6 +3913,17 @@ tiny-invariant "^1.1.0" tiny-warning "^1.0.3" +"@uniswap/v2-sdk@^3.2.1": + version "3.2.1" + resolved "https://registry.yarnpkg.com/@uniswap/v2-sdk/-/v2-sdk-3.2.1.tgz#3904788ae41649ee28cfced45d817564e1ea824b" + integrity sha512-YocFCG97t7qi0fZrBWjFz3dfOgW+rhVN70PlciwcioG+x3KmQlJH7pVfCA34U/BDVFfebHp/iS/De6ajvMmJBg== + dependencies: + "@ethersproject/address" "^5.0.0" + "@ethersproject/solidity" "^5.0.0" + "@uniswap/sdk-core" "^4.0.7" + tiny-invariant "^1.1.0" + tiny-warning "^1.0.3" + "@uniswap/v3-core@1.0.0": version "1.0.0" resolved "https://registry.npmjs.org/@uniswap/v3-core/-/v3-core-1.0.0.tgz" From e2158e7433b5b71571b6ffb2eb14a91788527ec5 Mon Sep 17 00:00:00 2001 From: Anthony Date: Thu, 21 Sep 2023 17:26:38 -0700 Subject: [PATCH 09/10] Bump deps --- package.json | 6 +++--- yarn.lock | 16 +--------------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 4d71fdfbd..0cf997df8 100644 --- a/package.json +++ b/package.json @@ -66,11 +66,11 @@ "@uniswap/permit2-sdk": "^1.2.0", "@uniswap/redux-multicall": "^1.1.8", "@uniswap/router-sdk": "^1.6.0", - "@uniswap/sdk-core": "^4.0.6", + "@uniswap/sdk-core": "^4.0.7", "@uniswap/smart-order-router": "^3.16.25", "@uniswap/token-lists": "^1.0.0-beta.30", - "@uniswap/universal-router-sdk": "^1.5.6", - "@uniswap/v2-sdk": "^3.2.0", + "@uniswap/universal-router-sdk": "^1.5.7", + "@uniswap/v2-sdk": "^3.2.1", "@uniswap/v3-sdk": "^3.10.0", "@web3-react/core": "^8.2.0", "@web3-react/eip1193": "^8.2.0", diff --git a/yarn.lock b/yarn.lock index 7ca6e0bb0..76f26b756 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3775,7 +3775,7 @@ "@uniswap/v2-sdk" "^3.2.0" "@uniswap/v3-sdk" "^3.10.0" -"@uniswap/sdk-core@^4", "@uniswap/sdk-core@^4.0.0", "@uniswap/sdk-core@^4.0.2", "@uniswap/sdk-core@^4.0.6": +"@uniswap/sdk-core@^4", "@uniswap/sdk-core@^4.0.0", "@uniswap/sdk-core@^4.0.2": version "4.0.6" resolved "https://registry.npmjs.org/@uniswap/sdk-core/-/sdk-core-4.0.6.tgz" integrity sha512-6GzCVfnOiJtvo91zlF/VjnC2OEbBRThVclzrh7+Zmo8dBovXwSlXwqn3RkSWACn/XEOzAKH70TficfOWm6mWJA== @@ -3855,20 +3855,6 @@ resolved "https://registry.npmjs.org/@uniswap/token-lists/-/token-lists-1.0.0-beta.33.tgz" integrity sha512-JQkXcpRI3jFG8y3/CGC4TS8NkDgcxXaOQuYW8Qdvd6DcDiIyg2vVYCG9igFEzF0G6UvxgHkBKC7cWCgzZNYvQg== -"@uniswap/universal-router-sdk@^1.5.6": - version "1.5.6" - resolved "https://registry.npmjs.org/@uniswap/universal-router-sdk/-/universal-router-sdk-1.5.6.tgz" - integrity sha512-ZD27U+kugMRJRVEX0oWZsRCw1n5vBN3I17Q22IWE+w/WhOJSppUr6PLo9u4HRdqXTZET7gubnlRc0LOAEkkSkQ== - dependencies: - "@uniswap/permit2-sdk" "^1.2.0" - "@uniswap/router-sdk" "^1.6.0" - "@uniswap/sdk-core" "^4.0.0" - "@uniswap/universal-router" "1.4.3" - "@uniswap/v2-sdk" "^3.2.0" - "@uniswap/v3-sdk" "^3.10.0" - bignumber.js "^9.0.2" - ethers "^5.3.1" - "@uniswap/universal-router-sdk@^1.5.7": version "1.5.7" resolved "https://registry.yarnpkg.com/@uniswap/universal-router-sdk/-/universal-router-sdk-1.5.7.tgz#d79dedcdf66197695d57ef8c80336da807488871" From 31434591a7343eece36e550ea64505323f365056 Mon Sep 17 00:00:00 2001 From: Anthony Date: Thu, 21 Sep 2023 17:27:27 -0700 Subject: [PATCH 10/10] Ran yarn deduplicate --- yarn.lock | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) diff --git a/yarn.lock b/yarn.lock index 76f26b756..48ed5464d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3775,19 +3775,7 @@ "@uniswap/v2-sdk" "^3.2.0" "@uniswap/v3-sdk" "^3.10.0" -"@uniswap/sdk-core@^4", "@uniswap/sdk-core@^4.0.0", "@uniswap/sdk-core@^4.0.2": - version "4.0.6" - resolved "https://registry.npmjs.org/@uniswap/sdk-core/-/sdk-core-4.0.6.tgz" - integrity sha512-6GzCVfnOiJtvo91zlF/VjnC2OEbBRThVclzrh7+Zmo8dBovXwSlXwqn3RkSWACn/XEOzAKH70TficfOWm6mWJA== - dependencies: - "@ethersproject/address" "^5.0.2" - big.js "^5.2.2" - decimal.js-light "^2.5.0" - jsbi "^3.1.4" - tiny-invariant "^1.1.0" - toformat "^2.0.0" - -"@uniswap/sdk-core@^4.0.7": +"@uniswap/sdk-core@^4", "@uniswap/sdk-core@^4.0.0", "@uniswap/sdk-core@^4.0.2", "@uniswap/sdk-core@^4.0.7": version "4.0.7" resolved "https://registry.yarnpkg.com/@uniswap/sdk-core/-/sdk-core-4.0.7.tgz#90dfd070d7e44494234618af398da158363ae827" integrity sha512-jscx7KUIWzQatcL5PHY6xy0gEL9IGQcL5h/obxzX9foP2KoNk9cq66Ia8I2Kvpa7zBcPOeW1hU0hJNBq6CzcIQ== @@ -3888,18 +3876,7 @@ resolved "https://registry.npmjs.org/@uniswap/v2-core/-/v2-core-1.0.1.tgz" integrity sha512-MtybtkUPSyysqLY2U210NBDeCHX+ltHt3oADGdjqoThZaFRDKwM6k1Nb3F0A3hk5hwuQvytFWhrWHOEq6nVJ8Q== -"@uniswap/v2-sdk@^3.2.0": - version "3.2.0" - resolved "https://registry.npmjs.org/@uniswap/v2-sdk/-/v2-sdk-3.2.0.tgz" - integrity sha512-kBOJ6Iwtgb/2LckLMIzfbPM37/ll0F+33lzPmZlqoJwsT0F2hZdVfAhclufZcSb0Y9RdLXl6372CZJ+lhx8cUQ== - dependencies: - "@ethersproject/address" "^5.0.0" - "@ethersproject/solidity" "^5.0.0" - "@uniswap/sdk-core" "^4.0.2" - tiny-invariant "^1.1.0" - tiny-warning "^1.0.3" - -"@uniswap/v2-sdk@^3.2.1": +"@uniswap/v2-sdk@^3.2.0", "@uniswap/v2-sdk@^3.2.1": version "3.2.1" resolved "https://registry.yarnpkg.com/@uniswap/v2-sdk/-/v2-sdk-3.2.1.tgz#3904788ae41649ee28cfced45d817564e1ea824b" integrity sha512-YocFCG97t7qi0fZrBWjFz3dfOgW+rhVN70PlciwcioG+x3KmQlJH7pVfCA34U/BDVFfebHp/iS/De6ajvMmJBg==