chore: sync dependencies

apps/dao/package.json

@@ -29,20 +29,20 @@
     "@hookform/resolvers": "^3.9.0",
     "@lingui/react": "^4.6.0",
     "@supercharge/promise-pool": "^2.3.2",
-    "bignumber.js": "^9.0.1",
+    "bignumber.js": "^9.1.2",
     "curve-common": "*",
     "curve-lib": "*",
     "curve-ui-kit": "*",
     "dayjs": "^1.11.7",
-    "ethers": "^6.9.0",
+    "ethers": "^6.13.4",
     "focus-visible": "5.2.0",
     "fuse.js": "^6.6.2",
     "immer": "^9.0.12",
     "intersection-observer": "^0.12.0",
     "lightweight-charts": "4.1.2",
     "lodash": "4.17.21",
     "make-plural": "^7.1.0",
-    "memoizee": "^0.4.15",
+    "memoizee": "^0.4.17",
     "next": "^13.5.6",
     "next-images": "^1.8.5",
     "react": "*",

apps/lend/package.json

@@ -28,21 +28,21 @@
     "@lingui/detect-locale": "^4.6.0",
     "@lingui/react": "^4.6.0",
     "@supercharge/promise-pool": "^2.3.2",
-    "bignumber.js": "^9.0.1",
+    "bignumber.js": "^9.1.2",
     "cross-fetch": "^3.1.5",
     "curve-common": "*",
     "curve-lib": "*",
     "curve-ui-kit": "*",
     "dayjs": "^1.11.7",
-    "ethers": "^6.11.0",
+    "ethers": "^6.13.4",
     "external-rewards": "*",
     "focus-visible": "5.2.0",
     "fuse.js": "^6.6.2",
     "immer": "^9.0.12",
     "intersection-observer": "^0.12.0",
     "lodash": "4.17.21",
     "make-plural": "^7.1.0",
-    "memoizee": "^0.4.15",
+    "memoizee": "^0.4.17",
     "next": "^13.5.6",
     "next-images": "^1.8.5",
     "numbro": "^2.4.0",

apps/loan/package.json

@@ -29,20 +29,20 @@
     "@lingui/detect-locale": "^4.6.0",
     "@lingui/react": "^4.6.0",
     "@supercharge/promise-pool": "^2.3.2",
-    "bignumber.js": "^9.0.1",
+    "bignumber.js": "^9.1.2",
     "cross-fetch": "^3.1.5",
     "curve-common": "*",
     "curve-lib": "*",
     "curve-ui-kit": "*",
     "dayjs": "^1.11.7",
-    "ethers": "^5",
+    "ethers": "^6.13.4",
     "focus-visible": "5.2.0",
     "fuse.js": "^6.6.2",
     "immer": "^9.0.12",
     "intersection-observer": "^0.12.0",
     "lodash": "4.17.21",
     "make-plural": "^7.1.0",
-    "memoizee": "^0.4.15",
+    "memoizee": "^0.4.17",
     "next": "^13.5.6",
     "next-images": "^1.8.5",
     "numbro": "^2.4.0",

apps/loan/src/hooks/usePageOnMount.ts

@@ -123,7 +123,7 @@ function usePageOnMount(params: Params, location: Location, navigate: NavigateFu
           setStorageValue('APP_CACHE', { walletName: walletState.label, timestamp: Date.now().toString() })
           const walletChainId = getWalletChainId(walletState)
           if (walletChainId && walletChainId !== parsedParams.rChainId) {
-            const success = await setChain({ chainId: ethers.utils.hexValue(parsedParams.rChainId) })
+            const success = await setChain({ chainId: ethers.toQuantity(parsedParams.rChainId) })
             if (success) {
               updateConnectState('loading', CONNECT_STAGE.CONNECT_API, [parsedParams.rChainId, true])
             } else {
@@ -166,7 +166,7 @@ function usePageOnMount(params: Params, location: Location, navigate: NavigateFu
         const [currChainId, newChainId] = options
         if (wallet) {
           try {
-            const success = await setChain({ chainId: ethers.utils.hexValue(newChainId) })
+            const success = await setChain({ chainId: ethers.toQuantity(newChainId) })
             if (!success) throw new Error('reject network switch')
             updateConnectState('loading', CONNECT_STAGE.CONNECT_API, [newChainId, true])
           } catch (error) {

apps/loan/src/lib/apiCrvusd.ts

@@ -2,8 +2,7 @@ import type { FormValues as SwapFormValues } from '@/components/PageLoanManage/L
 import type { LiqRange, Provider, MaxRecvLeverage } from '@/store/types'
 import type { MaxRecvLeverage as MaxRecvLeverageForm } from '@/components/PageLoanCreate/types'
 import type { FormDetailInfo as FormDetailInfoDeleverage } from '@/components/PageLoanManage/LoanDeleverage/types'
-
-import { ethers } from 'ethers'
+import { BrowserProvider } from 'ethers'
 import PromisePool from '@supercharge/promise-pool'
 
 import { fulfilledValue, getErrorMessage, log } from '@/utils/helpers'
@@ -94,10 +93,10 @@ const helpers = {
     }
   },
   waitForTransaction: async (hash: string, provider: Provider) =>
-    (provider as ethers.providers.Web3Provider).waitForTransaction(hash),
+    (provider as BrowserProvider).waitForTransaction(hash),
   waitForTransactions: async (hashes: string[], provider: Provider) => {
     const { results, errors } = await PromisePool.for(hashes).process(
-      async (hash) => await (provider as ethers.providers.Web3Provider).waitForTransaction(hash),
+      async (hash) => await (provider as BrowserProvider).waitForTransaction(hash),
     )
     if (Array.isArray(errors) && errors.length > 0) {
       throw errors

apps/loan/src/store/createAppSlice.ts

@@ -5,7 +5,7 @@ import type { Locale } from '@/lib/i18n'
 
 import produce from 'immer'
 
-import { ethers, Contract } from 'ethers'
+import { ethers, Contract, ContractRunner } from 'ethers'
 import { Interface } from '@ethersproject/abi'
 import { httpFetcher, log } from '@/utils/helpers'
 import { setStorageValue } from '@/utils/storage'
@@ -39,7 +39,7 @@ type SliceState = {
 
 // prettier-ignore
 export interface AppSlice extends SliceState {
-  getContract(jsonModuleName: string, contractAddress: string, provider: Provider): Promise<ethers.Contract | null>
+  getContract(jsonModuleName: string, contractAddress: string, provider: ContractRunner): Promise<ethers.Contract | null>
   fetchCrvUSDTotalSupply(api: Curve): Promise<void>
   fetchDailyVolume(): Promise<void>
   setAppCache<T>(key: AppCacheKeys, value: T): void

apps/loan/src/store/createGasSlice.ts

@@ -2,7 +2,7 @@ import type { GetState, SetState } from 'zustand'
 import type { State } from '@/store/useStore'
 import type { GasInfo } from '@/store/types'
 
-import { ethers } from 'ethers'
+import { JsonRpcProvider } from 'ethers'
 import cloneDeep from 'lodash/cloneDeep'
 
 import { gweiToWai } from '@/shared/curve-lib'
@@ -118,38 +118,43 @@ function parseEthereumGasInfo(gasInfo, chainId: ChainId) {
   }
 }
 
-// @ts-ignore
-async function parseGasInfoFromRpcUrl(rpcUrl) {
-  const provider = new ethers.providers.JsonRpcProvider(rpcUrl)
+async function parseGasInfoFromRpcUrl(rpcUrl: string) {
+  if (rpcUrl) {
+    const provider = new JsonRpcProvider(rpcUrl)
 
-  if (provider) {
     const gasInfo = await provider.getFeeData()
     const { gasPrice, maxPriorityFeePerGas, maxFeePerGas } = gasInfo
 
     if (gasPrice) {
-      const base = gasPrice.toNumber()
+      const base = toNumber(gasPrice)
 
       if (maxPriorityFeePerGas && maxFeePerGas) {
         return {
           gasInfo: {
             base,
-            priority: [maxPriorityFeePerGas.toNumber()],
-            max: [maxFeePerGas.toNumber()],
-            basePlusPriority: [gasPrice.add(maxPriorityFeePerGas).toNumber()],
-          },
-          label: ['fast'],
-        }
-      } else {
-        return {
-          gasInfo: {
-            base,
-            priority: [0],
-            max: [0],
-            basePlusPriority: [gasPrice.add(gweiToWai(25)).toNumber()],
+            priority: [toNumber(maxPriorityFeePerGas)],
+            max: [toNumber(maxFeePerGas)],
+            basePlusPriority: [toNumber(gasPrice + maxPriorityFeePerGas)],
           },
           label: ['fast'],
         }
       }
+      return {
+        gasInfo: {
+          base,
+          priority: [0],
+          max: [0],
+          basePlusPriority: [toNumber(gasPrice) + gweiToWai(25)],
+        },
+        label: ['fast'],
+      }
     }
   }
 }
+
+const toNumber = (value: bigint) => {
+  if (value <= Number.MAX_SAFE_INTEGER && value >= Number.MIN_SAFE_INTEGER) {
+    return Number(value)
+  }
+  throw new Error(`Value: "${value}" is out of bounds to be a Number`)
+}

apps/loan/src/store/createPegKeepersSlice.ts

@@ -72,9 +72,9 @@ const createPegKeepersSlice = (set: SetState<State>, get: GetState<State>): PegK
               debtCeilingContract ? debtCeilingContract['debt_ceiling'](pegKeeperAddress) : () => '',
             ])
             results[pegKeeperAddress] = {
-              debt: ethers.utils.formatUnits(debt, 'ether'),
-              estCallerProfit: ethers.utils.formatUnits(estCallerProfit, 'ether'),
-              debtCeiling: ethers.utils.formatUnits(debtCeiling, 'ether'),
+              debt: ethers.formatEther(debt),
+              estCallerProfit: ethers.formatEther(estCallerProfit),
+              debtCeiling: ethers.formatEther(debtCeiling),
             }
           })
 
@@ -95,7 +95,7 @@ const createPegKeepersSlice = (set: SetState<State>, get: GetState<State>): PegK
         const estCallerProfit = await contract.estimate_caller_profit()
         sliceState.setStateByActiveKey('detailsMapper', pegKeeperAddress, {
           ...detailsMapper[pegKeeperAddress],
-          estCallerProfit: ethers.utils.formatUnits(estCallerProfit, 'ether'),
+          estCallerProfit: ethers.formatEther(estCallerProfit),
         })
       } catch (error) {
         console.error(error)

apps/loan/src/store/createScrvUsdSlice.ts

@@ -189,8 +189,8 @@ async function _fetchSavingsYield(provider?: Provider | null): Promise<PricesYie
       provider.getBlock('latest'),
     ])
     return {
-      last_updated: new Date(block.timestamp).toISOString(),
-      last_updated_block: block.number,
+      last_updated: new Date(block?.timestamp ?? 0).toISOString(),
+      last_updated_block: block?.number ?? 0,
       proj_apr: supply > 0 ? (unlock_amount * 1e-12 * YEAR) / supply : 0,
       supply: supply / 1e18,
     }

apps/loan/src/store/createWalletSlice.ts

@@ -3,9 +3,8 @@ import type { State } from '@/store/useStore'
 import type { CustomNotification, NotificationType } from '@web3-onboard/core/dist/types'
 import type { Provider } from '@/store/types'
 import type { OnboardAPI, UpdateNotification } from '@web3-onboard/core'
-
 import cloneDeep from 'lodash/cloneDeep'
-import { ethers } from 'ethers'
+import { BrowserProvider } from 'ethers'
 
 type StateKey = keyof typeof DEFAULT_STATE
 
@@ -116,11 +115,10 @@ const createWalletSlice = (set: SetState<State>, get: GetState<State>): WalletSl
 export default createWalletSlice
 
 export function getProvider(wallet: Wallet) {
-  return new ethers.providers.Web3Provider(wallet.provider)
+  return new BrowserProvider(wallet.provider)
 }
 
 export function getWalletChainId(wallet: Wallet | undefined | null) {
   if (!wallet) return null
-  const chainId = (wallet as Wallet).chains[0].id
-  return ethers.BigNumber.from(chainId).toNumber()
+  return +(wallet as Wallet).chains[0].id
 }

apps/loan/src/store/types.ts

@@ -1,4 +1,4 @@
-import { ethers } from 'ethers'
+import { BrowserProvider } from 'ethers'
 
 /* createAppSlice */
 
@@ -52,7 +52,7 @@ export type LiqRangeSliderIdx = LiqRange & { sliderIdx: number }
 export type LiqRangesMapper = { [n: string]: LiqRangeSliderIdx }
 
 /* createWalletSlice */
-export type Provider = ethers.providers.Web3Provider
+export type Provider = BrowserProvider
 
 export type PricesYieldDataResponse = PricesYieldData
 

apps/loan/src/types/global.d.ts

@@ -1,3 +1,4 @@
+import { BrowserProvider } from 'ethers'
 import type { INetworkName } from '@curvefi/stablecoin-api/lib/interfaces'
 import type { LlammaTemplate } from '@curvefi/stablecoin-api/lib/llammas'
 import type { Locale } from '@/lib/i18n'
@@ -31,7 +32,7 @@ declare global {
   type Curve = typeof stablecoinApi & { chainId: ChainId }
   type LendApi = typeof lendingApi & { chainId: ChainId }
   type NetworkEnum = INetworkName
-  type Provider = ethers.providers.web3Provider
+  type Provider = BrowserProvider
 
   type RFormType = 'loan' | 'deleverage' | 'collateral' | 'leverage' | ''
   type RouterParams = {

apps/main/package.json

@@ -29,13 +29,13 @@
     "@hookform/resolvers": "^3.9.0",
     "@lingui/react": "^4.6.0",
     "@supercharge/promise-pool": "^2.3.2",
-    "bignumber.js": "^9.0.1",
+    "bignumber.js": "^9.1.2",
     "cross-fetch": "^3.1.5",
     "curve-common": "*",
     "curve-lib": "*",
     "curve-ui-kit": "*",
     "dayjs": "^1.11.7",
-    "ethers": "^6.11.0",
+    "ethers": "^6.13.4",
     "external-rewards": "*",
     "focus-visible": "5.2.0",
     "fuse.js": "^6.6.2",
@@ -44,7 +44,7 @@
     "lightweight-charts": "4.1.2",
     "lodash": "4.17.21",
     "make-plural": "^7.1.0",
-    "memoizee": "^0.4.15",
+    "memoizee": "^0.4.17",
     "next": "^13.5.6",
     "next-images": "^1.8.5",
     "numbro": "^2.4.0",

packages/curve-common/package.json

@@ -23,7 +23,7 @@
     "@web3-onboard/trezor": "^2.4.6",
     "@web3-onboard/trust": "^2.1.2",
     "@web3-onboard/walletconnect": "^2.6.1",
-    "ethers": "^6.11.0"
+    "ethers": "^6.13.4"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",

packages/curve-lib/package.json

@@ -13,7 +13,7 @@
     "@tanstack/react-query": "^5.59.0",
     "@tanstack/react-query-devtools": "^5.59.0",
     "@tanstack/react-query-persist-client": "^5.59.0",
-    "ethers": "^6.11.0",
+    "ethers": "^6.13.4",
     "react": "^18.2.0",
     "type-fest": "^4.26.1"
   },

packages/ui/package.json

@@ -11,8 +11,8 @@
   "dependencies": {
     "@carbon/icons-react": "11.17.0",
     "@lingui/detect-locale": "^4.6.0",
-    "bignumber.js": "^9.0.1",
-    "ethers": "^6.11.0",
+    "bignumber.js": "^9.1.2",
+    "ethers": "^6.13.4",
     "lodash": "4.17.21",
     "react-aria": "3.22.0",
     "react-stately": "3.18.0"

tests/package.json

@@ -25,7 +25,7 @@
     "chai-bigint": "^0.2.0",
     "cypress": "^13.9.0",
     "dotenv-flow": "^4.1.0",
-    "ethers": "^6.11.0",
+    "ethers": "^6.13.4",
     "hardhat": "^2.22.10",
     "tsconfig": "*",
     "wait-on": "^8.0.1"