Merge branch 'main' into eip4844

taikoxyz · Feb 7, 2024 · 6e19a32 · 6e19a32
2 parents 7b0da7e + 738194d
commit 6e19a32
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/go.mod b/go.mod
@@ -221,4 +221,4 @@ require (
 	sigs.k8s.io/yaml v1.3.0 // 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
@@ -995,11 +995,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/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA=
-github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161/go.mod h1:wM7WEvslTq+iOEAMDLSzhVuOt5BRZ05WirO+b09GHQU=
-github.com/templexxx/xor v0.0.0-20191217153810-f85b25db303b/go.mod h1:5XA7W9S6mni3h5uvOC75dA3m9CCCaS83lltmc0ukdi4=
+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/tjfoc/gmsm v1.3.0/go.mod h1:HaUcFuY0auTiaHB9MHFGCPx5IaLhTUd2atbCFBQXn9w=

diff --git a/internal/testutils/helper.go b/internal/testutils/helper.go
@@ -140,9 +140,8 @@ func ProposeAndInsertValidBlock(
 	s.Nil(err)
 	s.Greater(newL1Head.Number.Uint64(), l1Head.Number.Uint64())
 
-	syncProgress, err := s.RPCClient.L2.SyncProgress(context.Background())
+	_, err = s.RPCClient.L2.SyncProgress(context.Background())
 	s.Nil(err)
-	s.Nil(syncProgress)
 
 	ctx, cancel := context.WithTimeout(context.Background(), time.Minute)
 	defer cancel()

diff --git a/pkg/rpc/dial_test.go b/pkg/rpc/dial_test.go
@@ -32,7 +32,7 @@ func TestDialEngineClientWithBackoff(t *testing.T) {
 	var result engine.ExecutableData
 	err = client.CallContext(context.Background(), &result, "engine_getPayloadV1", engine.PayloadID{})
 
-	require.Equal(t, engine.UnknownPayload.Error(), err.Error())
+	require.Equal(t, engine.UnsupportedFork.Error(), err.Error())
 }
 
 func TestDialClientWithBackoff(t *testing.T) {