Merge master

Lonaeri · Lonaeri · commit b4dbdb62cb5c · 2019-11-06T00:24:22.000+01:00
diff --git a/block.py b/block.py
@@ -5,7 +5,7 @@
 from merkle_tree import MerkleTree
 
 MINING_DIFFICULTY = 2
-HASH_GENESIS_BLOCK = "b4358083b2c93824360c5779e1cbe00998d7f09553fd7d18ef8f012b59e82a0f"
+HASH_GENESIS_BLOCK = "8f73145e22b5eef54041892ff92f7e1ab02d6c7246e76b81f0092a8adb13118e"
 
 
 class Block(object):
diff --git a/blockchain.py b/blockchain.py
@@ -41,6 +41,7 @@ def _genesis_block(self):
         previous_hash = 0
         index = 0
         b1 = Block(nonce, txs, index, previous_hash)
+        b1.timestamp = 1572993676
 
         self.chain.append(b1)
 
diff --git a/init_datas.py b/init_datas.py
diff --git a/init_transactions.py b/init_transactions.py
@@ -2,6 +2,7 @@
 import hashlib
 from init_datas import creator_address
 from init_datas import tx_signatures
+from init_datas import time
 
 #from wallet import Wallet
 #creator_wallet = Wallet(); creator_address = creator_wallet.address; print(creator_address)
@@ -15,16 +16,19 @@ def getInitialTransactions():
     for i in range(4):
         tx = Transaction('', creator_address, appleHash)
         tx.signature = bytes.fromhex(tx_signatures[i*3])
+        tx.time = time
         #tx.sign(creator_wallet); print("sign#", i*3, tx.signature.hex())
         txs.append(tx)
 
         tx = Transaction('', creator_address, ironAxeHash)
         tx.signature = bytes.fromhex(tx_signatures[i*3 + 1])
+        tx.time = time
         #tx.sign(creator_wallet); print("sign#", i*3 + 1, tx.signature.hex())
         txs.append(tx)
 
         tx = Transaction('', creator_address, ironSwordHash)
         tx.signature = bytes.fromhex(tx_signatures[i*3 + 2])
+        tx.time = time
         #tx.sign(creator_wallet); print("sign#", i*3 + 2, tx.signature.hex())
         txs.append(tx)
 
diff --git a/transaction.py b/transaction.py
@@ -10,6 +10,7 @@
 from mx_crypto import MxCrypto
 import json
 import jsonpickle
+import time
 
 
 class Transaction:
@@ -21,25 +22,15 @@ def __init__(self, sender_address, recipient_address, value):
 
         self.value = value
         self.signature = None
-
-    def to_dict(self):
-        return OrderedDict({'sender_address': self.sender_address,
-                            'recipient_address': self.recipient_address,
-                            'value': self.value})
-
-    def toJSON(self):
-        # return json.dumps({
-        #     'sender_address': self.sender_address,
-        #     'recipient_address': self.recipient_address,
-        #     'value': self.value
-        # }, sort_keys=True)
-        return jsonpickle.encode(self)
+        self.time = time.time()
 
     @property
     def to_sign(self):
         return jsonpickle.encode({'sender_address': self.sender_address,
                                   'recipient_address': self.recipient_address,
-                                  'value': self.value}).encode()
+                                  'value': self.value,
+                                  'time': self.time
+                                  }).encode()
 
     def sign(self, wallet):
         self.signature = wallet.sign_transaction(self.to_sign)
diff --git a/wallet.py b/wallet.py
@@ -22,10 +22,8 @@ def __init__(self, key_length=4096, regenerate=False, testDatas=False):
                 try:
                     public_key, private_key = Wallet._import_keys('./testKeys/')
                 except FileNotFoundError:
-                    print("ERROR : Keys not found")
-                    #TODO : faire quelque chose avec cette erreur ?
-                    testDatas = False
-            if testDatas is False:
+                    raise ValueError('Test keys not found, please import it')
+            else:
                 try:
                     public_key, private_key = Wallet._import_keys()
                 except FileNotFoundError:
