Merge pull request #44 from ltonetwork/Renaming-main-class-and-few-minor

Renaming main class and few minors

Author: AndreaScorza

src/lto/__init__.py

@@ -17,7 +17,7 @@
 from lto.accounts.account_factory_ed25519 import AccountFactoryED25519
 
 
-class PyCLTO:
+class LTO:
 
     def __init__(self, chain_id='T'):
 

src/lto/public_node.py

@@ -35,10 +35,10 @@ def wrapper(self, api, post_data='', host='', headers=None):
         return r.json()
 
     def broadcast(self, transaction):
-        from lto import PyCLTO
+        from lto import LTO
         data = json.dumps(transaction.to_json())
         response = self.wrapper(api='/transactions/broadcast', post_data=data)
-        return PyCLTO().from_data(response)
+        return LTO().from_data(response)
 
     def compile(self, script_source):
         return self.wrapper(api='/utils/script/compile', post_data=script_source)['script']
@@ -53,9 +53,9 @@ def block(self, n):
         return self.wrapper('/blocks/at/%d' % n)
 
     def tx(self, id):
-        from lto import PyCLTO
+        from lto import LTO
         response = self.wrapper('/transactions/info/%s' % id)
-        return PyCLTO().from_data(response)
+        return LTO().from_data(response)
 
     def lease_list(self, address):
         return self.wrapper(api='/leasing/active/{}'.format(address))

src/lto/transaction.py

@@ -44,7 +44,8 @@ def sponsor_with(self, sponsor_account):
             raise Exception('Transaction must be signed first')
 
         self.sponsor = sponsor_account.address
-        self.sponsor_public_key = sponsor_account.public_key
+        self.sponsor_public_key = base58.b58encode(sponsor_account.public_key.__bytes__())
+        self.sponsor_key_type = sponsor_account.key_type
         self.proofs.append(sponsor_account.sign(self.to_binary()))
 
     def broadcast_to(self, node: PublicNode):
@@ -57,7 +58,7 @@ def to_json(self):
     def _sponsor_json(self):
         if self.sponsor:
             return {"sponsor": self.sponsor,
-                    "sponsorPublicKey": base58.b58encode(self.sponsor_public_key.__bytes__()),
+                    "sponsorPublicKey": self.sponsor_public_key,
                     "sponsorKeyType": self.sponsor_key_type}
         else:
             return{}

src/lto/transactions/anchor.py

@@ -77,4 +77,10 @@ def from_data(data):
         tx.anchors = data['anchors']
         tx.proofs = data['proofs'] if 'proofs' in data else []
         tx.height = data['height'] if 'height' in data else ''
+
+        if "sponsor_public_key" in data:
+            tx.sponsor = data['sponsor']
+            tx.sponsor_public_key = data['sponsorPublicKey']
+            tx.sponsor_key_type = data['sponsorKeyType']
+
         return tx

src/lto/transactions/association.py

@@ -112,5 +112,11 @@ def from_data(data):
         tx.proofs = data['proofs'] if 'proofs' in data else []
         tx.height = data['height'] if 'height' in data else ''
 
+        if "sponsor_public_key" in data:
+            tx.sponsor = data['sponsor']
+            tx.sponsor_public_key = data['sponsorPublicKey']
+            tx.sponsor_key_type = data['sponsorKeyType']
+
+
         return tx
 

src/lto/transactions/cancel_lease.py

@@ -6,7 +6,7 @@
 
 class CancelLease(Transaction):
     TYPE = 9
-    DEFAULT_FEE = 500000000
+    DEFAULT_FEE = 100000000
     DEFAULT_VERSION = 3
 
 
@@ -73,6 +73,12 @@ def from_data(data):
         tx.proofs = data['proofs'] if 'proofs' in data else []
         tx.lease_id = data['leaseId'] if 'leaseId' in data else ''
         tx.height = data['height'] if 'height' in data else ''
+
+        if "sponsor_public_key" in data:
+            tx.sponsor = data['sponsor']
+            tx.sponsor_public_key = data['sponsorPublicKey']
+            tx.sponsor_key_type = data['sponsorKeyType']
+
         return tx
 
 

src/lto/transactions/cancel_sponsorship.py

@@ -71,5 +71,11 @@ def from_data(data):
         tx.proofs = data['proofs']
         tx.recipient = data['recipient']
         tx.height = data['height'] if 'height' in data else ''
+
+        if "sponsor_public_key" in data:
+            tx.sponsor = data['sponsor']
+            tx.sponsor_public_key = data['sponsorPublicKey']
+            tx.sponsor_key_type = data['sponsorKeyType']
+
         return tx
 

src/lto/transactions/lease.py

@@ -70,6 +70,7 @@ def from_data(data):
         tx.id = data['id'] if 'id' in data else ''
         tx.type = data['type']
         tx.version = data['version']
+        tx.amount = data['amount']
         tx.sender = data['sender'] if 'sender' in data else ''
         tx.sender_key_type = data['senderKeyType'] if 'senderKeyType' in data else 'ed25519'
         tx.sender_public_key = data['senderPublicKey']
@@ -78,6 +79,12 @@ def from_data(data):
         tx.recipient = data['recipient']
         tx.proofs = data['proofs'] if 'proofs' in data else []
         tx.height = data['height'] if 'height' in data else ''
+
+        if "sponsor_public_key" in data:
+            tx.sponsor = data['sponsor']
+            tx.sponsor_public_key = data['sponsorPublicKey']
+            tx.sponsor_key_type = data['sponsorKeyType']
+
         return tx
 
 

src/lto/transactions/mass_transfer.py

@@ -92,5 +92,11 @@ def from_data(data):
         tx.attachment = data['attachment'] if 'attachment' in data else ''
         tx.transfers = data['transfers']
         tx.height = data['height'] if 'height' in data else ''
+
+        if "sponsor_public_key" in data:
+            tx.sponsor = data['sponsor']
+            tx.sponsor_public_key = data['sponsorPublicKey']
+            tx.sponsor_key_type = data['sponsorKeyType']
+
         return tx
 

src/lto/transactions/revoke_association.py

@@ -95,4 +95,10 @@ def from_data(data):
         tx.fee = data['fee']
         tx.proofs = data['proofs'] if 'proofs' in data else []
         tx.height = data['height'] if 'height' in data else ''
+
+        if "sponsor_public_key" in data:
+            tx.sponsor = data['sponsor']
+            tx.sponsor_public_key = data['sponsorPublicKey']
+            tx.sponsor_key_type = data['sponsorKeyType']
+
         return tx

src/lto/transactions/set_script.py

@@ -81,4 +81,10 @@ def from_data(data):
         tx.proofs = data['proofs']
         tx.script = data['script']
         tx.height = data['height'] if 'height' in data else ''
+
+        if "sponsor_public_key" in data:
+            tx.sponsor = data['sponsor']
+            tx.sponsor_public_key = data['sponsorPublicKey']
+            tx.sponsor_key_type = data['sponsorKeyType']
+
         return tx

src/lto/transactions/sponsorship.py

@@ -71,4 +71,10 @@ def from_data(data):
         tx.fee = data['fee']
         tx.proofs = data['proofs']
         tx.height = data['height'] if 'height' in data else ''
+
+        if "sponsor_public_key" in data:
+            tx.sponsor = data['sponsor']
+            tx.sponsor_public_key = data['sponsorPublicKey']
+            tx.sponsor_key_type = data['sponsorKeyType']
+
         return tx

src/lto/transactions/transfer.py

@@ -86,8 +86,9 @@ def from_data(data):
         tx.proofs = data['proofs'] if 'proofs' in data else []
         tx.height = data['height'] if 'height' in data else ''
 
-        if 'sponsorPublicKey' in data:
+        if "sponsor_public_key" in data:
             tx.sponsor = data['sponsor']
             tx.sponsor_public_key = data['sponsorPublicKey']
+            tx.sponsor_key_type = data['sponsorKeyType']
 
         return tx

tests/init_test.py

@@ -1,5 +1,5 @@
 from unittest import mock
-from lto import PyCLTO
+from lto import LTO
 from lto.public_node import PublicNode
 from lto.accounts.ed25519.account_ed25519 import AccountED25519 as Account
 
@@ -20,21 +20,21 @@
 class TestInit():
 
     def testconstruct(self):
-        pyclto = PyCLTO()
+        pyclto = LTO()
         assert pyclto.NODE.url == PublicNode('https://testnet.lto.network').url
         assert pyclto.chain_id == 'T'
-        pyclto = PyCLTO('L')
+        pyclto = LTO('L')
         assert pyclto.NODE.url == PublicNode('https://nodes.lto.network').url
         assert pyclto.chain_id == 'L'
-        pyclto = PyCLTO('A')
+        pyclto = LTO('A')
         assert pyclto.NODE == ''
 
     def test_get_chain_id(self):
-        pyclto = PyCLTO()
+        pyclto = LTO()
         assert pyclto.getchain_id() == 'T'
 
     def test_account(self):
-        pyclto = PyCLTO()
+        pyclto = LTO()
         private_key = '4sEbCdhpYrZuYGsGSNCR9mJrZgLY6kTdFMGDZnK3oQtSCjyvMz3K6ZMo1GfGmbqHK95Pwx6WTi7vMLpFGbsgbfqz'
         seed = 'fragile because fox snap picnic mean art observe vicious program chicken purse text hidden chest'
         expectedAccount = Account(seed=seed, public_key='G3PaJt9cUvM5dVW8XAZnKrqmQj1xbSQ4yM7gWuknEKjn',
@@ -46,7 +46,7 @@ def test_account(self):
         assert pyclto.Account()
 
     def test_from_data(self):
-        pyclto = PyCLTO()
+        pyclto = LTO()
         data = ({
             "type": 4,
             "recipient": '3N6MFpSbbzTozDcfkTUT5zZ2sNbJKFyRtRj',

tests/transaction_test.py

@@ -21,12 +21,12 @@ def test_sponsor_with(self):
 
         transaction.sponsor_with(self.account2)
         assert transaction.sponsor == self.account2.address
-        assert transaction.sponsor_public_key == self.account2.public_key
+        assert transaction.sponsor_public_key == base58.b58encode(self.account2.public_key.__bytes__())
         assert transaction.sponsor_key_type == 'ed25519'
 
         assert self.account2.verify_signature(transaction.to_binary(), transaction.proofs[1])
 
         json = transaction.to_json()
         assert json['sponsor'] == self.account2.address
         assert json['sponsorPublicKey'] == base58.b58encode(self.account2.public_key.__bytes__())
-        assert json['sponsorKeyType'] == 'ed25519'
+        assert json['sponsorKeyType'] == self.account2.key_type

tests/transactions/cancel_lease_test.py

@@ -14,7 +14,7 @@ class TestCancelLease:
     def test_construct(self):
         transaction = CancelLease('B22YzYdNv7DCqMqdK2ckpt53gQuYq2v997N7g8agZoHo')
         assert transaction.lease_id == 'B22YzYdNv7DCqMqdK2ckpt53gQuYq2v997N7g8agZoHo'
-        assert transaction.tx_fee == 500000000
+        assert transaction.tx_fee == 100000000
 
 
     @freeze_time("2021-01-14")
@@ -30,10 +30,10 @@ def test_sign_with(self):
         assert self.account.verify_signature(transaction.to_binary(), transaction.proofs[0])
 
 
-    expected_v2 = {'fee': 500000000,
+    expected_v2 = {'fee': 100000000,
                 'senderKeyType': 'ed25519',
                 'leaseId': 'B22YzYdNv7DCqMqdK2ckpt53gQuYq2v997N7g8agZoHo',
-                'proofs': ['4bvuZhr215hhxyBmyvbSoMMb2QHULuy36Zdsx2zY2dQqzowHYVq3S6g21J8TzHN5cdxVyChTMx3HMssyaWKAwNYF'],
+                'proofs': ['r293ec6yhFaVxqg72y1HVqS1UspqMvS97HzontVfrV2T4i6VdhqTe9MxJhutanvAYXUu8fXv4AEx9vgC4BPht47'],
                 'sender': '3MtHYnCkd3oFZr21yb2vEdngcSGXvuNNCq2',
                 'senderPublicKey': '4EcSxUkMxqxBEBUBL2oKz3ARVsbyRJTivWpNrYQGdguz',
                 'timestamp': 1326499200000,
@@ -46,9 +46,9 @@ def test_sign_with(self):
             "sender": '3MtHYnCkd3oFZr21yb2vEdngcSGXvuNNCq2',
             "senderKeyType": "ed25519",
             "senderPublicKey": '4EcSxUkMxqxBEBUBL2oKz3ARVsbyRJTivWpNrYQGdguz',
-            "fee": 500000000,
+            "fee": 100000000,
             "timestamp": 1326499200000,
-            "proofs": ['3mR62iT9JBuyDBic678DWaSW5wZ8mZv7dRDTc7LKdA4pu6rJAzFbAUDu3Mi7RjUirwvtryAErSwE37EatJZ1kUbP'],
+            "proofs": ['2oRKZ1wTUHzhwxfQCseUNCREiKh9aG46KChQJDPHievdbmMTfJpyGaayD3eXQK89odDwCShDyiD1Dp5SUWZJuPEB'],
             "leaseId": "B22YzYdNv7DCqMqdK2ckpt53gQuYq2v997N7g8agZoHo"
         }
 
@@ -81,7 +81,7 @@ def test_from_data(self):
             "senderKeyType": 'ed25519',
             "senderPublicKey": "4EcSxUkMxqxBEBUBL2oKz3ARVsbyRJTivWpNrYQGdguz",
             "timestamp": 1519862400,
-            "fee": 500000000,
+            "fee": 100000000,
             "leaseId": "B22YzYdNv7DCqMqdK2ckpt53gQuYq2v997N7g8agZoHo",
             "proofs": [
                 "2AKUBja93hF8AC2ee21m9AtedomXZNQG5J3FZMU85avjKF9B8CL45RWyXkXEeYb13r1AhpSzRvcudye39xggtDHv"

tests/transactions/lease_test.py

@@ -82,6 +82,7 @@ def test_from_data(self):
             "type" : 8,
             "version": 3,
             "sender" : "3HgqG68qfeVz5dqbyvqnxQceFaH49xmGvUS",
+            "amount" : 1,
             "senderKeyType": 'ed25519',
             "senderPublicKey" : "DddGQs63eWAA1G1ZJnJDVSrCpMS97NH4odnggwUV42kE",
             "fee" : 500000000,