diff --git a/app/app.go b/app/app.go index e3f92289..a4e8aa9e 100644 --- a/app/app.go +++ b/app/app.go @@ -9,6 +9,8 @@ import ( "github.com/cosmos/cosmos-sdk/runtime" + autocliv1 "cosmossdk.io/api/cosmos/autocli/v1" + reflectionv1 "cosmossdk.io/api/cosmos/reflection/v1" dbm "github.com/cometbft/cometbft-db" abci "github.com/cometbft/cometbft/abci/types" tmjson "github.com/cometbft/cometbft/libs/json" @@ -20,6 +22,7 @@ import ( "github.com/cosmos/cosmos-sdk/client/grpc/tmservice" "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/codec/types" + runtimeservices "github.com/cosmos/cosmos-sdk/runtime/services" "github.com/cosmos/cosmos-sdk/server/api" "github.com/cosmos/cosmos-sdk/server/config" servertypes "github.com/cosmos/cosmos-sdk/server/types" @@ -63,7 +66,6 @@ import ( govclient "github.com/cosmos/cosmos-sdk/x/gov/client" govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper" govtypes "github.com/cosmos/cosmos-sdk/x/gov/types" - govtypesv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1" govtypesv1beta1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1beta1" "github.com/cosmos/cosmos-sdk/x/mint" mintkeeper "github.com/cosmos/cosmos-sdk/x/mint/keeper" @@ -744,6 +746,14 @@ func NewSommelierApp( app.MountTransientStores(tkeys) app.MountMemoryStores(memKeys) + autocliv1.RegisterQueryServer(app.GRPCQueryRouter(), runtimeservices.NewAutoCLIQueryService(app.mm.Modules)) + + reflectionSvc, err := runtimeservices.NewReflectionService() + if err != nil { + panic(err) + } + reflectionv1.RegisterReflectionServiceServer(app.GRPCQueryRouter(), reflectionSvc) + // initialize BaseApp app.SetInitChainer(app.InitChainer) app.SetBeginBlocker(app.BeginBlocker) @@ -966,7 +976,7 @@ func initParamsKeeper(appCodec codec.BinaryCodec, legacyAmino *codec.LegacyAmino paramsKeeper.Subspace(minttypes.ModuleName) paramsKeeper.Subspace(distrtypes.ModuleName) paramsKeeper.Subspace(slashingtypes.ModuleName) - paramsKeeper.Subspace(govtypes.ModuleName).WithKeyTable(govtypesv1.ParamKeyTable()) + paramsKeeper.Subspace(govtypes.ModuleName) paramsKeeper.Subspace(crisistypes.ModuleName) paramsKeeper.Subspace(ibctransfertypes.ModuleName) paramsKeeper.Subspace(icaexported.ModuleName) diff --git a/integration_tests/auction_test.go b/integration_tests/auction_test.go index 37e379bf..f5c5d736 100644 --- a/integration_tests/auction_test.go +++ b/integration_tests/auction_test.go @@ -276,12 +276,6 @@ func (s *IntegrationTestSuite) TestAuction() { endedAuctionResponse, err := auctionQueryClient.QueryEndedAuction(context.Background(), &types.QueryEndedAuctionRequest{AuctionId: uint32(1)}) s.Require().NoError(err) - node, err = orchClientCtx.GetNode() - s.Require().NoError(err) - status, err = node.Status(context.Background()) - s.Require().NoError(err) - currentBlockHeight = status.SyncInfo.LatestBlockHeight - expectedEndedAuction := types.Auction{ Id: uint32(1), StartingTokensForSale: sdk.NewCoin("gravity0x3506424f91fd33084466f402d5d97f05f8e3b4af", sdk.NewInt(5000000000)), diff --git a/integration_tests/incentives_test.go b/integration_tests/incentives_test.go index ccbb9abf..e15c8472 100644 --- a/integration_tests/incentives_test.go +++ b/integration_tests/incentives_test.go @@ -210,13 +210,16 @@ func (s *IntegrationTestSuite) queryValidatorRewards(ctx context.Context, valOpe return rewardsRes.Rewards.Rewards.AmountOf(params.BaseCoinUnit) } -func (s *IntegrationTestSuite) getCurrentHeight(clientCtx *client.Context) int64 { +func (s *IntegrationTestSuite) getCurrentHeight(clientCtx *client.Context) (int64, error) { node, err := clientCtx.GetNode() - s.Require().NoError(err) + if err != nil { + return 0, err + } status, err := node.Status(context.Background()) - s.Require().NoError(err) - - return status.SyncInfo.LatestBlockHeight + if err != nil { + return 0, err + } + return status.SyncInfo.LatestBlockHeight, nil } func (s *IntegrationTestSuite) getRewardAmountAndHeight(ctx context.Context, distQueryClient disttypes.QueryClient, operatorAddress string, clientCtx *client.Context) (sdk.Dec, int64) { @@ -224,9 +227,15 @@ func (s *IntegrationTestSuite) getRewardAmountAndHeight(ctx context.Context, dis var height int64 s.Require().Eventually(func() bool { - initialHeight := s.getCurrentHeight(clientCtx) + initialHeight, err := s.getCurrentHeight(clientCtx) + if err != nil { + return false + } amount = s.queryValidatorRewards(ctx, operatorAddress, distQueryClient) - height = s.getCurrentHeight(clientCtx) + height, err = s.getCurrentHeight(clientCtx) + if err != nil { + return false + } return initialHeight == height }, time.Second*30, time.Second*1, "failed to reliably determine height of reward sample") diff --git a/integration_tests/setup_test.go b/integration_tests/setup_test.go index 842fcb45..77a13516 100644 --- a/integration_tests/setup_test.go +++ b/integration_tests/setup_test.go @@ -403,8 +403,6 @@ func (s *IntegrationTestSuite) initGenesis() { distGenState := disttypes.DefaultGenesisState() s.Require().NoError(cdc.UnmarshalJSON(appGenState[minttypes.ModuleName], &mintGenState)) distGenState.Params.CommunityTax = sdk.ZeroDec() - distGenState.Params.BaseProposerReward = sdk.ZeroDec() - distGenState.Params.BonusProposerReward = sdk.ZeroDec() distGenState.FeePool.CommunityPool = sdk.NewDecCoins(sdk.NewDecCoin(params.BaseCoinUnit, sdk.NewInt(1000000000))) bz, err = cdc.MarshalJSON(distGenState) s.Require().NoError(err) diff --git a/x/auction/client/cli/tx_test.go b/x/auction/client/cli/tx_test.go index f8cb5357..8a39b04f 100644 --- a/x/auction/client/cli/tx_test.go +++ b/x/auction/client/cli/tx_test.go @@ -5,15 +5,15 @@ import ( "os" "testing" - "github.com/cosmos/cosmos-sdk/testutil" "github.com/peggyjv/sommelier/v7/x/auction/types" "github.com/cosmos/cosmos-sdk/testutil" + moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil" "github.com/stretchr/testify/require" ) func TestParseSetTokenPricesProposal(t *testing.T) { - encodingConfig := testutil.TestEncodingConfig() + encodingConfig := moduletestutil.MakeTestEncodingConfig() okJSON := testutil.WriteToNewTempFile(t, ` { @@ -33,7 +33,7 @@ func TestParseSetTokenPricesProposal(t *testing.T) { require.Equal(t, "My token proposal", proposal.Title) require.Equal(t, "Contains a usomm price update", proposal.Description) - require.Equal(t, "denom:\"usomm\" exponent:\"6\" usd_price:\"4200000000000000000\" ", proposal.TokenPrices[0].String()) + require.Equal(t, "denom:\"usomm\" exponent:6 usd_price:\"4200000000000000000\" ", proposal.TokenPrices[0].String()) require.Equal(t, "10000usomm", proposal.Deposit) } diff --git a/x/auction/module.go b/x/auction/module.go index 14114663..c189e197 100644 --- a/x/auction/module.go +++ b/x/auction/module.go @@ -151,7 +151,7 @@ func (AppModule) GenerateGenesisState(simState *module.SimulationState) { // ProposalContents returns all the distribution content functions used to // simulate governance proposals. -func (am AppModule) ProposalContents(_ module.SimulationState) []sim.WeightedProposalContent { +func (am AppModule) ProposalContents(_ module.SimulationState) []sim.WeightedProposalMsg { return nil } diff --git a/x/axelarcork/client/cli/tx_test.go b/x/axelarcork/client/cli/tx_test.go index 087ba52f..fff2e355 100644 --- a/x/axelarcork/client/cli/tx_test.go +++ b/x/axelarcork/client/cli/tx_test.go @@ -8,11 +8,12 @@ import ( "github.com/peggyjv/sommelier/v7/x/axelarcork/types" "github.com/cosmos/cosmos-sdk/testutil" + moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil" "github.com/stretchr/testify/require" ) func TestParseAddManagedCellarsProposal(t *testing.T) { - encodingConfig := testutil.TestEncodingConfig() + encodingConfig := moduletestutil.MakeTestEncodingConfig() okJSON := testutil.WriteToNewTempFile(t, ` { @@ -42,7 +43,7 @@ func TestParseAddManagedCellarsProposal(t *testing.T) { } func TestParseRemoveManagedCellarsProposal(t *testing.T) { - encodingConfig := testutil.TestEncodingConfig() + encodingConfig := moduletestutil.MakeTestEncodingConfig() okJSON := testutil.WriteToNewTempFile(t, ` { @@ -70,7 +71,7 @@ func TestParseRemoveManagedCellarsProposal(t *testing.T) { } func TestParseSubmitScheduledCorkProposal(t *testing.T) { - encodingConfig := testutil.TestEncodingConfig() + encodingConfig := moduletestutil.MakeTestEncodingConfig() okJSON := testutil.WriteToNewTempFile(t, ` { @@ -103,7 +104,7 @@ func TestParseSubmitScheduledCorkProposal(t *testing.T) { } func TestParseAxelarCommunityPoolSpendProposal(t *testing.T) { - encodingConfig := testutil.TestEncodingConfig() + encodingConfig := moduletestutil.MakeTestEncodingConfig() okJSON := testutil.WriteToNewTempFile(t, ` { @@ -132,7 +133,7 @@ func TestParseAxelarCommunityPoolSpendProposal(t *testing.T) { } func TestParseAddChainConfigurationProposal(t *testing.T) { - encodingConfig := testutil.TestEncodingConfig() + encodingConfig := moduletestutil.MakeTestEncodingConfig() okJSON := testutil.WriteToNewTempFile(t, ` { @@ -171,7 +172,7 @@ func TestParseAddChainConfigurationProposal(t *testing.T) { } func TestParseRemoveChainConfigurationProposal(t *testing.T) { - encodingConfig := testutil.TestEncodingConfig() + encodingConfig := moduletestutil.MakeTestEncodingConfig() okJSON := testutil.WriteToNewTempFile(t, ` { @@ -196,7 +197,7 @@ func TestParseRemoveChainConfigurationProposal(t *testing.T) { } func TestParseUpgradeAxelarProxyContractProposal(t *testing.T) { - encodingConfig := testutil.TestEncodingConfig() + encodingConfig := moduletestutil.MakeTestEncodingConfig() okJSON := testutil.WriteToNewTempFile(t, ` { @@ -223,7 +224,7 @@ func TestParseUpgradeAxelarProxyContractProposal(t *testing.T) { } func TestParseCancelAxelarProxyContractUpgradeProposal(t *testing.T) { - encodingConfig := testutil.TestEncodingConfig() + encodingConfig := moduletestutil.MakeTestEncodingConfig() okJSON := testutil.WriteToNewTempFile(t, ` { diff --git a/x/axelarcork/module.go b/x/axelarcork/module.go index 52fae168..f98a39cc 100644 --- a/x/axelarcork/module.go +++ b/x/axelarcork/module.go @@ -147,7 +147,7 @@ func (AppModule) GenerateGenesisState(simState *module.SimulationState) { // ProposalContents returns all the cork content functions used to // simulate governance proposals. -func (am AppModule) ProposalContents(_ module.SimulationState) []sim.WeightedProposalContent { +func (am AppModule) ProposalContents(_ module.SimulationState) []sim.WeightedProposalMsg { return nil } diff --git a/x/cellarfees/module.go b/x/cellarfees/module.go index bc3c931d..7e35a42e 100644 --- a/x/cellarfees/module.go +++ b/x/cellarfees/module.go @@ -157,7 +157,7 @@ func (AppModule) GenerateGenesisState(simState *module.SimulationState) {} // ProposalContents returns all the cellarfees content functions used to // simulate governance proposals. -func (am AppModule) ProposalContents(_ module.SimulationState) []sim.WeightedProposalContent { +func (am AppModule) ProposalContents(_ module.SimulationState) []sim.WeightedProposalMsg { return nil } diff --git a/x/cork/client/cli/tx_test.go b/x/cork/client/cli/tx_test.go index 13799211..03fd9829 100644 --- a/x/cork/client/cli/tx_test.go +++ b/x/cork/client/cli/tx_test.go @@ -7,11 +7,12 @@ import ( types "github.com/peggyjv/sommelier/v7/x/cork/types/v2" "github.com/cosmos/cosmos-sdk/testutil" + moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil" "github.com/stretchr/testify/require" ) func TestParseAddManagedCellarsProposal(t *testing.T) { - encodingConfig := testutil.TestEncodingConfig() + encodingConfig := moduletestutil.MakeTestEncodingConfig() okJSON := testutil.WriteToNewTempFile(t, ` { @@ -39,7 +40,7 @@ func TestParseAddManagedCellarsProposal(t *testing.T) { } func TestParseRemoveManagedCellarsProposal(t *testing.T) { - encodingConfig := testutil.TestEncodingConfig() + encodingConfig := moduletestutil.MakeTestEncodingConfig() okJSON := testutil.WriteToNewTempFile(t, ` { @@ -65,7 +66,7 @@ func TestParseRemoveManagedCellarsProposal(t *testing.T) { } func TestParseSubmitScheduledCorkProposal(t *testing.T) { - encodingConfig := testutil.TestEncodingConfig() + encodingConfig := moduletestutil.MakeTestEncodingConfig() okJSON := testutil.WriteToNewTempFile(t, ` { diff --git a/x/cork/module.go b/x/cork/module.go index 7a78ac82..d31123b7 100644 --- a/x/cork/module.go +++ b/x/cork/module.go @@ -154,7 +154,7 @@ func (AppModule) GenerateGenesisState(simState *module.SimulationState) { // ProposalContents returns all the cork content functions used to // simulate governance proposals. -func (am AppModule) ProposalContents(_ module.SimulationState) []sim.WeightedProposalContent { +func (am AppModule) ProposalContents(_ module.SimulationState) []sim.WeightedProposalMsg { return nil } diff --git a/x/incentives/module.go b/x/incentives/module.go index cd936b45..7a306555 100644 --- a/x/incentives/module.go +++ b/x/incentives/module.go @@ -153,7 +153,7 @@ func (AppModule) GenerateGenesisState(simState *module.SimulationState) { // ProposalContents returns all the distribution content functions used to // simulate governance proposals. -func (am AppModule) ProposalContents(_ module.SimulationState) []sim.WeightedProposalContent { +func (am AppModule) ProposalContents(_ module.SimulationState) []sim.WeightedProposalMsg { return nil } diff --git a/x/pubsub/module.go b/x/pubsub/module.go index 3b4120e2..6ff586d4 100644 --- a/x/pubsub/module.go +++ b/x/pubsub/module.go @@ -162,7 +162,7 @@ func (AppModule) GenerateGenesisState(simState *module.SimulationState) {} // ProposalContents returns all the content functions used to // simulate governance proposals. -func (am AppModule) ProposalContents(_ module.SimulationState) []sim.WeightedProposalContent { +func (am AppModule) ProposalContents(_ module.SimulationState) []sim.WeightedProposalMsg { return nil }