Merge pull request #38 from celo-tools/enable-ceur

jmrossy · web-flow · commit aa79cfa3e3c8 · 2021-04-22T19:52:20.000-04:00
Enable cEUR and syncing fixes
diff --git a/package-electron.json b/package-electron.json
@@ -1,6 +1,6 @@
 {
   "name": "celo-web-wallet",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "A lightweight web and desktop wallet for the Celo network",
   "main": "main.js",
   "keywords": [
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "celo-web-wallet",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "A lightweight web and desktop wallet for the Celo network",
   "keywords": [
     "Celo",
diff --git a/src/blockchain/blocks.ts b/src/blockchain/blocks.ts
@@ -3,6 +3,7 @@ import { AVG_BLOCK_TIMES } from 'src/consts'
 import { logger } from 'src/utils/logger'
 
 export interface LatestBlockDetails {
+  nodeUrl: string
   number: number
   timestamp: number
 }
@@ -11,13 +12,15 @@ export async function getLatestBlockDetails(): Promise<LatestBlockDetails | null
   if (!isProviderSet()) return null
 
   const provider = getProvider()
+  const nodeUrl = provider.connection?.url
   const block = await provider.getBlock('latest')
   if (!block || !block.number) {
     logger.warn('Latest block is not valid')
     return null
   }
 
   return {
+    nodeUrl,
     number: block.number,
     timestamp: block.timestamp,
   }
diff --git a/src/blockchain/provider.ts b/src/blockchain/provider.ts
@@ -1,8 +1,11 @@
 import { CeloProvider } from '@celo-tools/celo-ethers-wrapper'
+import { providers } from 'ethers'
 import { config } from 'src/config'
+import { STALE_BLOCK_TIME } from 'src/consts'
 import { setIsConnected } from 'src/features/wallet/walletSlice'
 import { logger } from 'src/utils/logger'
 import { promiseTimeout, sleep } from 'src/utils/promises'
+import { isStale } from 'src/utils/time'
 import { call, put } from 'typed-redux-saga'
 
 let provider: CeloProvider | undefined
@@ -40,14 +43,11 @@ async function connectToJsonRpcProvider(url: string) {
     logger.info(`Connecting to json rpc provider: ${url}`)
     provider = new CeloProvider(url)
     for (let i = 0; i < 3; i++) {
-      const providerStateP = Promise.all([provider.getBlockNumber(), provider.getNetwork()])
-      const providerState = await promiseTimeout(providerStateP, 1000)
-      if (providerState) {
-        const [latestBlock, network] = providerState
-        if (latestBlock > 0 && network?.chainId === config.chainId) {
-          logger.info('Provider is connected')
-          return true
-        }
+      const blockAndNetworkP = Promise.all([provider.getBlock('latest'), provider.getNetwork()])
+      const blockAndNetwork = await promiseTimeout(blockAndNetworkP, 1000)
+      if (blockAndNetwork && isProviderSynced(blockAndNetwork[0], blockAndNetwork[1])) {
+        logger.info('Provider is connected')
+        return true
       }
       // Otherwise wait a bit and then try again
       await sleep(1000)
@@ -60,6 +60,17 @@ async function connectToJsonRpcProvider(url: string) {
   }
 }
 
+function isProviderSynced(block?: providers.Block, network?: providers.Network) {
+  return (
+    block &&
+    block.number &&
+    block.timestamp &&
+    !isStale(block.timestamp * 1000, STALE_BLOCK_TIME) &&
+    network &&
+    network.chainId === config.chainId
+  )
+}
+
 export function getProvider() {
   if (!provider) {
     logger.error('Provider is not yet initialized')
diff --git a/src/components/footer/ConnectionStatus.tsx b/src/components/footer/ConnectionStatus.tsx
@@ -5,16 +5,14 @@ import { Box } from 'src/components/layout/Box'
 import { ModalOkAction } from 'src/components/modal/modal'
 import { useModal } from 'src/components/modal/useModal'
 import { config } from 'src/config'
+import { CONNECTION_CHECK_INTERVAL, STALE_BLOCK_TIME } from 'src/consts'
 import { Color } from 'src/styles/Color'
 import { Font } from 'src/styles/fonts'
 import { mq } from 'src/styles/mediaQueries'
 import { Stylesheet } from 'src/styles/types'
 import { logger } from 'src/utils/logger'
 import { isStale, useInterval } from 'src/utils/time'
 
-const CONNECTION_CHECK_INTERVAL = 15000
-const STALE_BLOCK_TIME = 20000
-
 export function ConnectionStatusLink() {
   const [latestBlock, setLatestBlock] = useState<LatestBlockDetails | null | undefined>(undefined)
 
@@ -78,11 +76,12 @@ export const ConnectionStatus = () => {
   }
 
   const { chainId, jsonRpcUrlPrimary } = config
+  const nodeUrl = latestBlock?.nodeUrl || jsonRpcUrlPrimary
 
   return (
     <Box direction="column" align="center" styles={style.container}>
       <p css={{ color: `${summaryColor} !important` }}>{summary}</p>
-      <p>Node: {jsonRpcUrlPrimary}</p>
+      <p>Node: {nodeUrl}</p>
       <p>Last Block Number: {block}</p>
       <p>Chain ID: {chainId}</p>
     </Box>
diff --git a/src/components/header/BalanceSummary.tsx b/src/components/header/BalanceSummary.tsx
@@ -4,7 +4,6 @@ import { useNavigate } from 'react-router-dom'
 import { transparentButtonStyles } from 'src/components/buttons/Button'
 import { Box } from 'src/components/layout/Box'
 import { MoneyValue } from 'src/components/MoneyValue'
-import { config } from 'src/config'
 import { useTokens } from 'src/features/wallet/utils'
 import { Color } from 'src/styles/Color'
 import { Font } from 'src/styles/fonts'
@@ -17,14 +16,7 @@ export function BalanceSummary() {
   if (windowWidth && windowWidth > 550) numItems = 3
   if (windowWidth && windowWidth > 1024) numItems = 4
 
-  let tokens = useTokens()
-  // TODO-cEUR remove when activated
-  if (config.chainId === 42220) {
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    const { cEUR, ...rest } = tokens
-    // @ts-ignore
-    tokens = rest
-  }
+  const tokens = useTokens()
 
   const { tokensToShow, hiddenTokens } = useMemo(() => {
     const sortedTokens = Object.values(tokens).sort((t1, t2) => {
diff --git a/src/components/input/AmountAndCurrencyInput.tsx b/src/components/input/AmountAndCurrencyInput.tsx
@@ -3,11 +3,10 @@ import { TokenIcon } from 'src/components/icons/tokens/TokenIcon'
 import { NumberInput } from 'src/components/input/NumberInput'
 import { SelectInput, SelectOption } from 'src/components/input/SelectInput'
 import { Box } from 'src/components/layout/Box'
-import { config } from 'src/config'
 import { useTokens } from 'src/features/wallet/utils'
 import { Font } from 'src/styles/fonts'
 import { Stylesheet } from 'src/styles/types'
-import { cEUR, isNativeToken } from 'src/tokens'
+import { isNativeToken } from 'src/tokens'
 import { ErrorState } from 'src/utils/validation'
 
 interface Props {
@@ -43,8 +42,6 @@ export const AmountAndCurrencyInput = (props: Props) => {
     () =>
       Object.values(tokens)
         .filter((t) => (nativeTokensOnly ? isNativeToken(t.id) : true))
-        // TODO-cEUR remove when activated
-        .filter((t) => t.id !== cEUR.id || config.chainId === 44787)
         .map((t) => ({
           display: t.symbol,
           value: t.id,
diff --git a/src/consts.ts b/src/consts.ts
@@ -7,6 +7,8 @@ export const ETHEREUM_DERIVATION_PATH = "m/44'/60'/0'/0"
 export const CELO_DERIVATION_PATH = "m/44'/52752'/0'/0"
 export const DERIVATION_PATH_MAX_INDEX = 1000000
 export const AVG_BLOCK_TIMES = 5000 // 5 seconds
+export const CONNECTION_CHECK_INTERVAL = 15000 // 15 seconds
+export const STALE_BLOCK_TIME = 20000 // 20 seconds
 export const MAX_NUM_ELECTABLE_VALIDATORS = 100
 
 export const MAX_SEND_TOKEN_SIZE = '100000000000000000000' // 100 Tokens
diff --git a/src/features/ledger/tokenData.ts b/src/features/ledger/tokenData.ts
@@ -1,10 +1,10 @@
 import { logger } from 'ethers'
 import { config } from 'src/config'
-import { areAddressesEqual, ensureLeading0x } from 'src/utils/addresses'
+import { ensureLeading0x } from 'src/utils/addresses'
 
 // From https://github.com/celo-org/celo-monorepo/blob/master/packages%2Fsdk%2Fwallets%2Fwallet-ledger%2Fsrc%2Fdata.ts
 const ERC_20_TOKEN_DATA =
-  'AAAAaARjVVNEdl3oFoRYYedaJfyhIrtomLixKCoAAAASAACk7DBFAiEApwQFHNBKXp+V2jq8BMD2y/5AwC9bhPQ2H4hT/vMl/B4CIFalOVtBFGREUKMU/F5vDlJLeQrTn6GQeDertpB2FpMvAAAAZwRjR0xERx7ON1DaI3+TuOM5xTaYm4l4pDgAAAASAACk7DBEAiAtUE03OVEDTuAgMR8CeUiXVB7Uqa+4gQHaZtXsU0tjMQIgTsY5//96mGMOtyoQFgjDrh3kztxlUO90MJOLElo6baQ='
+  'AAAAaARDRUxPRx7ON1DaI3+TuOM5xTaYm4l4pDgAAAASAACk7DBFAiEA5rECRg94+fCoIvoG9/5qWh62zl2C6Y+aFuuZrFe4CtcCIEJbRrkL3gqwT/Jj+7L3neazgpVCCTZZ3HX9JXXg5vleAAAAaARjVVNEdl3oFoRYYedaJfyhIrtomLixKCoAAAASAACk7DBFAiEApwQFHNBKXp+V2jq8BMD2y/5AwC9bhPQ2H4hT/vMl/B4CIFalOVtBFGREUKMU/F5vDlJLeQrTn6GQeDertpB2FpMvAAAAaARjRVVS2HY8uidqNzjm3oW0s79f3tbWynMAAAASAACk7DBFAiEAh2UeP1+SI2Ed5SiAjpJF6MkMrVa94gUwjJztyBlzhWMCIHfaOrEsxdxAGx+P+hxuSNO4zcw6KRLfJkkuic1V/CrHAAAAagZiIENFTE/dyb5X9VP+dXUtYWBrlMvX4CZO+AAAABIAAPNwMEUCIQCi62KsBfuNcfX0MriiRZ7a5DKERhtIz7sZ1SqBT7ruhgIgVrfmavyWzxzDW4AQeHn++A4qPjB1pQKoHvNXo8Hf1SMAAABpBmIgY1VTRGJJKmRKWI/ZBCcL7QatUrmr/qGuAAAAEgAA83AwRAIgGDYx4oB/gkYUqLeXqvEZXx9nOxVHzTe2ajyd2wnehxgCICQBe/rBPcXiaQJj3pdoXxroct/hV6r3G2G7y79EOEAPAAAAaQZiIGNFVVL57OMBJHrSziGJSUGDCiRw9Od0ygAAABIAAPNwMEQCIEdcFWP+HxEUoF1sCGVd34QGS0hL5cVUdrWdqVm3bYTgAiBCMA+Rg3Ubc3xla/35wzZesPlbeSMEPcr4uqL+8PeydwAAAGoGYSBDRUxP8ZSv31CwPmm9fQV8GqnhDJlU5MkAAAASAACu8zBFAiEAk/o0FBus2/QCrunFGEyoneQIRaMRC+y5L6Dvar8MU/kCIByJt2ziRhDG3AAbyXBIuJfZQujSHFcSJL3xF0xIlcPdAAAAaQZhIGNVU0SHQGn6HrFtRNYi8uDKJe6hcjabwQAAABIAAK7zMEQCIClrH2xgE3WMbD+hgQ7t5SiAcVG5WiUZ655voqCszKEoAiA/cO8UVgNY891MNJ5yeDk8w47WO0E1DQecrK71LR8g8gAAAGoGYSBjRVVSEMiSpuxDpT5F0LkWtLfTg7G3jA8AAAASAACu8zBFAiEAgpktbB1ZxyAwMJwKTSbZ30n8zgRuW0twbXoZxlsUAswCIHek4l4CIbjVMG2HVr0Ml9/8kA4F9dr69JBMaoSUkdKl'
 
 export interface TokenInfo {
   contractAddress: string
@@ -19,11 +19,7 @@ export interface TokenInfo {
 let tokenDataCache: Record<string, TokenInfo> | null = null
 
 export function getTokenData(tokenAddress?: string) {
-  if (
-    !tokenAddress ||
-    (!areAddressesEqual(tokenAddress, config.contractAddresses.StableToken) &&
-      !areAddressesEqual(tokenAddress, config.contractAddresses.GoldToken))
-  ) {
+  if (!tokenAddress) {
     return null
   }
 
@@ -65,7 +61,7 @@ export function getTokenData(tokenAddress?: string) {
   const tokenData = tokenDataCache[tokenAddress.toLowerCase()]
   if (!tokenData) {
     // Note, there's no data for Alfajores atm, only Mainnet
-    logger.warn(`No token data found for ${tokenAddress}`)
+    logger.debug(`No token data found for ${tokenAddress}`)
     return null
   }
   return tokenData
diff --git a/src/features/wallet/BalanceDetailsScreen.tsx b/src/features/wallet/BalanceDetailsScreen.tsx
@@ -21,7 +21,7 @@ import { Color } from 'src/styles/Color'
 import { Font } from 'src/styles/fonts'
 import { useIsMobile } from 'src/styles/mediaQueries'
 import { Stylesheet } from 'src/styles/types'
-import { cEUR, isNativeToken, LockedCELO } from 'src/tokens'
+import { isNativeToken, LockedCELO } from 'src/tokens'
 import { fromWeiRounded } from 'src/utils/amount'
 import { SagaStatus } from 'src/utils/saga'
 
@@ -164,8 +164,6 @@ function balancesToTableData(balances: Balances): BalanceTableRow[] {
     : balances.tokens
 
   for (const token of Object.values(tokens)) {
-    // TODO-cEUR remove when activated
-    if (config.chainId === 42220 && token.id === cEUR.id) continue
     tableRows.push({
       id: token.id,
       label: token.symbol,
diff --git a/src/features/wallet/fetchBalances.ts b/src/features/wallet/fetchBalances.ts
@@ -14,7 +14,7 @@ import {
   updateBalances,
   walletInitialState,
 } from 'src/features/wallet/walletSlice'
-import { CELO, cEUR, isNativeToken, Token, TokenWithBalance } from 'src/tokens'
+import { CELO, isNativeToken, Token, TokenWithBalance } from 'src/tokens'
 import { logger } from 'src/utils/logger'
 import { createMonitoredSaga } from 'src/utils/saga'
 import { isStale } from 'src/utils/time'
@@ -68,8 +68,6 @@ async function fetchTokenBalances(
     if (t.id === CELO.id) {
       fetchPromises.push(fetchCeloBalance(address))
     } else {
-      // TODO-cEUR remove when activated
-      if (t.id === cEUR.id && config.chainId === 42220) continue
       fetchPromises.push(fetchTokenBalance(address, t))
     }
   }
diff --git a/src/features/wallet/walletSlice.ts b/src/features/wallet/walletSlice.ts
@@ -1,5 +1,5 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit'
-import { persistReducer } from 'redux-persist'
+import { createMigrate, persistReducer } from 'redux-persist'
 import autoMergeLevel2 from 'redux-persist/es/stateReconciler/autoMergeLevel2'
 import storage from 'redux-persist/lib/storage'
 import { SignerType } from 'src/blockchain/signer'
@@ -145,12 +145,38 @@ export const {
 } = walletSlice.actions
 const walletReducer = walletSlice.reducer
 
+const migrations = {
+  // Typings don't work well for migrations:
+  // https://github.com/rt2zz/redux-persist/issues/1065
+  0: (state: any) => {
+    // Migration to fix symbol to label rename
+    const tokens: any = {}
+    for (const t of Object.keys(state.balances.tokens)) {
+      const previous = state.balances.tokens[t]
+      tokens[t] = {
+        ...previous,
+        symbol: previous.symbol || previous.label || '??',
+      }
+    }
+    return {
+      ...state,
+      balances: {
+        ...state.balances,
+        tokens,
+      },
+    }
+  },
+}
+
 const walletPersistConfig = {
   key: 'wallet',
   storage: storage,
   stateReconciler: autoMergeLevel2,
   whitelist: ['address', 'balances', 'type', 'derivationPath', 'secretType', 'account'], //we don't want to persist everything in the wallet store
+  version: 0, // -1 is default
+  migrate: createMigrate(migrations),
 }
+
 export const persistedWalletReducer = persistReducer<ReturnType<typeof walletReducer>>(
   walletPersistConfig,
   walletReducer
diff --git a/src/utils/logger.ts b/src/utils/logger.ts
@@ -1,10 +1,8 @@
 /* eslint-disable no-console */
 
-import { config } from '../config'
-
 export const logger = {
-  debug: (...args: any[]) => config.debug && console.debug(...args),
-  info: (...args: any[]) => config.debug && console.info(...args),
+  debug: (...args: any[]) => console.debug(...args),
+  info: (...args: any[]) => console.info(...args),
   warn: (...args: any[]) => console.warn(...args),
   error: (...args: any[]) => console.error(...args),
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "celo-web-wallet",`
`3`		`- "version": "1.1.2",`
	`3`	`+ "version": "1.1.3",`
`4`	`4`	`"description": "A lightweight web and desktop wallet for the Celo network",`
`5`	`5`	`"main": "main.js",`
`6`	`6`	`"keywords": [`