Merge pull request #14 from FairBlock/fix/encrypted-tx-not-removed

Fix encrypted tx not removed after execution
Fairblock · Jun 13, 2023 · 4062213 · 4062213
2 parents 2e45da4 + 7cdd6d2
commit 4062213
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/x/pep/module.go b/x/pep/module.go
@@ -265,7 +265,6 @@ func (am AppModule) BeginBlock(ctx sdk.Context, _ abci.RequestBeginBlock) {
 		am.keeper.Logger(ctx).Info(skPoint.String())
 
 		for _, eachTx := range arr.EncryptedTx {
-			am.keeper.RemoveEncryptedTx(ctx, eachTx.TargetHeight, eachTx.Index)
 
 			if currentNonce, found := am.keeper.GetPepNonce(ctx, eachTx.Creator); found && currentNonce.Nonce == math.MaxUint64 {
 				am.keeper.Logger(ctx).Error("Invalid PEP Nonce")
@@ -516,6 +515,8 @@ func (am AppModule) BeginBlock(ctx sdk.Context, _ abci.RequestBeginBlock) {
 				),
 			)
 		}
+
+		am.keeper.RemoveAllEncryptedTxFromHeight(ctx, h)
 	}
 
 }