Omnibus commited on
Commit
8813f2d
·
1 Parent(s): ad686b4

Update app.py

Browse files
Files changed (1) hide show
  1. app.py +86 -80
app.py CHANGED
@@ -305,9 +305,11 @@ def valid():
305
  valid,ind,mes = blockchain.chain_valid(blockchain.chain)
306
  if valid:
307
  response = 'The Blockchain is valid.'
 
308
  else:
309
  response = f'Blockchain is not valid. {mes} at Index {ind}'
310
- return response
 
311
 
312
  def get_chain(repo_name=None,chain_name=None,token=None):
313
  if repo_name == "":
@@ -384,87 +386,91 @@ def issue_tokens(send,rec,amount):
384
  #print(f"{api.whoami(['name'])}")
385
  #repo = f'omnibus/{space}'
386
  #is_valid='True'
387
- mes = None
388
- try:
389
- r = requests.get(f'{main_balance}{send}.json')
390
- lod = json.loads(r.text)
391
- p=True
392
- except:
393
- lod=[]
394
- p=False
395
- mes = "Sender has no wallet"
396
- pass
397
- if p==True:
398
- balance = lod[-1]["balance"]
399
- print (balance)
400
- balance =int(balance)-int(amount)
401
- if balance >=0:
402
- block = {'index': len(lod) + 1,
403
- 'timestamp': str(datetime.datetime.now()),
404
- 'sender': f'{send}',
405
- 'recipient':f'{rec}',
406
- 'amount': f'{amount}',
407
- 'balance': f'{balance}'
408
- }
409
- lod.append(block)
410
-
411
- json_object = json.dumps(lod, indent=4)
412
- with open("tmp1.json", "w") as outfile:
413
- outfile.write(json_object)
414
- try:
415
- api.upload_file(
416
- path_or_fileobj="tmp1.json",
417
- path_in_repo=f'{main_balance.split("main/",1)[1]}/{send}.json',
418
- repo_id=main_balance.split('datasets/',1)[1].split('/raw',1)[0],
419
- token=token_self,
420
- repo_type="dataset",
421
- )
422
- os.remove("tmp1.json")
423
- except Exception as e:
424
- mes=e
425
- pass
426
-
427
- try:
428
- r = requests.get(f'{main_balance}{rec}.json')
429
- lod = json.loads(r.text)
430
- balance = lod[-1]["balance"]
431
-
432
- except:
433
- lod=[]
434
- balance=0
435
- pass
436
  print (balance)
437
- balance =int(balance)+int(amount)
438
- block = {'index': len(lod) + 1,
439
- 'timestamp': str(datetime.datetime.now()),
440
- 'sender': f'{send}',
441
- 'recipient':f'{rec}',
442
- 'amount': f'{amount}',
443
- 'balance': f'{balance}'}
444
- lod.append(block)
445
-
446
- json_object = json.dumps(lod, indent=4)
447
- with open("tmp1.json", "w") as outfile:
448
- outfile.write(json_object)
449
- try:
450
- api.upload_file(
451
- path_or_fileobj="tmp1.json",
452
- path_in_repo=f'{main_balance.split("main/",1)[1]}/{rec}.json',
453
- repo_id=main_balance.split('datasets/',1)[1].split('/raw',1)[0],
454
- token=token_self,
455
- repo_type="dataset",
456
- )
457
- os.remove("tmp1.json")
 
 
 
 
 
458
 
459
- except Exception as e:
460
- mes = e
461
- pass
462
- if mes == None:
463
- mes = f'{amount} sent from {send} to {rec}'
464
- if balance < 0:
465
- mes ="Not enough tokens"
466
- p = False
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
467
 
 
 
 
 
 
 
 
 
 
 
 
468
  return mes,p
469
  #api = HfApi(token=token)
470
  repo = main_balance.split('datasets/',1)[1].split('/raw',1)[0].split('/',1)[0]
@@ -526,7 +532,7 @@ with gr.Blocks() as bc:
526
  pass_btn.click(checkp,pass_box,[invalid,valida])
527
  in_chain_btn.click(get_chain,[chain_repo,chain_n],[chain_json,block_text])
528
  create_bc.click(create_chain,[chain_n],[block_text,json_out,chain_json])
529
- check.click(valid,None,block_text)
530
  check_all.click(sort_valid,None,block_text)
531
 
532
  send_trans.click(bc_transactions,[send,rec,am],[trans_data,block_text,send,rec,am])
 
305
  valid,ind,mes = blockchain.chain_valid(blockchain.chain)
306
  if valid:
307
  response = 'The Blockchain is valid.'
308
+ z=True
309
  else:
310
  response = f'Blockchain is not valid. {mes} at Index {ind}'
311
+ z=False
312
+ return response,z
313
 
314
  def get_chain(repo_name=None,chain_name=None,token=None):
315
  if repo_name == "":
 
386
  #print(f"{api.whoami(['name'])}")
387
  #repo = f'omnibus/{space}'
388
  #is_valid='True'
389
+ _,z=valid()
390
+ if z == True:
391
+ mes = None
392
+ try:
393
+ r = requests.get(f'{main_balance}{send}.json')
394
+ lod = json.loads(r.text)
395
+ p=True
396
+ except:
397
+ lod=[]
398
+ p=False
399
+ mes = "Sender has no wallet"
400
+ pass
401
+ if p==True:
402
+ balance = lod[-1]["balance"]
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
403
  print (balance)
404
+ balance =int(balance)-int(amount)
405
+ if balance >=0:
406
+ block = {'index': len(lod) + 1,
407
+ 'timestamp': str(datetime.datetime.now()),
408
+ 'sender': f'{send}',
409
+ 'recipient':f'{rec}',
410
+ 'amount': f'{amount}',
411
+ 'balance': f'{balance}'
412
+ }
413
+ lod.append(block)
414
+
415
+ json_object = json.dumps(lod, indent=4)
416
+ with open("tmp1.json", "w") as outfile:
417
+ outfile.write(json_object)
418
+ try:
419
+ api.upload_file(
420
+ path_or_fileobj="tmp1.json",
421
+ path_in_repo=f'{main_balance.split("main/",1)[1]}/{send}.json',
422
+ repo_id=main_balance.split('datasets/',1)[1].split('/raw',1)[0],
423
+ token=token_self,
424
+ repo_type="dataset",
425
+ )
426
+ os.remove("tmp1.json")
427
+ except Exception as e:
428
+ mes=e
429
+ pass
430
 
431
+ try:
432
+ r = requests.get(f'{main_balance}{rec}.json')
433
+ lod = json.loads(r.text)
434
+ balance = lod[-1]["balance"]
435
+
436
+ except:
437
+ lod=[]
438
+ balance=0
439
+ pass
440
+ print (balance)
441
+ balance =int(balance)+int(amount)
442
+ block = {'index': len(lod) + 1,
443
+ 'timestamp': str(datetime.datetime.now()),
444
+ 'sender': f'{send}',
445
+ 'recipient':f'{rec}',
446
+ 'amount': f'{amount}',
447
+ 'balance': f'{balance}'}
448
+ lod.append(block)
449
+
450
+ json_object = json.dumps(lod, indent=4)
451
+ with open("tmp1.json", "w") as outfile:
452
+ outfile.write(json_object)
453
+ try:
454
+ api.upload_file(
455
+ path_or_fileobj="tmp1.json",
456
+ path_in_repo=f'{main_balance.split("main/",1)[1]}/{rec}.json',
457
+ repo_id=main_balance.split('datasets/',1)[1].split('/raw',1)[0],
458
+ token=token_self,
459
+ repo_type="dataset",
460
+ )
461
+ os.remove("tmp1.json")
462
 
463
+ except Exception as e:
464
+ mes = e
465
+ pass
466
+ if mes == None:
467
+ mes = f'{amount} sent from {send} to {rec}'
468
+ if balance < 0:
469
+ mes ="Not enough tokens"
470
+ p = False
471
+ if z==False:
472
+ mes = "No Blockchain Loaded"
473
+ p=False
474
  return mes,p
475
  #api = HfApi(token=token)
476
  repo = main_balance.split('datasets/',1)[1].split('/raw',1)[0].split('/',1)[0]
 
532
  pass_btn.click(checkp,pass_box,[invalid,valida])
533
  in_chain_btn.click(get_chain,[chain_repo,chain_n],[chain_json,block_text])
534
  create_bc.click(create_chain,[chain_n],[block_text,json_out,chain_json])
535
+ check.click(valid,None,[block_text,out_box_bool])
536
  check_all.click(sort_valid,None,block_text)
537
 
538
  send_trans.click(bc_transactions,[send,rec,am],[trans_data,block_text,send,rec,am])