Skip to content

Commit 9ff9b98

Browse files
authored
Upgrade bbolt via raft (ethereum-optimism#11507)
1 parent d1e1c25 commit 9ff9b98

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

go.mod

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ require (
2121
github.com/hashicorp/go-multierror v1.1.1
2222
github.com/hashicorp/golang-lru/v2 v2.0.7
2323
github.com/hashicorp/raft v1.7.0
24-
github.com/hashicorp/raft-boltdb v0.0.0-20231211162105-6c830fa4535e
24+
github.com/hashicorp/raft-boltdb/v2 v2.3.0
2525
github.com/holiman/uint256 v1.3.1
2626
github.com/ipfs/go-datastore v0.6.0
2727
github.com/ipfs/go-ds-leveldb v0.5.0
@@ -113,10 +113,10 @@ require (
113113
github.com/hashicorp/go-bexpr v0.1.11 // indirect
114114
github.com/hashicorp/go-hclog v1.6.2 // indirect
115115
github.com/hashicorp/go-immutable-radix v1.0.0 // indirect
116-
github.com/hashicorp/go-msgpack v0.5.5 // indirect
117116
github.com/hashicorp/go-msgpack/v2 v2.1.1 // indirect
118117
github.com/hashicorp/golang-lru v0.5.0 // indirect
119118
github.com/hashicorp/golang-lru/arc/v2 v2.0.7 // indirect
119+
github.com/hashicorp/raft-boltdb v0.0.0-20231211162105-6c830fa4535e // indirect
120120
github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4 // indirect
121121
github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
122122
github.com/huin/goupnp v1.3.0 // indirect
@@ -214,6 +214,7 @@ require (
214214
github.com/tyler-smith/go-bip39 v1.1.0 // indirect
215215
github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
216216
github.com/yusufpapurcu/wmi v1.2.3 // indirect
217+
go.etcd.io/bbolt v1.3.5 // indirect
217218
go.uber.org/automaxprocs v1.5.2 // indirect
218219
go.uber.org/dig v1.17.1 // indirect
219220
go.uber.org/fx v1.21.1 // indirect

go.sum

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,8 @@ github.com/hashicorp/raft v1.7.0 h1:4u24Qn6lQ6uwziM++UgsyiT64Q8GyRn43CV41qPiz1o=
339339
github.com/hashicorp/raft v1.7.0/go.mod h1:N1sKh6Vn47mrWvEArQgILTyng8GoDRNYlgKyK7PMjs0=
340340
github.com/hashicorp/raft-boltdb v0.0.0-20231211162105-6c830fa4535e h1:SK4y8oR4ZMHPvwVHryKI88kJPJda4UyWYvG5A6iEQxc=
341341
github.com/hashicorp/raft-boltdb v0.0.0-20231211162105-6c830fa4535e/go.mod h1:EMz/UIuG93P0MBeHh6CbXQAEe8ckVJLZjhD17lBzK5Q=
342+
github.com/hashicorp/raft-boltdb/v2 v2.3.0 h1:fPpQR1iGEVYjZ2OELvUHX600VAK5qmdnDEv3eXOwZUA=
343+
github.com/hashicorp/raft-boltdb/v2 v2.3.0/go.mod h1:YHukhB04ChJsLHLJEUD6vjFyLX2L3dsX3wPBZcX4tmc=
342344
github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4 h1:X4egAf/gcS1zATw6wn4Ej8vjuVGxeHdan+bRb2ebyv4=
343345
github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4/go.mod h1:5GuXa7vkL8u9FkFuWdVvfR5ix8hRB7DbOAaYULamFpc=
344346
github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao=
@@ -780,6 +782,8 @@ github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1
780782
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
781783
github.com/yusufpapurcu/wmi v1.2.3 h1:E1ctvB7uKFMOJw3fdOW32DwGE9I7t++CRUEMKvFoFiw=
782784
github.com/yusufpapurcu/wmi v1.2.3/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
785+
go.etcd.io/bbolt v1.3.5 h1:XAzx9gjCb0Rxj7EoqcClPD1d5ZBxZJk0jbuoPHenBt0=
786+
go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ=
783787
go.opencensus.io v0.18.0/go.mod h1:vKdFvxhtzZ9onBp9VKHK8z/sRpBMnKAsufL7wlDrCOA=
784788
go.uber.org/atomic v1.6.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ=
785789
go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
@@ -918,6 +922,7 @@ golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7w
918922
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
919923
golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
920924
golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
925+
golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
921926
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
922927
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
923928
golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=

op-conductor/consensus/raft.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import (
1010

1111
"github.com/ethereum/go-ethereum/log"
1212
"github.com/hashicorp/raft"
13-
boltdb "github.com/hashicorp/raft-boltdb"
13+
boltdb "github.com/hashicorp/raft-boltdb/v2"
1414
"github.com/pkg/errors"
1515

1616
"github.com/ethereum-optimism/optimism/op-node/rollup"

0 commit comments

Comments
 (0)