Merge branch 'release/1.4.0'

.changes/1.4.0.json

@@ -0,0 +1,6 @@
+[
+  {
+    "description": "Add Hash160",
+    "type": "minor"
+  }
+]

AUTHORS

@@ -1,5 +1,5 @@
-   777	Fabian Schuh <[email protected]>
-   164	Fabian Schuh <[email protected]>
+   782	Fabian Schuh <[email protected]>
+   167	Fabian Schuh <[email protected]>
    104	Vladimir Kamarzin <[email protected]>
    100	Fabian Schuh <[email protected]>
     60	pyup-bot <[email protected]>
@@ -13,6 +13,7 @@
      3	Boombastic <[email protected]>
      3	Holger Nahrstaedt <[email protected]>
      3	abitmore <[email protected]>
+     2	Christopher Sanborn <[email protected]>
      2	Nicolas Wack <[email protected]>
      2	Scott Howard <[email protected]>
      2	alt <[email protected]>

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 Note: version releases in the 0.x.y range may introduce breaking changes.
 
+## 1.4.0
+
+- minor: Add Hash160
+
 ## 1.3.4
 
 - patch: Fix an issue with vesting balances raising exceptions

graphenebase/types.py

@@ -41,9 +41,19 @@ def variable_buffer(s):
 
 
 def JsonObj(data):
-    """ Returns json object from data
+    """ Return json object from data
+
+    If data has a __json__() method, use that, else assume it follows the
+    convention that its string representation is interprettable as valid json.
+    (The latter can be problematic if str(data) returns, e.g., "1234". Was
+    this supposed to be the string "1234" or the number 1234? If this
+    ambiguity exists, the data type must implement __json__().)
+
     """
-    return json.loads(str(data))
+    try:
+        return data.__json__()
+    except Exception:
+        return json.loads(str(data))
 
 
 class Uint8:
@@ -139,13 +149,30 @@ def __str__(self):
 
 
 class Bytes:
+    """Bytes
+
+    Initializes from and stores internally as a string of hex digits.
+    Byte-serializes as a length-prefixed series of bytes represented
+    by those hex digits.
+
+    Ex: len(str(Bytes("deadbeef")) == 8   # Eight hex chars
+        len(bytes(Bytes("deadbeef")) == 5 # Four data bytes plus varint length
+
+    Implements __json__() method to disambiguate between string and numeric in
+    event where hex digits include only numeric digits and no alpha digits.
+
+    """
+
     def __init__(self, d):
         self.data = d
 
     def __bytes__(self):
         d = unhexlify(bytes(self.data, "utf-8"))
         return varint(len(d)) + d
 
+    def __json__(self):
+        return str(self.data)
+
     def __str__(self):
         return str(self.data)
 
@@ -176,6 +203,12 @@ def __init__(self, a):
         super().__init__(a)
 
 
+class Hash160(Hash):
+    def __init__(self, a):
+        assert len(a) == 40, "Require 40 char long hex"
+        super().__init__(a)
+
+
 class Void:
     def __init__(self):
         pass

setup.py

@@ -3,7 +3,7 @@
 
 from setuptools import setup
 
-__version__ = "1.3.4"
+__version__ = "1.4.0"
 URL = "https://github.com/xeroc/python-graphenelib"
 
 setup(