Omnibus commited on
Commit
49c209b
·
1 Parent(s): 12d4be8

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +47 -6
app.py CHANGED
@@ -18,7 +18,48 @@ def checkp(inp):
18
  elif inp != pa:
19
  return gr.update(visible=True), gr.update(visible=False)
20
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
21
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
22
  ############################################
23
  def send_message(send,rec,message):
24
  response_send={}
@@ -37,9 +78,9 @@ def send_message(send,rec,message):
37
  balance_rec = 0
38
  mes = "blank message"
39
  try:
40
- response,message = chatchain.get_my_chain_send(send)
41
  send_rec = response
42
- response,message = chatchain.get_my_chain_rec(rec)
43
  lod_rec = response
44
  '''
45
  mes1,val,mes2,ind = chatchain.valid_rec()
@@ -62,12 +103,12 @@ def send_message(send,rec,message):
62
  if p==False:
63
  return (mes, p,None,None,None,None,None,None,None,None,None,None,None)
64
  if p==True:
65
- chatchain.MyChainSend.new_transaction(sender=send,recipient=rec,message=message)
66
  message_send = "Transaction Added to Pool"
67
- data_send = pd.DataFrame(chatchain.MyChainSend.pending_transactions)
68
- chatchain.MyChainRec.new_transaction(f"{send}",f"{rec}",f"{message}")
69
  message_rec = "Transaction Added to Pool"
70
- data_rec = pd.DataFrame(chatchain.MyChainRec.pending_transactions)
71
  response_send, show_chain_send, message_send = chatchain.mychain_mine_block_send(chain_r=None,chain_n=send)
72
 
73
  #mychain_mine_block_trans(balance_send, chain_r=None,chain_n=send)
 
18
  elif inp != pa:
19
  return gr.update(visible=True), gr.update(visible=False)
20
 
21
+ def get_my_chain_send(sender_name=None):
22
+ global mychain_send
23
+ mes_error = ""
24
+ try:
25
+ r = requests.get(f'{main_balance}{sender_name}.json')
26
+
27
+ #print (f'r={r.text}')
28
+ mychain_send = MyChainSend(chain_load=main_balance,load=r.text)
29
+
30
+ response = {'chain': mychain_send.chain,
31
+ 'length': len(mychain_send.chain)}
32
+ #print (f'response={response}')
33
+
34
+
35
+ message = f"Blockchain loaded from: {main_balance}{sender_name}.json"
36
+ return response,message
37
+ except Exception:
38
+ message = f"Error loading from: {sender_name}"
39
+ print (message)
40
+ return ["Error Loading Chain"],message
41
+
42
+ def get_my_chain_rec(recipient_name=None):
43
+ global mychain_rec
44
 
45
+ try:
46
+ r = requests.get(f'{main_balance}{recipient_name}.json')
47
+ mychain_rec = MyChainRec(chain_load=main_balance,load=r.text)
48
+ response = {'chain': mychain_rec.chain,
49
+ 'length': len(mychain_rec.chain)}
50
+ message = f"Blockchain loaded from: {main_balance}{recipient_name}.json"
51
+ return response,message
52
+ except Exception:
53
+ try:
54
+ mychain_rec = MyChainRec(chain_load=main_balance,create=recipient_name)
55
+ response = {'chain': mychain_rec.chain,
56
+ 'length': len(mychain_rec.chain)}
57
+
58
+ message = f"Blockchain loaded from: {main_balance}{recipient_name}.json"
59
+ return response,message
60
+ except Exception:
61
+ message = f"Error loading from: {recipient_name}"
62
+ return ["Error Loading Chain"],message
63
  ############################################
64
  def send_message(send,rec,message):
65
  response_send={}
 
78
  balance_rec = 0
79
  mes = "blank message"
80
  try:
81
+ response,message = get_my_chain_send(send)
82
  send_rec = response
83
+ response,message = get_my_chain_rec(rec)
84
  lod_rec = response
85
  '''
86
  mes1,val,mes2,ind = chatchain.valid_rec()
 
103
  if p==False:
104
  return (mes, p,None,None,None,None,None,None,None,None,None,None,None)
105
  if p==True:
106
+ mychain_send.new_transaction(sender=send,recipient=rec,message=message)
107
  message_send = "Transaction Added to Pool"
108
+ data_send = pd.DataFrame(mychain_send.pending_transactions)
109
+ mychain_rec.new_transaction(f"{send}",f"{rec}",f"{message}")
110
  message_rec = "Transaction Added to Pool"
111
+ data_rec = pd.DataFrame(mychain_rec.pending_transactions)
112
  response_send, show_chain_send, message_send = chatchain.mychain_mine_block_send(chain_r=None,chain_n=send)
113
 
114
  #mychain_mine_block_trans(balance_send, chain_r=None,chain_n=send)