Merge pull request #73 from aeternity/release/0.25.0.1b1

Release/0.25.0.1b1

Author: noandrea

.env

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

CHANGELOG.md

@@ -5,6 +5,19 @@ log follows the conventions of [keepachangelog.com](http://keepachangelog.com/).
 
 ## [Unreleased]
 
+## [0.25.0.1b1]
+
+### Added
+
+- Support for network_id when signing transactions
+
+### Removed
+
+- Compatiblity with epoch nodes version < [0.25.0](https://github.com/aeternity/epoch/blob/v0.25.0/docs/release-notes/RELEASE-NOTES-0.25.0.md)
+- Support for .aet tld for aens
+
+
+
 ## [0.24.0.2]
 
 ### Fixed
@@ -21,7 +34,6 @@ log follows the conventions of [keepachangelog.com](http://keepachangelog.com/).
 
 - The keystore/JSON format will be deprecated in the next releases
 
-
 ## [0.22.0.1]
 
 ### Removed
@@ -44,7 +56,6 @@ log follows the conventions of [keepachangelog.com](http://keepachangelog.com/).
 - Add [exponetial backoff](https://developers.google.com/drive/api/v3/handle-errors#exponential-backoff) strategy to verify if a transaction has been included in the chain.
 - Add `--wait` flag to instruct the client to wait for a transaction to be included in a chain before returning
 
-
 ## [0.21.0.1]
 
 ### Removed

aeternity/__init__.py

@@ -1,5 +1,5 @@
-__version__ = '0.24.0.2'
+__version__ = '0.25.0.1b1'
 
 __compatibility__ = [
-    '0.24.0'
+    '0.25.0'
 ]

aeternity/__main__.py

@@ -350,8 +350,8 @@ def name_register(keystore_name, domain, name_ttl, ttl, password, force, wait, j
 @click.argument('keystore_name', required=True)
 @click.argument('domain', required=True)
 @click.argument('address', required=True)
-@click.option("--name-ttl", default=100, help=f'Lifetime of the claim in blocks (default {config.DEFAULT_NAME_TTL})')
-@click.option("--ttl", default=100, help=f'Lifetime of the claim request in blocks (default {config.DEFAULT_TX_TTL})')
+@click.option("--name-ttl", default=config.DEFAULT_NAME_TTL, help=f'Lifetime of the claim in blocks (default {config.DEFAULT_NAME_TTL})')
+@click.option("--ttl", default=config.DEFAULT_TX_TTL, help=f'Lifetime of the claim request in blocks (default {config.DEFAULT_TX_TTL})')
 @account_options
 def name_update(keystore_name, domain, address, name_ttl, ttl, password, force, wait, json_):
     """
@@ -578,7 +578,7 @@ def contract_call(keystore_name, deploy_descriptor, function, params, return_typ
 def inspect(obj, force, wait, json_):
     try:
         set_global_options(force, wait, json_)
-        if obj.endswith(".aet"):
+        if obj.endswith(".test"):
             name = _epoch_cli().AEName(obj)
             name.update_status()
             _print_object({

aeternity/config.py

@@ -20,6 +20,8 @@
 CONTRACT_DEFAULT_GAS_PRICE = 1
 CONTRACT_DEFAULT_DEPOSIT = 4
 CONTRACT_DEFAULT_VM_VERSION = 1
+# network id
+DEFAULT_NETWORK_ID = "ae_mainnet"
 # TUNING
 MAX_RETRIES = 7  # used in exponential backoff when checking a transaction
 POLLING_INTERVAL = 2  # in seconds
@@ -40,7 +42,8 @@ def __init__(self,
                  external_url='http://localhost:3013',
                  internal_url='http://localhost:3113',
                  websocket_url=None,
-                 force_compatibility=False):
+                 force_compatibility=False,
+                 network_id=DEFAULT_NETWORK_ID):
 
         # endpoint urls
         self.websocket_url = websocket_url
@@ -49,6 +52,7 @@ def __init__(self,
         # get the version
         self.name_url = f'{self.api_url}/name'
         self.pubkey = None
+        self.network_id = network_id
         # retrieve the version of the node we are connecting to
         try:
             r = requests.get(f"{self.api_url}/v2/status").json()

aeternity/epoch.py

@@ -137,7 +137,7 @@ def send(self, message):
 
     def spend(self, keypair, recipient_pubkey, amount, payload="", fee=config.DEFAULT_FEE, tx_ttl=config.DEFAULT_TX_TTL):
         """create and execute a spend transaction"""
-        txb = transactions.TxBuilder(self.cli, keypair)
+        txb = transactions.TxBuilder(self, keypair)
         # create spend_tx
         tx, sg, tx_hash = txb.tx_spend(recipient_pubkey, amount, payload, fee, tx_ttl)
         # post the transaction to the chain

aeternity/transactions.py

@@ -73,14 +73,15 @@ class TxBuilder:
     TxBuilder is used to build and post transactions to the chain.
     """
 
-    def __init__(self, epoch, account, native=True):
+    def __init__(self, epoch, account, native=False):
         """
         :param epoch: the epoch rest client
         :param account: the account that will be signing the transactions
         :param native: if the transactions should be built by the sdk (True) or requested to the debug api (False)
         """
         self.epoch = epoch
         self.account = account
+        self.network_id = epoch._get_active_config().network_id
         self.native_transactions = native
 
     @staticmethod
@@ -122,11 +123,11 @@ def _get_nonce_ttl(self, relative_ttl):
         nonce = TxBuilder.get_next_nonce(self.epoch, self.account.get_address())
         return nonce, ttl
 
-    def encode_signed_transaction(self, signed_tx, signature):
+    def encode_signed_transaction(self, transaction, signature):
         """prepare a signed transaction message"""
         tag = bytes([OBJECT_TAG_SIGNED_TRANSACTION])
         vsn = bytes([VSN])
-        encoded_signed_tx = hashing.encode_rlp("tx", [tag, vsn, [signature], signed_tx])
+        encoded_signed_tx = hashing.encode_rlp("tx", [tag, vsn, [signature], transaction])
         encoded_signature = hashing.encode("sg", signature)
         return encoded_signed_tx, encoded_signature
 
@@ -138,7 +139,7 @@ def sign_encode_transaction(self, tx):
         # decode the transaction if not in native mode
         transaction = hashing.decode(tx.tx) if hasattr(tx, "tx") else hashing.decode(tx)
         # sign the transaction
-        signature = self.account.sign(transaction)
+        signature = self.account.sign(hashing.to_bytes(self.network_id) + transaction)
         # encode the transaction
         encoded_signed_tx, encoded_signature = self.encode_signed_transaction(transaction, signature)
         # compute the hash

aeternity/utils.py

@@ -48,6 +48,6 @@ def is_valid_aens_name(domain_name):
     # TODO: validate according to the spec!
     # TODO: https://github.com/aeternity/protocol/blob/master/AENS.md#name
 
-    if domain_name is None or not validators.domain(domain_name) or not domain_name.endswith(('.aet', '.test')):
+    if domain_name is None or not validators.domain(domain_name) or not domain_name.endswith(('.test')):
         return False
     return True

docker/epoch_node_mean16.yaml

@@ -1,7 +1,6 @@
 ---
 peers:
     - aenode://pp_28uQUgsPcsy7TQwnRxhF8GMKU4ykFLKsgf4TwDwPMNaSCXwWV8@node2:3015
-    - aenode://pp_Dxq41rJN33j26MLqryvh7AnhuZywefWKEPBiiYu2Da2vDWLBq@node3:3015
 
 http:
     external:
@@ -10,11 +9,11 @@ http:
         listen_address: 0.0.0.0
 
 websocket:
-    internal:
+    channel:
         listen_address: 0.0.0.0
 
 keys:
-    password: "top secret"
+    peer_password: "top secret"
     dir: ./keys
 
 chain:

sonar-project.properties

@@ -1,6 +1,6 @@
 sonar.projectKey=aeternity:aepp-sdk-python
 sonar.projectName=Python :: Aeternity SDK 
-sonar.projectVersion=0.24.0.1
+sonar.projectVersion=0.25.0.1
 
 sonar.sources=aeternity
 sonar.tests=tests