Skip to content

Commit b14a9f8

Browse files
alpealpe
committed
Merge branch 'main' into alex/3141_getTimestamp
* 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)
2 parents 1a393f0 + fd6591c commit b14a9f8

14 files changed

Lines changed: 170 additions & 17 deletions

File tree

‎.github/workflows/benchmark.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ jobs:
112112
steps:
113113
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
114114
- name: Download EVM benchmark results
115-
uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
115+
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
116116
with:
117117
name: evm-benchmark-results
118118

‎.github/workflows/test.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -129,12 +129,12 @@ jobs:
129129
steps:
130130
- uses: actions/checkout@v6.0.2
131131
- name: Download unit test coverage report
132-
uses: actions/download-artifact@v8.0.0
132+
uses: actions/download-artifact@v8.0.1
133133
with:
134134
name: unit-test-coverage-report-${{ github.sha }}
135135
path: ./unit-coverage
136136
- name: Download integration test coverage report
137-
uses: actions/download-artifact@v8.0.0
137+
uses: actions/download-artifact@v8.0.1
138138
with:
139139
name: integration-test-coverage-report-${{ github.sha }}
140140
path: ./integration-coverage

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1212
### Fixed
1313

1414
- Fix race on startup sync. [#3162](https://github.com/evstack/ev-node/pull/3162)
15+
- Strict raft state. [#3167](https://github.com/evstack/ev-node/pull/3167)
1516
- Retry fetching the timestamp on error in da-client [#3166](https://github.com/evstack/ev-node/pull/3166)
1617

1718
## v1.0.0

‎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=

0 commit comments

Comments
 (0)