From c71ae6cde60461bde363a4c040dd5982693edf65 Mon Sep 17 00:00:00 2001 From: MSalopek Date: Mon, 17 Jun 2024 18:09:04 +0200 Subject: [PATCH] deps: bump cosmos-sdk-lsm --- go.mod | 2 +- go.sum | 4 ++-- testutil/integration/interfaces.go | 2 +- x/ccv/provider/client/proposal_handler.go | 6 +++--- x/ccv/provider/keeper/hooks_test.go | 2 ++ 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 23367812a6..2bf9db2dbf 100644 --- a/go.mod +++ b/go.mod @@ -205,7 +205,7 @@ require ( // following versions might cause unexpected behavior replace ( - github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.47.13-ics-lsm + github.com/cosmos/cosmos-sdk => github.com/informalsystems/cosmos-sdk v0.46.0-alpha2.0.20240614081903-f1b9aac8d413 github.com/syndtr/goleveldb => github.com/syndtr/goleveldb v1.0.1-0.20210819022825-2ae1ddf74ef7 // stick with compatible version or x/exp in v0.47.x line diff --git a/go.sum b/go.sum index 04401adf3e..3cd39b74f3 100644 --- a/go.sum +++ b/go.sum @@ -337,8 +337,6 @@ github.com/cosmos/btcutil v1.0.5 h1:t+ZFcX77LpKtDBhjucvnOH8C2l2ioGsBNEQ3jef8xFk= github.com/cosmos/btcutil v1.0.5/go.mod h1:IyB7iuqZMJlthe2tkIFL33xPyzbFYP0XVdS8P5lUPis= github.com/cosmos/cosmos-proto v1.0.0-beta.5 h1:eNcayDLpip+zVLRLYafhzLvQlSmyab+RC5W7ZfmxJLA= github.com/cosmos/cosmos-proto v1.0.0-beta.5/go.mod h1:hQGLpiIUloJBMdQMMWb/4wRApmI9hjHH05nefC0Ojec= -github.com/cosmos/cosmos-sdk v0.47.13-ics-lsm h1:MrJ9BVAsqH7XAangoAcvUTCN7nSEP0tnuu+7QdSHlbs= -github.com/cosmos/cosmos-sdk v0.47.13-ics-lsm/go.mod h1:uzvMwHXmuRDSOaF8ec9HickjLHJcItWBREdkaDHcPiE= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= github.com/cosmos/go-bip39 v1.0.0 h1:pcomnQdrdH22njcAatO0yWojsUnCO3y2tNoV1cb6hHY= github.com/cosmos/go-bip39 v1.0.0/go.mod h1:RNJv0H/pOIVgxw6KS7QeX2a0Uo0aKUlfhZ4xuwvCdJw= @@ -683,6 +681,8 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= +github.com/informalsystems/cosmos-sdk v0.46.0-alpha2.0.20240614081903-f1b9aac8d413 h1:Vkk5RywGiqQsR68T9FwxTw5JQ2JstfpRlMiOP0j2+Tk= +github.com/informalsystems/cosmos-sdk v0.46.0-alpha2.0.20240614081903-f1b9aac8d413/go.mod h1:9sL4HXReNswcuwsPO33TACJmc+xkxYwHnmcL7rZgu1c= github.com/informalsystems/itf-go v0.0.1 h1:lVvdg3v+IMWOsVfIvOOGy1hHFO5KxoS8b8EiwKLbQDg= github.com/informalsystems/itf-go v0.0.1/go.mod h1:wgqaQ/yl2kbNlgw6GaleuHEefpZvkZo6Hc0jc8cGG9M= github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c= diff --git a/testutil/integration/interfaces.go b/testutil/integration/interfaces.go index fe3382b524..c01d37e5cf 100644 --- a/testutil/integration/interfaces.go +++ b/testutil/integration/interfaces.go @@ -152,7 +152,7 @@ type TestMintKeeper interface { type TestGovKeeper interface { GetParams(ctx sdk.Context) govv1.Params SetParams(ctx sdk.Context, params govv1.Params) error - SubmitProposal(ctx sdk.Context, messages []sdk.Msg, metadata, title, summary string, proposer sdk.AccAddress) (govv1.Proposal, error) + SubmitProposal(ctx sdk.Context, messages []sdk.Msg, metadata, title, summary string, proposer sdk.AccAddress, expedited bool) (govv1.Proposal, error) AddDeposit(ctx sdk.Context, proposalID uint64, depositorAddr sdk.AccAddress, depositAmount sdk.Coins) (bool, error) AddVote(ctx sdk.Context, proposalID uint64, voterAddr sdk.AccAddress, options govv1.WeightedVoteOptions, metadata string) error } diff --git a/x/ccv/provider/client/proposal_handler.go b/x/ccv/provider/client/proposal_handler.go index bb88276393..563e6370a6 100644 --- a/x/ccv/provider/client/proposal_handler.go +++ b/x/ccv/provider/client/proposal_handler.go @@ -106,7 +106,7 @@ Where proposal.json contains: return err } - msg, err := govv1.NewMsgSubmitProposal([]sdk.Msg{msgContent}, deposit, from.String(), "", content.GetTitle(), proposal.Summary) + msg, err := govv1.NewMsgSubmitProposal([]sdk.Msg{msgContent}, deposit, from.String(), "", content.GetTitle(), proposal.Summary, false) if err != nil { return err } @@ -162,7 +162,7 @@ Where proposal.json contains: return err } - msg, err := govv1.NewMsgSubmitProposal([]sdk.Msg{msgContent}, deposit, from.String(), "", content.GetTitle(), proposal.Summary) + msg, err := govv1.NewMsgSubmitProposal([]sdk.Msg{msgContent}, deposit, from.String(), "", content.GetTitle(), proposal.Summary, false) if err != nil { return err } @@ -219,7 +219,7 @@ func SubmitChangeRewardDenomsProposalTxCmd() *cobra.Command { return err } - msg, err := govv1.NewMsgSubmitProposal([]sdk.Msg{msgContent}, deposit, from.String(), "", content.GetTitle(), proposal.Summary) + msg, err := govv1.NewMsgSubmitProposal([]sdk.Msg{msgContent}, deposit, from.String(), "", content.GetTitle(), proposal.Summary, false) if err != nil { return err } diff --git a/x/ccv/provider/keeper/hooks_test.go b/x/ccv/provider/keeper/hooks_test.go index 931667fac4..3c81bcbe50 100644 --- a/x/ccv/provider/keeper/hooks_test.go +++ b/x/ccv/provider/keeper/hooks_test.go @@ -108,6 +108,7 @@ func TestAfterPropSubmissionAndVotingPeriodEnded(t *testing.T) { "", "", sdk.AccAddress(acct.SDKValOpAddress()), + false, ) require.NoError(t, err) @@ -202,6 +203,7 @@ func TestGetConsumerAdditionLegacyPropFromProp(t *testing.T) { "", "", sdk.AccAddress(acct.SDKValOpAddress()), + false, ) require.NoError(t, err) }