Skip to content

Commit a3aea35

Browse files
authored
Switch connect v2 back to slinky v1 (#2657)
1 parent 5fd53fc commit a3aea35

File tree

77 files changed

+325
-352
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+325
-352
lines changed

protocol/app/ante/market_update.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,14 @@
11
package ante
22

33
import (
4-
"context"
54
"errors"
65
"fmt"
6+
slinkytypes "github.com/skip-mev/slinky/pkg/types"
77

88
errorsmod "cosmossdk.io/errors"
99
sdk "github.com/cosmos/cosmos-sdk/types"
1010
sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
11-
slinkytypes "github.com/skip-mev/connect/v2/pkg/types"
12-
mmtypes "github.com/skip-mev/connect/v2/x/marketmap/types"
11+
mmtypes "github.com/skip-mev/slinky/x/marketmap/types"
1312

1413
slinkylibs "github.com/dydxprotocol/v4-chain/protocol/lib/slinky"
1514
perpetualstypes "github.com/dydxprotocol/v4-chain/protocol/x/perpetuals/types"
@@ -20,7 +19,7 @@ var ErrRestrictedMarketUpdates = errors.New("cannot call MsgUpdateMarkets or Msg
2019
"on a restricted market")
2120

2221
type MarketMapKeeper interface {
23-
GetAllMarkets(ctx context.Context) (map[string]mmtypes.Market, error)
22+
GetAllMarkets(ctx sdk.Context) (map[string]mmtypes.Market, error)
2423
}
2524

2625
var (

protocol/app/ante/market_update_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ import (
1414
"github.com/cosmos/cosmos-sdk/types/tx/signing"
1515
xauthsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
1616
banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
17-
"github.com/skip-mev/connect/v2/pkg/types"
18-
mmtypes "github.com/skip-mev/connect/v2/x/marketmap/types"
17+
"github.com/skip-mev/slinky/pkg/types"
18+
mmtypes "github.com/skip-mev/slinky/x/marketmap/types"
1919
"github.com/stretchr/testify/require"
2020

2121
"github.com/dydxprotocol/v4-chain/protocol/app/ante"

protocol/app/app.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -198,9 +198,9 @@ import (
198198
vestmodule "github.com/dydxprotocol/v4-chain/protocol/x/vest"
199199
vestmodulekeeper "github.com/dydxprotocol/v4-chain/protocol/x/vest/keeper"
200200
vestmoduletypes "github.com/dydxprotocol/v4-chain/protocol/x/vest/types"
201-
marketmapmodule "github.com/skip-mev/connect/v2/x/marketmap"
202-
marketmapmodulekeeper "github.com/skip-mev/connect/v2/x/marketmap/keeper"
203-
marketmapmoduletypes "github.com/skip-mev/connect/v2/x/marketmap/types"
201+
marketmapmodule "github.com/skip-mev/slinky/x/marketmap"
202+
marketmapmodulekeeper "github.com/skip-mev/slinky/x/marketmap/keeper"
203+
marketmapmoduletypes "github.com/skip-mev/slinky/x/marketmap/types"
204204

205205
// IBC
206206
ica "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts"
@@ -225,16 +225,16 @@ import (
225225
"github.com/dydxprotocol/v4-chain/protocol/indexer/msgsender"
226226

227227
// Slinky
228-
slinkyproposals "github.com/skip-mev/connect/v2/abci/proposals"
229-
"github.com/skip-mev/connect/v2/abci/strategies/aggregator"
230-
compression "github.com/skip-mev/connect/v2/abci/strategies/codec"
231-
"github.com/skip-mev/connect/v2/abci/strategies/currencypair"
232-
"github.com/skip-mev/connect/v2/abci/ve"
233-
oracleconfig "github.com/skip-mev/connect/v2/oracle/config"
234-
"github.com/skip-mev/connect/v2/pkg/math/voteweighted"
235-
oracleclient "github.com/skip-mev/connect/v2/service/clients/oracle"
236-
servicemetrics "github.com/skip-mev/connect/v2/service/metrics"
237-
promserver "github.com/skip-mev/connect/v2/service/servers/prometheus"
228+
slinkyproposals "github.com/skip-mev/slinky/abci/proposals"
229+
"github.com/skip-mev/slinky/abci/strategies/aggregator"
230+
compression "github.com/skip-mev/slinky/abci/strategies/codec"
231+
"github.com/skip-mev/slinky/abci/strategies/currencypair"
232+
"github.com/skip-mev/slinky/abci/ve"
233+
oracleconfig "github.com/skip-mev/slinky/oracle/config"
234+
"github.com/skip-mev/slinky/pkg/math/voteweighted"
235+
oracleclient "github.com/skip-mev/slinky/service/clients/oracle"
236+
servicemetrics "github.com/skip-mev/slinky/service/metrics"
237+
promserver "github.com/skip-mev/slinky/service/servers/prometheus"
238238

239239
// Full Node Streaming
240240
streaming "github.com/dydxprotocol/v4-chain/protocol/streaming"

protocol/app/app_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"testing"
77
"time"
88

9-
marketmapmodule "github.com/skip-mev/connect/v2/x/marketmap"
9+
marketmapmodule "github.com/skip-mev/slinky/x/marketmap"
1010

1111
evidencemodule "cosmossdk.io/x/evidence"
1212
feegrantmodule "cosmossdk.io/x/feegrant/module"

protocol/app/basic_manager/basic_manager.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ import (
4242
subaccountsmodule "github.com/dydxprotocol/v4-chain/protocol/x/subaccounts"
4343
vaultmodule "github.com/dydxprotocol/v4-chain/protocol/x/vault"
4444
vestmodule "github.com/dydxprotocol/v4-chain/protocol/x/vest"
45-
marketmapmodule "github.com/skip-mev/connect/v2/x/marketmap"
45+
marketmapmodule "github.com/skip-mev/slinky/x/marketmap"
4646

4747
ica "github.com/cosmos/ibc-go/v8/modules/apps/27-interchain-accounts"
4848
"github.com/cosmos/ibc-go/v8/modules/apps/transfer"

protocol/app/module_accounts.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import (
1515
satypes "github.com/dydxprotocol/v4-chain/protocol/x/subaccounts/types"
1616
vaultmoduletypes "github.com/dydxprotocol/v4-chain/protocol/x/vault/types"
1717
vestmoduletypes "github.com/dydxprotocol/v4-chain/protocol/x/vest/types"
18-
marketmapmoduletypes "github.com/skip-mev/connect/v2/x/marketmap/types"
18+
marketmapmoduletypes "github.com/skip-mev/slinky/x/marketmap/types"
1919

2020
"golang.org/x/exp/maps"
2121
)

protocol/app/module_accounts_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
satypes "github.com/dydxprotocol/v4-chain/protocol/x/subaccounts/types"
1919
vaultmoduletypes "github.com/dydxprotocol/v4-chain/protocol/x/vault/types"
2020
vestmoduletypes "github.com/dydxprotocol/v4-chain/protocol/x/vest/types"
21-
marketmapmoduletypes "github.com/skip-mev/connect/v2/x/marketmap/types"
21+
marketmapmoduletypes "github.com/skip-mev/slinky/x/marketmap/types"
2222
)
2323

2424
func TestModuleAccountsToAddresses(t *testing.T) {

protocol/app/msgs/all_msgs.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,6 @@ var (
88
// AllTypeMessages is a list of all messages and types that are used in the app.
99
// This list comes from the app's `InterfaceRegistry`.
1010
AllTypeMessages = map[string]struct{}{
11-
// connect marketmap messages
12-
"/connect.marketmap.v2.MsgCreateMarkets": {},
13-
"/connect.marketmap.v2.MsgCreateMarketsResponse": {},
14-
"/connect.marketmap.v2.MsgParams": {},
15-
"/connect.marketmap.v2.MsgParamsResponse": {},
16-
"/connect.marketmap.v2.MsgRemoveMarkets": {},
17-
"/connect.marketmap.v2.MsgRemoveMarketsResponse": {},
18-
"/connect.marketmap.v2.MsgRemoveMarketAuthorities": {},
19-
"/connect.marketmap.v2.MsgRemoveMarketAuthoritiesResponse": {},
20-
"/connect.marketmap.v2.MsgUpdateMarkets": {},
21-
"/connect.marketmap.v2.MsgUpdateMarketsResponse": {},
22-
"/connect.marketmap.v2.MsgUpsertMarkets": {},
23-
"/connect.marketmap.v2.MsgUpsertMarketsResponse": {},
24-
2511
// auth
2612
"/cosmos.auth.v1beta1.BaseAccount": {},
2713
"/cosmos.auth.v1beta1.ModuleAccount": {},
@@ -407,6 +393,20 @@ var (
407393
"/ibc.applications.interchain_accounts.controller.v1.MsgUpdateParamsResponse": {},
408394
"/ibc.applications.interchain_accounts.host.v1.MsgUpdateParams": {},
409395
"/ibc.applications.interchain_accounts.host.v1.MsgUpdateParamsResponse": {},
396+
397+
// slinky marketmap messages
398+
"/slinky.marketmap.v1.MsgCreateMarkets": {},
399+
"/slinky.marketmap.v1.MsgCreateMarketsResponse": {},
400+
"/slinky.marketmap.v1.MsgParams": {},
401+
"/slinky.marketmap.v1.MsgParamsResponse": {},
402+
"/slinky.marketmap.v1.MsgRemoveMarkets": {},
403+
"/slinky.marketmap.v1.MsgRemoveMarketsResponse": {},
404+
"/slinky.marketmap.v1.MsgRemoveMarketAuthorities": {},
405+
"/slinky.marketmap.v1.MsgRemoveMarketAuthoritiesResponse": {},
406+
"/slinky.marketmap.v1.MsgUpdateMarkets": {},
407+
"/slinky.marketmap.v1.MsgUpdateMarketsResponse": {},
408+
"/slinky.marketmap.v1.MsgUpsertMarkets": {},
409+
"/slinky.marketmap.v1.MsgUpsertMarketsResponse": {},
410410
}
411411

412412
// DisallowMsgs are messages that cannot be externally submitted.

protocol/app/msgs/normal_msgs.go

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ import (
2323
listing "github.com/dydxprotocol/v4-chain/protocol/x/listing/types"
2424
sending "github.com/dydxprotocol/v4-chain/protocol/x/sending/types"
2525
vault "github.com/dydxprotocol/v4-chain/protocol/x/vault/types"
26-
marketmapmoduletypes "github.com/skip-mev/connect/v2/x/marketmap/types"
26+
marketmapmoduletypes "github.com/skip-mev/slinky/x/marketmap/types"
2727
)
2828

2929
var (
3030
// NormalMsgs are messages that can be submitted by external users.
31-
NormalMsgs = lib.MergeAllMapsMustHaveDistinctKeys(NormalMsgsDefault, NormalMsgsDydxCustom, NormalMsgsConnect)
31+
NormalMsgs = lib.MergeAllMapsMustHaveDistinctKeys(NormalMsgsDefault, NormalMsgsDydxCustom, NormalMsgsSlinky)
3232

3333
// Default modules
3434
NormalMsgsDefault = map[string]sdk.Msg{
@@ -267,19 +267,19 @@ var (
267267
"/dydxprotocol.vault.MsgWithdrawFromMegavaultResponse": nil,
268268
}
269269

270-
NormalMsgsConnect = map[string]sdk.Msg{
271-
// connect marketmap messages
272-
"/connect.marketmap.v2.MsgCreateMarkets": &marketmapmoduletypes.MsgCreateMarkets{},
273-
"/connect.marketmap.v2.MsgCreateMarketsResponse": nil,
274-
"/connect.marketmap.v2.MsgParams": &marketmapmoduletypes.MsgParams{},
275-
"/connect.marketmap.v2.MsgParamsResponse": nil,
276-
"/connect.marketmap.v2.MsgRemoveMarketAuthorities": &marketmapmoduletypes.MsgRemoveMarketAuthorities{},
277-
"/connect.marketmap.v2.MsgRemoveMarketAuthoritiesResponse": nil,
278-
"/connect.marketmap.v2.MsgRemoveMarkets": &marketmapmoduletypes.MsgRemoveMarkets{},
279-
"/connect.marketmap.v2.MsgRemoveMarketsResponse": nil,
280-
"/connect.marketmap.v2.MsgUpdateMarkets": &marketmapmoduletypes.MsgUpdateMarkets{},
281-
"/connect.marketmap.v2.MsgUpdateMarketsResponse": nil,
282-
"/connect.marketmap.v2.MsgUpsertMarkets": &marketmapmoduletypes.MsgUpsertMarkets{},
283-
"/connect.marketmap.v2.MsgUpsertMarketsResponse": nil,
270+
NormalMsgsSlinky = map[string]sdk.Msg{
271+
// slinky marketmap messages
272+
"/slinky.marketmap.v1.MsgCreateMarkets": &marketmapmoduletypes.MsgCreateMarkets{},
273+
"/slinky.marketmap.v1.MsgCreateMarketsResponse": nil,
274+
"/slinky.marketmap.v1.MsgParams": &marketmapmoduletypes.MsgParams{},
275+
"/slinky.marketmap.v1.MsgParamsResponse": nil,
276+
"/slinky.marketmap.v1.MsgRemoveMarkets": &marketmapmoduletypes.MsgRemoveMarkets{},
277+
"/slinky.marketmap.v1.MsgRemoveMarketsResponse": nil,
278+
"/slinky.marketmap.v1.MsgRemoveMarketAuthorities": &marketmapmoduletypes.MsgRemoveMarketAuthorities{},
279+
"/slinky.marketmap.v1.MsgRemoveMarketAuthoritiesResponse": nil,
280+
"/slinky.marketmap.v1.MsgUpdateMarkets": &marketmapmoduletypes.MsgUpdateMarkets{},
281+
"/slinky.marketmap.v1.MsgUpdateMarketsResponse": nil,
282+
"/slinky.marketmap.v1.MsgUpsertMarkets": &marketmapmoduletypes.MsgUpsertMarkets{},
283+
"/slinky.marketmap.v1.MsgUpsertMarketsResponse": nil,
284284
}
285285
)

protocol/app/msgs/normal_msgs_test.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,6 @@ import (
1111

1212
func TestNormalMsgs_Key(t *testing.T) {
1313
expectedMsgs := []string{
14-
// connect marketmap messages
15-
"/connect.marketmap.v2.MsgCreateMarkets",
16-
"/connect.marketmap.v2.MsgCreateMarketsResponse",
17-
"/connect.marketmap.v2.MsgParams",
18-
"/connect.marketmap.v2.MsgParamsResponse",
19-
"/connect.marketmap.v2.MsgRemoveMarketAuthorities",
20-
"/connect.marketmap.v2.MsgRemoveMarketAuthoritiesResponse",
21-
"/connect.marketmap.v2.MsgRemoveMarkets",
22-
"/connect.marketmap.v2.MsgRemoveMarketsResponse",
23-
"/connect.marketmap.v2.MsgUpdateMarkets",
24-
"/connect.marketmap.v2.MsgUpdateMarketsResponse",
25-
"/connect.marketmap.v2.MsgUpsertMarkets",
26-
"/connect.marketmap.v2.MsgUpsertMarketsResponse",
27-
2814
// auth
2915
"/cosmos.auth.v1beta1.BaseAccount",
3016
"/cosmos.auth.v1beta1.ModuleAccount",
@@ -253,6 +239,20 @@ func TestNormalMsgs_Key(t *testing.T) {
253239
"/ibc.lightclients.tendermint.v1.ConsensusState",
254240
"/ibc.lightclients.tendermint.v1.Header",
255241
"/ibc.lightclients.tendermint.v1.Misbehaviour",
242+
243+
// slinky marketmap messages
244+
"/slinky.marketmap.v1.MsgCreateMarkets",
245+
"/slinky.marketmap.v1.MsgCreateMarketsResponse",
246+
"/slinky.marketmap.v1.MsgParams",
247+
"/slinky.marketmap.v1.MsgParamsResponse",
248+
"/slinky.marketmap.v1.MsgRemoveMarketAuthorities",
249+
"/slinky.marketmap.v1.MsgRemoveMarketAuthoritiesResponse",
250+
"/slinky.marketmap.v1.MsgRemoveMarkets",
251+
"/slinky.marketmap.v1.MsgRemoveMarketsResponse",
252+
"/slinky.marketmap.v1.MsgUpdateMarkets",
253+
"/slinky.marketmap.v1.MsgUpdateMarketsResponse",
254+
"/slinky.marketmap.v1.MsgUpsertMarkets",
255+
"/slinky.marketmap.v1.MsgUpsertMarketsResponse",
256256
}
257257

258258
require.Equal(t, expectedMsgs, lib.GetSortedKeys[sort.StringSlice](msgs.NormalMsgs))

protocol/app/prepare/prepare_proposal.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import (
1414
"github.com/dydxprotocol/v4-chain/protocol/app/prepare/prices"
1515
"github.com/dydxprotocol/v4-chain/protocol/lib/metrics"
1616
pricetypes "github.com/dydxprotocol/v4-chain/protocol/x/prices/types"
17-
"github.com/skip-mev/connect/v2/abci/ve"
17+
"github.com/skip-mev/slinky/abci/ve"
1818
)
1919

2020
var (

protocol/app/prepare/prepare_proposal_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ import (
2121
clobtypes "github.com/dydxprotocol/v4-chain/protocol/x/clob/types"
2222
perpetualtypes "github.com/dydxprotocol/v4-chain/protocol/x/perpetuals/types"
2323
pricestypes "github.com/dydxprotocol/v4-chain/protocol/x/prices/types"
24-
"github.com/skip-mev/connect/v2/abci/strategies/aggregator"
25-
aggregatormock "github.com/skip-mev/connect/v2/abci/strategies/aggregator/mocks"
26-
"github.com/skip-mev/connect/v2/abci/strategies/codec"
27-
strategymock "github.com/skip-mev/connect/v2/abci/strategies/currencypair/mocks"
28-
slinkytestutils "github.com/skip-mev/connect/v2/abci/testutils"
29-
vetypes "github.com/skip-mev/connect/v2/abci/ve/types"
30-
oracletypes "github.com/skip-mev/connect/v2/pkg/types"
24+
"github.com/skip-mev/slinky/abci/strategies/aggregator"
25+
aggregatormock "github.com/skip-mev/slinky/abci/strategies/aggregator/mocks"
26+
"github.com/skip-mev/slinky/abci/strategies/codec"
27+
strategymock "github.com/skip-mev/slinky/abci/strategies/currencypair/mocks"
28+
slinkytestutils "github.com/skip-mev/slinky/abci/testutils"
29+
vetypes "github.com/skip-mev/slinky/abci/ve/types"
30+
oracletypes "github.com/skip-mev/slinky/pkg/types"
3131
"github.com/stretchr/testify/mock"
3232
"github.com/stretchr/testify/require"
3333
)

protocol/app/prepare/prices/slinky_price_update_generator.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ import (
55

66
sdk "github.com/cosmos/cosmos-sdk/types"
77
pricestypes "github.com/dydxprotocol/v4-chain/protocol/x/prices/types"
8-
"github.com/skip-mev/connect/v2/abci/strategies/aggregator"
9-
"github.com/skip-mev/connect/v2/abci/strategies/codec"
10-
"github.com/skip-mev/connect/v2/abci/strategies/currencypair"
11-
"github.com/skip-mev/connect/v2/abci/ve"
8+
"github.com/skip-mev/slinky/abci/strategies/aggregator"
9+
"github.com/skip-mev/slinky/abci/strategies/codec"
10+
"github.com/skip-mev/slinky/abci/strategies/currencypair"
11+
"github.com/skip-mev/slinky/abci/ve"
1212
)
1313

1414
// SlinkyPriceUpdateGenerator is an implementation of the PriceUpdateGenerator interface. This implementation

protocol/app/prepare/prices/slinky_price_update_generator_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ import (
55
cmtabci "github.com/cometbft/cometbft/abci/types"
66
sdk "github.com/cosmos/cosmos-sdk/types"
77
"github.com/dydxprotocol/v4-chain/protocol/app/prepare/prices"
8-
"github.com/skip-mev/connect/v2/abci/strategies/aggregator"
9-
aggregatormock "github.com/skip-mev/connect/v2/abci/strategies/aggregator/mocks"
10-
codecmock "github.com/skip-mev/connect/v2/abci/strategies/codec/mocks"
11-
strategymock "github.com/skip-mev/connect/v2/abci/strategies/currencypair/mocks"
12-
"github.com/skip-mev/connect/v2/abci/testutils"
13-
vetypes "github.com/skip-mev/connect/v2/abci/ve/types"
14-
oracletypes "github.com/skip-mev/connect/v2/pkg/types"
8+
"github.com/skip-mev/slinky/abci/strategies/aggregator"
9+
aggregatormock "github.com/skip-mev/slinky/abci/strategies/aggregator/mocks"
10+
codecmock "github.com/skip-mev/slinky/abci/strategies/codec/mocks"
11+
strategymock "github.com/skip-mev/slinky/abci/strategies/currencypair/mocks"
12+
"github.com/skip-mev/slinky/abci/testutils"
13+
vetypes "github.com/skip-mev/slinky/abci/ve/types"
14+
oracletypes "github.com/skip-mev/slinky/pkg/types"
1515
"github.com/stretchr/testify/suite"
1616
"math/big"
1717
"testing"

protocol/app/process/slinky_market_price_decoder.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"fmt"
55

66
sdk "github.com/cosmos/cosmos-sdk/types"
7-
"github.com/skip-mev/connect/v2/abci/ve"
7+
"github.com/skip-mev/slinky/abci/ve"
88

99
"github.com/dydxprotocol/v4-chain/protocol/app/constants"
1010
"github.com/dydxprotocol/v4-chain/protocol/app/prepare/prices"

protocol/app/process/slinky_market_price_decoder_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"testing"
66

77
sdk "github.com/cosmos/cosmos-sdk/types"
8-
"github.com/skip-mev/connect/v2/abci/testutils"
8+
"github.com/skip-mev/slinky/abci/testutils"
99
"github.com/stretchr/testify/suite"
1010

1111
"github.com/dydxprotocol/v4-chain/protocol/app/constants"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package v_6_0_0
22

33
import (
44
store "cosmossdk.io/store/types"
5-
slinkytypes "github.com/skip-mev/connect/v2/pkg/types"
6-
marketmapmoduletypes "github.com/skip-mev/connect/v2/x/marketmap/types"
5+
slinkytypes "github.com/skip-mev/slinky/pkg/types"
6+
marketmapmoduletypes "github.com/skip-mev/slinky/x/marketmap/types"
77

88
"github.com/dydxprotocol/v4-chain/protocol/app/upgrades"
99
accountplustypes "github.com/dydxprotocol/v4-chain/protocol/x/accountplus/types"

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ import (
1414
revsharetypes "github.com/dydxprotocol/v4-chain/protocol/x/revshare/types"
1515
vaultkeeper "github.com/dydxprotocol/v4-chain/protocol/x/vault/keeper"
1616
vaulttypes "github.com/dydxprotocol/v4-chain/protocol/x/vault/types"
17-
"github.com/skip-mev/connect/v2/providers/apis/dydx"
18-
dydxtypes "github.com/skip-mev/connect/v2/providers/apis/dydx/types"
19-
marketmapkeeper "github.com/skip-mev/connect/v2/x/marketmap/keeper"
20-
marketmaptypes "github.com/skip-mev/connect/v2/x/marketmap/types"
17+
"github.com/skip-mev/slinky/providers/apis/dydx"
18+
dydxtypes "github.com/skip-mev/slinky/providers/apis/dydx/types"
19+
marketmapkeeper "github.com/skip-mev/slinky/x/marketmap/keeper"
20+
marketmaptypes "github.com/skip-mev/slinky/x/marketmap/types"
2121

2222
sdk "github.com/cosmos/cosmos-sdk/types"
2323
"github.com/cosmos/cosmos-sdk/types/module"

protocol/app/vote_extensions/expected_keepers.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
package vote_extensions
22

33
import (
4-
"context"
54
sdk "github.com/cosmos/cosmos-sdk/types"
6-
oracletypes "github.com/skip-mev/connect/v2/pkg/types"
5+
oracletypes "github.com/skip-mev/slinky/pkg/types"
76

87
pricestypes "github.com/dydxprotocol/v4-chain/protocol/x/prices/types"
98
)
109

1110
// PricesKeeper is the expected interface for the x/price keeper used by the vote extension handlers
1211
type PricesKeeper interface {
13-
GetCurrencyPairFromID(ctx context.Context, id uint64) (cp oracletypes.CurrencyPair, found bool)
12+
GetCurrencyPairFromID(ctx sdk.Context, id uint64) (cp oracletypes.CurrencyPair, found bool)
1413
GetValidMarketPriceUpdates(ctx sdk.Context) *pricestypes.MsgUpdateMarketPrices
1514
UpdateMarketPrices(
1615
ctx sdk.Context,

protocol/app/vote_extensions/extend_vote_handler.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package vote_extensions
22

33
import (
44
"fmt"
5-
slinkytypes "github.com/skip-mev/connect/v2/pkg/types"
5+
slinkytypes "github.com/skip-mev/slinky/pkg/types"
66
"math/big"
77

88
cometabci "github.com/cometbft/cometbft/abci/types"
@@ -38,8 +38,7 @@ func (n NoopPriceApplier) GetPricesForValidator(_ sdk.ConsAddress) map[slinkytyp
3838
// latest available market prices
3939
// 4. Calling the Slinky ExtendVoteHandler to handle the rest of ExtendVote
4040
//
41-
// See
42-
// https://github.com/skip-mev/connect/v2/blob/a5b1d3d3a2723e4746b5d588c512d7cc052dc0ff/abci/ve/vote_extension.go#L77
41+
// See https://github.com/skip-mev/slinky/blob/a5b1d3d3a2723e4746b5d588c512d7cc052dc0ff/abci/ve/vote_extension.go#L77
4342
// for the Slinky ExtendVoteHandler logic.
4443
func (e *ExtendVoteHandler) ExtendVoteHandler() sdk.ExtendVoteHandler {
4544
return func(ctx sdk.Context, req *cometabci.RequestExtendVote) (resp *cometabci.ResponseExtendVote, err error) {

0 commit comments

Comments
 (0)