fix: enable sends fast fail in gov proposals execution

InjectiveLabs · Jun 12, 2024 · b0d018a · b0d018a
1 parent 5cd942f
commit b0d018a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go
@@ -57,7 +57,7 @@ const (
 	execModeVerifyVoteExtension                 // Verify a vote extension
 	execModeFinalize                            // Finalize a block proposal
 
-	DoNotFailFastContextKey contextKeyT = "DoNotFailFast"
+	DoNotFailFastSendContextKey contextKeyT = "DoNotFailFast"
 )
 
 var _ servertypes.ABCI = (*BaseApp)(nil)
@@ -712,7 +712,7 @@ func (app *BaseApp) cacheTxContext(ctx sdk.Context, txBytes []byte) (sdk.Context
 
 func (app *BaseApp) preBlock(req *abci.RequestFinalizeBlock) error {
 	if app.preBlocker != nil {
-		ctx := app.finalizeBlockState.Context().WithValue(DoNotFailFastContextKey, struct{}{})
+		ctx := app.finalizeBlockState.Context().WithValue(DoNotFailFastSendContextKey, struct{}{})
 		rsp, err := app.preBlocker(ctx, req)
 		if err != nil {
 			return err
@@ -737,7 +737,7 @@ func (app *BaseApp) beginBlock(req *abci.RequestFinalizeBlock) (sdk.BeginBlock,
 	)
 
 	if app.beginBlocker != nil {
-		ctx := app.finalizeBlockState.Context().WithValue(DoNotFailFastContextKey, struct{}{})
+		ctx := app.finalizeBlockState.Context().WithValue(DoNotFailFastSendContextKey, struct{}{})
 		resp, err = app.beginBlocker(ctx)
 		if err != nil {
 			return resp, err
@@ -805,7 +805,7 @@ func (app *BaseApp) endBlock(_ context.Context) (sdk.EndBlock, error) {
 	var endblock sdk.EndBlock
 
 	if app.endBlocker != nil {
-		ctx := app.finalizeBlockState.Context().WithValue(DoNotFailFastContextKey, struct{}{})
+		ctx := app.finalizeBlockState.Context().WithValue(DoNotFailFastSendContextKey, struct{}{})
 		eb, err := app.endBlocker(ctx)
 		if err != nil {
 			return endblock, err

diff --git a/x/gov/abci.go b/x/gov/abci.go
@@ -158,7 +158,8 @@ func EndBlocker(ctx sdk.Context, keeper *keeper.Keeper) error {
 			// Messages may mutate state thus we use a cached context. If one of
 			// the handlers fails, no state mutation is written and the error
 			// message is logged.
-			cacheCtx, writeCache := ctx.CacheContext()
+			execCtx := ctx.WithValue(baseapp.DoNotFailFastSendContextKey, nil) // enable fail fast during msg handling
+			cacheCtx, writeCache := execCtx.CacheContext()
 			messages, err := proposal.GetMsgs()
 			if err != nil {
 				proposal.Status = v1.StatusFailed