Merge remote-tracking branch 'origin' into eric/block-stm-upstream

Eric-Warehime · Eric-Warehime · commit 2dbb0df4f041 · 2025-09-16T08:52:36.000-07:00
diff --git a/.github/workflows/dependabot-update-all.yml b/.github/workflows/dependabot-update-all.yml
@@ -14,7 +14,7 @@ jobs:
     if: ${{ github.actor == 'dependabot[bot]' }}
     steps:
       - name: Generate Token
-        uses: actions/create-github-app-token@a8d616148505b5069dccd32f177bb87d7f39123b # v1
+        uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v1
         id: app-token
         with:
           app-id: "${{ secrets.APP_ID }}"
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -81,6 +81,7 @@ This patch update also includes minor dependency bumps.
 
 ### Improvements
 
+* (types) [#25342](https://github.com/cosmos/cosmos-sdk/pull/25342) Undeprecated `EmitEvent` and `EmitEvents` on the `EventManager`.  These functions will continue to be maintained.
 * (types) [#24668](https://github.com/cosmos/cosmos-sdk/pull/24668) Scope the global config to a particular binary so that multiple SDK binaries can be properly run on the same machine.
 * (baseapp) [#24655](https://github.com/cosmos/cosmos-sdk/pull/24655) Add mutex locks for `state` and make `lastCommitInfo` atomic to prevent race conditions between `Commit` and `CreateQueryContext`.
 * (proto) [#24161](https://github.com/cosmos/cosmos-sdk/pull/24161) Remove unnecessary annotations from `x/staking` authz proto.
diff --git a/types/events.go b/types/events.go
@@ -43,13 +43,11 @@ func NewEventManager() *EventManager {
 func (em *EventManager) Events() Events { return em.events }
 
 // EmitEvent stores a single Event object.
-// Deprecated: Use EmitTypedEvent
 func (em *EventManager) EmitEvent(event Event) {
 	em.events = em.events.AppendEvent(event)
 }
 
 // EmitEvents stores a series of Event objects.
-// Deprecated: Use EmitTypedEvents
 func (em *EventManager) EmitEvents(events Events) {
 	em.events = em.events.AppendEvents(events)
 }
diff --git a/x/bank/keeper/keeper.go b/x/bank/keeper/keeper.go
@@ -395,7 +395,7 @@ func (k BaseKeeper) MintCoins(ctx context.Context, moduleName string, amounts sd
 	return nil
 }
 
-// BurnCoins burns coins deletes coins from the balance of the module account.
+// BurnCoins burns coins from the balance of the module account.
 // It will panic if the module account does not exist or is unauthorized.
 func (k BaseKeeper) BurnCoins(ctx context.Context, moduleName string, amounts sdk.Coins) error {
 	acc := k.ak.GetModuleAccount(ctx, moduleName)
diff --git a/x/bank/migrations/v4/gen_state_test.go b/x/bank/migrations/v4/gen_state_test.go
@@ -28,7 +28,7 @@ func TestMigrateGenState(t *testing.T) {
 				}},
 				Supply: sdk.Coins{sdk.NewCoin("supplycoin", sdkmath.NewInt(800))},
 				DenomMetadata: []types.Metadata{{
-					Description: "metadesk",
+					Description: "metadesc",
 					DenomUnits:  nil,
 					Base:        "meta",
 					Display:     "meta",
@@ -47,7 +47,7 @@ func TestMigrateGenState(t *testing.T) {
 				}},
 				Supply: sdk.Coins{sdk.NewCoin("supplycoin", sdkmath.NewInt(800))},
 				DenomMetadata: []types.Metadata{{
-					Description: "metadesk",
+					Description: "metadesc",
 					DenomUnits:  nil,
 					Base:        "meta",
 					Display:     "meta",
diff --git a/x/bank/types/genesis_test.go b/x/bank/types/genesis_test.go
@@ -174,7 +174,7 @@ func TestMigrateSendEnabled(t *testing.T) {
 				}},
 				Supply: sdk.Coins{sdk.NewCoin("supplycoin", math.NewInt(800))},
 				DenomMetadata: []Metadata{{
-					Description: "metadesk",
+					Description: "metadesc",
 					DenomUnits:  nil,
 					Base:        "meta",
 					Display:     "meta",
@@ -192,7 +192,7 @@ func TestMigrateSendEnabled(t *testing.T) {
 				}},
 				Supply: sdk.Coins{sdk.NewCoin("supplycoin", math.NewInt(800))},
 				DenomMetadata: []Metadata{{
-					Description: "metadesk",
+					Description: "metadesc",
 					DenomUnits:  nil,
 					Base:        "meta",
 					Display:     "meta",
diff --git a/x/bank/types/params_test.go b/x/bank/types/params_test.go
@@ -69,5 +69,5 @@ func Test_validateParams(t *testing.T) {
 	assert.NoError(t, DefaultParams().Validate(), "default")
 	assert.NoError(t, NewParams(true).Validate(), "true")
 	assert.NoError(t, NewParams(false).Validate(), "false")
-	assert.Error(t, Params{[]*SendEnabled{{"foocoing", false}}, true}.Validate(), "with SendEnabled entry")
+	assert.Error(t, Params{[]*SendEnabled{{"foocoin", false}}, true}.Validate(), "with SendEnabled entry")
 }
diff --git a/x/bank/types/restrictions_test.go b/x/bank/types/restrictions_test.go
@@ -391,7 +391,7 @@ func TestNoOpMintingRestrictionFn(t *testing.T) {
 		err = types.NoOpMintingRestrictionFn(sdk.Context{}, sdk.Coins{})
 	}
 	require.NotPanics(t, testFunc, "NoOpMintingRestrictionFn")
-	assert.NoError(t, err, "NoOpSendRestrictionFn error")
+	assert.NoError(t, err, "NoOpMintingRestrictionFn error")
 }
 
 // SendRestrictionArgs are the args provided to a SendRestrictionFn function.
diff --git a/x/consensus/keeper/keeper_test.go b/x/consensus/keeper/keeper_test.go
@@ -165,7 +165,7 @@ func (s *KeeperTestSuite) TestUpdateParams() {
 			expErrMsg: "",
 		},
 		{
-			name: "invalid  params",
+			name: "invalid params",
 			input: &types.MsgUpdateParams{
 				Authority: s.consensusParamsKeeper.GetAuthority(),
 				Block:     &cmtproto.BlockParams{MaxGas: -10, MaxBytes: -10},
diff --git a/x/consensus/module.go b/x/consensus/module.go
@@ -54,7 +54,7 @@ func (AppModuleBasic) RegisterGRPCGatewayRoutes(clientCtx client.Context, mux *g
 	}
 }
 
-// RegisterInterfaces registers interfaces and implementations of the bank module.
+// RegisterInterfaces registers interfaces and implementations of the consensus module.
 func (AppModuleBasic) RegisterInterfaces(registry codectypes.InterfaceRegistry) {
 	types.RegisterInterfaces(registry)
 }
diff --git a/x/distribution/keeper/abci.go b/x/distribution/keeper/abci.go
@@ -14,7 +14,6 @@ func (k Keeper) BeginBlocker(ctx sdk.Context) error {
 
 	// determine the total power signing the block
 	var previousTotalPower int64
-	// determine the total power signing the block
 	for _, voteInfo := range ctx.VoteInfos() {
 		previousTotalPower += voteInfo.Validator.Power
 	}
diff --git a/x/distribution/keeper/delegation_test.go b/x/distribution/keeper/delegation_test.go
@@ -760,7 +760,7 @@ func TestCalculateRewardsMultiDelegatorMultiSlash(t *testing.T) {
 	require.Equal(t, sdk.DecCoins{{Denom: sdk.DefaultBondDenom, Amount: initial}}, valCommission.Commission)
 }
 
-func TestCalculateRewardsMultiDelegatorMultWithdraw(t *testing.T) {
+func TestCalculateRewardsMultiDelegatorMultiWithdraw(t *testing.T) {
 	ctrl := gomock.NewController(t)
 	key := storetypes.NewKVStoreKey(disttypes.StoreKey)
 	storeService := runtime.NewKVStoreService(key)
@@ -989,7 +989,7 @@ func Test100PercentCommissionReward(t *testing.T) {
 	require.NoError(t, distrKeeper.FeePool.Set(ctx, disttypes.InitialFeePool()))
 	require.NoError(t, distrKeeper.Params.Set(ctx, disttypes.DefaultParams()))
 
-	// create validator with 50% commission
+	// create validator with 100% commission
 	valAddr := sdk.ValAddress(valConsAddr0)
 	addr := sdk.AccAddress(valAddr)
 	val, err := distrtestutil.CreateValidator(valConsPk0, math.NewInt(100))
diff --git a/x/distribution/keeper/msg_server.go b/x/distribution/keeper/msg_server.go
@@ -147,7 +147,7 @@ func (k msgServer) UpdateParams(ctx context.Context, msg *types.MsgUpdateParams)
 
 func (k msgServer) CommunityPoolSpend(ctx context.Context, msg *types.MsgCommunityPoolSpend) (*types.MsgCommunityPoolSpendResponse, error) {
 	if k.HasExternalCommunityPool() {
-		return nil, errors.Wrapf(sdkerrors.ErrInvalidRequest, "external community pool is enabled -  use the DistributeFromCommunityPool method exposed by the external community pool")
+		return nil, errors.Wrapf(sdkerrors.ErrInvalidRequest, "external community pool is enabled - use the DistributeFromCommunityPool method exposed by the external community pool")
 	}
 
 	if err := k.validateAuthority(msg.Authority); err != nil {
diff --git a/x/slashing/simulation/operations.go b/x/slashing/simulation/operations.go
@@ -22,7 +22,7 @@ import (
 const (
 	OpWeightMsgUnjail = "op_weight_msg_unjail"
 
-	DefaultWeightMsgUnjail = 100
+	DefaultWeightMsgUnjail = 5 // Reduced from 100 since validators are rarely jailed in simulations
 )
 
 // WeightedOperations returns all the operations from the module with their respective weights
@@ -87,7 +87,8 @@ func SimulateMsgUnjail(
 		}
 
 		if !validator.IsJailed() {
-			// TODO: due to this condition this message is almost, if not always, skipped !
+			// This operation is often skipped because validators are rarely jailed in simulations.
+			// The weight has been reduced to 5 to reflect this reality.
 			return simtypes.NoOpMsg(types.ModuleName, msgType, "validator is not jailed"), nil, nil
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -43,13 +43,11 @@ func NewEventManager() *EventManager {`
`43`	`43`	`func (em *EventManager) Events() Events { return em.events }`
`44`	`44`
`45`	`45`	`// EmitEvent stores a single Event object.`
`46`		`-// Deprecated: Use EmitTypedEvent`
`47`	`46`	`func (em *EventManager) EmitEvent(event Event) {`
`48`	`47`	`em.events = em.events.AppendEvent(event)`
`49`	`48`	`}`
`50`	`49`
`51`	`50`	`// EmitEvents stores a series of Event objects.`
`52`		`-// Deprecated: Use EmitTypedEvents`
`53`	`51`	`func (em *EventManager) EmitEvents(events Events) {`
`54`	`52`	`em.events = em.events.AppendEvents(events)`
`55`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -395,7 +395,7 @@ func (k BaseKeeper) MintCoins(ctx context.Context, moduleName string, amounts sd`
`395`	`395`	`return nil`
`396`	`396`	`}`
`397`	`397`
`398`		`-// BurnCoins burns coins deletes coins from the balance of the module account.`
	`398`	`+// BurnCoins burns coins from the balance of the module account.`
`399`	`399`	`// It will panic if the module account does not exist or is unauthorized.`
`400`	`400`	`func (k BaseKeeper) BurnCoins(ctx context.Context, moduleName string, amounts sdk.Coins) error {`
`401`	`401`	`acc := k.ak.GetModuleAccount(ctx, moduleName)`
Original file line number	Diff line number	Diff line change
`@@ -69,5 +69,5 @@ func Test_validateParams(t *testing.T) {`
`69`	`69`	`assert.NoError(t, DefaultParams().Validate(), "default")`
`70`	`70`	`assert.NoError(t, NewParams(true).Validate(), "true")`
`71`	`71`	`assert.NoError(t, NewParams(false).Validate(), "false")`
`72`		`- assert.Error(t, Params{[]*SendEnabled{{"foocoing", false}}, true}.Validate(), "with SendEnabled entry")`
	`72`	`+ assert.Error(t, Params{[]*SendEnabled{{"foocoin", false}}, true}.Validate(), "with SendEnabled entry")`
`73`	`73`	`}`
Original file line number	Diff line number	Diff line change
`@@ -391,7 +391,7 @@ func TestNoOpMintingRestrictionFn(t *testing.T) {`
`391`	`391`	`err = types.NoOpMintingRestrictionFn(sdk.Context{}, sdk.Coins{})`
`392`	`392`	`}`
`393`	`393`	`require.NotPanics(t, testFunc, "NoOpMintingRestrictionFn")`
`394`		`- assert.NoError(t, err, "NoOpSendRestrictionFn error")`
	`394`	`+ assert.NoError(t, err, "NoOpMintingRestrictionFn error")`
`395`	`395`	`}`
`396`	`396`
`397`	`397`	`// SendRestrictionArgs are the args provided to a SendRestrictionFn function.`
Original file line number	Diff line number	Diff line change
`@@ -165,7 +165,7 @@ func (s *KeeperTestSuite) TestUpdateParams() {`
`165`	`165`	`expErrMsg: "",`
`166`	`166`	`},`
`167`	`167`	`{`
`168`		`- name: "invalid params",`
	`168`	`+ name: "invalid params",`
`169`	`169`	`input: &types.MsgUpdateParams{`
`170`	`170`	`Authority: s.consensusParamsKeeper.GetAuthority(),`
`171`	`171`	`Block: &cmtproto.BlockParams{MaxGas: -10, MaxBytes: -10},`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ func (AppModuleBasic) RegisterGRPCGatewayRoutes(clientCtx client.Context, mux *g`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`
`57`		`-// RegisterInterfaces registers interfaces and implementations of the bank module.`
	`57`	`+// RegisterInterfaces registers interfaces and implementations of the consensus module.`
`58`	`58`	`func (AppModuleBasic) RegisterInterfaces(registry codectypes.InterfaceRegistry) {`
`59`	`59`	`types.RegisterInterfaces(registry)`
`60`	`60`	`}`