Merge branch 'fix/remove_pysha3_dependency' of https://github.com/InjectiveLabs/sdk-python into fix/remove_pysha3_dependency

Author: abel

pyinjective/wallet.py

@@ -1,4 +1,4 @@
-import eth_hash.auto
+import sha3
 import hashlib
 import aiohttp
 import json
@@ -7,8 +7,6 @@
 
 from bech32 import bech32_encode, bech32_decode, convertbits
 from bip32 import BIP32
-from Crypto.Hash import keccak
-from Crypto.Hash.keccak import Keccak_Hash
 from ecdsa import SigningKey, VerifyingKey, SECP256k1, BadSignatureError
 from ecdsa.util import sigencode_string_canonize
 from mnemonic import Mnemonic
@@ -27,14 +25,6 @@
 DEFAULT_DERIVATION_PATH = "m/44'/60'/0'/0/0"
 
 
-class Keccak_Hash_With_Copy(Keccak_Hash):
-    # We need to create a version of Keccak_Hash that responds to `copy`
-    # This is a requirement from the ecdsa library
-
-    def copy(self):
-        return self.new(data=self.digest())
-
-
 class PrivateKey:
     """
     Class for wrapping SigningKey that is used for signature creation and public key derivation.
@@ -109,18 +99,8 @@ def sign(self, msg: bytes) -> bytes:
 
         :return: a signature of this private key over the given message
         """
-        # return self.signing_key.sign_deterministic(msg, hashfunc=hashlib.sha256, sigencode=sigencode_string_canonize)
-        # keccak_function = functools.partial(keccak.new, digest_bits=256)
-        def keccak_creation(data=None):
-            # Create a 256 bits keccak hash
-            keccak_hash = Keccak_Hash_With_Copy(data=data, digest_bytes=32, update_after_digest=False)
-            return keccak_hash
-
-        #return self.signing_key.sign_deterministic(msg, hashfunc=sha3.keccak_256, sigencode=sigencode_string_canonize)
-        hash = eth_hash.auto.keccak
-        digest = eth_hash.auto.keccak(msg)
-        return self.signing_key.sign_digest_deterministic(digest, hashfunc=hash, sigencode=sigencode_string_canonize)
 
+        return self.signing_key.sign_deterministic(msg, hashfunc=sha3.keccak_256, sigencode=sigencode_string_canonize)
 
 class PublicKey:
     """
@@ -194,7 +174,7 @@ def to_cons_bech32(self) -> str:
     def to_address(self) -> "Address":
         """Return address instance from this public key"""
         pubkey = self.verify_key.to_string("uncompressed")
-        keccak_hash = keccak.new(digest_bits=256)
+        keccak_hash = sha3.keccak_256()
         keccak_hash.update(pubkey[1:])
         addr = keccak_hash.digest()[12:]
         return Address(addr)