Merge pull request #49 from aeternity/release/0.22.0.1rc1

Release/0.22.0.1rc1

Author: jsnewby

.env

@@ -1,2 +1,2 @@
 # this is used by docker-compose.yml to for the epoch image tag
-TAG=v0.20.0
+TAG=v0.22.0

CHANGELOG.md

@@ -4,6 +4,19 @@ log follows the conventions of [keepachangelog.com](http://keepachangelog.com/).
 
 ## [Unreleased]
 
+## [0.22.0.1]
+
+### Removed
+- Compatiblity with epoch nodes version < [0.22.0](https://github.com/aeternity/epoch/blob/v0.22.0/docs/release-notes/RELEASE-NOTES-0.22.0.md) 
+
+### Changed
+- change hash prefix separator from `$` to `_`
+
+## [0.21.0.1]
+
+### Removed
+- Compatiblity with epoch nodes version < 0.21.0
+
 ## [0.20.0.2]
 
 ### Fixed

Jenkinsfile

@@ -27,21 +27,21 @@ pipeline {
       }
     }
 
-    stage('Publish-Test') {
-      when {
-        beforeAgent true
-        branch 'develop'
-      }
-      steps {
-        withCredentials([
-          usernamePassword(credentialsId: 'test_pypi',
-                                          usernameVariable: 'TWINE_USERNAME',
-                                          passwordVariable: 'TWINE_PASSWORD'),
-          string(credentialsId: 'pypi_test_repo_url', variable: 'TWINE_REPOSITORY_URL')]) {
-            sh '''make clean && make build && make publish'''
-        }
-      }
-    }
+    // stage('Publish-Test') {
+    //   when {
+    //     beforeAgent true
+    //     branch 'develop'
+    //   }
+    //   steps {
+    //     withCredentials([
+    //       usernamePassword(credentialsId: 'test_pypi',
+    //                                       usernameVariable: 'TWINE_USERNAME',
+    //                                       passwordVariable: 'TWINE_PASSWORD'),
+    //       string(credentialsId: 'pypi_test_repo_url', variable: 'TWINE_REPOSITORY_URL')]) {
+    //         sh '''make clean && make build && make publish'''
+    //     }
+    //   }
+    // }
 
     stage('Publish') {
       when {

README.md

@@ -122,7 +122,7 @@ class MyOracleQuery(OracleQuery):
         print('The oracle responded %s' % query)
 
 my_query = MyOracleQuery(
-    oracle_pubkey='ok$deadbeef...',  # oracle id as published by the operator
+    oracle_pubkey='ok_deadbeef...',  # oracle id as published by the operator
     query_fee=4,      # these are the same values as the Oracle
     fee=6,
     response_ttl=10,
@@ -165,7 +165,7 @@ if not name.is_available():
 
 name.preclaim()  # preclaim will mark the domain as yours in the current block
 name.claim_blocking()  # will wait for the next block to claim the domain
-name.update(target='ak$1234deadbeef')  # set what this domain stands for
+name.update(target='ak_1234deadbeef')  # set what this domain stands for
 ```
 
 you can also pass an oracle instance directly to in the `target` parameter

aeternity/__init__.py

@@ -1 +1 @@
-__version__ = '0.20.0.2'
+__version__ = '0.22.0.1rc1'

aeternity/__main__.py

@@ -70,16 +70,16 @@ def _check_prefix(data, prefix):
     """
 
     if len(data) < 3:
-        print("Invalid input, likely you forgot to escape the $ sign (use \\$)")
+        print(f"Invalid input: '{data}'")
         exit(1)
 
-    if not data.startswith(f"{prefix}$"):
+    if not data.startswith(f"{prefix}_"):
         if prefix == 'ak':
-            print("Invalid account address, it shoudld be like: ak$....")
+            print("Invalid account address, it shoudld be like: ak_....")
         if prefix == 'th':
-            print("Invalid transaction hash, it shoudld be like: th$....")
-        if prefix == 'bh':
-            print("Invalid block hash, it shoudld be like: bh$....")
+            print("Invalid transaction hash, it shoudld be like: th_....")
+        if prefix in ('bh', 'kh'):
+            print("Invalid block hash, it shoudld be like: bh_...., kh_...")
         exit(1)
 
 
@@ -274,9 +274,9 @@ def wallet_balance(password):
     kp, _ = _keypair(password=password)
 
     try:
-        balance = _epoch_cli().get_balance(kp.get_address())
+        account = _epoch_cli().get_account_by_pubkey(pubkey=kp.get_address())
         _pp(
-            ("Account balance", balance)
+            ("Account balance", account.balance)
         )
     except Exception as e:
         _ppe(e)
@@ -555,39 +555,39 @@ def inspect():
     pass
 
 
-@inspect.command('block', help='The block hash to inspect (eg: bh$...)')
+@inspect.command('block', help='The block hash to inspect (eg: bh_...)')
 @click.argument('block_hash')
 def inspect_block(block_hash):
-    _check_prefix(block_hash, "bh")
-    data = _epoch_cli().get_block_by_hash(block_hash)
+    _check_prefix(block_hash, "kh")
+    data = _epoch_cli().get_key_block_by_hash(hash=block_hash)
     _p_block(data)
 
 
 @inspect.command('height', help='The height of the chain to inspect (eg:14352)')
 @click.argument('chain_height', default=1)
 def inspect_height(chain_height):
-    data = _epoch_cli().get_key_block_by_height(chain_height)
+    data = _epoch_cli().get_key_block_by_height(height=chain_height)
     _p_block(data)
 
 
-@inspect.command('transaction', help='The transaction hash to inspect (eg: th$...)')
+@inspect.command('transaction', help='The transaction hash to inspect (eg: th_...)')
 @click.argument('tx_hash')
 def inspect_transaction(tx_hash):
     try:
         _check_prefix(tx_hash, "th")
-        data = _epoch_cli().get_transaction_by_transaction_hash(tx_hash)
+        data = _epoch_cli().get_transaction_by_hash(hash=tx_hash)
         _p_tx(data.transaction)
     except Exception as e:
         print(e)
 
 
-@inspect.command('account', help='The address of the account to inspect (eg: ak$...)')
+@inspect.command('account', help='The address of the account to inspect (eg: ak_...)')
 @click.argument('account')
 def inspect_account(account):
     _check_prefix(account, "ak")
     try:
-        data = _epoch_cli().get_balance(account)
-        _pp(("Account balance", data))
+        data = _epoch_cli().get_account_by_pubkey(pubkey=account)
+        _pp(("Account balance", data.balance))
     except Exception as e:
         print(e)
 
@@ -627,7 +627,7 @@ def inspect_deploy(contract_deploy_descriptor):
                 ('Owner', contract.get('owner', 'N/A')),
                 ('Created_at', contract.get('created_at', 'N/A')),
             ])
-            data = _epoch_cli().get_transaction_by_transaction_hash(contract.get('transaction', 'N/A'))
+            data = _epoch_cli().get_transaction_by_hash(hash=contract.get('transaction', 'N/A'))
             print("Transaction")
             _p_tx(data.transaction)
     except Exception as e:
@@ -654,7 +654,7 @@ def chain_top():
     """
     Print the information of the top block of the chain.
     """
-    data = _epoch_cli().get_top()
+    data = _epoch_cli().get_top_block()
     _p_block(data)
 
 
@@ -663,8 +663,18 @@ def chain_version():
     """
     Print the epoch node version.
     """
-    data = _epoch_cli().get_version()
-    _pp(("Epoch node version", data))
+    data = _epoch_cli().get_status()
+    _pp([
+        ("Epoch node version", data.node_version),
+        ("Epoch node revision", data.node_revision),
+        ("Difficulty", data.difficulty),
+        ("Genesis key block hash", data.genesis_key_block_hash),
+        ("Peers", data.peer_count),
+        ("Pending transactions", data.pending_transactions_count),
+        ("Solutions", data.solutions),
+        ("Listening", data.listening),
+        ("syncing", data.syncing),
+    ])
 
 
 @chain.command('play')
@@ -677,11 +687,11 @@ def chain_play(height, block_hash, limit):
     """
     if block_hash is not None:
         _check_prefix(block_hash, "bh")
-        b = _epoch_cli().get_block_by_hash(block_hash)
+        b = _epoch_cli().get_key_block_by_hash(hash=block_hash)
     elif height is not None:
-        b = _epoch_cli().get_key_block_by_height(height)
+        b = _epoch_cli().get_key_block_by_height(height=height)
     else:
-        b = _epoch_cli().get_top()
+        b = _epoch_cli().get_top_block()
     # check the limit
     limit = limit if limit > 0 else 0
     while b is not None and limit > 0:
@@ -690,7 +700,7 @@ def chain_play(height, block_hash, limit):
             limit -= 1
             if limit <= 0:
                 break
-            b = _epoch_cli().get_block_by_hash(b.prev_hash)
+            b = _epoch_cli().get_key_block_by_hash(hash=b.prev_hash)
         except Exception as e:
             _ppe(e)
             b = None

aeternity/aens.py

@@ -1,4 +1,3 @@
-import json
 import random
 
 from aeternity.exceptions import NameNotAvailable, TooEarlyClaim, MissingPreclaim  # ,PreclaimFailed
@@ -52,10 +51,10 @@ def validate_pointer(cls, pointer):
 
     @classmethod
     def validate_address(cls, address, raise_exception=True):
-        if not address.startswith(('ak$', 'ok$')):
+        if not address.startswith(('ak_', 'ok_')):
             if raise_exception:
                 raise ValueError(
-                    'pointer addresses must start with in ak$'
+                    'pointer addresses must start with in ak_'
                 )
             return False
         return True
@@ -73,11 +72,11 @@ def validate_name(cls, domain, raise_exception=True):
     def update_status(self):
         try:
             # use the openapi client inside the epoch client
-            response = self.client.cli.get_name(name=self.domain)
+            response = self.client.get_name_entry_by_name(name=self.domain)
             self.status = NameStatus.CLAIMED
-            self.name_ttl = response.name_ttl
-            self.name_hash = response.name_hash
-            self.pointers = json.loads(response.pointers)
+            self.name_ttl = response.ttl
+            self.name_hash = response.id
+            self.pointers = response.pointers
         except OpenAPIClientException:
             # e.g. if the status is already PRECLAIMED or CLAIMED, don't reset
             # it to AVAILABLE.
@@ -135,16 +134,16 @@ def preclaim(self, keypair, fee=DEFAULT_FEE, tx_ttl=DEFAULT_TX_TTL):
         Execute a name preclaim
         """
         # check which block we used to create the preclaim
-        self.preclaimed_block_height = self.client.get_height()
+        self.preclaimed_block_height = self.client.get_current_key_block_height()
         # calculate the commitment hash
         commitment_hash = self._get_commitment_hash()
         # compute the absolute ttl
         ttl = self.client.compute_absolute_ttl(tx_ttl)
         # preclaim
         preclaim_transaction = self.client.cli.post_name_preclaim(body=dict(
-            commitment=commitment_hash,
+            commitment_id=commitment_hash,
             fee=fee,
-            account=keypair.get_address(),
+            account_id=keypair.get_address(),
             ttl=ttl
         ))
         signed_tx = self.client.post_transaction(keypair, preclaim_transaction)
@@ -168,7 +167,7 @@ def claim(self, keypair, fee=DEFAULT_FEE, tx_ttl=DEFAULT_TX_TTL):
         if self.preclaimed_block_height is None:
             raise MissingPreclaim('You must call preclaim before claiming a name')
 
-        current_block_height = self.client.get_height()
+        current_block_height = self.client.get_current_key_block_height()
         if self.preclaimed_block_height >= current_block_height:
             raise TooEarlyClaim(
                 'You must wait for one block to call claim.'
@@ -177,7 +176,7 @@ def claim(self, keypair, fee=DEFAULT_FEE, tx_ttl=DEFAULT_TX_TTL):
         # compute the absolute ttl
         ttl = self.client.compute_absolute_ttl(tx_ttl)
         claim_transaction = self.client.cli.post_name_claim(body=dict(
-            account=keypair.get_address(),
+            account_id=keypair.get_address(),
             name=AEName._encode_name(self.domain),
             name_salt=self.preclaim_salt,
             fee=fee,
@@ -188,12 +187,22 @@ def claim(self, keypair, fee=DEFAULT_FEE, tx_ttl=DEFAULT_TX_TTL):
         self.status = AEName.Status.CLAIMED
         return signed_tx.tx_hash, self.preclaim_salt
 
-    def _get_pointers_json(self, target):
+    def _get_pointers(self, target):
         if target.startswith('ak'):
-            pointers = {'account_pubkey': target}
+            pointers = [
+                {
+                    'id': target,
+                    'key': 'account_pubkey'
+                }
+            ]
         else:
-            pointers = {'oracle_pubkey': target}
-        return json.dumps(pointers)
+            pointers = [
+              {
+                'id': target,
+                'key': 'oracle_pubkey'
+              }
+            ]
+        return pointers
 
     def update(self, keypair, target,
                name_ttl=NAME_MAX_TLL,
@@ -211,11 +220,11 @@ def update(self, keypair, target,
         ttl = self.client.compute_absolute_ttl(tx_ttl)
         # send the update transaction
         update_transaction = self.client.cli.post_name_update(body=dict(
-            account=keypair.get_address(),
-            name_hash=AEName.calculate_name_hash(self.domain),
+            account_id=keypair.get_address(),
+            name_id=AEName.calculate_name_hash(self.domain),
             client_ttl=client_ttl,
             name_ttl=name_ttl,
-            pointers=self._get_pointers_json(target),
+            pointers=self._get_pointers(target),
             ttl=ttl,
             fee=fee,
         ))
@@ -232,9 +241,9 @@ def transfer_ownership(self, keypair, receipient_pubkey,
         # compute the absolute ttl
         ttl = self.client.compute_absolute_ttl(tx_ttl)
         transfer_transaction = self.client.cli.post_name_transfer(body=dict(
-            account=keypair.get_address(),
-            name_hash=self.calculate_name_hash(self.domain),
-            recipient_pubkey=receipient_pubkey,
+            account_id=keypair.get_address(),
+            name_id=self.calculate_name_hash(self.domain),
+            recipient_id=receipient_pubkey,
             ttl=ttl,
             fee=fee,
         ))
@@ -250,8 +259,8 @@ def revoke(self, keypair, fee=DEFAULT_FEE, tx_ttl=DEFAULT_TX_TTL):
         # compute the absolute ttl
         ttl = self.client.compute_absolute_ttl(tx_ttl)
         revoke_transaction = self.client.cli.post_name_revoke(body=dict(
-            account=keypair.get_address(),
-            name_hash=self.calculate_name_hash(self.domain),
+            account_id=keypair.get_address(),
+            name_id=self.calculate_name_hash(self.domain),
             fee=fee,
             ttl=ttl
         ))

aeternity/config.py

@@ -21,10 +21,6 @@
 CONTRACT_DEFAULT_DEPOSIT = 4
 CONTRACT_DEFAULT_VM_VERSION = 1
 
-# params
-# can be message_pack or json
-PARAM_DEFAULT_ENCODING = 'json'
-
 
 class ConfigException(Exception):
     pass
@@ -47,8 +43,8 @@ def __init__(self,
         self.pubkey = None
         # retrieve the version of the node we are connecting to
         try:
-            r = requests.get(f"{self.api_url}/v2/version").json()
-            self.node_version = r['version']
+            r = requests.get(f"{self.api_url}/v2/status").json()
+            self.node_version = r['node_version']
         except requests.exceptions.ConnectionError as e:
             raise ConfigException(f"Error connecting to the epoch node at {self.api_url}, connection unavailable")