revert: skip processed swap

bnb-chain · Jan 4, 2024 · 3959f78 · 3959f78
1 parent 2dd2ba1
commit 3959f78
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 27 deletions.
diff --git a/plugins/tokens/plugin.go b/plugins/tokens/plugin.go
@@ -1,7 +1,6 @@
 package tokens
 
 import (
-	"bytes"
 	"encoding/binary"
 	"fmt"
 
@@ -87,14 +86,7 @@ func EndBlocker(ctx sdk.Context, timelockKeeper timelock.Keeper, swapKeeper swap
 	swapIterator := swapKeeper.GetSwapIterator(ctx)
 	defer swapIterator.Close()
 	i = 0
-	lastProcessedRefundSwapKey := swapKeeper.GetLatestProcessedRefundSwapKey(ctx)
 	for ; swapIterator.Valid(); swapIterator.Next() {
-		if len(lastProcessedRefundSwapKey) > 0 &&
-			bytes.Compare(swapIterator.Key(), lastProcessedRefundSwapKey) <= 0 {
-			// skip the processed swap
-			continue
-		}
-
 		if i >= MaxUnlockItems {
 			break
 		}
@@ -118,11 +110,8 @@ func EndBlocker(ctx sdk.Context, timelockKeeper timelock.Keeper, swapKeeper swap
 		}
 
 		logger.Info("succeed to refund swap", "swapId", swapID, "swap", fmt.Sprintf("%+v", swapItem))
-		lastProcessedRefundSwapKey = swapIterator.Key()
 		i++
 	}
-
-	swapKeeper.SetLatestProcessedRefundSwapKey(ctx, lastProcessedRefundSwapKey)
 }
 
 // EndBreatheBlock processes the breathe block lifecycle event.

diff --git a/plugins/tokens/swap/keeper.go b/plugins/tokens/swap/keeper.go
@@ -141,16 +141,6 @@ func (kp *Keeper) GetSwap(ctx sdk.Context, swapID SwapBytes) *AtomicSwap {
 	return &swap
 }
 
-func (kp *Keeper) GetLatestProcessedRefundSwapKey(ctx sdk.Context) []byte {
-	kvStore := ctx.KVStore(kp.storeKey)
-	return kvStore.Get(LatestProcessedRefundSwapKey)
-}
-
-func (kp *Keeper) SetLatestProcessedRefundSwapKey(ctx sdk.Context, key []byte) {
-	kvStore := ctx.KVStore(kp.storeKey)
-	kvStore.Set(LatestProcessedRefundSwapKey, key)
-}
-
 func (kp *Keeper) GetSwapIterator(ctx sdk.Context) (iterator store.Iterator) {
 	kvStore := ctx.KVStore(kp.storeKey)
 	return sdk.KVStorePrefixIterator(kvStore, HashKey)

diff --git a/plugins/tokens/swap/keys.go b/plugins/tokens/swap/keys.go
@@ -11,12 +11,11 @@ const (
 )
 
 var (
-	HashKey                      = []byte{0x01}
-	SwapCreatorQueueKey          = []byte{0x02}
-	SwapRecipientQueueKey        = []byte{0x03}
-	SwapCloseTimeKey             = []byte{0x04}
-	SwapIndexKey                 = []byte{0x05}
-	LatestProcessedRefundSwapKey = []byte{0x06}
+	HashKey               = []byte{0x01}
+	SwapCreatorQueueKey   = []byte{0x02}
+	SwapRecipientQueueKey = []byte{0x03}
+	SwapCloseTimeKey      = []byte{0x04}
+	SwapIndexKey          = []byte{0x05}
 )
 
 func BuildHashKey(randomNumberHash []byte) []byte {