Merge branch 'main' into alex/3141_getTimestamp

alpe · alpe · commit b14a9f8be1f8 · 2026-03-17T08:20:58.000+01:00
* main: chore: minor changes from audit tool (#3165) build(deps): Bump actions/download-artifact from 8.0.0 to 8.0.1 in the patch-updates group (#3169) fix: Strict raft state (#3167)
diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml
@@ -112,7 +112,7 @@ jobs:
     steps:
       - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Download EVM benchmark results
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
         with:
           name: evm-benchmark-results
 
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -129,12 +129,12 @@ jobs:
     steps:
       - uses: actions/checkout@v6.0.2
       - name: Download unit test coverage report
-        uses: actions/download-artifact@v8.0.0
+        uses: actions/download-artifact@v8.0.1
         with:
           name: unit-test-coverage-report-${{ github.sha }}
           path: ./unit-coverage
       - name: Download integration test coverage report
-        uses: actions/download-artifact@v8.0.0
+        uses: actions/download-artifact@v8.0.1
         with:
           name: integration-test-coverage-report-${{ github.sha }}
           path: ./integration-coverage
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Fix race on startup sync. [#3162](https://github.com/evstack/ev-node/pull/3162)
+- Strict raft state. [#3167](https://github.com/evstack/ev-node/pull/3167)
 - Retry fetching the timestamp on error in da-client [#3166](https://github.com/evstack/ev-node/pull/3166)
 
 ## v1.0.0
diff --git a/apps/grpc/go.mod b/apps/grpc/go.mod
@@ -96,7 +96,6 @@ require (
 	github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b // indirect
 	github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect
 	github.com/minio/sha256-simd v1.0.1 // indirect
-	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mr-tron/base58 v1.2.0 // indirect
 	github.com/multiformats/go-base32 v0.1.0 // indirect
 	github.com/multiformats/go-base36 v0.2.0 // indirect
diff --git a/apps/grpc/go.sum b/apps/grpc/go.sum
@@ -740,8 +740,6 @@ github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8Ie
 github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
 github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM=
 github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8=
-github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
-github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
diff --git a/apps/testapp/go.mod b/apps/testapp/go.mod
@@ -93,7 +93,6 @@ require (
 	github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b // indirect
 	github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect
 	github.com/minio/sha256-simd v1.0.1 // indirect
-	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mr-tron/base58 v1.2.0 // indirect
 	github.com/multiformats/go-base32 v0.1.0 // indirect
 	github.com/multiformats/go-base36 v0.2.0 // indirect
diff --git a/apps/testapp/go.sum b/apps/testapp/go.sum
@@ -740,8 +740,6 @@ github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8Ie
 github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
 github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM=
 github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8=
-github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
-github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
diff --git a/block/internal/syncing/assert.go b/block/internal/syncing/assert.go
@@ -1,6 +1,7 @@
 package syncing
 
 import (
+	"bytes"
 	"errors"
 	"fmt"
 
@@ -9,7 +10,7 @@ import (
 )
 
 func assertExpectedProposer(genesis genesis.Genesis, proposerAddr []byte) error {
-	if string(proposerAddr) != string(genesis.ProposerAddress) {
+	if !bytes.Equal(proposerAddr, genesis.ProposerAddress) {
 		return fmt.Errorf("unexpected proposer: got %x, expected %x",
 			proposerAddr, genesis.ProposerAddress)
 	}
diff --git a/go.mod b/go.mod
@@ -15,6 +15,7 @@ require (
 	github.com/evstack/ev-node/core v1.0.0
 	github.com/filecoin-project/go-jsonrpc v0.10.1
 	github.com/go-kit/kit v0.13.0
+	github.com/go-viper/mapstructure/v2 v2.4.0
 	github.com/goccy/go-yaml v1.19.2
 	github.com/hashicorp/golang-lru/v2 v2.0.7
 	github.com/hashicorp/raft v1.7.3
@@ -24,7 +25,6 @@ require (
 	github.com/libp2p/go-libp2p v0.47.0
 	github.com/libp2p/go-libp2p-kad-dht v0.38.0
 	github.com/libp2p/go-libp2p-pubsub v0.15.0
-	github.com/mitchellh/mapstructure v1.5.0
 	github.com/multiformats/go-multiaddr v0.16.1
 	github.com/prometheus/client_golang v1.23.2
 	github.com/rs/zerolog v1.34.0
@@ -64,7 +64,6 @@ require (
 	github.com/fsnotify/fsnotify v1.9.0 // indirect
 	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
 	github.com/google/flatbuffers v25.1.24+incompatible // indirect
diff --git a/go.sum b/go.sum
@@ -306,8 +306,6 @@ github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod h1:pD8Rv
 github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
 github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM=
 github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8=
-github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
-github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -11,7 +11,7 @@ import (
 	"time"
 
 	"github.com/celestiaorg/go-square/v3/share"
-	"github.com/mitchellh/mapstructure"
+	"github.com/go-viper/mapstructure/v2"
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
 	"github.com/spf13/viper"
diff --git a/pkg/raft/types.go b/pkg/raft/types.go
@@ -11,10 +11,10 @@ type RaftBlockState = pb.RaftBlockState
 
 // assertValid checks basic constraints but does not ensure that no gaps exist or chain continuity
 func assertValid(s *RaftBlockState, next *RaftBlockState) error {
-	if s.Height > next.Height {
+	if s.Height >= next.Height {
 		return fmt.Errorf("invalid height: %d > %d", s.Height, next.Height)
 	}
-	if s.Timestamp > next.Timestamp {
+	if s.Timestamp >= next.Timestamp {
 		return fmt.Errorf("invalid timestamp: %d > %d", s.Timestamp, next.Timestamp)
 	}
 	return nil
diff --git a/pkg/raft/types_test.go b/pkg/raft/types_test.go
@@ -0,0 +1,56 @@
+package raft
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestAssertValid(t *testing.T) {
+	specs := map[string]struct {
+		s      *RaftBlockState
+		next   *RaftBlockState
+		expErr bool
+	}{
+		"ok": {
+			s:    &RaftBlockState{Height: 10, Timestamp: 100},
+			next: &RaftBlockState{Height: 11, Timestamp: 101},
+		},
+		"all equal": {
+			s:      &RaftBlockState{Height: 10, Timestamp: 100},
+			next:   &RaftBlockState{Height: 10, Timestamp: 100},
+			expErr: true,
+		},
+		"equal height": {
+			s:      &RaftBlockState{Height: 10, Timestamp: 100},
+			next:   &RaftBlockState{Height: 10, Timestamp: 101},
+			expErr: true,
+		},
+		"equal timestamp": {
+			s:      &RaftBlockState{Height: 10, Timestamp: 100},
+			next:   &RaftBlockState{Height: 11, Timestamp: 100},
+			expErr: true,
+		},
+		"lower timestamp": {
+			s:      &RaftBlockState{Height: 10, Timestamp: 101},
+			next:   &RaftBlockState{Height: 11, Timestamp: 100},
+			expErr: true,
+		},
+		"lower height": {
+			s:      &RaftBlockState{Height: 11, Timestamp: 100},
+			next:   &RaftBlockState{Height: 10, Timestamp: 101},
+			expErr: true,
+		},
+	}
+
+	for name, spec := range specs {
+		t.Run(name, func(t *testing.T) {
+			err := assertValid(spec.s, spec.next)
+			if spec.expErr {
+				require.Error(t, err)
+				return
+			}
+			require.NoError(t, err)
+		})
+	}
+}
diff --git a/types/serialization_fuzz_test.go b/types/serialization_fuzz_test.go
@@ -0,0 +1,104 @@
+package types
+
+import (
+	"testing"
+
+	"google.golang.org/protobuf/proto"
+
+	pb "github.com/evstack/ev-node/types/pb/evnode/v1"
+)
+
+func FuzzHeaderUnmarshalBinary(f *testing.F) {
+	// Seed with a valid marshalled header
+	h := Header{}
+	h.BaseHeader.Height = 1
+	h.BaseHeader.ChainID = "test"
+	h.BaseHeader.Time = 1000
+	if data, err := h.MarshalBinary(); err == nil {
+		f.Add(data)
+	}
+	f.Add([]byte{})
+	f.Add([]byte{0xff, 0xff, 0xff})
+
+	f.Fuzz(func(t *testing.T, data []byte) {
+		var h Header
+		if err := h.UnmarshalBinary(data); err != nil {
+			return
+		}
+		// Round-trip: if unmarshal succeeds, marshal should not panic
+		_, _ = h.MarshalBinary()
+	})
+}
+
+func FuzzDataUnmarshalBinary(f *testing.F) {
+	d := Data{Txs: Txs{[]byte("tx1"), []byte("tx2")}}
+	if data, err := d.MarshalBinary(); err == nil {
+		f.Add(data)
+	}
+	f.Add([]byte{})
+
+	f.Fuzz(func(t *testing.T, data []byte) {
+		var d Data
+		if err := d.UnmarshalBinary(data); err != nil {
+			return
+		}
+		_, _ = d.MarshalBinary()
+	})
+}
+
+func FuzzSignedHeaderUnmarshalBinary(f *testing.F) {
+	f.Add([]byte{})
+	f.Add([]byte{0x0a, 0x00})
+
+	f.Fuzz(func(t *testing.T, data []byte) {
+		var sh SignedHeader
+		if err := sh.UnmarshalBinary(data); err != nil {
+			return
+		}
+		_, _ = sh.MarshalBinary()
+	})
+}
+
+func FuzzSignedDataUnmarshalBinary(f *testing.F) {
+	f.Add([]byte{})
+	f.Add([]byte{0x0a, 0x00})
+
+	f.Fuzz(func(t *testing.T, data []byte) {
+		var sd SignedData
+		if err := sd.UnmarshalBinary(data); err != nil {
+			return
+		}
+		_, _ = sd.MarshalBinary()
+	})
+}
+
+func FuzzDAEnvelopeUnmarshalBinary(f *testing.F) {
+	f.Add([]byte{})
+
+	f.Fuzz(func(t *testing.T, data []byte) {
+		var sh SignedHeader
+		if _, err := sh.UnmarshalDAEnvelope(data); err != nil {
+			return
+		}
+		_, _ = sh.MarshalDAEnvelope(nil)
+	})
+}
+
+func FuzzStateFromProto(f *testing.F) {
+	s := State{ChainID: "test", LastBlockHeight: 1}
+	if p, err := s.ToProto(); err == nil {
+		if data, err := proto.Marshal(p); err == nil {
+			f.Add(data)
+		}
+	}
+	f.Add([]byte{})
+
+	f.Fuzz(func(t *testing.T, data []byte) {
+		var ps pb.State
+		if err := proto.Unmarshal(data, &ps); err != nil {
+			return
+		}
+		var s State
+		_ = s.FromProto(&ps)
+	})
+}

-Original file line number
+Diff line change
 	github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b // indirect
 	github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect
 	github.com/minio/sha256-simd v1.0.1 // indirect
 -	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mr-tron/base58 v1.2.0 // indirect
 	github.com/multiformats/go-base32 v0.1.0 // indirect
 	github.com/multiformats/go-base36 v0.2.0 // indirect
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`package syncing`
`2`	`2`
`3`	`3`	`import (`
	`4`	`+ "bytes"`
`4`	`5`	`"errors"`
`5`	`6`	`"fmt"`
`6`	`7`
`@@ -9,7 +10,7 @@ import (`
`9`	`10`	`)`
`10`	`11`
`11`	`12`	`func assertExpectedProposer(genesis genesis.Genesis, proposerAddr []byte) error {`
`12`		`- if string(proposerAddr) != string(genesis.ProposerAddress) {`
	`13`	`+ if !bytes.Equal(proposerAddr, genesis.ProposerAddress) {`
`13`	`14`	`return fmt.Errorf("unexpected proposer: got %x, expected %x",`
`14`	`15`	`proposerAddr, genesis.ProposerAddress)`
`15`	`16`	`}`
-Original file line number
+Diff line change
 	github.com/evstack/ev-node/core v1.0.0
 	github.com/filecoin-project/go-jsonrpc v0.10.1
 	github.com/go-kit/kit v0.13.0
 +	github.com/go-viper/mapstructure/v2 v2.4.0
 	github.com/goccy/go-yaml v1.19.2
 	github.com/hashicorp/golang-lru/v2 v2.0.7
 	github.com/hashicorp/raft v1.7.3
 	github.com/libp2p/go-libp2p v0.47.0
 	github.com/libp2p/go-libp2p-kad-dht v0.38.0
 	github.com/libp2p/go-libp2p-pubsub v0.15.0
 -	github.com/mitchellh/mapstructure v1.5.0
 	github.com/multiformats/go-multiaddr v0.16.1
 	github.com/prometheus/client_golang v1.23.2
 	github.com/rs/zerolog v1.34.0
 	github.com/fsnotify/fsnotify v1.9.0 // indirect
 	github.com/go-logr/logr v1.4.3 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 -	github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
 	github.com/google/flatbuffers v25.1.24+incompatible // indirect