Fixed sync between nodes

adilmoujahid · adilmoujahid · commit 6561ca1ee84d · 2018-03-22T09:10:52.000+09:00
diff --git a/blockchain/blockchain.py b/blockchain/blockchain.py
@@ -164,15 +164,21 @@ def valid_chain(self, chain):
 
         while current_index < len(chain):
             block = chain[current_index]
-            print(last_block)
-            print(block)
-            print("\n-----------\n")
+            #print(last_block)
+            #print(block)
+            #print("\n-----------\n")
             # Check that the hash of the block is correct
             if block['previous_hash'] != self.hash(last_block):
                 return False
 
             # Check that the Proof of Work is correct
-            if not self.valid_proof(last_block['nonce'], block['nonce'], block['previous_hash']):
+            #Delete the reward transaction
+            transactions = block['transactions'][:-1]
+            # Need to make sure that the dictionary is ordered. Otherwise we'll get a different hash
+            transaction_elements = ['sender_address', 'recipient_address', 'value']
+            transactions = [OrderedDict((k, transaction[k]) for k in transaction_elements) for transaction in transactions]
+
+            if not self.valid_proof(transactions, block['previous_hash'], block['nonce'], MINING_DIFFICULTY):
                 return False
 
             last_block = block
diff --git a/blockchain/templates/index.html b/blockchain/templates/index.html
@@ -109,8 +109,6 @@ <h4 class="card-title">Transactions on the Blockchain &nbsp;&nbsp;&nbsp;
           type: 'GET',
           success: function(response){
 
-            console.log(response['transactions']);
-            //Generate Transactions Table
               //Generate Transactions Table
               var transactions = [];
               count = 1;
@@ -150,7 +148,7 @@ <h4 class="card-title">Transactions on the Blockchain &nbsp;&nbsp;&nbsp;
           type: 'GET',
           success: function(response){
 
-            console.log(response);
+            //console.log(response);
             //Generate Transactions Table
             var transactions = [];
             count = 1;
