From c93b7685a4c3ff24a8e52704ac0ff373b116040e Mon Sep 17 00:00:00 2001 From: vincentwschau <99756290+vincentwschau@users.noreply.github.com> Date: Tue, 16 Jul 2024 17:23:18 -0400 Subject: [PATCH] Fix ordering of begin/end blocker to match rc2. (#1924) --- protocol/app/app.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/protocol/app/app.go b/protocol/app/app.go index 0a75076840..193f6f20df 100644 --- a/protocol/app/app.go +++ b/protocol/app/app.go @@ -1205,15 +1205,13 @@ func New( perpetualsmoduletypes.ModuleName, statsmoduletypes.ModuleName, satypes.ModuleName, - // should be before clob EndBlocker so that vault order cancels are - // processed before any vault order expirations (handled by clob) - vaultmoduletypes.ModuleName, clobmoduletypes.ModuleName, vestmoduletypes.ModuleName, rewardsmoduletypes.ModuleName, sendingmoduletypes.ModuleName, govplusmoduletypes.ModuleName, delaymsgmoduletypes.ModuleName, + vaultmoduletypes.ModuleName, ) app.ModuleManager.SetOrderPrepareCheckStaters( @@ -1246,6 +1244,9 @@ func New( perpetualsmoduletypes.ModuleName, statsmoduletypes.ModuleName, satypes.ModuleName, + // should be before clob EndBlocker so that vault order cancels are + // processed before any vault order expirations (handled by clob) + vaultmoduletypes.ModuleName, clobmoduletypes.ModuleName, sendingmoduletypes.ModuleName, vestmoduletypes.ModuleName, @@ -1253,7 +1254,6 @@ func New( epochsmoduletypes.ModuleName, govplusmoduletypes.ModuleName, delaymsgmoduletypes.ModuleName, - vaultmoduletypes.ModuleName, authz.ModuleName, // No-op. blocktimemoduletypes.ModuleName, // Must be last )