Skip to content

Commit 697c276

Browse files
authored
upgrade slinky to 1.0.8 (#2069)
1 parent 651bfbb commit 697c276

File tree

5 files changed

+61
-127
lines changed

5 files changed

+61
-127
lines changed

protocol/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# NB: This is a digest for a multi-arch manifest list, you will want to get this by running
2-
# `docker buildx imagetools inspect golang:1.21-alpine`
3-
ARG GOLANG_1_22_ALPINE_DIGEST="8e96e6cff6a388c2f70f5f662b64120941fcd7d4b89d62fec87520323a316bd9"
2+
# `docker buildx imagetools inspect golang:1.22.2-alpine`
3+
ARG GOLANG_1_22_ALPINE_DIGEST="cdc86d9f363e8786845bea2040312b4efa321b828acdeb26f393faa864d887b0"
44

55
# This Dockerfile is a stateless build of the `dydxprotocold` binary as a Docker container.
66
# It does not include any configuration, state, or genesis information.

protocol/app/upgrades/v6.0.0/upgrade.go

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,10 @@ import (
1212
clobtypes "github.com/dydxprotocol/v4-chain/protocol/x/clob/types"
1313
pricestypes "github.com/dydxprotocol/v4-chain/protocol/x/prices/types"
1414
revsharetypes "github.com/dydxprotocol/v4-chain/protocol/x/revshare/types"
15-
"github.com/skip-mev/slinky/oracle/config"
16-
"github.com/skip-mev/slinky/providers/apis/dydx"
15+
dydx "github.com/skip-mev/slinky/providers/apis/dydx"
1716
dydxtypes "github.com/skip-mev/slinky/providers/apis/dydx/types"
1817
marketmapkeeper "github.com/skip-mev/slinky/x/marketmap/keeper"
1918
marketmaptypes "github.com/skip-mev/slinky/x/marketmap/types"
20-
"go.uber.org/zap"
2119

2220
sdk "github.com/cosmos/cosmos-sdk/types"
2321
"github.com/cosmos/cosmos-sdk/types/module"
@@ -65,22 +63,6 @@ func setMarketMapParams(ctx sdk.Context, mmk marketmapkeeper.Keeper) {
6563
}
6664

6765
func migratePricesToMarketMap(ctx sdk.Context, pk pricestypes.PricesKeeper, mmk marketmapkeeper.Keeper) {
68-
// fill out config with dummy variables to pass validation. This handler is only used to run the
69-
// ConvertMarketParamsToMarketMap member function.
70-
h, err := dydx.NewAPIHandler(zap.NewNop(), config.APIConfig{
71-
Enabled: true,
72-
Timeout: 1,
73-
Interval: 1,
74-
ReconnectTimeout: 1,
75-
MaxQueries: 1,
76-
Atomic: false,
77-
Endpoints: []config.Endpoint{{URL: "upgrade"}},
78-
BatchSize: 0,
79-
Name: dydx.Name,
80-
})
81-
if err != nil {
82-
panic(fmt.Sprintf("Failed to construct dydx handler %v", err))
83-
}
8466
allMarketParams := pk.GetAllMarketParams(ctx)
8567
var mpr dydxtypes.QueryAllMarketParamsResponse
8668
for _, mp := range allMarketParams {
@@ -93,7 +75,7 @@ func migratePricesToMarketMap(ctx sdk.Context, pk pricestypes.PricesKeeper, mmk
9375
ExchangeConfigJson: mp.ExchangeConfigJson,
9476
})
9577
}
96-
mm, err := h.ConvertMarketParamsToMarketMap(mpr)
78+
mm, err := dydx.ConvertMarketParamsToMarketMap(mpr)
9779
if err != nil {
9880
panic(fmt.Sprintf("Couldn't convert markets %v", err))
9981
}

protocol/go.mod

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
module github.com/dydxprotocol/v4-chain/protocol
22

3-
go 1.22
4-
5-
toolchain go1.22.0
3+
go 1.22.2
64

75
require (
86
cosmossdk.io/api v0.7.5
97
cosmossdk.io/math v1.3.0
108
github.com/Shopify/sarama v1.37.2
119
github.com/cometbft/cometbft v0.38.10
12-
github.com/cometbft/cometbft-db v0.10.0 // indirect
10+
github.com/cometbft/cometbft-db v0.12.0 // indirect
1311
github.com/cosmos/cosmos-proto v1.0.0-beta.5
14-
github.com/cosmos/cosmos-sdk v0.50.8
12+
github.com/cosmos/cosmos-sdk v0.50.9
1513
github.com/cosmos/go-bip39 v1.0.0
16-
github.com/cosmos/gogoproto v1.5.0
14+
github.com/cosmos/gogoproto v1.6.0
1715
github.com/go-playground/validator/v10 v10.14.0
1816
github.com/gofrs/flock v0.8.1
1917
github.com/gogo/protobuf v1.3.2 // indirect
@@ -28,50 +26,49 @@ require (
2826
github.com/ory/dockertest v3.3.5+incompatible
2927
github.com/pkg/errors v0.9.1
3028
github.com/rakyll/statik v0.1.7
31-
github.com/spf13/cast v1.6.0
29+
github.com/spf13/cast v1.7.0
3230
github.com/spf13/cobra v1.8.1
3331
github.com/spf13/pflag v1.0.5
3432
github.com/stretchr/testify v1.9.0
35-
github.com/vektra/mockery/v2 v2.43.2
33+
github.com/vektra/mockery/v2 v2.44.1
3634
github.com/zyedidia/generic v1.0.0
37-
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842
35+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
3836
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
3937
google.golang.org/grpc v1.65.0
4038
gopkg.in/DataDog/dd-trace-go.v1 v1.48.0
4139
gopkg.in/typ.v4 v4.1.0
4240
)
4341

4442
require (
45-
cosmossdk.io/client/v2 v2.0.0-beta.1
43+
cosmossdk.io/client/v2 v2.0.0-beta.4
4644
cosmossdk.io/core v0.12.0
4745
cosmossdk.io/errors v1.0.1
48-
cosmossdk.io/log v1.3.1
46+
cosmossdk.io/log v1.4.0
4947
cosmossdk.io/store v1.1.0
5048
cosmossdk.io/tools/confix v0.1.1
5149
cosmossdk.io/x/circuit v0.1.1
5250
cosmossdk.io/x/evidence v0.1.0
5351
cosmossdk.io/x/feegrant v0.1.0
54-
cosmossdk.io/x/tx v0.13.3
55-
cosmossdk.io/x/upgrade v0.1.3
52+
cosmossdk.io/x/tx v0.13.4
53+
cosmossdk.io/x/upgrade v0.1.4
5654
github.com/burdiyan/kafkautil v0.0.0-20190131162249-eaf83ed22d5b
5755
github.com/cosmos/cosmos-db v1.0.2
5856
github.com/cosmos/iavl v1.1.2
5957
github.com/cosmos/ibc-go/modules/capability v1.0.0
60-
github.com/cosmos/ibc-go/v8 v8.2.0
58+
github.com/cosmos/ibc-go/v8 v8.3.2
6159
github.com/cosmos/rosetta v0.50.3
6260
github.com/deckarep/golang-set/v2 v2.6.0
6361
github.com/ethereum/go-ethereum v1.14.7
6462
github.com/go-kit/log v0.2.1
6563
github.com/hashicorp/go-metrics v0.5.3
6664
github.com/ory/dockertest/v3 v3.10.0
6765
github.com/pelletier/go-toml v1.9.5
68-
github.com/rs/zerolog v1.32.0
66+
github.com/rs/zerolog v1.33.0
6967
github.com/shopspring/decimal v1.3.1
70-
github.com/skip-mev/slinky v1.0.5-0.20240724231039-9f85f7f0f7cb
68+
github.com/skip-mev/slinky v1.0.8
7169
github.com/spf13/viper v1.19.0
7270
github.com/syndtr/goleveldb v1.0.1-0.20220721030215-126854af5e6d
73-
go.uber.org/zap v1.27.0
74-
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157
71+
google.golang.org/genproto/googleapis/api v0.0.0-20240725223205-93522f1f2a9f
7572
google.golang.org/protobuf v1.34.2
7673
gotest.tools/v3 v3.5.1
7774
)
@@ -136,7 +133,6 @@ require (
136133
github.com/ccojocar/zxcvbn-go v1.0.2 // indirect
137134
github.com/cenkalti/backoff v2.2.1+incompatible // indirect
138135
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
139-
github.com/cespare/xxhash v1.1.0 // indirect
140136
github.com/cespare/xxhash/v2 v2.3.0 // indirect
141137
github.com/charithe/durationcheck v0.0.10 // indirect
142138
github.com/chavacava/garif v0.1.0 // indirect
@@ -157,7 +153,7 @@ require (
157153
github.com/cosmos/btcutil v1.0.5 // indirect
158154
github.com/cosmos/gogogateway v1.2.0 // indirect
159155
github.com/cosmos/ics23/go v0.10.0 // indirect
160-
github.com/cosmos/interchain-security/v5 v5.0.0 // indirect
156+
github.com/cosmos/interchain-security/v5 v5.1.1 // indirect
161157
github.com/cosmos/ledger-cosmos-go v0.13.3 // indirect
162158
github.com/cosmos/rosetta-sdk-go v0.10.0 // indirect
163159
github.com/crate-crypto/go-kzg-4844 v1.0.0 // indirect
@@ -171,9 +167,8 @@ require (
171167
github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
172168
github.com/denis-tingaikin/go-header v0.5.0 // indirect
173169
github.com/desertbit/timer v0.0.0-20180107155436-c41aec40b27f // indirect
174-
github.com/dgraph-io/badger/v2 v2.2007.4 // indirect
170+
github.com/dgraph-io/badger/v4 v4.2.0 // indirect
175171
github.com/dgraph-io/ristretto v0.1.1 // indirect
176-
github.com/dgryski/go-farm v0.0.0-20200201041132-a6ae2369ad13 // indirect
177172
github.com/docker/cli v23.0.1+incompatible // indirect
178173
github.com/docker/docker v23.0.1+incompatible // indirect
179174
github.com/docker/go-connections v0.4.0 // indirect
@@ -230,6 +225,7 @@ require (
230225
github.com/golangci/revgrep v0.5.3 // indirect
231226
github.com/golangci/unconvert v0.0.0-20240309020433-c5143eacb3ed // indirect
232227
github.com/google/btree v1.1.2 // indirect
228+
github.com/google/flatbuffers v2.0.8+incompatible // indirect
233229
github.com/google/orderedcode v0.0.1 // indirect
234230
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
235231
github.com/google/s2a-go v0.1.7 // indirect
@@ -410,7 +406,7 @@ require (
410406
gitlab.com/bosi/decorder v0.4.2 // indirect
411407
go-simpler.org/musttag v0.12.2 // indirect
412408
go-simpler.org/sloglint v0.7.1 // indirect
413-
go.etcd.io/bbolt v1.3.8 // indirect
409+
go.etcd.io/bbolt v1.4.0-alpha.0.0.20240404170359-43604f3112c5 // indirect
414410
go.mongodb.org/mongo-driver v1.11.0 // indirect
415411
go.opencensus.io v0.24.0 // indirect
416412
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.49.0 // indirect
@@ -421,19 +417,20 @@ require (
421417
go.uber.org/automaxprocs v1.5.3 // indirect
422418
go.uber.org/multierr v1.11.0 // indirect
423419
go.uber.org/ratelimit v0.2.0 // indirect
420+
go.uber.org/zap v1.27.0 // indirect
424421
golang.org/x/crypto v0.25.0 // indirect
425422
golang.org/x/exp/typeparams v0.0.0-20240314144324-c7f7c6466f7f // indirect
426423
golang.org/x/mod v0.19.0 // indirect
427424
golang.org/x/net v0.27.0 // indirect
428425
golang.org/x/oauth2 v0.20.0 // indirect
429-
golang.org/x/sync v0.7.0 // indirect
426+
golang.org/x/sync v0.8.0 // indirect
430427
golang.org/x/sys v0.22.0 // indirect
431428
golang.org/x/term v0.22.0 // indirect
432429
golang.org/x/text v0.16.0 // indirect
433430
golang.org/x/time v0.5.0 // indirect
434431
golang.org/x/tools v0.23.0 // indirect
435432
google.golang.org/api v0.171.0 // indirect
436-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240709173604-40e1e62336c5 // indirect
433+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240722135656-d784300faade // indirect
437434
gopkg.in/ini.v1 v1.67.0 // indirect
438435
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
439436
gopkg.in/yaml.v2 v2.4.0 // indirect

0 commit comments

Comments
 (0)