From 7127713fff98a98cbe37c0e9b21723f994b04557 Mon Sep 17 00:00:00 2001
From: Spekulaas <“ryan@aterve.nl”>
Date: Sun, 21 Jan 2024 23:06:19 +0100
Subject: [PATCH] fixed removing previousblock

---
 goodchain/src/helpers/BlockHelper.py  | 7 ++++---
 goodchain/src/helpers/SocketHelper.py | 4 +++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/goodchain/src/helpers/BlockHelper.py b/goodchain/src/helpers/BlockHelper.py
index 844806a..2fb7edf 100644
--- a/goodchain/src/helpers/BlockHelper.py
+++ b/goodchain/src/helpers/BlockHelper.py
@@ -124,7 +124,8 @@ def createBlock(self):
     if lastBlock != []:
         lastBlock = lastBlock[-1]
 
-        canAddBlock(lastBlock)
+    if not canAddBlock(lastBlock):
+        return False
 
     transactions = Tx()
     transactions = utilityHelper.loadFile("../data/transaction_pool.dat")
@@ -382,11 +383,11 @@ def socketBlock(block):
     if block_status:
 
         if block.id == last_block.id and block.blockHash == last_block.blockHash and last_block.metadata['validated'] == False:
-            # block.previousBlock = last_block.previousBlock
+            block.previousBlock = last_block.previousBlock
             return updateBlockValidation(block)
         
         if block.id == last_block.id + 1 and block.previousHash == last_block.blockHash:
-            # block.previousBlock = last_block
+            block.previousBlock = last_block
             return addBlockToChain(block, last_block)
         
     return False, False, block
diff --git a/goodchain/src/helpers/SocketHelper.py b/goodchain/src/helpers/SocketHelper.py
index 8f65e51..8a8adcc 100644
--- a/goodchain/src/helpers/SocketHelper.py
+++ b/goodchain/src/helpers/SocketHelper.py
@@ -41,7 +41,8 @@ def recvObj(socket):
 
 def sendObj(ip_addr, blk, port):
     try:
-        print("sending to peer")
+        if type(blk) == TxBlock:
+            blk.previousBlock = None
         soc = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         soc.connect((ip_addr, port))
         data = pickle.dumps(blk)
@@ -150,6 +151,7 @@ def connection(ip, port, db):
 
                 case "VALIDATE BLOCK":
                     blockHelper.updateBlockValidation(item[1])
+                    continue
 
         if type(item) == str:
             match item: