nns: fix expired TLD registration (#366)

nspcc-dev · Nov 10, 2023 · 76f2d44 · 76f2d44
2 parents 6342a16 + 9ae1bfe
commit 76f2d44
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/nns/nns_contract.go b/nns/nns_contract.go
@@ -422,7 +422,7 @@ func saveCommitteeDomain(ctx storage.Context, name, email string, refresh, retry
 	}
 
 	tldKey := makeTLDKey(name)
-	if storage.Get(ctx, tldKey) != nil {
+	if storage.Get(ctx, tldKey) != nil && !parentExpired(ctx, 0, fragments) {
 		panic("TLD already exists")
 	}
 

diff --git a/tests/nns_test.go b/tests/nns_test.go
@@ -246,6 +246,8 @@ func TestExpiration(t *testing.T) {
 	c := newNNSInvoker(t, true)
 
 	refresh, retry, expire, ttl := int64(101), int64(102), int64(msPerYear/1000*10), int64(104)
+	c.Invoke(t, stackitem.Null{}, "registerTLD",
+		"newtld", "myemail@nspcc.ru", refresh, retry, expire, ttl)
 	c.Invoke(t, true, "register",
 		"testdomain.com", c.CommitteeHash,
 		"myemail@nspcc.ru", refresh, retry, expire, ttl)
@@ -278,6 +280,13 @@ func TestExpiration(t *testing.T) {
 
 	c.InvokeFail(t, "name has expired", "getAllRecords", "testdomain.com")
 	c.InvokeFail(t, "name has expired", "ownerOf", "testdomain.com")
+
+	c.InvokeFail(t, "name has expired", "renew", "newtld")
+	c.Invoke(t, stackitem.Null{}, "registerTLD",
+		"newtld", "myemail@nspcc.ru", refresh, retry, expire, ttl)
+	c.Invoke(t, true, "register",
+		"testdomain.com", c.CommitteeHash,
+		"myemail@nspcc.ru", refresh, retry, expire, ttl)
 }
 
 func TestNNSSetAdmin(t *testing.T) {