feat(aens): use .chain instead of .aet as TLD after Lima HF

* update node to v5.0.0-rc5

* use .chain instead of .aet as TLD after Lima HF

BREAKING CHANGES: .aet is not supported after this release

relates to #266

Author: noandrea

.env

@@ -1,3 +1,3 @@
 # this is used by docker-compose.yml to for the node image tag
-NODE_TAG=v5.0.0-rc.4
+NODE_TAG=v5.0.0-rc.5
 COMPILER_TAG=v3.2.0

aeternity/__main__.py

@@ -833,7 +833,7 @@ def contract_call_info(tx_hash, force, wait, json_):
 def inspect(obj, height, force, wait, json_):
     try:
         set_global_options(json_, force, wait)
-        if obj.endswith(".test") or obj.endswith(".aet"):
+        if obj.endswith(".test") or obj.endswith(".chain"):
             data = _node_cli().get_name_entry_by_name(name=obj)
             _print_object(data, title="name")
         elif obj.startswith("kh_") or obj.startswith("mh_"):

aeternity/aens.py

@@ -53,7 +53,7 @@ def get_minimum_name_fee(cls, domain: str) -> int:
         :param domain: the domain name to get the fee for
         :return: the minimum fee for the domain auction
         """
-        name_len = len(domain.replace(".aet", ""))
+        name_len = len(domain.replace(".chain", ""))
         if name_len >= defaults.NAME_BID_MAX_LENGTH:
             return defaults.NAME_BID_RANGES.get(defaults.NAME_BID_MAX_LENGTH)
         return defaults.NAME_BID_RANGES.get(name_len)

aeternity/hashing.py

@@ -142,15 +142,15 @@ def namehash_encode(prefix, name):
 
 def commitment_id(domain: str, salt: int = None) -> tuple:
     """
-    Compute the commitment id, the computed id will be different for .test (pre lima) and .aet domains
+    Compute the commitment id, the computed id will be different for .test (pre lima) and .chain domains
     :param domain: the domain for which the commitment_id has to be generated
     :param salt: the salt to use, if not provided it is randomly generated
     """
     name_salt = randint() if salt is None else salt
-    if domain.endswith(".test"):
-        commitment_id = hash_encode(identifiers.COMMITMENT_ID, namehash(domain) + _int(name_salt, 32))
-    else:
+    if domain.endswith(".chain"):
         commitment_id = hash_encode(identifiers.COMMITMENT_ID, domain.lower().encode('ascii') + _int(name_salt, 32))
+    else:
+        commitment_id = hash_encode(identifiers.COMMITMENT_ID, namehash(domain) + _int(name_salt, 32))
     return commitment_id, name_salt
 
 
@@ -236,7 +236,7 @@ def name_id(name: str):
     Encode a domain name
     :param name: the domain name to encode
     """
-    if name.endswith('.aet'):
+    if name.endswith('.chain'):
         return encode(identifiers.NAME_ID, hash(name.lower().encode('ascii')))
     return encode(identifiers.NAME_ID, namehash(name))
 

aeternity/signing.py

@@ -134,7 +134,7 @@ def from_private_key_string(cls, key_string):
 
     @classmethod
     def from_secret_key_string(cls, key_string):
-        """create a keypair from a aet address and key_string key string
+        """create a keypair from a chain address and key_string key string
         :param key_string: the encoded key_string key (hex for private, prefixed base58 for public)
         :return: a keypair object or raise error if the public key doesn't match
         """

aeternity/utils.py

@@ -50,7 +50,7 @@ def is_valid_aens_name(domain_name):
     Test if the provided name is valid for the aens system
     """
     if domain_name is None or not validators.domain(domain_name.lower()) or (
-            not domain_name.endswith(('.aet')) and not domain_name.endswith(('.test'))):
+            not domain_name.endswith(('.chain')) and not domain_name.endswith(('.test'))):
         return False
     return True
 

command-line-tool.md

@@ -103,9 +103,9 @@ Transactions__________________ 0
 The æternity naming system allows you to register a name for your account (or oracle).
 
 ```
-$ aecli account mywallet name 'newby.aet' claim
+$ aecli account mywallet name 'newby.chain' claim
 Enter the wallet password []: 
-Name newby.aet claimed
+Name newby.chain claimed
 Transaction hash______________ th_vmucE7sFSc8QjWBAJwkh2drN3jKwtSd7KYtYzjL6Bfg1x8kyq
 ```
 
@@ -125,7 +125,7 @@ TTL___________________________ 86238
 and check out the name we registered, to ensure we have it:
 
 ```
-$ aecli inspect name newby.aet
+$ aecli inspect name newby.chain
 Status________________________ CLAIMED
 Pointers______________________ {'account_pubkey': 'ak_wmZUvZWrVibPM2PuSGhgWmMQXchEWgRTbwBp7tYUcPyBYHnpR'}
 TTL___________________________ 86329

tests/conftest.py

@@ -28,7 +28,7 @@ def tempdir(scope="module"):
         shutil.rmtree(path)
 
 
-def random_domain(length=10, tld='aet'):
+def random_domain(length=10, tld='chain'):
     rand_str = ''.join(random.choice(string.ascii_letters) for _ in range(length))
     return f"{rand_str}.{tld}"
 

tests/test_aens.py

@@ -9,23 +9,23 @@
 def test_name_validation_fails(chain_fixture):
     with raises(ValueError):
         chain_fixture.NODE_CLI.AEName('test.lol')
-    chain_fixture.NODE_CLI.AEName('test.aet')
+    chain_fixture.NODE_CLI.AEName('test.chain')
     chain_fixture.NODE_CLI.AEName('test.test')
 
 
 def test_name_validation_succeeds(chain_fixture):
     chain_fixture.NODE_CLI.AEName('test.test')
-    chain_fixture.NODE_CLI.AEName('test.aet')
+    chain_fixture.NODE_CLI.AEName('test.chain')
 
 
 def test_name_is_available(chain_fixture):
-    domain = random_domain(tld='aet' if chain_fixture.NODE_CLI.get_consensus_protocol_version() >= PROTOCOL_LIMA else 'test')
+    domain = random_domain(tld='chain' if chain_fixture.NODE_CLI.get_consensus_protocol_version() >= PROTOCOL_LIMA else 'test')
     name = chain_fixture.NODE_CLI.AEName(domain)
     assert name.is_available()
 
 
 def test_name_status_available(chain_fixture):
-    domain = random_domain(length=13 ,tld='aet' if chain_fixture.NODE_CLI.get_consensus_protocol_version() >= PROTOCOL_LIMA else 'test')
+    domain = random_domain(length=13 ,tld='chain' if chain_fixture.NODE_CLI.get_consensus_protocol_version() >= PROTOCOL_LIMA else 'test')
     name = chain_fixture.NODE_CLI.AEName(domain)
     assert name.status == AEName.Status.UNKNOWN
     name.update_status()
@@ -35,7 +35,7 @@ def test_name_status_available(chain_fixture):
 def test_name_claim_lifecycle(chain_fixture):
     try:
         # avoid auctions
-        domain = random_domain(length=13 ,tld='aet' if chain_fixture.NODE_CLI.get_consensus_protocol_version() >= PROTOCOL_LIMA else 'test')
+        domain = random_domain(length=13 ,tld='chain' if chain_fixture.NODE_CLI.get_consensus_protocol_version() >= PROTOCOL_LIMA else 'test')
         node_cli = chain_fixture.NODE_CLI
         name = node_cli.AEName(domain)
         assert name.status == AEName.Status.UNKNOWN
@@ -86,7 +86,7 @@ def test_name_auction(chain_fixture):
 
 def test_name_status_unavailable(chain_fixture):
     # avoid auctions
-    domain = random_domain(length=13 ,tld='aet' if chain_fixture.NODE_CLI.get_consensus_protocol_version() >= PROTOCOL_LIMA else 'test')
+    domain = random_domain(length=13 ,tld='chain' if chain_fixture.NODE_CLI.get_consensus_protocol_version() >= PROTOCOL_LIMA else 'test')
     print(f"domain is {domain}")
     occupy_name = chain_fixture.NODE_CLI.AEName(domain)
     occupy_name.full_claim_blocking(chain_fixture.ALICE)
@@ -97,7 +97,7 @@ def test_name_status_unavailable(chain_fixture):
 
 def test_name_update(chain_fixture):
     # avoid auctions
-    domain = random_domain(length=13 ,tld='aet' if chain_fixture.NODE_CLI.get_consensus_protocol_version() >= PROTOCOL_LIMA else 'test')
+    domain = random_domain(length=13 ,tld='chain' if chain_fixture.NODE_CLI.get_consensus_protocol_version() >= PROTOCOL_LIMA else 'test')
     print(f"domain is {domain}")
     name = chain_fixture.NODE_CLI.AEName(domain)
     print("Claim name ", domain)
@@ -122,7 +122,7 @@ def test_name_update(chain_fixture):
 
 def test_spend_by_name(chain_fixture):
     # claim a domain
-    domain = random_domain(tld='aet' if chain_fixture.NODE_CLI.get_consensus_protocol_version() >= PROTOCOL_LIMA else 'test')
+    domain = random_domain(tld='chain' if chain_fixture.NODE_CLI.get_consensus_protocol_version() >= PROTOCOL_LIMA else 'test')
     print(f"domain is {domain}")
     name = chain_fixture.NODE_CLI.AEName(domain)
     print("Claim name ", domain)
@@ -146,7 +146,7 @@ def test_spend_by_name(chain_fixture):
 
 def test_name_transfer_ownership(chain_fixture):
     # avoid auctions
-    domain = random_domain(length=13 ,tld='aet' if chain_fixture.NODE_CLI.get_consensus_protocol_version() >= PROTOCOL_LIMA else 'test')
+    domain = random_domain(length=13 ,tld='chain' if chain_fixture.NODE_CLI.get_consensus_protocol_version() >= PROTOCOL_LIMA else 'test')
     name = chain_fixture.NODE_CLI.AEName(domain)
     name.full_claim_blocking(chain_fixture.ALICE)
     assert name.status == AEName.Status.CLAIMED
@@ -167,7 +167,7 @@ def test_name_transfer_ownership(chain_fixture):
 
 def test_name_revocation(chain_fixture):
     # avoid auctions
-    domain = random_domain(length=13 ,tld='aet' if chain_fixture.NODE_CLI.get_consensus_protocol_version() >= PROTOCOL_LIMA else 'test')
+    domain = random_domain(length=13 ,tld='chain' if chain_fixture.NODE_CLI.get_consensus_protocol_version() >= PROTOCOL_LIMA else 'test')
     name = chain_fixture.NODE_CLI.AEName(domain)
     name.full_claim_blocking(chain_fixture.ALICE)
     name.revoke(chain_fixture.ALICE)

tests/test_cli.py

@@ -168,7 +168,7 @@ def test_cli_phases_spend(chain_fixture, tempdir):
 def test_cli_name_claim(chain_fixture, tempdir):
     account_alice_path = _account_path(tempdir, chain_fixture.ALICE)
     # get a domain that is not under auction scheme
-    domain = random_domain(length=13 ,tld='aet' if chain_fixture.NODE_CLI.get_consensus_protocol_version() >= identifiers.PROTOCOL_LIMA else 'test')
+    domain = random_domain(length=13 ,tld='chain' if chain_fixture.NODE_CLI.get_consensus_protocol_version() >= identifiers.PROTOCOL_LIMA else 'test')
     # let alice preclaim a name 
     j = call_aecli('name', 'pre-claim', '--password', 'aeternity_bc', account_alice_path, domain, '--wait')
     # retrieve the salt and the transaction hash 
@@ -202,7 +202,7 @@ def test_cli_name_auction(chain_fixture, tempdir):
     account_alice_path = _account_path(tempdir, chain_fixture.ALICE)
     account_bob_path = _account_path(tempdir, chain_fixture.ALICE)
     # get a domain that is under auction scheme
-    domain = random_domain(length=9 ,tld='aet' if chain_fixture.NODE_CLI.get_consensus_protocol_version() >= identifiers.PROTOCOL_LIMA else 'test')
+    domain = random_domain(length=9 ,tld='chain' if chain_fixture.NODE_CLI.get_consensus_protocol_version() >= identifiers.PROTOCOL_LIMA else 'test')
     # let alice preclaim a name 
     j = call_aecli('name', 'pre-claim', '--password', 'aeternity_bc', account_alice_path, domain, '--wait')
     # retrieve the salt and the transaction hash 

tests/test_hashing.py

@@ -127,19 +127,19 @@ def test_hashing_committment_id():
             "commitment_id": "cm_pQu4wAuiyhe1mHqZzh3yNA4JwBPaess3MY7MnZFG9vsFjD5yE"
         },
         {
-            "domain": "aeternity.aet",
+            "domain": "aeternity.chain",
             "salt": 10692426485854419779,
-            "commitment_id": "cm_s7xYUEpNNz4v3BenNMBP9YknxYRNqBMNTWG99Vu6v1d8kXxuH"
+            "commitment_id": "cm_j5Aa3senWdNskwSSHh3M182ucbqrAaSE5DVjejM8fBCgR97kq"
         },
         {
-            "domain": "whatever.aet",
+            "domain": "whatever.chain",
             "salt": 4703192432112,
-            "commitment_id": "cm_2EoRHJoWoNv4EpZLxgWKBrvgmrbSvA5BxMvDSwPDc6CUYBqanb"
+            "commitment_id": "cm_2Hd42FoCDfYxcG3MyZkiN9wXiBKfHHzBWycEvrazPYgoEh1ien"
         },
         {
-            "domain": "aepps.aet",
+            "domain": "aepps.chain",
             "salt": 723907012945811264198,
-            "commitment_id": "cm_2gPm7nAvTQojYnVGDPEMZd6uJbkVbZ4aX1nbFm1NCE5HW3kHE6"
+            "commitment_id": "cm_7aMmYzWVGK2t6gqWYD9WFbwHWaLzcux6t63i2J7VHPZfcuzjs"
         },
     ]
 

tests/test_utils.py

@@ -36,7 +36,7 @@ def test_utils_is_valid_name():
         ('valid.test', True),
         ('valid.test', True),
         ('aeternity.com', False),
-        ('aeternity.aet', True),
+        ('aeternity.chain', True),
         ('om', False),
         (None, False),
         (".o.test", False),