From 13fc473fbb04dd0dce3dc5ad7f900056c31bf993 Mon Sep 17 00:00:00 2001
From: istae <14264581+istae@users.noreply.github.com>
Date: Wed, 23 Oct 2024 19:29:16 +0300
Subject: [PATCH] fix: various swip21 fixes (#4874)

---
 pkg/node/node.go               | 10 ++++------
 pkg/storageincentives/agent.go |  3 ++-
 pkg/storer/reserve.go          |  4 ++++
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkg/node/node.go b/pkg/node/node.go
index 37500cb2a37..6db098c78b6 100644
--- a/pkg/node/node.go
+++ b/pkg/node/node.go
@@ -1031,12 +1031,10 @@ func NewBee(
 				logger.Info("updated new reserve capacity doubling height in the staking contract", "transaction", tx, "new_height", o.ReserveCapacityDoubling)
 			}
 
-			if o.ReserveCapacityDoubling > 0 {
-				// Check if the staked amount is sufficient to cover the additional neighborhoods.
-				// The staked amount must be at least 2^h * MinimumStake.
-				if stake.Cmp(big.NewInt(0).Mul(big.NewInt(1<<o.ReserveCapacityDoubling), staking.MinimumStakeAmount)) < 0 {
-					logger.Warning("staked amount does not sufficiently cover the additional reserve capacity. Stake should be at least 2^h * 10 BZZ, where h is the number extra doublings.")
-				}
+			// Check if the staked amount is sufficient to cover the additional neighborhoods.
+			// The staked amount must be at least 2^h * MinimumStake.
+			if o.ReserveCapacityDoubling > 0 && stake.Cmp(big.NewInt(0).Mul(big.NewInt(1<<o.ReserveCapacityDoubling), staking.MinimumStakeAmount)) < 0 {
+				logger.Warning("staked amount does not sufficiently cover the additional reserve capacity. Stake should be at least 2^h * 10 BZZ, where h is the number extra doublings.")
 			}
 		}
 	}
diff --git a/pkg/storageincentives/agent.go b/pkg/storageincentives/agent.go
index afd4614b4e3..63e20b0c4bd 100644
--- a/pkg/storageincentives/agent.go
+++ b/pkg/storageincentives/agent.go
@@ -225,7 +225,8 @@ func (a *Agent) start(blockTime time.Duration, blocksPerRound, blocksPerPhase ui
 		a.state.SetHealthy(a.health.IsHealthy())
 		go a.state.purgeStaleRoundData()
 
-		isFrozen, err := a.redistributionStatuser.IsOverlayFrozen(ctx, block)
+		// check if node is frozen starting from the next block
+		isFrozen, err := a.redistributionStatuser.IsOverlayFrozen(ctx, block+1)
 		if err != nil {
 			a.logger.Error(err, "error checking if stake is frozen")
 		} else {
diff --git a/pkg/storer/reserve.go b/pkg/storer/reserve.go
index 7f765ef5c08..41d76e66d1a 100644
--- a/pkg/storer/reserve.go
+++ b/pkg/storer/reserve.go
@@ -126,6 +126,10 @@ func (db *DB) reserveWorker(ctx context.Context) {
 
 	_, _ = db.countWithinRadius(ctx)
 
+	if !db.reserve.IsWithinCapacity() {
+		db.events.Trigger(reserveOverCapacity)
+	}
+
 	for {
 		select {
 		case <-ctx.Done():