Merge pull request #89 from aeternity/release/1.1.0

Release/1.1.0

Author: noandrea

CHANGELOG.md

@@ -5,7 +5,17 @@ log follows the conventions of [keepachangelog.com](http://keepachangelog.com/).
 
 ## [Unreleased]
 
-## [1.0.0b1]
+## [1.1.0]
+
+### Changed
+
+- CLI default node changed to [sdk-mainnet.aepp.com](https://sdk-mainnet.aepp.com/v2/status)
+
+### Added
+
+- Native transactions for contracts
+
+## [1.0.0]
 
 ### Changed
 
@@ -17,7 +27,7 @@ log follows the conventions of [keepachangelog.com](http://keepachangelog.com/).
 
 ## [0.25.0.1]
 
-⚠️  KEYSTORE FORMAT CHANGE INCOMPATIBLE WITH PREVIOUS FORMAT ⚠️
+⚠️ KEYSTORE FORMAT CHANGE INCOMPATIBLE WITH PREVIOUS FORMAT ⚠️
 
 refer to the [documentation](docs/keystore_format_change.md) about how to update existing keystores
 
@@ -41,7 +51,6 @@ refer to the [documentation](docs/keystore_format_change.md) about how to update
 - Compatibility 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

aeternity/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '1.0.0'
+__version__ = '1.1.0'
 
 __compatibility__ = [
     '1.0.0',

aeternity/__main__.py

@@ -208,7 +208,7 @@ def set_global_options(force, wait, json_):
 @click.group()
 @click.pass_context
 @click.version_option()
-@click.option('--url', '-u', default='https://sdk-testnet.aepps.com', envvar='EPOCH_URL', help='Epoch node url', metavar='URL')
+@click.option('--url', '-u', default='https://sdk-mainnet.aepps.com', envvar='EPOCH_URL', help='Epoch node url', metavar='URL')
 @click.option('--debug-url', '-d', default=None, envvar='EPOCH_URL_DEBUG', metavar='URL')
 @global_options
 @click.version_option(version=__version__)

aeternity/transactions.py

@@ -1,4 +1,4 @@
-from aeternity.hashing import _int, _binary, _id, encode, decode, encode_rlp, hash_encode
+from aeternity.hashing import _int, _binary, _id, encode, decode, encode_rlp, hash_encode, contract_id
 from aeternity.openapi import OpenAPICli
 from aeternity.config import ORACLE_DEFAULT_TTL_TYPE_DELTA
 
@@ -353,7 +353,20 @@ def tx_contract_create(self, account_id, code, call_data, amount, deposit, gas,
         """
 
         if self.native_transactions:
-            raise NotImplementedError("Native transaction for contract creation not implemented")
+            tx = [
+                _id(account_id),
+                _int(nonce),
+                _binary(code),
+                _int(vm_version),
+                _int(fee),
+                _int(ttl),
+                _int(deposit),
+                _int(amount),
+                _int(gas),
+                _int(gas_price),
+                _binary(call_data),
+            ]
+            return encode_rlp("tx", tx), contract_id(account_id, nonce)
         # use internal endpoints transaction
         body = dict(
             owner_id=account_id,
@@ -372,9 +385,35 @@ def tx_contract_create(self, account_id, code, call_data, amount, deposit, gas,
         return tx.tx, tx.contract_id
 
     def tx_contract_call(self, account_id, contract_id, call_data, function, arg, amount, gas, gas_price, vm_version, fee, ttl, nonce)-> str:
-        # compute the absolute ttl and the nonce
+        """
+        Create a contract call
+        :param account_id: the account creating the contract
+        :param contract_id: the contract to call
+        :param call_data: the call data for the contract
+        :param function: the function to execute
+        :param arg: the function arguments
+        :param amount: TODO: add definition
+        :param gas: TODO: add definition
+        :param gas_price: TODO: add definition
+        :param vm_version: TODO: add definition
+        :param fee: the transaction fee
+        :param ttl: the ttl of the transaction
+        :param nonce: the nonce of the account for the transaction
+        """
         if self.native_transactions:
-            raise NotImplementedError("Native transaction for contract calls not implemented")
+            tx = [
+                _id(account_id),
+                _int(nonce),
+                _id(contract_id),
+                _int(vm_version),
+                _int(fee),
+                _int(ttl),
+                _int(amount),
+                _int(gas),
+                _int(gas_price),
+                _binary(call_data),
+            ]
+            return encode_rlp("tx", tx)
         # use internal endpoints transaction
         body = dict(
             call_data=call_data,

tests/test_contract.py

@@ -22,23 +22,16 @@
 #
 
 
-def test_sophia_contract_tx_create_online():
-    # save settings and go online
-    original = EPOCH_CLI.set_native(False)
-
+def _sophia_contract_tx_create_online():
     # runt tests
     contract = EPOCH_CLI.Contract(aer_identity_contract)
     contract.tx_create(ACCOUNT, gas=100000, fee=150000)
     assert contract.address is not None
     assert len(contract.address) > 0
     assert contract.address.startswith('ct')
-    # restore settings
-    EPOCH_CLI.set_native(original)
 
 
-def test_sophia_contract_tx_call_online():
-    # save settings and go online
-    original = EPOCH_CLI.set_native(False)
+def _sophia_contract_tx_call_online():
 
     contract = EPOCH_CLI.Contract(aer_identity_contract)
     tx = contract.tx_create(ACCOUNT, gas=100000, fee=150000)
@@ -56,10 +49,38 @@ def test_sophia_contract_tx_call_online():
     assert val == 42
     assert remote_type == 'word'
 
+
+def test_sophia_contract_tx_create_native():
+    # save settings and go online
+    original = EPOCH_CLI.set_native(False)
+    _sophia_contract_tx_create_online()
     # restore settings
     EPOCH_CLI.set_native(original)
 
 
+def test_sophia_contract_tx_call_native():
+    # save settings and go online
+    original = EPOCH_CLI.set_native(False)
+    _sophia_contract_tx_call_online()
+    # restore settings
+    EPOCH_CLI.set_native(original)
+
+
+def test_sophia_contract_tx_create_debug():
+    # save settings and go online
+    original = EPOCH_CLI.set_native(False)
+    _sophia_contract_tx_create_online()
+    # restore settings
+    EPOCH_CLI.set_native(original)
+
+
+def test_sophia_contract_tx_call_debug():
+    # save settings and go online
+    original = EPOCH_CLI.set_native(False)
+    _sophia_contract_tx_call_online()
+    # restore settings
+    EPOCH_CLI.set_native(original)
+
 # test contracts