Merge pull request #1775 from nervosnetwork/develop

Merge develop into testnet
nervosnetwork · Sep 4, 2024 · 55b02bd · 55b02bd
2 parents 3341c5a + 08a0aa9
commit 55b02bd
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/src/pages/BlockDetail/index.tsx b/src/pages/BlockDetail/index.tsx
@@ -62,7 +62,7 @@ export default () => {
     ['node', 'block', 'info', blockHeightOrHash],
     () =>
       isBlockNumber(blockHeightOrHash)
-        ? nodeService.rpc.getBlockByNumber(`0x${parseInt(blockHeightOrHash, 10).toString(16)}`)
+        ? nodeService.rpc.getBlockByNumber(`0x${Number(blockHeightOrHash).toString(16)}`)
         : nodeService.rpc.getBlock(blockHeightOrHash),
     {
       enabled: nodeModeActivated,

diff --git a/src/services/ExplorerService/index.ts b/src/services/ExplorerService/index.ts
@@ -1,4 +1,4 @@
-import { BehaviorSubject, Subscription, map, switchMap, timer } from 'rxjs'
+import { BehaviorSubject, Subscription, map, switchMap, timer, catchError, of } from 'rxjs'
 import {
   BLOCKCHAIN_ALERT_POLLING_TIME,
   BLOCK_POLLING_TIME,
@@ -53,14 +53,20 @@ class ExplorerService {
     this.callbacksAtStop = new Subscription()
 
     this.callbacksAtStop.add(
-      timer(0, BLOCK_POLLING_TIME).pipe(switchMap(this.api.fetchStatistics)).subscribe(this.latestStatistics$),
+      timer(0, BLOCK_POLLING_TIME)
+        .pipe(
+          switchMap(this.api.fetchStatistics),
+          catchError(() => of(initStatistics)),
+        )
+        .subscribe(this.latestStatistics$),
     )
 
     this.callbacksAtStop.add(
       timer(0, BLOCK_POLLING_TIME)
         .pipe(
           switchMap(this.api.fetchTipBlockNumber),
           map(tipBlockNumber => Number(tipBlockNumber)),
+          catchError(() => of(0)),
         )
         .subscribe(this.latestBlockNumber$),
     )

diff --git a/src/utils/address.ts b/src/utils/address.ts
@@ -11,6 +11,14 @@ export const encodeNewAddress = (script: Script) => {
 }
 
 export const encodeDeprecatedAddress = (script: Script) => {
+  if (script.hashType === 'data1') {
+    return encodeNewAddress(script)
+  }
+
+  if (script.hashType === 'data2') {
+    return encodeNewAddress(script)
+  }
+
   return generateAddress(script, { config: lumosConfig })
 }
 

diff --git a/src/utils/number.ts b/src/utils/number.ts
@@ -5,8 +5,16 @@ export function isNumeric(str: string) {
   return !Number.isNaN(str) && !Number.isNaN(parseFloat(str))
 }
 
+const BLOCK_HASH_LENGTH = 64
+
 export function isBlockNumber(str: string) {
-  return !Number.isNaN(str) && !Number.isNaN(parseFloat(str)) && parseFloat(str) !== 0
+  if (str.length >= BLOCK_HASH_LENGTH) return false
+
+  if (!Number.isNaN(str) && !Number.isNaN(parseFloat(str)) && parseFloat(str) !== 0) {
+    return true
+  }
+
+  return !Number.isNaN(str) && !Number.isNaN(parseInt(str, 16)) && parseInt(str, 16) !== 0
 }
 
 export const localeNumberString = (value: BigNumber | string | number): string => {