diff --git a/codec/codec.go b/codec/codec.go index 7f8060f88a8e..3d9cfd771bc0 100644 --- a/codec/codec.go +++ b/codec/codec.go @@ -2,11 +2,11 @@ package codec import ( "github.com/cosmos/gogoproto/proto" + gogoprotoany "github.com/cosmos/gogoproto/types/any" "google.golang.org/grpc/encoding" "google.golang.org/protobuf/reflect/protoreflect" "github.com/cosmos/cosmos-sdk/codec/types" - gogoprotoany "github.com/cosmos/gogoproto/types/any" ) type ( diff --git a/crypto/keyring/legacy_info.go b/crypto/keyring/legacy_info.go index ca615809324a..48e5d664f11f 100644 --- a/crypto/keyring/legacy_info.go +++ b/crypto/keyring/legacy_info.go @@ -4,13 +4,14 @@ import ( "errors" "fmt" + gogoprotoany "github.com/cosmos/gogoproto/types/any" + "github.com/cosmos/cosmos-sdk/codec/legacy" codectypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/crypto/hd" "github.com/cosmos/cosmos-sdk/crypto/keys/multisig" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" sdk "github.com/cosmos/cosmos-sdk/types" - gogoprotoany "github.com/cosmos/gogoproto/types/any" ) // Deprecated: LegacyInfo is the publicly exposed information about a keypair diff --git a/crypto/keyring/record.go b/crypto/keyring/record.go index fb7ddeee06a7..2e19c5b91576 100644 --- a/crypto/keyring/record.go +++ b/crypto/keyring/record.go @@ -3,13 +3,14 @@ package keyring import ( "errors" + gogoprotoany "github.com/cosmos/gogoproto/types/any" + errorsmod "cosmossdk.io/errors" codectypes "github.com/cosmos/cosmos-sdk/codec/types" "github.com/cosmos/cosmos-sdk/crypto/hd" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" "github.com/cosmos/cosmos-sdk/types" - gogoprotoany "github.com/cosmos/gogoproto/types/any" ) var ( diff --git a/crypto/keys/multisig/multisig.go b/crypto/keys/multisig/multisig.go index c088ac2fd779..1fc3f8e28098 100644 --- a/crypto/keys/multisig/multisig.go +++ b/crypto/keys/multisig/multisig.go @@ -4,12 +4,12 @@ import ( "fmt" cmtcrypto "github.com/cometbft/cometbft/crypto" + gogoprotoany "github.com/cosmos/gogoproto/types/any" "github.com/cosmos/cosmos-sdk/codec/types" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" multisigtypes "github.com/cosmos/cosmos-sdk/crypto/types/multisig" "github.com/cosmos/cosmos-sdk/types/tx/signing" - gogoprotoany "github.com/cosmos/gogoproto/types/any" ) var ( diff --git a/types/result.go b/types/result.go index 02a18c59f6ce..b4724151e9da 100644 --- a/types/result.go +++ b/types/result.go @@ -7,10 +7,10 @@ import ( cmtproto "github.com/cometbft/cometbft/api/cometbft/types/v1" coretypes "github.com/cometbft/cometbft/rpc/core/types" + gogoprotoany "github.com/cosmos/gogoproto/types/any" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" - gogoprotoany "github.com/cosmos/gogoproto/types/any" ) func (gi GasInfo) String() string { diff --git a/types/tx/direct_aux.go b/types/tx/direct_aux.go index 92183b904c55..d685a837ad29 100644 --- a/types/tx/direct_aux.go +++ b/types/tx/direct_aux.go @@ -1,10 +1,11 @@ package tx import ( + gogoprotoany "github.com/cosmos/gogoproto/types/any" + cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" "github.com/cosmos/cosmos-sdk/types/tx/signing" - gogoprotoany "github.com/cosmos/gogoproto/types/any" ) // ValidateBasic performs stateless validation of the sign doc. diff --git a/types/tx/ext.go b/types/tx/ext.go index 94038f65d849..e51be337d5b1 100644 --- a/types/tx/ext.go +++ b/types/tx/ext.go @@ -1,8 +1,9 @@ package tx import ( - "github.com/cosmos/cosmos-sdk/codec/types" gogoprotoany "github.com/cosmos/gogoproto/types/any" + + "github.com/cosmos/cosmos-sdk/codec/types" ) // TxExtensionOptionI defines the interface for tx extension options diff --git a/types/tx/msgs.go b/types/tx/msgs.go index 1e8476809f60..036f9a2414c8 100644 --- a/types/tx/msgs.go +++ b/types/tx/msgs.go @@ -3,9 +3,10 @@ package tx import ( "fmt" + gogoprotoany "github.com/cosmos/gogoproto/types/any" + "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" - gogoprotoany "github.com/cosmos/gogoproto/types/any" ) const ( diff --git a/types/tx/signing/signature.go b/types/tx/signing/signature.go index 7860637b8415..a27ea27b86eb 100644 --- a/types/tx/signing/signature.go +++ b/types/tx/signing/signature.go @@ -3,8 +3,9 @@ package signing import ( "fmt" - cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" gogoprotoany "github.com/cosmos/gogoproto/types/any" + + cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" ) // SignatureV2 is a convenience type that is easier to use in application logic diff --git a/types/tx/types.go b/types/tx/types.go index 2917cd86b5ea..cc64047393cf 100644 --- a/types/tx/types.go +++ b/types/tx/types.go @@ -3,6 +3,7 @@ package tx import ( "fmt" + gogoprotoany "github.com/cosmos/gogoproto/types/any" "google.golang.org/protobuf/reflect/protoreflect" "cosmossdk.io/core/registry" @@ -12,7 +13,6 @@ import ( cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - gogoprotoany "github.com/cosmos/gogoproto/types/any" ) // MaxGasWanted defines the max gas allowed. diff --git a/x/auth/migrations/legacytx/stdsign.go b/x/auth/migrations/legacytx/stdsign.go index 2b8452520a3c..04e131768ac2 100644 --- a/x/auth/migrations/legacytx/stdsign.go +++ b/x/auth/migrations/legacytx/stdsign.go @@ -4,6 +4,7 @@ import ( "encoding/json" "fmt" + gogoprotoany "github.com/cosmos/gogoproto/types/any" "sigs.k8s.io/yaml" "cosmossdk.io/errors" @@ -15,7 +16,6 @@ import ( "github.com/cosmos/cosmos-sdk/crypto/types/multisig" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/tx/signing" - gogoprotoany "github.com/cosmos/gogoproto/types/any" ) // LegacyMsg defines the old interface a message must fulfill, diff --git a/x/auth/migrations/legacytx/stdsignmsg.go b/x/auth/migrations/legacytx/stdsignmsg.go index b4cb5242b228..1fd8c585015f 100644 --- a/x/auth/migrations/legacytx/stdsignmsg.go +++ b/x/auth/migrations/legacytx/stdsignmsg.go @@ -1,9 +1,10 @@ package legacytx import ( + gogoprotoany "github.com/cosmos/gogoproto/types/any" + "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" - gogoprotoany "github.com/cosmos/gogoproto/types/any" ) var _ gogoprotoany.UnpackInterfacesMessage = StdSignMsg{} diff --git a/x/auth/migrations/legacytx/stdtx.go b/x/auth/migrations/legacytx/stdtx.go index aacece7e5ec6..5e67518716d5 100644 --- a/x/auth/migrations/legacytx/stdtx.go +++ b/x/auth/migrations/legacytx/stdtx.go @@ -1,6 +1,8 @@ package legacytx import ( + gogoprotoany "github.com/cosmos/gogoproto/types/any" + errorsmod "cosmossdk.io/errors" "cosmossdk.io/math" @@ -9,7 +11,6 @@ import ( cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/tx/signing" - gogoprotoany "github.com/cosmos/gogoproto/types/any" ) // Interface implementation checks diff --git a/x/auth/types/account.go b/x/auth/types/account.go index 4d889178ae29..f2147d75bd54 100644 --- a/x/auth/types/account.go +++ b/x/auth/types/account.go @@ -7,11 +7,12 @@ import ( "fmt" "strings" + gogoprotoany "github.com/cosmos/gogoproto/types/any" + codectypes "github.com/cosmos/cosmos-sdk/codec/types" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/address" - gogoprotoany "github.com/cosmos/gogoproto/types/any" ) var ( diff --git a/x/auth/types/query.go b/x/auth/types/query.go index 67b708837047..96b089e18a74 100644 --- a/x/auth/types/query.go +++ b/x/auth/types/query.go @@ -1,8 +1,9 @@ package types import ( - sdk "github.com/cosmos/cosmos-sdk/types" gogoprotoany "github.com/cosmos/gogoproto/types/any" + + sdk "github.com/cosmos/cosmos-sdk/types" ) func (m *QueryAccountResponse) UnpackInterfaces(unpacker gogoprotoany.AnyUnpacker) error { diff --git a/x/authz/authorization_grant.go b/x/authz/authorization_grant.go index 4ea7ba1abf09..c054eb081403 100644 --- a/x/authz/authorization_grant.go +++ b/x/authz/authorization_grant.go @@ -4,10 +4,11 @@ import ( "time" "github.com/cosmos/gogoproto/proto" + gogoprotoany "github.com/cosmos/gogoproto/types/any" errorsmod "cosmossdk.io/errors" + sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - gogoprotoany "github.com/cosmos/gogoproto/types/any" ) // NewGrant returns new Grant. Expiration is optional and noop if null. diff --git a/x/authz/simulation/operations.go b/x/authz/simulation/operations.go index 7b3fcb38467e..374a451cfc23 100644 --- a/x/authz/simulation/operations.go +++ b/x/authz/simulation/operations.go @@ -5,6 +5,8 @@ import ( "math/rand" "time" + gogoprotoany "github.com/cosmos/gogoproto/types/any" + "cosmossdk.io/core/address" "cosmossdk.io/core/appmodule" corecontext "cosmossdk.io/core/context" @@ -13,7 +15,6 @@ import ( "cosmossdk.io/x/authz" "cosmossdk.io/x/authz/keeper" banktype "cosmossdk.io/x/bank/types" - gogoprotoany "github.com/cosmos/gogoproto/types/any" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" diff --git a/x/evidence/types/genesis.go b/x/evidence/types/genesis.go index ea64940f0f4d..e5c683831663 100644 --- a/x/evidence/types/genesis.go +++ b/x/evidence/types/genesis.go @@ -4,12 +4,11 @@ import ( "fmt" "github.com/cosmos/gogoproto/proto" + gogoprotoany "github.com/cosmos/gogoproto/types/any" "cosmossdk.io/x/evidence/exported" "github.com/cosmos/cosmos-sdk/codec/types" - - gogoprotoany "github.com/cosmos/gogoproto/types/any" ) var _ gogoprotoany.UnpackInterfacesMessage = GenesisState{} diff --git a/x/evidence/types/genesis_test.go b/x/evidence/types/genesis_test.go index 829050108b49..786b2103f762 100644 --- a/x/evidence/types/genesis_test.go +++ b/x/evidence/types/genesis_test.go @@ -5,11 +5,11 @@ import ( "testing" "time" + gogoprotoany "github.com/cosmos/gogoproto/types/any" "github.com/stretchr/testify/require" "cosmossdk.io/x/evidence/exported" "cosmossdk.io/x/evidence/types" - gogoprotoany "github.com/cosmos/gogoproto/types/any" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" diff --git a/x/feegrant/grant.go b/x/feegrant/grant.go index 2be36fa526a6..a483475c6b41 100644 --- a/x/feegrant/grant.go +++ b/x/feegrant/grant.go @@ -2,12 +2,12 @@ package feegrant import ( "github.com/cosmos/gogoproto/proto" + gogoprotoany "github.com/cosmos/gogoproto/types/any" errorsmod "cosmossdk.io/errors" "github.com/cosmos/cosmos-sdk/codec/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - gogoprotoany "github.com/cosmos/gogoproto/types/any" ) var _ gogoprotoany.UnpackInterfacesMessage = &Grant{} diff --git a/x/gov/types/v1/msgs.go b/x/gov/types/v1/msgs.go index d061b6bddbd0..70b4b90c5c73 100644 --- a/x/gov/types/v1/msgs.go +++ b/x/gov/types/v1/msgs.go @@ -4,9 +4,10 @@ import ( "errors" "fmt" - "cosmossdk.io/x/gov/types/v1beta1" gogoprotoany "github.com/cosmos/gogoproto/types/any" + "cosmossdk.io/x/gov/types/v1beta1" + codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" sdktx "github.com/cosmos/cosmos-sdk/types/tx" diff --git a/x/gov/types/v1beta1/genesis.go b/x/gov/types/v1beta1/genesis.go index 987a47cacf88..d2c288574db6 100644 --- a/x/gov/types/v1beta1/genesis.go +++ b/x/gov/types/v1beta1/genesis.go @@ -3,8 +3,9 @@ package v1beta1 import ( "fmt" - "cosmossdk.io/math" gogoprotoany "github.com/cosmos/gogoproto/types/any" + + "cosmossdk.io/math" ) // NewGenesisState creates a new genesis state for the governance module diff --git a/x/group/genesis.go b/x/group/genesis.go index 87df3bf52acc..2a7e073890ba 100644 --- a/x/group/genesis.go +++ b/x/group/genesis.go @@ -3,10 +3,11 @@ package group import ( "fmt" + gogoprotoany "github.com/cosmos/gogoproto/types/any" + errorsmod "cosmossdk.io/errors" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - gogoprotoany "github.com/cosmos/gogoproto/types/any" ) // NewGenesisState creates a new genesis state with default values. diff --git a/x/group/proposal.go b/x/group/proposal.go index 815d81d8ec98..642e8981a487 100644 --- a/x/group/proposal.go +++ b/x/group/proposal.go @@ -1,9 +1,10 @@ package group import ( + gogoprotoany "github.com/cosmos/gogoproto/types/any" + sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/tx" - gogoprotoany "github.com/cosmos/gogoproto/types/any" ) // GetMsgs unpacks p.Messages Any's into sdk.Msg's diff --git a/x/group/simulation/operations.go b/x/group/simulation/operations.go index e9e33a4a1c05..d0eb1b8f7989 100644 --- a/x/group/simulation/operations.go +++ b/x/group/simulation/operations.go @@ -8,6 +8,8 @@ import ( "sync/atomic" "time" + gogoprotoany "github.com/cosmos/gogoproto/types/any" + "cosmossdk.io/core/address" "cosmossdk.io/x/group" "cosmossdk.io/x/group/keeper" @@ -20,7 +22,6 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" "github.com/cosmos/cosmos-sdk/x/simulation" - gogoprotoany "github.com/cosmos/gogoproto/types/any" ) const unsetGroupID = 100000000000000 diff --git a/x/group/types.go b/x/group/types.go index e8328a6e6470..d91d4fd89704 100644 --- a/x/group/types.go +++ b/x/group/types.go @@ -5,13 +5,13 @@ import ( "time" "github.com/cosmos/gogoproto/proto" + gogoprotoany "github.com/cosmos/gogoproto/types/any" "cosmossdk.io/core/address" errorsmod "cosmossdk.io/errors" "cosmossdk.io/x/group/errors" "cosmossdk.io/x/group/internal/math" "cosmossdk.io/x/group/internal/orm" - gogoprotoany "github.com/cosmos/gogoproto/types/any" codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/staking/types/genesis.go b/x/staking/types/genesis.go index 673d251caa23..e3534fc4ea58 100644 --- a/x/staking/types/genesis.go +++ b/x/staking/types/genesis.go @@ -3,8 +3,9 @@ package types import ( "encoding/json" - "github.com/cosmos/cosmos-sdk/codec" gogoprotoany "github.com/cosmos/gogoproto/types/any" + + "github.com/cosmos/cosmos-sdk/codec" ) // NewGenesisState creates a new GenesisState instance diff --git a/x/staking/types/msg.go b/x/staking/types/msg.go index 5c70ceb4c353..782183ff0684 100644 --- a/x/staking/types/msg.go +++ b/x/staking/types/msg.go @@ -1,11 +1,12 @@ package types import ( + gogoprotoany "github.com/cosmos/gogoproto/types/any" + "cosmossdk.io/core/address" coretransaction "cosmossdk.io/core/transaction" errorsmod "cosmossdk.io/errors" "cosmossdk.io/math" - gogoprotoany "github.com/cosmos/gogoproto/types/any" codectypes "github.com/cosmos/cosmos-sdk/codec/types" cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" diff --git a/x/staking/types/validator.go b/x/staking/types/validator.go index fc169e357d23..c2e442d4c55a 100644 --- a/x/staking/types/validator.go +++ b/x/staking/types/validator.go @@ -7,6 +7,8 @@ import ( "strings" "time" + gogoprotoany "github.com/cosmos/gogoproto/types/any" + "cosmossdk.io/core/address" "cosmossdk.io/core/appmodule" "cosmossdk.io/errors" @@ -17,7 +19,6 @@ import ( cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - gogoprotoany "github.com/cosmos/gogoproto/types/any" ) const (