Skip to content

Commit 3cc9d0e

Browse files
chore(deps): bump pebble db to official release (#966)
1 parent 959f09d commit 3cc9d0e

File tree

3 files changed

+20
-7
lines changed

3 files changed

+20
-7
lines changed

ethdb/pebble/pebble.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -580,8 +580,8 @@ func (b *batch) Reset() {
580580
func (b *batch) Replay(w ethdb.KeyValueWriter) error {
581581
reader := b.b.Reader()
582582
for {
583-
kind, k, v, ok := reader.Next()
584-
if !ok {
583+
kind, k, v, ok, err := reader.Next()
584+
if !ok || err != nil {
585585
break
586586
}
587587
// The (k,v) slices might be overwritten if the batch is reset/reused,

go.mod

+6-5
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ require (
1313
github.com/btcsuite/btcd/btcec/v2 v2.2.0
1414
github.com/cespare/cp v0.1.0
1515
github.com/cloudflare/cloudflare-go v0.79.0
16-
github.com/cockroachdb/errors v1.8.1
17-
github.com/cockroachdb/pebble v0.0.0-20230928194634-aa077af62593
16+
github.com/cockroachdb/errors v1.11.1
17+
github.com/cockroachdb/pebble v1.1.0
1818
github.com/consensys/gnark-crypto v0.12.1
1919
github.com/crate-crypto/go-kzg-4844 v1.0.0
2020
github.com/davecgh/go-spew v1.1.1
@@ -95,8 +95,8 @@ require (
9595
github.com/bits-and-blooms/bitset v1.12.0 // indirect
9696
github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 // indirect
9797
github.com/cespare/xxhash/v2 v2.2.0 // indirect
98-
github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f // indirect
99-
github.com/cockroachdb/redact v1.0.8 // indirect
98+
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b // indirect
99+
github.com/cockroachdb/redact v1.1.5 // indirect
100100
github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 // indirect
101101
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 // indirect
102102
github.com/consensys/bavard v0.1.13 // indirect
@@ -106,6 +106,7 @@ require (
106106
github.com/deepmap/oapi-codegen v1.6.0 // indirect
107107
github.com/dlclark/regexp2 v1.7.0 // indirect
108108
github.com/garslo/gogen v0.0.0-20170306192744-1d203ffc1f61 // indirect
109+
github.com/getsentry/sentry-go v0.18.0 // indirect
109110
github.com/go-ole/go-ole v1.3.0 // indirect
110111
github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
111112
github.com/goccy/go-json v0.10.2 // indirect
@@ -143,7 +144,7 @@ require (
143144
github.com/yusufpapurcu/wmi v1.2.3 // indirect
144145
golang.org/x/mod v0.12.0 // indirect
145146
golang.org/x/net v0.17.0 // indirect
146-
google.golang.org/protobuf v1.27.1 // indirect
147+
google.golang.org/protobuf v1.28.1 // indirect
147148
gopkg.in/yaml.v2 v2.4.0 // indirect
148149
gotest.tools/v3 v3.5.1 // indirect
149150
rsc.io/tmplfunc v0.0.3 // indirect

go.sum

+12
Original file line numberDiff line numberDiff line change
@@ -128,12 +128,20 @@ github.com/cockroachdb/datadriven v1.0.3-0.20230413201302-be42291fc80f/go.mod h1
128128
github.com/cockroachdb/errors v1.6.1/go.mod h1:tm6FTP5G81vwJ5lC0SizQo374JNCOPrHyXGitRJoDqM=
129129
github.com/cockroachdb/errors v1.8.1 h1:A5+txlVZfOqFBDa4mGz2bUWSp0aHElvHX2bKkdbQu+Y=
130130
github.com/cockroachdb/errors v1.8.1/go.mod h1:qGwQn6JmZ+oMjuLwjWzUNqblqk0xl4CVV3SQbGwK7Ac=
131+
github.com/cockroachdb/errors v1.11.1 h1:xSEW75zKaKCWzR3OfxXUxgrk/NtT4G1MiOv5lWZazG8=
132+
github.com/cockroachdb/errors v1.11.1/go.mod h1:8MUxA3Gi6b25tYlFEBGLf+D8aISL+M4MIpiWMSNRfxw=
131133
github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f h1:o/kfcElHqOiXqcou5a3rIlMc7oJbMQkeLk0VQJ7zgqY=
132134
github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI=
135+
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b h1:r6VH0faHjZeQy818SGhaone5OnYfxFR/+AzdY3sf5aE=
136+
github.com/cockroachdb/logtags v0.0.0-20230118201751-21c54148d20b/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs=
133137
github.com/cockroachdb/pebble v0.0.0-20230928194634-aa077af62593 h1:aPEJyR4rPBvDmeyi+l/FS/VtA00IWvjeFvjen1m1l1A=
134138
github.com/cockroachdb/pebble v0.0.0-20230928194634-aa077af62593/go.mod h1:6hk1eMY/u5t+Cf18q5lFMUA1Rc+Sm5I6Ra1QuPyxXCo=
139+
github.com/cockroachdb/pebble v1.1.0 h1:pcFh8CdCIt2kmEpK0OIatq67Ln9uGDYY3d5XnE0LJG4=
140+
github.com/cockroachdb/pebble v1.1.0/go.mod h1:sEHm5NOXxyiAoKWhoFxT8xMgd/f3RA6qUqQ1BXKrh2E=
135141
github.com/cockroachdb/redact v1.0.8 h1:8QG/764wK+vmEYoOlfobpe12EQcS81ukx/a4hdVMxNw=
136142
github.com/cockroachdb/redact v1.0.8/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
143+
github.com/cockroachdb/redact v1.1.5 h1:u1PMllDkdFfPWaNGMyLD1+so+aq3uUItthCFqzwPJ30=
144+
github.com/cockroachdb/redact v1.1.5/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg=
137145
github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2 h1:IKgmqgMQlVJIZj19CdocBeSfSaiCbEBZGKODaixqtHM=
138146
github.com/cockroachdb/sentry-go v0.6.1-cockroachdb.2/go.mod h1:8BT+cPK6xvFOcRlk0R8eg+OTkcqI6baNH4xAkpiYVvQ=
139147
github.com/cockroachdb/tokenbucket v0.0.0-20230807174530-cc333fc44b06 h1:zuQyyAKVxetITBuuhv3BI9cMrmStnpT18zmgmTxunpo=
@@ -211,6 +219,8 @@ github.com/gballet/go-libpcsclite v0.0.0-20190607065134-2772fd86a8ff/go.mod h1:x
211219
github.com/gballet/go-verkle v0.0.0-20230607174250-df487255f46b h1:vMT47RYsrftsHSTQhqXwC3BYflo38OLC3Y4LtXtLyU0=
212220
github.com/gballet/go-verkle v0.0.0-20230607174250-df487255f46b/go.mod h1:CDncRYVRSDqwakm282WEkjfaAj1hxU/v5RXxk5nXOiI=
213221
github.com/getkin/kin-openapi v0.53.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4=
222+
github.com/getsentry/sentry-go v0.18.0 h1:MtBW5H9QgdcJabtZcuJG80BMOwaBpkRDZkxRkNC1sN0=
223+
github.com/getsentry/sentry-go v0.18.0/go.mod h1:Kgon4Mby+FJ7ZWHFUAZgVaIa8sxHtnRJRLTXZr51aKQ=
214224
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
215225
github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s=
216226
github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM=
@@ -956,6 +966,8 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0
956966
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
957967
google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
958968
google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
969+
google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
970+
google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
959971
gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
960972
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
961973
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

0 commit comments

Comments
 (0)