Update app.py

app.py

@@ -6,6 +6,7 @@ import json
 import os
 import requests
 from blockchain import Blockchain
+from mychain import MyChain
 from huggingface_hub import (create_repo,get_full_repo_name,upload_file,CommitOperationAdd,HfApi)
 
 main_chain='https://huggingface.co/datasets/Omnibus/blockchain-sim/raw/main/chains/'
@@ -201,8 +202,8 @@ class Blockchain1:
         
         return out, ind, mes
 #def check_balance(sender,amount):
-    
 
+########################  BLOCKCHAIN START  ###############################
 
 def bc_transactions(sender,recipient,amount):
     mes, out = issue_tokens(sender,recipient,amount)
@@ -381,12 +382,54 @@ def add_node(this_space,repo,space,chain_file):
         pass         
 
 
-  
-    
-start_tokens = 10000000
-source="Main"
+ 
+#api = HfApi(token=token)
+repo = main_balance.split('datasets/',1)[1].split('/raw',1)[0].split('/',1)[0]
+name = main_balance.split('datasets/',1)[1].split('/raw',1)[0].split('/',1)[1]
+
+f_ist = (api.list_repo_files(repo_id=f'{repo}/{name}', repo_type="dataset"))
+send_list =[]
+for i,ea in enumerate(f_ist):
+    if "balance/" in ea:
+        try:
+            send_list.append(ea.split("/",1)[1].split(".",1)[0])
+        except Exception:
+            pass
+
+
+##############################   BLOCKCHAIN END  ###############################
+##############################   MYCHAIN START   ###############################
+ 
+
+def get_my_chain(sender_name=None):
+    try:
+        r = requests.get(f'{main_balance}{chain_name}.json') 
+        global mychain
+        mychain = MyChain(chain_load=main_balance,load=r.text)
+        response = {'chain': mychain.chain,
+                    'length': len(mychain.chain)}
+        message = f"Blockchain loaded from: {main_balance}{chain_name}.json"
+        return response,message
+    except:
+        message = f"Error loading from: {sender_name}"
+        return ["Error Loading Chain"],message
+
+def mychain_transaction(sender,recipient,amount):
+    mes, out = issue_tokens(sender,recipient,amount)
+    if out == True:
+        mychain.new_transaction(f"{sender}",f"{recipient}",f"{amount}",f"{balance}")
+        message = "Transaction Added to Pool"
+        data = pd.DataFrame(mychain.pending_transactions)
+    if out == False:
+        message = mes
+        data = None
+    return data,message,None,None,None
+
+
+
+
 def issue_tokens(send,rec,amount):
-    #print(f"{api.whoami(['name'])}")
+    print(f"CURRENT USER:: {api.whoami(['name'])}")
     #repo = f'omnibus/{space}'
     #is_valid='True'
     try:
@@ -394,8 +437,9 @@ def issue_tokens(send,rec,amount):
         if z == True:
             mes = None
             try:
-                r = requests.get(f'{main_balance}{send}.json') 
-                lod = json.loads(r.text)
+                response,message = get_my_chain(send)
+                #r = requests.get(f'{main_balance}{send}.json') 
+                lod = json.loads(response)
                 p=True
             except:
                 lod=[]
@@ -403,10 +447,13 @@ def issue_tokens(send,rec,amount):
                 mes = "Sender has no wallet"
                 pass
             if p==True:
-                balance = lod[-1]["balance"]
+                balance = lod["chain"][-1]["balance"]
                 print (balance)
                 balance =int(balance)-int(amount)
                 if balance >=0:
+                    p==True
+                    '''
+                    #mychain.new_transaction(sender=send, recipient=rec, amount=amount, balance=balance)
                     block = {'index': len(lod) + 1,
                             'timestamp': str(datetime.datetime.now()),
                             'sender': f'{send}',
@@ -469,6 +516,7 @@ def issue_tokens(send,rec,amount):
                         pass   
                     if mes == None:
                         mes = f'{amount} sent from {send} to {rec}'
+                    '''
                 if balance < 0:
                     mes ="Not enough tokens"
                     p = False
@@ -479,18 +527,15 @@ def issue_tokens(send,rec,amount):
         mes = "Blockchain not loaded?"
         p=False
     return mes,p
-#api = HfApi(token=token)
-repo = main_balance.split('datasets/',1)[1].split('/raw',1)[0].split('/',1)[0]
-name = main_balance.split('datasets/',1)[1].split('/raw',1)[0].split('/',1)[1]
 
-f_ist = (api.list_repo_files(repo_id=f'{repo}/{name}', repo_type="dataset"))
-send_list =[]
-for i,ea in enumerate(f_ist):
-    if "balance/" in ea:
-        try:
-            send_list.append(ea.split("/",1)[1].split(".",1)[0])
-        except Exception:
-            pass
+
+##############################   MYCHAIN END   ###############################
+
+
+
+
+
+            
 with gr.Blocks() as bc:
     with gr.Row(visible=True) as invalid:
         pass_box = gr.Textbox()