Add threshold gas value to Wallet and other minor changes

Author: VadimGrznk

sdk/contracts/AccountsWrapper.py

@@ -216,7 +216,6 @@ def authorize_vote_signer(self, signer: str, proof_of_signing_key_possession: Si
             signer, proof_of_signing_key_possession.v, proof_of_signing_key_possession.r, proof_of_signing_key_possession.s)
         return self.__wallet.send_transaction(func_call)
 
-    # TODO need to implement Validators smart contract to try to test this method
     def authorize_validator_signer(self, signer: str, proof_of_signing_key_possession: SignedMessage) -> str:
         """
         Authorizes an address to sign consensus messages on behalf of the account

sdk/contracts/AttestationsWrapper.py

@@ -44,7 +44,6 @@ def __init__(self, web3: Web3, registry: Registry, address: str, abi: list, wall
             'valid': 'Valid'
         }
 
-    # TODO: test this method
     def parse_get_completable_attestations(self, response: list) -> list:
         metadata_urls = attestations_utils.parse_solidity_string_array(
             response[2], response[3])  # TODO: check response[3] data type
@@ -102,10 +101,6 @@ def is_attestation_expired(self, attestation_request_block_number: int) -> bool:
         current_block = self.web3.eth.getBlock().number
         return current_block >= attestation_request_block_number + attestation_expity_block
 
-    def wait_for_selecting_issuers(self):
-        # TODO: think whether we need to implement it such as it will not work the same as in JS
-        pass
-
     def get_attestation_issuers(self, identifier: str, account: str) -> list:
         """
         Returns the issuers of attestations for a phoneNumber/account combo

sdk/contracts/GovernanceWrapper.py

@@ -532,21 +532,21 @@ def sorted_queue(self, queue: List[dict]) -> List[dict]:
     def _with_upvote_revoked(self, upvoter: str, queue_p: List[dict] = []) -> dict:
         upvoter_record = self.get_upvote_record(upvoter)
         index, queue = self._get_queue_index(
-            upvoter_record['proposal_id'], queue_p)
+            upvoter_record['proposal_id'], queue_p).values()
         queue[index]['upvotes'] = queue[index]['upvotes'] - \
             upvoter_record['upvotes']
 
         return {'queue': self.sorted_queue(queue), 'upvote_record': upvoter_record}
 
     def _with_upvote_applied(self, upvoter: str, proposal_id: int, queue_p: List[dict] = []) -> list:
-        index, queue = self._get_queue_index(proposal_id, queue_p)
+        index, queue = self._get_queue_index(proposal_id, queue_p).values()
         weight = self.get_vote_weight(upvoter)
         queue[index]['upvotes'] = queue[index]['upvotes'] + weight
 
         return self.sorted_queue(queue)
 
     def _lesser_and_greater_after_revoke(self, upvoter: str) -> dict:
-        queue, upvote_record = self._with_upvote_revoked(upvoter)
+        queue, upvote_record = self._with_upvote_revoked(upvoter).values()
 
         return self._lesser_and_greater(upvote_record['proposal_id'], queue)
 

sdk/contracts/base_wrapper.py

@@ -69,7 +69,6 @@ def create_contract_by_name(self, contract_name: str):
         contract_obj = self.contracts.get(contract_name)
         if contract_obj:
             return
-            # raise Exception("Such a contract already created")
         contract_data = self.registry.load_contract_by_name(contract_name)
 
         self.create_contract(

sdk/wallet.py

@@ -35,6 +35,7 @@ def __init__(self, web3: Web3, priv_key: bytes, gas_price_contract: "GasPriceCon
         self._gas_price = None
         self._gas = 10000000
         self.gas_increase_step = 1000000
+        self._threshold_gas_value = 100000000
 
     @property
     def fee_currency(self) -> str:
@@ -55,6 +56,10 @@ def gas_price(self) -> int:
     @property
     def gas(self) -> int:
         return self._gas
+    
+    @property
+    def threshold_gas_value(self) -> int:
+        return self._threshold_gas_value
 
     @property
     def accounts(self) -> dict:
@@ -93,6 +98,12 @@ def gas(self, new_gas: int):
         if type(new_gas) != int:
             raise TypeError("Incorrect new gas type data")
         self._gas = new_gas
+    
+    @threshold_gas_value.setter
+    def threshold_gas_value(self, new_threshold_gas_value: int):
+        if type(new_threshold_gas_value) != int:
+            raise TypeError("Incorrect new threshold gas value type data")
+        self._threshold_gas_value = new_threshold_gas_value
 
     @accounts.setter
     def accounts(self, new_acc: Account):
@@ -208,9 +219,9 @@ def send_transaction(self, contract_method: web3._utils.datatypes, parameters: d
         except ValueError as e:
             error_message = ast.literal_eval(str(e))['message']
             if error_message == 'intrinsic gas too low':
-                print(
-                    "Got error about too low gas value. Increase gas value and try to send it again.")
                 gas = gas + self.gas_increase_step if gas else self._gas + self.gas_increase_step
+                if gas > self.threshold_gas_value:
+                    raise Exception(f"Transaction requires a lot of gas use({gas}), if you want to send transaction set higher gas value and increase threshold gas value")
                 self.send_transaction(contract_method, parameters={'gas': gas})
             else:
                 raise ValueError(error_message)
@@ -229,7 +240,7 @@ def push_tx_to_blockchain(self, signed_raw_tx: HexBytes) -> str:
             hash of sent transaction
         """
         tx_hash = self.web3.eth.sendRawTransaction(signed_raw_tx)
-        return tx_hash.hex()
+        return tx_hash
 
     def get_network_gas_price(self) -> int:
         """