Merge pull request #270 from aeternity/release/6.0.0

Release/6.0.0

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.3
+NODE_TAG=v5.0.0-rc.5
 COMPILER_TAG=v3.2.0

CHANGELOG.md

@@ -1,26 +1,54 @@
 # Changelog
+
 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).
 
+## [6.0.0](https://github.com/aeternity/aepp-sdk-python/releases/tag/6.0.0) ([compare](https://github.com/aeternity/aepp-sdk-python/compare/5.0.1...6.0.0)) - 2019-10-17
+
+### Bug Fixes
+
+- fix(cli): name claim and update commands (#257) ([84988f9](https://github.com/aeternity/aepp-sdk-python/commit/84988f97f96983d683a37bd58c6e01ec2cb9efde)). Related issues/PRs: #256
+- fix(hashing): fix typo in hash function name ([af06d36](https://github.com/aeternity/aepp-sdk-python/commit/af06d36f3475fd80b7b7af08981e2366c9351038)).
+
+### Features
+
+- feat(aens): allow to set multiple and custom pointers for a name ([0e60389](https://github.com/aeternity/aepp-sdk-python/commit/0e6038994ce3034c8192c6bf60d1fd83a7719051)). Related issues/PRs: #244, #244
+- feat(aens): use .chain instead of .aet as TLD after Lima HF ([e02b92c](https://github.com/aeternity/aepp-sdk-python/commit/e02b92c81afc60b44d570ecd76f725268c333f07)). Related issues/PRs: #266
+- feat(contracts): enable contracts compile, deploy, generate aci using cli ([1c0e21d](https://github.com/aeternity/aepp-sdk-python/commit/1c0e21deb2ed34e10782b69c4b190521b9eee85a)).
+- feat(node): add spend_by_name ([72d4a95](https://github.com/aeternity/aepp-sdk-python/commit/72d4a9547ad1574c56fb6dd79e8ae4eba9e816c8)).
+
+### BREAKING CHANGES
+
+- remove legacy parameters and add the required ones. Removed address from the contract object
+- the `init_calldata` used to have a default. That is not allowed anymore the user need to be provide `init_calldata`.
+- changes in the signature of the contract call in contract and transaction module
+- the encode-calldata and decode-data commands have been removed
+- rename cli name contracts to contract
+- unify parameters related to calldata to `--calldata` in cli
+- unify parameters related to calldata to `calldata` in programmatic api
+- `encode-calldata` arguments parameter is now varidic instead of a list
+- account_basic_to_ga param `init_calldata` renamed to calldata
+- account_basic_to_ga param calldata is mandatory
+- it is not possible anymore to use `.address` to retrieve the contract address, instead it can be retrieved from the deploy transaction
+
 ## [5.0.1](https://github.com/aeternity/aepp-sdk-python/releases/tag/5.0.1) ([compare](https://github.com/aeternity/aepp-sdk-python/compare/5.0.0...5.0.1)) - 2019-10-06
 
 ### Bug Fixes
 - fix: compatibility range for node version (#251) ([a1b273e](https://github.com/aeternity/aepp-sdk-python/commit/a1b273eb73b093c81c8ef3e8de3dcfe24989a8d5)).
 - fix: inspect oracle (#252) ([9daf5ef](https://github.com/aeternity/aepp-sdk-python/commit/9daf5efae9a6abb2a312667078c1f76ccf21be39)).
 
-
-
 ## [5.0.0](https://github.com/aeternity/aepp-sdk-python/releases/tag/5.0.0) ([compare](https://github.com/aeternity/aepp-sdk-python/compare/4.3.0...5.0.0)) - 2019-10-04
 
-
 This version is cross compatible with Fortuna and Lima versions of the node
 
 ### Code Refactoring
+
 - refactor(tx): tx management consolidation (#230) ([542beb6](https://github.com/aeternity/aepp-sdk-python/commit/542beb64d4198b036d62b3b30014da02801ffac5)). Related issues/PRs: #237, #238
 
 ### Features
+
 - feat(aens): support lima aens model (#241) ([1ffae14](https://github.com/aeternity/aepp-sdk-python/commit/1ffae147c8f666c8a4674608246c2b7ca5be82be)). Related issues/PRs: #233, #236, #235
 - feat(cli): auto select the network-id for high level cli command (#246) ([e512d15](https://github.com/aeternity/aepp-sdk-python/commit/e512d15be29e3140a869d2ec8872c86a1db1fe6b)).
 - feat(compiler): support for compiler series v4 / FATE (#229) ([3276eec](https://github.com/aeternity/aepp-sdk-python/commit/3276eeca31c989ec6afa13f9eb48706eb555abee)).
@@ -31,13 +59,15 @@ This version is cross compatible with Fortuna and Lima versions of the node
 - namehash function is deprecated and will be removed after Lima HF
 
 ### BREAKING CHANGES
-- `sign_transaction(str)` has been changed to  `broadcast_transaction(TxObject)` where TxObject is the default transaction object troughout the sdk
+
+- `sign_transaction(str)` has been changed to  `broadcast_transaction(TxObject)` where TxObject is the default transaction object throughout the sdk
 - `broadcast_transaction(str)`  has been changed to  `broadcast_transaction(TxObject)` 
 changes the max length for auction from 32 to 12
 - `wait_for_transaction` drops the optional (and unused) parameter `confirm_transaction`.
 - `wait_for_confirmation` returns height where the transaction has been found (if any)
 
 For the CLI, the parameter `--network-id` has been dropped for the commands:
+
 - `aecli account spend`
 - `aecli name claim`
 - `aecli name revoke`
@@ -47,6 +77,17 @@ For the CLI, the parameter `--network-id` has been dropped for the commands:
 - `aecli contract deploy`
 - `aecli contract call`
 
+In the name claim function, the first param is pre-claim tx hash and not the Account.
+example:
+
+```python
+# PREVIOUS
+name.claim(account, claim_tx.hash,...)
+
+#NEW
+name.claim(claim_tx.hash, account,...)
+```
+
 more details can be found at the relevant commit: [542beb6](https://github.com/aeternity/aepp-sdk-python/commit/542beb64d4198b036d62b3b30014da02801ffac5), [e512d15](https://github.com/aeternity/aepp-sdk-python/commit/e512d15be29e3140a869d2ec8872c86a1db1fe6b),
 [b5f3a08](https://github.com/aeternity/aepp-sdk-python/commit/b5f3a0871cf98b8b3fedd8a67fd4c1b12cacad01)
 

Makefile

@@ -1,6 +1,8 @@
 # build output folder
 DIST_FOLDER = dist
 BUILD_FOLDER = build
+# extra test options
+TEST_OPTS = ''
 
 .PHONY: list
 list:
@@ -19,7 +21,7 @@ test: test-all
 
 test-all:
 	@echo run pytest
-	pytest -v --junitxml test-results.xml tests --cov=aeternity --cov-config .coveragerc --cov-report xml:coverage.xml
+	pytest -v --junitxml test-results.xml tests --cov=aeternity --cov-config .coveragerc --cov-report xml:coverage.xml $(TEST_OPTS)
 	@echo done
 
 lint: lint-all

aeternity/__main__.py

@@ -531,7 +531,7 @@ def name_claim(keystore_name, domain, name_ttl, name_salt, preclaim_tx_hash, ttl
             print("Domain not available")
             exit(0)
         # claim
-        tx = name.claim(account, name_salt, preclaim_tx_hash, fee=fee, tx_ttl=ttl)
+        tx = name.claim(preclaim_tx_hash, account, name_salt, fee=fee, tx_ttl=ttl)
         _print_object(tx, title=f'Name {domain} claim transaction')
     except ValueError as e:
         _print_error(e, exit_code=1)
@@ -542,13 +542,13 @@ def name_claim(keystore_name, domain, name_ttl, name_salt, preclaim_tx_hash, ttl
 @name.command('bid', help="Bid on a name auction")
 @click.argument('keystore_name', required=True)
 @click.argument('domain', required=True)
-@click.argument('name_fee', required=True)
+@click.argument('name_fee', required=True, type=int)
 @click.option("--name-ttl", default=defaults.NAME_TTL, help=f'Lifetime of the name in blocks', show_default=True, type=int)
 @global_options
 @account_options
 @online_options
 @transaction_options
-def name_bid(keystore_name, domain, name_fee, ttl, fee, nonce, password, force, wait, json_):
+def name_bid(keystore_name, domain, name_ttl, name_fee, ttl, fee, nonce, password, force, wait, json_):
     try:
         set_global_options(json_, force, wait)
         account, _ = _account(keystore_name, password=password)
@@ -676,8 +676,8 @@ def contract_compile(contract_file, compiler_url, json_):
 
 
 @compiler.command('aci', help="Get the aci of a contract")
-@click.option('--compiler-url', '-c', default='http://localhost:3080', envvar='COMPILER_URL', help='Aeternity compiler url', metavar='URL')
 @click.argument("contract_file")
+@click.option('--compiler-url', '-c', default='http://localhost:3080', envvar='COMPILER_URL', help='Aeternity compiler url', metavar='URL')
 @global_options
 def contract_aci(contract_file, compiler_url, json_):
     try:
@@ -686,17 +686,20 @@ def contract_aci(contract_file, compiler_url, json_):
             code = fp.read()
             c = CompilerClient(compiler_url=compiler_url)
             result = c.aci(code)
+            if click.confirm(f'Save contract ACI to file ({contract_file}.aci.json) ?', default=True, show_default=True):
+                with open(f"{contract_file}.aci.json", "w") as fp:
+                    fp.write(json.dumps(namedtupled.reduce(result), indent=2))
             _print_object(result, title="contract")
     except Exception as e:
         _print_error(e, exit_code=1)
 
 
-@compiler.command('encode-calldata', help="Encode the calldata to invoke a contract")
-@click.option('--compiler-url', '-c', default='http://localhost:3080', envvar='COMPILER_URL', help='Aeternity compiler url', metavar='URL')
-@click.argument("contract_file")
-@click.argument("function_name")
-@click.option("--arguments", default=None, help="Argument of the function if any, comma separated")
-@global_options
+# @compiler.command('encode-calldata', help="Encode the calldata to invoke a contract")
+# @click.option('--compiler-url', '-c', default='http://localhost:3080', envvar='COMPILER_URL', help='Aeternity compiler url', metavar='URL')
+# @click.argument("contract_file")
+# @click.argument("function_name")
+# @click.option("--arguments", default=None, help="Argument of the function if any, comma separated")
+# @global_options
 def contract_encode_calldata(contract_file, function_name, arguments, compiler_url, json_):
     try:
         set_global_options(json_, False, False)
@@ -706,17 +709,15 @@ def contract_encode_calldata(contract_file, function_name, arguments, compiler_u
             arguments = [] if arguments is None else arguments.split(",")
             result = c.encode_calldata(code, function_name, arguments=arguments)
             _print_object(result, title="contract")
-    # except Exception as e:
-    #     _print_error(e, exit_code=1)
-    finally:
-        pass
+    except Exception as e:
+        _print_error(e, exit_code=1)
 
 
-@compiler.command('decode-data', help="Decode the data retrieve from a contract")
-@click.option('--compiler-url', '-c', default='http://localhost:3080', envvar='COMPILER_URL', help='Aeternity compiler url', metavar='URL')
-@click.argument("sophia_type")
-@click.argument("encoded_data")
-@global_options
+# @compiler.command('decode-data', help="Decode the data retrieve from a contract")
+# @click.option('--compiler-url', '-c', default='http://localhost:3080', envvar='COMPILER_URL', help='Aeternity compiler url', metavar='URL')
+# @click.argument("sophia_type")
+# @click.argument("encoded_data")
+# @global_options
 def contract_decode_data(contract_file, encoded_data, sophia_type, compiler_url, json_):
     try:
         set_global_options(json_, False, False)
@@ -727,24 +728,24 @@ def contract_decode_data(contract_file, encoded_data, sophia_type, compiler_url,
         _print_error(e, exit_code=1)
 
 
-@cli.group(help='Deploy and execute contracts on the chain')
-def contracts():
+@cli.group(help='Deploy and execute a contract on chain')
+def contract():
     pass
 
 
-@contracts.command('deploy', help='Deploy a contract on the chain')
+@contract.command('deploy', help='Deploy a contract on the chain')
 @click.argument('keystore_name', required=True)
 @click.argument("bytecode_file", required=True)
-@click.option("--init-calldata", default=defaults.CONTRACT_INIT_CALLDATA, help="The calldata for the init function", show_default=True)
-@click.option("--gas", default=defaults.CONTRACT_GAS, help='Amount of gas to deploy the contract', show_default=True)
-@click.option("--amount", default=defaults.CONTRACT_AMOUNT, help='Amount of tokens to transfer to the contract', show_default=True)
-@click.option("--gas-price", default=defaults.CONTRACT_GAS_PRICE, help='The gas price used to execute the contract init function', show_default=True)
-@click.option("--deposit", default=defaults.CONTRACT_AMOUNT, help='A initial deposit to the contract', show_default=True)
+@click.option("--calldata", help="The calldata for the init function", required=True)
+@click.option("--gas", default=defaults.CONTRACT_GAS, help='Amount of gas to deploy the contract', show_default=True, type=int)
+@click.option("--amount", default=defaults.CONTRACT_AMOUNT, help='Amount of tokens to transfer to the contract', show_default=True, type=int)
+@click.option("--gas-price", default=defaults.CONTRACT_GAS_PRICE, help='The gas price used to execute the contract init function', show_default=True, type=int)
+@click.option("--deposit", default=defaults.CONTRACT_AMOUNT, help='A initial deposit to the contract', show_default=True, type=int)
 @global_options
 @account_options
 @online_options
 @transaction_options
-def contract_deploy(keystore_name, bytecode_file, init_calldata, gas, gas_price, amount, deposit, password, ttl, fee, nonce, force, wait, json_):
+def contract_deploy(keystore_name, bytecode_file, calldata, gas, gas_price, amount, deposit, password, ttl, fee, nonce, force, wait, json_):
     """
     Deploy a contract to the chain and create a deploy descriptor
     with the contract informations that can be use to invoke the contract
@@ -754,59 +755,58 @@ def contract_deploy(keystore_name, bytecode_file, init_calldata, gas, gas_price,
     source file. Multiple deploy of the same contract file will generate different
     deploy descriptor
     """
-    print("Not yet implemented")
-    return
     try:
         with open(bytecode_file) as fp:
             set_global_options(json_, force, wait)
             account, _ = _account(keystore_name, password=password)
             bytecode = fp.read()
             contract = _node_cli().Contract()
-            tx = contract.create(account, bytecode, init_calldata=init_calldata, gas=gas, amount=amount,
-                                 gas_price=gas_price, deposit=deposit, tx_ttl=ttl, fee=fee)
+            tx = contract.create(account, bytecode, calldata,
+                                 gas=gas,
+                                 amount=amount,
+                                 gas_price=gas_price,
+                                 deposit=deposit,
+                                 tx_ttl=ttl,
+                                 fee=fee)
             _print_object(tx, title="contract create")
     except Exception as e:
         _print_error(e, exit_code=1)
 
 
-@contracts.command('call', help='Execute a function of the contract')
+@contract.command('call', help='Execute a function of the contract')
 @click.argument('keystore_name', required=True)
-@click.argument("deploy_descriptor", required=True)
-@click.argument("function", required=True)
-@click.argument("params", required=True)
-@click.argument("return_type", required=True)
-@click.option("--gas", default=defaults.CONTRACT_GAS, help='Amount of gas to deploy the contract', show_default=True)
+@click.argument('contract_id', required=True)
+@click.argument("function_name")
+@click.option("--calldata", help="The encoded calldata of the function to call", required=True)
+@click.option("--gas", default=defaults.CONTRACT_GAS, help='Gas limit for the contract call', show_default=True)
+@click.option("--gas-price", default=defaults.CONTRACT_GAS_PRICE, help='Gas unit price for the contract call', show_default=True)
+@click.option("--amount", default=defaults.CONTRACT_AMOUNT, help='Amount of token (only for payable contracts)', show_default=True)
 @global_options
 @account_options
 @online_options
 @transaction_options
-def contract_call(keystore_name, deploy_descriptor, function, params, return_type, gas,  password, force, wait, json_):
-    print("Not yet implemented")
-    return
+def contract_call(keystore_name, contract_id, function_name, calldata, gas, gas_price, amount,
+                  password, ttl, fee, nonce, force, wait, json_):
     try:
-        with open(deploy_descriptor) as fp:
-            contract = json.load(fp)
-            source = contract.get('source')
-            bytecode = contract.get('bytecode')
-            address = contract.get('address')
-
-            set_global_options(json_, force, wait)
-            account, _ = _account(keystore_name, password=password)
-
-            contract = _node_cli().Contract(source, bytecode=bytecode, address=address)
-            tx = contract.tx_call(account, function, params, gas=gas)
-            _print_object(tx, "contract call")
+        set_global_options(json_, force, wait)
+        account, _ = _account(keystore_name, password=password)
+        contract = _node_cli().Contract()
+        tx = contract.call(contract_id, account, function_name, calldata,
+                           amount=amount,
+                           gas=gas,
+                           gas_price=gas_price,
+                           fee=fee,
+                           tx_ttl=ttl)
+        _print_object(tx, "contract call")
     except Exception as e:
         _print_error(e, exit_code=1)
 
 
-@contracts.command('call-info', help='Retrieve the result of a contract call if any')
+@contract.command('call-info', help='Retrieve the result of a contract call if any')
 @click.argument('tx_hash', required=True)
 @global_options
 @online_options
 def contract_call_info(tx_hash, force, wait, json_):
-    print("Not yet implemented")
-    return
     try:
         contract = _node_cli().Contract()
         call_object = contract.get_call_object(tx_hash)
@@ -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_"):