Skip to content

Commit

Permalink
Merge pull request #182 from cometbft/alesforz/go-version-v0.9.x
Browse files Browse the repository at this point in the history
Update go version to 1.21.13 on `v0.9.x`
  • Loading branch information
alesforz authored Aug 19, 2024
2 parents d56a452 + 8de1400 commit cbfb102
Show file tree
Hide file tree
Showing 8 changed files with 64 additions and 60 deletions.
2 changes: 2 additions & 0 deletions .changelog/unreleased/dependencies/182-update-go-version.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- bumped go version to 1.21.13, updated depencency version to fix a
vulnerability ([\#182](https://github.com/cometbft/cometbft-db/pull/182))
6 changes: 3 additions & 3 deletions .github/workflows/govulncheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ jobs:
govulncheck:
runs-on: ubuntu-latest
steps:
- uses: actions/setup-go@v4
with:
go-version: "1.21"
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version: "1.21.13"
- uses: technote-space/get-diff-action@v6
with:
PATTERNS: |
Expand Down
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/cometbft/cometbft-db

go 1.21
go 1.21.13

require (
github.com/dgraph-io/badger/v2 v2.2007.4
Expand All @@ -25,8 +25,8 @@ require (
github.com/klauspost/compress v1.12.3 // indirect
github.com/pkg/errors v0.8.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
golang.org/x/net v0.18.0 // indirect
golang.org/x/sys v0.14.0 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
google.golang.org/protobuf v1.31.0 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,8 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL
golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
golang.org/x/net v0.0.0-20200813134508-3edf25e44fcc/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.18.0 h1:mIYleuAkSbHh0tCv7RvjL3F6ZVbLjq4+R7zbOn3Kokg=
golang.org/x/net v0.18.0/go.mod h1:/czyP5RqHAH4odGYxBJ1qz0+CE5WZ+2j1YgoEo8F2jQ=
golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
Expand All @@ -137,8 +137,8 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200814200057-3d37ad5750ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.14.0 h1:Vz7Qs629MkJkGyHxUlRHizWJRG2j8fbQKjELVSNhy7Q=
golang.org/x/sys v0.14.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
Expand Down
4 changes: 3 additions & 1 deletion remotedb/remotedb_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ func TestRemoteDB(t *testing.T) {
client, err := remotedb.NewRemoteDB(ln.Addr().String(), cert)
require.Nil(t, err, "expecting a successful client creation")
dbName := "test-remote-db"
require.Nil(t, client.InitRemote(&remotedb.Init{Name: dbName, Type: "goleveldb"}))

err = client.InitRemote(&remotedb.Init{Name: dbName, Type: "goleveldb"})
require.Nil(t, err)
defer os.RemoveAll(dbName + ".db")

k1 := []byte("key-1")
Expand Down
46 changes: 23 additions & 23 deletions remotedb/test.crt
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
-----BEGIN CERTIFICATE-----
MIIEOTCCAiGgAwIBAgIRAKFDMVd84l9c+H7Igu+IeyAwDQYJKoZIhvcNAQELBQAw
FzEVMBMGA1UEAxMMY29tZXRiZnQuY29tMB4XDTIzMDExMjIwNDgxMVoXDTI0MDcx
MjIwNTgwN1owEzERMA8GA1UEAxMIcmVtb3RlZGIwggEiMA0GCSqGSIb3DQEBAQUA
A4IBDwAwggEKAoIBAQCzY2p/uGtME0w4suqYdMtXQU81ZX7A7ko6mP0N3ZKuji3R
XY9SXGKeJW46JbNIgbs5B8CHI4OiYdarZKF6gBs5cPAnKbsPW5MnNxWNXStm5c/9
rhoDi9dUUEpf8JFNb+IqJPsW7iURI8exqQr2Pb1oZPPk2GhgYfauu1lqyDAf88T2
GvdGYsmR8mNYW6NfrL4zqGeGnuq6sWxKHQWuh95gpSYnxNzmVVKIuttOoUC1FK6K
U+vdbVxkbeYKIK9a/yJOyp6zTaIZqUa6A5HhVWHdG6e9RY20sssamSPUJ+kmmHrp
eCRiE7n8lk0G/HzzO5znQB99RnzijfaarKDYy3a1AgMBAAGjgYMwgYAwDgYDVR0P
AQH/BAQDAgO4MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAdBgNVHQ4E
FgQU3V11wxMnDxNTnuNgA8DS6hQnntYwHwYDVR0jBBgwFoAUXBFqyY+zUYMwcG4B
CxPPklt+9QQwDwYDVR0RBAgwBocEfwAAATANBgkqhkiG9w0BAQsFAAOCAgEASPz4
KAa4K/wHWFAi/KKEAIgnsZD+4VJtW3Blkv+6XZQwSzX7GeW2Cs6Ze5rqokC2Fk1n
gp76sZ9TMvdqFa0dI6ZU0s/eGIvKdTR5JdoV1MqL+at3vwC7JrvV15WtNy6itMQH
YxdOmTCyi/+1UFW3GVtuoDj9AtdsulVWGQqfH1VYVOGBGOMCzAyjO9RYzg1dyCJR
plmX36B1UaJXRlD24FbnusuRWbBwnW/OeJZnD+THTB8Jn46tgS4AjRZ4Key9kAKc
BLKNmgCLjH3RdWhhMM5YAKpbDpN3TzaY1GoZgmQWF2WvyVJriAR3aJ9C+eDl2sSi
q1+gcYlLJDXcC9t5cDbkyp2sM3T7VNBOrsyO2Xg4Mkn5EYlLM7zd8TFNiSF4xJrF
EDYt/DQSt1lmz1dZqOyflapJh7nRSxNHPVlBPT2HCNJgVf0RO3zc7yBDicOlkEql
l1aeMclKPvUQMr7+WoRyUcz9RHIlvwlGBMsZAADvhpJ1yUgDAZupBC0HxkYYHEOm
MM122yfAf0NGU4oroTWiUkB/BFmFO3bmzd4CWe0e0WMJObQ5BpHUi5iOERMTuXGs
gPSJ2tgoOVHRUPR17mTDqpZWJWBKb66UCnxtkGoJxuP4JYRDmH2x4naHs/u7A6h0
KoZ/512EeDozQpqb5bJK+dqTIEc2Wkl7A9CIOjk=
MIIEODCCAiCgAwIBAgIQDNGic1zapsngJGm9DKSNajANBgkqhkiG9w0BAQsFADAX
MRUwEwYDVQQDEwxjb21ldGJmdC5jb20wHhcNMjQwODE5MDk1ODQzWhcNMjYwMjE5
MTAwODQyWjATMREwDwYDVQQDEwhyZW1vdGVkYjCCASIwDQYJKoZIhvcNAQEBBQAD
ggEPADCCAQoCggEBANtDkggYlHGXXDt3a/u6sE+swuH2irBisX9k5X/mffbRWhys
1w/70OxfWKS0D+kk160yV7hXu9LDsjmjVYDE+ZNKaB146Aua+1/+YK+PbV3p9WTu
LDD+nuUX2rkEjePEvBm+33imOJJ+w8fqUaQPtpjfubRjRPETFOBkiN2UcgIcJYEK
Nila2h4SBepXgpZD4XQ8ukif+K60XC5aFo7CxkwpiZaUuGnVS4XeFcEMaPpeh+mO
4ntwY/4JbiXpG+evJUrtAV2NruV6QH0UO1qpWuL3/wZoYnO7neQ2JJ95wMpXosYK
kjMQbQtHiXTyhSH/KYjm8TETGAshuZ9XePCDxjMCAwEAAaOBgzCBgDAOBgNVHQ8B
Af8EBAMCA7gwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB0GA1UdDgQW
BBSB9QYO18XI4Xz6P6XgHwR/weTRIDAfBgNVHSMEGDAWgBTyfh4XBTdxn4IR9NEB
TWgtFNik4jAPBgNVHREECDAGhwR/AAABMA0GCSqGSIb3DQEBCwUAA4ICAQAWGLos
TKvecLS19WJRqb6HWU0yFfHfiqvSThDBiVylcpxknhFScH9lwvv2mc3ZQVHR9zBZ
iReUXutYMFarcVyVgy2P/31d1DxBY0dixiYxKIXY+9Kpc9hN8aKi1527sGwSYGsH
RgqTzuZCJ7kQqfolpDqg80pDEobuh3LKbwxpSi5dMS+2RH8CishawE3WOpT/M6qU
W2xbEfnlWasxhlIo1qQgajpDwgdR242Dv88/zditU7EETn/gF6+7sFJoDHCtfdNm
cn7Dd9JJhLXOkY1XaTl+eKnIohQDOMcLhx/pm8ZaqeX4OaRNpNl7DfdvfklxaoBD
w4pjncJt9uZPxeZopOxiP/3NOtXVRU+sMG6ogiKpKEejnxMbjpBsvEz8NhjAsnXX
n38JrdQzNq2xTCJHg0TxsxGTVrkGQzA5MyGODrf4t3sU+Vru+WaXkVpiPBBnCeaK
NADoGkRHsMdg66EFvYimaJd2ysOT8hUPzEQEeO4IhQ+FPs/25m400l2iUdsh93x6
+qMKNAyexFwlDda51qvW5YvjPeTXo8Xc4uNGLwB+31/zIeR3gdSWW8IaYvOAv+5n
2DI9+MI4nzalN/pmQjCUDsIdMoQNRD9nHREJ8lTI9ZA3RU9+/+xCrUxzd8mII1eL
nkiPk9nzdcu7B7dIpIefQOhmEd3VKLtjGVrhYQ==
-----END CERTIFICATE-----
50 changes: 25 additions & 25 deletions remotedb/test.key
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
-----BEGIN RSA PRIVATE KEY-----
MIIEpAIBAAKCAQEAs2Nqf7hrTBNMOLLqmHTLV0FPNWV+wO5KOpj9Dd2Sro4t0V2P
UlxiniVuOiWzSIG7OQfAhyODomHWq2SheoAbOXDwJym7D1uTJzcVjV0rZuXP/a4a
A4vXVFBKX/CRTW/iKiT7Fu4lESPHsakK9j29aGTz5NhoYGH2rrtZasgwH/PE9hr3
RmLJkfJjWFujX6y+M6hnhp7qurFsSh0FrofeYKUmJ8Tc5lVSiLrbTqFAtRSuilPr
3W1cZG3mCiCvWv8iTsqes02iGalGugOR4VVh3RunvUWNtLLLGpkj1CfpJph66Xgk
YhO5/JZNBvx88zuc50AffUZ84o32mqyg2Mt2tQIDAQABAoIBACxgJ3Q41rIXA//y
on3cRoDrMwDufpCTYeFk/xRy/1oW6dak4lNpbyvX7pCLyvHgxcOx2zqS2nlM4qG7
XwbCsflfqsjFVfTSnnBQ/A/gQGBP8Ue7zcuayEWfJwbcp9UUHEp4o3RkrN60jy2v
t3p6g2RTtNGjhw5wrWlEBzaXFvCQHsUbDAoTniEp51Rfw4uo1gyHT78Brk5FrNSp
ulG8BHFVGC/IMOYHVajMvXvRqlP2oov5prArNj3qU/FDKe7ZAeRDMBsvg339lEOj
39RHJR0waVFJsw+AgyTLT3+TWh2Eb9UMOkG8fLcXb5kTAKY+36Ijn1nTtIt2tiOK
cU/nDfECgYEAzSWF196Xtyin8Rcw3DLcLPYnYrtmZFl69Fq8ZefpnIZtZQg04Ors
fFrFxGgjrwB269r9ZkYtd10z/RE3B1IRuOwu1U6Px7Dp+BbhllanLcg5FK5ggD2h
xjLD9kcDo1b78sY7h3gGnyBAj5oxb8TEQbjvdCc6s6VXH0Woh9DVfBMCgYEA39tK
oqP+OxNznvAkpwi+GMRFxHULN10LV58u3iBWBwa5NvjGOwwEieBa73pOOeIUFqaO
IF/zrpBYIsXkHFl6IJnsH9OJIgMqBGa/JAbgFI7UMmROh4pWhRslQ5zjMCHfZnLC
Fmi2iGRixbD33rynZMQF/KrTaDvWHPclf2GlixcCgYEAi7pJBZWJRKmeaenfz7uc
l8s5XFhED4ma46CBve9OANzW2f/S9HdOiAzTs0kzNNleJptMCUM3aJvE81OsZYIS
rB/CbmtKJztqwR3knR98UwSTTHDRLcfMzlB5hN8trS1sAhnfJhAsgmnXT3g4v+YH
vrQV9MlbhEzToGsztP4ayp0CgYEAqUC1gpj5rJL9dWteWwiKKlGj6nEQZPCtlbde
iUXrpW5Y9Y5M2vIwMEr4ll5j7PHZfHK7vRCvPwoWCVyUJzcj1qhqVnnrElNQHnnN
BSFJpWGEYQFkOqjG1+b5WtCxGYBS17PmuWi8sg0sfQpbrwX2joKDgFFsfD/ZmJbo
vBIJR0sCgYAt9uHwN4QdK3POdVkn24zKwOBkx4GEhoQjh4vjMmE4hi8ZxxIFur5T
nM1LtjLgbV8TMX67vZsk0yksrgW0KEnJXXVNaFG7ZtoFBGhV7UMDD7aFUFZyoFhE
AYncjzZl+m34vTc1doBbZt768mMA84pxZgvIqvPkU2KQDYyxIbtvbA==
MIIEpAIBAAKCAQEA20OSCBiUcZdcO3dr+7qwT6zC4faKsGKxf2Tlf+Z99tFaHKzX
D/vQ7F9YpLQP6STXrTJXuFe70sOyOaNVgMT5k0poHXjoC5r7X/5gr49tXen1ZO4s
MP6e5RfauQSN48S8Gb7feKY4kn7Dx+pRpA+2mN+5tGNE8RMU4GSI3ZRyAhwlgQo2
KVraHhIF6leClkPhdDy6SJ/4rrRcLloWjsLGTCmJlpS4adVLhd4VwQxo+l6H6Y7i
e3Bj/gluJekb568lSu0BXY2u5XpAfRQ7Wqla4vf/Bmhic7ud5DYkn3nAyleixgqS
MxBtC0eJdPKFIf8piObxMRMYCyG5n1d48IPGMwIDAQABAoIBABnvfC6I+cYV6Ur/
bT5xbrl97e9cgjsq8WPoQ11FnlC7orURnL6/Qo8zGAEja15ghUJvWgDsH8NmcoZu
04ZPxlWtz3LtAkWdJ27LYBRkGsOpEOXHZmLFO3ZNxAluiHoQo09ITJaw0rBBXlcf
WFjXovmiPQ0hUN5TK3z/Z1EOZg3pnlhA+E4YTyhnPekgfmYaIxX1JMTbWCtr5Vma
o1/WXG9bizzJe30ERhN4nyzDZqoLaijwZXlfSvTiz6MOyCydI8yT3INP0kTXTSww
q26u+CUeEcJ/nzZY/48kLZ5PeNhcnfdCj87ezzpxGXnQ/OJNquSoHU8gGXjCuWI1
f6J0UEECgYEA8BeNx2SjBGqKWAGnlEdeNLUmbSM3U2aap8B/pfRinkilYEsAiUk0
BitdU7QnnZMuarJRqrXkccCcA2O8daR4nzWBJpo1UFDKFQt7PO8rBVHoC0wX1mlw
Db01jKUhG8q0iqdQ3yZm1yQZzvjek63dcl1j/YAEdgsPX1fNeaChvb0CgYEA6cq7
BvkB5g66dZ/S0dJyL0DL+VT1jpohE566kpoN2icuvgXw59iDlFrPZjLaHR9Cd/QM
7GtM7RUUf/bM5+8GbXURutLKDQ5thwCYelioHWxmHXN3U5IU8eXjYCbThU0g52GM
Sh5oqFriCnAbpclhelRclFgcWdkY4veGxCKTeq8CgYEAnYwHOCl8o4A6CegEDFQM
qG+aqJEsU+kHYT77RG4qbI1lH9v3nR7RKZ85HZ0hRdB37AHZfzjekBqBBeRjnZrw
oCCfADK++1YYVVj0ZJbY1yPZLdif583Gfu2C/yi4oiEQ+c8zTUtIvrJs0RkUDTpR
DyPjYkyoIMG/M6RNLBvRJs0CgYBJgTjuR0nmiAjtxHMnDxBhdPDskl6mGCWAIq6s
Ow1R4nHawslsS3GLKkX87s4Oy+49Apkxl8bW34LTfMgNv+P4dA8/+tgV5Mxg3roR
9V/d6F/usIf62XoGV+32JB7q0UYgGVZfU1I6ZGCfQYIfzMH+ERoOdelsAkrFyWcw
sWJG9wKBgQCfaN317CI+9UpR75UZLnkO86zBuykj4pDbOiJ7omQ7DydaH1SYvPk/
cgaPlAhnpX1o833onPsKLvdX4Jk6c2YOnBZBrtt4cV23+LYe9FH7+IJWyke+7AWk
hXq8/G7qeg2RS7AGPuwcRX2ufryhdkF9RN3/jed90KDjLIIu2KeB3Q==
-----END RSA PRIVATE KEY-----
2 changes: 1 addition & 1 deletion tools/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# updates here, merge the changes here first and let the image get updated (or
# push a new version manually) before PRs that depend on them.

FROM golang:1.21 AS build
FROM golang:1.21.13 AS build

ENV LD_LIBRARY_PATH=/usr/local/lib

Expand Down

0 comments on commit cbfb102

Please sign in to comment.