namestate: fix expire block for closed names.

handshake-org · Sep 26, 2023 · 7da5443 · 7da5443
1 parent 871e401
commit 7da5443
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/lib/covenants/namestate.js b/lib/covenants/namestate.js
@@ -724,7 +724,8 @@ class NameState extends bio.Struct {
     assert((height >>> 0) === height);
     assert(network && network.names);
 
-    const spacing = network.pow.targetSpacing;
+    const {blocksPerDay} = network.pow;
+    const blocksPerHour = blocksPerDay / 24;
 
     const {
       treeInterval,
@@ -759,7 +760,7 @@ class NameState extends bio.Struct {
         const start = this.height;
         const end = this.height + openPeriod;
         const blocks = end - height;
-        const hours = ((blocks * spacing) / 60 / 60);
+        const hours = blocks / blocksPerHour;
 
         stats.openPeriodStart = start;
         stats.openPeriodEnd = end;
@@ -772,7 +773,7 @@ class NameState extends bio.Struct {
         const start = this.height;
         const end = this.height + lockupPeriod;
         const blocks = end - height;
-        const hours = ((blocks * spacing) / 60 / 60);
+        const hours = blocks / blocksPerHour;
 
         stats.lockupPeriodStart = start;
         stats.lockupPeriodEnd = end;
@@ -785,7 +786,7 @@ class NameState extends bio.Struct {
         const start = this.height + openPeriod;
         const end = start + biddingPeriod;
         const blocks = end - height;
-        const hours = ((blocks * spacing) / 60 / 60);
+        const hours = blocks / blocksPerHour;
 
         stats.bidPeriodStart = start;
         stats.bidPeriodEnd = end;
@@ -798,7 +799,7 @@ class NameState extends bio.Struct {
         const start = this.height + openPeriod + biddingPeriod;
         const end = start + revealPeriod;
         const blocks = end - height;
-        const hours = ((blocks * spacing) / 60 / 60);
+        const hours = blocks / blocksPerHour;
 
         stats.revealPeriodStart = start;
         stats.revealPeriodEnd = end;
@@ -809,11 +810,10 @@ class NameState extends bio.Struct {
       }
       case states.CLOSED: {
         const start = this.renewal;
-        const end = this.claimed ?
-          claimPeriod :
-          start + renewalWindow;
+        const normalEnd = start + renewalWindow;
+        const end = this.claimed ? Math.max(claimPeriod, normalEnd) : normalEnd;
         const blocks = end - height;
-        const days = ((blocks * spacing) / 60 / 60 / 24);
+        const days = blocks / blocksPerDay;
 
         stats.renewalPeriodStart = start;
         stats.renewalPeriodEnd = end;
@@ -827,7 +827,7 @@ class NameState extends bio.Struct {
           const start = this.transfer;
           const end = start + transferLockup;
           const blocks = end - height;
-          const hours = ((blocks * spacing) / 60 / 60);
+          const hours = blocks / blocksPerHour;
 
           stats.transferLockupStart = start;
           stats.transferLockupEnd = end;
@@ -841,7 +841,7 @@ class NameState extends bio.Struct {
         const start = this.revoked;
         const end = start + auctionMaturity;
         const blocks = end - height;
-        const hours = ((blocks * spacing) / 60 / 60);
+        const hours = blocks / blocksPerHour;
 
         stats.revokePeriodStart = start;
         stats.revokePeriodEnd = end;

diff --git a/test/namestate-test.js b/test/namestate-test.js
@@ -175,6 +175,7 @@ describe('Namestate', function() {
               'hoursUntilValidFinalize'
             ]
           );
+
           heightWithTransfer++;
         }