Up library patch version >> 0.1.49: update CommitteeMemberUpdateGloba…

…lParameters operation and relations Up library patch version >> 0.1.49: update CommitteeMemberUpdateGlobalParameters operation and relations
echoprotocol · Nov 26, 2019 · a1cd4c8 · a1cd4c8
1 parent fb009b6
commit a1cd4c8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 21 deletions.
diff --git a/echopy/echobase/feetypes.py b/echopy/echobase/feetypes.py
@@ -128,7 +128,7 @@ def __init__(self, *args, **kwargs):
             operations["vesting_balance_withdraw"]: DefaultFee,
             operations["balance_claim"]: NoFee,
             operations["balance_freeze"]: DefaultFee,
-            operations["balance_unfreeze"]: DefaultFee,
+            operations["balance_unfreeze"]: NoFee,
             operations["contract_create"]: DefaultFee,
             operations["contract_call"]: DefaultFee,
             operations["contract_internal_create"]: NoFee,

diff --git a/echopy/echobase/objects.py b/echopy/echobase/objects.py
@@ -434,7 +434,7 @@ def __init__(self, *args, **kwargs):
                         ("_time_net_256b", Uint32(kwargs["_time_net_256b"])),
                         ("_creator_count", Uint32(kwargs["_creator_count"])),
                         ("_verifier_count", Uint32(kwargs["_verifier_count"])),
-                        ("_ok_treshold", Uint32(kwargs["_ok_treshold"])),
+                        ("_ok_threshold", Uint32(kwargs["_ok_threshold"])),
                         ("_max_bba_steps", Uint32(kwargs["_max_bba_steps"])),
                         ("_gc1_delay", Uint32(kwargs["_gc1_delay"])),
                         ("_round_attempts", Uint32(kwargs["_round_attempts"])),
@@ -443,22 +443,6 @@ def __init__(self, *args, **kwargs):
             )
 
 
-class Fines(EchoObject):
-    def __init__(self, *args, **kwargs):
-        if isArgsThisClass(self, args):
-            self.data = args[0].data
-        else:
-            if len(args) == 1 and len(kwargs) == 0:
-                kwargs = args[0]
-            super().__init__(
-                OrderedDict(
-                    [
-                        ("_eth_addr", Int64(kwargs["_eth_addr"]))
-                    ]
-                )
-            )
-
-
 class EthAddress(EchoObject):
     def __init__(self, *args, **kwargs):
         if isArgsThisClass(self, args):
@@ -500,7 +484,7 @@ def __init__(self, *args, **kwargs):
                         ("erc20_withdraw_topic", Bytes(kwargs["erc20_withdraw_topic"], 32)),
                         ("ETH_asset_id", ObjectId(kwargs["ETH_asset_id"], "asset")),
                         ("BTC_asset_id", ObjectId(kwargs["BTC_asset_id"], "asset")),
-                        ("fines", Fines(kwargs["fines"])),
+                        ("fines", EthAddress(kwargs["fines"])),
                         ("gas_price", Uint64(kwargs["gas_price"])),
                         ("satoshis_per_byte", Uint32(kwargs["satoshis_per_byte"])),
                         ("coefficient_waiting_blocks", Uint32(kwargs["coefficient_waiting_blocks"]))

diff --git a/echopy/echobase/types.py b/echopy/echobase/types.py
@@ -222,7 +222,9 @@ def __str__(self):
 class Set(Array):
     def __init__(self, d):
         super().__init__(d)
-        self.data = sorted(self.data)
+
+    def __bytes__(self):
+        return bytes(self.length) + b"".join(sorted([bytes(a) for a in self.data]))
 
 
 class FixedArray:

diff --git a/setup.py b/setup.py
@@ -3,7 +3,7 @@
 
 from setuptools import setup, find_packages
 
-VERSION = "0.1.48"
+VERSION = "0.1.49"
 packages = find_packages()
 packages.remove('test')