diff --git a/app/ante.go b/app/ante.go index 81eb2cb5b..b72341f43 100644 --- a/app/ante.go +++ b/app/ante.go @@ -14,10 +14,10 @@ import ( govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" wasmTypes "github.com/CosmWasm/wasmd/x/wasm/types" - decorators "github.com/CosmosContracts/juno/v14/app/decorators" + decorators "github.com/CosmosContracts/juno/v15/app/decorators" - feeshareante "github.com/CosmosContracts/juno/v14/x/feeshare/ante" - feesharekeeper "github.com/CosmosContracts/juno/v14/x/feeshare/keeper" + feeshareante "github.com/CosmosContracts/juno/v15/x/feeshare/ante" + feesharekeeper "github.com/CosmosContracts/juno/v15/x/feeshare/keeper" gaiafeeante "github.com/cosmos/gaia/v9/x/globalfee/ante" ) diff --git a/app/app.go b/app/app.go index b5602a7a8..52b1c0757 100644 --- a/app/app.go +++ b/app/app.go @@ -7,8 +7,8 @@ import ( "strconv" "strings" - "github.com/CosmosContracts/juno/v14/app/openapiconsole" - "github.com/CosmosContracts/juno/v14/docs" + "github.com/CosmosContracts/juno/v15/app/openapiconsole" + "github.com/CosmosContracts/juno/v15/docs" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/grpc/tmservice" @@ -55,14 +55,15 @@ import ( "github.com/cosmos/gaia/v9/x/globalfee" - "github.com/CosmosContracts/juno/v14/app/keepers" - encparams "github.com/CosmosContracts/juno/v14/app/params" - upgrades "github.com/CosmosContracts/juno/v14/app/upgrades" - v10 "github.com/CosmosContracts/juno/v14/app/upgrades/v10" - v11 "github.com/CosmosContracts/juno/v14/app/upgrades/v11" - v12 "github.com/CosmosContracts/juno/v14/app/upgrades/v12" - v13 "github.com/CosmosContracts/juno/v14/app/upgrades/v13" - v14 "github.com/CosmosContracts/juno/v14/app/upgrades/v14" + "github.com/CosmosContracts/juno/v15/app/keepers" + encparams "github.com/CosmosContracts/juno/v15/app/params" + upgrades "github.com/CosmosContracts/juno/v15/app/upgrades" + v10 "github.com/CosmosContracts/juno/v15/app/upgrades/v10" + v11 "github.com/CosmosContracts/juno/v15/app/upgrades/v11" + v12 "github.com/CosmosContracts/juno/v15/app/upgrades/v12" + v13 "github.com/CosmosContracts/juno/v15/app/upgrades/v13" + v14 "github.com/CosmosContracts/juno/v15/app/upgrades/v14" + v15 "github.com/CosmosContracts/juno/v15/app/upgrades/v15" ) const ( @@ -83,7 +84,7 @@ var ( // https://github.com/CosmWasm/wasmd/blob/02a54d33ff2c064f3539ae12d75d027d9c665f05/x/wasm/internal/types/proposal.go#L28-L34 EnableSpecificProposals = "" - Upgrades = []upgrades.Upgrade{v10.Upgrade, v11.Upgrade, v12.Upgrade, v13.Upgrade, v14.Upgrade} + Upgrades = []upgrades.Upgrade{v10.Upgrade, v11.Upgrade, v12.Upgrade, v13.Upgrade, v14.Upgrade, v15.Upgrade} ) // These constants are derived from the above variables. diff --git a/app/encoding.go b/app/encoding.go index d0cfb03da..56e813683 100644 --- a/app/encoding.go +++ b/app/encoding.go @@ -1,7 +1,7 @@ package app import ( - "github.com/CosmosContracts/juno/v14/app/params" + "github.com/CosmosContracts/juno/v15/app/params" "github.com/cosmos/cosmos-sdk/std" ) diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index 96a1efae0..cd460cb17 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -7,8 +7,8 @@ import ( "github.com/CosmWasm/wasmd/x/wasm" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" - mintkeeper "github.com/CosmosContracts/juno/v14/x/mint/keeper" - minttypes "github.com/CosmosContracts/juno/v14/x/mint/types" + mintkeeper "github.com/CosmosContracts/juno/v15/x/mint/keeper" + minttypes "github.com/CosmosContracts/juno/v15/x/mint/types" "github.com/cosmos/cosmos-sdk/baseapp" "github.com/cosmos/cosmos-sdk/codec" servertypes "github.com/cosmos/cosmos-sdk/server/types" @@ -69,8 +69,8 @@ import ( icahostkeeper "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host/keeper" icahosttypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host/types" - feesharekeeper "github.com/CosmosContracts/juno/v14/x/feeshare/keeper" - feesharetypes "github.com/CosmosContracts/juno/v14/x/feeshare/types" + feesharekeeper "github.com/CosmosContracts/juno/v15/x/feeshare/keeper" + feesharetypes "github.com/CosmosContracts/juno/v15/x/feeshare/types" // ica "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts" icacontroller "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/controller" @@ -80,6 +80,12 @@ import ( "github.com/cosmos/gaia/v9/x/globalfee" ) +var EnabledCapabilities = []string{ + tokenfactorytypes.EnableBurnFrom, + tokenfactorytypes.EnableForceTransfer, + tokenfactorytypes.EnableSetMetadata, +} + type AppKeepers struct { // keys to access the substores keys map[string]*sdk.KVStoreKey @@ -357,6 +363,7 @@ func NewAppKeepers( appKeepers.AccountKeeper, appKeepers.BankKeeper, appKeepers.DistrKeeper, + EnabledCapabilities, ) wasmDir := filepath.Join(homePath, "data") diff --git a/app/keepers/keys.go b/app/keepers/keys.go index ed767be77..2685f401f 100644 --- a/app/keepers/keys.go +++ b/app/keepers/keys.go @@ -3,8 +3,8 @@ package keepers import ( tokenfactorytypes "github.com/CosmWasm/token-factory/x/tokenfactory/types" "github.com/CosmWasm/wasmd/x/wasm" - feesharetypes "github.com/CosmosContracts/juno/v14/x/feeshare/types" - minttypes "github.com/CosmosContracts/juno/v14/x/mint/types" + feesharetypes "github.com/CosmosContracts/juno/v15/x/feeshare/types" + minttypes "github.com/CosmosContracts/juno/v15/x/mint/types" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" diff --git a/app/modules.go b/app/modules.go index 655877405..e2481faef 100644 --- a/app/modules.go +++ b/app/modules.go @@ -4,11 +4,11 @@ import ( "github.com/CosmWasm/token-factory/x/tokenfactory" tokenfactorytypes "github.com/CosmWasm/token-factory/x/tokenfactory/types" "github.com/CosmWasm/wasmd/x/wasm" - encparams "github.com/CosmosContracts/juno/v14/app/params" - feeshare "github.com/CosmosContracts/juno/v14/x/feeshare" - feesharetypes "github.com/CosmosContracts/juno/v14/x/feeshare/types" - "github.com/CosmosContracts/juno/v14/x/mint" - minttypes "github.com/CosmosContracts/juno/v14/x/mint/types" + encparams "github.com/CosmosContracts/juno/v15/app/params" + feeshare "github.com/CosmosContracts/juno/v15/x/feeshare" + feesharetypes "github.com/CosmosContracts/juno/v15/x/feeshare/types" + "github.com/CosmosContracts/juno/v15/x/mint" + minttypes "github.com/CosmosContracts/juno/v15/x/mint/types" "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/x/auth" authsims "github.com/cosmos/cosmos-sdk/x/auth/simulation" diff --git a/app/test_helpers.go b/app/test_helpers.go index 1a7a99b98..71e39f57c 100644 --- a/app/test_helpers.go +++ b/app/test_helpers.go @@ -7,8 +7,8 @@ import ( "github.com/CosmWasm/wasmd/x/wasm" "github.com/CosmWasm/wasmd/x/wasm/keeper" - apphelpers "github.com/CosmosContracts/juno/v14/app/helpers" - appparams "github.com/CosmosContracts/juno/v14/app/params" + apphelpers "github.com/CosmosContracts/juno/v15/app/helpers" + appparams "github.com/CosmosContracts/juno/v15/app/params" codectypes "github.com/cosmos/cosmos-sdk/codec/types" cryptocodec "github.com/cosmos/cosmos-sdk/crypto/codec" "github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1" diff --git a/app/upgrades/types.go b/app/upgrades/types.go index 005c52784..d833795a5 100644 --- a/app/upgrades/types.go +++ b/app/upgrades/types.go @@ -3,7 +3,7 @@ package upgrades import ( "strings" - "github.com/CosmosContracts/juno/v14/app/keepers" + "github.com/CosmosContracts/juno/v15/app/keepers" store "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" diff --git a/app/upgrades/v10/constants.go b/app/upgrades/v10/constants.go index 6d6c2d254..b21c62b2d 100644 --- a/app/upgrades/v10/constants.go +++ b/app/upgrades/v10/constants.go @@ -1,7 +1,7 @@ package v10 import ( - "github.com/CosmosContracts/juno/v14/app/upgrades" + "github.com/CosmosContracts/juno/v15/app/upgrades" store "github.com/cosmos/cosmos-sdk/store/types" icacontrollertypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/controller/types" icahosttypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host/types" diff --git a/app/upgrades/v10/upgrades.go b/app/upgrades/v10/upgrades.go index b1b8a550f..a96e920c3 100644 --- a/app/upgrades/v10/upgrades.go +++ b/app/upgrades/v10/upgrades.go @@ -2,7 +2,7 @@ package v10 import ( wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - "github.com/CosmosContracts/juno/v14/app/keepers" + "github.com/CosmosContracts/juno/v15/app/keepers" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/x/authz" diff --git a/app/upgrades/v11/constants.go b/app/upgrades/v11/constants.go index 977461ec0..f05fff308 100644 --- a/app/upgrades/v11/constants.go +++ b/app/upgrades/v11/constants.go @@ -1,7 +1,7 @@ package v11 import ( - "github.com/CosmosContracts/juno/v14/app/upgrades" + "github.com/CosmosContracts/juno/v15/app/upgrades" store "github.com/cosmos/cosmos-sdk/store/types" icacontrollertypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/controller/types" icahosttypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/host/types" diff --git a/app/upgrades/v11/upgrades.go b/app/upgrades/v11/upgrades.go index bec52ccaa..5ab901559 100644 --- a/app/upgrades/v11/upgrades.go +++ b/app/upgrades/v11/upgrades.go @@ -2,7 +2,7 @@ package v11 import ( wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - "github.com/CosmosContracts/juno/v14/app/keepers" + "github.com/CosmosContracts/juno/v15/app/keepers" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" "github.com/cosmos/cosmos-sdk/x/authz" diff --git a/app/upgrades/v12/constants.go b/app/upgrades/v12/constants.go index dc1ed6458..c7f9b99a6 100644 --- a/app/upgrades/v12/constants.go +++ b/app/upgrades/v12/constants.go @@ -1,7 +1,7 @@ package v12 import ( - "github.com/CosmosContracts/juno/v14/app/upgrades" + "github.com/CosmosContracts/juno/v15/app/upgrades" store "github.com/cosmos/cosmos-sdk/store/types" ) diff --git a/app/upgrades/v12/upgrades.go b/app/upgrades/v12/upgrades.go index 5fdd84fe8..8aa40a53f 100644 --- a/app/upgrades/v12/upgrades.go +++ b/app/upgrades/v12/upgrades.go @@ -1,7 +1,7 @@ package v12 import ( - "github.com/CosmosContracts/juno/v14/app/keepers" + "github.com/CosmosContracts/juno/v15/app/keepers" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" diff --git a/app/upgrades/v13/constants.go b/app/upgrades/v13/constants.go index e4808d387..991183022 100644 --- a/app/upgrades/v13/constants.go +++ b/app/upgrades/v13/constants.go @@ -2,8 +2,8 @@ package v13 import ( tokenfactorytypes "github.com/CosmWasm/token-factory/x/tokenfactory/types" - "github.com/CosmosContracts/juno/v14/app/upgrades" - feesharetypes "github.com/CosmosContracts/juno/v14/x/feeshare/types" + "github.com/CosmosContracts/juno/v15/app/upgrades" + feesharetypes "github.com/CosmosContracts/juno/v15/x/feeshare/types" store "github.com/cosmos/cosmos-sdk/store/types" icacontrollertypes "github.com/cosmos/ibc-go/v4/modules/apps/27-interchain-accounts/controller/types" ibcfeetypes "github.com/cosmos/ibc-go/v4/modules/apps/29-fee/types" diff --git a/app/upgrades/v13/upgrades.go b/app/upgrades/v13/upgrades.go index 1792c8208..2cc5f6d85 100644 --- a/app/upgrades/v13/upgrades.go +++ b/app/upgrades/v13/upgrades.go @@ -3,9 +3,9 @@ package v13 import ( "fmt" - "github.com/CosmosContracts/juno/v14/app/keepers" + "github.com/CosmosContracts/juno/v15/app/keepers" - "github.com/CosmosContracts/juno/v14/app/upgrades" + "github.com/CosmosContracts/juno/v15/app/upgrades" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" @@ -16,7 +16,7 @@ import ( // types tokenfactorytypes "github.com/CosmWasm/token-factory/x/tokenfactory/types" - feesharetypes "github.com/CosmosContracts/juno/v14/x/feeshare/types" + feesharetypes "github.com/CosmosContracts/juno/v15/x/feeshare/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" ibcfeetypes "github.com/cosmos/ibc-go/v4/modules/apps/29-fee/types" diff --git a/app/upgrades/v14/constants.go b/app/upgrades/v14/constants.go index 63cd8cdba..a40ee4812 100644 --- a/app/upgrades/v14/constants.go +++ b/app/upgrades/v14/constants.go @@ -1,7 +1,7 @@ package v14 import ( - "github.com/CosmosContracts/juno/v14/app/upgrades" + "github.com/CosmosContracts/juno/v15/app/upgrades" store "github.com/cosmos/cosmos-sdk/store/types" "github.com/cosmos/gaia/v9/x/globalfee" ibchookstypes "github.com/osmosis-labs/osmosis/x/ibc-hooks/types" diff --git a/app/upgrades/v14/upgrades.go b/app/upgrades/v14/upgrades.go index 85111458e..7209f594a 100644 --- a/app/upgrades/v14/upgrades.go +++ b/app/upgrades/v14/upgrades.go @@ -3,9 +3,9 @@ package v14 import ( "fmt" - "github.com/CosmosContracts/juno/v14/app/keepers" + "github.com/CosmosContracts/juno/v15/app/keepers" - "github.com/CosmosContracts/juno/v14/app/upgrades" + "github.com/CosmosContracts/juno/v15/app/upgrades" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" diff --git a/app/upgrades/v15/constants.go b/app/upgrades/v15/constants.go new file mode 100644 index 000000000..73e7da15f --- /dev/null +++ b/app/upgrades/v15/constants.go @@ -0,0 +1,15 @@ +package v14 + +import ( + "github.com/CosmosContracts/juno/v15/app/upgrades" + store "github.com/cosmos/cosmos-sdk/store/types" +) + +// UpgradeName defines the on-chain upgrade name for the upgrade. +const UpgradeName = "v15" + +var Upgrade = upgrades.Upgrade{ + UpgradeName: UpgradeName, + CreateUpgradeHandler: CreateV15PatchUpgradeHandler, + StoreUpgrades: store.StoreUpgrades{}, +} diff --git a/app/upgrades/v15/upgrades.go b/app/upgrades/v15/upgrades.go new file mode 100644 index 000000000..7ba424d11 --- /dev/null +++ b/app/upgrades/v15/upgrades.go @@ -0,0 +1,42 @@ +package v14 + +import ( + "fmt" + + "github.com/CosmosContracts/juno/v15/app/keepers" + + sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/types/module" + + tokenfactorytypes "github.com/CosmWasm/token-factory/x/tokenfactory/types" + upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" +) + +// We now charge 2 million gas * gas price to create a denom. +const NewDenomCreationGasConsume uint64 = 2_000_000 + +func CreateV15PatchUpgradeHandler( + mm *module.Manager, + cfg module.Configurator, + keepers *keepers.AppKeepers, +) upgradetypes.UpgradeHandler { + return func(ctx sdk.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) { + logger := ctx.Logger().With("upgrade", UpgradeName) + + logger.Info(fmt.Sprintf("pre migrate version map: %v", vm)) + versionMap, err := mm.RunMigrations(ctx, cfg, vm) + logger.Info(fmt.Sprintf("post migrate version map: %v", versionMap)) + + // x/TokenFactory + // Use denom creation gas consumtion instead of fee for contract developers + updatedTf := tokenfactorytypes.Params{ + DenomCreationFee: nil, + DenomCreationGasConsume: NewDenomCreationGasConsume, + } + + keepers.TokenFactoryKeeper.SetParams(ctx, updatedTf) + logger.Info(fmt.Sprintf("updated tokenfactory params to %v", updatedTf)) + + return versionMap, err + } +} diff --git a/cmd/junod/cmd/balances_from_state_export.go b/cmd/junod/cmd/balances_from_state_export.go index 98f5515d2..225ca72dc 100644 --- a/cmd/junod/cmd/balances_from_state_export.go +++ b/cmd/junod/cmd/balances_from_state_export.go @@ -15,7 +15,7 @@ import ( tmjson "github.com/tendermint/tendermint/libs/json" tmtypes "github.com/tendermint/tendermint/types" - appparams "github.com/CosmosContracts/juno/v14/app/params" + appparams "github.com/CosmosContracts/juno/v15/app/params" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/server" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/cmd/junod/cmd/root.go b/cmd/junod/cmd/root.go index 36f2afdfd..69a102b4f 100644 --- a/cmd/junod/cmd/root.go +++ b/cmd/junod/cmd/root.go @@ -35,8 +35,8 @@ import ( "github.com/CosmWasm/wasmd/x/wasm" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - "github.com/CosmosContracts/juno/v14/app" - "github.com/CosmosContracts/juno/v14/app/params" + "github.com/CosmosContracts/juno/v15/app" + "github.com/CosmosContracts/juno/v15/app/params" ) // NewRootCmd creates a new root command for junod. It is called once in the diff --git a/cmd/junod/main.go b/cmd/junod/main.go index 2b26f30d7..915394b24 100644 --- a/cmd/junod/main.go +++ b/cmd/junod/main.go @@ -3,8 +3,8 @@ package main import ( "os" - "github.com/CosmosContracts/juno/v14/app" - "github.com/CosmosContracts/juno/v14/cmd/junod/cmd" + "github.com/CosmosContracts/juno/v15/app" + "github.com/CosmosContracts/juno/v15/cmd/junod/cmd" "github.com/cosmos/cosmos-sdk/server" svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" diff --git a/go.mod b/go.mod index eb4a5c4d1..517a4a617 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/CosmosContracts/juno/v14 +module github.com/CosmosContracts/juno/v15 go 1.19 @@ -160,7 +160,7 @@ replace ( // cosmos keyring github.com/99designs/keyring => github.com/cosmos/keyring v1.2.0 // token factory: - github.com/CosmWasm/token-factory => github.com/CosmosContracts/token-factory v1.2.0-juno + github.com/CosmWasm/token-factory => github.com/CosmosContracts/token-factory v1.2.1-juno.0.20230523144425-253f9b9df6a6 // TODO: Simapp dependency, review removing when updating to SDK with backported update https://github.com/cosmos/cosmos-sdk/issues/13423 github.com/btcsuite/btcd => github.com/btcsuite/btcd v0.22.2 // indirect // dgrijalva/jwt-go is deprecated and doesn't receive security updates. diff --git a/go.sum b/go.sum index 97428ba7f..51d2a61f4 100644 --- a/go.sum +++ b/go.sum @@ -68,8 +68,8 @@ github.com/CosmWasm/wasmd v0.31.0 h1:xACf6A/SkCeGWQWrKGsR4X9PQb5G4XYuNfnrl+HQ1mE github.com/CosmWasm/wasmd v0.31.0/go.mod h1:VcyDGk/ISVlMUeW+1GGL0zdHWBS2FPwLEV2qZ86l7l8= github.com/CosmWasm/wasmvm v1.2.3 h1:OKYlobwmVGbl0eSn0mXoAAjE5hIuXnQCLPjbNd91sVY= github.com/CosmWasm/wasmvm v1.2.3/go.mod h1:vW/E3h8j9xBQs9bCoijDuawKo9kCtxOaS8N8J7KFtkc= -github.com/CosmosContracts/token-factory v1.2.0-juno h1:ArPEH/gg2zD3RwtB++JR4rMSgNINb5TgVJRcwbSm15g= -github.com/CosmosContracts/token-factory v1.2.0-juno/go.mod h1:REKRfNe+zunKZitx2wGCPJBBmwu8qofOxGhsgV2h4cw= +github.com/CosmosContracts/token-factory v1.2.1-juno.0.20230523144425-253f9b9df6a6 h1:2jL+sNaJoH+OMGYhOCcL6M5i3RaLGDDunZr+GeWy2xQ= +github.com/CosmosContracts/token-factory v1.2.1-juno.0.20230523144425-253f9b9df6a6/go.mod h1:REKRfNe+zunKZitx2wGCPJBBmwu8qofOxGhsgV2h4cw= github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/DataDog/zstd v1.4.5/go.mod h1:1jcaCB/ufaK+sKp1NBhlGmpz41jOoPQ35bpF36t7BBo= diff --git a/tests/interchaintest/chain_upgrade_test.go b/tests/interchaintest/chain_upgrade_test.go index 371a3cd35..fd6b51d7a 100644 --- a/tests/interchaintest/chain_upgrade_test.go +++ b/tests/interchaintest/chain_upgrade_test.go @@ -22,8 +22,9 @@ const ( func TestBasicJunoUpgrade(t *testing.T) { repo, version := GetDockerImageInfo() - upgradeName := "v14" - CosmosChainUpgradeTest(t, "juno", "v13.0.1", version, repo, upgradeName) + // This is a patch upgrade that also includes the tokenfactory changes required for ICS999 + upgradeName := "v15" + CosmosChainUpgradeTest(t, "juno", "v14.1.0", version, repo, upgradeName) } func CosmosChainUpgradeTest(t *testing.T, chainName, initialVersion, upgradeBranchVersion, upgradeRepo, upgradeName string) { @@ -143,4 +144,13 @@ func CosmosChainUpgradeTest(t *testing.T, chainName, initialVersion, upgradeBran require.NoError(t, err, "error fetching height after upgrade") require.GreaterOrEqual(t, height, haltHeight+blocksAfterUpgrade, "height did not increment enough after upgrade") + + // ensure DenomCreationGasConsume for tokenfactory is set to 2000000 with the standard fee being set to empty + param, err := chain.QueryParam(ctx, "tokenfactory", "DenomCreationGasConsume") + require.NoError(t, err, "error querying denom creation gas consume") + require.Equal(t, param.Value, "\"2000000\"") + + param, err = chain.QueryParam(ctx, "tokenfactory", "DenomCreationFee") + require.NoError(t, err, "error querying denom creation fee") + require.Equal(t, param.Value, "[]") } diff --git a/tests/interchaintest/go.mod b/tests/interchaintest/go.mod index 270c0a1c5..1cfc39619 100644 --- a/tests/interchaintest/go.mod +++ b/tests/interchaintest/go.mod @@ -2,11 +2,33 @@ module github.com/CosmosContracts/juno/tests/interchaintest go 1.19 +replace ( + github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d + github.com/ChainSafe/go-schnorrkel/1 => github.com/ChainSafe/go-schnorrkel v1.0.0 + + // token factory: + github.com/CosmWasm/token-factory => github.com/CosmosContracts/token-factory v0.0.0-20230226045138-fb4138453558 + + // For this nested module, you always want to replace the parent reference with the current worktree. + // github.com/CosmosContracts/juno => ../../ + // github.com/CosmosContracts/juno/v15 => github.com/CosmosContracts/juno/v15 v16.0.0-20230524152917-465dae509bfe + github.com/btcsuite/btcd => github.com/btcsuite/btcd v0.22.2 //indirect + + // interchaintest supports ICS features so we need this for now + github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.45.13-ics + github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 + + // use informal system fork of tendermint + github.com/tendermint/tendermint => github.com/informalsystems/tendermint v0.34.26 + + github.com/vedhavyas/go-subkey => github.com/strangelove-ventures/go-subkey v1.0.7 +) + require ( - github.com/CosmosContracts/juno/v13 v13.0.0 - github.com/cosmos/cosmos-sdk v0.45.14 + github.com/CosmosContracts/juno/v15 v15.0.0-20230524152339-77942b14da8c + github.com/cosmos/cosmos-sdk v0.45.16 github.com/cosmos/ibc-go/v4 v4.3.0 - github.com/strangelove-ventures/interchaintest/v4 v4.0.0-20230316161044-8d8c01f96b4a + github.com/strangelove-ventures/interchaintest/v4 v4.0.0-20230508170700-5b7cf4fd016b github.com/stretchr/testify v1.8.2 go.uber.org/zap v1.23.0 ) @@ -18,11 +40,11 @@ require ( github.com/BurntSushi/toml v1.2.1 // indirect github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect github.com/ChainSafe/go-schnorrkel/1 v0.0.0-00010101000000-000000000000 // indirect - github.com/CosmWasm/wasmd v0.30.0 // indirect - github.com/CosmWasm/wasmvm v1.1.1 // indirect + github.com/CosmWasm/wasmd v0.31.0 // indirect + github.com/CosmWasm/wasmvm v1.2.3 // indirect github.com/Microsoft/go-winio v0.6.0 // indirect github.com/StirlingMarketingGroup/go-namecase v1.0.0 // indirect - github.com/armon/go-metrics v0.4.0 // indirect + github.com/armon/go-metrics v0.4.1 // indirect github.com/avast/retry-go/v4 v4.0.4 // indirect github.com/benbjohnson/clock v1.3.0 // indirect github.com/beorn7/perks v1.0.1 // indirect @@ -36,7 +58,7 @@ require ( github.com/cosmos/btcutil v1.0.5 // indirect github.com/cosmos/cosmos-proto v1.0.0-beta.2 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect - github.com/cosmos/gogoproto v1.4.6 // indirect + github.com/cosmos/gogoproto v1.4.7 // indirect github.com/cosmos/gorocksdb v1.2.0 // indirect github.com/cosmos/iavl v0.19.5 // indirect github.com/cosmos/interchain-security v1.0.0 // indirect @@ -68,7 +90,7 @@ require ( github.com/gogo/protobuf v1.3.3 // indirect github.com/golang/glog v1.0.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect - github.com/golang/protobuf v1.5.2 // indirect + github.com/golang/protobuf v1.5.3 // indirect github.com/golang/snappy v0.0.4 // indirect github.com/google/btree v1.1.2 // indirect github.com/google/flatbuffers v1.12.1 // indirect @@ -88,7 +110,7 @@ require ( github.com/hashicorp/hcl v1.0.0 // indirect github.com/hdevalence/ed25519consensus v0.0.0-20220222234857-c00d1f31bab3 // indirect github.com/icza/dyno v0.0.0-20220812133438-f0b6f8a18845 // indirect - github.com/inconshreveable/mousetrap v1.0.1 // indirect + github.com/inconshreveable/mousetrap v1.1.0 // indirect github.com/ipfs/go-cid v0.0.7 // indirect github.com/jmhodges/levigo v1.0.0 // indirect github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect @@ -135,14 +157,14 @@ require ( github.com/spaolacci/murmur3 v1.1.0 // indirect github.com/spf13/afero v1.9.3 // indirect github.com/spf13/cast v1.5.0 // indirect - github.com/spf13/cobra v1.6.1 // indirect + github.com/spf13/cobra v1.7.0 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect github.com/spf13/viper v1.15.0 // indirect github.com/subosito/gotenv v1.4.2 // indirect github.com/syndtr/goleveldb v1.0.1-0.20220614013038-64ee5596c38a // indirect github.com/tendermint/go-amino v0.16.0 // indirect - github.com/tendermint/tendermint v0.34.26 // indirect + github.com/tendermint/tendermint v0.34.27 // indirect github.com/tendermint/tm-db v0.6.8-0.20220506192307-f628bb5dc95b // indirect github.com/tidwall/btree v1.5.0 // indirect github.com/vedhavyas/go-subkey v1.0.3 // indirect @@ -155,15 +177,15 @@ require ( golang.org/x/crypto v0.5.0 // indirect golang.org/x/exp v0.0.0-20230131160201-f062dba9d201 // indirect golang.org/x/mod v0.8.0 // indirect - golang.org/x/net v0.7.0 // indirect + golang.org/x/net v0.8.0 // indirect golang.org/x/sync v0.1.0 // indirect - golang.org/x/sys v0.5.0 // indirect - golang.org/x/term v0.5.0 // indirect - golang.org/x/text v0.7.0 // indirect + golang.org/x/sys v0.6.0 // indirect + golang.org/x/term v0.6.0 // indirect + golang.org/x/text v0.8.0 // indirect golang.org/x/tools v0.6.0 // indirect google.golang.org/genproto v0.0.0-20230125152338-dcaf20b6aeaa // indirect google.golang.org/grpc v1.53.0 // indirect - google.golang.org/protobuf v1.28.2-0.20220831092852-f930b1dc76e8 // indirect + google.golang.org/protobuf v1.29.1 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect gopkg.in/yaml.v2 v2.4.0 // indirect @@ -180,24 +202,3 @@ require ( modernc.org/strutil v1.1.1 // indirect modernc.org/token v1.0.0 // indirect ) - -replace ( - github.com/ChainSafe/go-schnorrkel => github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d - github.com/ChainSafe/go-schnorrkel/1 => github.com/ChainSafe/go-schnorrkel v1.0.0 - - // token factory: - github.com/CosmWasm/token-factory => github.com/CosmosContracts/token-factory v0.0.0-20230226045138-fb4138453558 - - // For this nested module, you always want to replace the parent reference with the current worktree. - github.com/CosmosContracts/juno => ../../ - github.com/btcsuite/btcd => github.com/btcsuite/btcd v0.22.2 //indirect - - // interchaintest supports ICS features so we need this for now - github.com/cosmos/cosmos-sdk => github.com/cosmos/cosmos-sdk v0.45.13-ics - github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 - - // use informal system fork of tendermint - github.com/tendermint/tendermint => github.com/informalsystems/tendermint v0.34.26 - - github.com/vedhavyas/go-subkey => github.com/strangelove-ventures/go-subkey v1.0.7 -) diff --git a/tests/interchaintest/go.sum b/tests/interchaintest/go.sum index c2c41b1e8..0233b521a 100644 --- a/tests/interchaintest/go.sum +++ b/tests/interchaintest/go.sum @@ -58,12 +58,12 @@ github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQ github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4= github.com/ChainSafe/go-schnorrkel v1.0.0 h1:3aDA67lAykLaG1y3AOjs88dMxC88PgUuHRrLeDnvGIM= github.com/ChainSafe/go-schnorrkel v1.0.0/go.mod h1:dpzHYVxLZcp8pjlV+O+UR8K0Hp/z7vcchBSbMBEhCw4= -github.com/CosmWasm/wasmd v0.30.0 h1:oUVz3TgO/+24JZQdoTOlOv+IK7N9hEa/s3M4eR9i4FQ= -github.com/CosmWasm/wasmd v0.30.0/go.mod h1:umLGeYyowAMMEdOYfDOf8jsDrQ75Qkm1+ogBXT/w01c= -github.com/CosmWasm/wasmvm v1.1.1 h1:0xtdrmmsP9fibe+x42WcMkp5aQ738BICgcH3FNVLzm4= -github.com/CosmWasm/wasmvm v1.1.1/go.mod h1:ei0xpvomwSdONsxDuONzV7bL1jSET1M8brEx0FCXc+A= -github.com/CosmosContracts/juno/v13 v13.0.0 h1:/1pikuWzkT9a3WN+o7JBgwvgzWFDF5cIpzJoXoHdHYo= -github.com/CosmosContracts/juno/v13 v13.0.0/go.mod h1:Woy1aY09yjO04m+9DQuNUOy10NTyLT0RcoysqfZGCyM= +github.com/CosmWasm/wasmd v0.31.0 h1:xACf6A/SkCeGWQWrKGsR4X9PQb5G4XYuNfnrl+HQ1mE= +github.com/CosmWasm/wasmd v0.31.0/go.mod h1:VcyDGk/ISVlMUeW+1GGL0zdHWBS2FPwLEV2qZ86l7l8= +github.com/CosmWasm/wasmvm v1.2.3 h1:OKYlobwmVGbl0eSn0mXoAAjE5hIuXnQCLPjbNd91sVY= +github.com/CosmWasm/wasmvm v1.2.3/go.mod h1:vW/E3h8j9xBQs9bCoijDuawKo9kCtxOaS8N8J7KFtkc= +github.com/CosmosContracts/juno/v15 v15.0.0-20230524152339-77942b14da8c h1:2HY5/Ps+sS8amSZHp2ymFmIb1NLhXMIOKsH7bn8GM3k= +github.com/CosmosContracts/juno/v15 v15.0.0-20230524152339-77942b14da8c/go.mod h1:snqXBNGPpDo6wWB8Cn/BigJs8ig9dGsWfZaAAspxChY= github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod h1:f/Ixk793poVmq4qj/V1dPUg2JEAKC73Q5eFN3EC/SaM= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/Microsoft/go-winio v0.6.0 h1:slsWYD/zyx7lCXoZVlvQrj0hPTM1HI4+v1sIda2yDvg= @@ -88,8 +88,8 @@ github.com/andreyvit/diff v0.0.0-20170406064948-c7f18ee00883/go.mod h1:rCTlJbsFo github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= github.com/apache/arrow/go/arrow v0.0.0-20191024131854-af6fa24be0db/go.mod h1:VTxUBvSJ3s3eHAg65PNgrsn5BtqCRPdmyXh6rAfdxN0= github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= -github.com/armon/go-metrics v0.4.0 h1:yCQqn7dwca4ITXb+CbubHmedzaQYHhNhrEXLYUeEe8Q= -github.com/armon/go-metrics v0.4.0/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= +github.com/armon/go-metrics v0.4.1 h1:hR91U9KYmb6bLBYLQjyM+3j+rcd/UhE+G78SFnF8gJA= +github.com/armon/go-metrics v0.4.1/go.mod h1:E6amYzXo6aW1tqzoZGT755KkbgrJsSdpwZ+3JqfkOG4= github.com/avast/retry-go/v4 v4.0.4 h1:38hLf0DsRXh+hOF6HbTni0+5QGTNdw9zbaMD7KAO830= github.com/avast/retry-go/v4 v4.0.4/go.mod h1:HqmLvS2VLdStPCGDFjSuZ9pzlTqVRldCI4w2dO4m1Ms= github.com/aws/aws-sdk-go-v2 v1.2.0/go.mod h1:zEQs02YRBw1DjK0PoJv3ygDYOFTre1ejlJWl8FwAuQo= @@ -160,8 +160,8 @@ github.com/cosmos/cosmos-sdk v0.45.13-ics/go.mod h1:tpDFgc98sgRcLLRiosBSyos8EZoD 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= -github.com/cosmos/gogoproto v1.4.6 h1:Ee7z15dWJaGlgM2rWrK8N2IX7PQcuccu8oG68jp5RL4= -github.com/cosmos/gogoproto v1.4.6/go.mod h1:VS/ASYmPgv6zkPKLjR9EB91lwbLHOzaGCirmKKhncfI= +github.com/cosmos/gogoproto v1.4.7 h1:RzYKVnsEC7UIkDnhTIkqEB7LnIQbsySvmNEqPCiPevk= +github.com/cosmos/gogoproto v1.4.7/go.mod h1:gxGePp9qedovvl/StQL2BIJ6qlIBn1+9YxR0IulGBKA= github.com/cosmos/gorocksdb v1.2.0 h1:d0l3jJG8M4hBouIZq0mDUHZ+zjOx044J3nGRskwTb4Y= github.com/cosmos/gorocksdb v1.2.0/go.mod h1:aaKvKItm514hKfNJpUJXnnOWeBnk2GL4+Qw9NHizILw= github.com/cosmos/iavl v0.19.5 h1:rGA3hOrgNxgRM5wYcSCxgQBap7fW82WZgY78V9po/iY= @@ -326,8 +326,9 @@ github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QD github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= @@ -430,8 +431,8 @@ github.com/icza/dyno v0.0.0-20220812133438-f0b6f8a18845 h1:H+uM0Bv88eur3ZSsd2NGK github.com/icza/dyno v0.0.0-20220812133438-f0b6f8a18845/go.mod h1:c1tRKs5Tx7E2+uHGSyyncziFjvGpgv4H2HrqXeUQ/Uk= github.com/improbable-eng/grpc-web v0.15.0 h1:BN+7z6uNXZ1tQGcNAuaU1YjsLTApzkjt2tzCixLaUPQ= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc= -github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= +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/flux v0.65.1/go.mod h1:J754/zds0vvpfwuq7Gc2wRdVwEodfpCFM7mYlOw2LqY= github.com/influxdata/influxdb v1.8.3/go.mod h1:JugdFhsvvI8gadxOI6noqNeeBHvWNTbfYGtiAn+2jhI= github.com/influxdata/influxdb-client-go/v2 v2.4.0/go.mod h1:vLNHdxTJkIf2mSLvGrpj8TCcISApPoXkaxP8g9uRlW8= @@ -716,8 +717,8 @@ github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= -github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA= -github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY= +github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= +github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= @@ -730,8 +731,8 @@ github.com/spf13/viper v1.15.0/go.mod h1:fFcTBJxvhhzSJiZy8n+PeW6t8l+KeT/uTARa0jH github.com/status-im/keycard-go v0.0.0-20190316090335-8537d3370df4/go.mod h1:RZLeN1LMWmRsyYjvAu+I6Dm9QmlDaIIt+Y+4Kd7Tp+Q= github.com/strangelove-ventures/go-subkey v1.0.7 h1:cOP/Lajg3uxV/tvspu0m6+0Cu+DJgygkEAbx/s+f35I= github.com/strangelove-ventures/go-subkey v1.0.7/go.mod h1:E34izOIEm+sZ1YmYawYRquqBQWeZBjVB4pF7bMuhc1c= -github.com/strangelove-ventures/interchaintest/v4 v4.0.0-20230316161044-8d8c01f96b4a h1:ReDdhlzY19zH7Ql6aPUsxnO7H5H/HT5PcfXtkn2OWPc= -github.com/strangelove-ventures/interchaintest/v4 v4.0.0-20230316161044-8d8c01f96b4a/go.mod h1:1iRRVEhAIGtYMl7/UVEwGx7O1tN4x8C+SzS/MBpi+JY= +github.com/strangelove-ventures/interchaintest/v4 v4.0.0-20230508170700-5b7cf4fd016b h1:LrCcTnI4n772BEF6kyD4TvrtOOQu88zqFjjjO3uudhc= +github.com/strangelove-ventures/interchaintest/v4 v4.0.0-20230508170700-5b7cf4fd016b/go.mod h1:pZEZL7eKFk6gauxedsFP1UpkNug4TKX4HxkHY1ITfeo= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= @@ -917,8 +918,8 @@ golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220607020251-c690dde0001d/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= -golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= +golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1019,13 +1020,13 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw= +golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1035,8 +1036,8 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= +golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1214,8 +1215,8 @@ google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGj google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.28.2-0.20220831092852-f930b1dc76e8 h1:KR8+MyP7/qOlV+8Af01LtjL04bu7on42eVsxT4EyBQk= -google.golang.org/protobuf v1.28.2-0.20220831092852-f930b1dc76e8/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.29.1 h1:7QBf+IK2gx70Ap/hDsOmam3GE0v9HicjfEdAxE62UoM= +google.golang.org/protobuf v1.29.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/tests/interchaintest/setup.go b/tests/interchaintest/setup.go index 78647e53b..d7b6fb72a 100644 --- a/tests/interchaintest/setup.go +++ b/tests/interchaintest/setup.go @@ -1,7 +1,8 @@ package interchaintest import ( - feesharetypes "github.com/CosmosContracts/juno/v13/x/feeshare/types" + feesharetypes "github.com/CosmosContracts/juno/v15/x/feeshare/types" + simappparams "github.com/cosmos/cosmos-sdk/simapp/params" "github.com/strangelove-ventures/interchaintest/v4/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v4/ibc" diff --git a/x/feeshare/ante/ante.go b/x/feeshare/ante/ante.go index e74cbfc88..653471b7e 100644 --- a/x/feeshare/ante/ante.go +++ b/x/feeshare/ante/ante.go @@ -6,7 +6,7 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - feeshare "github.com/CosmosContracts/juno/v14/x/feeshare/types" + feeshare "github.com/CosmosContracts/juno/v15/x/feeshare/types" ) // FeeSharePayoutDecorator Run his after we already deduct the fee from the account with diff --git a/x/feeshare/ante/ante_test.go b/x/feeshare/ante/ante_test.go index b91f505f1..eb3b3ee17 100644 --- a/x/feeshare/ante/ante_test.go +++ b/x/feeshare/ante/ante_test.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/stretchr/testify/suite" - ante "github.com/CosmosContracts/juno/v14/x/feeshare/ante" + ante "github.com/CosmosContracts/juno/v15/x/feeshare/ante" ) type AnteTestSuite struct { diff --git a/x/feeshare/ante/expected_keepers.go b/x/feeshare/ante/expected_keepers.go index 3a74d0d92..21dbed827 100644 --- a/x/feeshare/ante/expected_keepers.go +++ b/x/feeshare/ante/expected_keepers.go @@ -3,7 +3,7 @@ package ante // Used for the Juno ante handler so we can properly send 50% of fees to dAPP developers via fee share module import ( - revtypes "github.com/CosmosContracts/juno/v14/x/feeshare/types" + revtypes "github.com/CosmosContracts/juno/v15/x/feeshare/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/feeshare/client/cli/query.go b/x/feeshare/client/cli/query.go index bdb940ff1..febee2d0d 100644 --- a/x/feeshare/client/cli/query.go +++ b/x/feeshare/client/cli/query.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/flags" "github.com/cosmos/cosmos-sdk/version" - "github.com/CosmosContracts/juno/v14/x/feeshare/types" + "github.com/CosmosContracts/juno/v15/x/feeshare/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/feeshare/client/cli/tx.go b/x/feeshare/client/cli/tx.go index 8b15b83fc..676d01db2 100644 --- a/x/feeshare/client/cli/tx.go +++ b/x/feeshare/client/cli/tx.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/tx" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v14/x/feeshare/types" + "github.com/CosmosContracts/juno/v15/x/feeshare/types" ) // NewTxCmd returns a root CLI command handler for certain modules/FeeShare diff --git a/x/feeshare/genesis.go b/x/feeshare/genesis.go index f12d5db36..b8b667bd5 100644 --- a/x/feeshare/genesis.go +++ b/x/feeshare/genesis.go @@ -3,8 +3,8 @@ package feeshare import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v14/x/feeshare/keeper" - "github.com/CosmosContracts/juno/v14/x/feeshare/types" + "github.com/CosmosContracts/juno/v15/x/feeshare/keeper" + "github.com/CosmosContracts/juno/v15/x/feeshare/types" ) // InitGenesis import module genesis diff --git a/x/feeshare/genesis_test.go b/x/feeshare/genesis_test.go index 658fb3fee..541417d22 100644 --- a/x/feeshare/genesis_test.go +++ b/x/feeshare/genesis_test.go @@ -8,9 +8,9 @@ import ( "github.com/stretchr/testify/suite" - "github.com/CosmosContracts/juno/v14/app" - "github.com/CosmosContracts/juno/v14/x/feeshare" - "github.com/CosmosContracts/juno/v14/x/feeshare/types" + "github.com/CosmosContracts/juno/v15/app" + "github.com/CosmosContracts/juno/v15/x/feeshare" + "github.com/CosmosContracts/juno/v15/x/feeshare/types" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" ) diff --git a/x/feeshare/integration_test.go b/x/feeshare/integration_test.go index e0657edd5..814136856 100644 --- a/x/feeshare/integration_test.go +++ b/x/feeshare/integration_test.go @@ -8,10 +8,10 @@ import ( tmproto "github.com/tendermint/tendermint/proto/tendermint/types" dbm "github.com/tendermint/tm-db" - junoapp "github.com/CosmosContracts/juno/v14/app" + junoapp "github.com/CosmosContracts/juno/v15/app" "github.com/cosmos/cosmos-sdk/simapp" - "github.com/CosmosContracts/juno/v14/x/mint/types" + "github.com/CosmosContracts/juno/v15/x/mint/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/feeshare/keeper/feeshare.go b/x/feeshare/keeper/feeshare.go index 394641af8..a093cb591 100644 --- a/x/feeshare/keeper/feeshare.go +++ b/x/feeshare/keeper/feeshare.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/store/prefix" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v14/x/feeshare/types" + "github.com/CosmosContracts/juno/v15/x/feeshare/types" ) // GetFeeShares returns all registered FeeShares. diff --git a/x/feeshare/keeper/grpc_query.go b/x/feeshare/keeper/grpc_query.go index 60a193950..686da3259 100644 --- a/x/feeshare/keeper/grpc_query.go +++ b/x/feeshare/keeper/grpc_query.go @@ -10,7 +10,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/CosmosContracts/juno/v14/x/feeshare/types" + "github.com/CosmosContracts/juno/v15/x/feeshare/types" ) var _ types.QueryServer = Querier{} diff --git a/x/feeshare/keeper/grpc_query_test.go b/x/feeshare/keeper/grpc_query_test.go index d2690e570..73d91e4a3 100644 --- a/x/feeshare/keeper/grpc_query_test.go +++ b/x/feeshare/keeper/grpc_query_test.go @@ -1,8 +1,8 @@ package keeper_test import ( - "github.com/CosmosContracts/juno/v14/testutil/nullify" - "github.com/CosmosContracts/juno/v14/x/feeshare/types" + "github.com/CosmosContracts/juno/v15/testutil/nullify" + "github.com/CosmosContracts/juno/v15/x/feeshare/types" "github.com/cosmos/cosmos-sdk/testutil/testdata" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" diff --git a/x/feeshare/keeper/keeper.go b/x/feeshare/keeper/keeper.go index f964c145b..557af3995 100644 --- a/x/feeshare/keeper/keeper.go +++ b/x/feeshare/keeper/keeper.go @@ -10,7 +10,7 @@ import ( "github.com/tendermint/tendermint/libs/log" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" - revtypes "github.com/CosmosContracts/juno/v14/x/feeshare/types" + revtypes "github.com/CosmosContracts/juno/v15/x/feeshare/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" ) diff --git a/x/feeshare/keeper/keeper_test.go b/x/feeshare/keeper/keeper_test.go index 93fd52f68..5c4743b23 100644 --- a/x/feeshare/keeper/keeper_test.go +++ b/x/feeshare/keeper/keeper_test.go @@ -13,9 +13,9 @@ import ( wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - "github.com/CosmosContracts/juno/v14/app" - "github.com/CosmosContracts/juno/v14/x/feeshare/keeper" - "github.com/CosmosContracts/juno/v14/x/feeshare/types" + "github.com/CosmosContracts/juno/v15/app" + "github.com/CosmosContracts/juno/v15/x/feeshare/keeper" + "github.com/CosmosContracts/juno/v15/x/feeshare/types" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" ) diff --git a/x/feeshare/keeper/msg_server.go b/x/feeshare/keeper/msg_server.go index 2f9f17d45..675cbebbd 100644 --- a/x/feeshare/keeper/msg_server.go +++ b/x/feeshare/keeper/msg_server.go @@ -7,7 +7,7 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" wasmTypes "github.com/CosmWasm/wasmd/x/wasm/types" - "github.com/CosmosContracts/juno/v14/x/feeshare/types" + "github.com/CosmosContracts/juno/v15/x/feeshare/types" ) var _ types.MsgServer = &Keeper{} diff --git a/x/feeshare/keeper/msg_server_test.go b/x/feeshare/keeper/msg_server_test.go index a9f2e1716..e2182e04a 100644 --- a/x/feeshare/keeper/msg_server_test.go +++ b/x/feeshare/keeper/msg_server_test.go @@ -5,7 +5,7 @@ import ( _ "embed" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - "github.com/CosmosContracts/juno/v14/x/feeshare/types" + "github.com/CosmosContracts/juno/v15/x/feeshare/types" "github.com/cosmos/cosmos-sdk/testutil/testdata" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/feeshare/keeper/params.go b/x/feeshare/keeper/params.go index f53ea66b2..f661f5a2a 100644 --- a/x/feeshare/keeper/params.go +++ b/x/feeshare/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v14/x/feeshare/types" + "github.com/CosmosContracts/juno/v15/x/feeshare/types" ) // GetParams returns the total set of fees parameters. diff --git a/x/feeshare/module.go b/x/feeshare/module.go index 063d614b6..85053054b 100644 --- a/x/feeshare/module.go +++ b/x/feeshare/module.go @@ -18,9 +18,9 @@ import ( "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" - "github.com/CosmosContracts/juno/v14/x/feeshare/client/cli" - "github.com/CosmosContracts/juno/v14/x/feeshare/keeper" - "github.com/CosmosContracts/juno/v14/x/feeshare/types" + "github.com/CosmosContracts/juno/v15/x/feeshare/client/cli" + "github.com/CosmosContracts/juno/v15/x/feeshare/keeper" + "github.com/CosmosContracts/juno/v15/x/feeshare/types" ) // type check to ensure the interface is properly implemented diff --git a/x/mint/abci.go b/x/mint/abci.go index 4d769a065..1bfa89831 100644 --- a/x/mint/abci.go +++ b/x/mint/abci.go @@ -3,8 +3,8 @@ package mint import ( "time" - "github.com/CosmosContracts/juno/v14/x/mint/keeper" - "github.com/CosmosContracts/juno/v14/x/mint/types" + "github.com/CosmosContracts/juno/v15/x/mint/keeper" + "github.com/CosmosContracts/juno/v15/x/mint/types" "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/mint/client/cli/query.go b/x/mint/client/cli/query.go index 55290b167..cd76bb5c8 100644 --- a/x/mint/client/cli/query.go +++ b/x/mint/client/cli/query.go @@ -5,7 +5,7 @@ import ( "github.com/spf13/cobra" - "github.com/CosmosContracts/juno/v14/x/mint/types" + "github.com/CosmosContracts/juno/v15/x/mint/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" ) diff --git a/x/mint/client/rest/grpc_query_test.go b/x/mint/client/rest/grpc_query_test.go index 86bbb0583..982c32214 100644 --- a/x/mint/client/rest/grpc_query_test.go +++ b/x/mint/client/rest/grpc_query_test.go @@ -14,7 +14,7 @@ import ( "github.com/gogo/protobuf/proto" "github.com/stretchr/testify/suite" - minttypes "github.com/CosmosContracts/juno/v14/x/mint/types" + minttypes "github.com/CosmosContracts/juno/v15/x/mint/types" ) type IntegrationTestSuite struct { diff --git a/x/mint/client/rest/query.go b/x/mint/client/rest/query.go index a7ae363b4..e87cd14e5 100644 --- a/x/mint/client/rest/query.go +++ b/x/mint/client/rest/query.go @@ -6,7 +6,7 @@ import ( "github.com/gorilla/mux" - "github.com/CosmosContracts/juno/v14/x/mint/types" + "github.com/CosmosContracts/juno/v15/x/mint/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/types/rest" ) diff --git a/x/mint/client/testutil/suite.go b/x/mint/client/testutil/suite.go index f1059006b..12f3f8566 100644 --- a/x/mint/client/testutil/suite.go +++ b/x/mint/client/testutil/suite.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/suite" tmcli "github.com/tendermint/tendermint/libs/cli" - "github.com/CosmosContracts/juno/v14/x/mint/client/cli" - minttypes "github.com/CosmosContracts/juno/v14/x/mint/types" + "github.com/CosmosContracts/juno/v15/x/mint/client/cli" + minttypes "github.com/CosmosContracts/juno/v15/x/mint/types" "github.com/cosmos/cosmos-sdk/client/flags" clitestutil "github.com/cosmos/cosmos-sdk/testutil/cli" diff --git a/x/mint/genesis.go b/x/mint/genesis.go index cd88b49fd..ac2ab3b65 100644 --- a/x/mint/genesis.go +++ b/x/mint/genesis.go @@ -1,8 +1,8 @@ package mint import ( - "github.com/CosmosContracts/juno/v14/x/mint/keeper" - "github.com/CosmosContracts/juno/v14/x/mint/types" + "github.com/CosmosContracts/juno/v15/x/mint/keeper" + "github.com/CosmosContracts/juno/v15/x/mint/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/mint/keeper/grpc_query.go b/x/mint/keeper/grpc_query.go index 804868173..6bccb3b31 100644 --- a/x/mint/keeper/grpc_query.go +++ b/x/mint/keeper/grpc_query.go @@ -3,7 +3,7 @@ package keeper import ( "context" - "github.com/CosmosContracts/juno/v14/x/mint/types" + "github.com/CosmosContracts/juno/v15/x/mint/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/mint/keeper/grpc_query_test.go b/x/mint/keeper/grpc_query_test.go index a7b720783..e2fb71c5f 100644 --- a/x/mint/keeper/grpc_query_test.go +++ b/x/mint/keeper/grpc_query_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/suite" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/CosmosContracts/juno/v14/app" - "github.com/CosmosContracts/juno/v14/x/mint/types" + "github.com/CosmosContracts/juno/v15/app" + "github.com/CosmosContracts/juno/v15/x/mint/types" "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/mint/keeper/integration_test.go b/x/mint/keeper/integration_test.go index 699135b8b..9218885fd 100644 --- a/x/mint/keeper/integration_test.go +++ b/x/mint/keeper/integration_test.go @@ -8,10 +8,10 @@ import ( tmproto "github.com/tendermint/tendermint/proto/tendermint/types" dbm "github.com/tendermint/tm-db" - junoapp "github.com/CosmosContracts/juno/v14/app" + junoapp "github.com/CosmosContracts/juno/v15/app" "github.com/cosmos/cosmos-sdk/simapp" - "github.com/CosmosContracts/juno/v14/x/mint/types" + "github.com/CosmosContracts/juno/v15/x/mint/types" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/mint/keeper/keeper.go b/x/mint/keeper/keeper.go index 9b6ff4d68..0fc908d91 100644 --- a/x/mint/keeper/keeper.go +++ b/x/mint/keeper/keeper.go @@ -3,7 +3,7 @@ package keeper import ( "github.com/tendermint/tendermint/libs/log" - "github.com/CosmosContracts/juno/v14/x/mint/types" + "github.com/CosmosContracts/juno/v15/x/mint/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" diff --git a/x/mint/keeper/migrator.go b/x/mint/keeper/migrator.go index 6286733f5..c13543945 100644 --- a/x/mint/keeper/migrator.go +++ b/x/mint/keeper/migrator.go @@ -1,7 +1,7 @@ package keeper import ( - v2 "github.com/CosmosContracts/juno/v14/x/mint/migrations/v2" + v2 "github.com/CosmosContracts/juno/v15/x/mint/migrations/v2" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/mint/keeper/querier.go b/x/mint/keeper/querier.go index ec8ae2337..0f1d24f23 100644 --- a/x/mint/keeper/querier.go +++ b/x/mint/keeper/querier.go @@ -3,7 +3,7 @@ package keeper import ( abci "github.com/tendermint/tendermint/abci/types" - "github.com/CosmosContracts/juno/v14/x/mint/types" + "github.com/CosmosContracts/juno/v15/x/mint/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" diff --git a/x/mint/keeper/querier_test.go b/x/mint/keeper/querier_test.go index d8f50b0a3..1cd5bd7ce 100644 --- a/x/mint/keeper/querier_test.go +++ b/x/mint/keeper/querier_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" - keep "github.com/CosmosContracts/juno/v14/x/mint/keeper" - "github.com/CosmosContracts/juno/v14/x/mint/types" + keep "github.com/CosmosContracts/juno/v15/x/mint/keeper" + "github.com/CosmosContracts/juno/v15/x/mint/types" sdk "github.com/cosmos/cosmos-sdk/types" abci "github.com/tendermint/tendermint/abci/types" diff --git a/x/mint/migrations/v2/migrate.go b/x/mint/migrations/v2/migrate.go index 2189301b0..2bca5ad6f 100644 --- a/x/mint/migrations/v2/migrate.go +++ b/x/mint/migrations/v2/migrate.go @@ -1,7 +1,7 @@ package v2 import ( - "github.com/CosmosContracts/juno/v14/x/mint/types" + "github.com/CosmosContracts/juno/v15/x/mint/types" "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" ) diff --git a/x/mint/module.go b/x/mint/module.go index c6642e055..a27df0d34 100644 --- a/x/mint/module.go +++ b/x/mint/module.go @@ -11,11 +11,11 @@ import ( "github.com/spf13/cobra" abci "github.com/tendermint/tendermint/abci/types" - "github.com/CosmosContracts/juno/v14/x/mint/client/cli" - "github.com/CosmosContracts/juno/v14/x/mint/client/rest" - "github.com/CosmosContracts/juno/v14/x/mint/keeper" - "github.com/CosmosContracts/juno/v14/x/mint/simulation" - "github.com/CosmosContracts/juno/v14/x/mint/types" + "github.com/CosmosContracts/juno/v15/x/mint/client/cli" + "github.com/CosmosContracts/juno/v15/x/mint/client/rest" + "github.com/CosmosContracts/juno/v15/x/mint/keeper" + "github.com/CosmosContracts/juno/v15/x/mint/simulation" + "github.com/CosmosContracts/juno/v15/x/mint/types" "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/codec" cdctypes "github.com/cosmos/cosmos-sdk/codec/types" diff --git a/x/mint/module_test.go b/x/mint/module_test.go index 85cbe78d2..00b994a09 100644 --- a/x/mint/module_test.go +++ b/x/mint/module_test.go @@ -7,7 +7,7 @@ import ( abcitypes "github.com/tendermint/tendermint/abci/types" tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - "github.com/CosmosContracts/juno/v14/x/mint/types" + "github.com/CosmosContracts/juno/v15/x/mint/types" "github.com/cosmos/cosmos-sdk/simapp" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" ) diff --git a/x/mint/simulation/decoder.go b/x/mint/simulation/decoder.go index 27f1477e9..19d94390b 100644 --- a/x/mint/simulation/decoder.go +++ b/x/mint/simulation/decoder.go @@ -4,7 +4,7 @@ import ( "bytes" "fmt" - "github.com/CosmosContracts/juno/v14/x/mint/types" + "github.com/CosmosContracts/juno/v15/x/mint/types" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/types/kv" ) diff --git a/x/mint/simulation/decoder_test.go b/x/mint/simulation/decoder_test.go index 28e44a876..5d7e8a8c6 100644 --- a/x/mint/simulation/decoder_test.go +++ b/x/mint/simulation/decoder_test.go @@ -6,9 +6,9 @@ import ( "github.com/stretchr/testify/require" - "github.com/CosmosContracts/juno/v14/app" - "github.com/CosmosContracts/juno/v14/x/mint/simulation" - "github.com/CosmosContracts/juno/v14/x/mint/types" + "github.com/CosmosContracts/juno/v15/app" + "github.com/CosmosContracts/juno/v15/x/mint/simulation" + "github.com/CosmosContracts/juno/v15/x/mint/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/kv" ) diff --git a/x/mint/simulation/genesis.go b/x/mint/simulation/genesis.go index fe36ccb2e..3926a4aaa 100644 --- a/x/mint/simulation/genesis.go +++ b/x/mint/simulation/genesis.go @@ -7,7 +7,7 @@ import ( "fmt" "math/rand" - "github.com/CosmosContracts/juno/v14/x/mint/types" + "github.com/CosmosContracts/juno/v15/x/mint/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" ) diff --git a/x/mint/simulation/genesis_test.go b/x/mint/simulation/genesis_test.go index cb5943859..92e7bf2d1 100644 --- a/x/mint/simulation/genesis_test.go +++ b/x/mint/simulation/genesis_test.go @@ -7,8 +7,8 @@ import ( "github.com/stretchr/testify/require" - "github.com/CosmosContracts/juno/v14/x/mint/simulation" - "github.com/CosmosContracts/juno/v14/x/mint/types" + "github.com/CosmosContracts/juno/v15/x/mint/simulation" + "github.com/CosmosContracts/juno/v15/x/mint/types" "github.com/cosmos/cosmos-sdk/codec" codectypes "github.com/cosmos/cosmos-sdk/codec/types" sdk "github.com/cosmos/cosmos-sdk/types" diff --git a/x/mint/simulation/params.go b/x/mint/simulation/params.go index a9bbaa4a3..4711df242 100644 --- a/x/mint/simulation/params.go +++ b/x/mint/simulation/params.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/x/simulation" - "github.com/CosmosContracts/juno/v14/x/mint/types" + "github.com/CosmosContracts/juno/v15/x/mint/types" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" ) diff --git a/x/mint/simulation/params_test.go b/x/mint/simulation/params_test.go index 7dcb666df..b6c21c3ed 100644 --- a/x/mint/simulation/params_test.go +++ b/x/mint/simulation/params_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/CosmosContracts/juno/v14/x/mint/simulation" + "github.com/CosmosContracts/juno/v15/x/mint/simulation" ) func TestParamChangest(t *testing.T) {