Minor refactor changes

Author: VadimGrznk

Readme.md

@@ -111,6 +111,8 @@ For the moment, we have contract wrappers for:
 - StableToken
 - Validators
 
+To create object of contract wrapper you shold set one of those contract names as a parameter to function `BaseWrapper.create_and_get_contract_by_name(...)`
+
 ## A Note About Contract Addresses
 
 Celo Core Contracts addresses, can be obtained by looking at the `Registry` contract.

celo_sdk/__init__.py

@@ -2,4 +2,5 @@
     registry,
     wallet,
     tests,
+    kit,
 )

celo_sdk/contracts/AccountsWrapper.py

@@ -7,7 +7,6 @@
 from celo_sdk.registry import Registry
 from celo_sdk.utils import hash_utils
 
-from eth_keys.datatypes import PublicKey
 from web3 import Web3
 
 

celo_sdk/contracts/AttestationsWrapper.py

@@ -10,6 +10,7 @@
 from celo_sdk.contracts.base_wrapper import BaseWrapper
 from celo_sdk.registry import Registry
 from celo_sdk.utils import attestations_utils
+from celo_sdk.celo_account.messages import encode_defunct
 
 
 class Attestations(BaseWrapper):
@@ -248,6 +249,7 @@ def complete(self, identifier: str, account: str, issuer: str, code: str) -> str
         attestation_signer = accounts_contract.get_attestation_signer(issuer)
 
         message = self.web3.soliditySha3(['bytes32', 'address'], [identifier, account]).hex()
+        message = encode_defunct(hexstr=message)
         signer_address = Account.recoverHash(message, signature=code)
 
         if signer_address != attestation_signer:
@@ -277,6 +279,7 @@ def find_matching_issuer(self, identifier: str, account: str, code: str, issuers
         """
         accounts_contract = self.create_and_get_contract_by_name('Accounts')
         message = self.web3.soliditySha3(['bytes32', 'address'], [identifier, account]).hex()
+        message = encode_defunct(hexstr=message)
         signer_address = Account.recoverHash(message, signature=code)
 
         for issuer in issuers:
@@ -395,6 +398,7 @@ def validate_attestation_code(self, identifier: str, account: str, issuer: str,
         attestation_signer = accounts_contract.get_attestation_signer(issuer)
 
         message = self.web3.soliditySha3(['bytes32', 'address'], [identifier, account]).hex()
+        message = encode_defunct(hexstr=message)
         signer_address = Account.recoverHash(message, signature=code)
 
         if signer_address != attestation_signer:

celo_sdk/contracts/BlockchainParametersWrapper.py

@@ -1,6 +1,5 @@
 import sys
 
-from eth_keys.datatypes import PublicKey
 from web3 import Web3
 
 from celo_sdk.contracts.base_wrapper import BaseWrapper

celo_sdk/contracts/GovernanceWrapper.py

@@ -1,4 +1,3 @@
-import sys
 import time
 from typing import List
 

celo_sdk/contracts/LockedGoldWrapper.py

@@ -1,4 +1,3 @@
-import sys
 import time
 from typing import List
 

celo_sdk/contracts/MultiSigWrapper.py

@@ -1,4 +1,3 @@
-import sys
 import time
 from typing import List
 

celo_sdk/contracts/ReleaseGoldWrapper.py

@@ -6,6 +6,8 @@
 from web3 import Web3
 
 from celo_sdk.contracts.base_wrapper import BaseWrapper
+from celo_sdk.celo_account.account import Account
+from celo_sdk.celo_account.messages import encode_defunct
 from celo_sdk.registry import Registry
 from celo_sdk.utils import hash_utils
 
@@ -563,7 +565,7 @@ def authorize_vote_signer(self, signer: str, signature: 'Signature') -> str:
                 Transaction hash
         """
         func_call = self._contract.functions.authorizeVoteSigner(
-            signer, signature.v, signature.r, signature.s)
+            signer, signature.v, self.web3.toBytes(signature.r), self.web3.toBytes(signature.s))
 
         return self.__wallet.send_transaction(func_call)
 
@@ -588,8 +590,8 @@ def authorize_validator_signer(self, signer: str, proof_of_signing_key_possessio
             message = self.web3.soliditySha3(['address'], [account]).hex()
             prefixed_msg = hash_utils.hash_message_with_prefix(
                 self.web3, message)
-            pub_key = PublicKey.recover_from_msg_hash(
-                prefixed_msg, proof_of_signing_key_possession).to_hex()
+            prefixed_msg = encode_defunct(hexstr=prefixed_msg)
+            pub_key = Account.recover_hash_to_pub(prefixed_msg, vrs=proof_of_signing_key_possession.vrs).to_hex()
             func_call = self._contract.functions.authorizeValidatorSignerWithPublicKey(
                 signer, proof_of_signing_key_possession.v, self.web3.toBytes(proof_of_signing_key_possession.r), self.web3.toBytes(proof_of_signing_key_possession.s), pub_key)
 
@@ -622,8 +624,8 @@ def authorize_validator_signer_and_bls(self, signer: str, proof_of_signing_key_p
         account = self.__wallet.active_account.address
         message = self.web3.soliditySha3(['address'], [account]).hex()
         prefixed_msg = hash_utils.hash_message_with_prefix(self.web3, message)
-        pub_key = PublicKey.recover_from_msg_hash(
-            prefixed_msg, proof_of_signing_key_possession).to_hex()
+        prefixed_msg = encode_defunct(hexstr=prefixed_msg)
+        pub_key = Account.recover_hash_to_pub(prefixed_msg, vrs=proof_of_signing_key_possession.vrs).to_hex()
         func_call = self._contract.functions.authorizeValidatorSignerWithKeys(
             signer, proof_of_signing_key_possession.v, self.web3.toBytes(proof_of_signing_key_possession.r), self.web3.toBytes(proof_of_signing_key_possession.s), pub_key, bls_pub_key, bls_pop)
 

celo_sdk/contracts/ReserveWrapper.py

@@ -1,8 +1,5 @@
-import sys
-import time
 from typing import List
 
-from eth_keys.datatypes import PublicKey
 from web3 import Web3
 
 from celo_sdk.contracts.base_wrapper import BaseWrapper