From f2fbe2716cb881de487ebe7a8d477c695e953e09 Mon Sep 17 00:00:00 2001 From: maskpp Date: Wed, 7 Feb 2024 13:41:01 +0800 Subject: [PATCH 1/2] update taiko-geth dependency --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 72f28eb61..79a7d1e4d 100644 --- a/go.mod +++ b/go.mod @@ -117,4 +117,4 @@ require ( rsc.io/tmplfunc v0.0.3 // indirect ) -replace github.com/ethereum/go-ethereum v1.13.11 => github.com/taikoxyz/taiko-geth v0.0.0-20240207044711-7f625e6a8228 +replace github.com/ethereum/go-ethereum v1.13.11 => github.com/taikoxyz/taiko-geth v0.0.0-20240207045737-1f775750a248 diff --git a/go.sum b/go.sum index d66c3adce..6bc9b2859 100644 --- a/go.sum +++ b/go.sum @@ -407,8 +407,8 @@ github.com/swaggo/swag v1.16.2 h1:28Pp+8DkQoV+HLzLx8RGJZXNGKbFqnuvSbAAtoxiY04= github.com/swaggo/swag v1.16.2/go.mod h1:6YzXnDcpr0767iOejs318CwYkCQqyGer6BizOg03f+E= github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d h1:vfofYNRScrDdvS342BElfbETmL1Aiz3i2t0zfRj16Hs= github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d/go.mod h1:RRCYJbIwD5jmqPI9XoAFR0OcDxqUctll6zUj/+B4S48= -github.com/taikoxyz/taiko-geth v0.0.0-20240207044711-7f625e6a8228 h1:gLp/Gr3/VLpoGTwq+irtf685KSpb9aNj3+fzRKEf5M0= -github.com/taikoxyz/taiko-geth v0.0.0-20240207044711-7f625e6a8228/go.mod h1:gFtlVORuUcT+UUIcJ/veCNjkuOSujCi338uSHJrYAew= +github.com/taikoxyz/taiko-geth v0.0.0-20240207045737-1f775750a248 h1:biOi7poktBhAsrkxrvO3Sczs8L6OyvBFtt7lUxdwe7A= +github.com/taikoxyz/taiko-geth v0.0.0-20240207045737-1f775750a248/go.mod h1:gFtlVORuUcT+UUIcJ/veCNjkuOSujCi338uSHJrYAew= github.com/thomaso-mirodin/intmath v0.0.0-20160323211736-5dc6d854e46e h1:cR8/SYRgyQCt5cNCMniB/ZScMkhI9nk8U5C7SbISXjo= github.com/thomaso-mirodin/intmath v0.0.0-20160323211736-5dc6d854e46e/go.mod h1:Tu4lItkATkonrYuvtVjG0/rhy15qrNGNTjPdaphtZ/8= github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= From ce93a28061ababb41127b5b2339a1bd687902f42 Mon Sep 17 00:00:00 2001 From: maskpp Date: Wed, 7 Feb 2024 15:23:53 +0800 Subject: [PATCH 2/2] update isSyncing check --- pkg/rpc/methods.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/rpc/methods.go b/pkg/rpc/methods.go index c5c36906a..bff837beb 100644 --- a/pkg/rpc/methods.go +++ b/pkg/rpc/methods.go @@ -288,7 +288,8 @@ type L2SyncProgress struct { // isSyncing returns true if the L2 execution engine is syncing with L1. func (p *L2SyncProgress) isSyncing() bool { - return p.SyncProgress != nil || + sync := p.SyncProgress + return (sync != nil && (sync.StartingBlock < sync.HighestBlock)) || p.CurrentBlockID == nil || p.HighestBlockID == nil || p.CurrentBlockID.Cmp(p.HighestBlockID) < 0