update

Author: serderovsh

tronapi/main.py

@@ -4,7 +4,17 @@
 # Licensed under the MIT License.
 # See License.txt in the project root for license information.
 # --------------------------------------------------------------------
-from typing import Union, Any
+
+"""
+    tronapi.main
+    ===============
+
+    Connect to the Tron network.
+
+    :copyright: © 2018 by the iEXBase.
+    :license: MIT License
+"""
+
 
 import ecdsa
 from eth_utils import apply_to_return_value, to_hex
@@ -58,10 +68,8 @@ def __init__(self, **kwargs):
         """Connect to the Tron network.
 
         Args:
-            full_node (Any): A provider connected to a valid full node
-            solidity_node (Any): A provider connected to a valid solidity node
-            event_server (Any): Optional for smart contract events. Expects a valid event server URL
-            private_key (str): Optional default private key used when signing transactions
+            kwargs (Any): We fill the most necessary parameters
+            for working with blockchain Tron
 
         """
 
@@ -85,14 +93,18 @@ def __init__(self, **kwargs):
         if 'private_key' in kwargs:
             self.private_key = kwargs.get('private_key')
 
+        # We check whether the default wallet address is set when
+        # defining the class, and then written to the variable
+        if 'default_address' in kwargs:
+            self.default_address = kwargs.get('default_address')
+
         # If custom methods are not declared,
         # we take the default from the list
         modules = kwargs.setdefault('modules', DEFAULT_MODULES)
-
         for module_name, module_class in modules.items():
             module_class.attach(self, module_name)
 
-        self.transaction = TransactionBuilder(self)
+        self.transaction_builder = TransactionBuilder(self)
 
     @property
     def default_block(self):

tronapi/trx.py

@@ -4,6 +4,16 @@
 # See License.txt in the project root for license information.
 # --------------------------------------------------------------------
 
+"""
+    tronapi.trx
+    ===============
+
+    Work with basic methods
+
+    :copyright: © 2018 by the iEXBase.
+    :license: MIT License
+"""
+
 import math
 from typing import Any
 
@@ -321,7 +331,11 @@ def send_transaction(self, to, amount, options=None):
         if 'from' not in options:
             options = assoc(options, 'from', self.tron.default_address.hex)
 
-        tx = self.tron.transaction.send_transaction(to, amount, options['from'])
+        tx = self.tron.transaction_builder.send_transaction(
+            to,
+            amount,
+            options['from']
+        )
         # If a comment is attached to the transaction,
         # in this case adding to the object
         if 'message' in options:
@@ -348,7 +362,12 @@ def send_token(self, to, amount, token_id=None, account=None):
         if account is None:
             account = self.tron.default_address.hex
 
-        tx = self.tron.transaction.send_token(to, amount, token_id, account)
+        tx = self.tron.transaction_builder.send_token(
+            to,
+            amount,
+            token_id,
+            account
+        )
         sign = self.sign(tx)
         result = self.broadcast(sign)
 
@@ -371,7 +390,12 @@ def freeze_balance(self, amount=0, duration=3, resource='BANDWIDTH', account=Non
         if account is None:
             account = self.tron.default_address.hex
 
-        transaction = self.tron.transaction.freeze_balance(amount, duration, resource, account)
+        transaction = self.tron.transaction_builder.freeze_balance(
+            amount,
+            duration,
+            resource,
+            account
+        )
         sign = self.sign(transaction)
         response = self.broadcast(sign)
 
@@ -391,7 +415,10 @@ def unfreeze_balance(self, resource='BANDWIDTH', account=None):
         if account is None:
             account = self.tron.default_address.hex
 
-        transaction = self.tron.transaction.unfreeze_balance(resource, account)
+        transaction = self.tron.transaction_builder.unfreeze_balance(
+            resource,
+            account
+        )
         sign = self.sign(transaction)
         response = self.broadcast(sign)
 
@@ -499,7 +526,10 @@ def update_account(self, account_name, address=None):
         if address is None:
             address = self.tron.default_address.hex
 
-        transaction = self.tron.transaction.update_account(account_name, address)
+        transaction = self.tron.transaction_builder.update_account(
+            account_name,
+            address
+        )
         sign = self.sign(transaction)
         response = self.broadcast(sign)
 
@@ -518,7 +548,10 @@ def apply_for_sr(self, url, address):
         if address is None:
             address = self.tron.default_address.hex
 
-        transaction = self.tron.transaction.apply_for_sr(url, address)
+        transaction = self.tron.transaction_builder.apply_for_sr(
+            url,
+            address
+        )
         sign = self.sign(transaction)
         response = self.broadcast(sign)
 
@@ -755,7 +788,11 @@ def vote_proposal(self, proposal_id, has_approval, voter_address):
         if voter_address is None:
             voter_address = self.tron.default_address.hex
 
-        transaction = self.tron.transaction.vote_proposal(proposal_id, has_approval, voter_address)
+        transaction = self.tron.transaction_builder.vote_proposal(
+            proposal_id,
+            has_approval,
+            voter_address
+        )
         sign = self.sign(transaction)
         response = self.broadcast(sign)
 
@@ -775,7 +812,10 @@ def proposal_delete(self, proposal_id: int, issuer_address: str):
         if issuer_address is None:
             issuer_address = self.tron.default_address.hex
 
-        transaction = self.tron.transaction.delete_proposal(proposal_id, issuer_address)
+        transaction = self.tron.transaction_builder.delete_proposal(
+            proposal_id,
+            issuer_address
+        )
         sign = self.sign(transaction)
         response = self.broadcast(sign)