Merge branch 'feat/sdk-47-ibc-7' into masa/migrate-v15-validator-comm…

…ission-rates
cosmos · Jan 4, 2024 · b5f8207 · b5f8207
2 parents 304e982 + 89c5afe
commit b5f8207
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 354 deletions.
diff --git a/app/upgrades/v7/constants.go b/app/upgrades/v7/constants.go
@@ -6,8 +6,6 @@ import (
 	store "github.com/cosmos/cosmos-sdk/store/types"
 	icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types"
 
-	store "github.com/cosmos/cosmos-sdk/store/types"
-
 	"github.com/cosmos/gaia/v15/app/upgrades"
 )
 
@@ -38,6 +36,10 @@ const (
 	stakingMsgCreateValidator           = "/cosmos.staking.v1beta1.MsgCreateValidator"
 	vestingMsgCreateVestingAccount      = "/cosmos.vesting.v1beta1.MsgCreateVestingAccount"
 	ibcMsgTransfer                      = "/ibc.applications.transfer.v1.MsgTransfer"
+	liquidityMsgSwapWithinBatch         = "/tendermint.liquidity.v1beta1.MsgSwapWithinBatch" //#nosec G101 -- This is a false positive
+	liquidityMsgCreatePool              = "/tendermint.liquidity.v1beta1.MsgCreatePool"
+	liquidityMsgDepositWithinBatch      = "/tendermint.liquidity.v1beta1.MsgDepositWithinBatch"
+	liquidityMsgWithdrawWithinBatch     = "/tendermint.liquidity.v1beta1.MsgWithdrawWithinBatch"
 )
 
 var Upgrade = upgrades.Upgrade{

diff --git a/app/upgrades/v7/upgrades.go b/app/upgrades/v7/upgrades.go
@@ -11,10 +11,6 @@ import (
 	icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types"
 	icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types"
 
-	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/types/module"
-	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
-
 	"github.com/cosmos/gaia/v15/app/keepers"
 )
 

diff --git a/third_party/proto/cosmos/staking/v1beta1/query.proto b/third_party/proto/cosmos/staking/v1beta1/query.proto