Merge branch 'cosmos-sdk-v0.47' of https://github.com/bandprotocol/chain

 into extra-rest-47

app/ante.go

@@ -39,6 +39,9 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
 	if options.IBCKeeper == nil {
 		return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "IBC keeper is required for AnteHandler")
 	}
+	if options.StakingKeeper == nil {
+		return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "Staking keeper is required for AnteHandler")
+	}
 	if options.GlobalfeeKeeper == nil {
 		return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "Globalfee keeper is required for AnteHandler")
 	}

app/keepers/keepers.go

@@ -1,7 +1,6 @@
 package keepers
 
 import (
-	globalfeekeeper "github.com/bandprotocol/chain/v2/x/globalfee/keeper"
 	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
 	authzkeeper "github.com/cosmos/cosmos-sdk/x/authz/keeper"
 	capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper"
@@ -22,6 +21,7 @@ import (
 	ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
 
 	bandbankkeeper "github.com/bandprotocol/chain/v2/x/bank/keeper"
+	globalfeekeeper "github.com/bandprotocol/chain/v2/x/globalfee/keeper"
 	oraclekeeper "github.com/bandprotocol/chain/v2/x/oracle/keeper"
 )
 

app/upgrades/types.go

@@ -1,13 +1,14 @@
 package upgrades
 
 import (
-	"github.com/bandprotocol/chain/v2/app/keepers"
 	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
 	store "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
+
+	"github.com/bandprotocol/chain/v2/app/keepers"
 )
 
 // Upgrade defines a struct containing necessary fields that a SoftwareUpgradeProposal

app/upgrades/v2_4/constants.go

@@ -1,9 +1,10 @@
 package v2_4
 
 import (
-	"github.com/bandprotocol/chain/v2/app/upgrades"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types"
+
+	"github.com/bandprotocol/chain/v2/app/upgrades"
 )
 
 const UpgradeName = "v2_4"

app/upgrades/v2_4/upgrades.go

@@ -1,9 +1,8 @@
 package v2_4
 
 import (
-	"github.com/bandprotocol/chain/v2/app/keepers"
-	"github.com/bandprotocol/chain/v2/app/upgrades"
-	oracletypes "github.com/bandprotocol/chain/v2/x/oracle/types"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
 	vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types"
 	"github.com/cosmos/cosmos-sdk/x/authz"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
@@ -18,8 +17,9 @@ import (
 	icatypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/types"
 	ibctransfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
 
-	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/types/module"
+	"github.com/bandprotocol/chain/v2/app/keepers"
+	"github.com/bandprotocol/chain/v2/app/upgrades"
+	oracletypes "github.com/bandprotocol/chain/v2/x/oracle/types"
 )
 
 func CreateUpgradeHandler(

app/upgrades/v2_5/constants.go

@@ -1,8 +1,9 @@
 package v2_5
 
 import (
-	"github.com/bandprotocol/chain/v2/app/upgrades"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
+
+	"github.com/bandprotocol/chain/v2/app/upgrades"
 )
 
 const UpgradeName = "v2_5"

app/upgrades/v2_5/upgrades.go

@@ -1,12 +1,12 @@
 package v2_5
 
 import (
-	"github.com/bandprotocol/chain/v2/app/keepers"
-	"github.com/bandprotocol/chain/v2/app/upgrades"
-	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/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/bandprotocol/chain/v2/app/keepers"
+	"github.com/bandprotocol/chain/v2/app/upgrades"
 )
 
 func CreateUpgradeHandler(

app/upgrades/v2_6/upgrades.go

@@ -1,14 +1,14 @@
 package v2_6
 
 import (
-	"github.com/bandprotocol/chain/v2/app/keepers"
-	"github.com/bandprotocol/chain/v2/app/upgrades"
-	globalfeetypes "github.com/bandprotocol/chain/v2/x/globalfee/types"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/module"
 	upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types"
 	icahosttypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/host/types"
 
-	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/cosmos/cosmos-sdk/types/module"
+	"github.com/bandprotocol/chain/v2/app/keepers"
+	"github.com/bandprotocol/chain/v2/app/upgrades"
+	globalfeetypes "github.com/bandprotocol/chain/v2/x/globalfee/types"
 )
 
 func CreateUpgradeHandler(

benchmark/bench_test.go

@@ -6,10 +6,11 @@ import (
 	"testing"
 	"time"
 
-	oraclekeeper "github.com/bandprotocol/chain/v2/x/oracle/keeper"
-	oracletypes "github.com/bandprotocol/chain/v2/x/oracle/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/require"
+
+	oraclekeeper "github.com/bandprotocol/chain/v2/x/oracle/keeper"
+	oracletypes "github.com/bandprotocol/chain/v2/x/oracle/types"
 )
 
 var PrepareCases = map[string]struct {

benchmark/helper_test.go

@@ -8,9 +8,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/bandprotocol/chain/v2/pkg/obi"
-	"github.com/bandprotocol/chain/v2/testing/testapp"
-	oracletypes "github.com/bandprotocol/chain/v2/x/oracle/types"
 	owasm "github.com/bandprotocol/go-owasm/api"
 	types "github.com/cometbft/cometbft/abci/types"
 	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
@@ -19,6 +16,10 @@ import (
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	"github.com/stretchr/testify/require"
+
+	"github.com/bandprotocol/chain/v2/pkg/obi"
+	"github.com/bandprotocol/chain/v2/testing/testapp"
+	oracletypes "github.com/bandprotocol/chain/v2/x/oracle/types"
 )
 
 type Account struct {

client/grpc/oracle/proof/proof_test.go

@@ -4,9 +4,10 @@ import (
 	"encoding/hex"
 	"testing"
 
-	oracletypes "github.com/bandprotocol/chain/v2/x/oracle/types"
 	"github.com/cometbft/cometbft/crypto/tmhash"
 	"github.com/stretchr/testify/require"
+
+	oracletypes "github.com/bandprotocol/chain/v2/x/oracle/types"
 )
 
 func hexToBytes(hexstr string) []byte {

client/grpc/oracle/proof/service.go

@@ -6,13 +6,14 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"github.com/bandprotocol/chain/v2/x/oracle/types"
-	oracletypes "github.com/bandprotocol/chain/v2/x/oracle/types"
 	rpcclient "github.com/cometbft/cometbft/rpc/client"
 	"github.com/cosmos/cosmos-sdk/client"
 	gogogrpc "github.com/cosmos/gogoproto/grpc"
 	"github.com/ethereum/go-ethereum/accounts/abi"
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
+
+	"github.com/bandprotocol/chain/v2/x/oracle/types"
+	oracletypes "github.com/bandprotocol/chain/v2/x/oracle/types"
 )
 
 // RegisterProofService registers the node gRPC service on the provided gRPC router.

client/grpc/oracle/proof/util.go

@@ -11,7 +11,7 @@ import (
 	gogotypes "github.com/cosmos/gogoproto/types"
 )
 
-// Copied from https://github.com/cometbft/cometbft/blob/master/types/encoding_helper.go
+// Copied from https://github.com/cometbft/cometbft/blob/v0.37.2/types/encoding_helper.go
 func cdcEncode(item interface{}) []byte {
 	if item != nil && !isTypedNil(item) && !isEmpty(item) {
 		switch item := item.(type) {

cmd/bandd/cmd/gends.go

@@ -15,7 +15,6 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/bandprotocol/chain/v2/pkg/filecache"
-
 	"github.com/bandprotocol/chain/v2/x/oracle/types"
 )
 

cmd/bandd/cmd/genos.go

@@ -6,6 +6,7 @@ import (
 	"io/ioutil"
 	"path/filepath"
 
+	"github.com/bandprotocol/go-owasm/api"
 	"github.com/cometbft/cometbft/libs/cli"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/server"
@@ -15,8 +16,6 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/bandprotocol/chain/v2/pkg/filecache"
-	"github.com/bandprotocol/go-owasm/api"
-
 	"github.com/bandprotocol/chain/v2/x/oracle/types"
 )
 

testing/testapp/setup.go

@@ -10,6 +10,12 @@ import (
 	"testing"
 	"time"
 
+	owasm "github.com/bandprotocol/go-owasm/api"
+	dbm "github.com/cometbft/cometbft-db"
+	abci "github.com/cometbft/cometbft/abci/types"
+	"github.com/cometbft/cometbft/libs/log"
+	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
+	tmtypes "github.com/cometbft/cometbft/types"
 	"github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
@@ -31,19 +37,11 @@ import (
 	slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
-
-	dbm "github.com/cometbft/cometbft-db"
-	abci "github.com/cometbft/cometbft/abci/types"
-	"github.com/cometbft/cometbft/libs/log"
-	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
-	tmtypes "github.com/cometbft/cometbft/types"
 	ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
 	"github.com/stretchr/testify/require"
 
-	"github.com/bandprotocol/chain/v2/pkg/filecache"
-	owasm "github.com/bandprotocol/go-owasm/api"
-
 	bandapp "github.com/bandprotocol/chain/v2/app"
+	"github.com/bandprotocol/chain/v2/pkg/filecache"
 	"github.com/bandprotocol/chain/v2/x/oracle/keeper"
 	"github.com/bandprotocol/chain/v2/x/oracle/types"
 )

x/bank/module.go

@@ -3,13 +3,14 @@ package bank
 import (
 	"fmt"
 
-	"github.com/bandprotocol/chain/v2/x/bank/keeper"
 	"github.com/cosmos/cosmos-sdk/codec"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	"github.com/cosmos/cosmos-sdk/x/bank"
 	"github.com/cosmos/cosmos-sdk/x/bank/exported"
 	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
 	"github.com/cosmos/cosmos-sdk/x/bank/types"
+
+	"github.com/bandprotocol/chain/v2/x/bank/keeper"
 )
 
 var (

x/globalfee/client/cli/query.go

@@ -24,11 +24,10 @@ func GetQueryCmd() *cobra.Command {
 
 func GetQueryCmdParams() *cobra.Command {
 	cmd := &cobra.Command{
-		Use:     "params",
-		Short:   "Show params",
-		Long:    "Show parameter of globalfee module",
-		Aliases: []string{"min"},
-		Args:    cobra.ExactArgs(0),
+		Use:   "params",
+		Short: "Show params",
+		Long:  "Show parameter of globalfee module",
+		Args:  cobra.ExactArgs(0),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			clientCtx, err := client.GetClientQueryContext(cmd)
 			if err != nil {

x/oracle/handler_test.go

@@ -10,13 +10,12 @@ import (
 	"testing"
 	"time"
 
+	"github.com/bandprotocol/go-owasm/api"
 	abci "github.com/cometbft/cometbft/abci/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	authtypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	"github.com/stretchr/testify/require"
 
-	"github.com/bandprotocol/go-owasm/api"
-
 	"github.com/bandprotocol/chain/v2/testing/testapp"
 	"github.com/bandprotocol/chain/v2/x/oracle"
 	"github.com/bandprotocol/chain/v2/x/oracle/types"

x/oracle/ibc_module.go

@@ -5,17 +5,16 @@ import (
 	"math"
 	"strings"
 
-	"github.com/bandprotocol/chain/v2/x/oracle/keeper"
-	"github.com/bandprotocol/chain/v2/x/oracle/types"
-
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 	capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
-
 	channeltypes "github.com/cosmos/ibc-go/v7/modules/core/04-channel/types"
 	porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types"
 	host "github.com/cosmos/ibc-go/v7/modules/core/24-host"
 	ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
+
+	"github.com/bandprotocol/chain/v2/x/oracle/keeper"
+	"github.com/bandprotocol/chain/v2/x/oracle/types"
 )
 
 // IBCModule implements the ICS26 interface for oracle given the oracle keeper.

x/oracle/ibc_test.go

@@ -12,7 +12,6 @@ import (
 	"github.com/stretchr/testify/suite"
 
 	"github.com/bandprotocol/chain/v2/pkg/obi"
-
 	ibctesting "github.com/bandprotocol/chain/v2/testing"
 	"github.com/bandprotocol/chain/v2/testing/testapp"
 	"github.com/bandprotocol/chain/v2/x/oracle/types"

x/oracle/keeper/keeper.go

@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"time"
 
+	owasm "github.com/bandprotocol/go-owasm/api"
 	"github.com/cometbft/cometbft/libs/log"
 	"github.com/cosmos/cosmos-sdk/codec"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
@@ -14,8 +15,6 @@ import (
 	capabilitytypes "github.com/cosmos/cosmos-sdk/x/capability/types"
 	host "github.com/cosmos/ibc-go/v7/modules/core/24-host"
 
-	owasm "github.com/bandprotocol/go-owasm/api"
-
 	"github.com/bandprotocol/chain/v2/pkg/filecache"
 	"github.com/bandprotocol/chain/v2/x/oracle/types"
 )

x/oracle/keeper/migrator.go

@@ -1,9 +1,10 @@
 package keeper
 
 import (
+	sdk "github.com/cosmos/cosmos-sdk/types"
+
 	"github.com/bandprotocol/chain/v2/x/oracle/exported"
 	v2 "github.com/bandprotocol/chain/v2/x/oracle/migrations/v2"
-	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
 // Migrator is a struct for handling in-place state migrations.

x/oracle/keeper/owasm.go

@@ -10,7 +10,6 @@ import (
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 
 	"github.com/bandprotocol/chain/v2/pkg/bandrng"
-
 	"github.com/bandprotocol/chain/v2/x/oracle/types"
 )
 

x/oracle/keeper/owasm_test.go

@@ -13,7 +13,6 @@ import (
 	"github.com/stretchr/testify/require"
 
 	"github.com/bandprotocol/chain/v2/pkg/obi"
-
 	"github.com/bandprotocol/chain/v2/testing/testapp"
 	"github.com/bandprotocol/chain/v2/x/oracle/keeper"
 	"github.com/bandprotocol/chain/v2/x/oracle/types"

x/oracle/keeper/snapshotter_integration_test.go

@@ -3,12 +3,13 @@ package keeper_test
 import (
 	"testing"
 
-	"github.com/bandprotocol/chain/v2/testing/testapp"
-	"github.com/bandprotocol/chain/v2/x/oracle/keeper"
 	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+
+	"github.com/bandprotocol/chain/v2/testing/testapp"
+	"github.com/bandprotocol/chain/v2/x/oracle/keeper"
 )
 
 func TestSnapshotter(t *testing.T) {