Merge pull request #206 from aeternity/release/3.1.1

Release/3.1.1

Author: noandrea

CHANGELOG.md

@@ -4,6 +4,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [3.1.1](https://github.com/aeternity/aepp-sdk-python/releases/tag/3.1.1) ([compare](https://github.com/aeternity/aepp-sdk-python/compare/3.1.0...3.1.1))
+
+### Bug Fixes
+- fix(tx): encode spend tx payload as base64 string prefixed by 'ba' (#204) ([488745b](https://github.com/aeternity/aepp-sdk-python/commit/488745bc93167b0a80e2dd1e90691110e0abaf24)). Related issues/PRs: #203
+
+### Code Refactoring
+- refactor(cli): add option --secret-key as alias to --private-key.([60bcf6d](https://github.com/aeternity/aepp-sdk-python/commit/60bcf6d4af5d423fcf7660bd3ee4f7ea1e299400)).
+
+⚠️ `--private-key` is deprecated and will be removed in a future release`
+
+### Features
+- feat(tx): improve precision for fee calculation (#193) ([04adcb4](https://github.com/aeternity/aepp-sdk-python/commit/04adcb47dd20dd754c3b402227ec251f0c5972e2)).
+
 ## [3.1.0](https://github.com/aeternity/aepp-sdk-python/releases/tag/3.1.0) ([compare](https://github.com/aeternity/aepp-sdk-python/compare/3.0.1...3.1.0))
 
 ### Features

aeternity/__main__.py

@@ -310,17 +310,17 @@ def account_save(keystore_name, private_key, password, overwrite, json_):
 
 @account.command('address', help="Print the account address (public key)")
 @click.argument('keystore_name')
-@click.option('--private-key', is_flag=True, help="Print the private key instead of the account address")
+@click.option('--secret-key', '--private-key', is_flag=True, help="Print the secret key in addition to the account address")
 @global_options
 @account_options
-def account_address(password, keystore_name, private_key, json_):
+def account_address(password, keystore_name, secret_key, json_):
     try:
         set_global_options(json_)
         account, keystore_path = _account(keystore_name, password=password)
         o = {'Address': account.get_address()}
-        if private_key:
-            click.confirm(f'!Warning! this will print your private key on the screen, are you sure?', abort=True)
-            o["Signing key"] = account.get_private_key()
+        if secret_key:
+            click.confirm(f'!Warning! this will print your secret key on the screen, are you sure?', abort=True)
+            o["SecretKey"] = account.get_secret_key()
         _print_object(o, title='account')
     except Exception as e:
         _print_error(e, exit_code=1)

aeternity/identifiers.py

@@ -26,6 +26,7 @@
 STATE_TREES = "ss"  # base64	State trees
 STATE = "st"  # base64	State
 TRANSACTION = "tx"  # base64	Transaction
+BYTE_ARRAY = "ba"  # base64 byte array
 
 IDENTIFIERS_B58 = set([
     ACCOUNT_ID,
@@ -53,7 +54,8 @@
     PROOF_OF_INCLUSION,
     STATE_TREES,
     STATE,
-    TRANSACTION
+    TRANSACTION,
+    BYTE_ARRAY
 ])
 
 # Account address encoding formats

aeternity/transactions.py

@@ -66,22 +66,39 @@ def _tx_native(op, **kwargs):
     def std_fee(tx_raw, fee_idx, base_gas_multiplier=1):
         # calculates the standard minimum transaction fee
         tx_copy = tx_raw  # create a copy of the input
-        tx_copy[fee_idx] = _int(0, 8)  # replace fee with a byte array of length 8
-        return (defaults.BASE_GAS * base_gas_multiplier + len(rlp.encode(tx_copy)) * defaults.GAS_PER_BYTE) * defaults.GAS_PRICE
+        actual_fee = 0
+        tx_copy[fee_idx] = _int(actual_fee)  # replace fee with a byte array of length 1
+        expected = (defaults.BASE_GAS * base_gas_multiplier + len(rlp.encode(tx_copy)) * defaults.GAS_PER_BYTE) * defaults.GAS_PRICE
+        while expected != actual_fee:
+            actual_fee = expected
+            tx_copy[fee_idx] = _int(expected)
+            expected = (defaults.BASE_GAS * base_gas_multiplier + len(rlp.encode(tx_copy)) * defaults.GAS_PER_BYTE) * defaults.GAS_PRICE
+        return actual_fee
 
     def contract_fee(tx_raw, fee_idx, gas, base_gas_multiplier=1):
         # estimate the contract creation fee
         tx_copy = tx_raw  # create a copy of the input
-        tx_copy[fee_idx] = _int(0, 8)  # replace fee with a byte array of length 8
-        return (defaults.BASE_GAS * base_gas_multiplier + gas + len(rlp.encode(tx_copy)) * defaults.GAS_PER_BYTE) * defaults.GAS_PRICE
+        actual_fee = 0
+        tx_copy[fee_idx] = _int(actual_fee)  # replace fee with a byte array of length 1
+        expected = (defaults.BASE_GAS * base_gas_multiplier + gas + len(rlp.encode(tx_copy)) * defaults.GAS_PER_BYTE) * defaults.GAS_PRICE
+        while expected != actual_fee:
+            actual_fee = expected
+            tx_copy[fee_idx] = _int(expected)
+            expected = (defaults.BASE_GAS * base_gas_multiplier + gas + len(rlp.encode(tx_copy)) * defaults.GAS_PER_BYTE) * defaults.GAS_PRICE
+        return actual_fee
 
     def oracle_fee(tx_raw, fee_idx, relative_ttl):
         # estimate oracle fees
         tx_copy = tx_raw  # create a copy of the input
-        tx_copy[fee_idx] = _int(0, 8)  # replace fee with a byte array of length 8
-        fee = (defaults.BASE_GAS + len(rlp.encode(tx_copy)) * defaults.GAS_PER_BYTE)
-        fee += math.ceil(32000 * relative_ttl / math.floor(60 * 24 * 365 / defaults.KEY_BLOCK_INTERVAL))
-        return fee * defaults.GAS_PRICE
+        actual_fee = 0
+        tx_copy[fee_idx] = _int(actual_fee)  # replace fee with a byte array of length 1
+        ttl_cost = math.ceil(32000 * relative_ttl / math.floor(60 * 24 * 365 / defaults.KEY_BLOCK_INTERVAL))  # calculate the variable cost for ttl
+        expected = ((defaults.BASE_GAS + len(rlp.encode(tx_copy)) * defaults.GAS_PER_BYTE) + ttl_cost) * defaults.GAS_PRICE
+        while expected != actual_fee:
+            actual_fee = expected
+            tx_copy[fee_idx] = _int(expected)
+            expected = ((defaults.BASE_GAS + len(rlp.encode(tx_copy)) * defaults.GAS_PER_BYTE) + ttl_cost) * defaults.GAS_PRICE
+        return actual_fee
 
     def build_tx_object(tx_data, tx_raw, fee_idx, min_fee):
         # if fee is not set use the min fee
@@ -147,7 +164,7 @@ def build_tx_object(tx_data, tx_raw, fee_idx, min_fee):
                 fee=_int_decode(tx_native[5]),
                 ttl=_int_decode(tx_native[6]),
                 nonce=_int_decode(tx_native[7]),
-                payload=_binary_decode(tx_native[8]),
+                payload=encode(idf.BYTE_ARRAY, tx_native[8]),
             )
             min_fee = tx_data.get("fee")
         else:

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "aepp-sdk"
-version = "3.1.0"
+version = "3.1.1"
 description = "Python SDK to interact with the Æternity blockchain"
 authors = [
   "Andrea Giacobino <[email protected]>",