feat: improve block number and spec version checks in network state management

xlc · xlc · commit 5d6d156afad1 · 2025-10-07T16:26:15.000+13:00
diff --git a/src/hooks/useNetworkState.ts b/src/hooks/useNetworkState.ts
@@ -180,7 +180,9 @@ export const useNetworkState = () => {
           if (!current) {
             return previous
           }
-          if (current.blockNumber !== blockNumber || current.specVersion !== specVersion) {
+          const currentBlockNumber = current.blockNumber
+          const currentSpecVersion = current.specVersion
+          if (currentSpecVersion !== specVersion || currentBlockNumber == null || currentBlockNumber < blockNumber) {
             return previous
           }
           const nextAttempts = Math.max(0, Math.trunc(attempts))
@@ -314,7 +316,8 @@ export const useNetworkState = () => {
                     if (!current) {
                       return previous
                     }
-                    if (current.blockNumber !== blockNumber || current.specVersion !== specVersion) {
+                    const currentBlockNumber = current.blockNumber
+                    if (current.specVersion !== specVersion || (currentBlockNumber != null && currentBlockNumber < blockNumber)) {
                       return previous
                     }
                     const currentUpgrade = current.upgradedAt
@@ -348,7 +351,8 @@ export const useNetworkState = () => {
                     if (!current) {
                       return previous
                     }
-                    if (current.blockNumber !== blockNumber || current.specVersion !== specVersion) {
+                    const currentBlockNumber = current.blockNumber
+                    if (current.specVersion !== specVersion || (currentBlockNumber != null && currentBlockNumber < blockNumber)) {
                       return previous
                     }
                     if (current.upgradeError === formattedMessage) {

Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,9 @@ export const useNetworkState = () => {`
`180`	`180`	`if (!current) {`
`181`	`181`	`return previous`
`182`	`182`	`}`
`183`		`- if (current.blockNumber !== blockNumber \|\| current.specVersion !== specVersion) {`
	`183`	`+ const currentBlockNumber = current.blockNumber`
	`184`	`+ const currentSpecVersion = current.specVersion`
	`185`	`+ if (currentSpecVersion !== specVersion \|\| currentBlockNumber == null \|\| currentBlockNumber < blockNumber) {`
`184`	`186`	`return previous`
`185`	`187`	`}`
`186`	`188`	`const nextAttempts = Math.max(0, Math.trunc(attempts))`
`@@ -314,7 +316,8 @@ export const useNetworkState = () => {`
`314`	`316`	`if (!current) {`
`315`	`317`	`return previous`
`316`	`318`	`}`
`317`		`- if (current.blockNumber !== blockNumber \|\| current.specVersion !== specVersion) {`
	`319`	`+ const currentBlockNumber = current.blockNumber`
	`320`	`+ if (current.specVersion !== specVersion \|\| (currentBlockNumber != null && currentBlockNumber < blockNumber)) {`
`318`	`321`	`return previous`
`319`	`322`	`}`
`320`	`323`	`const currentUpgrade = current.upgradedAt`
`@@ -348,7 +351,8 @@ export const useNetworkState = () => {`
`348`	`351`	`if (!current) {`
`349`	`352`	`return previous`
`350`	`353`	`}`
`351`		`- if (current.blockNumber !== blockNumber \|\| current.specVersion !== specVersion) {`
	`354`	`+ const currentBlockNumber = current.blockNumber`
	`355`	`+ if (current.specVersion !== specVersion \|\| (currentBlockNumber != null && currentBlockNumber < blockNumber)) {`
`352`	`356`	`return previous`
`353`	`357`	`}`
`354`	`358`	`if (current.upgradeError === formattedMessage) {`