Skip to content

Commit 1ddba73

Browse files
danyalproutdanyalprout
committed
Bumps deps + migrate to op-stack types
1 parent ce340a9 commit 1ddba73

File tree

4 files changed

+68
-86
lines changed

4 files changed

+68
-86
lines changed

‎api/service/api_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ import (
1515
"github.com/attestantio/go-eth2-client/spec/deneb"
1616
"github.com/attestantio/go-eth2-client/spec/phase0"
1717
"github.com/base-org/blob-archiver/api/metrics"
18-
"github.com/base-org/blob-archiver/api/version"
1918
"github.com/base-org/blob-archiver/common/beacon/beacontest"
2019
"github.com/base-org/blob-archiver/common/blobtest"
2120
"github.com/base-org/blob-archiver/common/storage"
21+
"github.com/ethereum-optimism/optimism/op-service/eth"
2222
"github.com/ethereum-optimism/optimism/op-service/testlog"
2323
"github.com/ethereum/go-ethereum/common"
2424
"github.com/ethereum/go-ethereum/log"
@@ -315,7 +315,7 @@ func TestVersionHandler(t *testing.T) {
315315

316316
require.Equal(t, 200, response.Code)
317317
require.Equal(t, "application/json", response.Header().Get("Content-Type"))
318-
var v version.Version
318+
var v eth.APIVersionResponse
319319
err := json.Unmarshal(response.Body.Bytes(), &v)
320320
require.NoError(t, err)
321321
require.Equal(t, "Blob Archiver API/unknown", v.Data.Version)

‎api/version/version.go

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,14 @@
11
package version
22

3-
import "fmt"
3+
import (
4+
"fmt"
5+
6+
"github.com/ethereum-optimism/optimism/op-service/eth"
7+
)
48

59
var (
610
GitCommit = ""
7-
APIVersion Version
11+
APIVersion eth.APIVersionResponse
812
)
913

1014
func init() {
@@ -13,17 +17,9 @@ func init() {
1317
commit = "unknown"
1418
}
1519

16-
APIVersion = Version{
17-
Data: struct {
18-
Version string `json:"version"`
19-
}{
20+
APIVersion = eth.APIVersionResponse{
21+
Data: eth.VersionInformation{
2022
Version: fmt.Sprintf("Blob Archiver API/%s", commit),
2123
},
2224
}
2325
}
24-
25-
type Version struct {
26-
Data struct {
27-
Version string `json:"version"`
28-
} `json:"data"`
29-
}

‎go.mod

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ go 1.21.6
44

55
require (
66
github.com/attestantio/go-eth2-client v0.21.1
7-
github.com/ethereum-optimism/optimism v1.7.2
8-
github.com/ethereum/go-ethereum v1.13.8
7+
github.com/ethereum-optimism/optimism v1.7.6
8+
github.com/ethereum/go-ethereum v1.101315.1
99
github.com/go-chi/chi/v5 v5.0.12
10-
github.com/minio/minio-go/v7 v7.0.66
10+
github.com/minio/minio-go/v7 v7.0.70
1111
github.com/prometheus/client_golang v1.19.0
12+
github.com/rs/zerolog v1.32.0
1213
github.com/stretchr/testify v1.9.0
1314
github.com/urfave/cli/v2 v2.27.1
1415
)
1516

1617
require (
1718
github.com/DataDog/zstd v1.5.2 // indirect
1819
github.com/Microsoft/go-winio v0.6.1 // indirect
19-
github.com/VictoriaMetrics/fastcache v1.12.1 // indirect
2020
github.com/beorn7/perks v1.0.1 // indirect
2121
github.com/bits-and-blooms/bitset v1.10.0 // indirect
2222
github.com/btcsuite/btcd/btcec/v2 v2.2.0 // indirect
@@ -33,9 +33,9 @@ require (
3333
github.com/crate-crypto/go-kzg-4844 v0.7.0 // indirect
3434
github.com/davecgh/go-spew v1.1.1 // indirect
3535
github.com/deckarep/golang-set/v2 v2.1.0 // indirect
36-
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
36+
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.3.0 // indirect
3737
github.com/dustin/go-humanize v1.0.1 // indirect
38-
github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20240318114348-52d3dbd1605d // indirect
38+
github.com/ethereum-optimism/superchain-registry/superchain v0.0.0-20240522134500-19555bdbdc95 // indirect
3939
github.com/ethereum/c-kzg-4844 v0.4.0 // indirect
4040
github.com/fatih/color v1.16.0 // indirect
4141
github.com/ferranbt/fastssz v0.1.3 // indirect
@@ -44,16 +44,16 @@ require (
4444
github.com/go-logr/logr v1.2.4 // indirect
4545
github.com/go-logr/stdr v1.2.2 // indirect
4646
github.com/go-ole/go-ole v1.3.0 // indirect
47+
github.com/goccy/go-json v0.10.2 // indirect
4748
github.com/goccy/go-yaml v1.9.2 // indirect
4849
github.com/gofrs/flock v0.8.1 // indirect
4950
github.com/gogo/protobuf v1.3.2 // indirect
5051
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
5152
github.com/google/uuid v1.6.0 // indirect
52-
github.com/gorilla/websocket v1.5.0 // indirect
53+
github.com/gorilla/websocket v1.5.1 // indirect
5354
github.com/holiman/uint256 v1.2.4 // indirect
5455
github.com/huandu/go-clone v1.6.0 // indirect
55-
github.com/json-iterator/go v1.1.12 // indirect
56-
github.com/klauspost/compress v1.17.4 // indirect
56+
github.com/klauspost/compress v1.17.6 // indirect
5757
github.com/klauspost/cpuid/v2 v2.2.7 // indirect
5858
github.com/kr/pretty v0.3.1 // indirect
5959
github.com/kr/text v0.2.0 // indirect
@@ -64,8 +64,6 @@ require (
6464
github.com/minio/sha256-simd v1.0.1 // indirect
6565
github.com/mitchellh/mapstructure v1.5.0 // indirect
6666
github.com/mmcloughlin/addchain v0.4.0 // indirect
67-
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
68-
github.com/modern-go/reflect2 v1.0.2 // indirect
6967
github.com/olekukonko/tablewriter v0.0.5 // indirect
7068
github.com/pkg/errors v0.9.1 // indirect
7169
github.com/pmezard/go-difflib v1.0.0 // indirect
@@ -77,28 +75,26 @@ require (
7775
github.com/rivo/uniseg v0.4.3 // indirect
7876
github.com/rogpeppe/go-internal v1.11.0 // indirect
7977
github.com/rs/xid v1.5.0 // indirect
80-
github.com/rs/zerolog v1.32.0 // indirect
8178
github.com/russross/blackfriday/v2 v2.1.0 // indirect
8279
github.com/shirou/gopsutil v3.21.11+incompatible // indirect
83-
github.com/sirupsen/logrus v1.9.3 // indirect
8480
github.com/supranational/blst v0.3.11 // indirect
8581
github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a // indirect
8682
github.com/tklauser/go-sysconf v0.3.12 // indirect
8783
github.com/tklauser/numcpus v0.6.1 // indirect
8884
github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 // indirect
89-
github.com/yusufpapurcu/wmi v1.2.2 // indirect
85+
github.com/yusufpapurcu/wmi v1.2.3 // indirect
9086
go.opentelemetry.io/otel v1.16.0 // indirect
9187
go.opentelemetry.io/otel/metric v1.16.0 // indirect
9288
go.opentelemetry.io/otel/trace v1.16.0 // indirect
93-
golang.org/x/crypto v0.21.0 // indirect
94-
golang.org/x/exp v0.0.0-20231110203233-9a3e6036ecaa // indirect
89+
golang.org/x/crypto v0.23.0 // indirect
90+
golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 // indirect
9591
golang.org/x/mod v0.14.0 // indirect
96-
golang.org/x/net v0.21.0 // indirect
92+
golang.org/x/net v0.23.0 // indirect
9793
golang.org/x/sync v0.6.0 // indirect
98-
golang.org/x/sys v0.18.0 // indirect
99-
golang.org/x/term v0.18.0 // indirect
100-
golang.org/x/text v0.14.0 // indirect
101-
golang.org/x/tools v0.16.1 // indirect
94+
golang.org/x/sys v0.20.0 // indirect
95+
golang.org/x/term v0.20.0 // indirect
96+
golang.org/x/text v0.15.0 // indirect
97+
golang.org/x/tools v0.17.0 // indirect
10298
golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
10399
google.golang.org/protobuf v1.32.0 // indirect
104100
gopkg.in/cenkalti/backoff.v1 v1.1.0 // indirect
@@ -108,4 +104,4 @@ require (
108104
rsc.io/tmplfunc v0.0.3 // indirect
109105
)
110106

111-
replace github.com/ethereum/go-ethereum v1.13.8 => github.com/ethereum-optimism/op-geth v1.101308.3-rc.1
107+
replace github.com/ethereum/go-ethereum v1.101315.1 => github.com/ethereum-optimism/op-geth v1.101315.1

0 commit comments

Comments
 (0)