Skip to content

Commit fd6591c

Browse files
chore: minor changes from audit tool (#3165)
* minor changes from audit tool * just deps * revert * revert++ --------- Co-authored-by: julienrbrt <julien@rbrt.fr>
1 parent 6f1d539 commit fd6591c

9 files changed

Lines changed: 108 additions & 12 deletions

File tree

apps/grpc/go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ require (
9696
github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b // indirect
9797
github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect
9898
github.com/minio/sha256-simd v1.0.1 // indirect
99-
github.com/mitchellh/mapstructure v1.5.0 // indirect
10099
github.com/mr-tron/base58 v1.2.0 // indirect
101100
github.com/multiformats/go-base32 v0.1.0 // indirect
102101
github.com/multiformats/go-base36 v0.2.0 // indirect

apps/grpc/go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -740,8 +740,6 @@ github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8Ie
740740
github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
741741
github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM=
742742
github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8=
743-
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
744-
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
745743
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
746744
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
747745
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=

apps/testapp/go.mod

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ require (
9393
github.com/mikioh/tcpinfo v0.0.0-20190314235526-30a79bb1804b // indirect
9494
github.com/mikioh/tcpopt v0.0.0-20190314235656-172688c1accc // indirect
9595
github.com/minio/sha256-simd v1.0.1 // indirect
96-
github.com/mitchellh/mapstructure v1.5.0 // indirect
9796
github.com/mr-tron/base58 v1.2.0 // indirect
9897
github.com/multiformats/go-base32 v0.1.0 // indirect
9998
github.com/multiformats/go-base36 v0.2.0 // indirect

apps/testapp/go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -740,8 +740,6 @@ github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3/go.mod h1:RagcQ7I8Ie
740740
github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
741741
github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM=
742742
github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8=
743-
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
744-
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
745743
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
746744
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
747745
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=

block/internal/syncing/assert.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package syncing
22

33
import (
4+
"bytes"
45
"errors"
56
"fmt"
67

@@ -9,7 +10,7 @@ import (
910
)
1011

1112
func assertExpectedProposer(genesis genesis.Genesis, proposerAddr []byte) error {
12-
if string(proposerAddr) != string(genesis.ProposerAddress) {
13+
if !bytes.Equal(proposerAddr, genesis.ProposerAddress) {
1314
return fmt.Errorf("unexpected proposer: got %x, expected %x",
1415
proposerAddr, genesis.ProposerAddress)
1516
}

go.mod

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ require (
1515
github.com/evstack/ev-node/core v1.0.0
1616
github.com/filecoin-project/go-jsonrpc v0.10.1
1717
github.com/go-kit/kit v0.13.0
18+
github.com/go-viper/mapstructure/v2 v2.4.0
1819
github.com/goccy/go-yaml v1.19.2
1920
github.com/hashicorp/golang-lru/v2 v2.0.7
2021
github.com/hashicorp/raft v1.7.3
@@ -24,7 +25,6 @@ require (
2425
github.com/libp2p/go-libp2p v0.47.0
2526
github.com/libp2p/go-libp2p-kad-dht v0.38.0
2627
github.com/libp2p/go-libp2p-pubsub v0.15.0
27-
github.com/mitchellh/mapstructure v1.5.0
2828
github.com/multiformats/go-multiaddr v0.16.1
2929
github.com/prometheus/client_golang v1.23.2
3030
github.com/rs/zerolog v1.34.0
@@ -64,7 +64,6 @@ require (
6464
github.com/fsnotify/fsnotify v1.9.0 // indirect
6565
github.com/go-logr/logr v1.4.3 // indirect
6666
github.com/go-logr/stdr v1.2.2 // indirect
67-
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
6867
github.com/gogo/protobuf v1.3.2 // indirect
6968
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
7069
github.com/google/flatbuffers v25.1.24+incompatible // indirect

go.sum

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,6 @@ github.com/minio/blake2b-simd v0.0.0-20160723061019-3f5f724cb5b1/go.mod h1:pD8Rv
306306
github.com/minio/sha256-simd v0.1.1-0.20190913151208-6de447530771/go.mod h1:B5e1o+1/KgNmWrSQK08Y6Z1Vb5pwIktudl0J58iy0KM=
307307
github.com/minio/sha256-simd v1.0.1 h1:6kaan5IFmwTNynnKKpDHe6FWHohJOHhCPchzK49dzMM=
308308
github.com/minio/sha256-simd v1.0.1/go.mod h1:Pz6AKMiUdngCLpeTL/RJY1M9rUuPMYujV5xJjtbRSN8=
309-
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
310-
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
311309
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
312310
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
313311
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=

pkg/config/config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import (
1111
"time"
1212

1313
"github.com/celestiaorg/go-square/v3/share"
14-
"github.com/mitchellh/mapstructure"
14+
"github.com/go-viper/mapstructure/v2"
1515
"github.com/spf13/cobra"
1616
"github.com/spf13/pflag"
1717
"github.com/spf13/viper"

types/serialization_fuzz_test.go

Lines changed: 104 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,104 @@
1+
package types
2+
3+
import (
4+
"testing"
5+
6+
"google.golang.org/protobuf/proto"
7+
8+
pb "github.com/evstack/ev-node/types/pb/evnode/v1"
9+
)
10+
11+
func FuzzHeaderUnmarshalBinary(f *testing.F) {
12+
// Seed with a valid marshalled header
13+
h := Header{}
14+
h.BaseHeader.Height = 1
15+
h.BaseHeader.ChainID = "test"
16+
h.BaseHeader.Time = 1000
17+
if data, err := h.MarshalBinary(); err == nil {
18+
f.Add(data)
19+
}
20+
f.Add([]byte{})
21+
f.Add([]byte{0xff, 0xff, 0xff})
22+
23+
f.Fuzz(func(t *testing.T, data []byte) {
24+
var h Header
25+
if err := h.UnmarshalBinary(data); err != nil {
26+
return
27+
}
28+
// Round-trip: if unmarshal succeeds, marshal should not panic
29+
_, _ = h.MarshalBinary()
30+
})
31+
}
32+
33+
func FuzzDataUnmarshalBinary(f *testing.F) {
34+
d := Data{Txs: Txs{[]byte("tx1"), []byte("tx2")}}
35+
if data, err := d.MarshalBinary(); err == nil {
36+
f.Add(data)
37+
}
38+
f.Add([]byte{})
39+
40+
f.Fuzz(func(t *testing.T, data []byte) {
41+
var d Data
42+
if err := d.UnmarshalBinary(data); err != nil {
43+
return
44+
}
45+
_, _ = d.MarshalBinary()
46+
})
47+
}
48+
49+
func FuzzSignedHeaderUnmarshalBinary(f *testing.F) {
50+
f.Add([]byte{})
51+
f.Add([]byte{0x0a, 0x00})
52+
53+
f.Fuzz(func(t *testing.T, data []byte) {
54+
var sh SignedHeader
55+
if err := sh.UnmarshalBinary(data); err != nil {
56+
return
57+
}
58+
_, _ = sh.MarshalBinary()
59+
})
60+
}
61+
62+
func FuzzSignedDataUnmarshalBinary(f *testing.F) {
63+
f.Add([]byte{})
64+
f.Add([]byte{0x0a, 0x00})
65+
66+
f.Fuzz(func(t *testing.T, data []byte) {
67+
var sd SignedData
68+
if err := sd.UnmarshalBinary(data); err != nil {
69+
return
70+
}
71+
_, _ = sd.MarshalBinary()
72+
})
73+
}
74+
75+
func FuzzDAEnvelopeUnmarshalBinary(f *testing.F) {
76+
f.Add([]byte{})
77+
78+
f.Fuzz(func(t *testing.T, data []byte) {
79+
var sh SignedHeader
80+
if _, err := sh.UnmarshalDAEnvelope(data); err != nil {
81+
return
82+
}
83+
_, _ = sh.MarshalDAEnvelope(nil)
84+
})
85+
}
86+
87+
func FuzzStateFromProto(f *testing.F) {
88+
s := State{ChainID: "test", LastBlockHeight: 1}
89+
if p, err := s.ToProto(); err == nil {
90+
if data, err := proto.Marshal(p); err == nil {
91+
f.Add(data)
92+
}
93+
}
94+
f.Add([]byte{})
95+
96+
f.Fuzz(func(t *testing.T, data []byte) {
97+
var ps pb.State
98+
if err := proto.Unmarshal(data, &ps); err != nil {
99+
return
100+
}
101+
var s State
102+
_ = s.FromProto(&ps)
103+
})
104+
}

0 commit comments

Comments
 (0)