Minor changes in methods parameters

Author: VadimGrznk

sdk/contracts/AccountsWrapper.py

@@ -33,15 +33,15 @@ def __init__(self, web3: Web3, registry: Registry, address: str, abi: list, wall
         self._contract = self.web3.eth.contract(self.address, abi=abi)
         self.__wallet = wallet
 
-    def create_account(self) -> str:
+    def create_account(self, parameters: dict = None) -> str:
         """
         Creates an account
 
         Returns:
             Transaction hash
         """
         func_call = self._contract.functions.createAccount()
-        return self.__wallet.send_transaction(func_call)
+        return self.__wallet.send_transaction(func_call, parameters=parameters)
 
     def get_attestation_signer(self, account: str) -> str:
         """
@@ -137,7 +137,7 @@ def is_account(self, account: str) -> bool:
         Returns:
             Returns `true` if account exists. Returns `false` otherwise
         """
-        return self._contract.functions.isAccount().call()
+        return self._contract.functions.isAccount(account).call()
 
     def is_signer(self, address: str) -> bool:
         """

sdk/contracts/GovernanceWrapper.py

@@ -336,11 +336,11 @@ def withdraw(self) -> str:
 
         return self.__wallet.send_transaction(func_call)
 
-    def propose(self, values: List[int], destinations: List[str], data: bytes, data_lengths: List[int], description_url: str) -> int:
+    def propose(self, values: List[int], destinations: List[str], data: bytes, data_lengths: List[int], description_url: str, parameters: dict = None) -> int:
         func_call = self._contract.functions.propose(
             values, destinations, data, data_lengths, description_url)
 
-        return self.__wallet.send_transaction(func_call)
+        return self.__wallet.send_transaction(func_call, parameters)
 
     def proposal_exists(self, proposal_id: int) -> bool:
         """
@@ -559,7 +559,7 @@ def _lesser_and_greater_after_upvote(self, upvoter: str, proposal_id: int) -> di
 
         return self._lesser_and_greater(proposal_id, upvote_queue)
 
-    def upvote(self, proposal_id: int, upvoter: str) -> str:
+    def upvote(self, proposal_id: int, upvoter: str, parameters: dict = None) -> str:
         """
         Applies provided upvoter's upvote to given proposal
 
@@ -578,9 +578,9 @@ def upvote(self, proposal_id: int, upvoter: str) -> str:
         func_call = self._contract.functions.upvote(
             proposal_id, lesser_id, greater_id)
 
-        return self.__wallet.send_transaction(func_call)
+        return self.__wallet.send_transaction(func_call, parameters)
 
-    def revoke_upvote(self, upvoter: str) -> str:
+    def revoke_upvote(self, upvoter: str, parameters: dict = None) -> str:
         """
         Revokes provided upvoter's upvote
 
@@ -593,7 +593,7 @@ def revoke_upvote(self, upvoter: str) -> str:
         func_call = self._contract.functions.revokeUpvote(
             lesser_id, greater_id)
 
-        return self.__wallet.send_transaction(func_call)
+        return self.__wallet.send_transaction(func_call, parameters)
 
     def approve(self, proposal_id: int) -> str:
         """
@@ -613,7 +613,7 @@ def approve(self, proposal_id: int) -> str:
 
         return self.__wallet.send_transaction(func_call)
 
-    def vote(self, proposal_id: int, vote: str) -> str:
+    def vote(self, proposal_id: int, vote: str, parameters: dict = None) -> str:
         """
         Applies `sender`'s vote choice to a given proposal
 
@@ -632,7 +632,7 @@ def vote(self, proposal_id: int, vote: str) -> str:
         func_call = self._contract.functions.vote(
             proposal_id, proposal_index, vote_num)
 
-        return self.__wallet.send_transaction(func_call)
+        return self.__wallet.send_transaction(func_call, parameters)
 
     def get_vote_value(self, proposal_id: int, voter: str) -> str:
         """

sdk/contracts/LockedGoldWrapper.py

@@ -49,7 +49,7 @@ def withdraw(self, index: int) -> str:
 
         return self.__wallet.send_transaction(func_call)
 
-    def lock(self, value: int) -> str:
+    def lock(self, parameters: dict = None) -> str:
         """
         Locks gold to be used for voting
 
@@ -63,7 +63,7 @@ def lock(self, value: int) -> str:
         """
         func_call = self._contract.functions.lock()
 
-        return self.__wallet.send_transaction(func_call, parameters={'value': value})
+        return self.__wallet.send_transaction(func_call, parameters=parameters)
 
     def unlock(self, value: int) -> str:
         """

sdk/contracts/MultiSigWrapper.py

@@ -33,7 +33,7 @@ def __init__(self, web3: Web3, registry: Registry, address: str, abi: list, wall
         self._contract = self.web3.eth.contract(self.address, abi=abi)
         self.__wallet = wallet
 
-    def submit_or_confirm_transaction(self, destination: str, tx_data: str, value: str = '0') -> str:
+    def submit_or_confirm_transaction(self, destination: str, tx_data: str, value: str = '0', parameters: dict = None) -> str:
         """
         Allows an owner to submit and confirm a transaction.
         If an unexecuted transaction matching `tx_object` exists on the multisig, adds a confirmation to that tx ID.
@@ -59,12 +59,12 @@ def submit_or_confirm_transaction(self, destination: str, tx_data: str, value: s
             if transaction[2] == data and transaction[0] == destination and transaction[1] == value and not transaction[3]:
                 func_call = self._contract.functions.confirmTransaction(
                     tx_id + 1)
-                return self.__wallet.send_transaction(func_call)
+                return self.__wallet.send_transaction(func_call, parameters)
 
         func_call = self._contract.functions.submitTransaction(
             destination, value, tx_data)
 
-        return self.__wallet.send_transaction(func_call)
+        return self.__wallet.send_transaction(func_call, parameters)
 
     def is_owner(self, owner: str) -> bool:
         return self._contract.functions.isOwner(owner).call()

sdk/contracts/SortedOraclesWrapper.py

@@ -125,7 +125,7 @@ def is_oldest_report_expired(self, token: str) -> List[bool, str]:
 
         return self._contract.functions.isOldestReportExpired(token_address).call()
 
-    def remove_expired_reports(self, token: str, num_reports: int = None) -> str:
+    def remove_expired_reports(self, token: str, num_reports: int = None, parameteres: dict = None) -> str:
         """
         Removes expired reports, if any exist
 
@@ -148,7 +148,7 @@ def remove_expired_reports(self, token: str, num_reports: int = None) -> str:
 
         func_call = self._contract.functions.removeExpiredReports(token_address, num_reports)
 
-        return self.__wallet.send_transaction(func_call)
+        return self.__wallet.send_transaction(func_call, parameteres)
 
     def report(self, token: str, value: int, oracle_address: str) -> str:
         """

sdk/contracts/ValidatorsWrapper.py

@@ -32,7 +32,7 @@ def __init__(self, web3: Web3, registry: Registry, address: str, abi: list, wall
         self._contract = self.web3.eth.contract(self.address, abi=abi)
         self.__wallet = wallet
 
-    def set_next_commission_update(self, commission: int) -> str:
+    def set_next_commission_update(self, commission: int, parameters: dict = None) -> str:
         """
         Queues an update to a validator group's commission
 
@@ -47,9 +47,9 @@ def set_next_commission_update(self, commission: int) -> str:
         func_call = self._contract.functions.setNextCommissionUpdate(
             commission)
 
-        return self.__wallet.send_transaction(func_call)
+        return self.__wallet.send_transaction(func_call, parameters)
 
-    def update_commission(self) -> str:
+    def update_commission(self, parameters: dict = None) -> str:
         """
         Updates a validator group's commission based on the previously queued update
 
@@ -59,7 +59,7 @@ def update_commission(self) -> str:
         """
         func_call = self._contract.functions.updateCommission()
 
-        return self.__wallet.send_transaction(func_call)
+        return self.__wallet.send_transaction(func_call, parameters)
 
     def get_validator_locked_gold_requirements(self) -> dict:
         """
@@ -477,7 +477,7 @@ def deregister_validator(self, validator_address: str) -> str:
             raise Exception(
                 f"{validator_address} is not a registered validator")
 
-    def register_validator_group(self, commission: int) -> str:
+    def register_validator_group(self, commission: int, parameters: dict = None) -> str:
         """
         Registers a validator group with no member validators
         Fails if the account is already a validator or validator group
@@ -492,7 +492,7 @@ def register_validator_group(self, commission: int) -> str:
         """
         func_call = self._contract.functions.registerValidatorGroup(commission)
 
-        return self.__wallet.send_transaction(func_call)
+        return self.__wallet.send_transaction(func_call, parameters)
 
     def deregister_validator_group(self, validator_group_address: str) -> str:
         """
@@ -515,7 +515,7 @@ def deregister_validator_group(self, validator_group_address: str) -> str:
             raise Exception(
                 f"{validator_group_address} is not a registered validator")
 
-    def affiliate(self, group: str) -> str:
+    def affiliate(self, group: str, parameters: dict = None) -> str:
         """
         Affiliates a validator with a group, allowing it to be added as a member
         De-affiliates with the previously affiliated group if present
@@ -529,7 +529,7 @@ def affiliate(self, group: str) -> str:
         """
         func_call = self._contract.functions.affiliate(group)
 
-        return self.__wallet.send_transaction(func_call)
+        return self.__wallet.send_transaction(func_call, parameters)
 
     def deaffiliate(self) -> str:
         func_call = self._contract.functions.deaffiliate()
@@ -564,7 +564,7 @@ def reset_slashing_multiplier(self) -> str:
 
         return self.__wallet.send_transaction(func_call)
 
-    def add_member(self, group: str, validator: str) -> str:
+    def add_member(self, group: str, validator: str, parameters: dict = None) -> str:
         """
         Adds a member to the end of a validator group's list of members
         Fails if `validator` has not set their affiliation to this account
@@ -587,11 +587,11 @@ def add_member(self, group: str, validator: str) -> str:
             func_call = self._contract.functions.addFirstMember(
                 validator, lesser_greater['lesser'], lesser_greater['greater'])
 
-            return self.__wallet.send_transaction(func_call)
+            return self.__wallet.send_transaction(func_call, parameters)
         else:
             func_call = self._contract.functions.addMember(validator)
 
-            return self.__wallet.send_transaction(func_call)
+            return self.__wallet.send_transaction(func_call, parameters)
 
     def remove_member(self, validator: str) -> str:
         """
@@ -609,7 +609,7 @@ def remove_member(self, validator: str) -> str:
 
         return self.__wallet.send_transaction(func_call)
 
-    def reorder_member(self, group_addr: str, validator: str, new_index: int) -> str:
+    def reorder_member(self, group_addr: str, validator: str, new_index: int, parameters: dict = None) -> str:
         """
         Reorders a member within a validator group
         Fails if `validator` is not a member of the account's validator group
@@ -648,7 +648,7 @@ def reorder_member(self, group_addr: str, validator: str, new_index: int) -> str
             func_call = self._contract.functions.reorderMember(
                 validator, next_member, prev_member)
 
-            return self.__wallet.send_transaction(func_call)
+            return self.__wallet.send_transaction(func_call, parameters)
         except ValueError:
             raise Exception(
                 f"ValidatorGroup {group_addr} does not include ${validator}")

sdk/contracts/base_wrapper.py

@@ -40,8 +40,8 @@ def create_all_the_contracts(self):
             raise Exception(
                 f"Error occurs while create all the contracts objecst:\n{sys.exc_info()[1]}")
 
-    def create_and_get_contract_by_name(self, contract_name: str) -> 'ContractWrapperObject':
-        self.create_contract_by_name(contract_name)
+    def create_and_get_contract_by_name(self, contract_name: str, contract_address: str = None) -> 'ContractWrapperObject':
+        self.create_contract_by_name(contract_name, contract_address)
         return self.get_contract_by_name(contract_name)
 
     def get_contract_by_name(self, contract_name: str) -> 'ContractWrapperObject':
@@ -59,7 +59,7 @@ def get_contract_by_name(self, contract_name: str) -> 'ContractWrapperObject':
                 "Such a contract was not created yet, call create_contract_by_name() or create_all_the_contracts() first")
         return contract_obj
 
-    def create_contract_by_name(self, contract_name: str):
+    def create_contract_by_name(self, contract_name: str, contract_address: str = None):
         """
         Creates contract wrapper object by contract name and saves to the dictionary
 
@@ -69,7 +69,7 @@ def create_contract_by_name(self, contract_name: str):
         contract_obj = self.contracts.get(contract_name)
         if contract_obj:
             return
-        contract_data = self.registry.load_contract_by_name(contract_name)
+        contract_data = self.registry.load_contract_by_name(contract_name, contract_address)
 
         self.create_contract(
             contract_name, contract_data['address'], contract_data['abi'])