Merge branch 'desarrollo'

app/managers.py

@@ -10,8 +10,8 @@ from bitcoin.core.serialize import uint256_from_str
 
 class TimestampManager(models.Manager):
 
-    @classmethod
-    def get_provider(cls):
+    @staticmethod
+    def get_provider():
 
         try:
 
@@ -25,42 +25,42 @@ class TimestampManager(models.Manager):
         except UnhandledRequest:
             raise
 
-    @classmethod
-    def get_current_contract(cls):
+    @staticmethod
+    def get_current_contract():
 
         return TimestampManager.get_contract(CURRENT_CONTRACT_VERSION)
 
-    @classmethod
-    def get_contract(cls, contract_version):
+    @staticmethod
+    def get_contract(contract_version):
 
         web3 = TimestampManager.get_provider()
         return web3.eth.contract(abi=CONTRACTS[contract_version]['abi'], address=Web3.toChecksumAddress(CONTRACTS[contract_version]['address']))
 
-    @classmethod
-    def get_block(cls, block_number):
+    @staticmethod
+    def get_block(block_number):
 
         web3 = TimestampManager.get_provider()
         return web3.eth.getBlock(block_number)
 
-    @classmethod
-    def get_transaction(cls, tx_hash):
+    @staticmethod
+    def get_transaction(tx_hash):
 
         web3 = TimestampManager.get_provider()
         return web3.eth.getTransaction(tx_hash)
 
-    @classmethod
-    def stamp(cls, proof_hash, file_hash):
+    @staticmethod
+    def stamp(proof_hash, file_hash):
 
         contract = TimestampManager.get_current_contract()
         return contract.functions.stamp(uint256_from_str(proof_hash.encode('utf-8')), uint256_from_str(file_hash.encode('utf-8'))).transact({'from': Web3.toChecksumAddress(ACCOUNT_ADDRESS)})
 
-    @classmethod
-    def verify(cls, contract_version, proof_hash, file_hash):
+    @staticmethod
+    def verify(contract_version, proof_hash, file_hash):
         contract = TimestampManager.get_contract(contract_version)
         return contract.functions.verify(uint256_from_str(proof_hash.encode('utf-8')),uint256_from_str(file_hash.encode('utf-8'))).call()
 
-    @classmethod
-    def get_block_number(cls, contract_version, proof_hash):
+    @staticmethod
+    def get_block_number(contract_version, proof_hash):
         contract = TimestampManager.get_contract(contract_version)
         return contract.functions.getBlockNumber(uint256_from_str(proof_hash.encode('utf-8'))).call()
 

app/utils.py

@@ -5,14 +5,14 @@ from TsaApi.settings import ACCOUNT_ADDRESS, CURRENT_CONTRACT_VERSION
 
 
 class Utils():
-    @classmethod
-    def sha256_encode(cls, string):
+    @staticmethod
+    def sha256_encode(string):
         return hashlib.sha256(string.encode('utf-8')).hexdigest()
 
-    @classmethod
-    def datetime_from_timestamp(cls, timestamp):
+    @staticmethod
+    def datetime_from_timestamp(timestamp):
         return datetime.datetime.fromtimestamp(timestamp).strftime('%d/%m/%Y %H:%M:%S')
 
-    @classmethod
-    def get_proof_hash(cls, file_hash):
+    @staticmethod
+    def get_proof_hash(file_hash):
         return Utils.sha256_encode(str(file_hash + Utils.sha256_encode(str(int(time.time()))) + Utils.sha256_encode(ACCOUNT_ADDRESS))) + CURRENT_CONTRACT_VERSION