fix units underflow

ava-labs · Jan 19, 2022 · 957b540 · 957b540
1 parent 8addd1a
commit 957b540
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/chain/claim_tx.go b/chain/claim_tx.go
@@ -54,8 +54,8 @@ func (c *ClaimTx) Execute(t *TransactionContext) error {
 		Owner:   t.Sender,
 		Created: t.BlockTime,
 		Updated: t.BlockTime,
-		Expiry:  t.BlockTime + t.Genesis.ClaimReward/t.Genesis.MinClaimFee,
-		Units:   t.Genesis.MinClaimFee,
+		Expiry:  t.BlockTime + t.Genesis.ClaimReward/t.Genesis.ClaimExpiryUnits,
+		Units:   t.Genesis.ClaimExpiryUnits,
 	}
 	if err := PutSpaceInfo(t.Database, []byte(c.Space), newInfo, 0); err != nil {
 		return err

diff --git a/chain/delete_tx.go b/chain/delete_tx.go
@@ -49,7 +49,7 @@ func (d *DeleteTx) Execute(t *TransactionContext) error {
 		return ErrKeyMissing
 	}
 	timeRemaining := (i.Expiry - i.Updated) * i.Units
-	i.Units -= valueUnits(g, v.Size)
+	i.Units -= valueUnits(g, v.Size) / g.ValueExpiryDiscount
 	if err := DeleteSpaceKey(t.Database, []byte(d.Space), []byte(d.Key)); err != nil {
 		return err
 	}

diff --git a/chain/genesis.go b/chain/genesis.go
@@ -59,7 +59,8 @@ type Genesis struct {
 	SpaceRenewalDiscount uint64 `serialize:"true" json:"spaceRenewalDiscount"`
 
 	// Reward Params
-	ClaimReward uint64 `serialize:"true" json:"claimReward"`
+	ClaimReward      uint64 `serialize:"true" json:"claimReward"`
+	ClaimExpiryUnits uint64 `serialize:"true" json:"claimExpiryUnits"`
 
 	// Mining Reward (% of min required fee)
 	LotteryRewardMultipler uint64 `serialize:"true" json:"lotteryRewardMultipler"` // divided by 100
@@ -90,6 +91,7 @@ func DefaultGenesis() *Genesis {
 
 		// Claim Params
 		ClaimLoadMultiplier:         5,
+		ClaimExpiryUnits:            100,
 		MinClaimFee:                 100,
 		SpaceDesirabilityMultiplier: 5,