Merge pull request #69 from iotaledger/release/2.0.0

2.0.0-beta1

Author: todofixthis

.travis.yml

@@ -1,3 +1,4 @@
+dist: trusty
 language: python
 python:
   - '2.7'
@@ -9,7 +10,7 @@ deploy:
   on:
     branch: master
   provider: pypi
-  distribution: sdist bdist_wheel
+  distribution: bdist_wheel sdist
   skip_upload_docs: true
   user: phx
   password:

README.rst

@@ -4,6 +4,10 @@
 =====
 PyOTA
 =====
+.. warning::
+   ⚠️ This is pre-release software; it may have performance or stability issues.
+   Please do not use this software on mainnet until v2.0.0 stable is released. ⚠️
+
 This is the official Python library for the IOTA Core.
 
 It implements both the `official API`_, as well as newly-proposed functionality
@@ -28,9 +32,13 @@ PyOTA is compatible with Python 3.6, 3.5 and 2.7.
 ============
 Installation
 ============
+.. warning::
+   ⚠️ This is pre-release software; it may have performance or stability issues.
+   Please do not use this software on mainnet until v2.0.0 stable is released. ⚠️
+
 To install the latest version::
 
-  pip install pyota
+  pip install --pre pyota
 
 Optional C Extension
 ====================
@@ -39,15 +47,8 @@ cryptography features significantly (speedups of **60x** are common!).
 
 To install this extension, use the following command::
 
-   pip install pyota[ccurl]
-
-
-.. note::
-
-   The C extension is currently only compatible with Python 3.
+   pip install --pre pyota[ccurl]
 
-   If you are familiar with Python 2's C API, we'd love to hear from you!
-   See `<https://github.com/todofixthis/pyota-ccurl/issues/4>`_ for more info.
 
 Installing from Source
 ======================

examples/routingwrapper_pow.py

@@ -0,0 +1,43 @@
+# coding=utf-8
+"""
+Simple example using the RoutingWrapper to route API requests to different nodes.
+See: https://github.com/iotaledger/documentation/blob/iota.lib.py/1.2.x/source/includes/_adapters.md#routingwrapper
+"""
+from iota import *
+from iota.adapter.wrappers import RoutingWrapper
+
+api =\
+  Iota(
+    # Send PoW requests to local node.
+    # All other requests go to light wallet node.
+    RoutingWrapper('http://service.iotasupport.com:14265')
+      .add_route('attachToTangle', 'http://localhost:14265'),
+
+    # Seed used for cryptographic functions.
+    seed = b'SEED9GOES9HERE'
+  )
+
+# Example of sending a transfer using the adapter.
+bundle = api.send_transfer(
+  depth = 100,
+  transfers = [
+    ProposedTransaction(
+      # Recipient of the transfer.
+      address =
+        Address(
+          #b'TESTVALUE9DONTUSEINPRODUCTION99999FBFFTG'
+          #b'QFWEHEL9KCAFXBJBXGE9HID9XCOHFIDABHDG9AHDR'
+        ),
+
+      # Amount of IOTA to transfer.
+      # This value may be zero.
+      value = 1,
+
+      # Optional tag to attach to the transfer.
+      tag = Tag(b'ADAPT'),
+
+      # Optional message to include with the transfer.
+      message = TryteString.from_string('Hello!'),
+    ),
+  ],
+)

examples/send_transfer.py

@@ -0,0 +1,44 @@
+# coding=utf-8
+"""
+Example script that shows how to use PyOTA to send a transfer to an address.
+"""
+from iota import *
+
+
+# Create the API instance.
+api =\
+  Iota(
+    # URI of a locally running node.
+    'http://localhost:14265/',
+
+    # Seed used for cryptographic functions.
+    seed = b'SEED9GOES9HERE'
+  )
+
+# For more information, see :py:meth:`Iota.send_transfer`.
+api.send_transfer(
+  depth = 100,
+
+  # One or more :py:class:`ProposedTransaction` objects to add to the
+  # bundle.
+  transfers = [
+    ProposedTransaction(
+      # Recipient of the transfer.
+      address =
+        Address(
+          b'TESTVALUE9DONTUSEINPRODUCTION99999FBFFTG'
+          b'QFWEHEL9KCAFXBJBXGE9HID9XCOHFIDABHDG9AHDR'
+        ),
+
+      # Amount of IOTA to transfer.
+      # This value may be zero.
+      value = 1,
+
+      # Optional tag to attach to the transfer.
+      tag = Tag(b'EXAMPLE'),
+
+      # Optional message to include with the transfer.
+      message = TryteString.from_string('Hello!'),
+    ),
+  ],
+)

iota/api.py

@@ -133,7 +133,7 @@ def default_min_weight_magnitude(self):
     Returns the default ``min_weight_magnitude`` value to use for API
     requests.
     """
-    return 13 if self.testnet else 18
+    return 9 if self.testnet else 14
 
   def add_neighbors(self, uris):
     # type: (Iterable[Text]) -> dict
@@ -879,4 +879,4 @@ def send_trytes(self, trytes, depth, min_weight_magnitude=None):
       trytes              = trytes,
       depth               = depth,
       minWeightMagnitude  = min_weight_magnitude,
-    )
+    )

iota/commands/__init__.py

@@ -4,17 +4,17 @@
 
 from abc import ABCMeta, abstractmethod as abstract_method
 from importlib import import_module
-from inspect import isabstract as is_abstract, isclass as is_class, \
-  getmembers as get_members
+from inspect import getmembers as get_members, isabstract as is_abstract, \
+  isclass as is_class
 from pkgutil import walk_packages
 from types import ModuleType
-from typing import Dict, Mapping, Optional, Text, Union
+from typing import Any, Dict, Mapping, Optional, Text, Union
 
 import filters as f
-from iota.exceptions import with_context
-from six import with_metaclass, string_types
+from six import string_types, with_metaclass
 
 from iota.adapter import BaseAdapter
+from iota.exceptions import with_context
 
 __all__ = [
   'BaseCommand',
@@ -49,10 +49,14 @@ def discover_commands(package, recursively=True):
 
   commands = {}
 
-  for _, name, is_package in walk_packages(package.__path__):
+  for _, name, is_package in walk_packages(package.__path__, package.__name__ + '.'):
     # Loading the module is good enough; the CommandMeta metaclass will
     # ensure that any commands in the module get registered.
-    sub_package = import_module(package.__name__ + '.' + name)
+
+    # Prefix in name module move to function "walk_packages" for fix
+    # conflict with names importing packages
+    # Bug https://github.com/iotaledger/iota.lib.py/issues/63
+    sub_package = import_module(name)
 
     # Index any command classes that we find.
     for (_, obj) in get_members(sub_package):
@@ -99,7 +103,7 @@ def __init__(self, adapter):
     self.response = None # type: dict
 
   def __call__(self, **kwargs):
-    # type: (dict) -> dict
+    # type: (**Any) -> dict
     """
     Sends the command to the node.
     """

iota/commands/extended/get_new_addresses.py

@@ -2,11 +2,11 @@
 from __future__ import absolute_import, division, print_function, \
   unicode_literals
 
-from typing import Optional, List
+from typing import List, Optional
 
 import filters as f
-from iota import Address
 
+from iota import Address
 from iota.commands import FilterCommand, RequestFilter
 from iota.commands.core.find_transactions import FindTransactionsCommand
 from iota.crypto.addresses import AddressGenerator

iota/crypto/addresses.py

@@ -5,7 +5,7 @@
 from typing import Generator, Iterable, List, MutableSequence
 
 from iota import Address, TRITS_PER_TRYTE, TrytesCompatible
-from iota.crypto import Curl
+from iota.crypto.kerl import Kerl
 from iota.crypto.signing import KeyGenerator, KeyIterator
 from iota.crypto.types import Digest, PrivateKey, Seed
 from iota.exceptions import with_context
@@ -157,7 +157,7 @@ def address_from_digest(digest):
     """
     address_trits = [0] * (Address.LEN * TRITS_PER_TRYTE) # type: MutableSequence[int]
 
-    sponge = Curl()
+    sponge = Kerl()
     sponge.absorb(digest.as_trits())
     sponge.squeeze(address_trits)
 

iota/crypto/kerl/__init__.py

@@ -0,0 +1,5 @@
+# coding=utf-8
+from __future__ import absolute_import, division, print_function, \
+  unicode_literals
+
+from .pykerl import *