Update app.py

app.py

@@ -28,11 +28,11 @@ api = HfApi(token=token_self)
 
 ########################  BLOCKCHAIN START  ###############################
 
-def bc_transactions(block,prev_block=None):
+def bc_transactions(block):
     #mes, out = issue_tokens(sender,recipient,amount)
     
     try:
-        blockchain.new_transaction(block,prev_block=None)
+        blockchain.new_transaction(block)
         message = "Transaction Added to Pool"
         data = pd.DataFrame(blockchain.trans_data_out)
     except Exception as e:
@@ -210,13 +210,13 @@ name = main_balance.split('datasets/',1)[1].split('/raw',1)[0].split('/',1)[1]
 
         
 
-def get_my_chain_send(sender_name=None,prev_block=None):
+def get_my_chain_send(sender_name=None):
     global mychain_send
 
     try:
         r = requests.get(f'{main_balance}{sender_name}.json') 
         #print (f'r={r.text}')
-        mychain_send = MyChainSend(chain_load=main_balance,prev_block=prev_block,load=r.text)
+        mychain_send = MyChainSend(chain_load=main_balance,load=r.text)
         response = {'chain': mychain_send.chain,
                 'length': len(mychain_send.chain)}
         #print (f'response={response}')
@@ -226,19 +226,19 @@ def get_my_chain_send(sender_name=None,prev_block=None):
         message = f"Error loading from: {sender_name}"
         return ["Error Loading Chain"],message
         
-def get_my_chain_rec(recipient_name=None,prev_block=None):
+def get_my_chain_rec(recipient_name=None):
     global mychain_rec
 
     try:
         r = requests.get(f'{main_balance}{recipient_name}.json') 
-        mychain_rec = MyChainRec(chain_load=main_balance,prev_block=prev_block,load=r.text)
+        mychain_rec = MyChainRec(chain_load=main_balance,load=r.text)
         response = {'chain': mychain_rec.chain,
                 'length': len(mychain_rec.chain)}
         message = f"Blockchain loaded from: {main_balance}{recipient_name}.json"
         return response,message
     except Exception:
         try:
-            mychain_rec = MyChainRec(chain_load=main_balance,prev_block=prev_block,create=recipient_name)
+            mychain_rec = MyChainRec(chain_load=main_balance,create=recipient_name)
             response = {'chain': mychain_rec.chain,
                     'length': len(mychain_rec.chain)}
             
@@ -333,11 +333,8 @@ def merge_trans():
     trans_bx = []
     previous_post_send = mychain_send.print_previous_block()
     previous_post_rec = mychain_rec.print_previous_block()
-    prev_block = len(blockchain.chain)-1
-    previous_block = blockchain.chain[prev_block]             
-
+    
     send_block = {
-            'block': previous_block["index"]+1,
             'role': 'Sender',
             'name': previous_post_send['transactions'][0]['sender'],
             'index': previous_post_send['index'],
@@ -348,7 +345,6 @@ def merge_trans():
             'proof': previous_post_send['proof'],
             'previous_hash': previous_post_send['previous_hash']}
     rec_block = {
-            'block': previous_block["index"]+1,    
             'role': 'Recipient',
             'name': previous_post_rec['transactions'][0]['recipient'],
             'index': previous_post_rec['index'],
@@ -360,7 +356,7 @@ def merge_trans():
             'previous_hash': previous_post_rec['previous_hash']}
     trans_bx.append(send_block)
     trans_bx.append(rec_block)
-    return trans_bx,prev_block
+    return trans_bx
 
 
 
@@ -466,8 +462,8 @@ def issue_tokens(send,rec,amount):
         mes = (f'Send: {message_send} :: Recieve: {message_rec}')
         _,rec_send=update_send_list()
         _,rec_drop=update_rec_list()
-        trans_bx,prev_block = merge_trans()
-        trans_data, mes = bc_transactions(trans_bx,prev_block)
+        trans_bx = merge_trans()
+        trans_data, mes = bc_transactions(trans_bx)
         return (mes, p, response_send, response_rec, show_chain_send, show_chain_rec, data_send,  data_rec,  message_send, message_rec, rec_send, rec_drop,trans_data)
 
 
@@ -615,4 +611,4 @@ with gr.Blocks() as bc:
     mine_b.click(mine_block,[chain_repo,chain_n],[json_out,chain_json,trans_data,block_text])
 
 
-bc.launch(enable_queue=False)
+bc.launch(enable_queue=False)