diff --git a/.gitignore b/.gitignore index 28dd2df17..e5e151ed2 100644 --- a/.gitignore +++ b/.gitignore @@ -11,7 +11,7 @@ tmp-swagger-gen heighliner* -x/**/data/wasm/* +**/data/wasm/* # emacs editor config \#*\# diff --git a/Makefile b/Makefile index 47534398b..926b50a43 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,6 @@ BFT_VERSION := $(shell go list -m github.com/cometbft/cometbft | sed 's:.* ::') DOCKER := $(shell which docker) DOCKER_BUF := $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace bufbuild/buf:1.0.0-rc8 BUILDDIR ?= $(CURDIR)/build -E2E_UPGRADE_VERSION := "v14" export GO111MODULE = on # process build tags diff --git a/app/ante.go b/app/ante.go index 5b60aaddf..a5a60dd71 100644 --- a/app/ante.go +++ b/app/ante.go @@ -2,7 +2,7 @@ package app import ( wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" - wasmTypes "github.com/CosmWasm/wasmd/x/wasm/types" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" builderante "github.com/skip-mev/pob/x/builder/ante" builderkeeper "github.com/skip-mev/pob/x/builder/keeper" @@ -19,11 +19,11 @@ import ( govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" - decorators "github.com/CosmosContracts/juno/v16/app/decorators" - feeshareante "github.com/CosmosContracts/juno/v16/x/feeshare/ante" - feesharekeeper "github.com/CosmosContracts/juno/v16/x/feeshare/keeper" - globalfeeante "github.com/CosmosContracts/juno/v16/x/globalfee/ante" - globalfeekeeper "github.com/CosmosContracts/juno/v16/x/globalfee/keeper" + decorators "github.com/CosmosContracts/juno/v17/app/decorators" + feeshareante "github.com/CosmosContracts/juno/v17/x/feeshare/ante" + feesharekeeper "github.com/CosmosContracts/juno/v17/x/feeshare/keeper" + globalfeeante "github.com/CosmosContracts/juno/v17/x/globalfee/ante" + globalfeekeeper "github.com/CosmosContracts/juno/v17/x/globalfee/keeper" ) const maxBypassMinFeeMsgGasUsage = 1_000_000 @@ -38,7 +38,7 @@ type HandlerOptions struct { FeeShareKeeper feesharekeeper.Keeper BankKeeperFork feeshareante.BankKeeper TxCounterStoreKey storetypes.StoreKey - WasmConfig wasmTypes.WasmConfig + WasmConfig wasmtypes.WasmConfig Cdc codec.BinaryCodec BypassMinFeeMsgTypes []string diff --git a/app/app.go b/app/app.go index a8af774bf..ee245ed8c 100644 --- a/app/app.go +++ b/app/app.go @@ -9,7 +9,7 @@ import ( "strconv" "strings" - "github.com/CosmWasm/wasmd/x/wasm" + wasm "github.com/CosmWasm/wasmd/x/wasm" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" "github.com/prometheus/client_golang/prometheus" @@ -63,17 +63,18 @@ import ( upgradeclient "github.com/cosmos/cosmos-sdk/x/upgrade/client" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/CosmosContracts/juno/v16/app/keepers" - "github.com/CosmosContracts/juno/v16/app/openapiconsole" - "github.com/CosmosContracts/juno/v16/app/upgrades" - v10 "github.com/CosmosContracts/juno/v16/app/upgrades/v10" - v11 "github.com/CosmosContracts/juno/v16/app/upgrades/v11" - v12 "github.com/CosmosContracts/juno/v16/app/upgrades/v12" - v13 "github.com/CosmosContracts/juno/v16/app/upgrades/v13" - v14 "github.com/CosmosContracts/juno/v16/app/upgrades/v14" - v15 "github.com/CosmosContracts/juno/v16/app/upgrades/v15" - v16 "github.com/CosmosContracts/juno/v16/app/upgrades/v16" - "github.com/CosmosContracts/juno/v16/docs" + "github.com/CosmosContracts/juno/v17/app/keepers" + "github.com/CosmosContracts/juno/v17/app/openapiconsole" + upgrades "github.com/CosmosContracts/juno/v17/app/upgrades" + v10 "github.com/CosmosContracts/juno/v17/app/upgrades/v10" + v11 "github.com/CosmosContracts/juno/v17/app/upgrades/v11" + v12 "github.com/CosmosContracts/juno/v17/app/upgrades/v12" + v13 "github.com/CosmosContracts/juno/v17/app/upgrades/v13" + v14 "github.com/CosmosContracts/juno/v17/app/upgrades/v14" + v15 "github.com/CosmosContracts/juno/v17/app/upgrades/v15" + v16 "github.com/CosmosContracts/juno/v17/app/upgrades/v16" + v17 "github.com/CosmosContracts/juno/v17/app/upgrades/v17" + "github.com/CosmosContracts/juno/v17/docs" ) const ( @@ -94,7 +95,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, v15.Upgrade, v16.Upgrade} + Upgrades = []upgrades.Upgrade{v10.Upgrade, v11.Upgrade, v12.Upgrade, v13.Upgrade, v14.Upgrade, v15.Upgrade, v16.Upgrade, v17.Upgrade} ) // These constants are derived from the above variables. @@ -151,23 +152,23 @@ func SetAddressPrefixes() { // GetEnabledProposals parses the ProposalsEnabled / EnableSpecificProposals values to // produce a list of enabled proposals to pass into wasmd app. -func GetEnabledProposals() []wasm.ProposalType { +func GetEnabledProposals() []wasmtypes.ProposalType { if EnableSpecificProposals == "" { if ProposalsEnabled == "true" { - return wasm.EnableAllProposals + return wasmtypes.EnableAllProposals } - return wasm.DisableAllProposals + return wasmtypes.DisableAllProposals } chunks := strings.Split(EnableSpecificProposals, ",") - proposals, err := wasm.ConvertToProposals(chunks) + proposals, err := wasmtypes.ConvertToProposals(chunks) if err != nil { panic(err) } return proposals } -func GetWasmOpts(appOpts servertypes.AppOptions) []wasm.Option { - var wasmOpts []wasm.Option +func GetWasmOpts(appOpts servertypes.AppOptions) []wasmkeeper.Option { + var wasmOpts []wasmkeeper.Option if cast.ToBool(appOpts.Get("telemetry.enabled")) { wasmOpts = append(wasmOpts, wasmkeeper.WithVMCacheMetrics(prometheus.DefaultRegisterer)) } @@ -228,9 +229,9 @@ func New( db dbm.DB, traceStore io.Writer, loadLatest bool, - enabledProposals []wasm.ProposalType, + enabledProposals []wasmtypes.ProposalType, appOpts servertypes.AppOptions, - wasmOpts []wasm.Option, + wasmOpts []wasmkeeper.Option, baseAppOptions ...func(*baseapp.BaseApp), ) *App { encodingConfig := MakeEncodingConfig() @@ -353,7 +354,7 @@ func New( IBCKeeper: app.AppKeepers.IBCKeeper, FeeShareKeeper: app.AppKeepers.FeeShareKeeper, BankKeeperFork: app.AppKeepers.BankKeeper, // since we need extra methods - TxCounterStoreKey: app.AppKeepers.GetKey(wasm.StoreKey), + TxCounterStoreKey: app.AppKeepers.GetKey(wasmtypes.StoreKey), WasmConfig: wasmConfig, Cdc: appCodec, diff --git a/app/apptesting/test_suite.go b/app/apptesting/test_suite.go index 6d4e1e9e1..3f0ec420c 100644 --- a/app/apptesting/test_suite.go +++ b/app/apptesting/test_suite.go @@ -34,8 +34,8 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/CosmosContracts/juno/v16/app" - appparams "github.com/CosmosContracts/juno/v16/app/params" + "github.com/CosmosContracts/juno/v17/app" + appparams "github.com/CosmosContracts/juno/v17/app/params" ) type KeeperTestHelper struct { diff --git a/app/encoding.go b/app/encoding.go index 7461b7e25..da27641a5 100644 --- a/app/encoding.go +++ b/app/encoding.go @@ -3,7 +3,7 @@ package app import ( "github.com/cosmos/cosmos-sdk/std" - "github.com/CosmosContracts/juno/v16/app/params" + "github.com/CosmosContracts/juno/v17/app/params" ) // MakeEncodingConfig creates an EncodingConfig for testing diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go index eccf27c3d..6114656b0 100644 --- a/app/keepers/keepers.go +++ b/app/keepers/keepers.go @@ -5,6 +5,7 @@ import ( "github.com/CosmWasm/wasmd/x/wasm" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" builderkeeper "github.com/skip-mev/pob/x/builder/keeper" buildertypes "github.com/skip-mev/pob/x/builder/types" "github.com/spf13/cast" @@ -80,20 +81,20 @@ import ( upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - feesharekeeper "github.com/CosmosContracts/juno/v16/x/feeshare/keeper" - feesharetypes "github.com/CosmosContracts/juno/v16/x/feeshare/types" - "github.com/CosmosContracts/juno/v16/x/globalfee" - globalfeekeeper "github.com/CosmosContracts/juno/v16/x/globalfee/keeper" - globalfeetypes "github.com/CosmosContracts/juno/v16/x/globalfee/types" - mintkeeper "github.com/CosmosContracts/juno/v16/x/mint/keeper" - minttypes "github.com/CosmosContracts/juno/v16/x/mint/types" - "github.com/CosmosContracts/juno/v16/x/tokenfactory/bindings" - tokenfactorykeeper "github.com/CosmosContracts/juno/v16/x/tokenfactory/keeper" - tokenfactorytypes "github.com/CosmosContracts/juno/v16/x/tokenfactory/types" + feesharekeeper "github.com/CosmosContracts/juno/v17/x/feeshare/keeper" + feesharetypes "github.com/CosmosContracts/juno/v17/x/feeshare/types" + "github.com/CosmosContracts/juno/v17/x/globalfee" + globalfeekeeper "github.com/CosmosContracts/juno/v17/x/globalfee/keeper" + globalfeetypes "github.com/CosmosContracts/juno/v17/x/globalfee/types" + mintkeeper "github.com/CosmosContracts/juno/v17/x/mint/keeper" + minttypes "github.com/CosmosContracts/juno/v17/x/mint/types" + "github.com/CosmosContracts/juno/v17/x/tokenfactory/bindings" + tokenfactorykeeper "github.com/CosmosContracts/juno/v17/x/tokenfactory/keeper" + tokenfactorytypes "github.com/CosmosContracts/juno/v17/x/tokenfactory/types" ) var ( - wasmCapabilities = "iterator,staking,stargate,token_factory,cosmwasm_1_1,cosmwasm_1_2" + wasmCapabilities = "iterator,staking,stargate,token_factory,cosmwasm_1_1,cosmwasm_1_2,cosmwasm_1_3" tokenFactoryCapabilities = []string{ tokenfactorytypes.EnableBurnFrom, @@ -115,7 +116,7 @@ var maccPerms = map[string][]string{ ibctransfertypes.ModuleName: {authtypes.Minter, authtypes.Burner}, icatypes.ModuleName: nil, ibcfeetypes.ModuleName: nil, - wasm.ModuleName: {authtypes.Burner}, + wasmtypes.ModuleName: {authtypes.Burner}, tokenfactorytypes.ModuleName: {authtypes.Minter, authtypes.Burner}, globalfee.ModuleName: nil, buildertypes.ModuleName: nil, @@ -167,7 +168,7 @@ type AppKeepers struct { ScopedICAHostKeeper capabilitykeeper.ScopedKeeper ScopedTransferKeeper capabilitykeeper.ScopedKeeper - WasmKeeper wasm.Keeper + WasmKeeper wasmkeeper.Keeper scopedWasmKeeper capabilitykeeper.ScopedKeeper TokenFactoryKeeper tokenfactorykeeper.Keeper @@ -181,9 +182,9 @@ func NewAppKeepers( bApp *baseapp.BaseApp, cdc *codec.LegacyAmino, maccPerms map[string][]string, - enabledProposals []wasm.ProposalType, + enabledProposals []wasmtypes.ProposalType, appOpts servertypes.AppOptions, - wasmOpts []wasm.Option, + wasmOpts []wasmkeeper.Option, ) AppKeepers { appKeepers := AppKeepers{} @@ -218,7 +219,7 @@ func NewAppKeepers( scopedICAHostKeeper := appKeepers.CapabilityKeeper.ScopeToModule(icahosttypes.SubModuleName) scopedICQKeeper := appKeepers.CapabilityKeeper.ScopeToModule(icqtypes.ModuleName) scopedTransferKeeper := appKeepers.CapabilityKeeper.ScopeToModule(ibctransfertypes.ModuleName) - scopedWasmKeeper := appKeepers.CapabilityKeeper.ScopeToModule(wasm.ModuleName) + scopedWasmKeeper := appKeepers.CapabilityKeeper.ScopeToModule(wasmtypes.ModuleName) // add keepers Bech32Prefix := "juno" @@ -513,9 +514,9 @@ func NewAppKeepers( }) wasmOpts = append(wasmOpts, querierOpts) - appKeepers.WasmKeeper = wasm.NewKeeper( + appKeepers.WasmKeeper = wasmkeeper.NewKeeper( appCodec, - appKeepers.keys[wasm.StoreKey], + appKeepers.keys[wasmtypes.StoreKey], appKeepers.AccountKeeper, appKeepers.BankKeeper, appKeepers.StakingKeeper, @@ -553,7 +554,7 @@ func NewAppKeepers( // register wasm gov proposal types // The gov proposal types can be individually enabled if len(enabledProposals) != 0 { - govRouter.AddRoute(wasm.RouterKey, wasm.NewWasmProposalHandler(appKeepers.WasmKeeper, enabledProposals)) + govRouter.AddRoute(wasmtypes.RouterKey, wasm.NewWasmProposalHandler(appKeepers.WasmKeeper, enabledProposals)) //nolint:staticcheck // we still need this despite the deprecation of the gov handler } // Set legacy router for backwards compatibility with gov v1beta1 appKeepers.GovKeeper.SetLegacyRouter(govRouter) @@ -593,7 +594,7 @@ func NewAppKeepers( // Create static IBC router, add transfer route, then set and seal it ibcRouter := porttypes.NewRouter(). AddRoute(ibctransfertypes.ModuleName, transferStack). - AddRoute(wasm.ModuleName, wasmStack). + AddRoute(wasmtypes.ModuleName, wasmStack). AddRoute(icacontrollertypes.SubModuleName, icaControllerStack). AddRoute(icahosttypes.SubModuleName, icaHostStack). AddRoute(icqtypes.ModuleName, icqModule) @@ -639,7 +640,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino paramsKeeper.Subspace(globalfee.ModuleName) paramsKeeper.Subspace(tokenfactorytypes.ModuleName) paramsKeeper.Subspace(feesharetypes.ModuleName) - paramsKeeper.Subspace(wasm.ModuleName) + paramsKeeper.Subspace(wasmtypes.ModuleName) paramsKeeper.Subspace(buildertypes.ModuleName) return paramsKeeper @@ -667,7 +668,7 @@ func (appKeepers *AppKeepers) GetScopedIBCKeeper() capabilitykeeper.ScopedKeeper } // GetWasmKeeper implements the TestingApp interface. -func (appKeepers *AppKeepers) GetWasmKeeper() wasm.Keeper { +func (appKeepers *AppKeepers) GetWasmKeeper() wasmkeeper.Keeper { return appKeepers.WasmKeeper } diff --git a/app/keepers/keys.go b/app/keepers/keys.go index 20a204c72..f5995be06 100644 --- a/app/keepers/keys.go +++ b/app/keepers/keys.go @@ -1,7 +1,7 @@ package keepers import ( - "github.com/CosmWasm/wasmd/x/wasm" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" buildertypes "github.com/skip-mev/pob/x/builder/types" packetforwardtypes "github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7/router/types" @@ -31,10 +31,10 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - feesharetypes "github.com/CosmosContracts/juno/v16/x/feeshare/types" - globalfeetypes "github.com/CosmosContracts/juno/v16/x/globalfee/types" - minttypes "github.com/CosmosContracts/juno/v16/x/mint/types" - tokenfactorytypes "github.com/CosmosContracts/juno/v16/x/tokenfactory/types" + feesharetypes "github.com/CosmosContracts/juno/v17/x/feeshare/types" + globalfeetypes "github.com/CosmosContracts/juno/v17/x/globalfee/types" + minttypes "github.com/CosmosContracts/juno/v17/x/mint/types" + tokenfactorytypes "github.com/CosmosContracts/juno/v17/x/tokenfactory/types" ) func (appKeepers *AppKeepers) GenerateKeys() { @@ -47,7 +47,7 @@ func (appKeepers *AppKeepers) GenerateKeys() { // non sdk store keys ibcexported.StoreKey, ibctransfertypes.StoreKey, ibcfeetypes.StoreKey, - wasm.StoreKey, icahosttypes.StoreKey, + wasmtypes.StoreKey, icahosttypes.StoreKey, icacontrollertypes.StoreKey, icqtypes.StoreKey, packetforwardtypes.StoreKey, ibchookstypes.StoreKey, diff --git a/app/keepers/querier.go b/app/keepers/querier.go index 53a1a50c5..1c7591307 100644 --- a/app/keepers/querier.go +++ b/app/keepers/querier.go @@ -1,4 +1,4 @@ -// this file used from osmosis, ref: https://github.com/CosmosContracts/juno/v16/blob/2ce971f4c6aa85d3ef7ba33d60e0ae74b923ab83/app/keepers/querier.go +// this file used from osmosis, ref: https://github.com/CosmosContracts/juno/v17/blob/2ce971f4c6aa85d3ef7ba33d60e0ae74b923ab83/app/keepers/querier.go // Original Author: https://github.com/nicolaslara package keepers diff --git a/app/modules.go b/app/modules.go index ade486905..b85068794 100644 --- a/app/modules.go +++ b/app/modules.go @@ -1,7 +1,7 @@ package app import ( - "github.com/CosmWasm/wasmd/x/wasm" + wasm "github.com/CosmWasm/wasmd/x/wasm" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" buildermodule "github.com/skip-mev/pob/x/builder" buildertypes "github.com/skip-mev/pob/x/builder/types" @@ -59,14 +59,14 @@ import ( "github.com/cosmos/cosmos-sdk/x/upgrade" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - encparams "github.com/CosmosContracts/juno/v16/app/params" - feeshare "github.com/CosmosContracts/juno/v16/x/feeshare" - feesharetypes "github.com/CosmosContracts/juno/v16/x/feeshare/types" - "github.com/CosmosContracts/juno/v16/x/globalfee" - "github.com/CosmosContracts/juno/v16/x/mint" - minttypes "github.com/CosmosContracts/juno/v16/x/mint/types" - "github.com/CosmosContracts/juno/v16/x/tokenfactory" - tokenfactorytypes "github.com/CosmosContracts/juno/v16/x/tokenfactory/types" + encparams "github.com/CosmosContracts/juno/v17/app/params" + feeshare "github.com/CosmosContracts/juno/v17/x/feeshare" + feesharetypes "github.com/CosmosContracts/juno/v17/x/feeshare/types" + "github.com/CosmosContracts/juno/v17/x/globalfee" + "github.com/CosmosContracts/juno/v17/x/mint" + minttypes "github.com/CosmosContracts/juno/v17/x/mint/types" + "github.com/CosmosContracts/juno/v17/x/tokenfactory" + tokenfactorytypes "github.com/CosmosContracts/juno/v17/x/tokenfactory/types" ) // ModuleBasics defines the module BasicManager is in charge of setting up basic, @@ -221,7 +221,7 @@ func orderBeginBlockers() []string { tokenfactorytypes.ModuleName, feesharetypes.ModuleName, globalfee.ModuleName, - wasm.ModuleName, + wasmtypes.ModuleName, ibchookstypes.ModuleName, } } @@ -257,7 +257,7 @@ func orderEndBlockers() []string { tokenfactorytypes.ModuleName, feesharetypes.ModuleName, globalfee.ModuleName, - wasm.ModuleName, + wasmtypes.ModuleName, ibchookstypes.ModuleName, } } @@ -293,7 +293,7 @@ func orderInitBlockers() []string { tokenfactorytypes.ModuleName, feesharetypes.ModuleName, globalfee.ModuleName, - wasm.ModuleName, + wasmtypes.ModuleName, ibchookstypes.ModuleName, } } diff --git a/app/sim_test.go b/app/sim_test.go index ad6212935..b90c5387a 100644 --- a/app/sim_test.go +++ b/app/sim_test.go @@ -6,7 +6,8 @@ import ( "path/filepath" "testing" - "github.com/CosmWasm/wasmd/x/wasm" + wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" "github.com/stretchr/testify/require" dbm "github.com/cometbft/cometbft-db" @@ -103,13 +104,13 @@ func TestFullAppSimulation(t *testing.T) { appOptions[flags.FlagHome] = DefaultNodeHome appOptions[server.FlagInvCheckPeriod] = simcli.FlagPeriodValue - var emptyWasmOption []wasm.Option + var emptyWasmOption []wasmkeeper.Option app := New( logger, db, nil, true, - wasm.EnableAllProposals, + wasmtypes.EnableAllProposals, appOptions, emptyWasmOption, fauxMerkleModeOpt, diff --git a/app/test_helpers.go b/app/test_helpers.go index 5c03fd826..88af027af 100644 --- a/app/test_helpers.go +++ b/app/test_helpers.go @@ -6,8 +6,8 @@ import ( "testing" "time" - "github.com/CosmWasm/wasmd/x/wasm" - "github.com/CosmWasm/wasmd/x/wasm/keeper" + wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" "github.com/stretchr/testify/require" dbm "github.com/cometbft/cometbft-db" @@ -33,8 +33,8 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - apphelpers "github.com/CosmosContracts/juno/v16/app/helpers" - appparams "github.com/CosmosContracts/juno/v16/app/params" + apphelpers "github.com/CosmosContracts/juno/v17/app/helpers" + appparams "github.com/CosmosContracts/juno/v17/app/params" ) // SimAppChainID hardcoded chainID for simulation @@ -136,7 +136,7 @@ func SetupWithGenesisValSet(t *testing.T, valSet *tmtypes.ValidatorSet, genAccs return junoApp } -func setup(t *testing.T, withGenesis bool, opts ...wasm.Option) (*App, GenesisState) { +func setup(t *testing.T, withGenesis bool, opts ...wasmkeeper.Option) (*App, GenesisState) { db := dbm.NewMemDB() nodeHome := t.TempDir() snapshotDir := filepath.Join(nodeHome, "data", "snapshots") @@ -156,7 +156,7 @@ func setup(t *testing.T, withGenesis bool, opts ...wasm.Option) (*App, GenesisSt db, nil, true, - wasm.EnableAllProposals, + wasmtypes.EnableAllProposals, EmptyAppOptions{}, opts, bam.SetChainID("testing"), @@ -264,7 +264,7 @@ func ExecuteRawCustom(t *testing.T, ctx sdk.Context, app *App, contract sdk.AccA coins = sdk.Coins{funds} } - contractKeeper := keeper.NewDefaultPermissionKeeper(app.AppKeepers.WasmKeeper) + contractKeeper := wasmkeeper.NewDefaultPermissionKeeper(app.AppKeepers.WasmKeeper) _, err = contractKeeper.Execute(ctx, contract, sender, oracleBz, coins) return err } diff --git a/app/upgrades/types.go b/app/upgrades/types.go index d003f4e90..994e43b25 100644 --- a/app/upgrades/types.go +++ b/app/upgrades/types.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/CosmosContracts/juno/v16/app/keepers" + "github.com/CosmosContracts/juno/v17/app/keepers" ) // BaseAppParamManager defines an interrace that BaseApp is expected to fullfil diff --git a/app/upgrades/v10/constants.go b/app/upgrades/v10/constants.go index 210f1da4f..88af17afb 100644 --- a/app/upgrades/v10/constants.go +++ b/app/upgrades/v10/constants.go @@ -6,7 +6,7 @@ import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/CosmosContracts/juno/v16/app/upgrades" + "github.com/CosmosContracts/juno/v17/app/upgrades" ) // UpgradeName defines the on-chain upgrade name for the Juno v10 upgrade. diff --git a/app/upgrades/v10/upgrades.go b/app/upgrades/v10/upgrades.go index 203b96077..27aef6f40 100644 --- a/app/upgrades/v10/upgrades.go +++ b/app/upgrades/v10/upgrades.go @@ -15,7 +15,7 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/CosmosContracts/juno/v16/app/keepers" + "github.com/CosmosContracts/juno/v17/app/keepers" ) // CreateV10UpgradeHandler makes an upgrade handler for v10 of Juno diff --git a/app/upgrades/v11/constants.go b/app/upgrades/v11/constants.go index c822e8c0f..dd61669a0 100644 --- a/app/upgrades/v11/constants.go +++ b/app/upgrades/v11/constants.go @@ -6,7 +6,7 @@ import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/CosmosContracts/juno/v16/app/upgrades" + "github.com/CosmosContracts/juno/v17/app/upgrades" ) // UpgradeName defines the on-chain upgrade name for the Juno v11 upgrade. diff --git a/app/upgrades/v11/upgrades.go b/app/upgrades/v11/upgrades.go index bbdcd2bb9..d88d5c905 100644 --- a/app/upgrades/v11/upgrades.go +++ b/app/upgrades/v11/upgrades.go @@ -15,7 +15,7 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/CosmosContracts/juno/v16/app/keepers" + "github.com/CosmosContracts/juno/v17/app/keepers" ) // CreateV11UpgradeHandler makes an upgrade handler for v11 of Juno diff --git a/app/upgrades/v12/constants.go b/app/upgrades/v12/constants.go index 2243ccddc..8139a87d4 100644 --- a/app/upgrades/v12/constants.go +++ b/app/upgrades/v12/constants.go @@ -3,7 +3,7 @@ package v12 import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/CosmosContracts/juno/v16/app/upgrades" + "github.com/CosmosContracts/juno/v17/app/upgrades" ) const UpgradeName = "v12" diff --git a/app/upgrades/v12/upgrades.go b/app/upgrades/v12/upgrades.go index 1a9eccf85..fac85138d 100644 --- a/app/upgrades/v12/upgrades.go +++ b/app/upgrades/v12/upgrades.go @@ -5,7 +5,7 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/CosmosContracts/juno/v16/app/keepers" + "github.com/CosmosContracts/juno/v17/app/keepers" ) func CreateV12UpgradeHandler( diff --git a/app/upgrades/v13/constants.go b/app/upgrades/v13/constants.go index e285134a9..808483d50 100644 --- a/app/upgrades/v13/constants.go +++ b/app/upgrades/v13/constants.go @@ -8,9 +8,9 @@ import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/CosmosContracts/juno/v16/app/upgrades" - feesharetypes "github.com/CosmosContracts/juno/v16/x/feeshare/types" - tokenfactorytypes "github.com/CosmosContracts/juno/v16/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v17/app/upgrades" + feesharetypes "github.com/CosmosContracts/juno/v17/x/feeshare/types" + tokenfactorytypes "github.com/CosmosContracts/juno/v17/x/tokenfactory/types" ) // UpgradeName defines the on-chain upgrade name for the upgrade. diff --git a/app/upgrades/v13/upgrades.go b/app/upgrades/v13/upgrades.go index e6a409666..f35d3015c 100644 --- a/app/upgrades/v13/upgrades.go +++ b/app/upgrades/v13/upgrades.go @@ -13,11 +13,11 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/CosmosContracts/juno/v16/app/keepers" - "github.com/CosmosContracts/juno/v16/app/upgrades" + "github.com/CosmosContracts/juno/v17/app/keepers" + "github.com/CosmosContracts/juno/v17/app/upgrades" // types - feesharetypes "github.com/CosmosContracts/juno/v16/x/feeshare/types" - tokenfactorytypes "github.com/CosmosContracts/juno/v16/x/tokenfactory/types" + feesharetypes "github.com/CosmosContracts/juno/v17/x/feeshare/types" + tokenfactorytypes "github.com/CosmosContracts/juno/v17/x/tokenfactory/types" ) func CreateV13UpgradeHandler( diff --git a/app/upgrades/v14/constants.go b/app/upgrades/v14/constants.go index 982d8fc93..ebb27b02b 100644 --- a/app/upgrades/v14/constants.go +++ b/app/upgrades/v14/constants.go @@ -5,8 +5,8 @@ import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/CosmosContracts/juno/v16/app/upgrades" - "github.com/CosmosContracts/juno/v16/x/globalfee" + "github.com/CosmosContracts/juno/v17/app/upgrades" + "github.com/CosmosContracts/juno/v17/x/globalfee" ) // UpgradeName defines the on-chain upgrade name for the upgrade. diff --git a/app/upgrades/v14/upgrades.go b/app/upgrades/v14/upgrades.go index b71fc2465..7b773336b 100644 --- a/app/upgrades/v14/upgrades.go +++ b/app/upgrades/v14/upgrades.go @@ -7,9 +7,9 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/CosmosContracts/juno/v16/app/keepers" - "github.com/CosmosContracts/juno/v16/app/upgrades" - globalfeetypes "github.com/CosmosContracts/juno/v16/x/globalfee/types" + "github.com/CosmosContracts/juno/v17/app/keepers" + "github.com/CosmosContracts/juno/v17/app/upgrades" + globalfeetypes "github.com/CosmosContracts/juno/v17/x/globalfee/types" ) func CreateV14UpgradeHandler( diff --git a/app/upgrades/v15/constants.go b/app/upgrades/v15/constants.go index 7dce9cc0b..7b9103ce4 100644 --- a/app/upgrades/v15/constants.go +++ b/app/upgrades/v15/constants.go @@ -3,7 +3,7 @@ package v15 import ( store "github.com/cosmos/cosmos-sdk/store/types" - "github.com/CosmosContracts/juno/v16/app/upgrades" + "github.com/CosmosContracts/juno/v17/app/upgrades" ) // UpgradeName defines the on-chain upgrade name for the upgrade. diff --git a/app/upgrades/v15/upgrades.go b/app/upgrades/v15/upgrades.go index d92e56a48..64b103f99 100644 --- a/app/upgrades/v15/upgrades.go +++ b/app/upgrades/v15/upgrades.go @@ -7,8 +7,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/CosmosContracts/juno/v16/app/keepers" - tokenfactorytypes "github.com/CosmosContracts/juno/v16/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v17/app/keepers" + tokenfactorytypes "github.com/CosmosContracts/juno/v17/x/tokenfactory/types" ) // We now charge 2 million gas * gas price to create a denom. diff --git a/app/upgrades/v16/constants.go b/app/upgrades/v16/constants.go index 509404159..e0a854e4e 100644 --- a/app/upgrades/v16/constants.go +++ b/app/upgrades/v16/constants.go @@ -10,8 +10,8 @@ import ( crisistypes "github.com/cosmos/cosmos-sdk/x/crisis/types" "github.com/cosmos/cosmos-sdk/x/nft" - "github.com/CosmosContracts/juno/v16/app/upgrades" - globalfeettypes "github.com/CosmosContracts/juno/v16/x/globalfee/types" + "github.com/CosmosContracts/juno/v17/app/upgrades" + globalfeettypes "github.com/CosmosContracts/juno/v17/x/globalfee/types" ) // UpgradeName defines the on-chain upgrade name for the upgrade. diff --git a/app/upgrades/v16/upgrade_test.go b/app/upgrades/v16/upgrade_test.go index 9f25c258f..ffea87190 100644 --- a/app/upgrades/v16/upgrade_test.go +++ b/app/upgrades/v16/upgrade_test.go @@ -5,8 +5,8 @@ import ( "github.com/stretchr/testify/suite" - "github.com/CosmosContracts/juno/v16/app/apptesting" - v16 "github.com/CosmosContracts/juno/v16/app/upgrades/v16" + "github.com/CosmosContracts/juno/v17/app/apptesting" + v16 "github.com/CosmosContracts/juno/v17/app/upgrades/v16" ) type UpgradeTestSuite struct { diff --git a/app/upgrades/v16/upgrades.go b/app/upgrades/v16/upgrades.go index 84baeb6bb..c8af9ba30 100644 --- a/app/upgrades/v16/upgrades.go +++ b/app/upgrades/v16/upgrades.go @@ -30,13 +30,13 @@ import ( stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" - "github.com/CosmosContracts/juno/v16/app/keepers" - "github.com/CosmosContracts/juno/v16/app/upgrades" + "github.com/CosmosContracts/juno/v17/app/keepers" + "github.com/CosmosContracts/juno/v17/app/upgrades" // Juno modules - feesharetypes "github.com/CosmosContracts/juno/v16/x/feeshare/types" - globalfeetypes "github.com/CosmosContracts/juno/v16/x/globalfee/types" - minttypes "github.com/CosmosContracts/juno/v16/x/mint/types" - tokenfactorytypes "github.com/CosmosContracts/juno/v16/x/tokenfactory/types" + feesharetypes "github.com/CosmosContracts/juno/v17/x/feeshare/types" + globalfeetypes "github.com/CosmosContracts/juno/v17/x/globalfee/types" + minttypes "github.com/CosmosContracts/juno/v17/x/mint/types" + tokenfactorytypes "github.com/CosmosContracts/juno/v17/x/tokenfactory/types" ) func CreateV16UpgradeHandler( diff --git a/app/upgrades/v17/constants.go b/app/upgrades/v17/constants.go new file mode 100644 index 000000000..e9c81c0b9 --- /dev/null +++ b/app/upgrades/v17/constants.go @@ -0,0 +1,16 @@ +package v16 + +import ( + store "github.com/cosmos/cosmos-sdk/store/types" + + "github.com/CosmosContracts/juno/v17/app/upgrades" +) + +// UpgradeName defines the on-chain upgrade name for the upgrade. +const UpgradeName = "v17" + +var Upgrade = upgrades.Upgrade{ + UpgradeName: UpgradeName, + CreateUpgradeHandler: CreateV17UpgradeHandler, + StoreUpgrades: store.StoreUpgrades{}, +} diff --git a/app/upgrades/v17/upgrade_test.go b/app/upgrades/v17/upgrade_test.go new file mode 100644 index 000000000..e02c2e4b8 --- /dev/null +++ b/app/upgrades/v17/upgrade_test.go @@ -0,0 +1,30 @@ +package v16_test + +import ( + "testing" + + "github.com/stretchr/testify/suite" + + "github.com/CosmosContracts/juno/v17/app/apptesting" + v17 "github.com/CosmosContracts/juno/v17/app/upgrades/v17" +) + +type UpgradeTestSuite struct { + apptesting.KeeperTestHelper +} + +func (s *UpgradeTestSuite) SetupTest() { + s.Setup() +} + +func TestKeeperTestSuite(t *testing.T) { + suite.Run(t, new(UpgradeTestSuite)) +} + +// Ensures the test does not error out. +func (s *UpgradeTestSuite) TestUpgrade() { + s.Setup() + + upgradeHeight := int64(5) + s.ConfirmUpgradeSucceeded(v17.UpgradeName, upgradeHeight) +} diff --git a/app/upgrades/v17/upgrades.go b/app/upgrades/v17/upgrades.go new file mode 100644 index 000000000..154b65029 --- /dev/null +++ b/app/upgrades/v17/upgrades.go @@ -0,0 +1,35 @@ +package v16 + +import ( + "fmt" + + 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/CosmosContracts/juno/v17/app/keepers" + "github.com/CosmosContracts/juno/v17/app/upgrades" +) + +func CreateV17UpgradeHandler( + mm *module.Manager, + cfg module.Configurator, + _ *keepers.AppKeepers, +) upgradetypes.UpgradeHandler { + return func(ctx sdk.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) { + logger := ctx.Logger().With("upgrade", UpgradeName) + + nativeDenom := upgrades.GetChainsDenomToken(ctx.ChainID()) + logger.Info(fmt.Sprintf("With native denom %s", nativeDenom)) + + // Run migrations + logger.Info(fmt.Sprintf("pre migrate version map: %v", vm)) + versionMap, err := mm.RunMigrations(ctx, cfg, vm) + if err != nil { + return nil, err + } + logger.Info(fmt.Sprintf("post migrate version map: %v", versionMap)) + + return versionMap, err + } +} diff --git a/cmd/junod/cmd/balances_from_state_export.go b/cmd/junod/cmd/balances_from_state_export.go index c3f7b30be..b60819d08 100644 --- a/cmd/junod/cmd/balances_from_state_export.go +++ b/cmd/junod/cmd/balances_from_state_export.go @@ -1,7 +1,7 @@ package cmd // modified from osmosis -// https://github.com/CosmosContracts/juno/v16/blob/main/cmd/osmosisd/cmd/balances_from_state_export.go +// https://github.com/CosmosContracts/juno/v17/blob/main/cmd/osmosisd/cmd/balances_from_state_export.go import ( "encoding/csv" @@ -24,7 +24,7 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - appparams "github.com/CosmosContracts/juno/v16/app/params" + appparams "github.com/CosmosContracts/juno/v17/app/params" ) const ( diff --git a/cmd/junod/cmd/root.go b/cmd/junod/cmd/root.go index 5a524f153..ccb66a6a8 100644 --- a/cmd/junod/cmd/root.go +++ b/cmd/junod/cmd/root.go @@ -6,7 +6,7 @@ import ( "os" "path/filepath" - "github.com/CosmWasm/wasmd/x/wasm" + wasm "github.com/CosmWasm/wasmd/x/wasm" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" "github.com/prometheus/client_golang/prometheus" @@ -36,8 +36,8 @@ import ( "github.com/cosmos/cosmos-sdk/x/crisis" genutilcli "github.com/cosmos/cosmos-sdk/x/genutil/client/cli" - "github.com/CosmosContracts/juno/v16/app" - "github.com/CosmosContracts/juno/v16/app/params" + "github.com/CosmosContracts/juno/v17/app" + "github.com/CosmosContracts/juno/v17/app/params" ) // NewRootCmd creates a new root command for junod. It is called once in the @@ -292,7 +292,7 @@ func (ac appCreator) newApp( skipUpgradeHeights[int64(h)] = true } - var wasmOpts []wasm.Option + var wasmOpts []wasmkeeper.Option if cast.ToBool(appOpts.Get("telemetry.enabled")) { wasmOpts = append(wasmOpts, wasmkeeper.WithVMCacheMetrics(prometheus.DefaultRegisterer)) } @@ -330,7 +330,7 @@ func (ac appCreator) appExport( } loadLatest := height == -1 - var emptyWasmOpts []wasm.Option + var emptyWasmOpts []wasmkeeper.Option junoApp = app.New( logger, db, diff --git a/cmd/junod/main.go b/cmd/junod/main.go index 847f28afc..57726556e 100644 --- a/cmd/junod/main.go +++ b/cmd/junod/main.go @@ -7,8 +7,8 @@ import ( svrcmd "github.com/cosmos/cosmos-sdk/server/cmd" - "github.com/CosmosContracts/juno/v16/app" - "github.com/CosmosContracts/juno/v16/cmd/junod/cmd" + "github.com/CosmosContracts/juno/v17/app" + "github.com/CosmosContracts/juno/v17/cmd/junod/cmd" ) func main() { diff --git a/docs/swagger.yaml b/docs/swagger.yaml index ac4c4e015..0cf831ed3 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -1,7 +1,7 @@ swagger: '2.0' info: title: Juno network - version: v15 + version: v0 consumes: - application/json produces: diff --git a/go.mod b/go.mod index 6f1958828..3085651a0 100644 --- a/go.mod +++ b/go.mod @@ -1,18 +1,18 @@ -module github.com/CosmosContracts/juno/v16 +module github.com/CosmosContracts/juno/v17 go 1.20 require ( cosmossdk.io/api v0.3.1 cosmossdk.io/errors v1.0.0 - cosmossdk.io/log v1.1.0 + cosmossdk.io/log v1.1.1-0.20230704160919-88f2c830b0ca cosmossdk.io/math v1.0.1 cosmossdk.io/tools/rosetta v0.2.1 - github.com/CosmWasm/wasmd v0.40.2 - github.com/CosmWasm/wasmvm v1.2.4 + github.com/CosmWasm/wasmd v0.41.0 + github.com/CosmWasm/wasmvm v1.3.0 github.com/cometbft/cometbft v0.37.2 github.com/cometbft/cometbft-db v0.8.0 - github.com/cosmos/cosmos-sdk v0.47.3 + github.com/cosmos/cosmos-sdk v0.47.4 github.com/cosmos/gogoproto v1.4.10 github.com/cosmos/ibc-apps/middleware/packet-forward-middleware/v7 v7.0.0-20230629164013-34f5e666f806 github.com/cosmos/ibc-apps/modules/async-icq/v7 v7.0.0-20230629164013-34f5e666f806 @@ -22,24 +22,22 @@ require ( github.com/gorilla/mux v1.8.0 github.com/grpc-ecosystem/grpc-gateway v1.16.0 github.com/prometheus/client_golang v1.16.0 - github.com/skip-mev/pob v1.0.3 + github.com/skip-mev/pob v1.0.4 github.com/spf13/cast v1.5.1 github.com/spf13/cobra v1.7.0 github.com/spf13/viper v1.16.0 github.com/stretchr/testify v1.8.4 - google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 - google.golang.org/grpc v1.56.2 + google.golang.org/genproto/googleapis/api v0.0.0-20230629202037-9506855d4529 + google.golang.org/grpc v1.57.0 gopkg.in/yaml.v2 v2.4.0 ) -require github.com/google/s2a-go v0.1.3 // indirect - require ( - cloud.google.com/go v0.110.0 // indirect - cloud.google.com/go/compute v1.19.1 // indirect + cloud.google.com/go v0.110.4 // indirect + cloud.google.com/go/compute v1.20.1 // indirect cloud.google.com/go/compute/metadata v0.2.3 // indirect - cloud.google.com/go/iam v0.13.0 // indirect - cloud.google.com/go/storage v1.29.0 // indirect + cloud.google.com/go/iam v1.1.0 // indirect + cloud.google.com/go/storage v1.30.1 // indirect cosmossdk.io/core v0.6.1 // indirect cosmossdk.io/depinject v1.0.0-alpha.3 // indirect filippo.io/edwards25519 v1.0.0 // indirect @@ -52,7 +50,7 @@ require ( github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect - github.com/cenkalti/backoff/v4 v4.1.3 // indirect + github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/cespare/xxhash v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/chzyer/readline v1.5.1 // indirect @@ -95,9 +93,10 @@ require ( github.com/google/go-cmp v0.5.9 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/google/orderedcode v0.0.1 // indirect + github.com/google/s2a-go v0.1.4 // indirect github.com/google/uuid v1.3.0 // indirect github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect - github.com/googleapis/gax-go/v2 v2.8.0 // indirect + github.com/googleapis/gax-go/v2 v2.11.0 // indirect github.com/gorilla/handlers v1.5.1 // indirect github.com/gorilla/websocket v1.5.0 // indirect github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect @@ -125,7 +124,7 @@ require ( github.com/magiconair/properties v1.8.7 // indirect github.com/manifoldco/promptui v0.9.0 // indirect github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.18 // indirect + github.com/mattn/go-isatty v0.0.19 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect github.com/minio/highwayhash v1.0.2 // indirect @@ -161,13 +160,16 @@ require ( golang.org/x/crypto v0.11.0 // indirect golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect golang.org/x/net v0.12.0 // indirect - golang.org/x/oauth2 v0.7.0 // indirect + golang.org/x/oauth2 v0.8.0 // indirect + golang.org/x/sync v0.2.0 // indirect golang.org/x/sys v0.10.0 // indirect golang.org/x/term v0.10.0 // indirect golang.org/x/text v0.11.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect - google.golang.org/api v0.122.0 // indirect + google.golang.org/api v0.126.0 // indirect google.golang.org/appengine v1.6.7 // indirect + google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 0683b92e2..608401b74 100644 --- a/go.sum +++ b/go.sum @@ -34,8 +34,8 @@ cloud.google.com/go v0.100.2/go.mod h1:4Xra9TjzAeYHrl5+oeLlzbM2k3mjVhZh4UqTZ//w9 cloud.google.com/go v0.102.0/go.mod h1:oWcCzKlqJ5zgHQt9YsaeTY9KzIvjyy0ArmiBUgpQ+nc= cloud.google.com/go v0.102.1/go.mod h1:XZ77E9qnTEnrgEOvr4xzfdX5TRo7fB4T2F4O6+34hIU= cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRYtA= -cloud.google.com/go v0.110.0 h1:Zc8gqp3+a9/Eyph2KDmcGaPtbKRIoqq4YTlL4NMD0Ys= -cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY= +cloud.google.com/go v0.110.4 h1:1JYyxKMN9hd5dR2MYTPWkGUgcoxVVhg0LKNKEo0qvmk= +cloud.google.com/go v0.110.4/go.mod h1:+EYjdK8e5RME/VY/qLCAtuyALQ9q67dvuum8i+H5xsI= cloud.google.com/go/aiplatform v1.22.0/go.mod h1:ig5Nct50bZlzV6NvKaTwmplLLddFx0YReh9WfTO5jKw= cloud.google.com/go/aiplatform v1.24.0/go.mod h1:67UUvRBKG6GTayHKV8DBv2RtR1t93YRu5B1P3x99mYY= cloud.google.com/go/analytics v0.11.0/go.mod h1:DjEWCu41bVbYcKyvlws9Er60YE4a//bK6mnhWvQeFNI= @@ -73,8 +73,8 @@ cloud.google.com/go/compute v1.6.0/go.mod h1:T29tfhtVbq1wvAPo0E3+7vhgmkOYeXjhFvz cloud.google.com/go/compute v1.6.1/go.mod h1:g85FgpzFvNULZ+S8AYq87axRKuf2Kh7deLqV/jJ3thU= cloud.google.com/go/compute v1.7.0/go.mod h1:435lt8av5oL9P3fv1OEzSbSUe+ybHXGMPQHHZWZxy9U= cloud.google.com/go/compute v1.10.0/go.mod h1:ER5CLbMxl90o2jtNbGSbtfOpQKR0t15FOtRsugnLrlU= -cloud.google.com/go/compute v1.19.1 h1:am86mquDUgjGNWxiGn+5PGLbmgiWXlE/yNWpIpNvuXY= -cloud.google.com/go/compute v1.19.1/go.mod h1:6ylj3a05WF8leseCdIf77NK0g1ey+nj5IKd5/kvShxE= +cloud.google.com/go/compute v1.20.1 h1:6aKEtlUiwEpJzM001l0yFkpXmUVXaN8W+fbkb2AZNbg= +cloud.google.com/go/compute v1.20.1/go.mod h1:4tCnrn48xsqlwSAiLf1HXMQk8CONslYbdiEZc9FEIbM= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= cloud.google.com/go/containeranalysis v0.5.1/go.mod h1:1D92jd8gRR/c0fGMlymRgxWD3Qw9C1ff6/T7mLgVL8I= @@ -114,13 +114,12 @@ cloud.google.com/go/gkehub v0.10.0/go.mod h1:UIPwxI0DsrpsVoWpLB0stwKCP+WFVG9+y97 cloud.google.com/go/grafeas v0.2.0/go.mod h1:KhxgtF2hb0P191HlY5besjYm6MqTSTj3LSI+M+ByZHc= cloud.google.com/go/iam v0.3.0/go.mod h1:XzJPvDayI+9zsASAFO68Hk07u3z+f+JrT2xXNdp4bnY= cloud.google.com/go/iam v0.5.0/go.mod h1:wPU9Vt0P4UmCux7mqtRu6jcpPAb74cP1fh50J3QpkUc= -cloud.google.com/go/iam v0.13.0 h1:+CmB+K0J/33d0zSQ9SlFWUeCCEn5XJA0ZMZ3pHE9u8k= -cloud.google.com/go/iam v0.13.0/go.mod h1:ljOg+rcNfzZ5d6f1nAUJ8ZIxOaZUVoS14bKCtaLZ/D0= +cloud.google.com/go/iam v1.1.0 h1:67gSqaPukx7O8WLLHMa0PNs3EBGd2eE4d+psbO/CO94= +cloud.google.com/go/iam v1.1.0/go.mod h1:nxdHjaKfCr7fNYx/HJMM8LgiMugmveWlkatear5gVyk= cloud.google.com/go/language v1.4.0/go.mod h1:F9dRpNFQmJbkaop6g0JhSBXCNlO90e1KWx5iDdxbWic= cloud.google.com/go/language v1.6.0/go.mod h1:6dJ8t3B+lUYfStgls25GusK04NLh3eDLQnWM3mdEbhI= cloud.google.com/go/lifesciences v0.5.0/go.mod h1:3oIKy8ycWGPUyZDR/8RNnTOYevhaMLqh5vLUXs9zvT8= cloud.google.com/go/lifesciences v0.6.0/go.mod h1:ddj6tSX/7BOnhxCSd3ZcETvtNr8NZ6t/iPhY2Tyfu08= -cloud.google.com/go/longrunning v0.4.1 h1:v+yFJOfKC3yZdY6ZUI933pIYdhyhV8S3NpWrXWmg7jM= cloud.google.com/go/mediatranslation v0.5.0/go.mod h1:jGPUhGTybqsPQn91pNXw0xVHfuJ3leR1wj37oU3y1f4= cloud.google.com/go/mediatranslation v0.6.0/go.mod h1:hHdBCTYNigsBxshbznuIMFNe5QXEowAuNmmC7h8pu5w= cloud.google.com/go/memcache v1.4.0/go.mod h1:rTOfiGZtJX1AaFUrOgsMHX5kAzaTQ8azHiuDoTPzNsE= @@ -178,8 +177,8 @@ cloud.google.com/go/storage v1.14.0/go.mod h1:GrKmX003DSIwi9o29oFT7YDnHYwZoctc3f cloud.google.com/go/storage v1.22.1/go.mod h1:S8N1cAStu7BOeFfE8KAQzmyyLkK8p/vmRq6kuBTW58Y= cloud.google.com/go/storage v1.23.0/go.mod h1:vOEEDNFnciUMhBeT6hsJIn3ieU5cFRmzeLgDvXzfIXc= cloud.google.com/go/storage v1.27.0/go.mod h1:x9DOL8TK/ygDUMieqwfhdpQryTeEkhGKMi80i/iqR2s= -cloud.google.com/go/storage v1.29.0 h1:6weCgzRvMg7lzuUurI4697AqIRPU1SvzHhynwpW31jI= -cloud.google.com/go/storage v1.29.0/go.mod h1:4puEjyTKnku6gfKoTfNOU/W+a9JyuVNxjpS5GBrB8h4= +cloud.google.com/go/storage v1.30.1 h1:uOdMxAs8HExqBlnLtnQyP0YkvbiDpdGShGKtx6U/oNM= +cloud.google.com/go/storage v1.30.1/go.mod h1:NfxhC0UJE1aXSx7CIIbCf7y9HKT7BiccwkR7+P7gN8E= cloud.google.com/go/talent v1.1.0/go.mod h1:Vl4pt9jiHKvOgF9KoZo6Kob9oV4lwd/ZD5Cto54zDRw= cloud.google.com/go/talent v1.2.0/go.mod h1:MoNF9bhFQbiJ6eFD3uSsg0uBALw4n4gaCaEjBw9zo8g= cloud.google.com/go/videointelligence v1.6.0/go.mod h1:w0DIDlVRKtwPCn/C4iwZIJdvC69yInhW0cfi+p546uU= @@ -200,8 +199,8 @@ cosmossdk.io/depinject v1.0.0-alpha.3 h1:6evFIgj//Y3w09bqOUOzEpFj5tsxBqdc5CfkO7z cosmossdk.io/depinject v1.0.0-alpha.3/go.mod h1:eRbcdQ7MRpIPEM5YUJh8k97nxHpYbc3sMUnEtt8HPWU= cosmossdk.io/errors v1.0.0 h1:nxF07lmlBbB8NKQhtJ+sJm6ef5uV1XkvPXG2bUntb04= cosmossdk.io/errors v1.0.0/go.mod h1:+hJZLuhdDE0pYN8HkOrVNwrIOYvUGnn6+4fjnJs/oV0= -cosmossdk.io/log v1.1.0 h1:v0ogPHYeTzPcBTcPR1A3j1hkei4pZama8kz8LKlCMv0= -cosmossdk.io/log v1.1.0/go.mod h1:6zjroETlcDs+mm62gd8Ig7mZ+N+fVOZS91V17H+M4N4= +cosmossdk.io/log v1.1.1-0.20230704160919-88f2c830b0ca h1:msenprh2BLLRwNT7zN56TbBHOGk/7ARQckXHxXyvjoQ= +cosmossdk.io/log v1.1.1-0.20230704160919-88f2c830b0ca/go.mod h1:PkIAKXZvaxrTRc++z53XMRvFk8AcGGWYHcMIPzVYX9c= cosmossdk.io/math v1.0.1 h1:Qx3ifyOPaMLNH/89WeZFH268yCvU4xEcnPLu3sJqPPg= cosmossdk.io/math v1.0.1/go.mod h1:Ygz4wBHrgc7g0N+8+MrnTfS9LLn9aaTGa9hKopuym5k= cosmossdk.io/tools/rosetta v0.2.1 h1:ddOMatOH+pbxWbrGJKRAawdBkPYLfKXutK9IETnjYxw= @@ -222,10 +221,10 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d h1:nalkkPQcITbvhmL4+C4cKA87NW0tfm3Kl9VXRoPywFg= github.com/ChainSafe/go-schnorrkel v0.0.0-20200405005733-88cbf1b4c40d/go.mod h1:URdX5+vg25ts3aCh8H5IFZybJYKWhJHYMTnf+ULtoC4= -github.com/CosmWasm/wasmd v0.40.2 h1:GSDHIaeJI7fcDF5mkzSXQI5IZLtvpNq5t3TjJ9bDpPw= -github.com/CosmWasm/wasmd v0.40.2/go.mod h1:vqI238yb4D6aNuigS8mCqTyyCV9HN5eBEZARKRoK3ts= -github.com/CosmWasm/wasmvm v1.2.4 h1:6OfeZuEcEH/9iqwrg2pkeVtDCkMoj9U6PpKtcrCyVrQ= -github.com/CosmWasm/wasmvm v1.2.4/go.mod h1:vW/E3h8j9xBQs9bCoijDuawKo9kCtxOaS8N8J7KFtkc= +github.com/CosmWasm/wasmd v0.41.0 h1:fmwxSbwb50zZDcBaayYFRLIaSFca+EFld1WOaQi49jg= +github.com/CosmWasm/wasmd v0.41.0/go.mod h1:0Sds1q2IsPaTN1gHa3BNOYcUFgtGvxH7CXEXPgoihns= +github.com/CosmWasm/wasmvm v1.3.0 h1:x12X4bKlUPS7TT9QQP45+fJo2sp30GEbiSSgb9jsec8= +github.com/CosmWasm/wasmvm v1.3.0/go.mod h1:vW/E3h8j9xBQs9bCoijDuawKo9kCtxOaS8N8J7KFtkc= 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.5.0/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= @@ -324,8 +323,8 @@ github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= -github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4= -github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= +github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= +github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/cp v0.1.0/go.mod h1:SOGHArjBr4JWaSDEVpWpo/hNg6RoKrls6Oh40hiwW+s= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= @@ -389,8 +388,8 @@ github.com/cosmos/btcutil v1.0.5 h1:t+ZFcX77LpKtDBhjucvnOH8C2l2ioGsBNEQ3jef8xFk= github.com/cosmos/btcutil v1.0.5/go.mod h1:IyB7iuqZMJlthe2tkIFL33xPyzbFYP0XVdS8P5lUPis= github.com/cosmos/cosmos-proto v1.0.0-beta.3 h1:VitvZ1lPORTVxkmF2fAp3IiA61xVwArQYKXTdEcpW6o= github.com/cosmos/cosmos-proto v1.0.0-beta.3/go.mod h1:t8IASdLaAq+bbHbjq4p960BvcTqtwuAxid3b/2rOD6I= -github.com/cosmos/cosmos-sdk v0.47.3 h1:r0hGmZoAzP2D+MaPaFGHwAaTdFQq3pNpHaUp1BsffbM= -github.com/cosmos/cosmos-sdk v0.47.3/go.mod h1:c4OfLdAykA9zsj1CqrxBRqXzVz48I++JSvIMPSPcEmk= +github.com/cosmos/cosmos-sdk v0.47.4 h1:FVUpEprm58nMmBX4xkRdMDaIG5Nr4yy92HZAfGAw9bg= +github.com/cosmos/cosmos-sdk v0.47.4/go.mod h1:R5n+uM7vguVPFap4pgkdvQCT1nVo/OtPwrlAU40rvok= 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= @@ -665,8 +664,8 @@ github.com/google/pprof v0.0.0-20210601050228-01bbb1931b22/go.mod h1:kpwsk12EmLe github.com/google/pprof v0.0.0-20210609004039-a478d1d731e9/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= -github.com/google/s2a-go v0.1.3 h1:FAgZmpLl/SXurPEZyCMPBIiiYeTbqfjlbdnCNTAkbGE= -github.com/google/s2a-go v0.1.3/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= +github.com/google/s2a-go v0.1.4 h1:1kZ/sQM3srePvKs3tXAvQzo66XfcReoqFpIpIccE7Oc= +github.com/google/s2a-go v0.1.4/go.mod h1:Ej+mSEMGRnqRzjc7VtF+jdBwYG5fuJfiZ8ELkjEwM0A= github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= @@ -687,8 +686,8 @@ github.com/googleapis/gax-go/v2 v2.3.0/go.mod h1:b8LNqSzNabLiUpXKkY7HAR5jr6bIT99 github.com/googleapis/gax-go/v2 v2.4.0/go.mod h1:XOTVJ59hdnfJLIP/dh8n5CGryZR2LxK9wbMD5+iXC6c= github.com/googleapis/gax-go/v2 v2.5.1/go.mod h1:h6B0KMMFNtI2ddbGJn3T3ZbwkeT6yqEF02fYlzkUCyo= github.com/googleapis/gax-go/v2 v2.6.0/go.mod h1:1mjbznJAPHFpesgE5ucqfYEscaz5kMdcIDwU/6+DDoY= -github.com/googleapis/gax-go/v2 v2.8.0 h1:UBtEZqx1bjXtOQ5BVTkuYghXrr3N4V123VKJK67vJZc= -github.com/googleapis/gax-go/v2 v2.8.0/go.mod h1:4orTrqY6hXxxaUL4LHIPl6lGo8vAE38/qKbhSAKP6QI= +github.com/googleapis/gax-go/v2 v2.11.0 h1:9V9PWXEsWnPpQhu/PeQIkS4eGzMlTLGgt80cUUI8Ki4= +github.com/googleapis/gax-go/v2 v2.11.0/go.mod h1:DxmR61SGKkGLa2xigwuZIQpkCI2S5iydzRfb3peWZJI= github.com/googleapis/go-type-adapters v1.0.0/go.mod h1:zHW75FOG2aur7gAO2B+MLby+cLsWGBF62rFAi7WjWO4= github.com/googleapis/google-cloud-go-testing v0.0.0-20200911160855-bcd43fbb19e8/go.mod h1:dvDLG8qkwmyD9a/MJJN3XJcT3xFxOKAvTZGvuZmac9g= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= @@ -893,8 +892,8 @@ github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Ky github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.18 h1:DOKFKCQ7FNG2L1rbrmstDN4QVRdS89Nkh85u68Uwp98= -github.com/mattn/go-isatty v0.0.18/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= +github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.2/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.3/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= @@ -1088,8 +1087,8 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= -github.com/skip-mev/pob v1.0.3 h1:cipN/WUU+xfYbcfUQ4EefSvl3ItocsKgRn3tOtRF2OE= -github.com/skip-mev/pob v1.0.3/go.mod h1:PMs/dqcWOQruSN6zLExU0TzlBfBmGA8iTy+FJhxn0T8= +github.com/skip-mev/pob v1.0.4 h1:Degz+Pdm9pCom16bbLawZhXi6PbYPiiJe6cGjBE5g30= +github.com/skip-mev/pob v1.0.4/go.mod h1:tpZivmkiDgCO6O79qBnK4eJQjuJeR9yUzc1jPlGaE1s= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= @@ -1383,8 +1382,8 @@ golang.org/x/oauth2 v0.0.0-20220822191816-0ebed06d0094/go.mod h1:h4gKUeWbJ4rQPri golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= golang.org/x/oauth2 v0.1.0/go.mod h1:G9FE4dLTsbXUu90h/Pf85g4w1D+SSAgR+q46nJZ8M4A= -golang.org/x/oauth2 v0.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g= -golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4= +golang.org/x/oauth2 v0.8.0 h1:6dkIjl3j3LtZ/O3sTgZTMsLKSftL/B8Zgq4huOIIUu8= +golang.org/x/oauth2 v0.8.0/go.mod h1:yr7u4HXZRm1R1kBWqr/xKNqewf0plRYoB7sla+BCIXE= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1400,6 +1399,7 @@ golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI= +golang.org/x/sync v0.2.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -1671,8 +1671,8 @@ google.golang.org/api v0.96.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ google.golang.org/api v0.97.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.98.0/go.mod h1:w7wJQLTM+wvQpNf5JyEcBoxK0RH7EDrh/L4qfsuJ13s= google.golang.org/api v0.100.0/go.mod h1:ZE3Z2+ZOr87Rx7dqFsdRQkRBk36kDtp/h+QpHbB7a70= -google.golang.org/api v0.122.0 h1:zDobeejm3E7pEG1mNHvdxvjs5XJoCMzyNH+CmwL94Es= -google.golang.org/api v0.122.0/go.mod h1:gcitW0lvnyWjSp9nKxAbdHKIZ6vF4aajGueeslZOyms= +google.golang.org/api v0.126.0 h1:q4GJq+cAdMAC7XP7njvQ4tvohGLiSlytuL4BQxbIZ+o= +google.golang.org/api v0.126.0/go.mod h1:mBwVAtz+87bEN6CbA1GtZPDOqY2R5ONPqJeIlvyo4Aw= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/appengine v1.2.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= @@ -1792,8 +1792,12 @@ google.golang.org/genproto v0.0.0-20221010155953-15ba04fc1c0e/go.mod h1:3526vdqw google.golang.org/genproto v0.0.0-20221014173430-6e2ab493f96b/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221014213838-99cd37c6964a/go.mod h1:1vXfmgAz9N9Jx0QA82PqRVauvCz1SGSz739p0f183jM= google.golang.org/genproto v0.0.0-20221025140454-527a21cfbd71/go.mod h1:9qHF0xnpdSfF6knlcsnpzUu5y+rpwgbvsyGAZPBMg4s= -google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 h1:KpwkzHKEF7B9Zxg18WzOa7djJ+Ha5DzthMyZYQfEn2A= -google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1/go.mod h1:nKE/iIaLqn2bQwXBg8f1g2Ylh6r5MN5CmZvuzZCgsCU= +google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130 h1:Au6te5hbKUV8pIYWHqOUZ1pva5qK/rwbIhoXEUB9Lu8= +google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130/go.mod h1:O9kGHb51iE/nOGvQaDUuadVYqovW56s5emA88lQnj6Y= +google.golang.org/genproto/googleapis/api v0.0.0-20230629202037-9506855d4529 h1:s5YSX+ZH5b5vS9rnpGymvIyMpLRJizowqDlOuyjXnTk= +google.golang.org/genproto/googleapis/api v0.0.0-20230629202037-9506855d4529/go.mod h1:vHYtlOoi6TsQ3Uk2yxR7NI5z8uoV+3pZtR4jmHIkRig= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 h1:bVf09lpb+OJbByTj913DRJioFFAjf/ZGxEz7MajTp2U= +google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM= google.golang.org/grpc v1.17.0/go.mod h1:6QZJwpn2B+Zp71q/5VxRsJ6NXXVCE5NRUHRo+f3cWCs= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.0/go.mod h1:chYK+tFQF0nDUGJgXMSgLCQk3phJEuONr2DCgLDdAQM= @@ -1835,8 +1839,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.56.2 h1:fVRFRnXvU+x6C4IlHZewvJOVHoOv1TUuQyoRsYnB4bI= -google.golang.org/grpc v1.56.2/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= +google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw= +google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= @@ -1892,7 +1896,7 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= -gotest.tools/v3 v3.4.0 h1:ZazjZUfuVeZGLAmlKKuyv3IKP5orXcwtOwDQH6YVr6o= +gotest.tools/v3 v3.5.0 h1:Ljk6PdHdOhAb5aDMWXjDLMMhph+BpztA4v1QdqEW2eY= honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/interchaintest/chain_upgrade_test.go b/interchaintest/chain_upgrade_test.go index 6cdc9f3ed..663ca8ea6 100644 --- a/interchaintest/chain_upgrade_test.go +++ b/interchaintest/chain_upgrade_test.go @@ -6,24 +6,26 @@ import ( "testing" "time" - helpers "github.com/CosmosContracts/juno/tests/interchaintest/helpers" + cosmosproto "github.com/cosmos/gogoproto/proto" + "github.com/docker/docker/client" "github.com/strangelove-ventures/interchaintest/v7" "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v7/ibc" "github.com/strangelove-ventures/interchaintest/v7/testutil" "github.com/stretchr/testify/require" - "go.uber.org/zap/zaptest" + + upgradetypes "github.com/cosmos/cosmos-sdk/x/upgrade/types" ) const ( - haltHeightDelta = uint64(10) // will propose upgrade this many blocks in the future + haltHeightDelta = uint64(9) // will propose upgrade this many blocks in the future blocksAfterUpgrade = uint64(7) ) func TestBasicJunoUpgrade(t *testing.T) { repo, version := GetDockerImageInfo() - startVersion := "v15.0.0" - upgradeName := "v16" + startVersion := "v16.0.0" + upgradeName := "v17" CosmosChainUpgradeTest(t, "juno", startVersion, version, repo, upgradeName) } @@ -36,59 +38,11 @@ func CosmosChainUpgradeTest(t *testing.T, chainName, initialVersion, upgradeBran t.Log(chainName, initialVersion, upgradeBranchVersion, upgradeRepo, upgradeName) - // v45 genesis params - genesisKVs := []cosmos.GenesisKV{ - { - Key: "app_state.gov.voting_params.voting_period", - Value: VotingPeriod, - }, - { - Key: "app_state.gov.deposit_params.max_deposit_period", - Value: MaxDepositPeriod, - }, - { - Key: "app_state.gov.deposit_params.min_deposit.0.denom", - Value: Denom, - }, - } - - cf := interchaintest.NewBuiltinChainFactory(zaptest.NewLogger(t), []*interchaintest.ChainSpec{ - { - Name: chainName, - ChainName: chainName, - Version: initialVersion, - ChainConfig: ibc.ChainConfig{ - Images: []ibc.DockerImage{ - { - Repository: JunoE2ERepo, - Version: initialVersion, - UidGid: JunoImage.UidGid, - }, - }, - GasPrices: fmt.Sprintf("0%s", Denom), - ModifyGenesis: cosmos.ModifyGenesis(genesisKVs), - }, - }, - }) - - chains, err := cf.Chains(t.Name()) - require.NoError(t, err) - + numVals, numNodes := 4, 4 + chains := CreateThisBranchChain(t, numVals, numNodes) chain := chains[0].(*cosmos.CosmosChain) - ic := interchaintest.NewInterchain(). - AddChain(chain) - - ctx := context.Background() - client, network := interchaintest.DockerSetup(t) - - err = ic.Build(ctx, nil, interchaintest.InterchainBuildOptions{ - TestName: t.Name(), - Client: client, - NetworkID: network, - SkipPathCreation: true, - }) - require.NoError(t, err) + ic, ctx, client, _ := BuildInitialChain(t, chains) t.Cleanup(func() { _ = ic.Close() @@ -98,85 +52,23 @@ func CosmosChainUpgradeTest(t *testing.T, chainName, initialVersion, upgradeBran users := interchaintest.GetAndFundTestUsers(t, ctx, t.Name(), userFunds, chain) chainUser := users[0] - // create a tokenfactory denom before upgrade (invalid genesis for hard forking due to x/bank validation) - emptyFullDenom := helpers.CreateTokenFactoryDenom(t, ctx, chain, chainUser, "empty", "") - - mintedDenom := helpers.CreateTokenFactoryDenom(t, ctx, chain, chainUser, "minted", "") - helpers.MintToTokenFactoryDenom(t, ctx, chain, chainUser, chainUser, 100, mintedDenom) - - mintedAndModified := helpers.CreateTokenFactoryDenom(t, ctx, chain, chainUser, "mandm", "") - helpers.MintToTokenFactoryDenom(t, ctx, chain, chainUser, chainUser, 100, mintedAndModified) - - ticker, desc, exponent := "TICKER", "desc", "6" - helpers.UpdateTokenFactoryMetadata(t, ctx, chain, chainUser, mintedAndModified, ticker, desc, exponent) - - // Validate pre upgrade denoms do not have the proper metadata - // metadata: base:"factory/juno1hql0qadnznq8skf5q2psqmwj4thl2ajnvr3qrx/empty" > - res := helpers.GetTokenFactoryDenomMetadata(t, ctx, chain, emptyFullDenom) - require.Equal(t, res.DenomUnits[0].Denom, emptyFullDenom) - require.Equal(t, res.Base, emptyFullDenom) - require.Empty(t, res.Description) - require.Empty(t, res.Display) - require.Empty(t, res.Name) - require.Empty(t, res.Symbol) - - res = helpers.GetTokenFactoryDenomMetadata(t, ctx, chain, mintedDenom) - require.Equal(t, res.DenomUnits[0].Denom, mintedDenom) - require.Equal(t, res.Base, mintedDenom) - require.Empty(t, res.Description) - require.Empty(t, res.Display) - require.Empty(t, res.Name) - require.Empty(t, res.Symbol) - - // Denom data should be as modified above - modifiedRes := helpers.GetTokenFactoryDenomMetadata(t, ctx, chain, mintedAndModified) - require.Equal(t, modifiedRes.DenomUnits[0].Denom, mintedAndModified) - require.Equal(t, modifiedRes.Base, mintedAndModified) - require.Equal(t, modifiedRes.Name, mintedAndModified) - require.Equal(t, modifiedRes.Symbol, ticker) - require.NotEmpty(t, modifiedRes.Description) - // upgrade height, err := chain.Height(ctx) require.NoError(t, err, "error fetching height before submit upgrade proposal") haltHeight := height + haltHeightDelta + proposalID := SubmitUpgradeProposal(t, ctx, chain, chainUser, upgradeName, haltHeight) - proposal := cosmos.SoftwareUpgradeProposal{ - Deposit: "500000000" + chain.Config().Denom, // greater than min deposit - Title: "Chain Upgrade 1", - Name: upgradeName, - Description: "First chain software upgrade", - Height: haltHeight, - } - - upgradeTx, err := chain.UpgradeProposal(ctx, chainUser.KeyName(), proposal) - require.NoError(t, err, "error submitting software upgrade proposal tx") - - err = chain.VoteOnProposalAllValidators(ctx, upgradeTx.ProposalID, cosmos.ProposalVoteYes) - require.NoError(t, err, "failed to submit votes") - - _, err = cosmos.PollForProposalStatus(ctx, chain, height, height+haltHeightDelta, upgradeTx.ProposalID, cosmos.ProposalStatusPassed) - require.NoError(t, err, "proposal status did not change to passed in expected number of blocks") - - timeoutCtx, timeoutCtxCancel := context.WithTimeout(ctx, time.Second*45) - defer timeoutCtxCancel() - - height, err = chain.Height(ctx) - require.NoError(t, err, "error fetching height before upgrade") - - // this should timeout due to chain halt at upgrade height. - _ = testutil.WaitForBlocks(timeoutCtx, int(haltHeight-height), chain) + ValidatorVoting(t, ctx, chain, proposalID, height, haltHeight) - height, err = chain.Height(ctx) - require.NoError(t, err, "error fetching height after chain should have halted") + UpgradeNodes(t, ctx, chain, client, haltHeight, upgradeRepo, upgradeBranchVersion) - // make sure that chain is halted - require.Equal(t, haltHeight, height, "height is not equal to halt height") +} +func UpgradeNodes(t *testing.T, ctx context.Context, chain *cosmos.CosmosChain, client *client.Client, haltHeight uint64, upgradeRepo, upgradeBranchVersion string) { // bring down nodes to prepare for upgrade t.Log("stopping node(s)") - err = chain.StopAllNodes(ctx) + err := chain.StopAllNodes(ctx) require.NoError(t, err, "error stopping node(s)") // upgrade version on all nodes @@ -190,41 +82,60 @@ func CosmosChainUpgradeTest(t *testing.T, chainName, initialVersion, upgradeBran err = chain.StartAllNodes(ctx) require.NoError(t, err, "error starting upgraded node(s)") - timeoutCtx, timeoutCtxCancel = context.WithTimeout(ctx, time.Second*60) + timeoutCtx, timeoutCtxCancel := context.WithTimeout(ctx, time.Second*60) defer timeoutCtxCancel() err = testutil.WaitForBlocks(timeoutCtx, int(blocksAfterUpgrade), chain) require.NoError(t, err, "chain did not produce blocks after upgrade") - height, err = chain.Height(ctx) + height, err := chain.Height(ctx) require.NoError(t, err, "error fetching height after upgrade") require.GreaterOrEqual(t, height, haltHeight+blocksAfterUpgrade, "height did not increment enough after upgrade") +} + +func ValidatorVoting(t *testing.T, ctx context.Context, chain *cosmos.CosmosChain, proposalID string, height uint64, haltHeight uint64) { + err := chain.VoteOnProposalAllValidators(ctx, proposalID, cosmos.ProposalVoteYes) + require.NoError(t, err, "failed to submit votes") + + _, err = cosmos.PollForProposalStatus(ctx, chain, height, height+haltHeightDelta, proposalID, cosmos.ProposalStatusPassed) + require.NoError(t, err, "proposal status did not change to passed in expected number of blocks") + + timeoutCtx, timeoutCtxCancel := context.WithTimeout(ctx, time.Second*45) + defer timeoutCtxCancel() + + height, err = chain.Height(ctx) + require.NoError(t, err, "error fetching height before upgrade") + + // this should timeout due to chain halt at upgrade height. + _ = testutil.WaitForBlocks(timeoutCtx, int(haltHeight-height), chain) + + height, err = chain.Height(ctx) + require.NoError(t, err, "error fetching height after chain should have halted") + + // make sure that chain is halted + require.Equal(t, haltHeight, height, "height is not equal to halt height") +} + +func SubmitUpgradeProposal(t *testing.T, ctx context.Context, chain *cosmos.CosmosChain, user ibc.Wallet, upgradeName string, haltHeight uint64) string { + // TODO Return proposal id + upgradeMsg := []cosmosproto.Message{ + &upgradetypes.MsgSoftwareUpgrade{ + // gGov Module account + Authority: "juno10d07y265gmmuvt4z0w9aw880jnsr700jvss730", + Plan: upgradetypes.Plan{ + Name: upgradeName, + Height: int64(haltHeight), + }, + }, + } + + proposal, err := chain.BuildProposal(upgradeMsg, "Chain Upgrade 1", "Summary desc", "ipfs://CID", fmt.Sprintf(`500000000%s`, chain.Config().Denom)) + require.NoError(t, err, "error building proposal") + + txProp, err := chain.SubmitProposal(ctx, user.KeyName(), proposal) + t.Log("txProp", txProp) + require.NoError(t, err, "error submitting proposal") - // Check that the tokenfactory denom's properly migrated - postRes := helpers.GetTokenFactoryDenomMetadata(t, ctx, chain, emptyFullDenom) - require.Equal(t, postRes.DenomUnits[0].Denom, emptyFullDenom) - require.Equal(t, postRes.Base, emptyFullDenom) - require.Equal(t, postRes.Display, emptyFullDenom) - require.Equal(t, postRes.Name, emptyFullDenom) - require.Equal(t, postRes.Symbol, emptyFullDenom) - - postRes = helpers.GetTokenFactoryDenomMetadata(t, ctx, chain, mintedDenom) - require.Equal(t, postRes.DenomUnits[0].Denom, mintedDenom) - require.Equal(t, postRes.Base, mintedDenom) - require.Equal(t, postRes.Display, mintedDenom) - require.Equal(t, postRes.Name, mintedDenom) - require.Equal(t, postRes.Symbol, mintedDenom) - - // since we already set it, the should remain the same. - postModified := helpers.GetTokenFactoryDenomMetadata(t, ctx, chain, mintedAndModified) - require.Equal(t, postModified, modifiedRes) - - // Ensure after the upgrade, the denoms are properly set with the Denom Metadata. - // (Due to migrating hardcoded, we have to set a fee after the upgrade). - afterUpgrade := helpers.CreateTokenFactoryDenom(t, ctx, chain, chainUser, "post", "250000"+Denom) - newRes := helpers.GetTokenFactoryDenomMetadata(t, ctx, chain, afterUpgrade) - require.Equal(t, newRes.Display, afterUpgrade) - require.Equal(t, newRes.Name, afterUpgrade) - require.Equal(t, newRes.Symbol, afterUpgrade) + return txProp.ProposalID } diff --git a/interchaintest/contract_unity_deploy_test.go b/interchaintest/contract_unity_deploy_test.go index 118170a3d..c202fb66f 100644 --- a/interchaintest/contract_unity_deploy_test.go +++ b/interchaintest/contract_unity_deploy_test.go @@ -35,7 +35,7 @@ func TestJunoUnityContractDeploy(t *testing.T) { _, contractAddr := helpers.SetupContract(t, ctx, juno, user.KeyName(), "contracts/cw_unity_prop.wasm", msg) t.Log("testing Unity contractAddr", contractAddr) - // Execute to start the withdrawl countdown + // Execute to start the withdrawal countdown juno.ExecuteContract(ctx, withdrawUser.KeyName(), contractAddr, `{"start_withdraw":{}}`) // make a query with GetUnityContractWithdrawalReadyTime diff --git a/interchaintest/contract_unity_submit_test.go b/interchaintest/contract_unity_submit_test.go index a0e10f15e..c5416f1dc 100644 --- a/interchaintest/contract_unity_submit_test.go +++ b/interchaintest/contract_unity_submit_test.go @@ -4,13 +4,14 @@ import ( "fmt" "testing" - cosmosproto "github.com/cosmos/gogoproto/proto" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" "github.com/strangelove-ventures/interchaintest/v7" "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v7/ibc" "github.com/stretchr/testify/require" - wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" + cosmosproto "github.com/cosmos/gogoproto/proto" + helpers "github.com/CosmosContracts/juno/tests/interchaintest/helpers" ) diff --git a/interchaintest/go.mod b/interchaintest/go.mod index 804155a66..7af0faed5 100644 --- a/interchaintest/go.mod +++ b/interchaintest/go.mod @@ -8,17 +8,16 @@ 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 // For this nested module, you always want to replace the parent reference with the current worktree. - // For now, we can not do this due to pulling tokenfactory in. - // github.com/CosmosContracts/juno => ../../ - github.com/CosmosContracts/juno/v16 => github.com/CosmosContracts/juno/v16 v16.0.0-20230524152917-465dae509bfe + github.com/CosmosContracts/juno/v17 v17.0.0-00010101000000-000000000000 => ../ + // github.com/CosmosContracts/juno/v17 => github.com/CosmosContracts/juno/v17 v17.0.0-20230524152917-465dae509bfe github.com/btcsuite/btcd => github.com/btcsuite/btcd v0.22.2 //indirect github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.3-alpha.regen.1 github.com/vedhavyas/go-subkey => github.com/strangelove-ventures/go-subkey v1.0.7 ) require ( - github.com/CosmWasm/wasmd v0.40.2 - github.com/CosmosContracts/juno/v16 v16.0.0-00010101000000-000000000000 + github.com/CosmWasm/wasmd v0.41.0 + github.com/CosmosContracts/juno/v17 v17.0.0-00010101000000-000000000000 github.com/cosmos/cosmos-sdk v0.47.4 github.com/cosmos/gogoproto v1.4.10 github.com/cosmos/ibc-go/v7 v7.2.0 @@ -37,7 +36,7 @@ require ( cloud.google.com/go/iam v1.1.0 // indirect cloud.google.com/go/storage v1.30.1 // indirect cosmossdk.io/api v0.3.1 // indirect - cosmossdk.io/core v0.5.1 // indirect + cosmossdk.io/core v0.6.1 // indirect cosmossdk.io/depinject v1.0.0-alpha.3 // indirect cosmossdk.io/errors v1.0.0 // indirect cosmossdk.io/log v1.1.1-0.20230704160919-88f2c830b0ca // indirect @@ -50,7 +49,7 @@ require ( github.com/ChainSafe/go-schnorrkel v1.0.0 // indirect github.com/ChainSafe/go-schnorrkel/1 v0.0.0-00010101000000-000000000000 // indirect github.com/ComposableFi/go-subkey/v2 v2.0.0-tm03420 // indirect - github.com/CosmWasm/wasmvm v1.2.4 // indirect + github.com/CosmWasm/wasmvm v1.3.0 // indirect github.com/FactomProject/basen v0.0.0-20150613233007-fe3947df716e // indirect github.com/FactomProject/btcutilecc v0.0.0-20130527213604-d3a63a5752ec // indirect github.com/Microsoft/go-winio v0.6.0 // indirect @@ -64,7 +63,7 @@ require ( github.com/bgentry/speakeasy v0.1.1-0.20220910012023-760eaf8b6816 // indirect github.com/btcsuite/btcd/btcec/v2 v2.3.2 // indirect github.com/bufbuild/protocompile v0.5.1 // indirect - github.com/cenkalti/backoff/v4 v4.1.3 // indirect + github.com/cenkalti/backoff/v4 v4.2.1 // indirect github.com/cespare/xxhash v1.1.0 // indirect github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/chzyer/readline v1.5.1 // indirect @@ -73,7 +72,7 @@ require ( github.com/cometbft/cometbft-db v0.8.0 // indirect github.com/confio/ics23/go v0.9.0 // indirect github.com/cosmos/btcutil v1.0.5 // indirect - github.com/cosmos/cosmos-proto v1.0.0-beta.2 // indirect + github.com/cosmos/cosmos-proto v1.0.0-beta.3 // indirect github.com/cosmos/go-bip39 v1.0.0 // indirect github.com/cosmos/gogogateway v1.2.0 // indirect github.com/cosmos/iavl v0.20.0 // indirect @@ -182,17 +181,17 @@ require ( github.com/pierrec/xxHash v0.1.5 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/prometheus/client_golang v1.15.1 // indirect + github.com/prometheus/client_golang v1.16.0 // indirect github.com/prometheus/client_model v0.3.0 // indirect github.com/prometheus/common v0.42.0 // indirect - github.com/prometheus/procfs v0.9.0 // indirect + github.com/prometheus/procfs v0.10.1 // indirect github.com/rakyll/statik v0.1.7 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect github.com/rs/cors v1.8.3 // indirect github.com/rs/zerolog v1.29.1 // indirect github.com/sasha-s/go-deadlock v0.3.1 // indirect - github.com/skip-mev/pob v1.0.3 // indirect + github.com/skip-mev/pob v1.0.4 // indirect github.com/spacemonkeygo/spacelog v0.0.0-20180420211403-2296661a0572 // indirect github.com/spaolacci/murmur3 v1.1.0 // indirect github.com/spf13/afero v1.9.5 // indirect @@ -230,7 +229,7 @@ require ( google.golang.org/genproto v0.0.0-20230706204954-ccb25ca9f130 // indirect google.golang.org/genproto/googleapis/api v0.0.0-20230629202037-9506855d4529 // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect - google.golang.org/grpc v1.56.2 // indirect + google.golang.org/grpc v1.57.0 // indirect google.golang.org/protobuf v1.31.0 // indirect gopkg.in/ini.v1 v1.67.0 // indirect gopkg.in/natefinch/npipe.v2 v2.0.0-20160621034901-c1b8fa8bdcce // indirect diff --git a/interchaintest/go.sum b/interchaintest/go.sum index f1d608049..d75160f07 100644 --- a/interchaintest/go.sum +++ b/interchaintest/go.sum @@ -189,8 +189,8 @@ cloud.google.com/go/workflows v1.6.0/go.mod h1:6t9F5h/unJz41YqfBmqSASJSXccBLtD1V cloud.google.com/go/workflows v1.7.0/go.mod h1:JhSrZuVZWuiDfKEFxU0/F1PQjmpnpcoISEXH2bcHC3M= cosmossdk.io/api v0.3.1 h1:NNiOclKRR0AOlO4KIqeaG6PS6kswOMhHD0ir0SscNXE= cosmossdk.io/api v0.3.1/go.mod h1:DfHfMkiNA2Uhy8fj0JJlOCYOBp4eWUUJ1te5zBGNyIw= -cosmossdk.io/core v0.5.1 h1:vQVtFrIYOQJDV3f7rw4pjjVqc1id4+mE0L9hHP66pyI= -cosmossdk.io/core v0.5.1/go.mod h1:KZtwHCLjcFuo0nmDc24Xy6CRNEL9Vl/MeimQ2aC7NLE= +cosmossdk.io/core v0.6.1 h1:OBy7TI2W+/gyn2z40vVvruK3di+cAluinA6cybFbE7s= +cosmossdk.io/core v0.6.1/go.mod h1:g3MMBCBXtxbDWBURDVnJE7XML4BG5qENhs0gzkcpuFA= cosmossdk.io/depinject v1.0.0-alpha.3 h1:6evFIgj//Y3w09bqOUOzEpFj5tsxBqdc5CfkO7z+zfw= cosmossdk.io/depinject v1.0.0-alpha.3/go.mod h1:eRbcdQ7MRpIPEM5YUJh8k97nxHpYbc3sMUnEtt8HPWU= cosmossdk.io/errors v1.0.0 h1:nxF07lmlBbB8NKQhtJ+sJm6ef5uV1XkvPXG2bUntb04= @@ -219,12 +219,10 @@ github.com/ChainSafe/go-schnorrkel v1.0.0 h1:3aDA67lAykLaG1y3AOjs88dMxC88PgUuHRr github.com/ChainSafe/go-schnorrkel v1.0.0/go.mod h1:dpzHYVxLZcp8pjlV+O+UR8K0Hp/z7vcchBSbMBEhCw4= github.com/ComposableFi/go-subkey/v2 v2.0.0-tm03420 h1:oknQF/iIhf5lVjbwjsVDzDByupRhga8nhA3NAmwyHDA= github.com/ComposableFi/go-subkey/v2 v2.0.0-tm03420/go.mod h1:KYkiMX5AbOlXXYfxkrYPrRPV6EbVUALTQh5ptUOJzu8= -github.com/CosmWasm/wasmd v0.40.2 h1:GSDHIaeJI7fcDF5mkzSXQI5IZLtvpNq5t3TjJ9bDpPw= -github.com/CosmWasm/wasmd v0.40.2/go.mod h1:vqI238yb4D6aNuigS8mCqTyyCV9HN5eBEZARKRoK3ts= -github.com/CosmWasm/wasmvm v1.2.4 h1:6OfeZuEcEH/9iqwrg2pkeVtDCkMoj9U6PpKtcrCyVrQ= -github.com/CosmWasm/wasmvm v1.2.4/go.mod h1:vW/E3h8j9xBQs9bCoijDuawKo9kCtxOaS8N8J7KFtkc= -github.com/CosmosContracts/juno/v16 v16.0.0-20230524152917-465dae509bfe h1:ACPwgrFYbitQeFh652jk6lRPH5wl8mALJSaPxfrz8IY= -github.com/CosmosContracts/juno/v16 v16.0.0-20230524152917-465dae509bfe/go.mod h1:aVYVLTlLf8+AaewnwtQYX0YnWi66bOfN14csZl9PoFQ= +github.com/CosmWasm/wasmd v0.41.0 h1:fmwxSbwb50zZDcBaayYFRLIaSFca+EFld1WOaQi49jg= +github.com/CosmWasm/wasmd v0.41.0/go.mod h1:0Sds1q2IsPaTN1gHa3BNOYcUFgtGvxH7CXEXPgoihns= +github.com/CosmWasm/wasmvm v1.3.0 h1:x12X4bKlUPS7TT9QQP45+fJo2sp30GEbiSSgb9jsec8= +github.com/CosmWasm/wasmvm v1.3.0/go.mod h1:vW/E3h8j9xBQs9bCoijDuawKo9kCtxOaS8N8J7KFtkc= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= github.com/FactomProject/basen v0.0.0-20150613233007-fe3947df716e h1:ahyvB3q25YnZWly5Gq1ekg6jcmWaGj/vG/MhF4aisoc= github.com/FactomProject/basen v0.0.0-20150613233007-fe3947df716e/go.mod h1:kGUqhHd//musdITWjFvNTHn90WG9bMLBEPQZ17Cmlpw= @@ -291,8 +289,8 @@ github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM= github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= -github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4= -github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= +github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM= +github.com/cenkalti/backoff/v4 v4.2.1/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= @@ -345,8 +343,8 @@ github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSV github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cosmos/btcutil v1.0.5 h1:t+ZFcX77LpKtDBhjucvnOH8C2l2ioGsBNEQ3jef8xFk= github.com/cosmos/btcutil v1.0.5/go.mod h1:IyB7iuqZMJlthe2tkIFL33xPyzbFYP0XVdS8P5lUPis= -github.com/cosmos/cosmos-proto v1.0.0-beta.2 h1:X3OKvWgK9Gsejo0F1qs5l8Qn6xJV/AzgIWR2wZ8Nua8= -github.com/cosmos/cosmos-proto v1.0.0-beta.2/go.mod h1:+XRCLJ14pr5HFEHIUcn51IKXD1Fy3rkEQqt4WqmN4V0= +github.com/cosmos/cosmos-proto v1.0.0-beta.3 h1:VitvZ1lPORTVxkmF2fAp3IiA61xVwArQYKXTdEcpW6o= +github.com/cosmos/cosmos-proto v1.0.0-beta.3/go.mod h1:t8IASdLaAq+bbHbjq4p960BvcTqtwuAxid3b/2rOD6I= github.com/cosmos/cosmos-sdk v0.47.4 h1:FVUpEprm58nMmBX4xkRdMDaIG5Nr4yy92HZAfGAw9bg= github.com/cosmos/cosmos-sdk v0.47.4/go.mod h1:R5n+uM7vguVPFap4pgkdvQCT1nVo/OtPwrlAU40rvok= github.com/cosmos/go-bip39 v0.0.0-20180819234021-555e2067c45d/go.mod h1:tSxLoYXyBmiFeKpvmq4dzayMdCjCnu8uqmCysIGBT2Y= @@ -910,8 +908,8 @@ github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5Fsn github.com/prometheus/client_golang v1.3.0/go.mod h1:hJaj2vgQTGQmVCsAACORcieXFeDPbaTKGT+JTgUa3og= github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.15.1 h1:8tXpTmJbyH5lydzFPoxSIJ0J46jdh3tylbvM1xCv0LI= -github.com/prometheus/client_golang v1.15.1/go.mod h1:e9yaBhRPU2pPNsZwE+JdQl0KEt1N9XgF6zxWmaC0xOk= +github.com/prometheus/client_golang v1.16.0 h1:yk/hx9hDbrGHovbci4BY+pRMfSuuat626eFsHb7tmT8= +github.com/prometheus/client_golang v1.16.0/go.mod h1:Zsulrv/L9oM40tJ7T815tM89lFEugiJ9HzIqaAx4LKc= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190115171406-56726106282f/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= @@ -934,8 +932,8 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= github.com/prometheus/procfs v0.3.0/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI= -github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= +github.com/prometheus/procfs v0.10.1 h1:kYK1Va/YMlutzCGazswoHKo//tZVlFpKYh+PymziUAg= +github.com/prometheus/procfs v0.10.1/go.mod h1:nwNm2aOCAYw8uTR/9bWRREkZFxAUcWzPHWJq+XBB/FM= github.com/rakyll/statik v0.1.7 h1:OF3QCZUuyPxuGEP7B4ypUa7sB/iHtqOTDYZXGM8KOdQ= github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Unghqrcc= github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= @@ -972,8 +970,8 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= -github.com/skip-mev/pob v1.0.3 h1:cipN/WUU+xfYbcfUQ4EefSvl3ItocsKgRn3tOtRF2OE= -github.com/skip-mev/pob v1.0.3/go.mod h1:PMs/dqcWOQruSN6zLExU0TzlBfBmGA8iTy+FJhxn0T8= +github.com/skip-mev/pob v1.0.4 h1:Degz+Pdm9pCom16bbLawZhXi6PbYPiiJe6cGjBE5g30= +github.com/skip-mev/pob v1.0.4/go.mod h1:tpZivmkiDgCO6O79qBnK4eJQjuJeR9yUzc1jPlGaE1s= github.com/skip-mev/pob/tests/integration v0.1.0 h1:Rag5gcOxMyqOQIY1/C9ZQ1PMRkO01DUkZSKfVs3l7lQ= github.com/skip-mev/pob/tests/integration v0.1.0/go.mod h1:BJtVD+0ic4YPLw1ljSnMlB2VI2KlFJVDW61P2p6+888= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= @@ -1674,8 +1672,8 @@ google.golang.org/grpc v1.48.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACu google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/grpc v1.50.1/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= -google.golang.org/grpc v1.56.2 h1:fVRFRnXvU+x6C4IlHZewvJOVHoOv1TUuQyoRsYnB4bI= -google.golang.org/grpc v1.56.2/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= +google.golang.org/grpc v1.57.0 h1:kfzNeI/klCGD2YPMUlaGNT3pxvYfga7smW3Vth8Zsiw= +google.golang.org/grpc v1.57.0/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= diff --git a/interchaintest/helpers/cosmwasm.go b/interchaintest/helpers/cosmwasm.go index 416053d9d..e930c60b0 100644 --- a/interchaintest/helpers/cosmwasm.go +++ b/interchaintest/helpers/cosmwasm.go @@ -4,11 +4,12 @@ import ( "context" "testing" - "github.com/cosmos/cosmos-sdk/crypto/keyring" "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v7/ibc" "github.com/strangelove-ventures/interchaintest/v7/testutil" "github.com/stretchr/testify/require" + + "github.com/cosmos/cosmos-sdk/crypto/keyring" ) func SetupContract(t *testing.T, ctx context.Context, chain *cosmos.CosmosChain, keyname string, fileLoc string, message string) (codeId, contract string) { @@ -29,7 +30,8 @@ func ExecuteMsgWithAmount(t *testing.T, ctx context.Context, chain *cosmos.Cosmo // amount is #utoken // There has to be a way to do this in ictest? - cmd := []string{"junod", "tx", "wasm", "execute", contractAddr, message, + cmd := []string{ + "junod", "tx", "wasm", "execute", contractAddr, message, "--node", chain.GetRPCAddress(), "--home", chain.HomeDir(), "--chain-id", chain.Config().ChainID, @@ -54,7 +56,8 @@ func ExecuteMsgWithFee(t *testing.T, ctx context.Context, chain *cosmos.CosmosCh // amount is #utoken // There has to be a way to do this in ictest? - cmd := []string{"junod", "tx", "wasm", "execute", contractAddr, message, + cmd := []string{ + "junod", "tx", "wasm", "execute", contractAddr, message, "--node", chain.GetRPCAddress(), "--home", chain.HomeDir(), "--chain-id", chain.Config().ChainID, diff --git a/interchaintest/helpers/feeshare.go b/interchaintest/helpers/feeshare.go index 3ee728101..07b03f930 100644 --- a/interchaintest/helpers/feeshare.go +++ b/interchaintest/helpers/feeshare.go @@ -4,16 +4,18 @@ import ( "context" "testing" - "github.com/cosmos/cosmos-sdk/crypto/keyring" "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v7/ibc" "github.com/strangelove-ventures/interchaintest/v7/testutil" "github.com/stretchr/testify/require" + + "github.com/cosmos/cosmos-sdk/crypto/keyring" ) func RegisterFeeShare(t *testing.T, ctx context.Context, chain *cosmos.CosmosChain, user ibc.Wallet, contract, withdrawAddr string) { // TF gas to create cost 2mil, so we set to 2.5 to be safe - cmd := []string{"junod", "tx", "feeshare", "register", contract, withdrawAddr, + cmd := []string{ + "junod", "tx", "feeshare", "register", contract, withdrawAddr, "--node", chain.GetRPCAddress(), "--home", chain.HomeDir(), "--chain-id", chain.Config().ChainID, diff --git a/interchaintest/helpers/ibchooks.go b/interchaintest/helpers/ibchooks.go index 04a359fdd..a58173612 100644 --- a/interchaintest/helpers/ibchooks.go +++ b/interchaintest/helpers/ibchooks.go @@ -11,7 +11,8 @@ import ( func GetIBCHooksUserAddress(t *testing.T, ctx context.Context, chain *cosmos.CosmosChain, channel, uaddr string) string { // junod q ibchooks wasm-sender channel-0 "juno1hj5fveer5cjtn4wd6wstzugjfdxzl0xps73ftl" --node http://localhost:26657 - cmd := []string{"junod", "query", "ibchooks", "wasm-sender", channel, uaddr, + cmd := []string{ + "junod", "query", "ibchooks", "wasm-sender", channel, uaddr, "--node", chain.GetRPCAddress(), "--chain-id", chain.Config().ChainID, "--output", "json", diff --git a/interchaintest/helpers/tokenfactory.go b/interchaintest/helpers/tokenfactory.go index 07e915046..d955da8f7 100644 --- a/interchaintest/helpers/tokenfactory.go +++ b/interchaintest/helpers/tokenfactory.go @@ -7,14 +7,15 @@ import ( "strconv" "testing" - tokenfactorytypes "github.com/CosmosContracts/juno/v16/x/tokenfactory/types" - banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - - "github.com/cosmos/cosmos-sdk/crypto/keyring" "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v7/ibc" "github.com/strangelove-ventures/interchaintest/v7/testutil" "github.com/stretchr/testify/require" + + "github.com/cosmos/cosmos-sdk/crypto/keyring" + banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" + + tokenfactorytypes "github.com/CosmosContracts/juno/v17/x/tokenfactory/types" ) func debugOutput(t *testing.T, stdout string) { @@ -25,7 +26,8 @@ func debugOutput(t *testing.T, stdout string) { func CreateTokenFactoryDenom(t *testing.T, ctx context.Context, chain *cosmos.CosmosChain, user ibc.Wallet, subDenomName, feeCoin string) (fullDenom string) { // TF gas to create cost 2mil, so we set to 2.5 to be safe - cmd := []string{"junod", "tx", "tokenfactory", "create-denom", subDenomName, + cmd := []string{ + "junod", "tx", "tokenfactory", "create-denom", subDenomName, "--node", chain.GetRPCAddress(), "--home", chain.HomeDir(), "--chain-id", chain.Config().ChainID, @@ -55,7 +57,8 @@ func MintTokenFactoryDenom(t *testing.T, ctx context.Context, chain *cosmos.Cosm denom := strconv.FormatUint(amount, 10) + fullDenom // mint new tokens to the account - cmd := []string{"junod", "tx", "tokenfactory", "mint", denom, + cmd := []string{ + "junod", "tx", "tokenfactory", "mint", denom, "--node", chain.GetRPCAddress(), "--home", chain.HomeDir(), "--chain-id", chain.Config().ChainID, @@ -81,7 +84,8 @@ func MintToTokenFactoryDenom(t *testing.T, ctx context.Context, chain *cosmos.Co t.Log("minting", denom, "to", receiver) // mint new tokens to the account - cmd := []string{"junod", "tx", "tokenfactory", "mint-to", receiver, denom, + cmd := []string{ + "junod", "tx", "tokenfactory", "mint-to", receiver, denom, "--node", chain.GetRPCAddress(), "--home", chain.HomeDir(), "--chain-id", chain.Config().ChainID, @@ -101,7 +105,8 @@ func MintToTokenFactoryDenom(t *testing.T, ctx context.Context, chain *cosmos.Co func UpdateTokenFactoryMetadata(t *testing.T, ctx context.Context, chain *cosmos.CosmosChain, admin ibc.Wallet, fullDenom, ticker, desc, exponent string) { // junod tx tokenfactory modify-metadata [denom] [ticker-symbol] [description] [exponent] - cmd := []string{"junod", "tx", "tokenfactory", "modify-metadata", fullDenom, ticker, fmt.Sprintf("'%s'", desc), exponent, + cmd := []string{ + "junod", "tx", "tokenfactory", "modify-metadata", fullDenom, ticker, fmt.Sprintf("'%s'", desc), exponent, "--node", chain.GetRPCAddress(), "--home", chain.HomeDir(), "--chain-id", chain.Config().ChainID, @@ -120,7 +125,8 @@ func UpdateTokenFactoryMetadata(t *testing.T, ctx context.Context, chain *cosmos } func TransferTokenFactoryAdmin(t *testing.T, ctx context.Context, chain *cosmos.CosmosChain, currentAdmin ibc.Wallet, newAdminBech32 string, fullDenom string) { - cmd := []string{"junod", "tx", "tokenfactory", "change-admin", fullDenom, newAdminBech32, + cmd := []string{ + "junod", "tx", "tokenfactory", "change-admin", fullDenom, newAdminBech32, "--node", chain.GetRPCAddress(), "--home", chain.HomeDir(), "--chain-id", chain.Config().ChainID, @@ -141,7 +147,8 @@ func TransferTokenFactoryAdmin(t *testing.T, ctx context.Context, chain *cosmos. // Getters func GetTokenFactoryAdmin(t *testing.T, ctx context.Context, chain *cosmos.CosmosChain, fullDenom string) string { // $BINARY q tokenfactory denom-authority-metadata $FULL_DENOM - cmd := []string{"junod", "query", "tokenfactory", "denom-authority-metadata", fullDenom, + cmd := []string{ + "junod", "query", "tokenfactory", "denom-authority-metadata", fullDenom, "--node", chain.GetRPCAddress(), "--chain-id", chain.Config().ChainID, "--output", "json", @@ -161,7 +168,8 @@ func GetTokenFactoryAdmin(t *testing.T, ctx context.Context, chain *cosmos.Cosmo } func GetTokenFactoryDenomMetadata(t *testing.T, ctx context.Context, chain *cosmos.CosmosChain, fullDenom string) banktypes.Metadata { - cmd := []string{"junod", "query", "bank", "denom-metadata", "--denom", fullDenom, + cmd := []string{ + "junod", "query", "bank", "denom-metadata", "--denom", fullDenom, "--node", chain.GetRPCAddress(), "--chain-id", chain.Config().ChainID, "--output", "json", diff --git a/interchaintest/ibc_transfer_test.go b/interchaintest/ibc_transfer_test.go index ca5ea34ff..53857f897 100644 --- a/interchaintest/ibc_transfer_test.go +++ b/interchaintest/ibc_transfer_test.go @@ -4,7 +4,6 @@ import ( "context" "testing" - transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" "github.com/strangelove-ventures/interchaintest/v7" "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v7/ibc" @@ -13,6 +12,8 @@ import ( "github.com/strangelove-ventures/interchaintest/v7/testutil" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" + + transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" ) // TestJunoGaiaIBCTransfer spins up a Juno and Gaia network, initializes an IBC connection between them, @@ -140,7 +141,7 @@ func TestJunoGaiaIBCTransfer(t *testing.T) { func() { err := r.StopRelayer(ctx, eRep) if err != nil { - t.Logf("an error occured while stopping the relayer: %s", err) + t.Logf("an error occurred while stopping the relayer: %s", err) } }, ) diff --git a/interchaintest/module_ibchooks_test.go b/interchaintest/module_ibchooks_test.go index ff84326c3..46031c03b 100644 --- a/interchaintest/module_ibchooks_test.go +++ b/interchaintest/module_ibchooks_test.go @@ -6,7 +6,6 @@ import ( "strings" "testing" - helpers "github.com/CosmosContracts/juno/tests/interchaintest/helpers" "github.com/strangelove-ventures/interchaintest/v7" "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v7/ibc" @@ -15,6 +14,8 @@ import ( "github.com/strangelove-ventures/interchaintest/v7/testutil" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" + + helpers "github.com/CosmosContracts/juno/tests/interchaintest/helpers" ) // TestJunoIBCHooks ensures the ibc-hooks middleware from osmosis works. @@ -122,7 +123,7 @@ func TestJunoIBCHooks(t *testing.T) { func() { err := r.StopRelayer(ctx, eRep) if err != nil { - t.Logf("an error occured while stopping the relayer: %s", err) + t.Logf("an error occurred while stopping the relayer: %s", err) } }, ) diff --git a/interchaintest/module_pfm_test.go b/interchaintest/module_pfm_test.go index cb0f28d7d..2bafc5fee 100644 --- a/interchaintest/module_pfm_test.go +++ b/interchaintest/module_pfm_test.go @@ -6,8 +6,6 @@ import ( "testing" "time" - sdk "github.com/cosmos/cosmos-sdk/types" - transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" "github.com/strangelove-ventures/interchaintest/v7" "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v7/ibc" @@ -16,6 +14,10 @@ import ( "github.com/strangelove-ventures/interchaintest/v7/testutil" "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" + + transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types" + + sdk "github.com/cosmos/cosmos-sdk/types" ) type PacketMetadata struct { @@ -191,7 +193,7 @@ func TestPacketForwardMiddlewareRouter(t *testing.T) { func() { err := r.StopRelayer(ctx, eRep) if err != nil { - t.Logf("an error occured while stopping the relayer: %s", err) + t.Logf("an error occurred while stopping the relayer: %s", err) } }, ) diff --git a/interchaintest/module_pob_test.go b/interchaintest/module_pob_test.go index 17c789da0..f41c2281f 100644 --- a/interchaintest/module_pob_test.go +++ b/interchaintest/module_pob_test.go @@ -39,7 +39,7 @@ func GetInterchainSpecForPOB() *interchaintest.ChainSpec { Value: "1", }, }...)) - + return &interchaintest.ChainSpec{ Name: "juno", ChainName: "juno", @@ -48,7 +48,6 @@ func GetInterchainSpecForPOB() *interchaintest.ChainSpec { NumValidators: &numVals, NumFullNodes: &numFull, } - } func TestJunoPOB(t *testing.T) { diff --git a/interchaintest/setup.go b/interchaintest/setup.go index 2093b798f..e775ef275 100644 --- a/interchaintest/setup.go +++ b/interchaintest/setup.go @@ -6,22 +6,21 @@ import ( "testing" wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" - feesharetypes "github.com/CosmosContracts/juno/v16/x/feeshare/types" - tokenfactorytypes "github.com/CosmosContracts/juno/v16/x/tokenfactory/types" - ibclocalhost "github.com/cosmos/ibc-go/v7/modules/light-clients/09-localhost" - "github.com/docker/docker/client" - interchaintest "github.com/strangelove-ventures/interchaintest/v7" "github.com/strangelove-ventures/interchaintest/v7/chain/cosmos" "github.com/strangelove-ventures/interchaintest/v7/ibc" "github.com/strangelove-ventures/interchaintest/v7/testreporter" - "github.com/stretchr/testify/require" "go.uber.org/zap/zaptest" - testutil "github.com/cosmos/cosmos-sdk/types/module/testutil" + ibclocalhost "github.com/cosmos/ibc-go/v7/modules/light-clients/09-localhost" + sdk "github.com/cosmos/cosmos-sdk/types" + testutil "github.com/cosmos/cosmos-sdk/types/module/testutil" + + feesharetypes "github.com/CosmosContracts/juno/v17/x/feeshare/types" + tokenfactorytypes "github.com/CosmosContracts/juno/v17/x/tokenfactory/types" ) var ( @@ -96,14 +95,13 @@ func junoEncoding() *testutil.TestEncodingConfig { feesharetypes.RegisterInterfaces(cfg.InterfaceRegistry) tokenfactorytypes.RegisterInterfaces(cfg.InterfaceRegistry) - //github.com/cosmos/cosmos-sdk/types/module/testutil + return &cfg } // This allows for us to test func FundSpecificUsers() { - } // Base chain, no relaying off this branch (or juno:local if no branch is provided.) diff --git a/x/feeshare/ante/ante.go b/x/feeshare/ante/ante.go index 8f779c2e5..ef12d000c 100644 --- a/x/feeshare/ante/ante.go +++ b/x/feeshare/ante/ante.go @@ -9,7 +9,7 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - feeshare "github.com/CosmosContracts/juno/v16/x/feeshare/types" + feeshare "github.com/CosmosContracts/juno/v17/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 e5db55177..464a75577 100644 --- a/x/feeshare/ante/ante_test.go +++ b/x/feeshare/ante/ante_test.go @@ -7,7 +7,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - ante "github.com/CosmosContracts/juno/v16/x/feeshare/ante" + ante "github.com/CosmosContracts/juno/v17/x/feeshare/ante" ) type AnteTestSuite struct { diff --git a/x/feeshare/ante/expected_keepers.go b/x/feeshare/ante/expected_keepers.go index cf6e96a2d..80c6c4302 100644 --- a/x/feeshare/ante/expected_keepers.go +++ b/x/feeshare/ante/expected_keepers.go @@ -5,7 +5,7 @@ package ante import ( sdk "github.com/cosmos/cosmos-sdk/types" - revtypes "github.com/CosmosContracts/juno/v16/x/feeshare/types" + revtypes "github.com/CosmosContracts/juno/v17/x/feeshare/types" ) type BankKeeper interface { diff --git a/x/feeshare/client/cli/query.go b/x/feeshare/client/cli/query.go index b3ee8dd96..67df07f18 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/v16/x/feeshare/types" + "github.com/CosmosContracts/juno/v17/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 d2733027f..336d47175 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/v16/x/feeshare/types" + "github.com/CosmosContracts/juno/v17/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 f2171f755..1de984e4f 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/v16/x/feeshare/keeper" - "github.com/CosmosContracts/juno/v16/x/feeshare/types" + "github.com/CosmosContracts/juno/v17/x/feeshare/keeper" + "github.com/CosmosContracts/juno/v17/x/feeshare/types" ) // InitGenesis import module genesis diff --git a/x/feeshare/genesis_test.go b/x/feeshare/genesis_test.go index a29269548..1c027e0c6 100644 --- a/x/feeshare/genesis_test.go +++ b/x/feeshare/genesis_test.go @@ -10,9 +10,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v16/app" - "github.com/CosmosContracts/juno/v16/x/feeshare" - "github.com/CosmosContracts/juno/v16/x/feeshare/types" + "github.com/CosmosContracts/juno/v17/app" + "github.com/CosmosContracts/juno/v17/x/feeshare" + "github.com/CosmosContracts/juno/v17/x/feeshare/types" ) type GenesisTestSuite struct { diff --git a/x/feeshare/integration_test.go b/x/feeshare/integration_test.go index 69c76ab42..f450d4cc6 100644 --- a/x/feeshare/integration_test.go +++ b/x/feeshare/integration_test.go @@ -5,7 +5,8 @@ import ( "path/filepath" "testing" - "github.com/CosmWasm/wasmd/x/wasm" + wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" + wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types" "github.com/stretchr/testify/require" dbm "github.com/cometbft/cometbft-db" @@ -19,8 +20,8 @@ import ( simtestutil "github.com/cosmos/cosmos-sdk/testutil/sims" sdk "github.com/cosmos/cosmos-sdk/types" - junoapp "github.com/CosmosContracts/juno/v16/app" - "github.com/CosmosContracts/juno/v16/x/mint/types" + junoapp "github.com/CosmosContracts/juno/v17/app" + "github.com/CosmosContracts/juno/v17/x/mint/types" ) // returns context and an app with updated mint keeper @@ -62,7 +63,7 @@ func Setup(t *testing.T, isCheckTx bool) *junoapp.App { return app } -func GenApp(t *testing.T, withGenesis bool, opts ...wasm.Option) (*junoapp.App, junoapp.GenesisState) { +func GenApp(t *testing.T, withGenesis bool, opts ...wasmkeeper.Option) (*junoapp.App, junoapp.GenesisState) { db := dbm.NewMemDB() nodeHome := t.TempDir() snapshotDir := filepath.Join(nodeHome, "data", "snapshots") @@ -78,7 +79,7 @@ func GenApp(t *testing.T, withGenesis bool, opts ...wasm.Option) (*junoapp.App, db, nil, true, - wasm.EnableAllProposals, + wasmtypes.EnableAllProposals, simtestutil.EmptyAppOptions{}, opts, bam.SetChainID("testing"), diff --git a/x/feeshare/keeper/feeshare.go b/x/feeshare/keeper/feeshare.go index 0ea53e8d0..c99d4432b 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/v16/x/feeshare/types" + "github.com/CosmosContracts/juno/v17/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 94ec0d3e8..8c8c3ff6f 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/v16/x/feeshare/types" + "github.com/CosmosContracts/juno/v17/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 f84e3db3a..77268c6b9 100644 --- a/x/feeshare/keeper/grpc_query_test.go +++ b/x/feeshare/keeper/grpc_query_test.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/query" - "github.com/CosmosContracts/juno/v16/testutil/nullify" - "github.com/CosmosContracts/juno/v16/x/feeshare/types" + "github.com/CosmosContracts/juno/v17/testutil/nullify" + "github.com/CosmosContracts/juno/v17/x/feeshare/types" ) func (s *IntegrationTestSuite) TestFeeShares() { diff --git a/x/feeshare/keeper/keeper.go b/x/feeshare/keeper/keeper.go index bc0a6c7bf..0d2a86330 100644 --- a/x/feeshare/keeper/keeper.go +++ b/x/feeshare/keeper/keeper.go @@ -11,7 +11,7 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - revtypes "github.com/CosmosContracts/juno/v16/x/feeshare/types" + revtypes "github.com/CosmosContracts/juno/v17/x/feeshare/types" ) // Keeper of this module maintains collections of feeshares for contracts diff --git a/x/feeshare/keeper/keeper_test.go b/x/feeshare/keeper/keeper_test.go index d1ae77792..88d87ef94 100644 --- a/x/feeshare/keeper/keeper_test.go +++ b/x/feeshare/keeper/keeper_test.go @@ -14,9 +14,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" minttypes "github.com/cosmos/cosmos-sdk/x/mint/types" - "github.com/CosmosContracts/juno/v16/app" - "github.com/CosmosContracts/juno/v16/x/feeshare/keeper" - "github.com/CosmosContracts/juno/v16/x/feeshare/types" + "github.com/CosmosContracts/juno/v17/app" + "github.com/CosmosContracts/juno/v17/x/feeshare/keeper" + "github.com/CosmosContracts/juno/v17/x/feeshare/types" ) // BankKeeper defines the expected interface needed to retrieve account balances. diff --git a/x/feeshare/keeper/migrator.go b/x/feeshare/keeper/migrator.go index dea5b0b6c..5f5e34ad4 100644 --- a/x/feeshare/keeper/migrator.go +++ b/x/feeshare/keeper/migrator.go @@ -3,8 +3,8 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v16/x/feeshare/exported" - v2 "github.com/CosmosContracts/juno/v16/x/feeshare/migrations/v2" + "github.com/CosmosContracts/juno/v17/x/feeshare/exported" + v2 "github.com/CosmosContracts/juno/v17/x/feeshare/migrations/v2" ) // Migrator is a struct for handling in-place state migrations. diff --git a/x/feeshare/keeper/msg_server.go b/x/feeshare/keeper/msg_server.go index b33760d05..2eab96925 100644 --- a/x/feeshare/keeper/msg_server.go +++ b/x/feeshare/keeper/msg_server.go @@ -11,7 +11,7 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/CosmosContracts/juno/v16/x/feeshare/types" + "github.com/CosmosContracts/juno/v17/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 7cd5f7223..a744f81f0 100644 --- a/x/feeshare/keeper/msg_server_test.go +++ b/x/feeshare/keeper/msg_server_test.go @@ -10,7 +10,7 @@ import ( "github.com/cosmos/cosmos-sdk/testutil/testdata" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v16/x/feeshare/types" + "github.com/CosmosContracts/juno/v17/x/feeshare/types" ) //go:embed testdata/reflect.wasm diff --git a/x/feeshare/keeper/params.go b/x/feeshare/keeper/params.go index 994946b89..c7c2089c9 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/v16/x/feeshare/types" + "github.com/CosmosContracts/juno/v17/x/feeshare/types" ) // GetParams returns the total set of fees parameters. diff --git a/x/feeshare/migrations/v2/migrate.go b/x/feeshare/migrations/v2/migrate.go index 9fabb52b5..905168787 100644 --- a/x/feeshare/migrations/v2/migrate.go +++ b/x/feeshare/migrations/v2/migrate.go @@ -4,8 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v16/x/feeshare/exported" - "github.com/CosmosContracts/juno/v16/x/feeshare/types" + "github.com/CosmosContracts/juno/v17/x/feeshare/exported" + "github.com/CosmosContracts/juno/v17/x/feeshare/types" ) const ( diff --git a/x/feeshare/migrations/v2/migrate_test.go b/x/feeshare/migrations/v2/migrate_test.go index 129bfe90e..ff020ee74 100644 --- a/x/feeshare/migrations/v2/migrate_test.go +++ b/x/feeshare/migrations/v2/migrate_test.go @@ -9,10 +9,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil" - "github.com/CosmosContracts/juno/v16/x/feeshare" - "github.com/CosmosContracts/juno/v16/x/feeshare/exported" - v2 "github.com/CosmosContracts/juno/v16/x/feeshare/migrations/v2" - "github.com/CosmosContracts/juno/v16/x/feeshare/types" + "github.com/CosmosContracts/juno/v17/x/feeshare" + "github.com/CosmosContracts/juno/v17/x/feeshare/exported" + v2 "github.com/CosmosContracts/juno/v17/x/feeshare/migrations/v2" + "github.com/CosmosContracts/juno/v17/x/feeshare/types" ) type mockSubspace struct { diff --git a/x/feeshare/module.go b/x/feeshare/module.go index 174814bbb..4c41d0328 100644 --- a/x/feeshare/module.go +++ b/x/feeshare/module.go @@ -19,10 +19,10 @@ import ( simtypes "github.com/cosmos/cosmos-sdk/types/simulation" authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper" - "github.com/CosmosContracts/juno/v16/x/feeshare/client/cli" - "github.com/CosmosContracts/juno/v16/x/feeshare/exported" - "github.com/CosmosContracts/juno/v16/x/feeshare/keeper" - "github.com/CosmosContracts/juno/v16/x/feeshare/types" + "github.com/CosmosContracts/juno/v17/x/feeshare/client/cli" + "github.com/CosmosContracts/juno/v17/x/feeshare/exported" + "github.com/CosmosContracts/juno/v17/x/feeshare/keeper" + "github.com/CosmosContracts/juno/v17/x/feeshare/types" ) // type check to ensure the interface is properly implemented diff --git a/x/globalfee/alias.go b/x/globalfee/alias.go index 481ebd2e3..1cbe68b65 100644 --- a/x/globalfee/alias.go +++ b/x/globalfee/alias.go @@ -1,7 +1,7 @@ package globalfee import ( - "github.com/CosmosContracts/juno/v16/x/globalfee/types" + "github.com/CosmosContracts/juno/v17/x/globalfee/types" ) const ( diff --git a/x/globalfee/ante/antetest/fee_test_setup.go.archive b/x/globalfee/ante/antetest/fee_test_setup.go.archive deleted file mode 100644 index d75f8a893..000000000 --- a/x/globalfee/ante/antetest/fee_test_setup.go.archive +++ /dev/null @@ -1,122 +0,0 @@ -package antetest - -import ( - "github.com/stretchr/testify/suite" - - tmproto "github.com/cometbft/cometbft/proto/tendermint/types" - - "github.com/cosmos/cosmos-sdk/client" - "github.com/cosmos/cosmos-sdk/client/tx" - cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types" - "github.com/cosmos/cosmos-sdk/testutil/testdata" - sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/cosmos/cosmos-sdk/types/tx/signing" - xauthsigning "github.com/cosmos/cosmos-sdk/x/auth/signing" - "github.com/cosmos/cosmos-sdk/x/params/types" - stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types" - - "github.com/CosmosContracts/juno/v16/app" - appparams "github.com/CosmosContracts/juno/v16/app/params" - "github.com/CosmosContracts/juno/v16/x/globalfee" - gaiafeeante "github.com/CosmosContracts/juno/v16/x/globalfee/ante" - globfeetypes "github.com/CosmosContracts/juno/v16/x/globalfee/types" -) - -type IntegrationTestSuite struct { - suite.Suite - - app *app.App - ctx sdk.Context - clientCtx client.Context - txBuilder client.TxBuilder -} - -func (s *IntegrationTestSuite) SetupTest() { - app := app.Setup(s.T()) - ctx := app.BaseApp.NewContext(false, tmproto.Header{ - ChainID: "testing", - Height: 1, - }) - - encodingConfig := appparams.MakeEncodingConfig() - encodingConfig.Amino.RegisterConcrete(&testdata.TestMsg{}, "testdata.TestMsg", nil) - testdata.RegisterInterfaces(encodingConfig.InterfaceRegistry) - - s.app = app - s.ctx = ctx - s.clientCtx = client.Context{}.WithTxConfig(encodingConfig.TxConfig) -} - -func (s *IntegrationTestSuite) SetupTestGlobalFeeStoreAndMinGasPrice(minGasPrice []sdk.DecCoin, globalFeeParams *globfeetypes.Params) (gaiafeeante.FeeDecorator, sdk.AnteHandler) { - subspace := s.app.GetSubspace(globalfee.ModuleName) - subspace.SetParamSet(s.ctx, globalFeeParams) - s.ctx = s.ctx.WithMinGasPrices(minGasPrice).WithIsCheckTx(true) - - // set staking params - stakingParam := stakingtypes.DefaultParams() - stakingParam.BondDenom = "uatom" - stakingSubspace := s.SetupTestStakingSubspace(stakingParam) - - // TODO: We use keepers here. - // build fee decorator - feeDecorator := gaiafeeante.NewFeeDecorator(app.GetDefaultBypassFeeMessages(), subspace, stakingSubspace, uint64(1_000_000)) - - // chain fee decorator to antehandler - antehandler := sdk.ChainAnteDecorators(feeDecorator) - - return feeDecorator, antehandler -} - -// SetupTestStakingSubspace sets uatom as bond denom for the fee tests. -func (s *IntegrationTestSuite) SetupTestStakingSubspace(params stakingtypes.Params) types.Subspace { - s.app.GetSubspace(stakingtypes.ModuleName).SetParamSet(s.ctx, ¶ms) - return s.app.GetSubspace(stakingtypes.ModuleName) -} - -func (s *IntegrationTestSuite) CreateTestTx(privs []cryptotypes.PrivKey, accNums []uint64, accSeqs []uint64, chainID string) (xauthsigning.Tx, error) { - var sigsV2 []signing.SignatureV2 - for i, priv := range privs { - sigV2 := signing.SignatureV2{ - PubKey: priv.PubKey(), - Data: &signing.SingleSignatureData{ - SignMode: s.clientCtx.TxConfig.SignModeHandler().DefaultMode(), - Signature: nil, - }, - Sequence: accSeqs[i], - } - - sigsV2 = append(sigsV2, sigV2) - } - - if err := s.txBuilder.SetSignatures(sigsV2...); err != nil { - return nil, err - } - - sigsV2 = []signing.SignatureV2{} - for i, priv := range privs { - signerData := xauthsigning.SignerData{ - ChainID: chainID, - AccountNumber: accNums[i], - Sequence: accSeqs[i], - } - sigV2, err := tx.SignWithPrivKey( - s.clientCtx.TxConfig.SignModeHandler().DefaultMode(), - signerData, - s.txBuilder, - priv, - s.clientCtx.TxConfig, - accSeqs[i], - ) - if err != nil { - return nil, err - } - - sigsV2 = append(sigsV2, sigV2) - } - - if err := s.txBuilder.SetSignatures(sigsV2...); err != nil { - return nil, err - } - - return s.txBuilder.GetTx(), nil -} diff --git a/x/globalfee/ante/fee.go b/x/globalfee/ante/fee.go index 7cc74118f..d99bcb261 100644 --- a/x/globalfee/ante/fee.go +++ b/x/globalfee/ante/fee.go @@ -11,7 +11,7 @@ import ( sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper" - globalfeekeeper "github.com/CosmosContracts/juno/v16/x/globalfee/keeper" + globalfeekeeper "github.com/CosmosContracts/juno/v17/x/globalfee/keeper" ) // FeeWithBypassDecorator checks if the transaction's fee is at least as large diff --git a/x/globalfee/client/cli/query.go b/x/globalfee/client/cli/query.go index babab60aa..2fab7e77d 100644 --- a/x/globalfee/client/cli/query.go +++ b/x/globalfee/client/cli/query.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/CosmosContracts/juno/v16/x/globalfee/types" + "github.com/CosmosContracts/juno/v17/x/globalfee/types" ) func GetQueryCmd() *cobra.Command { diff --git a/x/globalfee/genesis_test.go b/x/globalfee/genesis_test.go index c9f5d80dc..6898d573f 100644 --- a/x/globalfee/genesis_test.go +++ b/x/globalfee/genesis_test.go @@ -15,9 +15,9 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - appparams "github.com/CosmosContracts/juno/v16/app/params" - globalfeekeeper "github.com/CosmosContracts/juno/v16/x/globalfee/keeper" - "github.com/CosmosContracts/juno/v16/x/globalfee/types" + appparams "github.com/CosmosContracts/juno/v17/app/params" + globalfeekeeper "github.com/CosmosContracts/juno/v17/x/globalfee/keeper" + "github.com/CosmosContracts/juno/v17/x/globalfee/types" ) func TestDefaultGenesis(t *testing.T) { diff --git a/x/globalfee/keeper/keeper.go b/x/globalfee/keeper/keeper.go index eaf3ff746..226cb8e24 100644 --- a/x/globalfee/keeper/keeper.go +++ b/x/globalfee/keeper/keeper.go @@ -5,7 +5,7 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v16/x/globalfee/types" + "github.com/CosmosContracts/juno/v17/x/globalfee/types" ) // Keeper of the globalfee store diff --git a/x/globalfee/keeper/migrator.go b/x/globalfee/keeper/migrator.go index 3f6b539f2..f13fd47f8 100644 --- a/x/globalfee/keeper/migrator.go +++ b/x/globalfee/keeper/migrator.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - v2 "github.com/CosmosContracts/juno/v16/x/globalfee/migrations/v2" + v2 "github.com/CosmosContracts/juno/v17/x/globalfee/migrations/v2" ) // Migrator is a struct for handling in-place state migrations. diff --git a/x/globalfee/keeper/msg_server.go b/x/globalfee/keeper/msg_server.go index 29bdf0d83..78ecf327d 100644 --- a/x/globalfee/keeper/msg_server.go +++ b/x/globalfee/keeper/msg_server.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/CosmosContracts/juno/v16/x/globalfee/types" + "github.com/CosmosContracts/juno/v17/x/globalfee/types" ) var _ types.MsgServer = msgServer{} diff --git a/x/globalfee/migrations/v2/migrate.go b/x/globalfee/migrations/v2/migrate.go index 1330d4d91..7b4970bb6 100644 --- a/x/globalfee/migrations/v2/migrate.go +++ b/x/globalfee/migrations/v2/migrate.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v16/x/globalfee/types" + "github.com/CosmosContracts/juno/v17/x/globalfee/types" ) const ( diff --git a/x/globalfee/migrations/v2/migrator_test.go b/x/globalfee/migrations/v2/migrator_test.go index 530863122..c4af7f7ce 100644 --- a/x/globalfee/migrations/v2/migrator_test.go +++ b/x/globalfee/migrations/v2/migrator_test.go @@ -9,9 +9,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil" - "github.com/CosmosContracts/juno/v16/x/globalfee" - v2 "github.com/CosmosContracts/juno/v16/x/globalfee/migrations/v2" - "github.com/CosmosContracts/juno/v16/x/globalfee/types" + "github.com/CosmosContracts/juno/v17/x/globalfee" + v2 "github.com/CosmosContracts/juno/v17/x/globalfee/migrations/v2" + "github.com/CosmosContracts/juno/v17/x/globalfee/types" ) func TestMigrateMainnet(t *testing.T) { diff --git a/x/globalfee/module.go b/x/globalfee/module.go index bab87ab38..382e2e480 100644 --- a/x/globalfee/module.go +++ b/x/globalfee/module.go @@ -19,9 +19,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/CosmosContracts/juno/v16/x/globalfee/client/cli" - "github.com/CosmosContracts/juno/v16/x/globalfee/keeper" - "github.com/CosmosContracts/juno/v16/x/globalfee/types" + "github.com/CosmosContracts/juno/v17/x/globalfee/client/cli" + "github.com/CosmosContracts/juno/v17/x/globalfee/keeper" + "github.com/CosmosContracts/juno/v17/x/globalfee/types" ) var ( diff --git a/x/globalfee/querier.go b/x/globalfee/querier.go index add6a0a34..090796dbd 100644 --- a/x/globalfee/querier.go +++ b/x/globalfee/querier.go @@ -5,8 +5,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v16/x/globalfee/keeper" - "github.com/CosmosContracts/juno/v16/x/globalfee/types" + "github.com/CosmosContracts/juno/v17/x/globalfee/keeper" + "github.com/CosmosContracts/juno/v17/x/globalfee/types" ) var _ types.QueryServer = &GrpcQuerier{} diff --git a/x/globalfee/querier_test.go b/x/globalfee/querier_test.go index a0b544232..df8c09796 100644 --- a/x/globalfee/querier_test.go +++ b/x/globalfee/querier_test.go @@ -8,8 +8,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - globalfeekeeper "github.com/CosmosContracts/juno/v16/x/globalfee/keeper" - "github.com/CosmosContracts/juno/v16/x/globalfee/types" + globalfeekeeper "github.com/CosmosContracts/juno/v17/x/globalfee/keeper" + "github.com/CosmosContracts/juno/v17/x/globalfee/types" ) func TestQueryMinimumGasPrices(t *testing.T) { diff --git a/x/mint/abci.go b/x/mint/abci.go index f95cce9c9..b523ef28b 100644 --- a/x/mint/abci.go +++ b/x/mint/abci.go @@ -6,8 +6,8 @@ import ( "github.com/cosmos/cosmos-sdk/telemetry" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v16/x/mint/keeper" - "github.com/CosmosContracts/juno/v16/x/mint/types" + "github.com/CosmosContracts/juno/v17/x/mint/keeper" + "github.com/CosmosContracts/juno/v17/x/mint/types" ) // BeginBlocker mints new tokens for the previous block. diff --git a/x/mint/client/cli/query.go b/x/mint/client/cli/query.go index 2d6c70023..170d0d42a 100644 --- a/x/mint/client/cli/query.go +++ b/x/mint/client/cli/query.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/CosmosContracts/juno/v16/x/mint/types" + "github.com/CosmosContracts/juno/v17/x/mint/types" ) // GetQueryCmd returns the cli query commands for the minting module. diff --git a/x/mint/client/testutil/suite.go b/x/mint/client/testutil/suite.go index 1821d946c..a6e12172c 100644 --- a/x/mint/client/testutil/suite.go +++ b/x/mint/client/testutil/suite.go @@ -13,8 +13,8 @@ import ( "github.com/cosmos/cosmos-sdk/testutil/network" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v16/x/mint/client/cli" - minttypes "github.com/CosmosContracts/juno/v16/x/mint/types" + "github.com/CosmosContracts/juno/v17/x/mint/client/cli" + minttypes "github.com/CosmosContracts/juno/v17/x/mint/types" ) type IntegrationTestSuite struct { diff --git a/x/mint/genesis.go b/x/mint/genesis.go index 5c77f4a86..8db41eb41 100644 --- a/x/mint/genesis.go +++ b/x/mint/genesis.go @@ -3,8 +3,8 @@ package mint import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v16/x/mint/keeper" - "github.com/CosmosContracts/juno/v16/x/mint/types" + "github.com/CosmosContracts/juno/v17/x/mint/keeper" + "github.com/CosmosContracts/juno/v17/x/mint/types" ) // InitGenesis new mint genesis diff --git a/x/mint/keeper/grpc_query.go b/x/mint/keeper/grpc_query.go index 42806c2ef..85b549969 100644 --- a/x/mint/keeper/grpc_query.go +++ b/x/mint/keeper/grpc_query.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v16/x/mint/types" + "github.com/CosmosContracts/juno/v17/x/mint/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/mint/keeper/grpc_query_test.go b/x/mint/keeper/grpc_query_test.go index ceb6f22d5..deacc9077 100644 --- a/x/mint/keeper/grpc_query_test.go +++ b/x/mint/keeper/grpc_query_test.go @@ -11,8 +11,8 @@ import ( "github.com/cosmos/cosmos-sdk/baseapp" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v16/app" - "github.com/CosmosContracts/juno/v16/x/mint/types" + "github.com/CosmosContracts/juno/v17/app" + "github.com/CosmosContracts/juno/v17/x/mint/types" ) type MintTestSuite struct { diff --git a/x/mint/keeper/keeper.go b/x/mint/keeper/keeper.go index 99faa7417..14b22b840 100644 --- a/x/mint/keeper/keeper.go +++ b/x/mint/keeper/keeper.go @@ -11,7 +11,7 @@ import ( storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v16/x/mint/types" + "github.com/CosmosContracts/juno/v17/x/mint/types" ) // Keeper of the mint store diff --git a/x/mint/keeper/migrator.go b/x/mint/keeper/migrator.go index bf04a35eb..e4505e90e 100644 --- a/x/mint/keeper/migrator.go +++ b/x/mint/keeper/migrator.go @@ -3,8 +3,8 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - v2 "github.com/CosmosContracts/juno/v16/x/mint/migrations/v2" - v3 "github.com/CosmosContracts/juno/v16/x/mint/migrations/v3" + v2 "github.com/CosmosContracts/juno/v17/x/mint/migrations/v2" + v3 "github.com/CosmosContracts/juno/v17/x/mint/migrations/v3" ) // Migrator is a struct for handling in-place state migrations. diff --git a/x/mint/keeper/msg_server.go b/x/mint/keeper/msg_server.go index 133e5c0d8..eef6e0ecb 100644 --- a/x/mint/keeper/msg_server.go +++ b/x/mint/keeper/msg_server.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/CosmosContracts/juno/v16/x/mint/types" + "github.com/CosmosContracts/juno/v17/x/mint/types" ) var _ types.MsgServer = msgServer{} diff --git a/x/mint/keeper/querier.go b/x/mint/keeper/querier.go index 6a57367ab..8d4d62d60 100644 --- a/x/mint/keeper/querier.go +++ b/x/mint/keeper/querier.go @@ -6,7 +6,7 @@ package keeper // import ( // abci "github.com/cometbft/cometbft/abci/types" -// "github.com/CosmosContracts/juno/v16/x/mint/types" +// "github.com/CosmosContracts/juno/v17/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 4cac7dffc..dd9a83523 100644 --- a/x/mint/keeper/querier_test.go +++ b/x/mint/keeper/querier_test.go @@ -7,8 +7,8 @@ package keeper_test // "github.com/stretchr/testify/require" -// keep "github.com/CosmosContracts/juno/v16/x/mint/keeper" -// "github.com/CosmosContracts/juno/v16/x/mint/types" +// keep "github.com/CosmosContracts/juno/v17/x/mint/keeper" +// "github.com/CosmosContracts/juno/v17/x/mint/types" // sdk "github.com/cosmos/cosmos-sdk/types" // abci "github.com/cometbft/cometbft/abci/types" diff --git a/x/mint/migrations/v2/migrate.go b/x/mint/migrations/v2/migrate.go index 3f2f89877..9d2674227 100644 --- a/x/mint/migrations/v2/migrate.go +++ b/x/mint/migrations/v2/migrate.go @@ -4,7 +4,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v16/x/mint/types" + "github.com/CosmosContracts/juno/v17/x/mint/types" ) const ( diff --git a/x/mint/migrations/v3/migrate.go b/x/mint/migrations/v3/migrate.go index b465aa32f..bf4fb915f 100644 --- a/x/mint/migrations/v3/migrate.go +++ b/x/mint/migrations/v3/migrate.go @@ -6,7 +6,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v16/x/mint/types" + "github.com/CosmosContracts/juno/v17/x/mint/types" ) const ( diff --git a/x/mint/migrations/v3/migrator_test.go b/x/mint/migrations/v3/migrator_test.go index 27f285fc7..f2bf96ee0 100644 --- a/x/mint/migrations/v3/migrator_test.go +++ b/x/mint/migrations/v3/migrator_test.go @@ -9,10 +9,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil" - "github.com/CosmosContracts/juno/v16/x/mint" - "github.com/CosmosContracts/juno/v16/x/mint/exported" - v3 "github.com/CosmosContracts/juno/v16/x/mint/migrations/v3" - "github.com/CosmosContracts/juno/v16/x/mint/types" + "github.com/CosmosContracts/juno/v17/x/mint" + "github.com/CosmosContracts/juno/v17/x/mint/exported" + v3 "github.com/CosmosContracts/juno/v17/x/mint/migrations/v3" + "github.com/CosmosContracts/juno/v17/x/mint/types" ) type mockSubspace struct { diff --git a/x/mint/module.go b/x/mint/module.go index ca4edd1bb..ae9479b22 100644 --- a/x/mint/module.go +++ b/x/mint/module.go @@ -17,10 +17,10 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/CosmosContracts/juno/v16/x/mint/client/cli" - "github.com/CosmosContracts/juno/v16/x/mint/keeper" - "github.com/CosmosContracts/juno/v16/x/mint/simulation" - "github.com/CosmosContracts/juno/v16/x/mint/types" + "github.com/CosmosContracts/juno/v17/x/mint/client/cli" + "github.com/CosmosContracts/juno/v17/x/mint/keeper" + "github.com/CosmosContracts/juno/v17/x/mint/simulation" + "github.com/CosmosContracts/juno/v17/x/mint/types" ) var ( diff --git a/x/mint/module_test.go b/x/mint/module_test.go index fefc5e2fc..1cf72bbe7 100644 --- a/x/mint/module_test.go +++ b/x/mint/module_test.go @@ -12,7 +12,7 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" "github.com/cosmos/cosmos-sdk/x/nft/testutil" - "github.com/CosmosContracts/juno/v16/x/mint/types" + "github.com/CosmosContracts/juno/v17/x/mint/types" ) func TestItCreatesModuleAccountOnInitBlock(t *testing.T) { diff --git a/x/mint/simulation/decoder.go b/x/mint/simulation/decoder.go index 36f390a68..e9d04a4c3 100644 --- a/x/mint/simulation/decoder.go +++ b/x/mint/simulation/decoder.go @@ -7,7 +7,7 @@ import ( "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/types/kv" - "github.com/CosmosContracts/juno/v16/x/mint/types" + "github.com/CosmosContracts/juno/v17/x/mint/types" ) // NewDecodeStore returns a decoder function closure that unmarshals the KVPair's diff --git a/x/mint/simulation/decoder_test.go b/x/mint/simulation/decoder_test.go index 816510aee..80a1555fc 100644 --- a/x/mint/simulation/decoder_test.go +++ b/x/mint/simulation/decoder_test.go @@ -9,9 +9,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/kv" - "github.com/CosmosContracts/juno/v16/app" - "github.com/CosmosContracts/juno/v16/x/mint/simulation" - "github.com/CosmosContracts/juno/v16/x/mint/types" + "github.com/CosmosContracts/juno/v17/app" + "github.com/CosmosContracts/juno/v17/x/mint/simulation" + "github.com/CosmosContracts/juno/v17/x/mint/types" ) func TestDecodeStore(t *testing.T) { diff --git a/x/mint/simulation/genesis.go b/x/mint/simulation/genesis.go index ded944708..e9f955395 100644 --- a/x/mint/simulation/genesis.go +++ b/x/mint/simulation/genesis.go @@ -10,7 +10,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - "github.com/CosmosContracts/juno/v16/x/mint/types" + "github.com/CosmosContracts/juno/v17/x/mint/types" ) // Simulation parameter constants diff --git a/x/mint/simulation/genesis_test.go b/x/mint/simulation/genesis_test.go index 87583e6ca..99f81b284 100644 --- a/x/mint/simulation/genesis_test.go +++ b/x/mint/simulation/genesis_test.go @@ -15,8 +15,8 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/CosmosContracts/juno/v16/x/mint/simulation" - "github.com/CosmosContracts/juno/v16/x/mint/types" + "github.com/CosmosContracts/juno/v17/x/mint/simulation" + "github.com/CosmosContracts/juno/v17/x/mint/types" ) // TestRandomizedGenState tests the normal scenario of applying RandomizedGenState. diff --git a/x/tokenfactory/bindings/custom_msg_test.go b/x/tokenfactory/bindings/custom_msg_test.go index aa2944d9f..a094db501 100644 --- a/x/tokenfactory/bindings/custom_msg_test.go +++ b/x/tokenfactory/bindings/custom_msg_test.go @@ -11,9 +11,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v16/app" - bindings "github.com/CosmosContracts/juno/v16/x/tokenfactory/bindings/types" - "github.com/CosmosContracts/juno/v16/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v17/app" + bindings "github.com/CosmosContracts/juno/v17/x/tokenfactory/bindings/types" + "github.com/CosmosContracts/juno/v17/x/tokenfactory/types" ) func TestCreateDenomMsg(t *testing.T) { diff --git a/x/tokenfactory/bindings/custom_query_test.go b/x/tokenfactory/bindings/custom_query_test.go index 2893913fc..77711a8e0 100644 --- a/x/tokenfactory/bindings/custom_query_test.go +++ b/x/tokenfactory/bindings/custom_query_test.go @@ -10,8 +10,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v16/app" - bindings "github.com/CosmosContracts/juno/v16/x/tokenfactory/bindings/types" + "github.com/CosmosContracts/juno/v17/app" + bindings "github.com/CosmosContracts/juno/v17/x/tokenfactory/bindings/types" ) func TestQueryFullDenom(t *testing.T) { diff --git a/x/tokenfactory/bindings/helpers_test.go b/x/tokenfactory/bindings/helpers_test.go index 8c50d0ebe..0b1c66512 100644 --- a/x/tokenfactory/bindings/helpers_test.go +++ b/x/tokenfactory/bindings/helpers_test.go @@ -15,7 +15,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktestutil "github.com/cosmos/cosmos-sdk/x/bank/testutil" - "github.com/CosmosContracts/juno/v16/app" + "github.com/CosmosContracts/juno/v17/app" ) func CreateTestInput(t *testing.T) (*app.App, sdk.Context) { diff --git a/x/tokenfactory/bindings/message_plugin.go b/x/tokenfactory/bindings/message_plugin.go index 06ea4032f..04e21f714 100644 --- a/x/tokenfactory/bindings/message_plugin.go +++ b/x/tokenfactory/bindings/message_plugin.go @@ -13,9 +13,9 @@ import ( bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - bindingstypes "github.com/CosmosContracts/juno/v16/x/tokenfactory/bindings/types" - tokenfactorykeeper "github.com/CosmosContracts/juno/v16/x/tokenfactory/keeper" - tokenfactorytypes "github.com/CosmosContracts/juno/v16/x/tokenfactory/types" + bindingstypes "github.com/CosmosContracts/juno/v17/x/tokenfactory/bindings/types" + tokenfactorykeeper "github.com/CosmosContracts/juno/v17/x/tokenfactory/keeper" + tokenfactorytypes "github.com/CosmosContracts/juno/v17/x/tokenfactory/types" ) // CustomMessageDecorator returns decorator for custom CosmWasm bindings messages diff --git a/x/tokenfactory/bindings/queries.go b/x/tokenfactory/bindings/queries.go index 727b28944..88ea0e3a2 100644 --- a/x/tokenfactory/bindings/queries.go +++ b/x/tokenfactory/bindings/queries.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" - bindingstypes "github.com/CosmosContracts/juno/v16/x/tokenfactory/bindings/types" - tokenfactorykeeper "github.com/CosmosContracts/juno/v16/x/tokenfactory/keeper" + bindingstypes "github.com/CosmosContracts/juno/v17/x/tokenfactory/bindings/types" + tokenfactorykeeper "github.com/CosmosContracts/juno/v17/x/tokenfactory/keeper" ) type QueryPlugin struct { diff --git a/x/tokenfactory/bindings/query_plugin.go b/x/tokenfactory/bindings/query_plugin.go index d32eaac8a..72d0073b3 100644 --- a/x/tokenfactory/bindings/query_plugin.go +++ b/x/tokenfactory/bindings/query_plugin.go @@ -11,7 +11,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" sdkerrors "github.com/cosmos/cosmos-sdk/types/errors" - bindingstypes "github.com/CosmosContracts/juno/v16/x/tokenfactory/bindings/types" + bindingstypes "github.com/CosmosContracts/juno/v17/x/tokenfactory/bindings/types" ) // CustomQuerier dispatches custom CosmWasm bindings queries. diff --git a/x/tokenfactory/bindings/validate_msg_test.go b/x/tokenfactory/bindings/validate_msg_test.go index 934d112a2..899a1bfc2 100644 --- a/x/tokenfactory/bindings/validate_msg_test.go +++ b/x/tokenfactory/bindings/validate_msg_test.go @@ -8,9 +8,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - wasmbinding "github.com/CosmosContracts/juno/v16/x/tokenfactory/bindings" - bindings "github.com/CosmosContracts/juno/v16/x/tokenfactory/bindings/types" - "github.com/CosmosContracts/juno/v16/x/tokenfactory/types" + wasmbinding "github.com/CosmosContracts/juno/v17/x/tokenfactory/bindings" + bindings "github.com/CosmosContracts/juno/v17/x/tokenfactory/bindings/types" + "github.com/CosmosContracts/juno/v17/x/tokenfactory/types" ) func TestCreateDenom(t *testing.T) { diff --git a/x/tokenfactory/bindings/validate_queries_test.go b/x/tokenfactory/bindings/validate_queries_test.go index 4f4f3f746..21dd678fa 100644 --- a/x/tokenfactory/bindings/validate_queries_test.go +++ b/x/tokenfactory/bindings/validate_queries_test.go @@ -9,7 +9,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - wasmbinding "github.com/CosmosContracts/juno/v16/x/tokenfactory/bindings" + wasmbinding "github.com/CosmosContracts/juno/v17/x/tokenfactory/bindings" ) func TestFullDenom(t *testing.T) { diff --git a/x/tokenfactory/bindings/wasm.go b/x/tokenfactory/bindings/wasm.go index 1264f1782..95209cf5f 100644 --- a/x/tokenfactory/bindings/wasm.go +++ b/x/tokenfactory/bindings/wasm.go @@ -1,12 +1,11 @@ package bindings import ( - "github.com/CosmWasm/wasmd/x/wasm" wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper" bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper" - tokenfactorykeeper "github.com/CosmosContracts/juno/v16/x/tokenfactory/keeper" + tokenfactorykeeper "github.com/CosmosContracts/juno/v17/x/tokenfactory/keeper" ) func RegisterCustomPlugins( @@ -22,7 +21,7 @@ func RegisterCustomPlugins( CustomMessageDecorator(bank, tokenFactory), ) - return []wasm.Option{ + return []wasmkeeper.Option{ queryPluginOpt, messengerDecoratorOpt, } diff --git a/x/tokenfactory/client/cli/query.go b/x/tokenfactory/client/cli/query.go index 2eed012f0..73672b9c8 100644 --- a/x/tokenfactory/client/cli/query.go +++ b/x/tokenfactory/client/cli/query.go @@ -8,7 +8,7 @@ import ( "github.com/cosmos/cosmos-sdk/client" "github.com/cosmos/cosmos-sdk/client/flags" - "github.com/CosmosContracts/juno/v16/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v17/x/tokenfactory/types" ) // GetQueryCmd returns the cli query commands for this module diff --git a/x/tokenfactory/client/cli/tx.go b/x/tokenfactory/client/cli/tx.go index 1499f115c..ba7b89f69 100644 --- a/x/tokenfactory/client/cli/tx.go +++ b/x/tokenfactory/client/cli/tx.go @@ -13,7 +13,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/CosmosContracts/juno/v16/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v17/x/tokenfactory/types" ) // GetTxCmd returns the transaction commands for this module diff --git a/x/tokenfactory/keeper/admins.go b/x/tokenfactory/keeper/admins.go index 8beef0912..37b956e30 100644 --- a/x/tokenfactory/keeper/admins.go +++ b/x/tokenfactory/keeper/admins.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v16/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v17/x/tokenfactory/types" ) // GetAuthorityMetadata returns the authority metadata for a specific denom diff --git a/x/tokenfactory/keeper/admins_test.go b/x/tokenfactory/keeper/admins_test.go index 220581061..5e2e54026 100644 --- a/x/tokenfactory/keeper/admins_test.go +++ b/x/tokenfactory/keeper/admins_test.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/CosmosContracts/juno/v16/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v17/x/tokenfactory/types" ) func (suite *KeeperTestSuite) TestAdminMsgs() { diff --git a/x/tokenfactory/keeper/bankactions.go b/x/tokenfactory/keeper/bankactions.go index 602cc93bd..60d8061a8 100644 --- a/x/tokenfactory/keeper/bankactions.go +++ b/x/tokenfactory/keeper/bankactions.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v16/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v17/x/tokenfactory/types" ) func (k Keeper) mintTo(ctx sdk.Context, amount sdk.Coin, mintTo string) error { diff --git a/x/tokenfactory/keeper/createdenom.go b/x/tokenfactory/keeper/createdenom.go index 5d17c3970..26cb8f329 100644 --- a/x/tokenfactory/keeper/createdenom.go +++ b/x/tokenfactory/keeper/createdenom.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/CosmosContracts/juno/v16/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v17/x/tokenfactory/types" ) // ConvertToBaseToken converts a fee amount in a whitelisted fee token to the base fee token amount diff --git a/x/tokenfactory/keeper/createdenom_test.go b/x/tokenfactory/keeper/createdenom_test.go index bec45431b..443afba59 100644 --- a/x/tokenfactory/keeper/createdenom_test.go +++ b/x/tokenfactory/keeper/createdenom_test.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/CosmosContracts/juno/v16/app/apptesting" - "github.com/CosmosContracts/juno/v16/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v17/app/apptesting" + "github.com/CosmosContracts/juno/v17/x/tokenfactory/types" ) func (suite *KeeperTestSuite) TestMsgCreateDenom() { diff --git a/x/tokenfactory/keeper/genesis.go b/x/tokenfactory/keeper/genesis.go index 64f8248b2..af575cca9 100644 --- a/x/tokenfactory/keeper/genesis.go +++ b/x/tokenfactory/keeper/genesis.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v16/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v17/x/tokenfactory/types" ) // InitGenesis initializes the tokenfactory module's state from a provided genesis diff --git a/x/tokenfactory/keeper/genesis_test.go b/x/tokenfactory/keeper/genesis_test.go index 4161e64b3..fbe9c41c4 100644 --- a/x/tokenfactory/keeper/genesis_test.go +++ b/x/tokenfactory/keeper/genesis_test.go @@ -4,7 +4,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/CosmosContracts/juno/v16/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v17/x/tokenfactory/types" ) func (suite *KeeperTestSuite) TestGenesis() { diff --git a/x/tokenfactory/keeper/grpc_query.go b/x/tokenfactory/keeper/grpc_query.go index 8436b0ea0..33adbcfb9 100644 --- a/x/tokenfactory/keeper/grpc_query.go +++ b/x/tokenfactory/keeper/grpc_query.go @@ -5,7 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v16/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v17/x/tokenfactory/types" ) var _ types.QueryServer = Keeper{} diff --git a/x/tokenfactory/keeper/keeper.go b/x/tokenfactory/keeper/keeper.go index 655df9a3e..a78e48778 100644 --- a/x/tokenfactory/keeper/keeper.go +++ b/x/tokenfactory/keeper/keeper.go @@ -11,7 +11,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" - "github.com/CosmosContracts/juno/v16/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v17/x/tokenfactory/types" ) type ( diff --git a/x/tokenfactory/keeper/keeper_test.go b/x/tokenfactory/keeper/keeper_test.go index 4190ba881..36cd600bf 100644 --- a/x/tokenfactory/keeper/keeper_test.go +++ b/x/tokenfactory/keeper/keeper_test.go @@ -10,9 +10,9 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/CosmosContracts/juno/v16/app/apptesting" - "github.com/CosmosContracts/juno/v16/x/tokenfactory/keeper" - "github.com/CosmosContracts/juno/v16/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v17/app/apptesting" + "github.com/CosmosContracts/juno/v17/x/tokenfactory/keeper" + "github.com/CosmosContracts/juno/v17/x/tokenfactory/types" ) type KeeperTestSuite struct { diff --git a/x/tokenfactory/keeper/migrator.go b/x/tokenfactory/keeper/migrator.go index c0ed35897..376b5298b 100644 --- a/x/tokenfactory/keeper/migrator.go +++ b/x/tokenfactory/keeper/migrator.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/CosmosContracts/juno/v16/x/tokenfactory/exported" - v2 "github.com/CosmosContracts/juno/v16/x/tokenfactory/migrations/v2" + "github.com/CosmosContracts/juno/v17/x/tokenfactory/exported" + v2 "github.com/CosmosContracts/juno/v17/x/tokenfactory/migrations/v2" ) // Migrator is a struct for handling in-place state migrations. diff --git a/x/tokenfactory/keeper/msg_server.go b/x/tokenfactory/keeper/msg_server.go index af9ac85cd..9ad09bcb0 100644 --- a/x/tokenfactory/keeper/msg_server.go +++ b/x/tokenfactory/keeper/msg_server.go @@ -8,7 +8,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - "github.com/CosmosContracts/juno/v16/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v17/x/tokenfactory/types" ) type msgServer struct { diff --git a/x/tokenfactory/keeper/msg_server_test.go b/x/tokenfactory/keeper/msg_server_test.go index 1dd2bc3df..9cb93d8de 100644 --- a/x/tokenfactory/keeper/msg_server_test.go +++ b/x/tokenfactory/keeper/msg_server_test.go @@ -6,7 +6,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/CosmosContracts/juno/v16/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v17/x/tokenfactory/types" ) // TestMintDenomMsg tests TypeMsgMint message is emitted on a successful mint diff --git a/x/tokenfactory/keeper/params.go b/x/tokenfactory/keeper/params.go index c83d32c79..6214e160f 100644 --- a/x/tokenfactory/keeper/params.go +++ b/x/tokenfactory/keeper/params.go @@ -3,7 +3,7 @@ package keeper import ( sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v16/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v17/x/tokenfactory/types" ) // GetParams returns the total set params. diff --git a/x/tokenfactory/migrations/v2/migrate.go b/x/tokenfactory/migrations/v2/migrate.go index 886ec66d6..21f11ef09 100644 --- a/x/tokenfactory/migrations/v2/migrate.go +++ b/x/tokenfactory/migrations/v2/migrate.go @@ -4,8 +4,8 @@ import ( "github.com/cosmos/cosmos-sdk/codec" sdk "github.com/cosmos/cosmos-sdk/types" - "github.com/CosmosContracts/juno/v16/x/tokenfactory/exported" - "github.com/CosmosContracts/juno/v16/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v17/x/tokenfactory/exported" + "github.com/CosmosContracts/juno/v17/x/tokenfactory/types" ) const ModuleName = "tokenfactory" diff --git a/x/tokenfactory/migrations/v2/migrate_test.go b/x/tokenfactory/migrations/v2/migrate_test.go index 627bae5e1..8b5109687 100644 --- a/x/tokenfactory/migrations/v2/migrate_test.go +++ b/x/tokenfactory/migrations/v2/migrate_test.go @@ -9,10 +9,10 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil" - "github.com/CosmosContracts/juno/v16/x/tokenfactory" - "github.com/CosmosContracts/juno/v16/x/tokenfactory/exported" - v2 "github.com/CosmosContracts/juno/v16/x/tokenfactory/migrations/v2" - "github.com/CosmosContracts/juno/v16/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v17/x/tokenfactory" + "github.com/CosmosContracts/juno/v17/x/tokenfactory/exported" + v2 "github.com/CosmosContracts/juno/v17/x/tokenfactory/migrations/v2" + "github.com/CosmosContracts/juno/v17/x/tokenfactory/types" ) type mockSubspace struct { diff --git a/x/tokenfactory/module.go b/x/tokenfactory/module.go index f68dc74f3..ca74cd10a 100644 --- a/x/tokenfactory/module.go +++ b/x/tokenfactory/module.go @@ -26,11 +26,11 @@ import ( "github.com/cosmos/cosmos-sdk/types/module" simtypes "github.com/cosmos/cosmos-sdk/types/simulation" - "github.com/CosmosContracts/juno/v16/x/tokenfactory/client/cli" - "github.com/CosmosContracts/juno/v16/x/tokenfactory/exported" - "github.com/CosmosContracts/juno/v16/x/tokenfactory/keeper" - simulation "github.com/CosmosContracts/juno/v16/x/tokenfactory/simulation" - "github.com/CosmosContracts/juno/v16/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v17/x/tokenfactory/client/cli" + "github.com/CosmosContracts/juno/v17/x/tokenfactory/exported" + "github.com/CosmosContracts/juno/v17/x/tokenfactory/keeper" + simulation "github.com/CosmosContracts/juno/v17/x/tokenfactory/simulation" + "github.com/CosmosContracts/juno/v17/x/tokenfactory/types" ) var ( diff --git a/x/tokenfactory/simulation/genesis.go b/x/tokenfactory/simulation/genesis.go index f34db90e2..330bbc36d 100644 --- a/x/tokenfactory/simulation/genesis.go +++ b/x/tokenfactory/simulation/genesis.go @@ -6,8 +6,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/types/module" - appparams "github.com/CosmosContracts/juno/v16/app/params" - "github.com/CosmosContracts/juno/v16/x/tokenfactory/types" + appparams "github.com/CosmosContracts/juno/v17/app/params" + "github.com/CosmosContracts/juno/v17/x/tokenfactory/types" ) func RandDenomCreationFeeParam(r *rand.Rand) sdk.Coins { diff --git a/x/tokenfactory/simulation/operations.go b/x/tokenfactory/simulation/operations.go index fe9c62357..94ec966c9 100644 --- a/x/tokenfactory/simulation/operations.go +++ b/x/tokenfactory/simulation/operations.go @@ -10,8 +10,8 @@ import ( banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/cosmos/cosmos-sdk/x/simulation" - appparams "github.com/CosmosContracts/juno/v16/app/params" - "github.com/CosmosContracts/juno/v16/x/tokenfactory/types" + appparams "github.com/CosmosContracts/juno/v17/app/params" + "github.com/CosmosContracts/juno/v17/x/tokenfactory/types" ) // Simulation operation weights constants diff --git a/x/tokenfactory/types/denoms_test.go b/x/tokenfactory/types/denoms_test.go index a0d91233d..d94bc34bd 100644 --- a/x/tokenfactory/types/denoms_test.go +++ b/x/tokenfactory/types/denoms_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/CosmosContracts/juno/v16/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v17/x/tokenfactory/types" ) func TestDeconstructDenom(t *testing.T) { diff --git a/x/tokenfactory/types/genesis_test.go b/x/tokenfactory/types/genesis_test.go index bdc7e2048..9dca629fa 100644 --- a/x/tokenfactory/types/genesis_test.go +++ b/x/tokenfactory/types/genesis_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/require" - "github.com/CosmosContracts/juno/v16/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v17/x/tokenfactory/types" ) func TestGenesisState_Validate(t *testing.T) { diff --git a/x/tokenfactory/types/msgs_test.go b/x/tokenfactory/types/msgs_test.go index b78bfe724..e1452f2d2 100644 --- a/x/tokenfactory/types/msgs_test.go +++ b/x/tokenfactory/types/msgs_test.go @@ -11,8 +11,8 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" - "github.com/CosmosContracts/juno/v16/x/tokenfactory/testhelpers" - "github.com/CosmosContracts/juno/v16/x/tokenfactory/types" + "github.com/CosmosContracts/juno/v17/x/tokenfactory/testhelpers" + "github.com/CosmosContracts/juno/v17/x/tokenfactory/types" ) // Test authz serialize and de-serializes for tokenfactory msg.